fix some MAIN.xx bug's and import abc

_LibreLightDesk.py

@@ -2243,8 +2243,8 @@ class MASTER():
 ##draw_sub_dim
 
 
-from tkgui.dialog import *
-dialog = Dialog()
+import tkgui.dialog as dialoglib
+dialog = dialoglib.Dialog()
 
 
 from tkgui.draw import *

lib/jsbc.py

@@ -1,5 +1,12 @@
 #!/usr/bin/python3
 
+import time
+import traceback
+import json
+
+import __main__ as MAIN
+from lib.cprint import *
+
 def JSCB(x,sock=None):
     i = ""
     msg = ""
@@ -15,7 +22,7 @@ def JSCB(x,sock=None):
 
             for msg in msgs:
                 print("  ",msg)
-                # FIXTURES.encoder
+                # MAIN.FIXTURES.encoder
                 if "event" not in msg:
                     continue
 
@@ -31,8 +38,8 @@ def JSCB(x,sock=None):
                         ATTR=msg["ATTR"]
                     print("  Xevent",FIX,VAL,ATTR)
                     #cb = Xevent(fix=FIX,elem=None,attr=ATTR,mode="ENCODER",data=[]) #data)
-                    #FIXTURES.encoder(str(FIX),ATTR,xval="click",xfade=0,xdelay=0)#,blind=0)
-                    FIXTURES.encoder(str(FIX),ATTR,xval=VAL,xfade=0,xdelay=0)#,blind=0)
+                    #MAIN.FIXTURES.encoder(str(FIX),ATTR,xval="click",xfade=0,xdelay=0)#,blind=0)
+                    MAIN.FIXTURES.encoder(str(FIX),ATTR,xval=VAL,xfade=0,xdelay=0)#,blind=0)
 
                     #print(dir(cb))
                     #event =  DEVENT()
@@ -42,7 +49,7 @@ def JSCB(x,sock=None):
                     #refresher_fix.reset() # = Refresher()
                     #cb.cb(event)
                 if "CLEAR" == msg["event"]:
-                    FIXTURES.clear()
+                    MAIN.FIXTURES.clear()
                 if "EXEC" == msg["event"]:
                     print("  EXEC EXEC")
                     val = -1

lib/libtk.py

@@ -2,6 +2,7 @@
 
 import os
 import time
+
 import tkinter
 tk = tkinter
 
@@ -174,8 +175,8 @@ class Window():
                 if str(event.keysym) == "s":
                     cprint("tTtT ReW "*20)
                     #print("numbersign !!")
-                    PRESETS.backup_presets()
-                    FIXTURES.backup_patch()
+                    MAIN.PRESETS.backup_presets()
+                    MAIN.FIXTURES.backup_patch()
                     libwin.save_window_position()
 
                     e =  master.setup_elem["SAVE\nSHOW"]
@@ -183,18 +184,18 @@ class Window():
                     b = BLINKI(e)
                     b.blink()
                 if str(event.keysym) == "c":
-                    PRESETS.backup_presets()
-                    FIXTURES.backup_patch()
+                    MAIN.PRESETS.backup_presets()
+                    MAIN.FIXTURES.backup_patch()
 
                     libwin.save_window_position()
                     #self.elem.config(activebackground="lightgrey")
-                    LOAD_SHOW_AND_RESTART("").cb(force=1)
+                    MAIN.LOAD_SHOW_AND_RESTART("").cb(force=1)
                 #cprint("oipo "*10,round(int(time.time()-sstart)*1000,2))
                 return
 
         if "keysym" in dir(event):
             if "Escape" == event.keysym:
-                FIXTURES.clear()
+                MAIN.FIXTURES.clear()
                 modes.val("ESC",1)
                 master.refresh_fix()
             elif event.keysym in ["Shift_L","Shift_R"]:
@@ -234,7 +235,7 @@ class Window():
                 elif "m" == event.keysym:
                     x=modes.val("MOVE",1)
                     if not x:
