From 9f3b4b0072648ca80ec4852a9bec41e13f86632b Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sun, 12 Apr 2020 14:52:27 -0500 Subject: [PATCH] - Added possible fix for maximize in KDE --- .xkb/symbols/mac_gui | 8 +++++--- setup.py | 11 +++++++++-- 2 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.xkb/symbols/mac_gui b/.xkb/symbols/mac_gui index 628b272..5019f23 100644 --- a/.xkb/symbols/mac_gui +++ b/.xkb/symbols/mac_gui @@ -145,7 +145,8 @@ default partial xkb_symbols "mac_levelssym" { // Control Alt h // Super Control - // F10 + // ,F10 // Default maximize + // // Nothing // KDE maximize // Super Alt // Super Control Alt ], @@ -168,8 +169,9 @@ default partial xkb_symbols "mac_levelssym" { NoAction(), // Control Alt RedirectKey(key=,clearmods=Mod1) - // Super Control - Fullscreen - glitches Ctrl+F - // RedirectKey(key=,modifiers=Mod1,clearmods=Super+Control) + // Super Control - Fullscreen + // ,RedirectKey(key=,modifiers=Mod1,clearmods=Super+Control) // Default maximize + // // Nothing // KDE maximize // Super Alt // Super Control Alt ] diff --git a/setup.py b/setup.py index 3889e7e..2bd94ef 100755 --- a/setup.py +++ b/setup.py @@ -15,6 +15,8 @@ def cmdline(command): ) return process.communicate()[0] +dename = cmdline("./system-config/dename.sh").replace('"','').strip().split(" ")[0].lower() + def requirements(pkgm): print(bcolors.CYELLOW + "You need to install some packages, " +run_pkg+ ", for Kinto to fully remap browsers during input focus.\n" + bcolors.ENDC) print("sudo " + pkgm + " " + run_pkg + "\n") @@ -39,7 +41,6 @@ def install_ibus(): def setShortcuts(): distro = cmdline("awk -F= '$1==\"NAME\" { print $2 ;}' /etc/os-release").replace('"','').strip().split(" ")[0] distroVersion = cmdline("awk -F= '$1==\"VERSION_ID\" { print $2 ;}' /etc/os-release").replace('"','').strip() - dename = cmdline("./system-config/dename.sh").replace('"','').strip().split(" ")[0].lower() print("\nIf Kinto is already running it will be stopped...") print("If you cancel the installer you can re-run Kinto via\n systemctl --user start keyswap") @@ -126,7 +127,7 @@ def setShortcuts(): elif distro == "manjaro linux" and dename == "kde": # Remove Alt+F3 Operations Menu - Sublimetext Select-All cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Window Operations Menu","none,Alt+F3,Window Operations Menu"') - cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Window Maximize" "Alt+F10,Meta+PgUp,Maximize Window"') + cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Window Maximize" "Meta+Ctrl+F,Meta+PgUp,Maximize Window"') cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Minimize Window" "Meta+h,Meta+PgDown,Minimize Window"') cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Switch to Next Desktop" "Meta+Right,Meta+Right,Switch to Next Desktop"') cmdline('kwriteconfig5 --file "$HOME/.config/kglobalshortcutsrc" --group "kwin" --key "Switch to Previous Desktop" "Meta+Left,Meta+Left,Switch to Previous Desktop"') @@ -338,6 +339,12 @@ else: # Fix browsers cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle_chromebook)","+mac_gui(mac_levelssym)+mac_gui(mac_browsers_chromebook)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers') cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle_chromebook)","+mac_gui(mac_browsers_chromebook)+mac_gui(mac_chrome)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome') +if dename == "kde": + # Fix maximize shortcut + cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ KDE maximize)/\$2\$3/g" ~/.xkb/symbols/mac_gui') +else: + # Fix maximize shortcut + cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ Default maximize)/\$2\$3/g" ~/.xkb/symbols/mac_gui') cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.browsers') cmdline('sed -i '' -e "' + types_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_types_gui'] + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome')