aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorKen VanDine <ken.vandine@canonical.com>2011-02-03 17:16:59 -0500
committerKen VanDine <ken.vandine@canonical.com>2011-02-03 17:16:59 -0500
commit81ad3347c438773f60d6735ba103c0825b574f14 (patch)
treecb79f86c03edf8f0cc9c46e6563ec1aa8c0784d8 /data
parent62471dbe9fa9196597f37ec8d1780b6359ec5d5a (diff)
parentc5b4403212947c1e65de4b955a212296de1e4d9c (diff)
downloadayatana-indicator-datetime-81ad3347c438773f60d6735ba103c0825b574f14.tar.gz
ayatana-indicator-datetime-81ad3347c438773f60d6735ba103c0825b574f14.tar.bz2
ayatana-indicator-datetime-81ad3347c438773f60d6735ba103c0825b574f14.zip
* New upstream release.
* Increase robustness of GeoClue error handling * Remove g_error()'s from the .so * New upstream release. * Change to canonical.com for naming * Fixing a type callback * Switching to GDbus and dbusmenu-0.4 * Supporting a wider range of custom strings for time and support seconds in the custom time strings. * Fixing to take time settings from LC_TIME
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am2
-rw-r--r--data/Makefile.in7
-rw-r--r--data/com.canonical.indicator.datetime.gschema.xml61
-rw-r--r--data/indicator-datetime.service.in2
4 files changed, 65 insertions, 7 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index 0e8dec3..de417b2 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,7 +1,7 @@
#SUBDIRS = icons
gsettings_SCHEMAS = \
- org.ayatana.indicator.datetime.gschema.xml
+ com.canonical.indicator.datetime.gschema.xml
@GSETTINGS_RULES@
dbus_servicesdir = $(DBUSSERVICEDIR)
diff --git a/data/Makefile.in b/data/Makefile.in
index 27596cb..2f3399f 100644
--- a/data/Makefile.in
+++ b/data/Makefile.in
@@ -39,10 +39,7 @@ host_triplet = @host@
subdir = data
DIST_COMMON = $(srcdir)/Makefile.am $(srcdir)/Makefile.in
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
-am__aclocal_m4_deps = $(top_srcdir)/m4/intltool.m4 \
- $(top_srcdir)/m4/libtool.m4 $(top_srcdir)/m4/ltoptions.m4 \
- $(top_srcdir)/m4/ltsugar.m4 $(top_srcdir)/m4/ltversion.m4 \
- $(top_srcdir)/m4/lt~obsolete.m4 $(top_srcdir)/configure.ac
+am__aclocal_m4_deps = $(top_srcdir)/configure.ac
am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
$(ACLOCAL_M4)
mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
@@ -234,7 +231,7 @@ top_build_prefix = @top_build_prefix@
top_builddir = @top_builddir@
top_srcdir = @top_srcdir@
gsettings_SCHEMAS = \
- org.ayatana.indicator.datetime.gschema.xml
+ com.canonical.indicator.datetime.gschema.xml
dbus_servicesdir = $(DBUSSERVICEDIR)
dbus_services_DATA = indicator-datetime.service
diff --git a/data/com.canonical.indicator.datetime.gschema.xml b/data/com.canonical.indicator.datetime.gschema.xml
new file mode 100644
index 0000000..fe493f7
--- /dev/null
+++ b/data/com.canonical.indicator.datetime.gschema.xml
@@ -0,0 +1,61 @@
+<schemalist>
+ <enum id="time-enum">
+ <value nick="locale-default" value="0" />
+ <value nick="12-hour" value="1" />
+ <value nick="24-hour" value="2" />
+ <value nick="custom" value="3" />
+ </enum>
+ <schema id="com.canonical.indicator.datetime" path="/com/canonical/indicator/datetime/" gettext-domain="indicator-datetime">
+ <key name="time-format" enum="time-enum">
+ <default>'locale-default'</default>
+ <summary>What the time format should be</summary>
+ <description>
+ Controls the time format that is displayed in the indicator. For almost
+ all users this should be the default for their locale. If you think the
+ setting is wrong for your locale please join or talk to the translation
+ team for your language. If you just want something different you can
+ adjust this to be either 12 or 24 time. Or, you can use a custom format
+ string and set the custom-time-format setting.
+ </description>
+ </key>
+ <key name="show-seconds" type="b">
+ <default>false</default>
+ <summary>Show the number of seconds in the indicator</summary>
+ <description>
+ Makes the datetime indicator show the number of seconds in the indicator.
+ It's important to note that this will cause additional battery drain as
+ the time will update 60 times as often, so it is not recommended. Also,
+ this setting will be ignored if the time-format value is set to custom.
+ </description>
+ </key>
+ <key name="show-day" type="b">
+ <default>false</default>
+ <summary>Show the day of the week in the indicator</summary>
+ <description>
+ Puts the day of the week on the panel along with the time and/or date
+ depending on settings. This setting will be ignored if the time-format
+ value is set to custom.
+ </description>
+ </key>
+ <key name="show-date" type="b">
+ <default>false</default>
+ <summary>Show the month and date in the indicator</summary>
+ <description>
+ Puts the month and the date in the panel along with the time and/or day
+ of the week depending on settings. This setting will be ignored if the
+ time-format value is set to custom.
+ </description>
+ </key>
+ <key name="custom-time-format" type="s">
+ <default>"%l:%M %p"</default>
+ <summary>The format string passed to strftime</summary>
+ <description>
+ The format of the time and/or date that is visible on the panel when using
+ the indicator. For most users this will be a set of predefined values as
+ determined by the configuration utility, but advanced users can change it
+ to anything strftime can accept. Look at the man page on strftime for
+ more information.
+ </description>
+ </key>
+ </schema>
+</schemalist>
diff --git a/data/indicator-datetime.service.in b/data/indicator-datetime.service.in
index bcb70e3..e7735ce 100644
--- a/data/indicator-datetime.service.in
+++ b/data/indicator-datetime.service.in
@@ -1,3 +1,3 @@
[D-BUS Service]
-Name=org.ayatana.indicator.datetime
+Name=com.canonical.indicator.datetime
Exec=@libexecdir@/indicator-datetime-service