fix: MOVE, add fix.py ctl+c+s

_LibreLightDesk.py

@@ -38,6 +38,14 @@ rnd_id3 = ""
 _ENCODER_WINDOW = None
 
 
+__run_main = 0
+if __name__ == "__main__":
+    __run_main = 1
+else:
+    import __main__ 
+    if "unittest" not in dir(__main__):
+        __run_main = 1
+
 import tool.git as git
 rnd_id += git.get_all()
 
@@ -2085,14 +2093,6 @@ class Refresher():
 print("main",__name__)
 
 
-__run_main = 0
-if __name__ == "__main__":
-    __run_main = 1
-else:
-    import __main__ 
-    if "unittest" not in dir(__main__):
-        __run_main = 1
-
 
 
 refresher_fix = Refresher()
@@ -2179,6 +2179,27 @@ def open_sdl_window():
     if "--easy" not in sys.argv:
         movewin.startup_all_sdl()
 
+thread.start_new_thread(loops,())
+mc_fix = MC_FIX()
+def mc_fix_loop():
+    time.sleep(5)
+    while 1:
+        try:
+            #print(1)
+            data = FIXTURES.fixtures 
+            mc_fix.set(index="fix",data=data)
+        except Exception as e:
+            print("MC_FIX EXCEPTION",e)
+        time.sleep(1/10)
+
+thread.start_new_thread(mc_fix_loop,())
+thread.start_new_thread(open_sdl_window,())
+
+#while 1:
+#    time.sleep(1)
+#    if not __run_main:
+#        break
+
 if __run_main:
     cprint("main")
 
@@ -2756,21 +2777,6 @@ if __run_main:
 
 
 
-    thread.start_new_thread(loops,())
-    mc_fix = MC_FIX()
-    def mc_fix_loop():
-        time.sleep(5)
-        while 1:
-            try:
-                #print(1)
-                data = FIXTURES.fixtures 
-                mc_fix.set(index="fix",data=data)
-            except Exception as e:
-                print("MC_FIX EXCEPTION",e)
-            time.sleep(1/10)
-
-    thread.start_new_thread(mc_fix_loop,())
-    thread.start_new_thread(open_sdl_window,())
     
     try:
         window_manager.mainloop()

lib/jsbc.py

@@ -66,6 +66,11 @@ def JSCB(x,sock=None):
                     MAIN.modes.val("LABEL",1)
                 elif "REC" == msg["event"]:
                     MAIN.modes.val("REC",1)
+                elif "SAVE\nSHOW" == msg["event"]:
+                    MAIN.save_show()
+                elif "RESTART" == msg["event"]:
+                    print("OK OK")
+                    MAIN.LOAD_SHOW_AND_RESTART("").cb(force=1)
                 elif "REC-FX" == msg["event"]:
                     MAIN.modes.val("REC-FX",1)
                 elif "EXEC" == msg["event"]:

lib/tkevent.py

@@ -198,7 +198,7 @@ class tk_event():
         elif self.attr == "SAVE":
             MAIN.modes.val(self.attr,1)
             MAIN.save_show()
-            #PRESETS.backup_presets()
+            #MAIN.PRESETS.backup_presets()
             #MAIN.FIXTURES.backup_patch()
             #time.sleep(1)
             MAIN.modes.val(self.attr,0)
@@ -336,18 +336,18 @@ class tk_event():
                             time.sleep(0.05)
                             MAIN.master._refresh_exec(nr=nr)
                         elif MAIN.modes.val("DEL"):
-                            ok=PRESETS.delete(nr)
+                            ok=MAIN.PRESETS.delete(nr)
                             if ok:
                                 MAIN.modes.val("DEL",0)
                                 #MAIN.master.refresh_exec()
                                 MAIN.master._refresh_exec(nr=nr)
                         elif MAIN.modes.val("COPY"):
-                            ok=PRESETS.copy(nr)
+                            ok=MAIN.PRESETS.copy(nr)
                             if ok:
                                 MAIN.modes.val("COPY",0)
                                 MAIN.master._refresh_exec(nr=nr)
                         elif MAIN.modes.val("MOVE"):
-                            ok,cnr,bnr=PRESETS.move(nr)
+                            ok,cnr,bnr=MAIN.PRESETS.move(nr)
                             if ok:
                                 #MAIN.modes.val("MOVE",0) # keep MOVE on
                                 MAIN.master._refresh_exec(nr=nr)

tksdl/fix.py

@@ -724,14 +724,25 @@ while 1:
                     print("ESC",msg)
                     cmd_client.send(msg)
 
-                keycode = {27:"REC",39:"SELECT",46:"LABEL",54:"CFG-BTN",56:"BLIND",41:"FLASH",26:"EDIT"}
-                print( event.scancode in keycode,event.scancode)
-                if event.scancode in keycode: # r
-                    if event.type == 2: # press
-                            
-                        msg=json.dumps([{"event":keycode[event.scancode]}]).encode("utf-8")
-                        print("SPCIAL-KEY",msg)
-                        cmd_client.send(msg)
+                if event.mod == 0:
+                    keycode = {27:"REC",39:"SELECT",46:"LABEL",54:"CFG-BTN",56:"BLIND",41:"FLASH",26:"EDIT"}
+                    print( event.scancode in keycode,event.scancode)
+                    if event.scancode in keycode: # r
+                        if event.type == 2: # press
+                                
+                            msg=json.dumps([{"event":keycode[event.scancode]}]).encode("utf-8")
+                            print("SPCIAL-KEY",msg)
+                            cmd_client.send(msg)
+                if event.mod == 64:
+                    keycode = {39:"SAVE\nSHOW",54:"RESTART"}
+                    print( event.scancode in keycode,event.scancode)
+                    if event.scancode in keycode: # r
+                        if event.type == 2: # press
+                                
+                            msg=json.dumps([{"event":keycode[event.scancode]}]).encode("utf-8")
+                            print("SPCIAL-KEY",msg)
+                            cmd_client.send(msg)
+
                 if event.scancode in range(10,20+1):
                     if event.type in [2,3]: # press
                         v = 1-event.type+2