move kivy to settings and use system tray

Author: Xachman

Pipfile

@@ -14,11 +14,8 @@ pygments = "*"
 pypiwin32 = "*"
 "kivy.deps.sdl2" = "*"
 "kivy.deps.glew" = "*"
-pyenchant = "*"
-opencv-python = "*"
-wheel = "*"
-setuptools = "*"
 "kivy-deps.gstreamer" = "*"
+pystray = "*"
 
 [requires]
 python_version = "3.8"

Pipfile.lock

@@ -1,75 +1,67 @@
-from kivy.app import App
-from kivy.lang import Builder
-from kivy.uix.popup import Popup
-from kivy.uix.boxlayout import BoxLayout
-from kivy.properties import StringProperty, ObjectProperty
-from kivy.core.window import Window
-from windows import windowsStartup
+
+from windows import is_admin
 from nebula import runNebula
 import threading
 import os
-from plyer import filechooser
 from storage import Storage
+import pystray
+from PIL import Image, ImageDraw
+from pystray import Menu, MenuItem
+from settings import SettingsApp
 
 store = Storage()
+thread = None
+logStr = ''
 
-if os.name == 'nt':
-    windowsStartup()
-
-class NebulaGUI(BoxLayout):
-    state = StringProperty("off")
-    logs = StringProperty()
-    executablePath = StringProperty("No Executable Selected")
-    configPath = StringProperty("No Config Selected")
-    the_popup = ObjectProperty(None)
-    thread = None
-    shouldDisconnect = False
-    config = StringProperty()
-
-    def __init__(self, *args, **kwargs):
-        super(NebulaGUI, self).__init__(*args, **kwargs)
-        if store.exists('executable_path'):
-            self.executablePath = store.get('executable_path')
-        if store.exists('config_path'):
-            self.configPath = store.get('config_path')
-
-    def changeState(self, state):
-        self.state = state 
-
-    def connect(self):
-        if self.state == "off":
-            self.changeState("on") 
-            print(self.state)
-            self.thread = threading.Thread(target=runNebula, args=("nebula", self.log, self.executablePath, self.configPath))
-            self.thread.daemon = True
-            self.thread.start()
-
-    def disconnect(self):
-        pass
-
-    def log(self, line):
-        if line.decode('utf-8') != "":
-            print(line.decode('utf-8'))
-
-
-    def chooseExecutable(self):
-        paths = filechooser.open_file(title="Choose Nebula Executable")
-
-        if len(paths) > 0:
-            store.add('executable_path', paths[0])
-            self.executablePath = store.get('executable_path')
-
-    def chooseConfig(self):
-        paths = filechooser.open_file(title="Choose Nebula Config")
-        
-        if len(paths) > 0:
-            store.add('config_path', paths[0])
-            self.configPath = store.get('config_path')
+def create_image(color=250):
+    # Generate an image and draw a pattern
+    width=16
+    height=16
+    color1=20
+    color2=color
+    image = Image.new('RGB', (width, height), color1)
+    dc = ImageDraw.Draw(image)
+    dc.rectangle(
+        (width // 2, 0, width, height // 2),
+        fill=color2)
+    dc.rectangle(
+        (0, height // 2, width // 2, height),
+        fill=color2)
 
-class NebulaGUIApp(App):
-    def build(self):
-        return NebulaGUI()
+    return image
 
+def setup(icon):
+    icon.visible = True
+def log(line):
+    global logStr
+    if line.decode('utf-8') != '':
+        logStr=logStr+line.decode('utf-8')
+        print(line.decode('utf-8'))
+def connect(icon, item):
+    global thread
+    if thread is None:
+        thread = threading.Thread(target=runNebula, args=("nebula", log, store.get('executable_path'), store.get('config_path')))
+        thread.daemon = True
+        thread.start()
+        icon.icon = create_image((51,255,51))
+def settings(icon, item):
+    SettingsApp().run()
+def quit(icon, item):
+    icon.stop()
+def menu():
+    return Menu(
+    MenuItem(
+        'Connect',
+        connect),
+    MenuItem(
+        'Settings',
+        settings),
+    MenuItem(
+        'Quit',
+        quit)
+        )
 
 if __name__ == '__main__':
-    NebulaGUIApp().run()
+    icon = pystray.Icon('test name', create_image(), menu=menu())
+    #create_image().show()
+    icon.run(setup)

main.py

@@ -1,25 +1,18 @@
 #:kivy 1.0.9
 
-<NebulaGUI>:    
+<Settings>:    
     orientation: 'vertical'
     BoxLayout:
-        orientation: 'horizontal'
-        Button:
-            text: 'Connect'
-            on_release: root.connect()
-        Label:
-            text: root.state
-    BoxLayout:
-        orientation: 'horizontal'
+        orientation: 'vertical'
         BoxLayout:
-            orientation: 'vertical'
+            orientation: 'horizontal'
             Label:
                 text: root.executablePath
             Button:
                 text: 'Choose Executable'
                 on_release: root.chooseExecutable()
         BoxLayout:
-            orientation: 'vertical'
+            orientation: 'horizontal'
             Label:
                 text: root.configPath
             Button:

nebula_gui.zip

@@ -0,0 +1,43 @@
+from kivy.app import App
+from kivy.lang import Builder
+from kivy.uix.boxlayout import BoxLayout
+from kivy.properties import StringProperty, ObjectProperty
+from storage import Storage
+from plyer import filechooser
+
+store = Storage()
+class Settings(BoxLayout):
+    state = StringProperty("off")
+    executablePath = StringProperty("No Executable Selected")
+    configPath = StringProperty("No Config Selected")
+    config = StringProperty()
+
+    def __init__(self, *args, **kwargs):
+        super(Settings, self).__init__(*args, **kwargs)
+        if store.exists('executable_path'):
+            self.executablePath = store.get('executable_path')
+        if store.exists('config_path'):
+            self.configPath = store.get('config_path')
+
+    def chooseExecutable(self):
+        paths = filechooser.open_file(title="Choose Nebula Executable")
+
+        if len(paths) > 0:
+            store.add('executable_path', paths[0])
+            self.executablePath = store.get('executable_path')
+
+    def chooseConfig(self):
+        paths = filechooser.open_file(title="Choose Nebula Config")
+        
+        if len(paths) > 0:
+            store.add('config_path', paths[0])
+            self.configPath = store.get('config_path')
+
+class SettingsApp(App):
+    def build(self):
+        from kivy.core.window import Window
+        Window.bind(on_request_close=self.on_request_close)
+        return Settings()
+    def on_request_close(self, *args):
+        from kivy.core.window import Window
+        Window.hide()