aboutsummaryrefslogtreecommitdiff
path: root/data/datetime-dialog.ui
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2013-10-31 11:40:41 -0700
committerTed Gould <ted@gould.cx>2013-10-31 11:40:41 -0700
commiteb47d698341bc8f1b46433c48fc280d5a4906ad3 (patch)
tree04e18a96bcad6c22f5079a517c5c8927d1ac49cd /data/datetime-dialog.ui
parenta4a5562fd93fdd6d9cb4b9cde98126fdca3ea21d (diff)
parent0439dc69bfd71c42d01b7d11cb586ef056503b28 (diff)
downloadayatana-indicator-datetime-eb47d698341bc8f1b46433c48fc280d5a4906ad3.tar.gz
ayatana-indicator-datetime-eb47d698341bc8f1b46433c48fc280d5a4906ad3.tar.bz2
ayatana-indicator-datetime-eb47d698341bc8f1b46433c48fc280d5a4906ad3.zip
Merge trunk
Diffstat (limited to 'data/datetime-dialog.ui')
-rw-r--r--data/datetime-dialog.ui45
1 files changed, 42 insertions, 3 deletions
diff --git a/data/datetime-dialog.ui b/data/datetime-dialog.ui
index 430f77f..6f74cd0 100644
--- a/data/datetime-dialog.ui
+++ b/data/datetime-dialog.ui
@@ -529,7 +529,7 @@
</packing>
</child>
<child>
- <object class="GtkCheckButton" id="showDateTimeCheck">
+ <object class="GtkCheckButton" id="showDateAndMonthCheck">
<property name="label" translatable="yes">_Date and month</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@@ -546,6 +546,45 @@
</packing>
</child>
<child>
+ <object class="GtkAlignment" id="showYearAlignment">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0</property>
+ <property name="yscale">0</property>
+ <property name="left_padding">24</property>
+ <child>
+ <object class="GtkVBox" id="showYearVbox">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ <property name="spacing">6</property>
+ <child>
+ <object class="GtkCheckButton" id="showYearCheck">
+ <property name="label" translatable="yes">_Year</property>
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="receives_default">False</property>
+ <property name="use_action_appearance">False</property>
+ <property name="use_underline">True</property>
+ <property name="xalign">0</property>
+ <property name="draw_indicator">True</property>
+ </object>
+ <packing>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
+ <property name="position">0</property>
+ </packing>
+ </child>
+ </object>
+ </child>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">3</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkVBox" id="vbox5">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -589,7 +628,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">3</property>
+ <property name="position">4</property>
</packing>
</child>
<child>
@@ -606,7 +645,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">4</property>
+ <property name="position">5</property>
</packing>
</child>
</object>