svx/uiconfig/ui/sidebarline.ui | 164 ++++++++++++++++++++++------------------- 1 file changed, 88 insertions(+), 76 deletions(-)
New commits: commit b68117b5b4af92757b95490f43d9af3651d3e16b Author: andreas kainz <[email protected]> AuthorDate: Thu Feb 13 22:51:03 2020 +0100 Commit: andreas_kainz <[email protected]> CommitDate: Tue Feb 18 08:17:22 2020 +0100 Line Sidebar arrangement update Change-Id: I6b80382f159c92dce703f8d07d69fe183ff90d27 Reviewed-on: https://gerrit.libreoffice.org/c/core/+/88666 Tested-by: Jenkins Reviewed-by: andreas_kainz <[email protected]> diff --git a/svx/uiconfig/ui/sidebarline.ui b/svx/uiconfig/ui/sidebarline.ui index 5ae3faa288d3..1bc7d27f0117 100644 --- a/svx/uiconfig/ui/sidebarline.ui +++ b/svx/uiconfig/ui/sidebarline.ui @@ -24,78 +24,13 @@ <property name="hexpand">True</property> <property name="orientation">vertical</property> <property name="spacing">6</property> - <child> - <object class="GtkBox" id="box1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">3</property> - <child> - <object class="GtkLabel" id="linelabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes" context="sidebarline|widthlabel">_Line:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">linestyle</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkToolbar" id="linestyle"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="toolbar_style">icons</property> - <property name="show_arrow">False</property> - <property name="icon_size">2</property> - <child> - <object class="GtkMenuToolButton" id=".uno:XLineStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes" context="sidebarline|linestyle|tooltip_text">Select the style of the line.</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - <child> - <object class="GtkMenuToolButton" id=".uno:LineEndStyle"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes" context="sidebarline|linestyle|tooltip_text">Select the style of the arrowheads.</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="homogeneous">False</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> <child> <object class="GtkGrid" id="lineproperties"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="halign">start</property> - <property name="row_spacing">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="widthlabel"> <property name="visible">True</property> @@ -107,7 +42,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="top_attach">1</property> </packing> </child> <child> @@ -123,6 +58,7 @@ <object class="GtkMenuToolButton" id="SelectWidth"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">end</property> <property name="hexpand">True</property> <property name="use_underline">True</property> </object> @@ -134,7 +70,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="top_attach">1</property> </packing> </child> <child> @@ -148,7 +84,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="top_attach">2</property> </packing> </child> <child> @@ -156,7 +92,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="tooltip_text" translatable="yes" context="sidebarline|color|tooltip_text">Select the color of the line.</property> - <property name="hexpand">True</property> <property name="toolbar_style">icons</property> <property name="show_arrow">False</property> <property name="icon_size">2</property> @@ -165,6 +100,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="tooltip_text" translatable="yes" context="sidebarline|setcolor|tooltip_text">Select the color of the line.</property> + <property name="halign">end</property> <property name="hexpand">True</property> <property name="use_underline">True</property> </object> @@ -176,7 +112,7 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="top_attach">2</property> </packing> </child> <child> @@ -190,7 +126,7 @@ </object> <packing> <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="top_attach">3</property> </packing> </child> <child> @@ -198,7 +134,6 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="tooltip_text" translatable="yes" context="sidebarline|linetransparency|tooltip_text">Specify the transparency of the line.</property> - <property name="halign">start</property> <property name="adjustment">adjustment1</property> <child internal-child="accessible"> <object class="AtkObject" id="linetransparency-atkobject"> @@ -208,7 +143,73 @@ </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkBox" id="box3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">3</property> + <child> + <object class="GtkLabel" id="linelabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="sidebarline|widthlabel">_Line:</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkToolbar" id="linestyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="hexpand">True</property> + <property name="toolbar_style">icons</property> + <property name="show_arrow">False</property> + <property name="icon_size">2</property> + <child> + <object class="GtkMenuToolButton" id=".uno:LineEndStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes" context="sidebarline|linestyle|tooltip_text">Select the style of the arrowheads.</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="homogeneous">False</property> + </packing> + </child> + <child> + <object class="GtkMenuToolButton" id=".uno:XLineStyle"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes" context="sidebarline|linestyle|tooltip_text">Select the style of the line.</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">True</property> + <property name="homogeneous">False</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="width">2</property> </packing> </child> </object> @@ -218,6 +219,17 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkSeparator"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> <child> <object class="GtkBox" id="arrowproperties"> <property name="visible">True</property> @@ -312,7 +324,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> </object> _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
