From bcf861f9a00d1e6e67616eee898291e1ed6cca36 Mon Sep 17 00:00:00 2001 From: infirit Date: Tue, 8 Sep 2015 11:51:41 +0200 Subject: Rework gsettings schema building * Bump intltool required version for gsettings support * Extract strings with intltool directly * Let autoconf generate the xml files --- Makefile.am | 15 +++---- configure.ac | 4 +- org.mate.control-center.gschema.xml.in | 47 ++++++++++++++++++++++ org.mate.control-center.gschema.xml.in.in | 47 ---------------------- org.mate.control-center.keybinding.gschema.xml.in | 19 +++++++++ ...ate.control-center.keybinding.gschema.xml.in.in | 19 --------- po/POTFILES.in | 4 +- 7 files changed, 77 insertions(+), 78 deletions(-) create mode 100644 org.mate.control-center.gschema.xml.in delete mode 100644 org.mate.control-center.gschema.xml.in.in create mode 100644 org.mate.control-center.keybinding.gschema.xml.in delete mode 100644 org.mate.control-center.keybinding.gschema.xml.in.in diff --git a/Makefile.am b/Makefile.am index 4feaf0ba..58d51686 100644 --- a/Makefile.am +++ b/Makefile.am @@ -14,13 +14,12 @@ SUBDIRS += typing-break endif @INTLTOOL_XML_NOMERGE_RULE@ -gsettings_SCHEMAS = \ - org.mate.control-center.gschema.xml \ - org.mate.control-center.keybinding.gschema.xml -@GSETTINGS_RULES@ +gsettingsschema_in_files = \ + org.mate.control-center.gschema.xml.in \ + org.mate.control-center.keybinding.gschema.xml.in -%.gschema.xml.in: %.gschema.xml.in.in Makefile - $(AM_V_GEN) $(SED) -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ +gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml) +@GSETTINGS_RULES@ convertdir = $(datadir)/MateConf/gsettings convert_DATA = mate-control-center.convert @@ -28,7 +27,6 @@ convert_DATA = mate-control-center.convert ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS} CLEANFILES = \ - $(gsettings_SCHEMAS_in) \ $(gsettings_SCHEMAS) \ *.gschema.valid @@ -53,8 +51,7 @@ MAINTAINERCLEANFILES = \ EXTRA_DIST = \ autogen.sh \ - org.mate.control-center.gschema.xml.in.in \ - org.mate.control-center.keybinding.gschema.xml.in.in \ + $(gsettingsschema_in_files) \ $(convert_DATA) DISTCHECK_CONFIGURE_FLAGS = --disable-update-mimedb diff --git a/configure.ac b/configure.ac index f9d9d105..3646a63d 100644 --- a/configure.ac +++ b/configure.ac @@ -27,7 +27,7 @@ changequote([,])dnl # Internationalization support -IT_PROG_INTLTOOL([0.37.1]) +IT_PROG_INTLTOOL([0.50.1]) GETTEXT_PACKAGE=mate-control-center AC_SUBST(GETTEXT_PACKAGE) @@ -327,6 +327,8 @@ fi AC_CONFIG_FILES([ Makefile +org.mate.control-center.gschema.xml +org.mate.control-center.keybinding.gschema.xml capplets/Makefile capplets/about-me/Makefile capplets/about-me/mate-about-me.desktop.in diff --git a/org.mate.control-center.gschema.xml.in b/org.mate.control-center.gschema.xml.in new file mode 100644 index 00000000..e8546185 --- /dev/null +++ b/org.mate.control-center.gschema.xml.in @@ -0,0 +1,47 @@ + + + + + [ 'Change Theme;mate-appearance-properties.desktop', 'Set Preferred Applications;mate-default-applications-properties.desktop' ] + Task names and associated .desktop files + The task name to be displayed in the control-center followed by a ";" separator then the filename of an associated .desktop file to launch for that task. + + + false + Close the control-center when a task is activated + if true, the control-center will close when a "Common Task" is activated. + + + false + Exit shell on start action performed + Indicates whether to close the shell when a start action is performed. + + + false + Exit shell on help action performed + Indicates whether to close the shell when a help action is performed. + + + false + Exit shell on add or remove action performed + Indicates whether to close the shell when an add or remove action is performed. + + + false + Exit shell on upgrade or uninstall action performed + Indicates whether to close the shell when an upgrade or uninstall action is performed. + + + + + 'http://mate-desktop.org/backgrounds/' + More backgrounds URL + URL for where to get more desktop backgrounds. If set to an empty string the link will not appear. + + + 'http://mate-desktop.org/themes/' + More themes URL + URL for where to get more desktop themes. If set to an empty string the link will not appear. + + + diff --git a/org.mate.control-center.gschema.xml.in.in b/org.mate.control-center.gschema.xml.in.in deleted file mode 100644 index 89760b08..00000000 --- a/org.mate.control-center.gschema.xml.in.in +++ /dev/null @@ -1,47 +0,0 @@ - - - - - <_default l10n="messages">[ 'Change Theme;mate-appearance-properties.desktop', 'Set Preferred Applications;mate-default-applications-properties.desktop' ] - <_summary>Task names and associated .desktop files - <_description>The task name to be displayed in the control-center followed by a ";" separator then the filename of an associated .desktop file to launch for that task. - - - false - <_summary>Close the control-center when a task is activated - <_description>if true, the control-center will close when a "Common Task" is activated. - - - false - <_summary>Exit shell on start action performed - <_description>Indicates whether to close the shell when a start action is performed. - - - false - <_summary>Exit shell on help action performed - <_description>Indicates whether to close the shell when a help action is performed. - - - false - <_summary>Exit shell on add or remove action performed - <_description>Indicates whether to close the shell when an add or remove action is performed. - - - false - <_summary>Exit shell on upgrade or uninstall action performed - <_description>Indicates whether to close the shell when an upgrade or uninstall action is performed. - - - - - 'http://mate-desktop.org/backgrounds/' - <_summary>More backgrounds URL - <_description>URL for where to get more desktop backgrounds. If set to an empty string the link will not appear. - - - 'http://mate-desktop.org/themes/' - <_summary>More themes URL - <_description>URL for where to get more desktop themes. If set to an empty string the link will not appear. - - - diff --git a/org.mate.control-center.keybinding.gschema.xml.in b/org.mate.control-center.keybinding.gschema.xml.in new file mode 100644 index 00000000..b06beb73 --- /dev/null +++ b/org.mate.control-center.keybinding.gschema.xml.in @@ -0,0 +1,19 @@ + + + + '' + Keybinding + Keybinding associated with a custom shortcut. + + + '' + Command + Command associated with a custom keybinding. + + + '' + Name + Description associated with a custom keybinding. + + + diff --git a/org.mate.control-center.keybinding.gschema.xml.in.in b/org.mate.control-center.keybinding.gschema.xml.in.in deleted file mode 100644 index acecc6b2..00000000 --- a/org.mate.control-center.keybinding.gschema.xml.in.in +++ /dev/null @@ -1,19 +0,0 @@ - - - - '' - <_summary>Keybinding - <_description>Keybinding associated with a custom shortcut. - - - '' - <_summary>Command - <_description>Command associated with a custom keybinding. - - - '' - <_summary>Name - <_description>Description associated with a custom keybinding. - - - diff --git a/po/POTFILES.in b/po/POTFILES.in index 797c4e64..93fa69d5 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -1,8 +1,8 @@ # Add files with translateable strings here. # Please keep this file sorted alphabetically. [encoding: UTF-8] -org.mate.control-center.gschema.xml.in.in -org.mate.control-center.keybinding.gschema.xml.in.in +[type: gettext/gsettings]org.mate.control-center.gschema.xml.in +[type: gettext/gsettings]org.mate.control-center.keybinding.gschema.xml.in capplets/about-me/eel-alert-dialog.c capplets/about-me/e-image-chooser.c capplets/about-me/mate-about-me.c -- cgit v1.2.1