Some fixes

Author: mtwebster

files/usr/share/cinnamon/applets/[email protected]/applet.js

@@ -227,7 +227,7 @@ class CinnamonKeyboardApplet extends Applet.IconApplet {
             }
 
             const menuItem = new LayoutMenuItem(
-                () => source.activate(),
+                () => source.activate(true),
                 actor, source.displayName
             );
 
@@ -308,6 +308,15 @@ class CinnamonKeyboardApplet extends Applet.IconApplet {
         // }
     }
 
+    _setPanelIBusLabel(label) {
+        let actor = new St.Label({
+            text: label,
+            style_class: "applet-label"
+        });
+
+        this._panel_icon_box.set_child(actor);
+    }
+
     _updatePropertySection(properties) {
         // this._propSeparator.hide();
         this._propSection.actor.hide();
@@ -336,12 +345,11 @@ class CinnamonKeyboardApplet extends Applet.IconApplet {
                     text = prop.get_symbol().get_text();
                 else
                     text = prop.get_label().get_text();
-
                 let currentSource = this._manager.currentSource;
                 if (currentSource) {
                     let indicatorLabel = this._layoutItems.get(currentSource);
                     if (text && text.length > 0 && text.length < 3)
-                        indicatorLabel.label.set_text(text);
+                        this._setPanelIBusLabel(text)
                 }
             }
 

files/usr/share/cinnamon/cinnamon-settings/bin/AddKeyboardLayout.py

@@ -43,8 +43,7 @@ def make_ibus_display_name(engine):
 class AddKeyboardLayoutDialog():
     def __init__(self, used_ids):
         self.input_source_settings = Gio.Settings(schema_id="org.cinnamon.desktop.input-sources")
-        self.used_ids = used_ids
-        self.loaded_ids = set()
+        self.used_ids = set(used_ids)
 
         builder = Gtk.Builder()
         builder.set_translation_domain('cinnamon')
@@ -195,10 +194,10 @@ def _load_layouts(self):
             self.add_xkb_row(None, layout)
 
     def add_xkb_row(self, lang_info, layout_id):
-        if layout_id in (self.used_ids, self.loaded_ids):
+        if layout_id in self.used_ids:
             return
 
-        self.loaded_ids.add(layout_id)
+        self.used_ids.add(layout_id)
 
         got, display_name, short_name, layout, variant = self.xkb_info.get_layout_info(layout_id)
         if got:
@@ -209,10 +208,10 @@ def add_ibus_row(self, ibus_info):
 
         if layout_id.startswith("xkb:"):
             return
-        if layout_id in self.loaded_ids:
+        if layout_id in self.used_ids:
             return
 
-        self.loaded_ids.add(layout_id)
+        self.used_ids.add(layout_id)
 
         display_name = make_ibus_display_name(ibus_info)
         self.layouts_store.append((layout_id, display_name, "ibus", ibus_info.get_layout(), ibus_info.get_layout_variant()))

files/usr/share/cinnamon/cinnamon-settings/bin/InputSources.py

@@ -298,6 +298,11 @@ def _on_proxy_ready(self, obj, result, data=None):
     def _on_proxy_signal(self, proxy, sender_name, signal_name, parameters):
         if signal_name == "InputSourcesChanged":
             self.refresh_input_source_list()
+        elif signal_name == "CurrentInputSourceChanged":
+            new_active = parameters[0]
+            for source in self._sources:
+                source.active = new_active == source.id
+            self.items_changed(0, len(self._sources), len(self._sources))
 
     def _on_cinnamon_state_changed(self, proxy, pspec, data=None):
         # If Cinnamon crashes, this will happen, reload our sources using xkb and ibus.
@@ -356,7 +361,7 @@ def refresh_input_source_list(self):
         self.items_changed(0, len(old_layouts), len(new_layouts))
 
     def show_add_layout_dialog(self):
-        used_ids = [source.xkbid for source in self._sources]
+        used_ids = [source.id for source in self._sources]
         add_dialog = AddKeyboardLayout.AddKeyboardLayoutDialog(used_ids)
         add_dialog.dialog.show_all()
         ret = add_dialog.dialog.run()

js/ui/cinnamonDBus.js

@@ -142,6 +142,9 @@ const CinnamonIface =
             <method name="ActivateInputSourceIndex"> \
                 <arg type="i" direction="in" name="index"/> \
             </method> \
+            <signal name="CurrentInputSourceChanged"> \
+                <arg type="s" direction="out" /> \
+            </signal> \
             <signal name="InputSourcesChanged"/> \
         </interface> \
     </node>';
@@ -570,6 +573,10 @@ CinnamonDBus.prototype = {
         is_mgr.activateInputSourceIndex(index);
     },
 
+    EmitCurrentInputSourceChanged: function(id) {
+        this._dbusImpl.emit_signal('CurrentInputSourceChanged', GLib.Variant.new('(s)', [id]));
+    },
+
     EmitInputSourcesChanged: function() {
         this._dbusImpl.emit_signal('InputSourcesChanged', null);
     },

js/ui/keyboardManager.js

@@ -419,7 +419,6 @@ class InputSourceSwitcher extends SwitcherPopup.SwitcherList {
 
         if (this.show_flags) {
             const file = Gio.file_new_for_path(getFlagFileName(name));
-            global.log(file.get_path());
             if (file.query_exists(null)) {
                 const icon = new SubscriptableFlagIcon({
                     style_class: 'input-source-switcher-flag-icon',
@@ -693,6 +692,7 @@ var InputSourceManager = class {
         [oldSource, this._currentSource] = [this._currentSource, newSource];
 
         this.emit('current-source-changed', oldSource);
+        Main.cinnamonDBusService.EmitCurrentInputSourceChanged(newSource.id);
 
         for (let i = 1; i < this._mruSources.length; ++i) {
             if (this._mruSources[i] == newSource) {
@@ -709,7 +709,7 @@ var InputSourceManager = class {
 
         try {
             let is = this._inputSources[index];
-            this.activateInputSource(is, false);
+            this.activateInputSource(is, true);
         } catch (e) {
             global.logError(`Could not activate input source index: ${index}`);
         }
@@ -942,7 +942,6 @@ var InputSourceManager = class {
             return;
 
         source.properties = props;
-        global.log(source.properties);
 
         if (source == this._currentSource)
             this.emit('current-source-changed', null);