From c5081444f4f493dc386012bcb99d2430fe26dc5a Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 26 Jun 2014 21:36:42 -0500 Subject: Expose the alarm settings via dbus properties. --- ...anonical.indicator.datetime.AlarmProperties.xml | 31 ++++++++++++++++++++++ 1 file changed, 31 insertions(+) create mode 100644 data/com.canonical.indicator.datetime.AlarmProperties.xml (limited to 'data') diff --git a/data/com.canonical.indicator.datetime.AlarmProperties.xml b/data/com.canonical.indicator.datetime.AlarmProperties.xml new file mode 100644 index 0000000..d25fa82 --- /dev/null +++ b/data/com.canonical.indicator.datetime.AlarmProperties.xml @@ -0,0 +1,31 @@ + + + + + + + + + The default alarm sound's filename. + + + + + + + + How loudly to play alarm sounds. [Range: 1-100] + + + + + + + + How long an alarm's sound should be looped. + + + + + + -- cgit v1.2.3 From 8bb09ca0225886c18e351d3c6156521ed479edd1 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Thu, 26 Jun 2014 22:13:13 -0500 Subject: Design prefers to have a volume slider instead of presets, so remove the AlarmVolume enum and replace it with an int range. --- data/com.canonical.indicator.datetime.gschema.xml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) (limited to 'data') diff --git a/data/com.canonical.indicator.datetime.gschema.xml b/data/com.canonical.indicator.datetime.gschema.xml index 3e0082d..17a38ed 100644 --- a/data/com.canonical.indicator.datetime.gschema.xml +++ b/data/com.canonical.indicator.datetime.gschema.xml @@ -5,13 +5,6 @@ - - - - - - - true @@ -137,8 +130,9 @@ If an alarm doesn't specify its own sound file, this file will be used as the fallback sound. - - 'normal' + + + 50 The alarm's default volume level. The volume at which alarms will be played. -- cgit v1.2.3 From a872431f78e5518419c6af5e365db972f362ba9a Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 27 Jun 2014 08:53:13 -0500 Subject: use intltool-merge to generate com.canonical.indicator.datetime.gschema.xml --- data/CMakeLists.txt | 10 +- data/com.canonical.indicator.datetime.gschema.xml | 150 --------------------- ...com.canonical.indicator.datetime.gschema.xml.in | 150 +++++++++++++++++++++ 3 files changed, 158 insertions(+), 152 deletions(-) delete mode 100644 data/com.canonical.indicator.datetime.gschema.xml create mode 100644 data/com.canonical.indicator.datetime.gschema.xml.in (limited to 'data') diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 5d9e545..d66c865 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -4,9 +4,15 @@ include (UseGSettings) set (SCHEMA_NAME "com.canonical.indicator.datetime.gschema.xml") -set (SCHEMA_FILE "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}") -add_schema (${SCHEMA_FILE}) +set (SCHEMA_FILE "${CMAKE_CURRENT_BINARY_DIR}/${SCHEMA_NAME}") +set (SCHEMA_FILE_IN "${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME}.in") + +# generate the .xml file using intltool +set (ENV{LC_ALL} "C") +execute_process (COMMAND intltool-merge -quiet --xml-style --utf8 --no-translations "${SCHEMA_FILE_IN}" "${SCHEMA_FILE}") +# let UseGSettings do the rest +add_schema (${SCHEMA_FILE}) ## ## Upstart Job File diff --git a/data/com.canonical.indicator.datetime.gschema.xml b/data/com.canonical.indicator.datetime.gschema.xml deleted file mode 100644 index 17a38ed..0000000 --- a/data/com.canonical.indicator.datetime.gschema.xml +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - - - - - true - Show the clock in the panel - - Controls whether the clock indicator appears in the panel or not. - - - - 'locale-default' - What the time format should be - - 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. - - - - "%l:%M %p" - The format string passed to strftime - - 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. - - - - false - Show the number of seconds in the indicator - - 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. - - - - false - Show the day of the week in the indicator - - 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. - - - - false - Show the month and date in the indicator - - 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. - - - - false - Show the year in the indicator - - 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. - - - - true - Show the monthly calendar in the indicator - - Puts the monthly calendar in indicator-datetime's menu. - - - - false - Show week numbers in calendar - - Shows the week numbers in the monthly calendar in indicator-datetime's menu. - - - - true - Show events in the indicator - - Shows events from Evolution in indicator-datetime's menu. - - - - false - Show the auto-detected location in the indicator - - Shows your current location (determined from geoclue and /etc/timezone) in indicator-datetime's menu. - - - - false - Show locations in the indicator - - Shows custom defined locations in indicator-datetime's menu. - - - - ['UTC'] - A List of locations - - Adds the list of locations the user has configured to display in the - indicator-datetime menu. - - - - '' - The name of the current timezone - - 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). - - - - '/usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg' - The alarm's default sound file. - - If an alarm doesn't specify its own sound file, this file will be used as the fallback sound. - - - - - 50 - The alarm's default volume level. - - The volume at which alarms will be played. - - - - - 30 - The alarm's duration. - - How long the alarm's sound will be looped if its snap decision is not dismissed by the user. - - - - diff --git a/data/com.canonical.indicator.datetime.gschema.xml.in b/data/com.canonical.indicator.datetime.gschema.xml.in new file mode 100644 index 0000000..776f6c7 --- /dev/null +++ b/data/com.canonical.indicator.datetime.gschema.xml.in @@ -0,0 +1,150 @@ + + + + + + + + + + true + <_summary>Show the clock in the panel + <_description> + Controls whether the clock indicator appears in the panel or not. + + + + 'locale-default' + <_summary>What the time format should be + <_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. + + + + "%l:%M %p" + <_summary>The format string passed to strftime + <_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. + + + + false + <_summary>Show the number of seconds in the indicator + <_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. + + + + false + <_summary>Show the day of the week in the indicator + <_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. + + + + false + <_summary>Show the month and date in the indicator + <_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. + + + + false + <_summary>Show the year in the indicator + <_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. + + + + true + <_summary>Show the monthly calendar in the indicator + <_description> + Puts the monthly calendar in indicator-datetime's menu. + + + + false + <_summary>Show week numbers in calendar + <_description> + Shows the week numbers in the monthly calendar in indicator-datetime's menu. + + + + true + <_summary>Show events in the indicator + <_description> + Shows events from Evolution in indicator-datetime's menu. + + + + false + <_summary>Show the auto-detected location in the indicator + <_description> + Shows your current location (determined from geoclue and /etc/timezone) in indicator-datetime's menu. + + + + false + <_summary>Show locations in the indicator + <_description> + Shows custom defined locations in indicator-datetime's menu. + + + + ['UTC'] + <_summary>A List of locations + <_description> + Adds the list of locations the user has configured to display in the + indicator-datetime menu. + + + + '' + <_summary>The name of the current timezone + <_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). + + + + '/usr/share/sounds/ubuntu/ringtones/Suru arpeggio.ogg' + <_summary>The alarm's default sound file. + <_description> + If an alarm doesn't specify its own sound file, this file will be used as the fallback sound. + + + + + 50 + <_summary>The alarm's default volume level. + <_description> + The volume at which alarms will be played. + + + + + 30 + <_summary>The alarm's duration. + <_description> + How long the alarm's sound will be looped if its snap decision is not dismissed by the user. + + + + -- cgit v1.2.3 From eebf8f911cedf5124ada2f91576f821da6f421b0 Mon Sep 17 00:00:00 2001 From: Charles Kerr Date: Fri, 27 Jun 2014 09:46:21 -0500 Subject: use unsigned ints for the alarm volume, duration properties --- data/com.canonical.indicator.datetime.gschema.xml.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'data') diff --git a/data/com.canonical.indicator.datetime.gschema.xml.in b/data/com.canonical.indicator.datetime.gschema.xml.in index 776f6c7..62b42c1 100644 --- a/data/com.canonical.indicator.datetime.gschema.xml.in +++ b/data/com.canonical.indicator.datetime.gschema.xml.in @@ -130,7 +130,7 @@ If an alarm doesn't specify its own sound file, this file will be used as the fallback sound. - + 50 <_summary>The alarm's default volume level. @@ -138,7 +138,7 @@ The volume at which alarms will be played. - + 30 <_summary>The alarm's duration. -- cgit v1.2.3