Browse Source

fix: movewin TK- and EXEC-BTN to gui-sdl.txt

micha 7 months ago
parent
commit
2483b1b94b
6 changed files with 16 additions and 15 deletions
  1. 3 3
      _LibreLightDesk.py
  2. 5 5
      tkgui/EXEC-BTN.py
  3. 1 1
      tksdl/dmx.py
  4. 1 1
      tksdl/fix.py
  5. 1 1
      tksdl/midi.py
  6. 5 4
      tool/movewin.py

+ 3 - 3
_LibreLightDesk.py

@@ -1817,7 +1817,7 @@ if __run_main:
     data.append({"text":"FIXTURES"})
     data.append({"text":"FIX-LIST"})
     #data.append({"text":"EXEC-BTN","name":"EXEC-BTN"})
-    data.append({"text":"TK-EXEC","name":"EXEC-BTN"})
+    data.append({"text":"EXEC-BTN","name":"EXEC-BTN"})
     data.append({"text":"EXEC-WING"})
     data.append({"text":"---"})
     data.append({"text":"SETUP"})
@@ -2018,9 +2018,9 @@ if __run_main:
         window_manager.top(name)
 
     # =======================================================================
-    name="TK-EXEC"
+    name="EXEC-BTN" #"TK-EXEC"
     def sdl_config():
-        cmd="/usr/bin/python3 /opt/LibreLight/Xdesk/tkgui/EXEC.py " #&"
+        cmd="/usr/bin/python3 /opt/LibreLight/Xdesk/tkgui/EXEC-BTN.py " #&"
         print(cmd)
 
         def xyz123(cmd):

+ 5 - 5
tkgui/EXEC.py → tkgui/EXEC-BTN.py

@@ -55,7 +55,7 @@ sys.path.insert(0,"/opt/LibreLight/Xdesk/")
 import tool.git as git
 #CAPTION += git.get_all()
 
-CAPTION = "TK-EXEC"
+CAPTION = "EXEC-BTN"
 title = CAPTION
 title += git.get_all()
 
@@ -138,7 +138,7 @@ def draw_exec(gui,xframe,EXEC):
 
 import tool.movewin as movewin
 #movewin.check_is_started(CAPTION,_file_path)
-movewin.check_is_started("EXEC","/opt/LibreLight/Xdesk/tkgui/EXEC.py")
+movewin.check_is_started("EXEC-BTN","/opt/LibreLight/Xdesk/tkgui/EXEC-BTN.py")
 
 _global_short_key = 1
 root = None
@@ -421,12 +421,12 @@ if geo:
 
 root = tk.Tk()
 
-win_title="TK-EXEC"
+win_title="EXEC-BTN"
 store = movewin.load_all_sdl(win_title)
 print(store)
 W=850
 H=460
-POS=None
+POS=[10,10]
 if store:
     W = store[-4]
     H = store[-3]
@@ -469,7 +469,7 @@ xframe = libtk.ScrollFrame(root,width=820,height=400,bd=1,bg="black",head=None,f
 #draw.draw_exec(gui,xframe,EXEC)
 draw_exec(gui,xframe,EXEC)
 #xframe.pack()
-root.title(title)#"TK-EXEC")
+root.title(title) #"TK-EXEC")
 
 def serialize_event(event):
     data = {}

+ 1 - 1
tksdl/dmx.py

@@ -27,7 +27,7 @@ store = movewin.load_all_sdl(win_title)
 print(store)
 W=850
 H=460
-POS=None
+POS=[10,10]
 if store:
     W = store[-4]
     H = store[-3]

+ 1 - 1
tksdl/fix.py

@@ -27,7 +27,7 @@ store = movewin.load_all_sdl(win_title)
 print(store)
 W=850
 H=460
-POS=None
+POS=[20,20]
 if store:
     W = store[-4]
     H = store[-3]

+ 1 - 1
tksdl/midi.py

@@ -35,7 +35,7 @@ movewin.check_is_started(CAPTION,_file_path)
 print(store)
 W=500
 H=100
-POS=None
+POS=[20,20]
 print()
 print("title:",win_title)
 if store:

+ 5 - 4
tool/movewin.py

@@ -134,12 +134,13 @@ def get_store_sdl_line():
     #print("-> def",inspect.currentframe().f_code.co_name,"-"*10)
     lines = winfo2(name="SDL-")
     lines.extend( winfo2(name="TK-"))
+    lines.extend( winfo2(name="EXEC-BTN"))
     out_lines=[]
     for line in lines:
         t=line[2].split()
         for k in t:
             k = k.replace(" ", "_")
-            if "SDL-" in k or "TK-" in k:
+            if "SDL-" in k or "TK-" in k or "EXEC-BTN" in k:
                 s=line[-2]
                 p=line[-1]
 
@@ -215,11 +216,11 @@ def startup_all_sdl():
                         cmd=cmd.format("fix.py")
                         #r=os.popen(cmd)
                         start_sub(cmd,"SDL-FIX",mute=1)
-                    elif line[1] == "TK-EXEC":
+                    elif line[1] == "EXEC-BTN":
                         cmd = "python3 /opt/LibreLight/Xdesk/tkgui/{}"
-                        cmd=cmd.format("EXEC.py")
+                        cmd=cmd.format("EXEC-BTN.py")
                         #r=os.popen(cmd)
-                        start_sub(cmd,"TK-EXEC",mute=1)
+                        start_sub(cmd,"EXEC-BTN",mute=1)
                 except json.decoder.JSONDecodeError as e:
                     cprint("ERR",e,color="red")
             time.sleep(0.3)