aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2011-03-29 20:52:37 -0500
committerTed Gould <ted@gould.cx>2011-03-29 20:52:37 -0500
commitc5309d7ec6d6de6683569d88bd17a418a11dbfdf (patch)
treed34e3eab25f3e03bf681e7775d6316abe5a13e86 /data
parent7aa23563b3667b313f9f19e3bbace6e794703526 (diff)
parentd455a0cfb2d3f1fd9e244c5db636ad766dcc287d (diff)
downloadayatana-indicator-datetime-c5309d7ec6d6de6683569d88bd17a418a11dbfdf.tar.gz
ayatana-indicator-datetime-c5309d7ec6d6de6683569d88bd17a418a11dbfdf.tar.bz2
ayatana-indicator-datetime-c5309d7ec6d6de6683569d88bd17a418a11dbfdf.zip
* Upstream Merge
* indicator-datetime-preferences crashed with SIGSEGV in g_utf8_normalize() (LP: #727089) * Uninstalling Evolution removes calendar from clock applet (LP: #691953) * clock doesn't update on timezone change (LP: #735445) * Cannot change main location (LP: #729029) * indicator-datetime-preferences crashed with SIGSEGV in g_simple_async_result_complete() (LP: #734951) * Time zone map looks identical when sensitive vs. insensitive (LP: #740846) * "Locations" window behaves like a modal dialog (LP: #740924) * Added location for clock menu isn't used or remembered (LP: #740930) * Time not displayed for added location in "Locations" window (LP: #740931) * "UTC" location can be removed but not re-added (LP: #740938) * "Locations" window bottom bar is missing a border (LP: #740941) * Add and Remove buttons in "Locations" window have unnecessary tooltips (LP: #740944) * No separator between "Add Event" and locations (LP: #740971) * indicator-datetime-preferences crashed with SIGSEGV in g_atomic_int_exchange_and_add() (LP: #740978) * inicator-datetime dosen't show corretly the time when changing from 24 hours format to 12 hours (LP: #743394)
Diffstat (limited to 'data')
-rw-r--r--data/com.canonical.indicator.datetime.gschema.xml7
-rw-r--r--data/datetime-dialog.ui40
2 files changed, 38 insertions, 9 deletions
diff --git a/data/com.canonical.indicator.datetime.gschema.xml b/data/com.canonical.indicator.datetime.gschema.xml
index b33f34e..8ce75e6 100644
--- a/data/com.canonical.indicator.datetime.gschema.xml
+++ b/data/com.canonical.indicator.datetime.gschema.xml
@@ -100,5 +100,12 @@
indicator-datetime menu.
</description>
</key>
+ <key name="timezone-name" type="s">
+ <default>''</default>
+ <summary>The name of the current timezone</summary>
+ <description>
+ Some timezones can be known by many different cities or names. This setting describes how the current zone prefers to be named. Format is "TIMEZONE NAME" (e.g. "America/New_York Boston" to name the New_York zone Boston).
+ </description>
+ </key>
</schema>
</schemalist>
diff --git a/data/datetime-dialog.ui b/data/datetime-dialog.ui
index 7545227..8479482 100644
--- a/data/datetime-dialog.ui
+++ b/data/datetime-dialog.ui
@@ -7,15 +7,9 @@
<property name="step_increment">86400</property>
<property name="page_increment">864000</property>
</object>
- <object class="GtkAdjustment" id="timeAdjustment">
- <property name="upper">1.8446744073709552e+19</property>
- <property name="step_increment">60</property>
- <property name="page_increment">3600</property>
- </object>
<object class="GtkWindow" id="locationsDialog">
<property name="can_focus">False</property>
<property name="title" translatable="yes">Locations</property>
- <property name="modal">True</property>
<property name="default_width">300</property>
<property name="default_height">200</property>
<property name="destroy_with_parent">True</property>
@@ -47,6 +41,17 @@
</packing>
</child>
<child>
+ <object class="GtkHSeparator" id="hseparator1">
+ <property name="visible">True</property>
+ <property name="can_focus">False</property>
+ </object>
+ <packing>
+ <property name="expand">False</property>
+ <property name="fill">True</property>
+ <property name="position">1</property>
+ </packing>
+ </child>
+ <child>
<object class="GtkHBox" id="hbox10">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -55,8 +60,12 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Add a Location…</property>
<property name="use_action_appearance">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="addButton-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes">Add a Location…</property>
+ </object>
+ </child>
<child>
<object class="GtkImage" id="addImage">
<property name="visible">True</property>
@@ -76,8 +85,12 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
- <property name="tooltip_text" translatable="yes">Remove This Location</property>
<property name="use_action_appearance">False</property>
+ <child internal-child="accessible">
+ <object class="AtkObject" id="removeButton-atkobject">
+ <property name="AtkObject::accessible-description" translatable="yes">Remove This Location</property>
+ </object>
+ </child>
<child>
<object class="GtkImage" id="removeImage">
<property name="visible">True</property>
@@ -96,7 +109,7 @@
<packing>
<property name="expand">False</property>
<property name="fill">True</property>
- <property name="position">1</property>
+ <property name="position">2</property>
</packing>
</child>
</object>
@@ -110,8 +123,17 @@
<column type="gchararray"/>
<!-- column-name Zone -->
<column type="gchararray"/>
+ <!-- column-name Visible Name -->
+ <column type="gchararray"/>
+ <!-- column-name Icon -->
+ <column type="gchararray"/>
</columns>
</object>
+ <object class="GtkAdjustment" id="timeAdjustment">
+ <property name="upper">1.8446744073709552e+19</property>
+ <property name="step_increment">60</property>
+ <property name="page_increment">3600</property>
+ </object>
<object class="GtkWindow" id="timeDateDialog">
<property name="can_focus">False</property>
<property name="border_width">5</property>