svx/uiconfig/ui/sidebarshadow.ui | 129 ++++++++++++++++++--------------------- 1 file changed, 60 insertions(+), 69 deletions(-)
New commits: commit 66fe473fb66b76352039e3618bab43a281d5cdca Author: andreas kainz <kain...@gmail.com> AuthorDate: Wed Sep 25 10:07:01 2019 +0200 Commit: andreas_kainz <kain...@gmail.com> CommitDate: Fri Sep 27 11:40:31 2019 +0200 harmonize shadow sidebar with area sidebar Change-Id: I7d157815c291de7ef88bf9973bf780de3e340340 Reviewed-on: https://gerrit.libreoffice.org/79511 Tested-by: Jenkins Reviewed-by: andreas_kainz <kain...@gmail.com> diff --git a/svx/uiconfig/ui/sidebarshadow.ui b/svx/uiconfig/ui/sidebarshadow.ui index 3bcd4e4439ea..c7e479298aa5 100644 --- a/svx/uiconfig/ui/sidebarshadow.ui +++ b/svx/uiconfig/ui/sidebarshadow.ui @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.18.3 --> +<!-- Generated with glade 3.22.1 --> <interface domain="svx"> <requires lib="gtk+" version="3.18"/> <requires lib="LibreOffice" version="1.0"/> @@ -30,22 +30,6 @@ <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkCheckButton" id="SHOW_SHADOW"> - <property name="label" translatable="yes" context="sidebarshadow|SHOW_SHADOW">Enable</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> <object class="GtkGrid" id="grid1"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -56,7 +40,8 @@ <object class="GtkLabel" id="angle"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="sidebarshadow|angle">Angle</property> + <property name="label" translatable="yes" context="sidebarshadow|angle">Angle:</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -67,7 +52,8 @@ <object class="GtkLabel" id="distance"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes" context="sidebarshadow|distance">Distance</property> + <property name="label" translatable="yes" context="sidebarshadow|distance">Distance:</property> + <property name="xalign">0</property> </object> <packing> <property name="left_attach">0</property> @@ -97,11 +83,49 @@ <property name="top_attach">1</property> </packing> </child> + <child> + <object class="GtkLabel" id="color"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="sidebarshadow|color">Color:</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="svxcorelo-SvxColorListBox" id="LB_SHADOW_COLOR"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="transparency_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="label" translatable="yes" context="sidebarshadow|transparency_label">Transparency:</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> @@ -110,19 +134,6 @@ <property name="can_focus">False</property> <property name="orientation">vertical</property> <child> - <object class="GtkLabel" id="transparency_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes" context="sidebarshadow|transparency_label">Transparency:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> <object class="GtkGrid" id="grid2"> <property name="visible">True</property> <property name="can_focus">False</property> @@ -164,47 +175,27 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkGrid" id="grid4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkLabel" id="color"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label" translatable="yes" context="sidebarshadow|color">Color:</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="svxcorelo-SvxColorListBox" id="LB_SHADOW_COLOR"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="halign">end</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> </object> <packing> <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="SHOW_SHADOW"> + <property name="label" translatable="yes" context="sidebarshadow|SHOW_SHADOW">Enable</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">0</property> <property name="top_attach">0</property> </packing> </child> _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits