瀏覽代碼

fix: --easy startup EXEC-BTN

micha 6 月之前
父節點
當前提交
bc3195b9af
共有 3 個文件被更改,包括 32 次插入25 次删除
  1. 2 2
      _LibreLightDesk.py
  2. 1 1
      lib/libwin.py
  3. 29 22
      tool/movewin.py

+ 2 - 2
_LibreLightDesk.py

@@ -1940,8 +1940,8 @@ class window_create_sdl_buffer():
 def open_sdl_window():
     cprint("open_sdl_window ... delay 1sec",color="yellow")
     time.sleep(1)
-    if "--easy" not in sys.argv:
-        movewin.startup_all_sdl()
+    #if "--easy" not in sys.argv:
+    movewin.startup_all_sdl()
 
 thread.start_new_thread(open_sdl_window,())
 

+ 1 - 1
lib/libwin.py

@@ -136,7 +136,7 @@ def read_window_position():
                     show = 1
 
                 if "--easy" in sys.argv:
-                    if name not in ["MAIN","EXEC","SETUP"]:
+                    if name not in ["MAIN","EXEC","SETUP","EXEC-BTN"]:
                         show=0
             out.append([show,name,geo])
 

+ 29 - 22
tool/movewin.py

@@ -205,28 +205,35 @@ def startup_all_sdl():
                 try:
                     line = json.loads(line)
                     cmd = "python3 /opt/LibreLight/Xdesk/tksdl/{}"
-                    if line[1] == "SDL-MIDI":
-                        cmd=cmd.format("midi.py")
-                        #r=os.popen(cmd)
-                        start_sub(cmd,"SDL-MIDI",mute=1)
-                    elif line[1] == "SDL-DMX":
-                        cmd=cmd.format("dmx.py")
-                        #os.popen(cmd)
-                        start_sub(cmd,"SDL-DMX",mute=1)
-                    elif line[1] == "SDL-FIX-LIST":
-                        cmd=cmd.format("fix.py")
-                        #r=os.popen(cmd)
-                        start_sub(cmd,"SDL-FIX",mute=1)
-                    elif line[1] == "EXEC-BTN":
-                        cmd = "python3 /opt/LibreLight/Xdesk/tkgui/{}"
-                        cmd=cmd.format("EXEC-BTN.py")
-                        #r=os.popen(cmd)
-                        start_sub(cmd,"EXEC-BTN",mute=1)
-                    elif line[1] == "EXEC-XWING":
-                        cmd = "python3 /opt/LibreLight/Xdesk/tkgui/{}"
-                        cmd=cmd.format("EXEC-XWING.py")
-                        #r=os.popen(cmd)
-                        start_sub(cmd,"EXEC-XWING",mute=1)
+                    if "--easy" in sys.argv:
+                        if line[1] == "EXEC-BTN":
+                            cmd = "python3 /opt/LibreLight/Xdesk/tkgui/{}"
+                            cmd=cmd.format("EXEC-BTN.py")
+                            #r=os.popen(cmd)
+                            start_sub(cmd,"EXEC-BTN",mute=1)
+                    else:
+                        if line[1] == "SDL-MIDI":
+                            cmd=cmd.format("midi.py")
+                            #r=os.popen(cmd)
+                            start_sub(cmd,"SDL-MIDI",mute=1)
+                        elif line[1] == "SDL-DMX":
+                            cmd=cmd.format("dmx.py")
+                            #os.popen(cmd)
+                            start_sub(cmd,"SDL-DMX",mute=1)
+                        elif line[1] == "SDL-FIX-LIST":
+                            cmd=cmd.format("fix.py")
+                            #r=os.popen(cmd)
+                            start_sub(cmd,"SDL-FIX",mute=1)
+                        elif line[1] == "EXEC-BTN":
+                            cmd = "python3 /opt/LibreLight/Xdesk/tkgui/{}"
+                            cmd=cmd.format("EXEC-BTN.py")
+                            #r=os.popen(cmd)
+                            start_sub(cmd,"EXEC-BTN",mute=1)
+                        elif line[1] == "EXEC-XWING":
+                            cmd = "python3 /opt/LibreLight/Xdesk/tkgui/{}"
+                            cmd=cmd.format("EXEC-XWING.py")
+                            #r=os.popen(cmd)
+                            start_sub(cmd,"EXEC-XWING",mute=1)
                 except json.decoder.JSONDecodeError as e:
                     cprint("ERR",e,color="red")
             time.sleep(0.3)