-                        PRESETS.clear_move()
+                        MAIN.PRESETS.clear_move()
                 elif "s" == event.keysym:
                     modes.val("SELECT",1)
             elif event.keysym in ["F1","F2","F3","F4","F5","F6","F7","F8","F9","F10","F11","F12"]:
@@ -252,8 +253,8 @@ class Window():
                 master.preset_go(nr-1,xfade=None,val=value)
             elif "numbersign" == event.keysym and value: # is char "#"
                 cprint("numbersign !!")
-                PRESETS.backup_presets()
-                FIXTURES.backup_patch()
+                MAIN.PRESETS.backup_presets()
+                MAIN.FIXTURES.backup_patch()
 
                 libwin.save_window_position()
 
@@ -266,11 +267,11 @@ class Window():
                 #e = Xevent(fix=0,elem=None,attr="SAVE\nSHOW",mode="SETUP")
                 #e.cb(event=event)
             elif "End" == event.keysym:
-                FIXTURES.fx_off("all")
+                MAIN.FIXTURES.fx_off("all")
                 CONSOLE.fx_off("all")
                 CONSOLE.flash_off("all")
             elif "Delete" == event.keysym:
-                #PRESETS.delete(nr)
+                #MAIN.PRESETS.delete(nr)
                 if value:
                     modes.val("DEL",1)
 

tkgui/GUI.py

@@ -1,8 +1,16 @@
 
 import _thread as thread
 import time
+import copy
 
+from collections import OrderedDict
+
+import tkinter 
 import tkinter as tk
+from idlelib.tooltip import Hovertip
+
+import tkgui.dialog  as dialoglib
+dialog = dialoglib.Dialog()
 
 import __main__ as MAIN
 
@@ -136,11 +144,11 @@ class _TableFrame():
             c=0
             r=0
             b = tk.Button(xframe,bg="lightblue", text="ID",width=6,anchor="e")
-            #b.bind("<Button>",Xevent(fix=fix,elem=b).cb)
+            #b.bind("<Button>",MAIN.Xevent(fix=fix,elem=b).cb)
             b.grid(row=r, column=c, sticky=tk.W+tk.E)
             c+=1
             b = tk.Button(xframe,bg="lightblue", text="NAME",width=14,anchor="w")
-            #b.bind("<Button>",Xevent(fix=fix,elem=b).cb)
+            #b.bind("<Button>",MAIN.Xevent(fix=fix,elem=b).cb)
             b.grid(row=r, column=c, sticky=tk.W+tk.E)
             c+=1
             b = tk.Button(xframe,bg="#ddd", text="TYPE",width=3)
@@ -309,25 +317,25 @@ def draw_sub_dim(gui,fix,data,c=0,r=0,frame=None):
         v= data["ATTRIBUT"][attr]["VALUE"]
         b = tk.Button(frame,bg="lightblue", text=""+str(fix),width=3,anchor="w")
         b.config(padx=1)
-        b.bind("<Button>",Xevent(fix=fix,mode="D-SELECT",elem=b).cb)
+        b.bind("<Button>",MAIN.Xevent(fix=fix,mode="D-SELECT",elem=b).cb)
         b.grid(row=r, column=c, sticky=tk.W+tk.E)
         c+=1
         b = tk.Button(frame,bg="lightblue", text=data["NAME"],width=10,anchor="w")
         b.config(padx=1)
-        b.bind("<Button>",Xevent(fix=fix,mode="D-SELECT",elem=b).cb)
+        b.bind("<Button>",MAIN.Xevent(fix=fix,mode="D-SELECT",elem=b).cb)
         b.grid(row=r, column=c, sticky=tk.W+tk.E)
         c+=1
         b = tk.Button(frame,bg="grey", text="S",width=2,anchor="c")
         b.config(padx=1)
         myTip = Hovertip(b,'SELECT')
