diff options
| author | infirit <[email protected]> | 2015-09-06 21:55:35 +0200 |
|---|---|---|
| committer | infirit <[email protected]> | 2015-09-06 21:55:35 +0200 |
| commit | df7a7488950139e3884972e2363294051e33d45d (patch) | |
| tree | c442d94aba98b29a69a743701bf9a7d7a1086950 | |
| parent | 6bfc67fc80ba929a740d20edd9ba34927dfefafe (diff) | |
| download | mate-applets-df7a7488950139e3884972e2363294051e33d45d.tar.bz2 mate-applets-df7a7488950139e3884972e2363294051e33d45d.tar.xz | |
Rework gsettings schema building
* Bump intltool required version for gsettings support
* Extract strings with intltool directly
* Let autoconf generate the xml files
22 files changed, 210 insertions, 219 deletions
diff --git a/battstat/Makefile.am b/battstat/Makefile.am index 642a128f..648e0789 100644 --- a/battstat/Makefile.am +++ b/battstat/Makefile.am @@ -60,12 +60,10 @@ battstat_applet_LDADD = \ -lm @INTLTOOL_XML_NOMERGE_RULE@ -gsettings_SCHEMAS = org.mate.panel.applet.battstat.gschema.xml +batstat_gschema_in_files = org.mate.panel.applet.battstat.gschema.xml.in +gsettings_SCHEMAS = $(batstat_gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ -%.gschema.xml.in: %.gschema.xml.in.in Makefile - $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ - appletdir = $(datadir)/mate-panel/applets applet_in_files = org.mate.applets.BattstatApplet.mate-panel-applet.in applet_DATA = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet) @@ -87,7 +85,7 @@ org.mate.panel.applet.BattstatAppletFactory.service: $(service_in_files) -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ $< > $@ -CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS) *.gschema.valid +CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid uidir = $(datadir)/mate/ui ui_DATA = battstat-applet-menu.xml @@ -97,7 +95,7 @@ EXTRA_DIST = \ $(ui_DATA) \ org.mate.applets.BattstatApplet.mate-panel-applet.in.in \ $(service_in_files) \ - $(gsettings_SCHEMAS).in.in + $(batstat_gschema_in_files) -include $(top_srcdir)/git.mk diff --git a/battstat/org.mate.panel.applet.battstat.gschema.xml.in b/battstat/org.mate.panel.applet.battstat.gschema.xml.in new file mode 100644 index 00000000..7deb8d54 --- /dev/null +++ b/battstat/org.mate.panel.applet.battstat.gschema.xml.in @@ -0,0 +1,49 @@ +<schemalist gettext-domain="@GETTEXT_PACKAGE@"> + <schema id="org.mate.panel.applet.battstat"> + <key name="red-value" type="i"> + <default>15</default> + <summary>Red value level</summary> + <description>The battery level below which the battery is displayed as red. Also the value at which the low battery warning is displayed.</description> + </key> + <key name="red-value-is-time" type="b"> + <default>false</default> + <summary>Warn on low time rather than low percentage</summary> + <description>Use the value defined in red_value as a time remaining to show the warning dialog rather than a percentage.</description> + </key> + <key name="low-battery-notification" type="b"> + <default>true</default> + <summary>Low Battery Notification</summary> + <description>Notify user when the battery is low.</description> + </key> + <key name="full-battery-notification" type="b"> + <default>false</default> + <summary>Full Battery Notification</summary> + <description>Notify user when the battery is full.</description> + </key> + <key name="beep" type="b"> + <default>false</default> + <summary>Beep for warnings</summary> + <description>Beep when displaying a warning.</description> + </key> + <key name="drain-from-top" type="b"> + <default>false</default> + <summary>Drain from top</summary> + <description>Show the battery meter draining from the top of the battery. Only implemented for traditional battery view.</description> + </key> + <key name="show-status" type="b"> + <default>true</default> + <summary>Upright (small) battery</summary> + <description>Show the upright, smaller battery on the panel.</description> + </key> + <key name="show-battery" type="b"> + <default>false</default> + <summary>Show the horizontal battery</summary> + <description>Show the traditional, horizontal battery on the panel.</description> + </key> + <key name="show-text" type="i"> + <default>0</default> + <summary>Show the time/percent label</summary> + <description>0 for no label, 1 for percentage and 2 for time remaining.</description> + </key> + </schema> +</schemalist> diff --git a/battstat/org.mate.panel.applet.battstat.gschema.xml.in.in b/battstat/org.mate.panel.applet.battstat.gschema.xml.in.in deleted file mode 100644 index 7ffc06c0..00000000 --- a/battstat/org.mate.panel.applet.battstat.gschema.xml.in.in +++ /dev/null @@ -1,49 +0,0 @@ -<schemalist gettext-domain="@GETTEXT_PACKAGE@"> - <schema id="org.mate.panel.applet.battstat"> - <key name="red-value" type="i"> - <default>15</default> - <_summary>Red value level</_summary> - <_description>The battery level below which the battery is displayed as red. Also the value at which the low battery warning is displayed.</_description> - </key> - <key name="red-value-is-time" type="b"> - <default>false</default> - <_summary>Warn on low time rather than low percentage</_summary> - <_description>Use the value defined in red_value as a time remaining to show the warning dialog rather than a percentage.</_description> - </key> - <key name="low-battery-notification" type="b"> - <default>true</default> - <_summary>Low Battery Notification</_summary> - <_description>Notify user when the battery is low.</_description> - </key> - <key name="full-battery-notification" type="b"> - <default>false</default> - <_summary>Full Battery Notification</_summary> - <_description>Notify user when the battery is full.</_description> - </key> - <key name="beep" type="b"> - <default>false</default> - <_summary>Beep for warnings</_summary> - <_description>Beep when displaying a warning.</_description> - </key> - <key name="drain-from-top" type="b"> - <default>false</default> - <_summary>Drain from top</_summary> - <_description>Show the battery meter draining from the top of the battery. Only implemented for traditional battery view.</_description> - </key> - <key name="show-status" type="b"> - <default>true</default> - <_summary>Upright (small) battery</_summary> - <_description>Show the upright, smaller battery on the panel.</_description> - </key> - <key name="show-battery" type="b"> - <default>false</default> - <_summary>Show the horizontal battery</_summary> - <_description>Show the traditional, horizontal battery on the panel.</_description> - </key> - <key name="show-text" type="i"> - <default>0</default> - <_summary>Show the time/percent label</_summary> - <_description>0 for no label, 1 for percentage and 2 for time remaining.</_description> - </key> - </schema> -</schemalist> diff --git a/charpick/Makefile.am b/charpick/Makefile.am index b58c4c98..d1c6abda 100644 --- a/charpick/Makefile.am +++ b/charpick/Makefile.am @@ -41,21 +41,19 @@ org.mate.panel.applet.CharpickerAppletFactory.service: $(service_in_files) $< > $@ @INTLTOOL_XML_NOMERGE_RULE@ -gsettings_SCHEMAS = org.mate.panel.applet.charpick.gschema.xml +charpick_gschema_in_files = org.mate.panel.applet.charpick.gschema.xml.in +gsettings_SCHEMAS = $(charpick_gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ -%.gschema.xml.in: %.gschema.xml.in.in Makefile - $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ - uidir = $(datadir)/mate/ui ui_DATA = charpick-applet-menu.xml -CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS) *.gschema.valid +CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid EXTRA_DIST = \ org.mate.applets.CharpickerApplet.mate-panel-applet.in.in \ $(service_in_files) \ $(ui_DATA) \ - $(gsettings_SCHEMAS).in.in + $(charpick_gschema_in_files) -include $(top_srcdir)/git.mk diff --git a/charpick/org.mate.panel.applet.charpick.gschema.xml.in b/charpick/org.mate.panel.applet.charpick.gschema.xml.in new file mode 100644 index 00000000..9e4971c7 --- /dev/null +++ b/charpick/org.mate.panel.applet.charpick.gschema.xml.in @@ -0,0 +1,14 @@ +<schemalist gettext-domain="@GETTEXT_PACKAGE@"> + <schema id="org.mate.panel.applet.charpick"> + <key name="current-list" type="s"> + <default>''</default> + <summary>Characters shown on applet startup</summary> + <description>The string that the user had selected when the applet was last used. This string will be displayed when the user starts the applet.</description> + </key> + <key name="chartable" type="as"> + <default>[]</default> + <summary>List of available palettes</summary> + <description>List of strings containing the available palettes.</description> + </key> + </schema> +</schemalist> diff --git a/charpick/org.mate.panel.applet.charpick.gschema.xml.in.in b/charpick/org.mate.panel.applet.charpick.gschema.xml.in.in deleted file mode 100644 index 555cc4b6..00000000 --- a/charpick/org.mate.panel.applet.charpick.gschema.xml.in.in +++ /dev/null @@ -1,14 +0,0 @@ -<schemalist gettext-domain="@GETTEXT_PACKAGE@"> - <schema id="org.mate.panel.applet.charpick"> - <key name="current-list" type="s"> - <default>''</default> - <_summary>Characters shown on applet startup</_summary> - <_description>The string that the user had selected when the applet was last used. This string will be displayed when the user starts the applet.</_description> - </key> - <key name="chartable" type="as"> - <default>[]</default> - <_summary>List of available palettes</_summary> - <_description>List of strings containing the available palettes.</_description> - </key> - </schema> -</schemalist> diff --git a/command/Makefile.am b/command/Makefile.am index e9df3c81..3159add3 100644 --- a/command/Makefile.am +++ b/command/Makefile.am @@ -32,15 +32,13 @@ org.mate.panel.applet.CommandAppletFactory.service: $(service_in_files) $< > $@ @INTLTOOL_XML_NOMERGE_RULE@ -gsettings_SCHEMAS = org.mate.panel.applet.command.gschema.xml +command_gschema_in_files = org.mate.panel.applet.command.gschema.xml.in +gsettings_SCHEMAS = $(command_gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ -%.gschema.xml.in: %.gschema.xml.in.in Makefile - $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ - EXTRA_DIST = \ $(applets_in_files).in \ $(service_in_files) \ - $(gsettings_SCHEMAS).in.in + $(command_gschema_in_files) -CLEANFILES = $(applets_DATA) $(applets_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS) *.gschema.valid +CLEANFILES = $(applets_DATA) $(applets_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid diff --git a/command/org.mate.panel.applet.command.gschema.xml.in b/command/org.mate.panel.applet.command.gschema.xml.in new file mode 100644 index 00000000..b352a21b --- /dev/null +++ b/command/org.mate.panel.applet.command.gschema.xml.in @@ -0,0 +1,24 @@ +<schemalist gettext-domain="@GETTEXT_PACKAGE@"> + <schema id="org.mate.panel.applet.command"> + <key name="command" type="s"> + <default>'date +%T'</default> + <summary>Command to execute</summary> + <description>Command/script to execute to get the output</description> + </key> + <key name="interval" type="i"> + <default>1</default> + <summary>Interval for the command</summary> + <description>Interval to execute the command (in seconds)</description> + </key> + <key name="width" type="i"> + <default>60</default> + <summary>Width of output</summary> + <description>Number of characters to display</description> + </key> + <key name="show-icon" type="b"> + <default>false</default> + <summary>Show icon</summary> + <description>If applet icon is shown or not</description> + </key> + </schema> +</schemalist> diff --git a/command/org.mate.panel.applet.command.gschema.xml.in.in b/command/org.mate.panel.applet.command.gschema.xml.in.in deleted file mode 100644 index f5d61479..00000000 --- a/command/org.mate.panel.applet.command.gschema.xml.in.in +++ /dev/null @@ -1,24 +0,0 @@ -<schemalist gettext-domain="@GETTEXT_PACKAGE@"> - <schema id="org.mate.panel.applet.command"> - <key name="command" type="s"> - <default>'date +%T'</default> - <_summary>Command to execute</_summary> - <_description>Command/script to execute to get the output</_description> - </key> - <key name="interval" type="i"> - <default>1</default> - <_summary>Interval for the command</_summary> - <_description>Interval to execute the command (in seconds)</_description> - </key> - <key name="width" type="i"> - <default>60</default> - <_summary>Width of output</_summary> - <_description>Number of characters to display</_description> - </key> - <key name="show-icon" type="b"> - <default>false</default> - <_summary>Show icon</_summary> - <_description>If applet icon is shown or not</_description> - </key> - </schema> -</schemalist> diff --git a/configure.ac b/configure.ac index 8d71cfda..3b411309 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ dnl *************************************************************************** AM_MAINTAINER_MODE -IT_PROG_INTLTOOL([0.35.0]) +IT_PROG_INTLTOOL([0.50.1]) PKG_PROG_PKG_CONFIG([0.19]) AC_PROG_CC @@ -563,8 +563,10 @@ accessx-status/pixmaps/Makefile drivemount/Makefile drivemount/help/Makefile multiload/Makefile +multiload/org.mate.panel.applet.multiload.gschema.xml multiload/docs/Makefile charpick/Makefile +charpick/org.mate.panel.applet.charpick.gschema.xml charpick/help/Makefile invest-applet/Makefile invest-applet/docs/Makefile @@ -575,14 +577,17 @@ invest-applet/data/art/Makefile mateweather/Makefile mateweather/docs/Makefile geyes/Makefile +geyes/org.mate.panel.applet.geyes.gschema.xml geyes/themes/Makefile geyes/docs/Makefile battstat/Makefile +battstat/org.mate.panel.applet.battstat.gschema.xml battstat/apmlib/Makefile battstat/sounds/Makefile battstat/docs/Makefile man/Makefile stickynotes/Makefile +stickynotes/org.mate.stickynotes.gschema.xml stickynotes/pixmaps/Makefile stickynotes/docs/Makefile trashapplet/Makefile @@ -590,11 +595,14 @@ trashapplet/src/Makefile trashapplet/docs/Makefile cpufreq/Makefile cpufreq/src/Makefile +cpufreq/org.mate.panel.applet.cpufreq.gschema.xml cpufreq/src/cpufreq-selector/Makefile cpufreq/pixmaps/Makefile cpufreq/help/Makefile timerapplet/Makefile +timerapplet/org.mate.panel.applet.timer.gschema.xml command/Makefile +command/org.mate.panel.applet.command.gschema.xml null_applet/Makefile ]) diff --git a/cpufreq/Makefile.am b/cpufreq/Makefile.am index ea9ea2aa..af18f188 100644 --- a/cpufreq/Makefile.am +++ b/cpufreq/Makefile.am @@ -1,12 +1,10 @@ SUBDIRS = help pixmaps src @INTLTOOL_XML_NOMERGE_RULE@ -gsettings_SCHEMAS = org.mate.panel.applet.cpufreq.gschema.xml +cpufreq_gschema_in_files = org.mate.panel.applet.cpufreq.gschema.xml.in +gsettings_SCHEMAS = $(cpufreq_gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ -%.gschema.xml.in: %.gschema.xml.in.in Makefile - $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ - appletdir = $(datadir)/mate-panel/applets applet_in_files = org.mate.applets.CPUFreqApplet.mate-panel-applet.in applet_DATA = $(applet_in_files:.mate-panel-applet.in=.mate-panel-applet) @@ -37,7 +35,6 @@ CLEANFILES = \ $(applet_DATA) \ $(applet_DATA).in \ $(service_DATA) \ - $(gsettings_SCHEMAS_in) \ $(gsettings_SCHEMAS) \ *.gschema.valid \ *.bak \ @@ -46,7 +43,7 @@ CLEANFILES = \ EXTRA_DIST = \ org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in \ $(service_in_files) \ - $(gsettings_SCHEMAS).in.in \ + $(cpufreq_gschema_in_files) \ $(builder_DATA) \ $(ui_DATA) diff --git a/cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in.in b/cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in index 7f306a7e..7f306a7e 100644 --- a/cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in.in +++ b/cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in diff --git a/geyes/Makefile.am b/geyes/Makefile.am index 09eaabf0..f8bb8c28 100644 --- a/geyes/Makefile.am +++ b/geyes/Makefile.am @@ -46,12 +46,10 @@ uidir = $(datadir)/mate/ui ui_DATA = geyes-applet-menu.xml @INTLTOOL_XML_NOMERGE_RULE@ -gsettings_SCHEMAS = org.mate.panel.applet.geyes.gschema.xml +geyes_gschema_in_files = org.mate.panel.applet.geyes.gschema.xml.in +gsettings_SCHEMAS = $(geyes_gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ -%.gschema.xml.in: %.gschema.xml.in.in Makefile - $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ - themesdir = $(pkgdatadir)/geyes icons = \ @@ -61,13 +59,13 @@ icons = \ mate-eyes-applet.22.png \ mate-eyes-applet.16.png -CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS) *.gschema.valid +CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid EXTRA_DIST = \ README.themes \ org.mate.applets.GeyesApplet.mate-panel-applet.in.in \ $(service_in_files) \ - $(gsettings_SCHEMAS).in.in \ + $(geyes_gschema_in_files) \ $(ui_DATA) \ $(icons) diff --git a/geyes/org.mate.panel.applet.geyes.gschema.xml.in.in b/geyes/org.mate.panel.applet.geyes.gschema.xml.in index c551fb6a..aad28f71 100644 --- a/geyes/org.mate.panel.applet.geyes.gschema.xml.in.in +++ b/geyes/org.mate.panel.applet.geyes.gschema.xml.in @@ -2,8 +2,8 @@ <schema id="org.mate.panel.applet.geyes"> <key name="theme-path" type="s"> <default>''</default> - <_summary>Directory in which the theme is located</_summary> - <_description>Directory in which the theme is located</_description> + <summary>Directory in which the theme is located</summary> + <description>Directory in which the theme is located</description> </key> </schema> </schemalist> diff --git a/multiload/Makefile.am b/multiload/Makefile.am index 4241b48b..2cad698c 100644 --- a/multiload/Makefile.am +++ b/multiload/Makefile.am @@ -30,16 +30,14 @@ mate_multiload_applet_LDADD = \ -lm @INTLTOOL_XML_NOMERGE_RULE@ -gsettings_SCHEMAS = org.mate.panel.applet.multiload.gschema.xml +multiload_gschema_in_files = org.mate.panel.applet.multiload.gschema.xml.in +gsettings_SCHEMAS = $(multiload_gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ -%.gschema.xml.in: %.gschema.xml.in.in Makefile - $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ - EXTRA_DIST = \ org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in \ $(service_in_files) \ - $(gsettings_SCHEMAS).in.in \ + $(multiload_gschema_in_files) \ $(ui_DATA) uidir = $(datadir)/mate/ui @@ -66,6 +64,6 @@ org.mate.panel.applet.MultiLoadAppletFactory.service: $(service_in_files) -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ $< > $@ -CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS) *.gschema.valid +CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid -include $(top_srcdir)/git.mk diff --git a/multiload/org.mate.panel.applet.multiload.gschema.xml.in.in b/multiload/org.mate.panel.applet.multiload.gschema.xml.in index 7ea422ea..7ea422ea 100644 --- a/multiload/org.mate.panel.applet.multiload.gschema.xml.in.in +++ b/multiload/org.mate.panel.applet.multiload.gschema.xml.in diff --git a/po/POTFILES.in b/po/POTFILES.in index d0811232..2db98810 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -7,19 +7,19 @@ accessx-status/applet.c battstat/battstat_applet.c [type: gettext/glade]battstat/battstat_applet.ui [type: gettext/ini]battstat/org.mate.applets.BattstatApplet.mate-panel-applet.in.in -battstat/org.mate.panel.applet.battstat.gschema.xml.in.in +[type: gettext/gsettings]battstat/org.mate.panel.applet.battstat.gschema.xml.in battstat/properties.c battstat/sounds/mate-battstat_applet.soundlist.in charpick/charpick.c [type: gettext/ini]charpick/org.mate.applets.CharpickerApplet.mate-panel-applet.in.in -charpick/org.mate.panel.applet.charpick.gschema.xml.in.in +[type: gettext/gsettings]charpick/org.mate.panel.applet.charpick.gschema.xml.in charpick/properties.c command/command.c command/org.mate.applets.CommandApplet.mate-panel-applet.in.in -command/org.mate.panel.applet.command.gschema.xml.in.in +[type: gettext/gsettings]command/org.mate.panel.applet.command.gschema.xml.in [type: gettext/glade]cpufreq/cpufreq-preferences.ui [type: gettext/ini]cpufreq/org.mate.applets.CPUFreqApplet.mate-panel-applet.in.in -cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in.in +[type: gettext/gsettings]cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in cpufreq/src/cpufreq-applet.c cpufreq/src/cpufreq-prefs.c cpufreq/src/cpufreq-monitor-cpuinfo.c @@ -32,7 +32,7 @@ drivemount/drivemount.c [type: gettext/ini]drivemount/org.mate.applets.DriveMountApplet.mate-panel-applet.in.in geyes/geyes.c [type: gettext/ini]geyes/org.mate.applets.GeyesApplet.mate-panel-applet.in.in -geyes/org.mate.panel.applet.geyes.gschema.xml.in.in +[type: gettext/gsettings]geyes/org.mate.panel.applet.geyes.gschema.xml.in geyes/themes.c mateweather/mateweather-about.c mateweather/mateweather-applet.c @@ -57,7 +57,7 @@ multiload/load-graph.c multiload/main.c multiload/netspeed.c [type: gettext/ini]multiload/org.mate.applets.MultiLoadApplet.mate-panel-applet.in.in -multiload/org.mate.panel.applet.multiload.gschema.xml.in.in +[type: gettext/gsettings]multiload/org.mate.panel.applet.multiload.gschema.xml.in multiload/properties.c null_applet/MATE_CDPlayerApplet.server.in null_applet/MATE_MailcheckApplet_Factory.server.in @@ -69,11 +69,11 @@ null_applet/null_applet.c [type: gettext/ini]stickynotes/org.mate.applets.StickyNotesApplet.mate-panel-applet.in.in stickynotes/stickynotes.c [type: gettext/glade]stickynotes/stickynotes.ui -stickynotes/org.mate.stickynotes.gschema.xml.in.in +[type: gettext/gsettings]stickynotes/org.mate.stickynotes.gschema.xml.in stickynotes/stickynotes_applet.c stickynotes/stickynotes_applet_callbacks.c stickynotes/stickynotes_callbacks.c -timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in +[type: gettext/gsettings]timerapplet/org.mate.panel.applet.timer.gschema.xml.in timerapplet/timerapplet.c [type: gettext/ini]trashapplet/org.mate.applets.TrashApplet.mate-panel-applet.in.in trashapplet/src/trashapplet.c diff --git a/stickynotes/Makefile.am b/stickynotes/Makefile.am index 2b10fd29..27950c76 100644 --- a/stickynotes/Makefile.am +++ b/stickynotes/Makefile.am @@ -48,12 +48,10 @@ uidir = $(datadir)/mate/ui ui_DATA = $(ui_files) @INTLTOOL_XML_NOMERGE_RULE@ -gsettings_SCHEMAS = org.mate.stickynotes.gschema.xml +stickynotes_gschema_in_files = org.mate.stickynotes.gschema.xml.in +gsettings_SCHEMAS = $(stickynotes_gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ -%.gschema.xml.in: %.gschema.xml.in.in Makefile - $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ - convertdir = $(datadir)/MateConf/gsettings convert_DATA = stickynotes-applet.convert @@ -76,14 +74,14 @@ org.mate.panel.applet.StickyNotesAppletFactory.service: $(service_in_files) -e "s|\@LIBEXECDIR\@|$(libexecdir)|" \ $< > $@ -CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS) *.gschema.valid +CLEANFILES = $(applet_DATA) $(applet_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid endif EXTRA_DIST = \ $(builder_files) \ $(ui_files) \ - $(gsettings_SCHEMAS).in.in \ + $(stickynotes_gschema_in_files) \ $(convert_DATA) \ $(service_in_files) \ org.mate.applets.StickyNotesApplet.mate-panel-applet.in.in diff --git a/stickynotes/org.mate.stickynotes.gschema.xml.in b/stickynotes/org.mate.stickynotes.gschema.xml.in new file mode 100644 index 00000000..eb5d3927 --- /dev/null +++ b/stickynotes/org.mate.stickynotes.gschema.xml.in @@ -0,0 +1,69 @@ +<schemalist gettext-domain="@GETTEXT_PACKAGE@"> + <schema id="org.mate.stickynotes" path="/org/mate/stickynotes/"> + <key name="default-width" type="i"> + <default>100</default> + <summary>Default width for new notes</summary> + <description>Default width for new sticky notes in pixels.</description> + </key> + <key name="default-height" type="i"> + <default>100</default> + <summary>Default height for new notes</summary> + <description>Default height for new sticky notes in pixels.</description> + </key> + <key name="default-color" type="s"> + <default>'#ECF833'</default> + <summary>Default color for new notes</summary> + <description>Default color for new sticky notes. This should be in html hex specification, for example "#30FF50".</description> + </key> + <key name="default-font-color" type="s"> + <default>'#000000'</default> + <summary>Default color for font</summary> + <description>Default font color for new sticky notes. This should be in html hex specification, for example "#000000".</description> + </key> + <key name="default-font" type="s"> + <default>'Sans 10'</default> + <summary>Default font for new notes</summary> + <description>Default font for new sticky notes. This should be a Pango Font Name, for example "Sans Italic 10".</description> + </key> + <key name="sticky" type="b"> + <default>true</default> + <summary>Sticky notes' workspace stickyness</summary> + <description>Specifies whether the sticky notes are visible on ALL workspaces on the desktop, or not.</description> + </key> + <key name="locked" type="b"> + <default>false</default> + <summary>Sticky notes' locked state</summary> + <description>Specifies whether the sticky notes are locked (non-editable) or not.</description> + </key> + <key name="date-format" type="s"> + <default>'%x'</default> + <summary>Date format of note's title</summary> + <description>By default, sticky notes are given the current date as the title when they are created. This format is used; anything that can be parsed by strftime() is valid.</description> + </key> + <key name="use-system-color" type="b"> + <default>true</default> + <summary>Whether to use the default system color</summary> + <description>If this option is disabled, a custom color can be used as the default color for all sticky notes.</description> + </key> + <key name="use-system-font" type="b"> + <default>true</default> + <summary>Whether to use the default system font</summary> + <description>If this option is disabled, a custom font can be used as the default font for all sticky notes.</description> + </key> + <key name="force-default" type="b"> + <default>false</default> + <summary>Whether to force the default color and font on all notes</summary> + <description>If this option is enabled, the custom colors and fonts that have been assigned to individual notes will be ignored.</description> + </key> + <key name="desktop-hide" type="b"> + <default>true</default> + <summary>Whether to hide all notes when the desktop is selected</summary> + <description>If this option is enabled, selecting the desktop in any way will automatically hide all the open notes.</description> + </key> + <key name="confirm-deletion" type="b"> + <default>true</default> + <summary>Whether to ask for confirmation when deleting a note</summary> + <description>Empty notes are always deleted without confirmation.</description> + </key> + </schema> +</schemalist> diff --git a/stickynotes/org.mate.stickynotes.gschema.xml.in.in b/stickynotes/org.mate.stickynotes.gschema.xml.in.in deleted file mode 100644 index a2e4ad34..00000000 --- a/stickynotes/org.mate.stickynotes.gschema.xml.in.in +++ /dev/null @@ -1,69 +0,0 @@ -<schemalist gettext-domain="@GETTEXT_PACKAGE@"> - <schema id="org.mate.stickynotes" path="/org/mate/stickynotes/"> - <key name="default-width" type="i"> - <default>100</default> - <_summary>Default width for new notes</_summary> - <_description>Default width for new sticky notes in pixels.</_description> - </key> - <key name="default-height" type="i"> - <default>100</default> - <_summary>Default height for new notes</_summary> - <_description>Default height for new sticky notes in pixels.</_description> - </key> - <key name="default-color" type="s"> - <default>'#ECF833'</default> - <_summary>Default color for new notes</_summary> - <_description>Default color for new sticky notes. This should be in html hex specification, for example "#30FF50".</_description> - </key> - <key name="default-font-color" type="s"> - <default>'#000000'</default> - <_summary>Default color for font</_summary> - <_description>Default font color for new sticky notes. This should be in html hex specification, for example "#000000".</_description> - </key> - <key name="default-font" type="s"> - <default>'Sans 10'</default> - <_summary>Default font for new notes</_summary> - <_description>Default font for new sticky notes. This should be a Pango Font Name, for example "Sans Italic 10".</_description> - </key> - <key name="sticky" type="b"> - <default>true</default> - <_summary>Sticky notes' workspace stickyness</_summary> - <_description>Specifies whether the sticky notes are visible on ALL workspaces on the desktop, or not.</_description> - </key> - <key name="locked" type="b"> - <default>false</default> - <_summary>Sticky notes' locked state</_summary> - <_description>Specifies whether the sticky notes are locked (non-editable) or not.</_description> - </key> - <key name="date-format" type="s"> - <default>'%x'</default> - <_summary>Date format of note's title</_summary> - <_description>By default, sticky notes are given the current date as the title when they are created. This format is used; anything that can be parsed by strftime() is valid.</_description> - </key> - <key name="use-system-color" type="b"> - <default>true</default> - <_summary>Whether to use the default system color</_summary> - <_description>If this option is disabled, a custom color can be used as the default color for all sticky notes.</_description> - </key> - <key name="use-system-font" type="b"> - <default>true</default> - <_summary>Whether to use the default system font</_summary> - <_description>If this option is disabled, a custom font can be used as the default font for all sticky notes.</_description> - </key> - <key name="force-default" type="b"> - <default>false</default> - <_summary>Whether to force the default color and font on all notes</_summary> - <_description>If this option is enabled, the custom colors and fonts that have been assigned to individual notes will be ignored.</_description> - </key> - <key name="desktop-hide" type="b"> - <default>true</default> - <_summary>Whether to hide all notes when the desktop is selected</_summary> - <_description>If this option is enabled, selecting the desktop in any way will automatically hide all the open notes.</_description> - </key> - <key name="confirm-deletion" type="b"> - <default>true</default> - <_summary>Whether to ask for confirmation when deleting a note</_summary> - <_description>Empty notes are always deleted without confirmation.</_description> - </key> - </schema> -</schemalist> diff --git a/timerapplet/Makefile.am b/timerapplet/Makefile.am index 5ace281b..bc276f69 100644 --- a/timerapplet/Makefile.am +++ b/timerapplet/Makefile.am @@ -33,15 +33,13 @@ org.mate.panel.applet.TimerAppletFactory.service: $(service_in_files) $< > $@ @INTLTOOL_XML_NOMERGE_RULE@ -gsettings_SCHEMAS = org.mate.panel.applet.timer.gschema.xml +timer_gschema_in_files = org.mate.panel.applet.timer.gschema.xml.in +gsettings_SCHEMAS = $(timer_gschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ -%.gschema.xml.in: %.gschema.xml.in.in Makefile - $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ - EXTRA_DIST = \ $(applets_in_files).in \ $(service_in_files) \ - $(gsettings_SCHEMAS).in.in + $(timer_gschema_in_files) -CLEANFILES = $(applets_DATA) $(applets_DATA).in $(service_DATA) $(gsettings_SCHEMAS_in) $(gsettings_SCHEMAS) *.gschema.valid +CLEANFILES = $(applets_DATA) $(applets_DATA).in $(service_DATA) $(gsettings_SCHEMAS) *.gschema.valid diff --git a/timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in b/timerapplet/org.mate.panel.applet.timer.gschema.xml.in index 8e2b40b9..1201c8a6 100644 --- a/timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in +++ b/timerapplet/org.mate.panel.applet.timer.gschema.xml.in @@ -2,19 +2,19 @@ <schema id="org.mate.panel.applet.timer"> <key name="name" type="s"> <default>'Timer'</default> - <_summary>Name of timer</_summary> + <summary>Name of timer</summary> </key> <key name="duration" type="i"> <default>10</default> - <_summary>Duration of timer in seconds</_summary> + <summary>Duration of timer in seconds</summary> </key> <key name="show-notification" type="b"> <default>true</default> - <_summary>Show notification popup when timer finish</_summary> + <summary>Show notification popup when timer finish</summary> </key> <key name="show-dialog" type="b"> <default>false</default> - <_summary>Show dialog window when timer finish</_summary> + <summary>Show dialog window when timer finish</summary> </key> </schema> </schemalist> |