Added options for enabling or disabling the switch-windows and switch…

CoverflowAltTab@dmo60.de/keybinder.js

@@ -36,15 +36,22 @@ class AbstractKeybinder {
 }
 
 var Keybinder330Api = class Keybinder330Api extends AbstractKeybinder {
-    enable(startAppSwitcherBind) {
+    constructor(...args) {
+        super(...args);
+
+        this._startAppSwitcherBind = null;
+    }
+
+    enable(startAppSwitcherBind, platform) {
         let Shell = imports.gi.Shell;
         let mode = Shell.ActionMode ? Shell.ActionMode : Shell.KeyBindingMode;
-        Main.wm.setCustomKeybindingHandler('switch-applications', mode.NORMAL, startAppSwitcherBind);
-        Main.wm.setCustomKeybindingHandler('switch-windows', mode.NORMAL, startAppSwitcherBind);
+
+        this._startAppSwitcherBind = startAppSwitcherBind;
+
+        platform.addSettingsChangedCallback(this._onSettingsChanged.bind(this));
+
         Main.wm.setCustomKeybindingHandler('switch-group', mode.NORMAL, startAppSwitcherBind);
         Main.wm.setCustomKeybindingHandler('switch-panels', mode.NORMAL, startAppSwitcherBind);
-        Main.wm.setCustomKeybindingHandler('switch-applications-backward', mode.NORMAL, startAppSwitcherBind);
-        Main.wm.setCustomKeybindingHandler('switch-windows-backward', mode.NORMAL, startAppSwitcherBind);
         Main.wm.setCustomKeybindingHandler('switch-group-backward', mode.NORMAL, startAppSwitcherBind);
     }
 
@@ -59,4 +66,24 @@ var Keybinder330Api = class Keybinder330Api extends AbstractKeybinder {
         Main.wm.setCustomKeybindingHandler('switch-windows-backward', mode.NORMAL, Main.wm._startSwitcher.bind(Main.wm));
         Main.wm.setCustomKeybindingHandler('switch-group-backward', mode.NORMAL, Main.wm._startSwitcher.bind(Main.wm));
     }
+
+    _onSettingsChanged(settings) {
+        let Shell = imports.gi.Shell;
+        let mode = Shell.ActionMode ? Shell.ActionMode : Shell.KeyBindingMode;
+        if (settings.get_boolean('bind-to-switch-applications')) {
+            Main.wm.setCustomKeybindingHandler('switch-applications', mode.NORMAL, this._startAppSwitcherBind);
+            Main.wm.setCustomKeybindingHandler('switch-applications-backward', mode.NORMAL, this._startAppSwitcherBind);
+        } else {
+            Main.wm.setCustomKeybindingHandler('switch-applications', mode.NORMAL, Main.wm._startSwitcher.bind(Main.wm));
+            Main.wm.setCustomKeybindingHandler('switch-applications-backward', mode.NORMAL, Main.wm._startSwitcher.bind(Main.wm));
+        }
+        if (settings.get_boolean('bind-to-switch-windows')) {
+            log("binding to switch windows");
+            Main.wm.setCustomKeybindingHandler('switch-windows', mode.NORMAL, this._startAppSwitcherBind);
+            Main.wm.setCustomKeybindingHandler('switch-windows-backward', mode.NORMAL, this._startAppSwitcherBind);
+        } else {
+            Main.wm.setCustomKeybindingHandler('switch-windows', mode.NORMAL, Main.wm._startSwitcher.bind(Main.wm));
+            Main.wm.setCustomKeybindingHandler('switch-windows-backward', mode.NORMAL, Main.wm._startSwitcher.bind(Main.wm));
+        }
+    }
 }

CoverflowAltTab@dmo60.de/manager.js

@@ -65,7 +65,7 @@ var Manager = class Manager {
 
     enable() {
         this.platform.enable();
-        this.keybinder.enable(this._startWindowSwitcher.bind(this));
+        this.keybinder.enable(this._startWindowSwitcher.bind(this), this.platform);
     }
 
     disable() {

CoverflowAltTab@dmo60.de/platform.js

@@ -84,6 +84,8 @@ class AbstractPlatform {
             switch_per_monitor: false,
             preview_to_monitor_ratio: 50,
             preview_scaling_factor: 75,
+            bind_to_switch_applications: true,
+            bind_to_switch_windows: true,
         };
     }
 
@@ -115,11 +117,14 @@ var PlatformGnomeShell = class PlatformGnomeShell extends AbstractPlatform {
         this._connections = null;
         this._extensionSettings = null;
         this._desktopSettings = null;
+        this._settings_changed_callbacks = null;
     }
 
     enable() {
         this.disable();
 
+        this._settings_changed_callbacks = [];
+
         if (this._extensionSettings == null)
             this._extensionSettings = ExtensionImports.lib.getSettings(SHELL_SCHEMA);
 
@@ -144,6 +149,8 @@ var PlatformGnomeShell = class PlatformGnomeShell extends AbstractPlatform {
             "switcher-style",
             "preview-to-monitor-ratio",
             "preview-scaling-factor",
+            "bind-to-switch-applications",
+            "bind-to-switch-windows",
         ];
 
         let dkeys = [
@@ -198,10 +205,19 @@ var PlatformGnomeShell = class PlatformGnomeShell extends AbstractPlatform {
         return this._settings;
     }
 
+    addSettingsChangedCallback(cb) {
+        cb(this._extensionSettings);
+        this._settings_changed_callbacks.push(cb);
+    }
+
     _onSettingsChanged() {
         this._settings = null;
+        for (let cb of this._settings_changed_callbacks) {
+            cb(this._extensionSettings);
+        }
     }
 
+
     _loadSettings() {
         try {
             let settings = this._extensionSettings;
@@ -226,6 +242,8 @@ var PlatformGnomeShell = class PlatformGnomeShell extends AbstractPlatform {
                 switch_per_monitor: settings.get_boolean("switch-per-monitor"),
                 preview_to_monitor_ratio: clamp(settings.get_int("preview-to-monitor-ratio") / 100, 0, 1),
                 preview_scaling_factor: clamp(settings.get_int("preview-scaling-factor") / 100, 0, 1),
+                bind_to_switch_applications: settings.get_boolean("bind-to-switch-applications"),
+                bind_to_switch_windows: settings.get_boolean("bind-to-switch-windows"),
             };
         } catch (e) {
             global.log(e);

CoverflowAltTab@dmo60.de/prefs.js

@@ -129,6 +129,8 @@ function buildPrefsWidget() {
 	}]
 	frame.append(buildComboBox("current-workspace-only", options, _("Show windows from current or all workspaces")));
 	frame.append(buildSwitcher("switch-per-monitor", _("Only switch between windows on current monitor")));
+	frame.append(buildSwitcher("bind-to-switch-applications", _("Bind to switch-applications keybinding")));
+	frame.append(buildSwitcher("bind-to-switch-windows", _("Bind to switch-windows keybinding")));
 
 	return frame;
 }

CoverflowAltTab@dmo60.de/schemas/org.gnome.shell.extensions.coverflowalttab.gschema.xml

@@ -127,5 +127,15 @@
         <summary>In Coverflow Switcher, scales the previews as they spread out to the sides in </summary>
         <description>Define the scale factor successively applied each step away from the current preview.</description>
     </key>
+    <key type="b" name="bind-to-switch-applications">
+        <default>true</default>
+        <summary>Bind to 'switch-applications' keybinding</summary>
+        <description>Whether or not to bind to the 'switch-applications' keybinding.</description>
+    </key>
+    <key type="b" name="bind-to-switch-windows">
+        <default>true</default>
+        <summary>Bind to 'switch-windows' keybinding</summary>
+        <description>Whether or not to bind to the 'switch-windows' keybinding.</description>
+    </key>
   </schema>
 </schemalist>