fix: Nodescanner add Main-Menu NodeScan

_LibreLightDesk.py

@@ -1831,15 +1831,16 @@ if __run_main:
     data.append({"text":"CONFIG"})
     data.append({"text":"SDL-MIDI"})
     data.append({"text":"CLOCK"})
-    data.append({"text":"XWING"})
     data.append({"text":"RAY-DMX"})
     data.append({"text":"SDL-DMX"})
     data.append({"text":"SDL-VPU"})
     data.append({"text":"SDL-OSZI"})
+    data.append({"text":"Nodescanner","name":"NodeScan"})
     data.append({"text":"---"})
     data.append({"text":"---"})
     data.append({"text":"- DEMO -"})
     data.append({"text":"---"})
+    data.append({"text":"XWING"})
     #data.append({"text":"TK-EXEC"})
     #data.append({"text":"EXEC-BTN","name":"EXEC-BTN"})
     data.append({"text":"SDL-STAGE"})
@@ -2037,6 +2038,31 @@ if __run_main:
     cls = sdl_config #: None #GUI_CONF
     cb_ok = None
 
+    c = window_create_sdl_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=1)
+    window_manager.new(None,name,wcb=c)
+    if libwin.split_window_show(pos_list,_filter=name):
+        window_manager.top(name)
+
+    # =======================================================================
+    # =======================================================================
+    name="Nodescanner" #"TK-EXEC"
+    def sdl_config():
+        cmd="nohup /usr/bin/python3 /opt/LibreLight/Xdesk/tool/TK-Nodescanner.py" #&"
+        print(cmd)
+
+        def xyz123(cmd):
+            os.system(cmd)
+        thread.start_new_thread(xyz123,(cmd,))
+        return [None,None,None]
+    args = {"title":name,"master":0,"width":W1,"height":H1,"left":L1,"top":TOP}
+    geo = libwin.split_window_position(pos_list,name)
+    if geo:
+        args.update(geo)
+
+    data = []
+    cls = sdl_config #: None #GUI_CONF
+    cb_ok = None
+
     c = window_create_sdl_buffer(args=args,cls=cls,data=data,cb_ok=cb_ok,gui=master,scroll=1)
     window_manager.new(None,name,wcb=c)
     if libwin.split_window_show(pos_list,_filter=name):

tool/TK-Nodescanner.py

@@ -336,13 +336,19 @@ def _send_cmd(event=None,cmd=""):
     #poll(delay=1.5)
 
 def kill_librelight(event=None):
-    for i in ["CONSOLE","EDITOR","ASP"]:
+    for i in ["CONSOLE.py","EDITOR.py","ASP"]:
         cmd='screen -XS "{}" quit | echo ""'.format(i)
         print(cmd)
         os.system(cmd)
 
     cmd="screen -ls"
     os.system(cmd)
+    time.sleep(1)
+    BASE_PATH = "/opt/LibreLight/Xdesk/"
+    cmd="_LibreLightDesk.py"
+    cmd="tool/TK-Nodescanner.py" #&"
+    arg = ""
+    os.execl("/usr/bin/python3", BASE_PATH, cmd,arg)
     
 def set_ip(event=None):
     print("SET NEW IP")
@@ -415,6 +421,7 @@ b_scan = Tkinter.Button(fframe,text="clear list",width=8,command=clear,font=font
 b_scan.pack(side="left",expand=0,fill="y")
 
 b_scan = Tkinter.Button(fframe,text="ArtNetPoll ->",width=10,command=poll,font=font2)
+b_scan.configure(bg="#0f0")
 b_scan.pack(side="left",expand=0,fill="y")