Bladeren bron

fix: MAIN.<var> Enc/shift and SHOW SAVE AS ... OK

micha 11 maanden geleden
bovenliggende
commit
7ec83d1626
3 gewijzigde bestanden met toevoegingen van 38 en 23 verwijderingen
  1. 0 8
      _LibreLightDesk.py
  2. 26 4
      lib/baselib.py
  3. 12 11
      lib/libtk.py

+ 0 - 8
_LibreLightDesk.py

@@ -1541,14 +1541,6 @@ class Element():
 
 
         
-def _clean_path(fpath):
-    _path=[]
-    for i in fpath:
-        fpath = fpath.replace(" ","_")
-        if i in string.ascii_letters+string.digits+"äöüßÖÄÜ_-":
-            _path.append(i)
-    path = "".join(_path)
-    return path
 
 
 

+ 26 - 4
lib/baselib.py

@@ -8,8 +8,23 @@ from collections import OrderedDict
 from lib.cprint import *
 import lib.fixlib as fixlib
 
+import string
+
+import tkinter
+tk = tkinter
+
+
 HOME = os.getenv('HOME')
 
+def _clean_path(fpath):
+    _path=[]
+    for i in fpath:
+        fpath = fpath.replace(" ","_")
+        if i in string.ascii_letters+string.digits+"äöüßÖÄÜ_-":
+            _path.append(i)
+    path = "".join(_path)
+    return path
+
 def _read_init_txt(show_path):
     fname = show_path+"init.txt"
     show_name = None
@@ -104,7 +119,8 @@ class Base():
         msg = " X "
         self.show_name,msg = _read_init_txt(self.show_path)
         if not self.show_name:
-            r=tkinter.messagebox.showwarning(message=msg,parent=None)
+            #r=tkinter.messagebox.showwarning(message=msg,parent=None)
+            r=tkinter.messagebox.showwarning(message=msg,title="Error",parent=None)
             sys.exit()
         
         fpath = self.show_path1 +show_name 
@@ -117,7 +133,8 @@ class Base():
             msg += "-{}init.txt\n".format(self.show_path0)
             msg += "-{}".format(self.show_path1)
 
-            showwarning(msg=msg,title="Show Error")
+            #showwarning(msg=msg,title="Show Error")
+            r=tkinter.messagebox.showwarning(message=msg,title="Show Error",parent=None)
             exit()
 
         self._check()
@@ -166,7 +183,8 @@ class Base():
             msg = ""#"Exception: {}".format(e)
             msg += "\n\ncheck\n-init.txt"
             cprint(msg,color="red")
-            showwarning(msg=msg,title="load Error")
+            #showwarning(msg=msg,title="load Error")
+            r=tkinter.messagebox.showwarning(message=msg,title="Error",parent=None)
             return
         return _read_sav_file(xpath)
 
@@ -181,7 +199,11 @@ class Base():
 
     def _create_path(self,fpath):
         if os.path.isdir(fpath):
-            cprint("STOP SHOW EXIST !",color="red")
+            msg="STOP SHOW EXIST !"
+            cprint(msg,color="red")
+            #showwarning(msg=msg,title="Error")
+            r=tkinter.messagebox.showwarning(message=msg,title="Error",parent=None)
+            #r=tkinter.messagebox.showwarning(message=msg,parent=None)
             return 0
         else:
             cprint("CREATE DIR ",fpath,color="green")

+ 12 - 11
lib/libtk.py

@@ -47,7 +47,7 @@ class DummyCallback():
 
 class Window():
     def __init__(self,args): #title="title",master=0,width=100,height=100,left=None,top=None,exit=0,cb=None,resize=1):
-        global lf_nr
+        global MAIN #lf_nr
         self.args = {"title":"title","master":0,"width":100,"height":100,"left":None,"top":None,"exit":0,"cb":None,"resize":1}
         self.args.update(args)
         
@@ -121,8 +121,8 @@ class Window():
         self.tk.geometry(geo)
         self.show()
     def update_idle_task(self):
-        if INIT_OK:
-            tkinter.Tk.update_idletasks(gui_menu_gui.tk)
+        if MAIN.INIT_OK:
+            tkinter.Tk.update_idletasks(MAIN.gui_menu_gui.tk)
         pass
     def close_app_win(self,event=None):
         cprint("close_app_win",self,event,self.args["title"],color="red")
@@ -143,7 +143,7 @@ class Window():
         else:
             #return self.tk.title(title)
             self.args["title"] = title
-            return self.tk.title(""+str(self.args["title"])+" "+str(lf_nr)+":"+str(rnd_id))
+            return self.tk.title(""+str(self.args["title"])+" "+str(MAIN.lf_nr)+":"+str(MAIN.rnd_id))
     def show(self):
         self.tk.deiconify()
         pass
@@ -164,7 +164,7 @@ class Window():
         if not MAIN._global_short_key:
             return 1
 
-        global _shift_key
+        #global MAIN #_shift_key
         #cprint("<GUI>",event,color="yellow")
         value = 255
         if "Release" in str(event.type) or str(event.type) == '5' or str(event.type) == '3':
@@ -203,19 +203,20 @@ class Window():
             elif event.keysym in ["Shift_L","Shift_R"]:
                 #cprint(event.type)
                 if "KeyRelease" in str(event.type) or str(event.type) in ["3"]:
-                    _shift_key = 0
+                    MAIN._shift_key = 0
                 else:
-                    _shift_key = 1
+                    MAIN._shift_key = 1
                 #cprint("SHIFT_KEY",_shift_key,"??????????")
                 #cprint("SHIFT_KEY",_shift_key,"??????????")
-                global _ENCODER_WINDOW
+                #global MAIN #_ENCODER_WINDOW
                 try:
-                    if _shift_key:
-                        _ENCODER_WINDOW.title("SHIFT/FINE ")
+                    if MAIN._shift_key:
+                        MAIN._ENCODER_WINDOW.title("SHIFT/FINE ")
                     else:
-                        _ENCODER_WINDOW.title("ENCODER") 
+                        MAIN._ENCODER_WINDOW.title("ENCODER") 
                 except Exception as e:
                     cprint("exc9800",e)
+                    #raise e
 
             elif event.keysym in "ebfclrmsRx" and value: 
                 if "e" == event.keysym: