marcel/kinto
1
0
Fork 0
mirror of https://github.com/rbreaves/kinto.git synced 2025-08-05 10:36:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fixed broken system tray for linux 1.2-9

Browse Source
This commit is contained in:
Ben Reaves
2021-05-07 10:46:13 -05:00
parent 44080c25da
commit ef60bf8a59
1 changed files with 28 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

55
linux/trayapps/appindicator/kintotray.py
View File

@@ -50,46 +50,46 @@ class Indicator():
autostart_bool = False autostart_bool = False
menu = Gtk.Menu() menu = Gtk.Menu()
menukb = Gtk.Menu() menukb = Gtk.Menu()
checkbox_autostart = Gtk.CheckMenuItem('Autostart') checkbox_autostart = Gtk.CheckMenuItem(label='Autostart')
restart = Gtk.MenuItem('Restart') restart = Gtk.MenuItem(label='Restart')
stop = Gtk.MenuItem('Stop') stop = Gtk.MenuItem(label='Stop')
keyboards = Gtk.MenuItem('Keyboard Types') keyboards = Gtk.MenuItem(label='Keyboard Types')
keyboards.set_submenu(menukb) keyboards.set_submenu(menukb)
winkb = Gtk.RadioMenuItem(label='Windows') winkb = Gtk.RadioMenuItem(label='Windows')
mackb = Gtk.RadioMenuItem(label='Apple',group=winkb) mackb = Gtk.RadioMenuItem(label='Apple',group=winkb)
chromekb = Gtk.RadioMenuItem(label='Chromebook',group=winkb) chromekb = Gtk.RadioMenuItem(label='Chromebook',group=winkb)
ibmkb = Gtk.RadioMenuItem(label='IBM (No Super/Win key)',group=winkb) ibmkb = Gtk.RadioMenuItem(label='IBM (No Super/Win key)',group=winkb)
winmackb = Gtk.RadioMenuItem(label='Windows & Apple*',group=winkb) winmackb = Gtk.RadioMenuItem(label='Windows & Apple*',group=winkb)
edit = Gtk.MenuItem('Customize') edit = Gtk.MenuItem(label='Customize')
edit_submenu = Gtk.Menu() edit_submenu = Gtk.Menu()
edit.set_submenu(edit_submenu) edit.set_submenu(edit_submenu)
tweaks = Gtk.MenuItem('Tweaks') tweaks = Gtk.MenuItem(label='Tweaks')
rightmod = Gtk.CheckButton('AltGr on Right Cmd') rightmod = Gtk.CheckButton(label='AltGr on Right Cmd')
vsc2st3 = Gtk.CheckButton('ST3 hotkeys for VS Code') vsc2st3 = Gtk.CheckButton(label='ST3 hotkeys for VS Code')
caps2esc = Gtk.CheckButton('Capslock is Escape when tapped, Cmd when held') caps2esc = Gtk.CheckButton(label='Capslock is Escape when tapped, Cmd when held')
caps2cmd = Gtk.CheckButton('Capslock is Cmd') caps2cmd = Gtk.CheckButton(label='Capslock is Cmd')
button_config = Gtk.MenuItem('Kinto Config (shortcuts)') button_config = Gtk.MenuItem(label='Kinto Config (shortcuts)')
service = Gtk.MenuItem('Kinto Service') service = Gtk.MenuItem(label='Kinto Service')
# Keyboard type set below # Keyboard type set below
button_syskb = Gtk.MenuItem('System Shortcuts') button_syskb = Gtk.MenuItem(label='System Shortcuts')
button_region = Gtk.MenuItem('Change Language') button_region = Gtk.MenuItem(label='Change Language')
systray = Gtk.CheckMenuItem('Tray Enabled') systray = Gtk.CheckMenuItem(label='Tray Enabled')
helpm = Gtk.MenuItem('Help') helpm = Gtk.MenuItem(label='Help')
help_submenu = Gtk.Menu() help_submenu = Gtk.Menu()
helpm.set_submenu(help_submenu) helpm.set_submenu(help_submenu)
debug = Gtk.MenuItem('Debug') debug = Gtk.MenuItem(label='Debug')
opengui = Gtk.MenuItem('Open Kinto') opengui = Gtk.MenuItem(label='Open Kinto')
support = Gtk.MenuItem("Support") support = Gtk.MenuItem(label='Support')
about = Gtk.MenuItem('About') about = Gtk.MenuItem(label='About')
global restartsvc global restartsvc
restartsvc = False restartsvc = False
unixts = int(time.time()) unixts = int(time.time())
last_status = "" last_status = ''
def __init__(self): def __init__(self):
global sysv global sysv
try: try:
sysv = check_output("pidof systemd >/dev/null 2>&1 && echo '0' || echo '1'").strip().decode('UTF-8') sysv = int(Popen("pidof systemd >/dev/null 2>&1 && echo '0' || echo '1'", stdout=PIPE, shell=True).communicate()[0].strip().decode('UTF-8'))
except: except:
sysv = 1 sysv = 1
if sysv: if sysv:
@@ -199,7 +199,7 @@ class Indicator():
# self.button_region.connect('activate',self.setRegion) # self.button_region.connect('activate',self.setRegion)
# self.menu.append(self.button_region) # self.menu.append(self.button_region)
item_quit = Gtk.MenuItem('Close') item_quit = Gtk.MenuItem(label='Close')
item_quit.connect('activate', quit) item_quit.connect('activate', quit)
self.menu.append(item_quit) self.menu.append(item_quit)
self.menu.show_all() self.menu.show_all()
@@ -417,10 +417,10 @@ class Indicator():
self.lbl = Gtk.Label() self.lbl = Gtk.Label()
global restartsvc global restartsvc
restartsvc = False restartsvc = False
self.rightmod = Gtk.CheckButton('AltGr on Right Cmd') self.rightmod = Gtk.CheckButton(label='AltGr on Right Cmd')
self.vsc2st3 = Gtk.CheckButton('ST3 hotkeys for VS Code') self.vsc2st3 = Gtk.CheckButton(label='ST3 hotkeys for VS Code')
self.caps2esc = Gtk.CheckButton('Capslock is Escape when tapped, Cmd when held') self.caps2esc = Gtk.CheckButton(label='Capslock is Escape when tapped, Cmd when held')
self.caps2cmd = Gtk.CheckButton('Capslock is Cmd') self.caps2cmd = Gtk.CheckButton(label='Capslock is Cmd')
if rightmod_result == 0: if rightmod_result == 0:
self.rightmod.set_active(True) self.rightmod.set_active(True)
@@ -598,6 +598,7 @@ class Indicator():
Popen(['notify-send','Kinto: Error restarting Kinto!']) Popen(['notify-send','Kinto: Error restarting Kinto!'])
def runStop(self,button): def runStop(self,button):
global sysv
try: try:
if sysv: if sysv:
stop = Popen(['sudo', '-E','/etc/init.d/kinto','stop']) stop = Popen(['sudo', '-E','/etc/init.d/kinto','stop'])