Store xkb_layout and xkb_variant in correct values

Author: Sunderland93

debian/changelog

@@ -0,0 +1,38 @@
+sway-input-config (1.1.3-1~kinetic) kinetic; urgency=medium
+
+  * Store keyboard layout and variant in
+    correct values
+
+ -- Aleksey Samoilov <[email protected]>  Sun, 15 Jan 2023 19:32:23 +0400
+
+sway-input-config (1.1.1-1~kinetic) kinetic; urgency=medium
+
+  * Set app_id to "sway-input-config"
+
+ -- Aleksey Samoilov <[email protected]>  Thu, 06 Oct 2022 12:07:03 +0400
+
+sway-input-config (1.1.0-1~kinetic) kinetic; urgency=medium
+
+  * Use setuptools directive to install data_files
+  * Refactoring mouse tab
+  * Refactoring touchpad tab
+  * Added option to set keyboard model
+  * Fixed bunch of errors from FLAKE8
+
+ -- Aleksey Samoilov <[email protected]>  Wed, 28 Sep 2022 10:36:58 +0400
+
+sway-input-config (1.1.0-1~kinetic) kinetic; urgency=medium
+
+  * Use setuptools directive to install data_files
+  * Refactoring mouse tab
+  * Refactoring touchpad tab
+  * Added option to set keyboard model
+  * Fixed bunch of errors from FLAKE8
+
+ -- Aleksey Samoilov <[email protected]>  Wed, 28 Sep 2022 10:33:25 +0400
+
+sway-input-config (1.0.0-1~kinetic) kinetic; urgency=medium
+
+  * Initial release. (Closes: #nnnn)  <nnnn is the bug number of your ITP>
+
+ -- Aleksey Samoilov <[email protected]>  Wed, 14 Sep 2022 22:22:12 +0400

debian/control

@@ -0,0 +1,23 @@
+Source: sway-input-config
+Section: x11
+Priority: optional
+Maintainer: Aleksey Samoilov <[email protected]>
+Rules-Requires-Root: no
+Build-Depends:
+ debhelper-compat (= 13), dh-python, python3-setuptools, python3
+Standards-Version: 4.6.1
+Homepage: https://github.com/Sunderland93/sway-input-config
+
+Package: sway-input-config
+Architecture: any
+Depends:
+ ${python3:Depends},
+ ${misc:Depends},
+ python3-i3ipc,
+ python3-pyside2.qtwidgets,
+ python3-pyside2.qtcore,
+ python3-pyside2.qtgui
+Description: Input devices configurator for Sway
+ Input devices configurator for SwayWM, written in Python and Qt5/PySide2,
+ inspired by nwg-shell-config. It uses standard libinput options
+ to configure keyboard, touchpad and pointer devices.

debian/copyright

@@ -0,0 +1,43 @@
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Source: <url://example.com>
+Upstream-Name: sway-input-config
+Upstream-Contact: <preferred name and address to reach the upstream project>
+
+Files:
+ *
+Copyright:
+ <years> <put author's name and email here>
+ <years> <likewise for another author>
+License: GPL-3.0+
+
+Files:
+ debian/*
+Copyright:
+ 2022 Aleksey Samoilov <[email protected]>
+License: GPL-3.0+
+
+License: GPL-3.0+
+ This program is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+ .
+ This package is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
+Comment:
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+# Please also look if there are files or directories which have a
+# different copyright/license attached and list them here.
+# Please avoid picking licenses with terms that are more restrictive than the
+# packaged work, as it may make Debian's contributions unacceptable upstream.
+#
+# If you need, there are some extra license texts available in two places:
+#   /usr/share/debhelper/dh_make/licenses/
+#   /usr/share/common-licenses/

debian/files

@@ -0,0 +1 @@
+sway-input-config_1.1.1-1~kinetic_source.buildinfo x11 optional

debian/rules

@@ -0,0 +1,4 @@
+#!/usr/bin/make -f
+
+%:
+	dh $@ --with python3 --buildsystem=pybuild

debian/source/format

@@ -0,0 +1 @@
+3.0 (quilt)

sway_input_config/data/layouts.json

@@ -0,0 +1,100 @@
+{
+    "English (US)": "us",
+    "Dari": "af",
+    "Arabic": "ara",
+    "Albanian": "al",
+    "Armenian": "am",
+    "German (Austria)": "at",
+    "English (Australian)": "au",
+    "Azerbaijani": "az",
+    "Belarusian": "by",
+    "Belgian": "be",
+    "Bangla": "bd",
+    "Indian": "in",
+    "Bosnian": "ba",
+    "Portuguese (Brazil)": "br",
+    "Bulgarian": "bg",
+    "Berber (Algeria, Latin)": "dz",
+    "Arabic (Morocco)": "ma",
+    "English (Cameroon)": "cm",
+    "Burmese": "mm",
+    "French (Canada)": "ca",
+    "French (Democratic Republic of the Congo)": "cd",
+    "Chinese": "cn",
+    "Croatian": "hr",
+    "Czech": "cz",
+    "Danish": "dk",
+    "Dutch": "nl",
+    "Dzongkha": "bt",
+    "Estonian": "ee",
+    "Persian": "ir",
+    "Iraqi": "iq",
+    "Faroese": "fo",
+    "Finnish": "fi",
+    "French": "fr",
+    "English (Ghana)": "gh",
+    "N'Ko (AZERTY)": "gn",
+    "Georgian": "ge",
+    "German": "de",
+    "Greek": "gr",
+    "Hungarian": "hu",
+    "Icelandic": "is",
+    "Hebrew": "il",
+    "Italian": "it",
+    "Japanese": "jp",
+    "Kyrgyz": "kg",
+    "Khmer (Cambodia)": "kh",
+    "Kazakh": "kz",
+    "Lao": "la",
+    "Spanish (Latin American)": "latam",
+    "Lithuanian": "lt",
+    "Latvian": "lv",
+    "Maori": "mao",
+    "Montenegrin": "me",
+    "Macedonian": "mk",
+    "Maltese": "mt",
+    "Mongolian": "mn",
+    "Norwegian": "no",
+    "Polish": "pl",
+    "Portuguese": "pt",
+    "Romanian": "ro",
+    "Russian": "ru",
+    "Serbian": "rs",
+    "Slovenian": "si",
+    "Slovak": "sk",
+    "Spanish": "es",
+    "Swedish": "se",
+    "German (Switzerland)": "ch",
+    "Arabic (Syria)": "sy",
+    "Tajik": "tj",
+    "Sinhala (phonetic)": "lk",
+    "Thai": "th",
+    "Turkish": "tr",
+    "Taiwanese": "tw",
+    "Ukrainian": "ua",
+    "English (UK)": "gb",
+    "Uzbek": "uz",
+    "Vietnamese": "vn",
+    "Korean": "kr",
+    "Irish": "ie",
+    "Urdu (Pakistan)": "pk",
+    "Dhivehi": "mv",
+    "English (South Africa)": "za",
+    "Esperanto": "epo",
+    "Nepali": "np",
+    "English (Nigeria)": "ng",
+    "Amharic": "et",
+    "Wolof": "sn",
+    "Braille": "brai",
+    "Turkmen": "tm",
+    "Bambara": "ml",
+    "Swahili (Tanzania)": "tz",
+    "French (Togo)": "tg",
+    "Swahili (Kenya)": "ke",
+    "Tswana": "bw",
+    "Filipino": "ph",
+    "Moldavian": "md",
+    "Indonesian (Latin)": "id",
+    "Indonesian (Javanese)": "jv",
+    "Malay (Jawi, Arabic Keyboard)": "my"
+}

sway_input_config/main.py

@@ -25,16 +25,7 @@
 dir_name = os.path.dirname(__file__)
 shortcut_list = os.path.join(dir_name, "data/shortcuts.json")
 kbd_model_list = os.path.join(dir_name, "data/kbd_model.json")
-
-layout_list = ["af", "al", "am", "ara", "at", "au", "az", "ba", "bd", "be", "bg",
-               "br", "brai", "bt", "bw", "by", "ca", "cd", "ch", "cm", "cn", "cz",
-               "de", "dk", "dz", "ee", "epo", "es", "et", "fi", "fo", "fr", "gb",
-               "ge", "gh", "gn", "gr", "hr", "hu", "id", "ie", "il", "in", "iq", "ir",
-               "is", "it", "jp", "jv", "ke", "kg", "kh", "kr", "kz", "la", "latam",
-               "lk", "lt", "lv", "ma", "mao", "md", "me", "mk", "ml", "mm", "mn", "mt",
-               "mv", "my", "ng", "nl", "no", "np", "ph", "pk", "pl", "pt", "ro", "rs",
-               "ru", "se", "si", "sk", "sn", "sy", "tg", "th", "tj", "tm", "tr", "tw",
-               "tz", "ua", "us", "uz", "vn", "za"]
+layouts_list = os.path.join(dir_name, "data/layouts.json")
 
 
 class MainWindow(QMainWindow):
@@ -139,12 +130,17 @@ def __init__(self):
 
         self.layoutList = QComboBox()
         self.layoutList.setStyleSheet("QComboBox { combobox-popup: 0; }")
-        for item in layout_list:
-            self.layoutList.addItem(item)
+        layout = load_json(layouts_list)
+        for key, value in layout.items():
+            self.layoutList.addItem(key)
 
         self.layoutName = QLineEdit()
         self.layoutLabel = QLabel("Layout:")
-        self.layoutName.setText(settings["keyboard-layout"])
+        layout = load_json(layouts_list)
+        layout_list = []
+        for key, value in layout.items():
+            layout_list.append('{}'.format(','.join(settings["keyboard-layout"])))
+        self.layoutName.setText(layout_list[0])
 
         self.addBtn = QPushButton("Add")
         self.addBtn.setToolTip("Add selected layout to the list")
@@ -154,7 +150,9 @@ def __init__(self):
         self.labelVariant = QLabel("Variant:")
         self.variantName.setToolTip("Variant of the keyboard like 'dvorak' or 'colemak'.")
         self.variantName.setMaxLength(30)
-        self.variantName.setText(settings["keyboard-variant"])
+        variant_list = []
+        variant_list.append('{}'.format(','.join(settings["keyboard-variant"])))
+        self.variantName.setText(variant_list[0])
         self.variantName.textChanged.connect(self.on_variant_changed)
 
         self.shortcutName = QComboBox()
@@ -271,9 +269,12 @@ def set_model(self):
             settings["keyboard-model"] = model_data[self.kbdModel.currentText()]
 
     def add_layout(self):
+        layout_data = load_json(layouts_list)
         layout = self.layoutList.currentText()
-        self.layoutName.insert(",")
-        self.layoutName.insert(layout)
+        for key, value in layout_data.items():
+            if key in layout:
+                self.layoutName.insert(",")
+                self.layoutName.insert(value)
         settings["keyboard-layout"] = self.layoutName.text()
 
     def on_variant_changed(self):
@@ -683,9 +684,9 @@ def save_to_config():
 
         lines = ['input "type:keyboard" {']
         if settings["keyboard-layout"]:
-            lines.append('  xkb_layout {}'.format(settings["keyboard-layout"]))
+            lines.append('  xkb_layout {}'.format(','.join(settings["keyboard-layout"])))
         if settings["keyboard-variant"]:
-            lines.append('  xkb_variant {}'.format(settings["keyboard-variant"]))
+            lines.append('  xkb_variant {}'.format(','.join(settings["keyboard-variant"])))
         if settings["keyboard-shortcut"]:
             lines.append('  xkb_options {}'.format(settings["keyboard-shortcut"]))
         lines.append('  xkb_model {}'.format(settings["keyboard-model"]))