This is an automated email from the git hooks/post-receive script.
andrzejr pushed a commit to branch master
in repository xfce/xfce4-panel.
commit d9f2bab27fcd309bc99366b8cbe4d37d0fbda21e
Author: Simon Steinbeiss <simon.steinbe...@elfenbeinturm.at>
Date: Wed Oct 26 13:41:12 2016 +0200
Clock: fix showing and hiding elements in prefs dialog
---
plugins/clock/clock-dialog.glade | 196 ++++++++++++++++++++++-----------------
1 file changed, 113 insertions(+), 83 deletions(-)
diff --git a/plugins/clock/clock-dialog.glade b/plugins/clock/clock-dialog.glade
index 809584d..6cdb0a6 100644
--- a/plugins/clock/clock-dialog.glade
+++ b/plugins/clock/clock-dialog.glade
@@ -293,11 +293,12 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="margin_left">18</property>
+ <property name="hexpand">True</property>
<property name="row_spacing">6</property>
<property name="column_spacing">12</property>
<child>
- <object class="GtkCheckButton" id="show-grid">
- <property name="label" translatable="yes">Show
gri_d</property>
+ <object class="GtkCheckButton" id="show-meridiem">
+ <property name="label" translatable="yes">Sho_w
AM/PM</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -306,13 +307,13 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">9</property>
+ <property name="top_attach">4</property>
<property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="show-inactive">
- <property name="label" translatable="yes">Show
_inactive dots</property>
+ <object class="GtkCheckButton" id="flash-separators">
+ <property name="label" translatable="yes">Fl_ash time
separators</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -321,81 +322,43 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">8</property>
+ <property name="top_attach">3</property>
<property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkLabel" id="label5">
+ <object class="GtkCheckButton" id="show-military">
+ <property name="label" translatable="yes">24-_hour
clock</property>
<property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label" translatable="yes"
comments="I18N: the fuzziness the *precision* of the fuzzy clock. Time steps of
5, 15 or parts of the day.">F_uzziness:</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">7</property>
- </packing>
- </child>
- <child>
- <object class="GtkScale" id="hscale1">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="adjustment">fuzziness</property>
- <property name="digits">0</property>
- <property name="value_pos">right</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">7</property>
+ <property name="top_attach">2</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkEntry" id="digital-format">
+ <object class="GtkCheckButton" id="true-binary">
+ <property name="label" translatable="yes">True _binary
clock</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
- <property name="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_activatable">False</property>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">6</property>
- </packing>
- </child>
- <child>
- <object class="GtkComboBox" id="digital-chooser">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <child>
- <object class="GtkCellRendererText"
id="cellrenderertext3"/>
- <attributes>
- <attribute name="text">2</attribute>
- </attributes>
- </child>
- </object>
- <packing>
- <property name="left_attach">1</property>
- <property name="top_attach">5</property>
- </packing>
- </child>
- <child>
- <object class="GtkLabel" id="label8">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="label"
translatable="yes">F_ormat:</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">5</property>
+ <property name="top_attach">1</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="show-meridiem">
- <property name="label" translatable="yes">Sho_w
AM/PM</property>
+ <object class="GtkCheckButton" id="show-seconds">
+ <property name="label" translatable="yes">Display
_seconds</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -404,43 +367,113 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">4</property>
+ <property name="top_attach">0</property>
<property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="flash-separators">
- <property name="label" translatable="yes">Fl_ash time
separators</property>
+ <object class="GtkGrid" id="digital-box">
<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="draw_indicator">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
+ <child>
+ <object class="GtkComboBox" id="digital-chooser">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <child>
+ <object class="GtkCellRendererText"
id="cellrenderertext3"/>
+ <attributes>
+ <attribute name="text">2</attribute>
+ </attributes>
+ </child>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkLabel" id="label8">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label"
translatable="yes">F_ormat:</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ </object>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ </packing>
+ </child>
+ <child>
+ <object class="GtkEntry" id="digital-format">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="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_activatable">False</property>
+ </object>
+ <packing>
+ <property name="left_attach">1</property>
+ <property name="top_attach">1</property>
+ </packing>
+ </child>
+ <child>
+ <placeholder/>
+ </child>
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">3</property>
+ <property name="top_attach">5</property>
<property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="show-military">
- <property name="label" translatable="yes">24-_hour
clock</property>
+ <object class="GtkBox" id="fuzziness-box">
<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="draw_indicator">True</property>
+ <property name="can_focus">False</property>
+ <child>
+ <object class="GtkLabel" id="label5">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="label" translatable="yes"
comments="I18N: the fuzziness the *precision* of the fuzzy clock. Time steps of
5, 15 or parts of the day.">F_uzziness:</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="GtkScale" id="hscale1">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="adjustment">fuzziness</property>
+ <property name="digits">0</property>
+ <property name="value_pos">right</property>
+ </object>
+ <packing>
+ <property name="expand">True</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">2</property>
+ <property name="top_attach">6</property>
<property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="true-binary">
- <property name="label" translatable="yes">True _binary
clock</property>
+ <object class="GtkCheckButton" id="show-inactive">
+ <property name="label" translatable="yes">Show
_inactive dots</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -449,13 +482,13 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">1</property>
+ <property name="top_attach">7</property>
<property name="width">2</property>
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="show-seconds">
- <property name="label" translatable="yes">Display
_seconds</property>
+ <object class="GtkCheckButton" id="show-grid">
+ <property name="label" translatable="yes">Show
gri_d</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@@ -464,13 +497,10 @@
</object>
<packing>
<property name="left_attach">0</property>
- <property name="top_attach">0</property>
+ <property name="top_attach">8</property>
<property name="width">2</property>
</packing>
</child>
- <child>
- <placeholder/>
- </child>
</object>
</child>
<child type="label">
--
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
