Merge pull request #38 from Satanarious/Satanarious/issue36

Fix Internal and External Functions

Author: Satanarious

Scripts/build_and_pack_for_release.bat

@@ -0,0 +1,7 @@
+cd ..
+pyinstaller --onefile --clean --noconsole --path="venv/Lib/site-packages" --icon="Assets/app_icon.ico" -n "TranslucentFlyoutsConfig.exe" main.py
+rmdir /s /q %cd%\build
+echo F|xcopy /i /q %cd%\dist\TranslucentFlyoutsConfig.exe %cd%\TranslucentFlyoutsConfig.exe
+rmdir /s /q %cd%\dist
+7z a -tzip TranslucentFlyoutsConfigV1.3.2.zip Assets Translations TranslucentFlyoutsConfig.exe
+del TranslucentFlyoutsConfig.exe

Scripts/clean_and_pack.bat Scripts/build_and_pack_for_testing.batScripts/clean_and_pack.bat renamed to Scripts/build_and_pack_for_testing.bat

@@ -1,6 +1,7 @@
 cd ..
+pyinstaller --onefile --clean --path="venv/Lib/site-packages" --icon="Assets/app_icon.ico" -n "TranslucentFlyoutsConfig.exe" main.py
 rmdir /s /q %cd%\build
 echo F|xcopy /i /q %cd%\dist\TranslucentFlyoutsConfig.exe %cd%\TranslucentFlyoutsConfig.exe
 rmdir /s /q %cd%\dist
-7z a -tzip TranslucentFlyoutsConfigV1.3.0.zip Assets Translations TranslucentFlyoutsConfig.exe
+7z a -tzip TranslucentFlyoutsConfigV1.3.2.zip Assets Translations TranslucentFlyoutsConfig.exe
 del TranslucentFlyoutsConfig.exe

Scripts/build_exe.bat

@@ -6,7 +6,7 @@ block_cipher = None
 
 a = Analysis(
     ['main.py'],
-    pathex=[],
+    pathex=['venv/Lib/site-packages'],
     binaries=[],
     datas=[],
     hiddenimports=[],

TranslucentFlyoutsConfig.exe.spec

@@ -1421,51 +1421,57 @@ def setMouseEvents(label: QLabel, parameterType: str, height: int):
 
     @staticmethod
     def connectSettings(window: Main):
+        _translate = translationVar.translateFrom
+
         def isValidTFPath() -> bool:
             if AppSettings.path in ("", None):
                 return False
-            elif not os.path.isfile(AppSettings.path + "/" + "TFMain64.dll"):
+            elif not os.path.isfile(AppSettings.path + "\\" + "TFMain64.dll"):
                 return False
             return True
 
         def run():
             if not isValidTFPath():
                 window.toolBox.setCurrentIndex(0)
-                window.location_error_text.setText("!! Error: TFMain64.dll not found !!")
+                window.location_error_text.setText(_translate("!! Error: TFMain64.dll not found !!"))
                 return
-            os.system(AppSettings.path + "/" + "start.bat")
+
+            os.system(rf'"{AppSettings.path}\\start.bat"')
 
         def stop():
             if not isValidTFPath():
                 window.toolBox.setCurrentIndex(0)
-                window.location_error_text.setText("!! Error: TFMain64.dll not found !!")
+                window.location_error_text.setText(_translate("!! Error: TFMain64.dll not found !!"))
                 return
-            os.system(AppSettings.path + "/" + "stop.bat")
+
+            os.system(rf'"{AppSettings.path}\\stop.bat"')
 
         def install():
             if not isValidTFPath():
                 window.toolBox.setCurrentIndex(0)
-                window.location_error_text.setText("!! Error: TFMain64.dll not found !!")
+                window.location_error_text.setText(_translate("!! Error: TFMain64.dll not found !!"))
                 return
+
             windll.shell32.ShellExecuteW(
                 None,
                 "runas",
                 "cmd.exe",
-                " ".join(["/c", AppSettings.path + "/" + "install.bat"]),
+                " ".join(["/c", rf'"{AppSettings.path}\\install.bat"']),
                 None,
                 1,
             )
 
         def uninstall():
             if not isValidTFPath():
                 window.toolBox.setCurrentIndex(0)
-                window.location_error_text.setText("!! Error: TFMain64.dll not found !!")
+                window.location_error_text.setText(_translate("!! Error: TFMain64.dll not found !!"))
                 return
+
             windll.shell32.ShellExecuteW(
                 None,
                 "runas",
                 "cmd.exe",
-                " ".join(["/c", AppSettings.path + "/" + "uninstall.bat"]),
+                " ".join(["/c", rf'"{AppSettings.path}\\uninstall.bat"']),
                 None,
                 1,
             )
@@ -1504,7 +1510,7 @@ def saveGeneral():
             if path in ["", None] or not os.path.isfile(r"{}/{}".format(path, "TFMain64.dll")):
                 AppSettings.path = ""
                 window.locationLineEdit.setText(AppSettings.path)
-                window.location_error_text.setText("!! Error: TFMain64.dll not found !!")
+                window.location_error_text.setText(_translate("!! Error: TFMain64.dll not found !!"))
             else:
                 AppSettings.path = path
                 window.location_error_text.setText("")

connections.py

@@ -1,4 +1,5 @@
 PyQt6==6.4.2
 pyqt6-tools==6.4.2.3.3
 pyinstaller==5.13.0
-vcolorpicker==1.4.3
+vcolorpicker==1.4.3
+wget==3.2