Merge branch 'hotfix'

Merge pull request #414 from RedBearAK/patch-1
Tweak GUI app menu to be more like tray icon menu
2025-08-02 09:06:40 +02:00 · 2021-03-11 00:06:19 -06:00 · 2021-03-10 22:02:29 -08:00 · 2021-03-10 23:59:34 -06:00 · 2021-03-06 19:03:52 -09:00 · 2021-03-06 19:44:12 -06:00
3 changed files with 20 additions and 13 deletions
--- a/linux/gui/kinto-gui.py
+++ b/linux/gui/kinto-gui.py
@@ -153,6 +153,14 @@ class MyWindow(Gtk.Window):
        menuitem_file = Gtk.MenuItem(label="File")
        menubar.append(menuitem_file)
        submenu_file = Gtk.Menu()
+
+        menuitem_restart = Gtk.MenuItem(label="Restart")
+        menuitem_restart.connect('activate',self.runRestart)
+        submenu_file.append(menuitem_restart)
+        menuitem_stop = Gtk.MenuItem(label="Stop")
+        menuitem_stop.connect('activate',self.runStop)
+        submenu_file.append(menuitem_stop)
+
        menuitem_file.set_submenu(submenu_file)
        submenu_file.append(self.menuitem_auto)
        kintotray = int(self.queryConfig('ps -aux | grep [k]intotray >/dev/null 2>&1 && echo "1" || echo "0"'))
@@ -164,12 +172,6 @@ class MyWindow(Gtk.Window):
            self.menuitem_systray.signal_id = self.menuitem_systray.connect('activate',self.checkTray,True)
        menuitem_file.connect('activate',self.refreshFile)
        submenu_file.append(self.menuitem_systray)
-        menuitem_restart = Gtk.MenuItem(label="Restart")
-        menuitem_restart.connect('activate',self.runRestart)
-        submenu_file.append(menuitem_restart)
-        menuitem_stop = Gtk.MenuItem(label="Stop")
-        menuitem_stop.connect('activate',self.runStop)
-        submenu_file.append(menuitem_stop)

        menuitem_quit = Gtk.MenuItem(label="Quit")
        submenu_file.append(menuitem_quit)
@@ -1435,4 +1437,4 @@ if openWin:
    win.show_all()
    openWin = False

-Gtk.main()
+Gtk.main()
--- a/linux/kinto.py
+++ b/linux/kinto.py
@@ -17,7 +17,7 @@ codeStr = "|".join(str(x) for x in mscodes)
 # Add remote desktop clients & VM software here
 # Ideally we'd only exclude the client window,
 # but that may not be easily done.
-remotes = ["org.remmina.Remmina"]
+remotes = ["org.remmina.Remmina","xfreerdp"]
 remotes = [client.casefold() for client in remotes]

 # Add remote desktop clients & VMs for no remapping
@@ -44,6 +44,12 @@ define_multipurpose_modmap(
    {                                         # Placeholder
 })

