From bd184344a0a21cadc3278cbdb1280e6f258fb40d Mon Sep 17 00:00:00 2001 From: piotr Date: Tue, 19 Mar 2024 02:21:27 +0100 Subject: [PATCH] simplify sway side --- nwg_panel/config.py | 11 ++++------- nwg_panel/glade/config_keyboard_layout.glade | 2 +- 2 files changed, 5 insertions(+), 8 deletions(-) diff --git a/nwg_panel/config.py b/nwg_panel/config.py index 32b2e25..5809848 100644 --- a/nwg_panel/config.py +++ b/nwg_panel/config.py @@ -2193,7 +2193,6 @@ class EditorWrapper(object): check_key(self.panel, "keyboard-layout", {}) settings = self.panel["keyboard-layout"] defaults = { - "keyboard-device-sway": "", "keyboard-device-hyprland": "", "root-css-name": "root-executor", "css-name": "executor", @@ -2221,9 +2220,9 @@ class EditorWrapper(object): self.kl_combo_device = builder.get_object("device") if sway: - from i3ipc import Connection - i3 = Connection() - inputs = i3.get_inputs() + # from i3ipc import Connection + # i3 = Connection() + # inputs = i3.get_inputs() self.kl_combo_device.append("", voc["all"]) # for i in inputs: # if i.type == "keyboard": @@ -2273,9 +2272,7 @@ class EditorWrapper(object): def update_keyboard_layout(self): settings = self.panel["keyboard-layout"] - if sway: - settings["keyboard-device-sway"] = self.kl_combo_device.get_active_id() - elif hyprland: + if hyprland: settings["keyboard-device-hyprland"] = self.kl_combo_device.get_active_id() settings["tooltip-text"] = self.kl_tooltip_text.get_text() settings["root-css-name"] = self.kl_root_css_name.get_text() diff --git a/nwg_panel/glade/config_keyboard_layout.glade b/nwg_panel/glade/config_keyboard_layout.glade index 1d8c0b6..0a6f710 100644 --- a/nwg_panel/glade/config_keyboard_layout.glade +++ b/nwg_panel/glade/config_keyboard_layout.glade @@ -24,7 +24,7 @@ False start <span size="small"><b>Note:</b> on sway switching layouts for a certain keyboard device does not work. -We will be switching for just 'type:keyboard' ¯\_(•_•)_/¯</span> +We will be switching for devices of 'type:keyboard' ¯\_(•_•)_/¯</span> True