-        b.bind("<Button>",Xevent(fix=fix,elem=b,attr="_ACTIVE",mode="ENCODER",data=data).cb)
+        b.bind("<Button>",MAIN.Xevent(fix=fix,elem=b,attr="_ACTIVE",mode="ENCODER",data=data).cb)
         b.grid(row=r, column=c, sticky=tk.W+tk.E)
         gui.elem_attr[fix]["S"] = b
         c+=1
         b = tk.Button(frame,bg="grey", text=str(round(v,2)),width=10,anchor="w")
         b.config(padx=1)
         gui.elem_attr[fix][attr] = b
-        b.bind("<Button>",Xevent(fix=fix,elem=b,attr=attr,mode="ENCODER",data=data).cb)
+        b.bind("<Button>",MAIN.Xevent(fix=fix,elem=b,attr=attr,mode="ENCODER",data=data).cb)
         b.grid(row=r, column=c, sticky=tk.W+tk.E)
         c+=1
         if c >=12:
@@ -431,18 +439,18 @@ class GUI_FIX():
             frame = fix_frame
         
             b = tk.Button(frame,bg="lightblue", text="ID:"+str(fix),width=6,anchor="w")
-            b.bind("<Button>",Xevent(fix=fix,mode="SELECT",elem=b).cb)
+            b.bind("<Button>",MAIN.Xevent(fix=fix,mode="SELECT",elem=b).cb)
             b.grid(row=r, column=c, sticky=tk.W+tk.E)
             c+=1
             b = tk.Button(frame,bg="#55f", text=data["NAME"],width=10,anchor="w")
-            b.bind("<Button>",Xevent(fix=fix,attr="ALL",mode="ENCODER",elem=b).cb)
+            b.bind("<Button>",MAIN.Xevent(fix=fix,attr="ALL",mode="ENCODER",elem=b).cb)
             b.grid(row=r, column=c, sticky=tk.W+tk.E)
             c+=1
 
             b = tk.Button(frame,bg="grey", text="S",width=2,anchor="c")
             b.config(padx=1)
             myTip = Hovertip(b,'SELECT')
-            b.bind("<Button>",Xevent(fix=fix,elem=b,attr="_ACTIVE",mode="ENCODER",data=data).cb)
+            b.bind("<Button>",MAIN.Xevent(fix=fix,elem=b,attr="_ACTIVE",mode="ENCODER",data=data).cb)
             b.grid(row=r, column=c, sticky=tk.W+tk.E)
             gui.elem_attr[fix]["S"] = b
             c+=1
@@ -479,7 +487,7 @@ class GUI_FIX():
                 else:
                     b = tk.Button(frame,bg="grey", text=str(attr)+' '+str(round(v,2)),width=12, anchor="w")
                 gui.elem_attr[fix][attr] = b
-                b.bind("<Button>",Xevent(fix=fix,elem=b,attr=attr,mode="ENCODER",data=data).cb)
+                b.bind("<Button>",MAIN.Xevent(fix=fix,elem=b,attr=attr,mode="ENCODER",data=data).cb)
                 b.grid(row=r, column=c, sticky=tk.W+tk.E,ipadx=0,ipady=0,padx=0,pady=0)
                 c+=1
                 if c >=8:
@@ -596,11 +604,11 @@ class GUI_PATCH():
         r=0
         def head(i,c,r,xframe=None):
             b = tk.Button(xframe,bg="grey", text="Z:{} ID".format(z+1),width=6,anchor="e")
-            #b.bind("<Button>",Xevent(fix=fix,elem=b).cb)
+            #b.bind("<Button>",MAIN.Xevent(fix=fix,elem=b).cb)
             b.grid(row=r, column=c, sticky=tk.W+tk.E)
             c+=1
             b = tk.Button(xframe,bg="grey", text="NAME",width=14,anchor="w")
