aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorMichael Terry <mike@mterry.name>2011-03-01 15:33:47 -0500
committerMichael Terry <mike@mterry.name>2011-03-01 15:33:47 -0500
commitae98ec994ac7f79bc5ddf3ab01053c6d3cef3d57 (patch)
tree4dc39c5d885db1041a93b7024a1d4e754c9c7b42 /data
parent486ad3625ca52b318f5514f782b90f1eda0b87e7 (diff)
parentb79665734363a3644d3eb7b13a110908ac05d3a1 (diff)
downloadayatana-indicator-datetime-ae98ec994ac7f79bc5ddf3ab01053c6d3cef3d57.tar.gz
ayatana-indicator-datetime-ae98ec994ac7f79bc5ddf3ab01053c6d3cef3d57.tar.bz2
ayatana-indicator-datetime-ae98ec994ac7f79bc5ddf3ab01053c6d3cef3d57.zip
merge from trunk
Diffstat (limited to 'data')
-rw-r--r--data/com.canonical.indicator.datetime.gschema.xml12
-rw-r--r--data/datetime-dialog.ui61
2 files changed, 0 insertions, 73 deletions
diff --git a/data/com.canonical.indicator.datetime.gschema.xml b/data/com.canonical.indicator.datetime.gschema.xml
index 5361896..b33f34e 100644
--- a/data/com.canonical.indicator.datetime.gschema.xml
+++ b/data/com.canonical.indicator.datetime.gschema.xml
@@ -5,11 +5,6 @@
<value nick="24-hour" value="2" />
<value nick="custom" value="3" />
</enum>
- <enum id="week-start-enum">
- <value nick="locale-default" value="0" />
- <value nick="sunday" value="1" />
- <value nick="monday" value="2" />
- </enum>
<schema id="com.canonical.indicator.datetime" path="/com/canonical/indicator/datetime/" gettext-domain="indicator-datetime">
<key name="show-clock" type="b">
<default>true</default>
@@ -83,13 +78,6 @@
Shows the week numbers in the monthly calendar in indicator-datetime's menu.
</description>
</key>
- <key name="week-start" enum="week-start-enum">
- <default>'locale-default'</default>
- <summary>When the week starts</summary>
- <description>
- Controls whether weeks in the calendar are shown to start on Sunday or Monday.
- </description>
- </key>
<key name="show-events" type="b">
<default>true</default>
<summary>Show events in the indicator</summary>
diff --git a/data/datetime-dialog.ui b/data/datetime-dialog.ui
index b8d0777..35cb172 100644
--- a/data/datetime-dialog.ui
+++ b/data/datetime-dialog.ui
@@ -597,67 +597,6 @@
<property name="position">0</property>
</packing>
</child>
- <child>
- <object class="GtkLabel" id="label5">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="xalign">0</property>
- <property name="label" translatable="yes">Week begins on:</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- <child>
- <object class="GtkHBox" id="hbox3">
- <property name="visible">True</property>
- <property name="can_focus">False</property>
- <property name="homogeneous">True</property>
- <child>
- <object class="GtkRadioButton" id="startOnSundayRadio">
- <property name="label" translatable="yes">S_unday</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="active">True</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>
- <child>
- <object class="GtkRadioButton" id="startOnMondayRadio">
- <property name="label" translatable="yes">Monda_y</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>
- <property name="group">startOnSundayRadio</property>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">1</property>
- </packing>
- </child>
- </object>
- <packing>
- <property name="expand">True</property>
- <property name="fill">True</property>
- <property name="position">2</property>
- </packing>
- </child>
</object>
</child>
</object>