Small changes

Author: Pololot64

OpticUI.py

@@ -102,6 +102,77 @@ def set_icons(iconpack_path):
             full = os.path.join(root, file)
             icons.update({file: full})
 
+def icon_path(name, spec=None):
+    filename = None  # "assets/chat.png"
+    name = name.lower()
+    names = None
+    n = 0
+    if " " in name:
+        names = name.split(" ")
+        name = names[0]
+        name = name.lower()
+    elif "." in name:
+        names = name.split(".")
+        name = names[0]
+        name = name.lower()
+
+    # name = name.replace(" ", "-")
+    if names == None:
+        names = [name]
+    for name in names:
+        for f in icons:
+            full = icons[f]
+            files = f[:-4].split("-")
+            if str(name) == str(f)[:-4].lower():
+                filename = full
+                break
+
+            elif str(name) == str(f).lower():
+                filename = full
+                break
+            elif str(name) == files[0]:
+                filename = full
+            elif name in full:
+                if spec == None:
+                    filename = full
+                    break
+                else:
+                    if spec in full:
+                        filename = full
+                        break
+            if filename != None:
+                break
+        if filename != None:
+            break
+
+    if filename == None:
+        filename = "link.png"
+    if name == "":
+        filename = "link.png"
+    try:
+        if filename.endswith(".svg") == True:
+            pass
+            # out = BytesIO()
+            # cairosvg.svg2png(url=filename, write_to=out)
+            # imager = Image.open(out)
+        else:
+            try:
+                imager = Image.open(filename)
+            except:
+                with open(filename) as f:
+                    reader = f.read()
+                    if ".png" in reader:
+                        filename = os.path.dirname(filename) + "\\" + reader
+                        #imager = Image.open(filename)
+                    else:
+                        #imager = Image.open(asset_dir + "link.png")
+                        filename = asset_dir + "link.png"
+        return filename#imager
+
+    except:
+        #imager = Image.open(asset_dir + "link.png")
+        return asset_dir + "link.png"#imager
+    return asset_dir + "link.png"
 
 def icon(name, spec=None):
     filename = None  # "assets/chat.png"

manager.build/.sconsign-37.dblite

@@ -3,7 +3,6 @@
 # Copyright Paul-E/Opticos Studios 2021
 # https://sites.google.com/bartimee.com/opticos-studios/home
 
-
 # Dedicated to the Sacred Heart of Jesus
 
 #                #########
@@ -37,7 +36,7 @@
 
 BUILD_MODE = "MSIX"  # MSIX or WIN32
 
-version = "1.3.8 beta 1 build7"
+version = "1.3.8 beta 2 build7"
 
 lc_name = "Licenses138.txt"
 
@@ -1088,6 +1087,7 @@ def get():
         profile = tools.profile(machine)
         m_version = get_version(machine)
 
+
         if "QT_SCALE_FACTOR=2" in profile:
             QT = 2
         if "GDK_SCALE=2" in profile:
@@ -2855,7 +2855,7 @@ def login(*args):
         if creds != {}:
             return creds
 
-
+from ttkbootstrap import Style
 def shortcut(name=None, cmd=None, mach=None, icn=None):
     ui.set_icons(asset_dir + "Paper/")
     k = get_light()
@@ -2879,6 +2879,10 @@ def quitter():
         # sys.exit()
         return None
 
+    #style = Style(theme='superhero')#darkly')
+    #boxRoot = style.master
+    
+
     boxRoot.title("Shortcut Creator")
     boxRoot.iconname("Dialog")
     boxRoot.minsize(420, 480)
@@ -3421,6 +3425,7 @@ def draw(canvas, mouse=False):
     if animator.get("start")[0] < 100 and animator.get("start")[0] > 0:
         if acrylic == False:
             canvas.blit(back, [-1 * (screensize[0] - WIDTH), -1 * (screensize[1] - taskbar - int(HEIGHT * launch))])
+        
         if pos_config == "bottom":
             win32gui.MoveWindow(HWND, winpos, screensize[1] - taskbar - int(HEIGHT * launch), WIDTH, HEIGHT, 1)
         elif pos_config == "top":
@@ -3430,7 +3435,6 @@ def draw(canvas, mouse=False):
                                 HEIGHT, 1)
         elif pos_config == "left":
             win32gui.MoveWindow(HWND, taskbar - WIDTH + int(WIDTH * launch), screensize[1] - HEIGHT, WIDTH, HEIGHT, 1)
-
         lumen_opac = 0
         win32gui.SetLayeredWindowAttributes(HWND, win32api.RGB(*fuchsia), int(launch * 255), win32con.LWA_ALPHA)
 

manager.py

@@ -68,8 +68,8 @@ def __init__(self, flavor_id="", lockfile=""):
             try:
                 fcntl.lockf(self.fp, fcntl.LOCK_EX | fcntl.LOCK_NB)
             except IOError:
-                logger.warning(
-                    "Another instance is already running, quitting.")
+                #logger.warning(
+                #    "Another instance is already running, quitting.")
                 raise SingleInstanceException()
         self.initialized = True
 
@@ -87,10 +87,10 @@ def __del__(self):
                 if os.path.isfile(self.lockfile):
                     os.unlink(self.lockfile)
         except Exception as e:
-            if logger:
-                logger.warning(e)
-            else:
-                print("Unloggable error: %s" % e)
+            #if logger:
+            #    logger.warning(e)
+            #else:
+            #    print("Unloggable error: %s" % e)
             sys.exit(-1)