فهرست منبع

rename baselib to showlib

micha 8 ماه پیش
والد
کامیت
fefacbcf30
12فایلهای تغییر یافته به همراه28 افزوده شده و 28 حذف شده
  1. 5 5
      _LibreLightDesk.py
  2. 1 1
      arc/unittest_run.py
  3. 2 2
      lib/execlib.py
  4. 2 2
      lib/fixlib.py
  5. 3 3
      lib/libtk.py
  6. 4 4
      lib/libwin.py
  7. 0 0
      lib/showlib.py
  8. 3 3
      lib/tkevent.py
  9. 1 1
      tkgui/GUI.py
  10. 2 2
      tkgui/fix.py
  11. 3 3
      tksdl/start.py
  12. 2 2
      tool/movewin.py

+ 5 - 5
_LibreLightDesk.py

@@ -740,7 +740,7 @@ def save_show(fpath=None,new=0):
 def save_show_as(fname,new=0):
     print()
     print()
-    fpath = baselib.generate_show_path(fname)
+    fpath = showlib.generate_show_path(fname)
 
     info = "SAVE SHOW AS"
     if new:
@@ -748,12 +748,12 @@ def save_show_as(fname,new=0):
 
     cprint(info,fpath,fname,color="green")
 
-    if baselib.create_new_show_path(fpath):
+    if showlib.create_new_show_path(fpath):
         return save_show(fpath,new)
 
 
 
-import lib.baselib as baselib
+import lib.showlib as showlib
 
 class cb():
     def __init__(self,win):
@@ -892,7 +892,7 @@ import lib.execlib as execlib
 
 class MASTER():
     def __init__(self):
-        self.base = baselib.Base ()
+        self.base = showlib.Base ()
         self.load()
         self._XX = 0
 
@@ -1417,7 +1417,7 @@ from tkgui.GUI import *
 class LOAD_SHOW_AND_RESTART():
     def __init__(self,fname=""):
         self.fname=fname
-        self.base = baselib.Base()
+        self.base = showlib.Base()
 
     def cb(self,event=None,force=0):
         print()

+ 1 - 1
arc/unittest_run.py

@@ -89,7 +89,7 @@ class Test_Fixture(unittest.TestCase):
 
 class Test_Desk(unittest.TestCase):
     def test_file_list(self):
-        _list =  = baselib.list_shows()
+        _list =  = showlib.list_shows()
         for i in _list: 
             print(i)
         self.assertTrue(len(_list))

+ 2 - 2
lib/execlib.py

@@ -77,7 +77,7 @@ def reshape_exec(data ,value=None,xfade=0,flash=0,ptfade=0,DELAY=None):
     return out
 
 
-import lib.baselib as baselib
+import lib.showlib as showlib
 
 
 
@@ -117,7 +117,7 @@ def EXEC_CFG_CHECKER(sdata):
 
 class EXEC(): #Presets():
     def __init__(self):
-        self.base = baselib.Base()
+        self.base = showlib.Base()
         self._last_copy = None
         self._last_move = None
         self.fx_buffer = {}

+ 2 - 2
lib/fixlib.py

@@ -293,12 +293,12 @@ def _load_fixture_list(mode="None"):
     return blist
 
 
-import lib.baselib as baselib
+import lib.showlib as showlib
 
 class Fixtures():
     def __init__(self):
         #super().__init__() 
-        self.base=baselib.Base()
+        self.base=showlib.Base()
         #self.load()
         self.fixtures = OrderedDict()
         self.gui = None # GUIHandler()

+ 3 - 3
lib/libtk.py

@@ -13,7 +13,7 @@ import __main__ as MAIN
 
 from lib.cprint import cprint
 import lib.libwin as libwin
-import lib.baselib as baselib
+import lib.showlib as showlib
 import lib.libconfig as libconfig
 
 import tkgui.dialog  as dialoglib
@@ -290,13 +290,13 @@ def ScrollFrame(root,width=50,height=100,bd=1,bg="black",head=None,foot=None):
 def frame_of_show_list(frame,cb=None):
     c=0
     r=0
-    base = baselib.Base()
+    base = showlib.Base()
     for i in ["name","stamp"]: #,"create"]:
         b = tk.Label(frame,bg="grey",text=i)
         b.grid(row=r, column=c, sticky=tk.W+tk.E)
         c+=1
     r+=1
-    blist = baselib.list_shows()
+    blist = showlib.list_shows()
     for i in range(10):
         blist.append(["",""])
 

