From 19663dd8958f833385470c6d67f1d80923f33fd0 Mon Sep 17 00:00:00 2001
From: Charles Kerr <charles.kerr@canonical.com>
Date: Wed, 30 Oct 2013 15:29:43 -0700
Subject: Add support for showing the year in indicator-datetime

---
 data/com.canonical.indicator.datetime.gschema.xml |  9 +++++
 data/datetime-dialog.ui                           | 45 +++++++++++++++++++++--
 2 files changed, 51 insertions(+), 3 deletions(-)

(limited to 'data')

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>
@@ -545,6 +545,45 @@
                             <property name="position">2</property>
                           </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>
@@ -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>
-- 
cgit v1.2.3