This is an automated email from the git hooks/post-receive script. o c h o s i p u s h e d a c o m m i t t o b r a n c h m a s t e r in repository xfce/xfce4-panel.
commit 0aa911024b9e0de3a886a42151f069648d91e606 Author: Simon Steinbeiss <simon.steinbe...@elfenbeinturm.at> Date: Sun Nov 18 00:34:05 2018 +0100 clock: Improve layout of settings dialog --- plugins/clock/clock-dialog.glade | 42 +++++++++++++++++++++++++--------------- 1 file changed, 26 insertions(+), 16 deletions(-) diff --git a/plugins/clock/clock-dialog.glade b/plugins/clock/clock-dialog.glade index 1298da9..51495d1 100644 --- a/plugins/clock/clock-dialog.glade +++ b/plugins/clock/clock-dialog.glade @@ -1,5 +1,5 @@ <?xml version="1.0" encoding="UTF-8"?> -<!-- Generated with glade 3.20.0 --> +<!-- Generated with glade 3.22.1 --> <interface> <requires lib="gtk+" version="3.20"/> <requires lib="libxfce4ui-2" version="4.12"/> @@ -14,6 +14,16 @@ <property name="can_focus">False</property> <property name="icon_name">time-admin</property> </object> + <object class="GtkImage" id="image2"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">window-close</property> + </object> + <object class="GtkImage" id="image3"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">help-browser</property> + </object> <object class="GtkListStore" id="mode-model"> <columns> <!-- column-name title --> @@ -59,6 +69,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="image">image2</property> <property name="use_underline">True</property> </object> <packing> @@ -73,6 +84,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">True</property> + <property name="image">image3</property> <property name="use_underline">True</property> </object> <packing> @@ -101,6 +113,7 @@ <object class="GtkFrame" id="frame2"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_bottom">18</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> @@ -116,10 +129,9 @@ <property name="can_focus">True</property> <property name="hexpand">True</property> <property name="invisible_char">●</property> - <property name="primary_icon_activatable">False</property> - <property name="secondary_icon_activatable">True</property> <property name="secondary_icon_name">help-contents</property> - <property name="secondary-icon-tooltip-text" translatable="yes">Name of a timezone corresponding a file in the zoneinfo database, for example "America/New_York". Leave empty to use the localtime.</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_tooltip_text" translatable="yes">Name of a timezone corresponding a file in the zoneinfo database, for example "America/New_York". Leave empty to use the localtime.</property> </object> <packing> <property name="left_attach">1</property> @@ -163,6 +175,7 @@ <object class="GtkLabel" id="label6"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_bottom">6</property> <property name="label" translatable="yes">Time Settings</property> <attributes> <attribute name="weight" value="bold"/> @@ -180,6 +193,7 @@ <object class="GtkFrame" id="frame3"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_bottom">18</property> <property name="label_xalign">0</property> <property name="shadow_type">none</property> <child> @@ -194,10 +208,9 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> - <property name="primary_icon_activatable">False</property> - <property name="secondary_icon_activatable">True</property> <property name="secondary_icon_name">help-contents</property> - <property name="secondary-icon-tooltip-text" translatable="yes">The format describes the date and time parts to insert into the panel. For example, %Y will be substituted with the year, %m with the month and %d with the day. Similarly, <b></b> tags will make the text bold. See the "Help" page for additional information.</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_tooltip_text" translatable="yes">The format describes the date and time parts to insert into the panel. For example, %Y will be substituted with the year, %m with the month and %d with the day. Similarly, <b></b> tags will make the text bold. See the "Help" page for additional information.</property> </object> <packing> <property name="left_attach">0</property> @@ -209,6 +222,7 @@ <object class="GtkComboBox" id="tooltip-chooser"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">False</property> <child> <object class="GtkCellRendererText" id="cellrenderertext2"/> <attributes> @@ -225,6 +239,7 @@ <object class="GtkComboBox" id="mode"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="hexpand">True</property> <property name="model">mode-model</property> <child> <object class="GtkCellRendererText" id="cellrenderertext1"/> @@ -264,15 +279,13 @@ <property name="top_attach">0</property> </packing> </child> - <child> - <placeholder/> - </child> </object> </child> <child type="label"> <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_bottom">6</property> <property name="label" translatable="yes">Appearance</property> <attributes> <attribute name="weight" value="bold"/> @@ -417,10 +430,9 @@ <property name="visible">True</property> <property name="can_focus">True</property> <property name="hexpand">True</property> - <property name="primary_icon_activatable">False</property> - <property name="secondary_icon_activatable">True</property> <property name="secondary_icon_name">help-contents</property> - <property name="secondary-icon-tooltip-text" translatable="yes">The format describes the date and time parts to insert into the panel. For example, %Y will be substituted with the year, %m with the month and %d with the day. Similarly, <b></b> tags will make the text bold. See the "Help" page for additional information.</property> + <property name="primary_icon_activatable">False</property> + <property name="secondary_icon_tooltip_text" translatable="yes">The format describes the date and time parts to insert into the panel. For example, %Y will be substituted with the year, %m with the month and %d with the day. Similarly, <b></b> tags will make the text bold. See the "Help" page for additional information.</property> </object> <packing> <property name="left_attach">0</property> @@ -428,9 +440,6 @@ <property name="width">2</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="left_attach">0</property> @@ -514,6 +523,7 @@ <object class="GtkLabel" id="label3"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_bottom">6</property> <property name="label" translatable="yes">Clock Options</property> <attributes> <attribute name="weight" value="bold"/> -- To stop receiving notification emails like this one, please contact the administrator of this repository. _______________________________________________ Xfce4-commits mailing list Xfce4-commits@xfce.org https://mail.xfce.org/mailman/listinfo/xfce4-commits