diff options
| -rw-r--r-- | data/CMakeLists.txt | 8 | ||||
| -rw-r--r-- | data/org.ayatana.indicator.keyboard.gschema.xml.in | 19 | ||||
| -rw-r--r-- | src/service.c | 36 |
3 files changed, 61 insertions, 2 deletions
diff --git a/data/CMakeLists.txt b/data/CMakeLists.txt index 39bd0458..35bbfd54 100644 --- a/data/CMakeLists.txt +++ b/data/CMakeLists.txt @@ -53,3 +53,11 @@ install(FILES org.ayatana.indicator.keyboard.AccountsService.policy DESTINATION # 50-org.ayatana.indicator.keyboard.AccountsService.pkla install(FILES 50-org.ayatana.indicator.keyboard.AccountsService.pkla DESTINATION "${CMAKE_INSTALL_FULL_LOCALSTATEDIR}/lib/polkit-1/localauthority/10-vendor.d") + +# org.ayatana.indicator.keyboard.gschema.xml + +find_package (Intltool REQUIRED) +set (ENV{LC_ALL} "C") +intltool_merge_translations ("${CMAKE_CURRENT_SOURCE_DIR}/org.ayatana.indicator.keyboard.gschema.xml.in" "${CMAKE_CURRENT_BINARY_DIR}/org.ayatana.indicator.keyboard.gschema.xml" ALL UTF8 STYLE "xml" NO_TRANSLATIONS) +find_package (GSettings REQUIRED) +add_schema ("org.ayatana.indicator.keyboard.gschema.xml") diff --git a/data/org.ayatana.indicator.keyboard.gschema.xml.in b/data/org.ayatana.indicator.keyboard.gschema.xml.in new file mode 100644 index 00000000..e80a89e9 --- /dev/null +++ b/data/org.ayatana.indicator.keyboard.gschema.xml.in @@ -0,0 +1,19 @@ +<schemalist> + <schema gettext-domain="@GETTEXT_PACKAGE@" id="org.ayatana.indicator.keyboard" path="/org/ayatana/indicator/keyboard/"> + <key name="language-icon-desktop" type="b"> + <default>true</default> + <_summary>Show the language icon in desktop mode.</_summary> + <_description>If enabled, the indicator shows the current layout icon. Otherwise, it displays a generic keyboard icon.</_description> + </key> + <key name="language-icon-phone" type="b"> + <default>false</default> + <_summary>Show the language icon in phone mode.</_summary> + <_description>If enabled, the indicator shows the current layout icon. Otherwise, it displays a generic keyboard icon.</_description> + </key> + <key name="language-icon-greeter" type="b"> + <default>false</default> + <_summary>Show the language icon in the greeter.</_summary> + <_description>If enabled, the indicator shows the current layout icon. Otherwise, it displays a generic keyboard icon.</_description> + </key> + </schema> +</schemalist> diff --git a/src/service.c b/src/service.c index ce4c0a80..3dabf5c9 100644 --- a/src/service.c +++ b/src/service.c @@ -76,6 +76,7 @@ struct _IndicatorKeyboardServicePrivate GSimpleAction *pLayoutAction; GMenu *pLayoutSection; Keyboard *pKeyboard; + GSettings *pSettings; }; typedef IndicatorKeyboardServicePrivate priv_t; @@ -90,8 +91,26 @@ static GVariant* createHeaderState(IndicatorKeyboardService *self, int nProfile) g_variant_builder_add(&cBuilder, "{sv}", "tooltip", g_variant_new_string(_("Keyboard layout switcher and settings"))); g_variant_builder_add(&cBuilder, "{sv}", "visible", g_variant_new_boolean(TRUE)); + gchar *sKey = NULL; + + if (nProfile == PROFILE_DESKTOP) + { + sKey = "language-icon-desktop"; + } + else if (nProfile == PROFILE_PHONE) + { + sKey = "language-icon-phone"; + } + else if (nProfile == PROFILE_GREETER) + { + sKey = "language-icon-greeter"; + } + + gboolean bLayout = g_settings_get_boolean (self->pPrivate->pSettings, sKey); GIcon *pIcon = NULL; - if (ayatana_common_utils_is_lomiri()) { + + if (bLayout == FALSE) + { pIcon = g_themed_icon_new_with_default_fallbacks(ICON_DEFAULT); } else @@ -395,6 +414,12 @@ static void onDispose(GObject *pObject) { IndicatorKeyboardService *self = INDICATOR_KEYBOARD_SERVICE(pObject); + if (self->pPrivate->pSettings != NULL) + { + g_signal_handlers_disconnect_by_data (self->pPrivate->pSettings, self); + g_clear_object (&self->pPrivate->pSettings); + } + if (self->pPrivate->pKeyboard != NULL) { g_object_unref(G_OBJECT(self->pPrivate->pKeyboard)); @@ -435,6 +460,12 @@ static void onDispose(GObject *pObject) G_OBJECT_CLASS(indicator_keyboard_service_parent_class)->dispose(pObject); } +static void onSettingsChanged(GSettings *pSettings, gchar *sKey, gpointer pData) +{ + IndicatorKeyboardService *self = INDICATOR_KEYBOARD_SERVICE(pData); + rebuildNow(self, SECTION_HEADER); +} + static void indicator_keyboard_service_init(IndicatorKeyboardService *self) { gchar *sLib = "libayatana-keyboard-x11.so.0"; @@ -464,9 +495,10 @@ static void indicator_keyboard_service_init(IndicatorKeyboardService *self) m_fnKeyboardGetNumLayouts = dlsym(m_pLibHandle, "keyboard_GetNumLayouts"); m_fnKeyboardGetLayout = dlsym(m_pLibHandle, "keyboard_GetLayout"); m_fnKeyboardSetLayout = dlsym(m_pLibHandle, "keyboard_SetLayout"); - self->pPrivate = indicator_keyboard_service_get_instance_private(self); self->pPrivate->pCancellable = g_cancellable_new(); + self->pPrivate->pSettings = g_settings_new ("org.ayatana.indicator.keyboard"); + g_signal_connect(self->pPrivate->pSettings, "changed", G_CALLBACK(onSettingsChanged), self); self->pPrivate->pKeyboard = m_fnKeyboardNew(); g_signal_connect(self->pPrivate->pKeyboard, KEYBOARD_LAYOUT_CHANGED, G_CALLBACK(onLayoutChanged), self); g_signal_connect(self->pPrivate->pKeyboard, KEYBOARD_CONFIG_CHANGED, G_CALLBACK(onConfigChanged), self); |