+# Fix for avoiding modmapping when using Synergy keyboard/mouse sharing.
+# Synergy doesn't set a wm_class, so this may cause issues with other
+# applications that also don't set the wm_class.
+# Enable only if you use Synergy.
+# define_conditional_modmap(lambda wm_class: wm_class == '', {})
+
 # [Global modemap] Change modifier keys as in xmodmap
 define_conditional_modmap(lambda wm_class: wm_class.casefold() not in terminals,{

@@ -368,8 +374,8 @@ define_keymap(re.compile(codeStr, re.IGNORECASE),{
    K("C-g"): K("f3"),                          # find_next
    K("Shift-f3"): pass_through_key,            # cancel find_prev
    K("C-Shift-g"): K("Shift-f3"),              # find_prev
-    # K("Super-c"): K("LC-c"),                    #  Default - Terminal - Sigint
-    # K("Super-x"): K("LC-x"),                    #  Default - Terminal - Exit nano
+    # K("Super-c"): K("LC-c"),                    # Default - Terminal - Sigint
+    # K("Super-x"): K("LC-x"),                    # Default - Terminal - Exit nano
    # K("M-c"): K("LC-c"),                        #  Chromebook/IBM - Terminal - Sigint
    # K("M-x"): K("LC-x"),                        #  Chromebook/IBM - Terminal - Exit nano
    # K("Super-C-g"): K("C-f2"),                  # Default - Sublime - find_all_under
@@ -382,8 +388,8 @@ define_keymap(re.compile(codeStr, re.IGNORECASE),{

 # Keybindings for Sublime Text
 define_keymap(re.compile("Sublime_text", re.IGNORECASE),{
-    # K("Super-c"): K("LC-c"),                    #  Default - Terminal - Sigint
-    # K("Super-x"): K("LC-x"),                    #  Default - Terminal - Exit nano
+    # K("Super-c"): K("LC-c"),                    # Default - Terminal - Sigint
+    # K("Super-x"): K("LC-x"),                    # Default - Terminal - Exit nano
    # K("M-c"): K("LC-c"),                        #  Chromebook/IBM - Terminal - Sigint
    # K("M-x"): K("LC-x"),                        #  Chromebook/IBM - Terminal - Exit nano
    K("Super-Space"): K("C-Space"),             # Basic code completion
--- a/windows/kinto.ahk
+++ b/windows/kinto.ahk
@@ -588,7 +588,6 @@ GroupAdd, intellij, ahk_exe idea64.exe
        ^!Left::send ^{PgUp}                                    ; prev_view
        Insert::Return                                          ; cancel toggle_overwrite
        ^!O::send {Insert}                                      ; toggle_overwrite
-        ; $#c::Send {Ctrl down}c{Ctrl up}                         ; Default - Sigints interrupt
        ; !c::Return                                              ; Default - cancel toggle_case_sensitive
        ; $!c::send ^{c}                                          ; CB/IBM - Sigint
        ^!c::send !{c}                                          ; toggle_case_sensitive
Author	SHA1	Message	Date
Ben Reaves	4980c4a35e	Merge branch 'hotfix'	2021-03-11 00:06:19 -06:00
Ben Reaves	c09d8b07e4	Merge pull request #414 from RedBearAK/patch-1 Tweak GUI app menu to be more like tray icon menu	2021-03-10 22:02:29 -08:00
Ben Reaves	a34acfb0b5	- Added xfreerdp to Linux	2021-03-10 23:59:34 -06:00
RedBearAK	9f694fd198	Tweak GUI app menu to be more like tray icon menu This tweak moves the "Restart" and "Stop" actions to the top of the File menu in the Kinto.sh GUI. More like the tray icon menu.	2021-03-06 19:03:52 -09:00
Ben Reaves	4349c4f9dd	Merge pull request #412 from m000/patch-1 temporary fix for using kinto with Synergy	2021-03-06 19:44:12 -06:00
Manolis Stamatogiannakis	68395fd91c	temporary fix for using kinto with Synergy If you use kinto and [Synergy](https://symless.com/synergy) at the same time, kinto will apply transformations when Synergy has the focus. This messes up input because the transformed keypresses are consumed by a different desktop. However it is not possible to write a rule to avoid transforming keypresses specifically for Synergy, because Synergy doesn't seem to set the wm_class. The conditional modmap in this commit solves the problem. But it will also affect any other applications not setting the wm_class. For this, the modmap is commented by default, and Synergy users (which shouldn't be too many) need to enable it manually.	2021-03-06 19:33:40 +01:00
Ben Reaves	482de09dcc	- Removed extra spacing on remap comments	2021-02-28 22:29:05 -06:00
Ben Reaves	f075f3a927	Merge branch 'hotfix'	2021-02-26 14:19:27 -06:00
Ben Reaves	00cbd59a4e	- Removed conflict (windows ahk)	2021-02-26 14:17:53 -06:00