Merge pull request #61 from FreeCAD/dev

Merge dev to main

Author: chennes

CMakeLists.txt

@@ -144,12 +144,6 @@ SET(AddonManagerResourceFilesTranslations
     Resources/translations/AddonManager_zh-TW.qm
 )
 
-LIST(APPEND AddonManager_SRCS
-    ${AddonManagerResourceFilesIcons}
-    ${AddonManagerResourceFilesLicenses}
-    ${AddonManagerResourceFilesTranslations}
-)
-
 SET(AddonManagerResourceFilesLicenses
     Resources/licenses/Apache-2.0.txt
     Resources/licenses/BSD-2-Clause.txt
@@ -164,6 +158,12 @@ SET(AddonManagerResourceFilesLicenses
     Resources/licenses/spdx.json
 )
 
+LIST(APPEND AddonManager_SRCS
+    ${AddonManagerResourceFilesIcons}
+    ${AddonManagerResourceFilesLicenses}
+    ${AddonManagerResourceFilesTranslations}
+)
+
 SET(AddonManagerTests_SRCS
     AddonManagerTest/__init__.py
     AddonManagerTest/test_information.md

addonmanager_devmode.py

@@ -36,7 +36,6 @@
 from addonmanager_devmode_predictor import Predictor
 from addonmanager_devmode_people_table import PeopleTable
 from addonmanager_devmode_licenses_table import LicensesTable
-from addonmanager_utilities import get_python_exe
 
 from addonmanager_metadata import Metadata, MetadataReader
 
@@ -602,7 +601,7 @@ def _ensure_vermin_loaded(self) -> bool:
             fci.Console.PrintMessage(
                 translate("AddonsInstaller", "Attempting to install Vermin from PyPi") + "...\n"
             )
-            python_exe = get_python_exe()
+            python_exe = fci.get_python_exe()
             vendor_path = os.path.join(fci.DataPaths().data_dir, "AdditionalPythonPackages")
             if not os.path.exists(vendor_path):
                 os.makedirs(vendor_path)

addonmanager_python_deps_gui.py

@@ -64,14 +64,6 @@ def loadUi(ui_file: str) -> QtWidgets.QWidget:
         return loader.load(ui_file)
 
 
-try:
-    from freecad.utils import get_python_exe
-except ImportError:
-
-    def get_python_exe():
-        return shutil.which("python")
-
-
 import addonmanager_utilities as utils
 
 translate = fci.translate

addonmanager_toolbar_adapter.py

@@ -23,10 +23,10 @@ class ToolbarAdapter:
     params = None
 
     def __init__(self):
-        if self.params is None:
-            self.params = fci.ParamGet("User parameter:BaseApp/Workbench/Global/Toolbar")
-        if fci.FreeCAD is not None:
+        if fci.FreeCAD is None:
             raise RuntimeError("ToolbarAdapter can only be used when run from within FreeCAD")
+        if self.params is None:
+            self.params = fci.FreeCAD.ParamGet("User parameter:BaseApp/Workbench/Global/Toolbar")
 
     def get_toolbars(self):
         """Get a list of toolbars: the result is a set of parameter groups, each representing a toolbar."""
@@ -45,7 +45,7 @@ def create_new_custom_toolbar(self):
         # unique.
 
         # First, the displayed name
-        custom_toolbar_name = QT_TRANSLATE_NOOP("Workbench", "Auto-Created Macro Toolbar")
+        custom_toolbar_name = str(QT_TRANSLATE_NOOP("Workbench", "Auto-Created Macro Toolbar"))
         custom_toolbars = self.params.GetGroups()
         name_taken = self.check_for_toolbar(custom_toolbar_name)
         if name_taken:
@@ -87,7 +87,6 @@ def get_toolbar_with_name(self, name: str):
 
     @staticmethod
     def create_custom_command(
-        cls,
         toolbar,
         filename,
         menu_text,
@@ -132,6 +131,6 @@ def get_custom_toolbars(self):
         return self.params.GetGroups()
 
     @staticmethod
-    def find_custom_command(cls, filename):
+    def find_custom_command(filename):
         """Wrap calls to FreeCADGui.Command.findCustomCommand so it can be faked in testing."""
         return fci.FreeCADGui.Command.findCustomCommand(filename)