From d2c557097250a57ce81281a6113bcbe417bad0ee Mon Sep 17 00:00:00 2001 From: infirit Date: Sun, 6 Sep 2015 20:43:52 +0200 Subject: Rework gsettings schema building * Bump intltool required version for gsettings support * Extract strings with intltool directly * Let autoconf generate the xml files --- configure.ac | 3 +- libmatekbd/Makefile.am | 12 +- ...rg.mate.peripherals-keyboard-xkb.gschema.xml.in | 124 +++++++++++++++++++++ ...mate.peripherals-keyboard-xkb.gschema.xml.in.in | 124 --------------------- po/POTFILES.in | 2 +- 5 files changed, 133 insertions(+), 132 deletions(-) create mode 100644 libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in delete mode 100644 libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.in diff --git a/configure.ac b/configure.ac index d264ff2..24c96eb 100644 --- a/configure.ac +++ b/configure.ac @@ -75,7 +75,7 @@ AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE", [Gettext package]) AM_GLIB_GNU_GETTEXT -IT_PROG_INTLTOOL([0.35.0]) +IT_PROG_INTLTOOL([0.50.1]) # ***************************************************************************** @@ -130,5 +130,6 @@ libmatekbd.pc libmatekbdui.pc po/Makefile.in libmatekbd/Makefile +libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml test/Makefile ]) diff --git a/libmatekbd/Makefile.am b/libmatekbd/Makefile.am index f94ae7c..a6a0a06 100644 --- a/libmatekbd/Makefile.am +++ b/libmatekbd/Makefile.am @@ -75,20 +75,20 @@ noinst_HEADERS = $(extra_nih) \ matekbd-config-private.h @INTLTOOL_XML_NOMERGE_RULE@ -gsettings_SCHEMAS = org.mate.peripherals-keyboard-xkb.gschema.xml +gsettingsschema_in_files = org.mate.peripherals-keyboard-xkb.gschema.xml.in +gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml) @GSETTINGS_RULES@ -%.gschema.xml.in: %.gschema.xml.in.in Makefile - $(AM_V_GEN) $(SED) -e 's^\@datadir\@^$(datadir)^g' -e 's^\@GETTEXT_PACKAGE\@^$(GETTEXT_PACKAGE)^g' < $< > $@ - convertdir = $(datadir)/MateConf/gsettings convert_DATA = matekbd.convert EXTRA_DIST = matekbd-indicator-marshal.list \ matekbd-keyboard-drawing-marshal.list \ - $(gsettings_SCHEMAS).in.in $(convert_DATA) $(ui_DATA) + $(gsettingsschema_in_files) \ + $(convert_DATA) \ + $(ui_DATA) -DISTCLEANFILES = $(gsettings_SCHEMAS).in $(gsettings_SCHEMAS) +DISTCLEANFILES = $(gsettings_SCHEMAS) GLIB_GENMARSHAL = $(shell pkg-config --variable=glib_genmarshal glib-2.0) diff --git a/libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in b/libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in new file mode 100644 index 0000000..abbe803 --- /dev/null +++ b/libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in @@ -0,0 +1,124 @@ + + + + + + + + + + '' + Keyboard model + keyboard model + + + [] + Keyboard layout + keyboard layout + + + [] + Keyboard options + Keyboard options + + + + + [] + Keyboard Update Handlers + A collection of scripts to run whenever the keyboard state is reloaded. Useful for re-applying xmodmap based adjustments + + + [] + modmap file list + A list of modmap files available in the $HOME directory. + + + -1 + Default group, assigned on window creation + Default group, assigned on window creation + + + true + Keep and manage separate group per window + Keep and manage separate group per window + + + false + Save/restore indicators together with layout groups + Save/restore indicators together with layout groups + + + true + Show layout names instead of group names + Show layout names instead of group names (only for versions of XFree supporting multiple layouts) + + + false + Load extra configuration items + Load exotic, rarely used layouts and options + + + false + Suppress the "X sysconfig changed" warning message + Suppress the "X sysconfig changed" warning message + + + false + Allow to disable the keyboard indicator tray icon + Allow to disable the keyboard indicator tray icon + + + false + Show keyboard leds indicator + Show keyboard leds indicator + + + + + -1 + The Keyboard Preview, X offset + The Keyboard Preview, X offset + + + -1 + The Keyboard Preview, Y offset + The Keyboard Preview, Y offset + + + -1 + The Keyboard Preview, width + The Keyboard Preview, width + + + -1 + The Keyboard Preview, height + The Keyboard Preview, height + + + + + 0 + Secondary groups + Secondary groups + + + false + + + '' + The font + The font for the layout indicator. This should be in "[FAMILY-LIST] [STYLE-OPTIONS] [SIZE]" format. + + + '' + The foreground color + The foreground color for the layout indicator. This should be in "R G B" format, for example "255 0 0". + + + '' + The background color + The background color for the layout indicator. This should be in "R G B" format, for example "255 0 0". + + + diff --git a/libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.in b/libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.in deleted file mode 100644 index 9224053..0000000 --- a/libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.in +++ /dev/null @@ -1,124 +0,0 @@ - - - - - - - - - - '' - <_summary>Keyboard model - <_description>keyboard model - - - [] - <_summary>Keyboard layout - <_description>keyboard layout - - - [] - <_summary>Keyboard options - <_description>Keyboard options - - - - - [] - <_summary>Keyboard Update Handlers - <_description>A collection of scripts to run whenever the keyboard state is reloaded. Useful for re-applying xmodmap based adjustments - - - [] - <_summary>modmap file list - <_description>A list of modmap files available in the $HOME directory. - - - -1 - <_summary>Default group, assigned on window creation - <_description>Default group, assigned on window creation - - - true - <_summary>Keep and manage separate group per window - <_description>Keep and manage separate group per window - - - false - <_summary>Save/restore indicators together with layout groups - <_description>Save/restore indicators together with layout groups - - - true - <_summary>Show layout names instead of group names - <_description>Show layout names instead of group names (only for versions of XFree supporting multiple layouts) - - - false - <_summary>Load extra configuration items - <_description>Load exotic, rarely used layouts and options - - - false - <_summary>Suppress the "X sysconfig changed" warning message - <_description>Suppress the "X sysconfig changed" warning message - - - false - <_summary>Allow to disable the keyboard indicator tray icon - <_description>Allow to disable the keyboard indicator tray icon - - - false - <_summary>Show keyboard leds indicator - <_description>Show keyboard leds indicator - - - - - -1 - <_summary>The Keyboard Preview, X offset - <_description>The Keyboard Preview, X offset - - - -1 - <_summary>The Keyboard Preview, Y offset - <_description>The Keyboard Preview, Y offset - - - -1 - <_summary>The Keyboard Preview, width - <_description>The Keyboard Preview, width - - - -1 - <_summary>The Keyboard Preview, height - <_description>The Keyboard Preview, height - - - - - 0 - <_summary>Secondary groups - <_description>Secondary groups - - - false - - - '' - <_summary>The font - <_description>The font for the layout indicator. This should be in "[FAMILY-LIST] [STYLE-OPTIONS] [SIZE]" format. - - - '' - <_summary>The foreground color - <_description>The foreground color for the layout indicator. This should be in "R G B" format, for example "255 0 0". - - - '' - <_summary>The background color - <_description>The background color for the layout indicator. This should be in "R G B" format, for example "255 0 0". - - - diff --git a/po/POTFILES.in b/po/POTFILES.in index 5bcf3ca..a5e7fff 100644 --- a/po/POTFILES.in +++ b/po/POTFILES.in @@ -5,6 +5,6 @@ libmatekbd/matekbd-keyboard-drawing.c libmatekbd/matekbd-keyboard-config.c libmatekbd/matekbd-status.c libmatekbd/matekbd-util.c -libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.in +[type: gettext/gsettings]libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in [type: gettext/glade]libmatekbd/show-layout.ui test/matekbd-indicator-test.c -- cgit v1.2.1