-            #b.bind("<Button>",Xevent(fix=fix,elem=b).cb)
+            #b.bind("<Button>",MAIN.Xevent(fix=fix,elem=b).cb)
             b.grid(row=r, column=c, sticky=tk.W+tk.E)
             c+=1
             rgb  = "#aaa"
@@ -666,14 +674,14 @@ class GUI_PATCH():
             data = FIXTURES.fixtures[fix]
                             
             b = tk.Button(xframe,bg="lightblue", text=""+str(fix),width=6,anchor="e")
-            #b.bind("<Button>",Xevent(fix=fix,elem=b).cb)
+            #b.bind("<Button>",MAIN.Xevent(fix=fix,elem=b).cb)
             b.grid(row=r, column=c, sticky=tk.W+tk.E)
             c+=1
 
             command = _SET_PATCH("NAME",data["NAME"],fix,data)
             b = tk.Button(xframe,bg="grey", text=data["NAME"],width=14,anchor="w",command=command.attr)
             command.set_button(b)
-            #b.bind("<Button>",Xevent(fix=fix,elem=b).cb)
+            #b.bind("<Button>",MAIN.Xevent(fix=fix,elem=b).cb)
             b.grid(row=r, column=c, sticky=tk.W+tk.E)
             c+=1
             LABEL = ""
@@ -696,16 +704,16 @@ class GUI_PATCH():
 
                     
             b = tk.Button(xframe,bg="#aaa", text=LABEL,width=8,anchor="w")
-            #b.bind("<Button>",Xevent(fix=fix,elem=b).cb)
+            #b.bind("<Button>",MAIN.Xevent(fix=fix,elem=b).cb)
             b.grid(row=r, column=c, sticky=tk.W+tk.E)
             b["activebackground"] = "#aaa"
             c+=1
             b = tk.Button(xframe,bg="#ddd", text="EDIT",width=3)
-            b.bind("<Button>",Xevent(fix=fix,mode="SELECT",elem=b).cb)
+            b.bind("<Button>",MAIN.Xevent(fix=fix,mode="SELECT",elem=b).cb)
             b.grid(row=r, column=c, sticky=tk.W+tk.E)
             c+=1
             b = tk.Button(xframe,bg="#ddd", text="[ ][x]",width=1)
-            b.bind("<Button>",Xevent(fix=fix,mode="SELECT",elem=b).cb)
+            b.bind("<Button>",MAIN.Xevent(fix=fix,mode="SELECT",elem=b).cb)
             b.grid(row=r, column=c, sticky=tk.W+tk.E)
             c+=1
             #r+=1
@@ -1562,7 +1570,7 @@ class GUI_grid():
         for row in data:
 
             self.b = tk.Button(self.frame,bg="lightblue", text=row["text"],width=11,height=4)
-            #self.b.bind("<Button>",Xevent(fix=fix,elem=b).cb)
+            #self.b.bind("<Button>",MAIN.Xevent(fix=fix,elem=b).cb)
             self.b.grid(row=r, column=c, sticky=tk.W+tk.E)#,anchor="w")
             c+=1
             if c % 8 == 0:
@@ -1852,8 +1860,8 @@ class EXEC_FADER():
             #b = self.b
             #k = ""
             #gui = MAIN.master
-            #self.b.bind("<Button>",Xevent(fix=0,elem=b,attr=k,data=gui,mode="PRESET").cb)
-            #self.b.bind("<ButtonRelease>",Xevent(fix=0,elem=b,attr=k,data=gui,mode="PRESET").cb)
+            #self.b.bind("<Button>",MAIN.Xevent(fix=0,elem=b,attr=k,data=gui,mode="PRESET").cb)
+            #self.b.bind("<ButtonRelease>",MAIN.Xevent(fix=0,elem=b,attr=k,data=gui,mode="PRESET").cb)
             self.attr=self.b
             self.b.pack(fill=tk.BOTH, side=tk.TOP)
             self.elem.append(self.b)