Closes #660, fixes incompatibility w/ Fedora 35 & 36

[Win] Enable browser page navigation with Cmd+Braces/Brackets

README.md

@@ -322,7 +322,7 @@ define_keymap(re.compile("Sublime_text"),{
 
 In the above example I am also showing that you can define a single shortcut to enact multiple shortcut keys if needed by defining an array of shortcuts to trigger.
 
-You can also make changes to the file in your /tmp/kinto/xkeysnail/kinto.py location and see them take affect in real time, but for your changes to be permanent you will need to make your changes in the ~/.config/kinto/kinto.py location & restart the xkeysnail service.
+To make changes you can edit ~/.config/kinto/kinto.py under linux & restart the xkeysnail service via the system tray, app or CLI.
 
 systemd
 ```

linux/kinto.py

@@ -69,6 +69,8 @@ browsers = [
     "Epiphany",
     "Firefox",
     "Firefox Developer Edition",
+    "Navigator",
+    "firefoxdeveloperedition",
     "Waterfox",
     "Google-chrome",
     "microsoft-edge",
@@ -436,9 +438,15 @@ define_keymap(re.compile("Firefox", re.IGNORECASE),{
     ],
     K("RC-Shift-N"):    K("RC-Shift-P"),        # Open private window with Ctrl+Shift+N like other browsers
 })
+
 define_keymap(re.compile(chromeStr, re.IGNORECASE),{
-    K("C-comma"): [K("M-e"), K("s"),K("Enter")],
-}, "Browsers")
+    K("C-comma"): [K("M-e"), K("s"),K("Enter")],    # Open preferences
+    K("RC-q"):              K("M-F4"),              # Quit Chrome(s) browsers with Cmd+Q
+    # K("RC-Left"):           K("M-Left"),            # Page nav: Back to prior page in history (conflict with wordwise)
+    # K("RC-Right"):          K("M-Right"),           # Page nav: Forward to next page in history (conflict with wordwise)
+    K("RC-Left_Brace"):     K("M-Left"),            # Page nav: Back to prior page in history
+    K("RC-Right_Brace"):    K("M-Right"),           # Page nav: Forward to next page in history
+}, "Chrome Browsers")
 # Opera C-F12
 
 # Keybindings for General Web Browsers

linux/trayapps/appindicator/kintotray.py

@@ -3,15 +3,19 @@
 import gi
 
 gi.require_version('Gtk', '3.0')
-gi.require_version('AppIndicator3', '0.1')
 gi.require_version('Notify', '0.7')
 
 import signal,time,os,fcntl,datetime,re
 from subprocess import Popen, PIPE, CalledProcessError
 from shutil import which
 from gi.repository import Gtk,GLib,GdkPixbuf
-from gi.repository import AppIndicator3 as appindicator
 from gi.repository import Notify as notify
+try:
+    gi.require_version('AyatanaAppIndicator3', '0.1')
+    from gi.repository import AyatanaAppIndicator3 as appindicator
+except ValueError:
+    gi.require_version('AppIndicator3', '0.1')
+    from gi.repository import AppIndicator3 as appindicator
 
 import signal
 

windows/kinto.ahk

@@ -552,13 +552,16 @@ GroupAdd, intellij, ahk_exe idea64.exe
 
     ; Close all browsers
     #IfWinActive ahk_group browsers
+        ; Page Navigation
+        ^[::send !{Left}                ; Go to prior page
+        ^]::send !{Right}               ; Go to next page
          ;Tab Navigation
-        ^+[::send ^{PgUp}
-        ^+]::send ^{PgDn}
-        ^!Left::send ^{PgUp}
-        ^!Right::send ^{PgDn}
-        #Left::send ^{PgUp}
-        #Right::send ^{PgDn}
+        ^+[::send ^{PgUp}               ; Go to prior tab (left)
+        ^+]::send ^{PgDn}               ; Go to next tab (right)
+        ^!Left::send ^{PgUp}            ; Go to prior tab (left)
+        ^!Right::send ^{PgDn}           ; Go to next tab (right)
+        #Left::send ^{PgUp}             ; Go to prior tab (left)
+        #Right::send ^{PgDn}            ; Go to next tab (right)
         ^q::send {Alt Down}f{Alt Up}x   ; exit all windows
         ; Dev Tools
         !^i::send {Ctrl Down}{Shift Down}i{Shift Up}{Ctrl Up}
@@ -858,3 +861,28 @@ Send {LWin up}
 Send {RShift up}
 Send {LShift up}
 return
+
+#IfWinNotActive ahk_group remotes
+    $!u::Goto, ActivateUmlautModifier
+    $!s::Send, ß
+
+    ActivateUmlautModifier:
+    StringCaseSense, On
+    ; watch next input string
+	Input, UserInput, L1 B
+    if UserInput = o
+        Send, ö
+    else if UserInput = O
+        Send, Ö
+    else if UserInput = a
+        Send, ä
+    else if UserInput = A
+        Send, Ä
+    else if UserInput = u
+        Send, ü
+    else if UserInput = U
+        Send, Ü
+    else
+        Send, %UserInput%
+    return
+#If

xkeysnail_service.sh

@@ -329,7 +329,7 @@ if [[ $distro == 'kdeneon' ]]; then
 	kquitapp5 kglobalaccel && sleep 2s && kglobalaccel5 &
 fi
 
-if [[ $distro == 'fedora' ]]; then
+if [[ $distro == 'fedora' ]] || [[ $distro == 'fedoralinux' ]]; then
 	if [[ $(gsettings get org.gnome.desktop.wm.keybindings show-desktop | grep "\[\]" | wc -l) == 1 ]];then
 		gsettings set org.gnome.desktop.wm.keybindings show-desktop "['<Super>d']"
 	else
@@ -500,7 +500,7 @@ if [[ $distro == "popos" ]]; then
 	perl -pi -e "\s{4}(# )(K.*)(# SL - .*popos.*)/    \$2\$3/g" ./linux/kinto.py.new >/dev/null 2>&1
 fi
 
-if [[ $distro == "fedora" ]]; then
+if [[ $distro == 'fedora' ]] || [[ $distro == 'fedoralinux' ]]; then
 	perl -pi -e "\s{4}(# )(K.*)(# SL - .*fedora.*)/    \$2\$3/g" ./linux/kinto.py.new >/dev/null 2>&1
 	sed -i "s#{sudo}##g" ./linux/xkeysnail.service.new
 	selinuxuser=system_u
@@ -575,7 +575,7 @@ if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
 		exit 0
 	fi
 	sed -i "s#{xkeysnail}#`which xkeysnail`#g" ./linux/limitedadmins.new
-	if [[ $distro == "fedora" ]]; then
+	if [[ $distro == 'fedora' ]] || [[ $distro == 'fedoralinux' ]]; then
 		echo "Changing SELinux context"
 		sudo chcon -v --user=$selinuxuser --type=$selinuxtype "$xkeypath"xkeysnail.service
 	fi
@@ -587,7 +587,7 @@ if ! [[ $1 == "5" || $1 == "uninstall" || $1 == "Uninstall" ]]; then
 		sed -i "s#{xkeysnail}#`which xkeysnail`#g" ./linux/xkeysnail.service.new
 		sudo mv ./linux/xkeysnail.service.new "$xkeypath"xkeysnail.service && echo "Service file added to "$xkeypath"xkeysnail.service"
 
-		if [[ $distro == "fedora" ]]; then
+		if [[ $distro == 'fedora' ]] || [[ $distro == 'fedoralinux' ]]; then
 			sudo cp "$xkeypath"xkeysnail.service /etc/systemd/system/xkeysnail.service && echo "Copied service file to system..." || echo "Failed to create copy..."
 			sudo cp "$xkeypath"xkeysnail.service /etc/systemd/system/graphical.target.wants/xkeysnail.service && echo "Copied service file to system for graphical target..." || echo "Failed to create copy for graphical target..."
 			sudo chown -R root:root /etc/systemd/system/xkeysnail.service && echo "Ownership set for root..." || echo "Failed to set ownership..."