sc/uiconfig/scalc/ui/sidebaralignment.ui | 170 ++++++++++++++-----------------
svx/uiconfig/ui/sidebarparagraph.ui | 130 +++++++++++------------
2 files changed, 145 insertions(+), 155 deletions(-)
New commits:
commit 0315626909c39da0bd4395c16ba571212f1bb6df
Author: Maxim Monastirsky <momonas...@gmail.com>
Date: Thu Nov 7 15:31:12 2013 +0200
Avoid too wide sidebar when writedirection controls are activated
Achieved by placing the nearby controls into the same box.
Change-Id: I28d04c8c3c5b5d9989e30d0ca18ef536640fb87a
Reviewed-on: https://gerrit.libreoffice.org/6609
Reviewed-by: Caolán McNamara <caol...@redhat.com>
Tested-by: Caolán McNamara <caol...@redhat.com>
diff --git a/sc/uiconfig/scalc/ui/sidebaralignment.ui
b/sc/uiconfig/scalc/ui/sidebaralignment.ui
index 228a25e..d65560e 100644
--- a/sc/uiconfig/scalc/ui/sidebaralignment.ui
+++ b/sc/uiconfig/scalc/ui/sidebaralignment.ui
@@ -18,109 +18,63 @@
<object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="spacing">12</property>
+ <property name="spacing">6</property>
<child>
- <object class="GtkBox" id="box8">
+ <object class="GtkToolbar" id="horizontalalignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Horizontal
Alignment</property>
+ <property name="tooltip_text" translatable="yes">Horizontal
Alignment</property>
+ <property name="halign">start</property>
+ <property name="show_arrow">False</property>
<child>
- <object class="GtkToolbar" id="horizontalalignment">
+ <object class="GtkToolButton" id="substleft">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="tooltip_text"
translatable="yes">Horizontal Alignment</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="substleft">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="valign">start</property>
- <property name="action_name">.uno:AlignLeft</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="substcenter">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property
name="action_name">.uno:AlignHorizontalCenter</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="substright">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:AlignRight</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="substjustify">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="action_name">.uno:AlignBlock</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property name="valign">start</property>
+ <property name="action_name">.uno:AlignLeft</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">0</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
<child>
- <object class="sfxlo-SidebarToolBox" id="writedirection">
+ <object class="GtkToolButton" id="substcenter">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="lefttoright">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="is_important">True</property>
- <property
name="action_name">.uno:ParaLeftToRight</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="righttoleft">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="is_important">True</property>
- <property
name="action_name">.uno:ParaRightToLeft</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
+ <property
name="action_name">.uno:AlignHorizontalCenter</property>
+ <property name="use_underline">True</property>
</object>
<packing>
<property name="expand">False</property>
- <property name="fill">True</property>
- <property name="position">1</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="substright">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:AlignRight</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="substjustify">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="action_name">.uno:AlignBlock</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
</packing>
</child>
</object>
@@ -131,11 +85,49 @@
</packing>
</child>
<child>
+ <object class="sfxlo-SidebarToolBox" id="writedirection">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="lefttoright">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="is_important">True</property>
+ <property
name="action_name">.uno:ParaLeftToRight</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="righttoleft">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="is_important">True</property>
+ <property
name="action_name">.uno:ParaRightToLeft</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkToolbar" id="verticalalignment">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="tooltip_text" translatable="yes">Vertical
Alignment</property>
- <property name="margin_left">47</property>
+ <property name="halign">end</property>
<property name="show_arrow">False</property>
<child>
<object class="GtkToolButton" id="verttop">
@@ -179,7 +171,7 @@
<property name="expand">False</property>
<property name="fill">True</property>
<property name="pack_type">end</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -320,12 +312,10 @@
<property name="spacing">12</property>
<child>
<object class="svxlo-SidebarDialControl" id="orientationcontrol">
- <property name="use_action_appearance">False</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="vexpand">True</property>
- <property name="use_action_appearance">False</property>
</object>
<packing>
<property name="expand">True</property>
diff --git a/svx/uiconfig/ui/sidebarparagraph.ui
b/svx/uiconfig/ui/sidebarparagraph.ui
index d702d15..5aac47e 100644
--- a/svx/uiconfig/ui/sidebarparagraph.ui
+++ b/svx/uiconfig/ui/sidebarparagraph.ui
@@ -16,70 +16,6 @@
<property name="column_spacing">6</property>
<property name="column_homogeneous">True</property>
<child>
- <object class="GtkToolbar" id="verticalalignment">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Vertical
Alignment</property>
- <property name="tooltip_text" translatable="yes">Vertical
Alignment</property>
- <property name="halign">end</property>
- <property name="hexpand">True</property>
- <property name="show_arrow">False</property>
- <child>
- <object class="GtkToolButton" id="cellverttop">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Align
Top</property>
- <property name="tooltip_text" translatable="yes">Align
Top</property>
- <property name="action_name">.uno:CellVertTop</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="cellvertcenter">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Align
Center Vertically</property>
- <property name="tooltip_text" translatable="yes">Align Center
Vertically</property>
- <property name="action_name">.uno:CellVertCenter</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- <child>
- <object class="GtkToolButton" id="cellvertbottom">
- <property name="width_request">25</property>
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="has_tooltip">True</property>
- <property name="tooltip_markup" translatable="yes">Align
Bottom</property>
- <property name="tooltip_text" translatable="yes">Align
Bottom</property>
- <property name="action_name">.uno:CellVertBottom</property>
- <property name="use_underline">True</property>
- </object>
- <packing>
- <property name="expand">False</property>
- <property name="homogeneous">True</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">0</property>
- <property name="width">1</property>
- <property name="height">1</property>
- </packing>
- </child>
- <child>
<object class="GtkToolbar" id="numberbullet">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -730,11 +666,75 @@
<property name="position">1</property>
</packing>
</child>
+ <child>
+ <object class="GtkToolbar" id="verticalalignment">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Vertical
Alignment</property>
+ <property name="tooltip_text" translatable="yes">Vertical
Alignment</property>
+ <property name="halign">end</property>
+ <property name="hexpand">True</property>
+ <property name="show_arrow">False</property>
+ <child>
+ <object class="GtkToolButton" id="cellverttop">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Align
Top</property>
+ <property name="tooltip_text" translatable="yes">Align
Top</property>
+ <property name="action_name">.uno:CellVertTop</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="cellvertcenter">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Align
Center Vertically</property>
+ <property name="tooltip_text" translatable="yes">Align
Center Vertically</property>
+ <property name="action_name">.uno:CellVertCenter</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkToolButton" id="cellvertbottom">
+ <property name="width_request">25</property>
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="has_tooltip">True</property>
+ <property name="tooltip_markup" translatable="yes">Align
Bottom</property>
+ <property name="tooltip_text" translatable="yes">Align
Bottom</property>
+ <property name="action_name">.uno:CellVertBottom</property>
+ <property name="use_underline">True</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="homogeneous">True</property>
+ </packing>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="pack_type">end</property>
+ <property name="position">2</property>
+ </packing>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
<property name="top_attach">0</property>
- <property name="width">1</property>
+ <property name="width">2</property>
<property name="height">1</property>
</packing>
</child>
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
