aboutsummaryrefslogtreecommitdiff
path: root/data
diff options
context:
space:
mode:
authorTed Gould <ted@gould.cx>2010-07-12 20:58:24 -0500
committerTed Gould <ted@gould.cx>2010-07-12 20:58:24 -0500
commitfe6129a2aec01220da2e413a9141980bbd827ae8 (patch)
tree2a45dccba3d7fcc3851e3641e85bd111b16535f0 /data
parentd051dbe509a1e88a0c3047a19c94130d58a9aa94 (diff)
parenta994c55bc39f419ce752d02a60bc01d5659aad62 (diff)
downloadayatana-indicator-datetime-fe6129a2aec01220da2e413a9141980bbd827ae8.tar.gz
ayatana-indicator-datetime-fe6129a2aec01220da2e413a9141980bbd827ae8.tar.bz2
ayatana-indicator-datetime-fe6129a2aec01220da2e413a9141980bbd827ae8.zip
* Merge upstream
* Adding in GSettings for configuring the format on the panel.
Diffstat (limited to 'data')
-rw-r--r--data/Makefile.am4
-rw-r--r--data/org.ayatana.indicator.datetime.gschema.xml9
2 files changed, 13 insertions, 0 deletions
diff --git a/data/Makefile.am b/data/Makefile.am
index b19cee4..2e6900c 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -1,5 +1,9 @@
#SUBDIRS = icons
+gsettings_SCHEMAS = \
+ org.ayatana.indicator.datetime.gschema.xml
+@GSETTINGS_RULES@
+
dbus_servicesdir = $(DBUSSERVICEDIR)
dbus_services_DATA = indicator-datetime.service
diff --git a/data/org.ayatana.indicator.datetime.gschema.xml b/data/org.ayatana.indicator.datetime.gschema.xml
new file mode 100644
index 0000000..5833d63
--- /dev/null
+++ b/data/org.ayatana.indicator.datetime.gschema.xml
@@ -0,0 +1,9 @@
+<schemalist>
+ <schema id="org.ayatana.indicator.datetime" path="/apps/indicators/datetime/" gettext-domain="indicator-datetime">
+ <key name="indicator-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>