diff options
author | andreas kainz <kainz.a@gmail.com> | 2020-02-10 20:53:17 +0100 |
---|---|---|
committer | andreas_kainz <kainz.a@gmail.com> | 2020-02-11 12:44:08 +0100 |
commit | ef23096591255d3a1aad87c21560812ef564b496 (patch) | |
tree | 145122ed928b45d5a94e05d139dcd071646757af | |
parent | 6c01bbab45eb16356d345ae2f6bfd6a864dd59e1 (diff) |
Writer Sidebar Wrap section update for better alignment and fit
Change-Id: I9bb3054f5e55346f09828e5ce7220445794c5880
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88411
Tested-by: Jenkins
Reviewed-by: andreas_kainz <kainz.a@gmail.com>
-rw-r--r-- | sw/uiconfig/swriter/ui/sidebarwrap.ui | 169 |
1 files changed, 99 insertions, 70 deletions
diff --git a/sw/uiconfig/swriter/ui/sidebarwrap.ui b/sw/uiconfig/swriter/ui/sidebarwrap.ui index 6d8e730804c2..1cf1609acb95 100644 --- a/sw/uiconfig/swriter/ui/sidebarwrap.ui +++ b/sw/uiconfig/swriter/ui/sidebarwrap.ui @@ -13,11 +13,11 @@ <property name="border_width">6</property> <property name="row_spacing">3</property> <property name="column_spacing">6</property> - <property name="column_homogeneous">True</property> <child> <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="label" translatable="yes" context="sidebarwrap|label1">Spacing:</property> <property name="use_underline">True</property> <property name="mnemonic_widget">spacingLB</property> @@ -40,50 +40,14 @@ </packing> </child> <child> - <object class="GtkToolbar" id="wrapoptions1"> + <object class="GtkLabel" id="label2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <property name="icon_size">2</property> - <child> - <object class="GtkRadioToolButton" id=".uno:WrapOff"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapoff|tooltip_text">Wrap Off</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkRadioToolButton" id=".uno:WrapOn"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapon|tooltip_text">Wrap On</property> - <property name="use_underline">True</property> - <property name="group">.uno:WrapOff</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkRadioToolButton" id=".uno:WrapIdeal"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapideal|tooltip_text">Wrap Ideal</property> - <property name="use_underline">True</property> - <property name="group">.uno:WrapOff</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> + <property name="hexpand">True</property> + <property name="label" translatable="yes" context="sidebarwrap|label2">Wrap:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">spacingLB</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -91,49 +55,114 @@ </packing> </child> <child> - <object class="GtkToolbar" id="wrapoptions2"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <property name="icon_size">2</property> - <child> - <object class="GtkRadioToolButton" id=".uno:WrapLeft"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapleft|tooltip_text">Wrap Left</property> - <property name="use_underline">True</property> - <property name="group">.uno:WrapOff</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> + <property name="halign">end</property> <child> - <object class="GtkRadioToolButton" id=".uno:WrapRight"> + <object class="GtkToolbar" id="wrapoptions1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapright|tooltip_text">Wrap Right</property> - <property name="use_underline">True</property> - <property name="group">.uno:WrapOff</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <property name="icon_size">2</property> + <child> + <object class="GtkRadioToolButton" id=".uno:WrapOff"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapoff|tooltip_text">Wrap Off</property> + <property name="use_underline">True</property> + <property name="active">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkRadioToolButton" id=".uno:WrapOn"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapon|tooltip_text">Wrap On</property> + <property name="use_underline">True</property> + <property name="group">.uno:WrapOff</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkRadioToolButton" id=".uno:WrapIdeal"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapideal|tooltip_text">Wrap Ideal</property> + <property name="use_underline">True</property> + <property name="group">.uno:WrapOff</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkRadioToolButton" id=".uno:WrapThrough"> + <object class="GtkToolbar" id="wrapoptions2"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapthrough|tooltip_text">Wrap Through</property> - <property name="use_underline">True</property> - <property name="group">.uno:WrapOff</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <property name="icon_size">2</property> + <child> + <object class="GtkRadioToolButton" id=".uno:WrapLeft"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapleft|tooltip_text">Wrap Left</property> + <property name="use_underline">True</property> + <property name="group">.uno:WrapOff</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkRadioToolButton" id=".uno:WrapRight"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapright|tooltip_text">Wrap Right</property> + <property name="use_underline">True</property> + <property name="group">.uno:WrapOff</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkRadioToolButton" id=".uno:WrapThrough"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes" context="sidebarwrap|wrapthrough|tooltip_text">Wrap Through</property> + <property name="use_underline">True</property> + <property name="group">.uno:WrapOff</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="homogeneous">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> </object> |