+ 4 - 4
lib/libwin.py

@@ -4,7 +4,7 @@ import os
 HOME = os.getenv('HOME')
 
 from lib.cprint import *
-import lib.baselib as baselib
+import lib.showlib as showlib
 import __main__ as MAIN
 
 window_list_buffer = {}
@@ -18,8 +18,8 @@ def save_window_position(save_as=""):
         fname = save_as 
         fpath=fname
     else:
-        fname = baselib.current_show_name() 
-        fpath = baselib.SHOW_DIR + fname
+        fname = showlib.current_show_name() 
+        fpath = showlib.SHOW_DIR + fname
     if not os.path.isdir(fpath):
         cprint("  -0 save_window_position no dir:",fpath,color="red")
         error += 1
@@ -118,7 +118,7 @@ def get_window_position(_filter="",win=None):
 
 def read_window_position():
     try:
-        fname = baselib.current_show_path() + "/gui.txt"
+        fname = showlib.current_show_path() + "/gui.txt"
 
         cprint("- fname:",fname)
         f = open(fname,"r")

+ 0 - 0
lib/baselib.py → lib/showlib.py


+ 3 - 3
lib/tkevent.py

@@ -8,7 +8,7 @@ import traceback
 from lib.cprint import cprint
 import __main__ as MAIN
 
-import lib.baselib as baselib
+import lib.showlib as showlib
 import lib.fxlib as fxlib
 import lib.libtk as libtk
 import tkgui.dialog as dialoglib
@@ -49,7 +49,7 @@ class tk_event():
 
         elif self.attr == "LOAD\nSHOW":
             name = "LOAD-SHOW"
-            line1 = "PATH: " + baselib.current_show_path()
+            line1 = "PATH: " + showlib.current_show_path()
             line2 = "DATE: " + time.strftime("%Y-%m-%d %X",  time.localtime(time.time()))
 
             class cb():
@@ -74,7 +74,7 @@ class tk_event():
                     cprint("err443",self,"_cb",data)
                     return None
                 fname = data["Value"]
-                fpath = baselib.generate_show_path(fname)
+                fpath = showlib.generate_show_path(fname)
                 cprint("SAVE NEW SHOW",fpath,fname)
 
                 if MAIN.save_show_as(fname,new=1):

+ 1 - 1
tkgui/GUI.py

@@ -20,7 +20,7 @@ from lib.cprint import *
 
 import lib.mytklib as mytklib
 import lib.fixlib  as fixlib
-import lib.baselib as baselib
+import lib.showlib as showlib
 import lib.libtk   as libtk
 import lib.tkevent as tkevent
 

+ 2 - 2
tkgui/fix.py

@@ -18,7 +18,7 @@ from lib.cprint import *
 
 
 import lib.fixlib  as fixlib
-import lib.baselib as baselib
+import lib.showlib as showlib
 import lib.libtk   as libtk
 
 
@@ -577,7 +577,7 @@ class GUI_FixtureEditor():
             self.name["text"] = data["name"] #"load_MH2"
             self.name["text"] = data["name"] #"load_MH2"
             xpath = data["xpath"] + "/" + data["xfname"]
-            fdata = baselib._read_sav_file(xpath)
+            fdata = showlib._read_sav_file(xpath)
             n = []
             a = []
             m = []

+ 3 - 3
tksdl/start.py

@@ -50,7 +50,7 @@ pygame.display.set_icon(icon)
 
 import tool.movewin as movewin
 import tool.sdl_elm as sdl_elm
-import lib.baselib as baselib
+import lib.showlib as showlib
 
 
 CAPTION = 'LibreLight Start '
@@ -87,8 +87,8 @@ y = 120
 import os
 import lib.fork as fork
 
-import lib.baselib as baselib
-SHOW_NAME = baselib.current_show_name()
+import lib.showlib as showlib
+SHOW_NAME = showlib.current_show_name()
 print([SHOW_NAME])
                 
 def exit(args=None):

+ 2 - 2
tool/movewin.py

@@ -11,11 +11,11 @@ import json
 import inspect
 import _thread as thread
 
-import lib.baselib as baselib
+import lib.showlib as showlib
 from lib.cprint import cprint
 
 
-SHOW_PATH = baselib.current_show_path() #SHOW_PATH 
+SHOW_PATH = showlib.current_show_path() #SHOW_PATH 
 
 
 # python3 movewin.py window-title x y