From 0f6cfb95ccbad48c97dd6916e44d632e7d4ee3e0 Mon Sep 17 00:00:00 2001 From: Ben Reaves Date: Sun, 12 Apr 2020 17:21:49 -0500 Subject: [PATCH] - Updated default keymap descriptions for cleaner install --- .xkb/symbols/mac_term | 14 ++++++-------- setup.py | 12 ++++++------ 2 files changed, 12 insertions(+), 14 deletions(-) diff --git a/.xkb/symbols/mac_term b/.xkb/symbols/mac_term index 97f1391..1eebce7 100644 --- a/.xkb/symbols/mac_term +++ b/.xkb/symbols/mac_term @@ -103,18 +103,16 @@ partial xkb_symbols "mac_global" { symbols[Group1]= [ Tab, Tab, - // F13, // Default cmdtab - // F14, // KDE cmdtab - // Right // Elementary - NoSymbol // Default + // F13 // Default cmdtab + // F14 // KDE cmdtab + // Right // Elementary ecmdtab ], actions[Group1]= [ NoAction(), NoAction(), - // Redirect(key=), // Default cmdtab - // Redirect(key=), // KDE cmdtab - // Redirect(key=,mods=Control+Shift,clearmods=Mod4+Super) // Elementary - Redirect(key=,mods=Control,clearmods=Mod4+Super) // Default + // Redirect(key=) // Default cmdtab + // Redirect(key=) // KDE cmdtab + // Redirect(key=,mods=Control+Shift,clearmods=Mod4+Super) // Elementary cmdtab ] }; diff --git a/setup.py b/setup.py index 4ea79f2..8fe8a3c 100755 --- a/setup.py +++ b/setup.py @@ -79,10 +79,10 @@ def setShortcuts(): cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings minimize \"['h','F9']\"") cmdline("gsettings set org.gnome.desktop.wm.keybindings panel-main-menu \"['Space','Space']\"") - cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ Elementary)/\$2\$3/g" ~/.xkb/symbols/mac_term') - cmdline('perl -pi -e "s/(\w.*)(\/\/ Default)/\/\/ \$1\$2/g" ~/.xkb/symbols/mac_term') - cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ Elementary)/\$2\$3/g" ~/.xkb/symbols/mac_gui') - cmdline('perl -pi -e "s/(\w.*)(\/\/ Default)/\/\/ \$1\$2/g" ~/.xkb/symbols/mac_gui') + cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ Elementary cmdtab)/\$2\$3/g" ~/.xkb/symbols/mac_term') + cmdline('perl -pi -e "s/(\w.*)(\/\/ Default cmdtab)/\/\/ \$1\$2/g" ~/.xkb/symbols/mac_term') + cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ Elementary cmdtab)/\$2\$3/g" ~/.xkb/symbols/mac_gui') + cmdline('perl -pi -e "s/(\w.*)(\/\/ Default cmdtab)/\/\/ \$1\$2/g" ~/.xkb/symbols/mac_gui') elif distro == "galliumos" and dename == "xfce": print("Applying GalliumOS (xfce) shortcuts...") # Reset Show desktop @@ -337,8 +337,8 @@ if default != 3: cmdline('sed -i '' -e "' + symbols_line + 's/\\"/' + keyboardconfigs[defaultkb-1]['xkb_symbols_gui'].replace("+mac_gui(mac_levelssym)+mac_gui(mac_appcycle)","+mac_gui(mac_browsers)+mac_gui(mac_chrome)") + '\\"/2" ~/.xkb/keymap/kbd.mac.gui.chrome') else: # Fix multicursor in mac_gui - cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ Chromebook)/\$2\$3/g" ~/.xkb/symbols/mac_gui') - cmdline('perl -pi -e "s/(\w.*)(\/\/ Default)/\/\/ \$1\$2/g" ~/.xkb/symbols/mac_gui') + cmdline('perl -pi -e "s/(\/\/ )(.*)(\/\/ Chromebook multicursor)/\$2\$3/g" ~/.xkb/symbols/mac_gui') + cmdline('perl -pi -e "s/(\w.*)(\/\/ Default multicursor)/\/\/ \$1\$2/g" ~/.xkb/symbols/mac_gui') # 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')