[Xfce4-commits] [apps/xfce4-screensaver] 381/425: Add missing org.xfce.peripherals-keyboard-xkb.gschema.xml
noreply at xfce.org
noreply at xfce.org
Mon Oct 15 01:53:48 CEST 2018
This is an automated email from the git hooks/post-receive script.
b l u e s a b r e p u s h e d a c o m m i t t o b r a n c h m a s t e r
in repository apps/xfce4-screensaver.
commit d9e48ad7b970efee205b5c0560ac777104a90b73
Author: Sean Davis <smd.seandavis at gmail.com>
Date: Mon Oct 8 20:37:41 2018 -0400
Add missing org.xfce.peripherals-keyboard-xkb.gschema.xml
---
.gitignore | 1 +
data/Makefile.am | 2 +-
data/lock-dialog-default.ui | 5 +-
...rg.xfce.peripherals-keyboard-xkb.gschema.xml.in | 59 ++++++++++++++++++++++
po/POTFILES.in | 1 +
src/xfcekbd-indicator-config.c | 3 --
src/xfcekbd-keyboard-config.c | 18 -------
src/xfcekbd-keyboard-config.h | 1 -
8 files changed, 63 insertions(+), 27 deletions(-)
diff --git a/.gitignore b/.gitignore
index 7873b3d..690cbc1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,3 +87,4 @@ src/xfce4-screensaver.desktop.in
src/xfcekbd-indicator-marshal.h
stamp-h1
po/xfce4-screensaver.pot
+*~
diff --git a/data/Makefile.am b/data/Makefile.am
index 4f9de3b..b2eba9b 100644
--- a/data/Makefile.am
+++ b/data/Makefile.am
@@ -43,7 +43,7 @@ dbussessionservice_DATA = org.xfce.ScreenSaver.service
@GSETTINGS_RULES@
@INTLTOOL_XML_NOMERGE_RULE@
-gsettingsschema_in_files = org.xfce.screensaver.gschema.xml.in
+gsettingsschema_in_files = org.xfce.screensaver.gschema.xml.in org.xfce.peripherals-keyboard-xkb.gschema.xml.in
gsettings_SCHEMAS = $(gsettingsschema_in_files:.xml.in=.xml)
EXTRA_DIST = \
diff --git a/data/lock-dialog-default.ui b/data/lock-dialog-default.ui
index 7d3839f..fff9cf4 100644
--- a/data/lock-dialog-default.ui
+++ b/data/lock-dialog-default.ui
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<!-- Generated with glade 3.22.1 -->
<interface>
- <requires lib="gtk+" version="3.14"/>
+ <requires lib="gtk+" version="3.20"/>
<object class="GtkBox" id="lock-dialog">
<property name="visible">True</property>
<property name="can_focus">False</property>
@@ -133,7 +133,6 @@
<object class="GtkLabel" id="status-message-label">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="label" translatable="yes">1</property>
<property name="wrap">True</property>
</object>
<packing>
@@ -146,7 +145,6 @@
<object class="GtkLabel" id="auth-prompt-label">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="label" translatable="yes">2</property>
<property name="xalign">0.5</property>
<property name="yalign">0.5</property>
</object>
@@ -172,7 +170,6 @@
<object class="GtkLabel" id="auth-status-label">
<property name="can_focus">False</property>
<property name="no_show_all">True</property>
- <property name="label" translatable="yes">3</property>
</object>
<packing>
<property name="expand">False</property>
diff --git a/data/org.xfce.peripherals-keyboard-xkb.gschema.xml.in b/data/org.xfce.peripherals-keyboard-xkb.gschema.xml.in
new file mode 100644
index 0000000..09d4549
--- /dev/null
+++ b/data/org.xfce.peripherals-keyboard-xkb.gschema.xml.in
@@ -0,0 +1,59 @@
+<schemalist gettext-domain="@GETTEXT_PACKAGE@">
+ <schema id="org.xfce.peripherals-keyboard-xkb" path="/org/xfce/desktop/peripherals/keyboard/">
+ <child name="kbd" schema="org.xfce.peripherals-keyboard-xkb.kbd"/>
+ <child name="general" schema="org.xfce.peripherals-keyboard-xkb.general"/>
+ <child name="indicator" schema="org.xfce.peripherals-keyboard-xkb.indicator"/>
+ </schema>
+ <schema id="org.xfce.peripherals-keyboard-xkb.general" path="/org/xfce/desktop/peripherals/keyboard/general/">
+ <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>
+ </schema>
+ <schema id="org.xfce.peripherals-keyboard-xkb.indicator" path="/org/xfce/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 dc7e058..776e4fc 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -3,6 +3,7 @@
data/images/cosmos/cosmos.xml.in.in
[type: gettext/glade]data/lock-dialog-default.ui
[type: gettext/gsettings]data/org.xfce.screensaver.gschema.xml.in
+[type: gettext/gsettings]data/org.xfce.peripherals-keyboard-xkb.gschema.xml.in
data/xfce4-screensaver-preferences.desktop.in
[type: gettext/glade]data/xfce4-screensaver-preferences.ui
data/xfce4-screensaver.directory.in
diff --git a/src/xfcekbd-indicator-config.c b/src/xfcekbd-indicator-config.c
index 40070ff..c4f9254 100644
--- a/src/xfcekbd-indicator-config.c
+++ b/src/xfcekbd-indicator-config.c
@@ -45,9 +45,6 @@ const gchar XFCEKBD_INDICATOR_CONFIG_KEY_FONT_FAMILY[] = "font-family";
const gchar XFCEKBD_INDICATOR_CONFIG_KEY_FOREGROUND_COLOR[] = "foreground-color";
const gchar XFCEKBD_INDICATOR_CONFIG_KEY_BACKGROUND_COLOR[] = "background-color";
-#define SYSTEM_FONT_SCHEMA "org.xfce.interface"
-#define SYSTEM_FONT_KEY "font-name"
-
/*
* static applet config functions
*/
diff --git a/src/xfcekbd-keyboard-config.c b/src/xfcekbd-keyboard-config.c
index 010d529..26cbd68 100644
--- a/src/xfcekbd-keyboard-config.c
+++ b/src/xfcekbd-keyboard-config.c
@@ -32,20 +32,6 @@
/*
* XfcekbdKeyboardConfig
*/
-#define XFCEKBD_KEYBOARD_CONFIG_SCHEMA XFCEKBD_CONFIG_SCHEMA ".kbd"
-
-#define GROUP_SWITCHERS_GROUP "grp"
-#define DEFAULT_GROUP_SWITCH "grp:shift_caps_toggle"
-
-const gchar XFCEKBD_KEYBOARD_CONFIG_KEY_MODEL[] = "model";
-const gchar XFCEKBD_KEYBOARD_CONFIG_KEY_LAYOUTS[] = "layouts";
-const gchar XFCEKBD_KEYBOARD_CONFIG_KEY_OPTIONS[] = "options";
-
-const gchar *XFCEKBD_KEYBOARD_CONFIG_ACTIVE[] = {
- XFCEKBD_KEYBOARD_CONFIG_KEY_MODEL,
- XFCEKBD_KEYBOARD_CONFIG_KEY_LAYOUTS,
- XFCEKBD_KEYBOARD_CONFIG_KEY_OPTIONS
-};
/*
* extern common functions
@@ -175,7 +161,6 @@ xfcekbd_keyboard_config_init (XfcekbdKeyboardConfig * kbd_config,
XklEngine * engine)
{
memset (kbd_config, 0, sizeof (*kbd_config));
- kbd_config->settings = g_settings_new (XFCEKBD_KEYBOARD_CONFIG_SCHEMA);
kbd_config->engine = engine;
}
@@ -188,9 +173,6 @@ xfcekbd_keyboard_config_term (XfcekbdKeyboardConfig * kbd_config)
kbd_config->layouts_variants = NULL;
g_strfreev (kbd_config->options);
kbd_config->options = NULL;
-
- g_object_unref (kbd_config->settings);
- kbd_config->settings = NULL;
}
void
diff --git a/src/xfcekbd-keyboard-config.h b/src/xfcekbd-keyboard-config.h
index 05d1e38..0e766df 100644
--- a/src/xfcekbd-keyboard-config.h
+++ b/src/xfcekbd-keyboard-config.h
@@ -39,7 +39,6 @@ struct _XfcekbdKeyboardConfig {
gchar **options;
/* private, transient */
- GSettings *settings;
int config_listener_id;
XklEngine *engine;
};
--
To stop receiving notification emails like this one, please contact
the administrator of this repository.
More information about the Xfce4-commits
mailing list