diff options
| author | Charles Kerr <charles.kerr@canonical.com> | 2013-10-31 00:13:17 +0000 |
|---|---|---|
| committer | Tarmac <Unknown> | 2013-10-31 00:13:17 +0000 |
| commit | b5ed574ecd4f8a1c84f0a0272bda4b0509877eae (patch) | |
| tree | 0975152aae9c159e23f3cccb5d05fcf0137d8f2e /data | |
| parent | bbc781d9e2afe500d9a5d09335f0954f25269be6 (diff) | |
| parent | 668658f383ae43f175a70a0fdca983c64b84fe59 (diff) | |
| download | ayatana-indicator-datetime-b5ed574ecd4f8a1c84f0a0272bda4b0509877eae.tar.gz ayatana-indicator-datetime-b5ed574ecd4f8a1c84f0a0272bda4b0509877eae.tar.bz2 ayatana-indicator-datetime-b5ed574ecd4f8a1c84f0a0272bda4b0509877eae.zip | |
As per the spec, let users show the year in indicator-datetime. Fixes: https://bugs.launchpad.net/bugs/465689.
Approved by Ted Gould, PS Jenkins bot.
Diffstat (limited to 'data')
| -rw-r--r-- | data/com.canonical.indicator.datetime.gschema.xml | 9 | ||||
| -rw-r--r-- | data/datetime-dialog.ui | 45 |
2 files changed, 51 insertions, 3 deletions
diff --git a/data/com.canonical.indicator.datetime.gschema.xml b/data/com.canonical.indicator.datetime.gschema.xml index 4f831d5..1a5922c 100644 --- a/data/com.canonical.indicator.datetime.gschema.xml +++ b/data/com.canonical.indicator.datetime.gschema.xml @@ -64,6 +64,15 @@ time-format value is set to custom. </description> </key> + <key name="show-year" type="b"> + <default>false</default> + <summary>Show the year in the indicator</summary> + <description> + Puts the year in the panel along with the month and the date. + This setting will be ignored if either the time-format value is set to custom + or if show-date is set to false. + </description> + </key> <key name="show-calendar" type="b"> <default>true</default> <summary>Show the monthly calendar in the indicator</summary> 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> |