From df7a7488950139e3884972e2363294051e33d45d Mon Sep 17 00:00:00 2001 From: infirit Date: Sun, 6 Sep 2015 21:55:35 +0200 Subject: Rework gsettings schema building * Bump intltool required version for gsettings support * Extract strings with intltool directly * Let autoconf generate the xml files --- battstat/Makefile.am | 10 +- .../org.mate.panel.applet.battstat.gschema.xml.in | 49 ++++++++ ...rg.mate.panel.applet.battstat.gschema.xml.in.in | 49 -------- charpick/Makefile.am | 10 +- .../org.mate.panel.applet.charpick.gschema.xml.in | 14 +++ ...rg.mate.panel.applet.charpick.gschema.xml.in.in | 14 --- command/Makefile.am | 10 +- .../org.mate.panel.applet.command.gschema.xml.in | 24 ++++ ...org.mate.panel.applet.command.gschema.xml.in.in | 24 ---- configure.ac | 10 +- cpufreq/Makefile.am | 9 +- .../org.mate.panel.applet.cpufreq.gschema.xml.in | 20 ++++ ...org.mate.panel.applet.cpufreq.gschema.xml.in.in | 20 ---- geyes/Makefile.am | 10 +- geyes/org.mate.panel.applet.geyes.gschema.xml.in | 9 ++ .../org.mate.panel.applet.geyes.gschema.xml.in.in | 9 -- multiload/Makefile.am | 10 +- .../org.mate.panel.applet.multiload.gschema.xml.in | 125 +++++++++++++++++++++ ...g.mate.panel.applet.multiload.gschema.xml.in.in | 125 --------------------- po/POTFILES.in | 16 +-- stickynotes/Makefile.am | 10 +- stickynotes/org.mate.stickynotes.gschema.xml.in | 69 ++++++++++++ stickynotes/org.mate.stickynotes.gschema.xml.in.in | 69 ------------ timerapplet/Makefile.am | 10 +- .../org.mate.panel.applet.timer.gschema.xml.in | 20 ++++ .../org.mate.panel.applet.timer.gschema.xml.in.in | 20 ---- 26 files changed, 378 insertions(+), 387 deletions(-) create mode 100644 battstat/org.mate.panel.applet.battstat.gschema.xml.in delete mode 100644 battstat/org.mate.panel.applet.battstat.gschema.xml.in.in create mode 100644 charpick/org.mate.panel.applet.charpick.gschema.xml.in delete mode 100644 charpick/org.mate.panel.applet.charpick.gschema.xml.in.in create mode 100644 command/org.mate.panel.applet.command.gschema.xml.in delete mode 100644 command/org.mate.panel.applet.command.gschema.xml.in.in create mode 100644 cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in delete mode 100644 cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in.in create mode 100644 geyes/org.mate.panel.applet.geyes.gschema.xml.in delete mode 100644 geyes/org.mate.panel.applet.geyes.gschema.xml.in.in create mode 100644 multiload/org.mate.panel.applet.multiload.gschema.xml.in delete mode 100644 multiload/org.mate.panel.applet.multiload.gschema.xml.in.in create mode 100644 stickynotes/org.mate.stickynotes.gschema.xml.in delete mode 100644 stickynotes/org.mate.stickynotes.gschema.xml.in.in create mode 100644 timerapplet/org.mate.panel.applet.timer.gschema.xml.in delete mode 100644 timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in 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 @@ + + + + 15 + Red value level + The battery level below which the battery is displayed as red. Also the value at which the low battery warning is displayed. + + + false + Warn on low time rather than low percentage + Use the value defined in red_value as a time remaining to show the warning dialog rather than a percentage. + + + true + Low Battery Notification + Notify user when the battery is low. + + + false + Full Battery Notification + Notify user when the battery is full. + + + false + Beep for warnings + Beep when displaying a warning. + + + false + Drain from top + Show the battery meter draining from the top of the battery. Only implemented for traditional battery view. + + + true + Upright (small) battery + Show the upright, smaller battery on the panel. + + + false + Show the horizontal battery + Show the traditional, horizontal battery on the panel. + + + 0 + Show the time/percent label + 0 for no label, 1 for percentage and 2 for time remaining. + + + 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 @@ - - - - 15 - <_summary>Red value level - <_description>The battery level below which the battery is displayed as red. Also the value at which the low battery warning is displayed. - - - false - <_summary>Warn on low time rather than low percentage - <_description>Use the value defined in red_value as a time remaining to show the warning dialog rather than a percentage. - - - true - <_summary>Low Battery Notification - <_description>Notify user when the battery is low. - - - false - <_summary>Full Battery Notification - <_description>Notify user when the battery is full. - - - false - <_summary>Beep for warnings - <_description>Beep when displaying a warning. - - - false - <_summary>Drain from top - <_description>Show the battery meter draining from the top of the battery. Only implemented for traditional battery view. - - - true - <_summary>Upright (small) battery - <_description>Show the upright, smaller battery on the panel. - - - false - <_summary>Show the horizontal battery - <_description>Show the traditional, horizontal battery on the panel. - - - 0 - <_summary>Show the time/percent label - <_description>0 for no label, 1 for percentage and 2 for time remaining. - - - 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 @@ + + + + '' + Characters shown on applet startup + The string that the user had selected when the applet was last used. This string will be displayed when the user starts the applet. + + + [] + List of available palettes + List of strings containing the available palettes. + + + 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 @@ - - - - '' - <_summary>Characters shown on applet startup - <_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. - - - [] - <_summary>List of available palettes - <_description>List of strings containing the available palettes. - - - 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 @@ + + + + 'date +%T' + Command to execute + Command/script to execute to get the output + + + 1 + Interval for the command + Interval to execute the command (in seconds) + + + 60 + Width of output + Number of characters to display + + + false + Show icon + If applet icon is shown or not + + + 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 @@ - - - - 'date +%T' - <_summary>Command to execute - <_description>Command/script to execute to get the output - - - 1 - <_summary>Interval for the command - <_description>Interval to execute the command (in seconds) - - - 60 - <_summary>Width of output - <_description>Number of characters to display - - - false - <_summary>Show icon - <_description>If applet icon is shown or not - - - 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 b/cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in new file mode 100644 index 00000000..7f306a7e --- /dev/null +++ b/cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in @@ -0,0 +1,20 @@ + + + + + 0 + CPU to Monitor + Set the CPU to monitor. In a single processor system you don't have to change it. + + + 2 + Mode to show cpu usage + A 0 value means to show the applet in graphic mode (pixmap only), 1 to show the applet in text mode (not to show the pixmap) and 2 to show the applet in graphic and text mode. + + + 1 + The type of text to display (if the text is enabled). + A 0 value means to show cpu frequency, 1 to show frequency and units, and 2 to show percentage instead of frequency. + + + diff --git a/cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in.in b/cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in.in deleted file mode 100644 index 7f306a7e..00000000 --- a/cpufreq/org.mate.panel.applet.cpufreq.gschema.xml.in.in +++ /dev/null @@ -1,20 +0,0 @@ - - - - - 0 - CPU to Monitor - Set the CPU to monitor. In a single processor system you don't have to change it. - - - 2 - Mode to show cpu usage - A 0 value means to show the applet in graphic mode (pixmap only), 1 to show the applet in text mode (not to show the pixmap) and 2 to show the applet in graphic and text mode. - - - 1 - The type of text to display (if the text is enabled). - A 0 value means to show cpu frequency, 1 to show frequency and units, and 2 to show percentage instead of frequency. - - - 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 b/geyes/org.mate.panel.applet.geyes.gschema.xml.in new file mode 100644 index 00000000..aad28f71 --- /dev/null +++ b/geyes/org.mate.panel.applet.geyes.gschema.xml.in @@ -0,0 +1,9 @@ + + + + '' + Directory in which the theme is located + Directory in which the theme is located + + + diff --git a/geyes/org.mate.panel.applet.geyes.gschema.xml.in.in b/geyes/org.mate.panel.applet.geyes.gschema.xml.in.in deleted file mode 100644 index c551fb6a..00000000 --- a/geyes/org.mate.panel.applet.geyes.gschema.xml.in.in +++ /dev/null @@ -1,9 +0,0 @@ - - - - '' - <_summary>Directory in which the theme is located - <_description>Directory in which the theme is located - - - 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 b/multiload/org.mate.panel.applet.multiload.gschema.xml.in new file mode 100644 index 00000000..7ea422ea --- /dev/null +++ b/multiload/org.mate.panel.applet.multiload.gschema.xml.in @@ -0,0 +1,125 @@ + + + + true + Enable CPU load graph + + + false + Enable memory load graph + + + false + Enable network load graph + + + false + Enable swap load graph + + + false + Enable load average graph + + + false + Enable disk load graph + + + 500 + Applet refresh rate in milliseconds + + + 40 + Graph size + For horizontal panels, the width of the graphs in pixels. For vertical panels, this is the height of the graphs. + + + '#0072b3' + Graph color for user-related CPU activity + + + '#0092e6' + Graph color for system-related CPU activity + + + '#00a3ff' + Graph color for nice-related CPU activity + + + '#002f3d' + Graph color for iowait related CPU activity + + + '#000000' + CPU graph background color + + + '#00b35b' + Graph color for user-related memory usage + + + '#00e675' + Graph color for shared memory + + + '#00ff82' + Graph color for buffer memory + + + '#AAF5D0' + Graph color for cached memory + + + '#000000' + Memory graph background color + + + '#fce94f' + Graph color for input network activity + + + '#edd400' + Graph color for output network activity + + + '#c4a000' + Graph color for loopback network usage + + + '#000000' + Network graph background color + + + '#8b00c3' + Graph color for user-related swap usage + + + '#000000' + Swap graph background color + + + '#d50000' + Graph color for load average + + + '#000000' + Load graph background color + + + '#C65000' + Graph color for disk read + + + '#FF6700' + Graph color for disk write + + + '#000000' + Background color for disk load graph + + + 'mate-system-monitor.desktop' + The desktop description file to execute as the system monitor + + + diff --git a/multiload/org.mate.panel.applet.multiload.gschema.xml.in.in b/multiload/org.mate.panel.applet.multiload.gschema.xml.in.in deleted file mode 100644 index 7ea422ea..00000000 --- a/multiload/org.mate.panel.applet.multiload.gschema.xml.in.in +++ /dev/null @@ -1,125 +0,0 @@ - - - - true - Enable CPU load graph - - - false - Enable memory load graph - - - false - Enable network load graph - - - false - Enable swap load graph - - - false - Enable load average graph - - - false - Enable disk load graph - - - 500 - Applet refresh rate in milliseconds - - - 40 - Graph size - For horizontal panels, the width of the graphs in pixels. For vertical panels, this is the height of the graphs. - - - '#0072b3' - Graph color for user-related CPU activity - - - '#0092e6' - Graph color for system-related CPU activity - - - '#00a3ff' - Graph color for nice-related CPU activity - - - '#002f3d' - Graph color for iowait related CPU activity - - - '#000000' - CPU graph background color - - - '#00b35b' - Graph color for user-related memory usage - - - '#00e675' - Graph color for shared memory - - - '#00ff82' - Graph color for buffer memory - - - '#AAF5D0' - Graph color for cached memory - - - '#000000' - Memory graph background color - - - '#fce94f' - Graph color for input network activity - - - '#edd400' - Graph color for output network activity - - - '#c4a000' - Graph color for loopback network usage - - - '#000000' - Network graph background color - - - '#8b00c3' - Graph color for user-related swap usage - - - '#000000' - Swap graph background color - - - '#d50000' - Graph color for load average - - - '#000000' - Load graph background color - - - '#C65000' - Graph color for disk read - - - '#FF6700' - Graph color for disk write - - - '#000000' - Background color for disk load graph - - - 'mate-system-monitor.desktop' - The desktop description file to execute as the system monitor - - - 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 @@ + + + + 100 + Default width for new notes + Default width for new sticky notes in pixels. + + + 100 + Default height for new notes + Default height for new sticky notes in pixels. + + + '#ECF833' + Default color for new notes + Default color for new sticky notes. This should be in html hex specification, for example "#30FF50". + + + '#000000' + Default color for font + Default font color for new sticky notes. This should be in html hex specification, for example "#000000". + + + 'Sans 10' + Default font for new notes + Default font for new sticky notes. This should be a Pango Font Name, for example "Sans Italic 10". + + + true + Sticky notes' workspace stickyness + Specifies whether the sticky notes are visible on ALL workspaces on the desktop, or not. + + + false + Sticky notes' locked state + Specifies whether the sticky notes are locked (non-editable) or not. + + + '%x' + Date format of note's title + 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. + + + true + Whether to use the default system color + If this option is disabled, a custom color can be used as the default color for all sticky notes. + + + true + Whether to use the default system font + If this option is disabled, a custom font can be used as the default font for all sticky notes. + + + false + Whether to force the default color and font on all notes + If this option is enabled, the custom colors and fonts that have been assigned to individual notes will be ignored. + + + true + Whether to hide all notes when the desktop is selected + If this option is enabled, selecting the desktop in any way will automatically hide all the open notes. + + + true + Whether to ask for confirmation when deleting a note + Empty notes are always deleted without confirmation. + + + 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 @@ - - - - 100 - <_summary>Default width for new notes - <_description>Default width for new sticky notes in pixels. - - - 100 - <_summary>Default height for new notes - <_description>Default height for new sticky notes in pixels. - - - '#ECF833' - <_summary>Default color for new notes - <_description>Default color for new sticky notes. This should be in html hex specification, for example "#30FF50". - - - '#000000' - <_summary>Default color for font - <_description>Default font color for new sticky notes. This should be in html hex specification, for example "#000000". - - - 'Sans 10' - <_summary>Default font for new notes - <_description>Default font for new sticky notes. This should be a Pango Font Name, for example "Sans Italic 10". - - - true - <_summary>Sticky notes' workspace stickyness - <_description>Specifies whether the sticky notes are visible on ALL workspaces on the desktop, or not. - - - false - <_summary>Sticky notes' locked state - <_description>Specifies whether the sticky notes are locked (non-editable) or not. - - - '%x' - <_summary>Date format of note's title - <_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. - - - true - <_summary>Whether to use the default system color - <_description>If this option is disabled, a custom color can be used as the default color for all sticky notes. - - - true - <_summary>Whether to use the default system font - <_description>If this option is disabled, a custom font can be used as the default font for all sticky notes. - - - false - <_summary>Whether to force the default color and font on all notes - <_description>If this option is enabled, the custom colors and fonts that have been assigned to individual notes will be ignored. - - - true - <_summary>Whether to hide all notes when the desktop is selected - <_description>If this option is enabled, selecting the desktop in any way will automatically hide all the open notes. - - - true - <_summary>Whether to ask for confirmation when deleting a note - <_description>Empty notes are always deleted without confirmation. - - - 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 b/timerapplet/org.mate.panel.applet.timer.gschema.xml.in new file mode 100644 index 00000000..1201c8a6 --- /dev/null +++ b/timerapplet/org.mate.panel.applet.timer.gschema.xml.in @@ -0,0 +1,20 @@ + + + + 'Timer' + Name of timer + + + 10 + Duration of timer in seconds + + + true + Show notification popup when timer finish + + + false + Show dialog window when timer finish + + + diff --git a/timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in b/timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in deleted file mode 100644 index 8e2b40b9..00000000 --- a/timerapplet/org.mate.panel.applet.timer.gschema.xml.in.in +++ /dev/null @@ -1,20 +0,0 @@ - - - - 'Timer' - <_summary>Name of timer - - - 10 - <_summary>Duration of timer in seconds - - - true - <_summary>Show notification popup when timer finish - - - false - <_summary>Show dialog window when timer finish - - - -- cgit v1.2.1