diff options
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | libmatekbd/Makefile.am | 12 | ||||
| -rw-r--r-- | libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in | 124 | ||||
| -rw-r--r-- | libmatekbd/org.mate.peripherals-keyboard-xkb.gschema.xml.in.in | 124 | ||||
| -rw-r--r-- | po/POTFILES.in | 2 |
5 files changed, 133 insertions, 132 deletions
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 @@ +<schemalist gettext-domain="@GETTEXT_PACKAGE@"> + <schema id="org.mate.peripherals-keyboard-xkb" path="/org/mate/desktop/peripherals/keyboard/"> + <child name="kbd" schema="org.mate.peripherals-keyboard-xkb.kbd"/> + <child name="general" schema="org.mate.peripherals-keyboard-xkb.general"/> + <child name="preview" schema="org.mate.peripherals-keyboard-xkb.preview"/> + <child name="indicator" schema="org.mate.peripherals-keyboard-xkb.indicator"/> + </schema> + <schema id="org.mate.peripherals-keyboard-xkb.kbd" path="/org/mate/desktop/peripherals/keyboard/kbd/"> + <key name="model" type="s"> + <default>''</default> + <summary>Keyboard model</summary> + <description>keyboard model</description> + </key> + <key name="layouts" type="as"> + <default>[]</default> + <summary>Keyboard layout</summary> + <description>keyboard layout</description> + </key> + <key name="options" type="as"> + <default>[]</default> + <summary>Keyboard options</summary> + <description>Keyboard options</description> + </key> + </schema> + <schema id="org.mate.peripherals-keyboard-xkb.general" path="/org/mate/desktop/peripherals/keyboard/general/"> + <key name="update-handlers" type="as"> + <default>[]</default> + <summary>Keyboard Update Handlers</summary> + <description>A collection of scripts to run whenever the keyboard state is reloaded. Useful for re-applying xmodmap based adjustments</description> + </key> + <key name="known-file-list" type="as"> + <default>[]</default> + <summary>modmap file list</summary> + <description>A list of modmap files available in the $HOME directory.</description> + </key> + <key name="default-group" type="i"> + <default>-1</default> + <summary>Default group, assigned on window creation</summary> + <description>Default group, assigned on window creation</description> + </key> + <key name="group-per-window" type="b"> + <default>true</default> + <summary>Keep and manage separate group per window</summary> + <description>Keep and manage separate group per window</description> + </key> + <key name="handle-indicators" type="b"> + <default>false</default> + <summary>Save/restore indicators together with layout groups</summary> + <description>Save/restore indicators together with layout groups</description> + </key> + <key name="layout-names-as-group-names" type="b"> + <default>true</default> + <summary>Show layout names instead of group names</summary> + <description>Show layout names instead of group names (only for versions of XFree supporting multiple layouts)</description> + </key> + <key name="load-extra-items" type="b"> + <default>false</default> + <summary>Load extra configuration items</summary> + <description>Load exotic, rarely used layouts and options</description> + </key> + <key name="disable-sysconfig-changed-warning" type="b"> + <default>false</default> + <summary>Suppress the "X sysconfig changed" warning message</summary> + <description>Suppress the "X sysconfig changed" warning message</description> + </key> + <key name="disable-indicator" type="b"> + <default>false</default> + <summary>Allow to disable the keyboard indicator tray icon</summary> + <description>Allow to disable the keyboard indicator tray icon</description> + </key> + <key name="duplicate-leds" type="b"> + <default>false</default> + <summary>Show keyboard leds indicator</summary> + <description>Show keyboard leds indicator</description> + </key> + </schema> + <schema id="org.mate.peripherals-keyboard-xkb.preview" path="/org/mate/desktop/peripherals/keyboard/preview/"> + <key name="x" type="i"> + <default>-1</default> + <summary>The Keyboard Preview, X offset</summary> + <description>The Keyboard Preview, X offset</description> + </key> + <key name="y" type="i"> + <default>-1</default> + <summary>The Keyboard Preview, Y offset</summary> + <description>The Keyboard Preview, Y offset</description> + </key> + <key name="width" type="i"> + <default>-1</default> + <summary>The Keyboard Preview, width</summary> + <description>The Keyboard Preview, width</description> + </key> + <key name="height" type="i"> + <default>-1</default> + <summary>The Keyboard Preview, height</summary> + <description>The Keyboard Preview, height</description> + </key> + </schema> + <schema id="org.mate.peripherals-keyboard-xkb.indicator" path="/org/mate/desktop/peripherals/keyboard/indicator/"> + <key name="secondary" type="i"> + <default>0</default> + <summary>Secondary groups</summary> + <description>Secondary groups</description> + </key> + <key name="show-flags" type="b"> + <default>false</default> + </key> + <key name="font-family" type="s"> + <default>''</default> + <summary>The font</summary> + <description>The font for the layout indicator. This should be in "[FAMILY-LIST] [STYLE-OPTIONS] [SIZE]" format.</description> + </key> + <key name="foreground-color" type="s"> + <default>''</default> + <summary>The foreground color</summary> + <description>The foreground color for the layout indicator. This should be in "R G B" format, for example "255 0 0".</description> + </key> + <key name="background-color" type="s"> + <default>''</default> + <summary>The background color</summary> + <description>The background color for the layout indicator. This should be in "R G B" format, for example "255 0 0".</description> + </key> + </schema> +</schemalist> 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 @@ -<schemalist gettext-domain="@GETTEXT_PACKAGE@"> - <schema id="org.mate.peripherals-keyboard-xkb" path="/org/mate/desktop/peripherals/keyboard/"> - <child name="kbd" schema="org.mate.peripherals-keyboard-xkb.kbd"/> - <child name="general" schema="org.mate.peripherals-keyboard-xkb.general"/> - <child name="preview" schema="org.mate.peripherals-keyboard-xkb.preview"/> - <child name="indicator" schema="org.mate.peripherals-keyboard-xkb.indicator"/> - </schema> - <schema id="org.mate.peripherals-keyboard-xkb.kbd" path="/org/mate/desktop/peripherals/keyboard/kbd/"> - <key name="model" type="s"> - <default>''</default> - <_summary>Keyboard model</_summary> - <_description>keyboard model</_description> - </key> - <key name="layouts" type="as"> - <default>[]</default> - <_summary>Keyboard layout</_summary> - <_description>keyboard layout</_description> - </key> - <key name="options" type="as"> - <default>[]</default> - <_summary>Keyboard options</_summary> - <_description>Keyboard options</_description> - </key> - </schema> - <schema id="org.mate.peripherals-keyboard-xkb.general" path="/org/mate/desktop/peripherals/keyboard/general/"> - <key name="update-handlers" type="as"> - <default>[]</default> - <_summary>Keyboard Update Handlers</_summary> - <_description>A collection of scripts to run whenever the keyboard state is reloaded. Useful for re-applying xmodmap based adjustments</_description> - </key> - <key name="known-file-list" type="as"> - <default>[]</default> - <_summary>modmap file list</_summary> - <_description>A list of modmap files available in the $HOME directory.</_description> - </key> - <key name="default-group" type="i"> - <default>-1</default> - <_summary>Default group, assigned on window creation</_summary> - <_description>Default group, assigned on window creation</_description> - </key> - <key name="group-per-window" type="b"> - <default>true</default> - <_summary>Keep and manage separate group per window</_summary> - <_description>Keep and manage separate group per window</_description> - </key> - <key name="handle-indicators" type="b"> - <default>false</default> - <_summary>Save/restore indicators together with layout groups</_summary> - <_description>Save/restore indicators together with layout groups</_description> - </key> - <key name="layout-names-as-group-names" type="b"> - <default>true</default> - <_summary>Show layout names instead of group names</_summary> - <_description>Show layout names instead of group names (only for versions of XFree supporting multiple layouts)</_description> - </key> - <key name="load-extra-items" type="b"> - <default>false</default> - <_summary>Load extra configuration items</_summary> - <_description>Load exotic, rarely used layouts and options</_description> - </key> - <key name="disable-sysconfig-changed-warning" type="b"> - <default>false</default> - <_summary>Suppress the "X sysconfig changed" warning message</_summary> - <_description>Suppress the "X sysconfig changed" warning message</_description> - </key> - <key name="disable-indicator" type="b"> - <default>false</default> - <_summary>Allow to disable the keyboard indicator tray icon</_summary> - <_description>Allow to disable the keyboard indicator tray icon</_description> - </key> - <key name="duplicate-leds" type="b"> - <default>false</default> - <_summary>Show keyboard leds indicator</_summary> - <_description>Show keyboard leds indicator</_description> - </key> - </schema> - <schema id="org.mate.peripherals-keyboard-xkb.preview" path="/org/mate/desktop/peripherals/keyboard/preview/"> - <key name="x" type="i"> - <default>-1</default> - <_summary>The Keyboard Preview, X offset</_summary> - <_description>The Keyboard Preview, X offset</_description> - </key> - <key name="y" type="i"> - <default>-1</default> - <_summary>The Keyboard Preview, Y offset</_summary> - <_description>The Keyboard Preview, Y offset</_description> - </key> - <key name="width" type="i"> - <default>-1</default> - <_summary>The Keyboard Preview, width</_summary> - <_description>The Keyboard Preview, width</_description> - </key> - <key name="height" type="i"> - <default>-1</default> - <_summary>The Keyboard Preview, height</_summary> - <_description>The Keyboard Preview, height</_description> - </key> - </schema> - <schema id="org.mate.peripherals-keyboard-xkb.indicator" path="/org/mate/desktop/peripherals/keyboard/indicator/"> - <key name="secondary" type="i"> - <default>0</default> - <_summary>Secondary groups</_summary> - <_description>Secondary groups</_description> - </key> - <key name="show-flags" type="b"> - <default>false</default> - </key> - <key name="font-family" type="s"> - <default>''</default> - <_summary>The font</_summary> - <_description>The font for the layout indicator. This should be in "[FAMILY-LIST] [STYLE-OPTIONS] [SIZE]" format.</_description> - </key> - <key name="foreground-color" type="s"> - <default>''</default> - <_summary>The foreground color</_summary> - <_description>The foreground color for the layout indicator. This should be in "R G B" format, for example "255 0 0".</_description> - </key> - <key name="background-color" type="s"> - <default>''</default> - <_summary>The background color</_summary> - <_description>The background color for the layout indicator. This should be in "R G B" format, for example "255 0 0".</_description> - </key> - </schema> -</schemalist> 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 |