{message}
") - self.message_label.setStyleSheet("color:" + attention_color_string()) - - def set_new_branch(self, branch: str): - """If the user just changed branches, update the message to show that a restart is - needed.""" - message_string = "" - message_string += translate( - "AddonsInstaller", "Changed to branch '{}' -- please restart to use Addon." - ).format(branch) - message_string += "
" - self.message_label.setText(message_string) - self.message_label.setStyleSheet("color:" + attention_color_string()) - - def set_updated(self): - """If the user has just updated the addon but not yet restarted, show an indication that - we are awaiting a restart.""" - message = translate( - "AddonsInstaller", "This Addon has been updated. Restart FreeCAD to see changes." - ) - self.message_label.setText(f"{message}
") - self.message_label.setStyleSheet("color:" + attention_color_string()) - - def _sync_ui_state(self): - self._sync_button_state() - self._create_status_label_text() - - def _sync_button_state(self): - self.button_bar.install.setVisible(not self.installed) - self.button_bar.uninstall.setVisible(self.installed) - if not self.installed: - self.button_bar.disable.hide() - self.button_bar.enable.hide() - self.button_bar.update.hide() - self.button_bar.check_for_update.hide() - else: - self.button_bar.update.setVisible(self.update_info.update_available) - if self.update_info.detached_head: - self.button_bar.check_for_update.hide() - else: - self.button_bar.check_for_update.setVisible(not self.update_info.update_available) - if self.can_disable: - self.button_bar.enable.setVisible(self.disabled) - self.button_bar.disable.setVisible(not self.disabled) - else: - self.button_bar.enable.hide() - self.button_bar.disable.hide() - - def _create_status_label_text(self): - if self.installed: - installation_details = self._get_installation_details_string() - update_details = self._get_update_status_string() - message_text = f"{installation_details} {update_details}" - if self.disabled: - message_text += " [" + translate("AddonsInstaller", "Disabled") + "]" - self.message_label.setText(f"{message_text}
") - if self.disabled: - self.message_label.setStyleSheet("color:" + warning_color_string()) - elif self.update_info.update_available: - self.message_label.setStyleSheet("color:" + attention_color_string()) - else: - self.message_label.setStyleSheet("color:" + bright_color_string()) - self.message_label.show() - elif self._there_are_warnings_to_show(): - warnings = self._get_warning_string() - self.message_label.setText(f"{warnings}
") - self.message_label.setStyleSheet("color:" + warning_color_string()) - self.message_label.show() - else: - self.message_label.hide() - - def _get_installation_details_string(self) -> str: - version = self.installed_version - date = "" - installed_version_string = "" - if self.installed_timestamp: - date = QtCore.QLocale().toString( - QtCore.QDateTime.fromSecsSinceEpoch(int(round(self.installed_timestamp, 0))), - QtCore.QLocale.ShortFormat, - ) - if version and date: - installed_version_string += ( - translate("AddonsInstaller", "Version {version} installed on {date}").format( - version=version, date=date - ) - + ". " - ) - elif version: - installed_version_string += ( - translate("AddonsInstaller", "Version {version} installed") + "." - ).format(version=version) - elif date: - installed_version_string += ( - translate("AddonsInstaller", "Installed on {date}") + "." - ).format(date=date) - else: - installed_version_string += translate("AddonsInstaller", "Installed") + "." - return installed_version_string - - def _get_update_status_string(self) -> str: - if self.update_info.check_in_progress: - return translate("AddonsInstaller", "Update check in progress") + "." - elif self.update_info.unchecked: - return "" - if self.update_info.detached_head: - return ( - translate( - "AddonsInstaller", "Git tag '{}' checked out, no updates possible" - ).format(self.update_info.tag) - + "." - ) - if self.update_info.update_available: - if self.installed_branch and self.update_info.branch: - if self.installed_branch != self.update_info.branch: - return ( - translate( - "AddonsInstaller", "Currently on branch {}, name changed to {}" - ).format(self.installed_branch, self.update_info.branch) - + "." - ) - if self.update_info.version: - return ( - translate( - "AddonsInstaller", - "Currently on branch {}, update available to version {}", - ).format(self.installed_branch, str(self.update_info.version).strip()) - + "." - ) - return translate("AddonsInstaller", "Update available") + "." - if self.update_info.version: - return ( - translate("AddonsInstaller", "Update available to version {}").format( - str(self.update_info.version).strip() - ) - + "." - ) - return translate("AddonsInstaller", "Update available") + "." - return translate("AddonsInstaller", "This is the latest version available") + "." - - def _there_are_warnings_to_show(self) -> bool: - if self.disabled: - return True - if ( - self.warning_flags.obsolete - or self.warning_flags.python2 - or self.warning_flags.required_freecad_version - ): - return True - return False # TODO: Someday support optional warnings on license types - - def _get_warning_string(self) -> str: - if self.installed and self.disabled: - return translate( - "AddonsInstaller", - "WARNING: This addon is currently installed, but disabled. Use the 'enable' " - "button to re-enable.", - ) - if self.warning_flags.obsolete: - return translate("AddonsInstaller", "WARNING: This addon is obsolete") - if self.warning_flags.python2: - return translate("AddonsInstaller", "WARNING: This addon is Python 2 only") - if self.warning_flags.required_freecad_version: - return translate("AddonsInstaller", "WARNING: This addon requires FreeCAD {}").format( - self.warning_flags.required_freecad_version - ) - return "" diff --git a/src/Mod/AddonManager/Widgets/addonmanager_widget_progress_bar.py b/src/Mod/AddonManager/Widgets/addonmanager_widget_progress_bar.py deleted file mode 100644 index 1e9c0a1f20..0000000000 --- a/src/Mod/AddonManager/Widgets/addonmanager_widget_progress_bar.py +++ /dev/null @@ -1,168 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -# *************************************************************************** -# * * -# * Copyright (c) 2022-2024 FreeCAD Project Association * -# * * -# * This file is part of FreeCAD. * -# * * -# * FreeCAD is free software: you can redistribute it and/or modify it * -# * under the terms of the GNU Lesser General Public License as * -# * published by the Free Software Foundation, either version 2.1 of the * -# * License, or (at your option) any later version. * -# * * -# * FreeCAD is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * -# * Lesser General Public License for more details. * -# * * -# * You should have received a copy of the GNU Lesser General Public * -# * License along with FreeCAD. If not, see * -# *" - + translate( - "AddonsInstaller", - "This addon requires Python packages that are not installed, and cannot be installed automatically. To use this addon you must install the following Python packages manually:", - ) - + "
- "
- )
- if len(bad_packages) < 15:
- for dep in bad_packages:
- message += f"
- {dep} " - else: - message += "
- (" + translate("AddonsInstaller", "Too many to list") + ") " - message += "
" - + translate( - "AddonsInstaller", - "Addon '{}' requires the following workbenches, which are not available in your copy of FreeCAD:", - ).format(addon_name) - + "
- "
- )
- for wb in wbs:
- message += "
- " + wb + " " - message += "
{self.addon_to_install.macro.comment}
" - whatsThisText = self.addon_to_install.macro.comment - else: - whatsThisText = translate( - "AddonsInstaller", "A macro installed with the FreeCAD Addon Manager" - ) - statustipText = ( - translate("AddonsInstaller", "Run", "Indicates a macro that can be 'run'") - + " " - + self.addon_to_install.display_name - ) - if self.addon_to_install.macro.icon: - if os.path.isabs(self.addon_to_install.macro.icon): - pixmapText = os.path.normpath(self.addon_to_install.macro.icon) - else: - pixmapText = os.path.normpath( - os.path.join(self.macro_dir, self.addon_to_install.macro.icon) - ) - elif self.addon_to_install.macro.xpm: - icon_file = os.path.normpath( - os.path.join(self.macro_dir, self.addon_to_install.macro.name + "_icon.xpm") - ) - with open(icon_file, "w", encoding="utf-8") as f: - f.write(self.addon_to_install.macro.xpm) - pixmapText = icon_file - else: - pixmapText = None - - # Add this command to that toolbar - self._create_custom_command( - toolbar, - self.addon_to_install.macro.filename, - menuText, - tooltipText, - whatsThisText, - statustipText, - pixmapText, - ) - - # pylint: disable=too-many-arguments - def _create_custom_command( - self, - toolbar, - filename, - menuText, - tooltipText, - whatsThisText, - statustipText, - pixmapText, - ): - """Wrap createCustomCommand so it can be overridden during testing.""" - # Add this command to that toolbar - command_name = FreeCADGui.Command.createCustomCommand( - filename, - menuText, - tooltipText, - whatsThisText, - statustipText, - pixmapText, - ) - toolbar.SetString(command_name, "FreeCAD") - - # Force the toolbars to be recreated - wb = FreeCADGui.activeWorkbench() - wb.reloadActive() - - def _remove_custom_toolbar_button(self) -> None: - """If this repo contains a macro, look through the custom commands and - see if one is set up for this macro. If so, remove it, including any - toolbar entries.""" - - command = FreeCADGui.Command.findCustomCommand(self.addon_to_install.macro.filename) - if not command: - return - custom_toolbars = FreeCAD.ParamGet("User parameter:BaseApp/Workbench/Global/Toolbar") - toolbar_groups = custom_toolbars.GetGroups() - for group in toolbar_groups: - toolbar = custom_toolbars.GetGroup(group) - if toolbar.GetString(command, "*") != "*": - toolbar.RemString(command) - - FreeCADGui.Command.removeCustomCommand(command) - - # Force the toolbars to be recreated - wb = FreeCADGui.activeWorkbench() - wb.reloadActive() diff --git a/src/Mod/AddonManager/addonmanager_licenses.py b/src/Mod/AddonManager/addonmanager_licenses.py deleted file mode 100644 index 46af254959..0000000000 --- a/src/Mod/AddonManager/addonmanager_licenses.py +++ /dev/null @@ -1,187 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -# *************************************************************************** -# * * -# * Copyright (c) 2024 FreeCAD Project Association * -# * * -# * This file is part of FreeCAD. * -# * * -# * FreeCAD is free software: you can redistribute it and/or modify it * -# * under the terms of the GNU Lesser General Public License as * -# * published by the Free Software Foundation, either version 2.1 of the * -# * License, or (at your option) any later version. * -# * * -# * FreeCAD is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * -# * Lesser General Public License for more details. * -# * * -# * You should have received a copy of the GNU Lesser General Public * -# * License along with FreeCAD. If not, see * -# *(.*?)", p.replace("\n", "--endl--")) - if code: - # take the biggest code block - code = str(sorted(code, key=len)[-1]) - code = code.replace("--endl--", "\n") - # Clean HTML escape codes. - code = unescape(code) - code = code.replace(b"\xc2\xa0".decode("utf-8"), " ") - return code - - def clean_icon(self): - """Downloads the macro's icon from whatever source is specified and stores a local - copy, potentially updating the internal icon location to that local storage.""" - if self.icon.startswith("http://") or self.icon.startswith("https://"): - self._console.PrintLog(f"Attempting to fetch macro icon from {self.icon}\n") - parsed_url = urllib.parse.urlparse(self.icon) - p = Macro.blocking_get(self.icon) - if p: - cache_path = fci.DataPaths().cache_dir - am_path = os.path.join(cache_path, "AddonManager", "MacroIcons") - os.makedirs(am_path, exist_ok=True) - _, _, filename = parsed_url.path.rpartition("/") - base, _, extension = filename.rpartition(".") - if base.lower().startswith("file:"): - self._console.PrintMessage( - f"Cannot use specified icon for {self.name}, {self.icon} " - "is not a direct download link\n" - ) - self.icon = "" - else: - constructed_name = os.path.join(am_path, base + "." + extension) - with open(constructed_name, "wb") as f: - f.write(p) - self.icon_source = self.icon - self.icon = constructed_name - else: - self._console.PrintLog( - f"MACRO DEVELOPER WARNING: failed to download icon from {self.icon}" - f" for macro {self.name}\n" - ) - self.icon = "" - - def parse_desc(self, line_start: str) -> Union[str, None]: - """Get data from the wiki for the value specified by line_start.""" - components = self.desc.split(">") - for component in components: - if component.startswith(line_start): - end = component.find("<") - return component[len(line_start) : end] - return None - - def install(self, macro_dir: str) -> Tuple[bool, List[str]]: - """Install a macro and all its related files - Returns True if the macro was installed correctly. - Parameters - ---------- - - macro_dir: the directory to install into - """ - - if not self.code: - return False, ["No code"] - if not os.path.isdir(macro_dir): - try: - os.makedirs(macro_dir) - except OSError: - return False, [f"Failed to create {macro_dir}"] - macro_path = os.path.join(macro_dir, self.filename) - try: - with codecs.open(macro_path, "w", "utf-8") as macrofile: - macrofile.write(self.code) - except OSError: - return False, [f"Failed to write {macro_path}"] - # Copy related files, which are supposed to be given relative to - # self.src_filename. - warnings = [] - - self._copy_icon_data(macro_dir, warnings) - success = self._copy_other_files(macro_dir, warnings) - - if warnings or not success > 0: - return False, warnings - - self._console.PrintLog(f"Macro {self.name} was installed successfully.\n") - return True, [] - - def _copy_icon_data(self, macro_dir, warnings): - """Copy any available icon data into the install directory""" - base_dir = os.path.dirname(self.src_filename) - if self.xpm: - xpm_file = os.path.join(base_dir, self.name + "_icon.xpm") - with open(xpm_file, "w", encoding="utf-8") as f: - f.write(self.xpm) - if self.icon: - if os.path.isabs(self.icon): - dst_file = os.path.normpath(os.path.join(macro_dir, os.path.basename(self.icon))) - try: - shutil.copy(self.icon, dst_file) - except OSError: - warnings.append(f"Failed to copy icon to {dst_file}") - elif self.icon not in self.other_files: - self.other_files.append(self.icon) - - def _copy_other_files(self, macro_dir, warnings) -> bool: - """Copy any specified "other files" into the installation directory""" - base_dir = os.path.dirname(self.src_filename) - for other_file in self.other_files: - if not other_file: - continue - if os.path.isabs(other_file): - dst_dir = macro_dir - else: - dst_dir = os.path.join(macro_dir, os.path.dirname(other_file)) - if not os.path.isdir(dst_dir): - try: - os.makedirs(dst_dir) - except OSError: - warnings.append(f"Failed to create {dst_dir}") - return False - if os.path.isabs(other_file): - src_file = other_file - dst_file = os.path.normpath(os.path.join(macro_dir, os.path.basename(other_file))) - else: - src_file = os.path.normpath(os.path.join(base_dir, other_file)) - dst_file = os.path.normpath(os.path.join(macro_dir, other_file)) - self._fetch_single_file(other_file, src_file, dst_file, warnings) - try: - shutil.copy(src_file, dst_file) - except OSError: - warnings.append(f"Failed to copy {src_file} to {dst_file}") - return True # No fatal errors, but some files may have failed to copy - - def _fetch_single_file(self, other_file, src_file, dst_file, warnings): - if not os.path.isfile(src_file): - # If the file does not exist, see if we have a raw code URL to fetch from - if self.raw_code_url: - fetch_url = self.raw_code_url.rsplit("/", 1)[0] + "/" + other_file - self._console.PrintLog(f"Attempting to fetch {fetch_url}...\n") - p = Macro.blocking_get(fetch_url) - if p: - with open(dst_file, "wb") as f: - f.write(p) - else: - self._console.PrintWarning( - translate( - "AddonsInstaller", - "Unable to fetch macro-specified file {} from {}", - ).format(other_file, fetch_url) - + "\n" - ) - else: - warnings.append( - translate( - "AddonsInstaller", - "Could not locate macro-specified file {} (expected at {})", - ).format(other_file, src_file) - ) - - def parse_wiki_page_for_icon(self, page_data: str) -> None: - """Attempt to find the url for the icon in the wiki page. Sets 'self.icon' if - found.""" - - # Method 1: the text "toolbar icon" appears on the page, and provides a direct - # link to an icon - - # pylint: disable=line-too-long - # Try to get an icon from the wiki page itself: - # ToolBar Icon - icon_regex = re.compile(r'.*href="(.*?)">ToolBar Icon', re.IGNORECASE) - wiki_icon = "" - if "ToolBar Icon" in page_data: - f = io.StringIO(page_data) - lines = f.readlines() - for line in lines: - if ">ToolBar Icon<" in line: - match = icon_regex.match(line) - if match: - wiki_icon = match.group(1) - if "file:" not in wiki_icon.lower(): - self.icon = wiki_icon - return - break - - # See if we found an icon, but it wasn't a direct link: - icon_regex = re.compile(r'.*img.*?src="(.*?)"', re.IGNORECASE) - if wiki_icon.startswith("http"): - # It's a File: wiki link. We can load THAT page and get the image from it... - self._console.PrintLog(f"Found a File: link for macro {self.name} -- {wiki_icon}\n") - p = Macro.blocking_get(wiki_icon) - if p: - p = p.decode("utf8") - f = io.StringIO(p) - lines = f.readlines() - trigger = False - for line in lines: - if trigger: - match = icon_regex.match(line) - if match: - wiki_icon = match.group(1) - self.icon = "https://wiki.freecad.org/" + wiki_icon - return - elif "fullImageLink" in line: - trigger = True - - #
- #
- # 
- #
-
-
-# @}
diff --git a/src/Mod/AddonManager/addonmanager_macro_parser.py b/src/Mod/AddonManager/addonmanager_macro_parser.py
deleted file mode 100644
index 8a560c79ae..0000000000
--- a/src/Mod/AddonManager/addonmanager_macro_parser.py
+++ /dev/null
@@ -1,257 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-# ***************************************************************************
-# * *
-# * Copyright (c) 2023 FreeCAD Project Association *
-# * *
-# * This file is part of FreeCAD. *
-# * *
-# * FreeCAD is free software: you can redistribute it and/or modify it *
-# * under the terms of the GNU Lesser General Public License as *
-# * published by the Free Software Foundation, either version 2.1 of the *
-# * License, or (at your option) any later version. *
-# * *
-# * FreeCAD is distributed in the hope that it will be useful, but *
-# * WITHOUT ANY WARRANTY; without even the implied warranty of *
-# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
-# * Lesser General Public License for more details. *
-# * *
-# * You should have received a copy of the GNU Lesser General Public *
-# * License along with FreeCAD. If not, see *
-# * *
-# * *
-# * This file is part of FreeCAD. *
-# * *
-# * FreeCAD is free software: you can redistribute it and/or modify it *
-# * under the terms of the GNU Lesser General Public License as *
-# * published by the Free Software Foundation, either version 2.1 of the *
-# * License, or (at your option) any later version. *
-# * *
-# * FreeCAD is distributed in the hope that it will be useful, but *
-# * WITHOUT ANY WARRANTY; without even the implied warranty of *
-# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
-# * Lesser General Public License for more details. *
-# * *
-# * You should have received a copy of the GNU Lesser General Public *
-# * License along with FreeCAD. If not, see *
-# * *
-# * *
-# * This file is part of FreeCAD. *
-# * *
-# * FreeCAD is free software: you can redistribute it and/or modify it *
-# * under the terms of the GNU Lesser General Public License as *
-# * published by the Free Software Foundation, either version 2.1 of the *
-# * License, or (at your option) any later version. *
-# * *
-# * FreeCAD is distributed in the hope that it will be useful, but *
-# * WITHOUT ANY WARRANTY; without even the implied warranty of *
-# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
-# * Lesser General Public License for more details. *
-# * *
-# * You should have received a copy of the GNU Lesser General Public *
-# * License along with FreeCAD. If not, see *
-# * *
-# * *
-# * This file is part of FreeCAD. *
-# * *
-# * FreeCAD is free software: you can redistribute it and/or modify it *
-# * under the terms of the GNU Lesser General Public License as *
-# * published by the Free Software Foundation, either version 2.1 of the *
-# * License, or (at your option) any later version. *
-# * *
-# * FreeCAD is distributed in the hope that it will be useful, but *
-# * WITHOUT ANY WARRANTY; without even the implied warranty of *
-# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
-# * Lesser General Public License for more details. *
-# * *
-# * You should have received a copy of the GNU Lesser General Public *
-# * License along with FreeCAD. If not, see *
-# * .*)"\]\s*'
- r"path\s*=\s*(?P.+)\s*"
- r"url\s*=\s*(?Phttps?://.*)\s*"
- r"(branch\s*=\s*(?P[^\s]*)\s*)?"
- ),
- p,
- )
- for name, _, url, _, branch in p:
- if self.current_thread.isInterruptionRequested():
- return
- if name in self.package_names:
- # We already have something with this name, skip this one
- continue
- self.package_names.append(name)
- if branch is None or len(branch) == 0:
- branch = "master"
- url = url.split(".git")[0]
- addondir = os.path.join(self.moddir, name)
- if os.path.exists(addondir) and os.listdir(addondir):
- # make sure the folder exists and it contains files!
- state = Addon.Status.UNCHECKED
- else:
- state = Addon.Status.NOT_INSTALLED
- repo = Addon(name, url, state, branch)
- md_file = os.path.join(addondir, "package.xml")
- if os.path.isfile(md_file):
- try:
- repo.installed_metadata = MetadataReader.from_file(md_file)
- repo.installed_version = repo.installed_metadata.version
- repo.updated_timestamp = os.path.getmtime(md_file)
- repo.verify_url_and_branch(url, branch)
- except xml.etree.ElementTree.ParseError:
- fci.Console.PrintWarning(
- "An invalid or corrupted package.xml file was installed for"
- )
- fci.Console.PrintWarning(f" addon {self.name}... ignoring the bad data.\n")
-
- if name in self.py2only:
- repo.python2 = True
- if name in self.mod_reject_list:
- repo.rejected = True
- if name in self.obsolete:
- repo.obsolete = True
- self.addon_repo.emit(repo)
-
- def _retrieve_macros_from_git(self):
- """Retrieve macros from FreeCAD-macros.git
-
- Emits a signal for each macro in
- https://github.com/FreeCAD/FreeCAD-macros.git
- """
-
- macro_cache_location = utils.get_cache_file_name("Macros")
-
- if not self.git_manager:
- message = translate(
- "AddonsInstaller",
- "Git is disabled, skipping Git macros",
- )
- FreeCAD.Console.PrintWarning(message + "\n")
- return
-
- update_succeeded = self._update_local_git_repo()
- if not update_succeeded:
- return
-
- n_files = 0
- for _, _, filenames in os.walk(macro_cache_location):
- n_files += len(filenames)
- counter = 0
- for dirpath, _, filenames in os.walk(macro_cache_location):
- counter += 1
- if self.current_thread.isInterruptionRequested():
- return
- if ".git" in dirpath:
- continue
- for filename in filenames:
- if self.current_thread.isInterruptionRequested():
- return
- if filename.lower().endswith(".fcmacro"):
- macro = Macro(filename[:-8]) # Remove ".FCMacro".
- if macro.name in self.package_names:
- FreeCAD.Console.PrintLog(
- f"Ignoring second macro named {macro.name} (found on git)\n"
- )
- continue # We already have a macro with this name
- self.package_names.append(macro.name)
- macro.on_git = True
- macro.src_filename = os.path.join(dirpath, filename)
- macro.fill_details_from_file(macro.src_filename)
- repo = Addon.from_macro(macro)
- FreeCAD.Console.PrintLog(f"Found macro {repo.name}\n")
- repo.url = "https://github.com/FreeCAD/FreeCAD-macros.git"
- utils.update_macro_installation_details(repo)
- self.addon_repo.emit(repo)
-
- def _update_local_git_repo(self) -> bool:
- macro_cache_location = utils.get_cache_file_name("Macros")
- try:
- if os.path.exists(macro_cache_location):
- if not os.path.exists(os.path.join(macro_cache_location, ".git")):
- FreeCAD.Console.PrintWarning(
- translate(
- "AddonsInstaller",
- "Attempting to change non-Git Macro setup to use Git\n",
- )
- )
- self.git_manager.repair(
- "https://github.com/FreeCAD/FreeCAD-macros.git",
- macro_cache_location,
- )
- self.git_manager.update(macro_cache_location)
- else:
- self.git_manager.clone(
- "https://github.com/FreeCAD/FreeCAD-macros.git",
- macro_cache_location,
- )
- except GitFailed as e:
- FreeCAD.Console.PrintMessage(
- translate(
- "AddonsInstaller",
- "An error occurred updating macros from GitHub, trying clean checkout...",
- )
- + f":\n{e}\n"
- )
- FreeCAD.Console.PrintMessage(f"{macro_cache_location}\n")
- FreeCAD.Console.PrintMessage(
- translate("AddonsInstaller", "Attempting to do a clean checkout...") + "\n"
- )
- try:
- os.chdir(
- os.path.join(macro_cache_location, "..")
- ) # Make sure we are not IN this directory
- shutil.rmtree(macro_cache_location, onerror=self._remove_readonly)
- self.git_manager.clone(
- "https://github.com/FreeCAD/FreeCAD-macros.git",
- macro_cache_location,
- )
- FreeCAD.Console.PrintMessage(
- translate("AddonsInstaller", "Clean checkout succeeded") + "\n"
- )
- except GitFailed as e2:
- # The Qt Python translation extractor doesn't support splitting this string (yet)
- # pylint: disable=line-too-long
- FreeCAD.Console.PrintWarning(
- translate(
- "AddonsInstaller",
- "Failed to update macros from GitHub -- try clearing the Addon Manager's cache.",
- )
- + f":\n{str(e2)}\n"
- )
- return False
- return True
-
- def _retrieve_macros_from_wiki(self):
- """Retrieve macros from the wiki
-
- Read the wiki and emit a signal for each found macro.
- Reads only the page https://wiki.freecad.org/Macros_recipes
- """
-
- p = NetworkManager.AM_NETWORK_MANAGER.blocking_get(
- "https://wiki.freecad.org/Macros_recipes", 5000
- )
- if not p:
- # The Qt Python translation extractor doesn't support splitting this string (yet)
- # pylint: disable=line-too-long
- FreeCAD.Console.PrintWarning(
- translate(
- "AddonsInstaller",
- "Error connecting to the Wiki, FreeCAD cannot retrieve the Wiki macro list at this time",
- )
- + "\n"
- )
- return
- p = p.data().decode("utf8")
- macros = re.findall(r'title="(Macro.*?)"', p)
- macros = [mac for mac in macros if "translated" not in mac]
- macro_names = []
- for _, mac in enumerate(macros):
- if self.current_thread.isInterruptionRequested():
- return
- macname = mac[6:] # Remove "Macro ".
- macname = macname.replace("&", "&")
- if not macname:
- continue
- if (
- (macname not in self.macros_reject_list)
- and ("recipes" not in macname.lower())
- and (macname not in macro_names)
- ):
- macro_names.append(macname)
- macro = Macro(macname)
- if macro.name in self.package_names:
- FreeCAD.Console.PrintLog(
- f"Ignoring second macro named {macro.name} (found on wiki)\n"
- )
- continue # We already have a macro with this name
- self.package_names.append(macro.name)
- macro.on_wiki = True
- macro.parsed = False
- repo = Addon.from_macro(macro)
- repo.url = "https://wiki.freecad.org/Macros_recipes"
- utils.update_macro_installation_details(repo)
- self.addon_repo.emit(repo)
-
- def _remove_readonly(self, func, path, _) -> None:
- """Remove a read-only file."""
-
- os.chmod(path, stat.S_IWRITE)
- func(path)
-
-
-class LoadPackagesFromCacheWorker(QtCore.QThread):
- """A subthread worker that loads package information from its cache file."""
-
- addon_repo = QtCore.Signal(object)
-
- def __init__(self, cache_file: str):
- QtCore.QThread.__init__(self)
- self.cache_file = cache_file
- self.metadata_cache_path = os.path.join(
- FreeCAD.getUserCachePath(), "AddonManager", "PackageMetadata"
- )
-
- def override_metadata_cache_path(self, path):
- """For testing purposes, override the location to fetch the package metadata from."""
- self.metadata_cache_path = path
-
- def run(self):
- """Rarely called directly: create an instance and call start() on it instead to
- launch in a new thread"""
- with open(self.cache_file, encoding="utf-8") as f:
- data = f.read()
- if data:
- dict_data = json.loads(data)
- for item in dict_data.values():
- if QtCore.QThread.currentThread().isInterruptionRequested():
- return
- repo = Addon.from_cache(item)
- repo_metadata_cache_path = os.path.join(
- self.metadata_cache_path, repo.name, "package.xml"
- )
- if os.path.isfile(repo_metadata_cache_path):
- try:
- repo.load_metadata_file(repo_metadata_cache_path)
- except RuntimeError as e:
- FreeCAD.Console.PrintLog(f"Failed loading {repo_metadata_cache_path}\n")
- FreeCAD.Console.PrintLog(str(e) + "\n")
- self.addon_repo.emit(repo)
-
-
-class LoadMacrosFromCacheWorker(QtCore.QThread):
- """A worker object to load macros from a cache file"""
-
- add_macro_signal = QtCore.Signal(object)
-
- def __init__(self, cache_file: str):
- QtCore.QThread.__init__(self)
- self.cache_file = cache_file
-
- def run(self):
- """Rarely called directly: create an instance and call start() on it instead to
- launch in a new thread"""
-
- with open(self.cache_file, encoding="utf-8") as f:
- data = f.read()
- dict_data = json.loads(data)
- for item in dict_data:
- if QtCore.QThread.currentThread().isInterruptionRequested():
- return
- new_macro = Macro.from_cache(item)
- repo = Addon.from_macro(new_macro)
- utils.update_macro_installation_details(repo)
- self.add_macro_signal.emit(repo)
-
-
-class CheckSingleUpdateWorker(QtCore.QObject):
- """This worker is a little different from the others: the actual recommended way of
- running in a QThread is to make a worker object that gets moved into the thread."""
-
- update_status = QtCore.Signal(int)
-
- def __init__(self, repo: Addon, parent: QtCore.QObject = None):
- super().__init__(parent)
- self.repo = repo
-
- def do_work(self):
- """Use the UpdateChecker class to do the work of this function, depending on the
- type of Addon"""
-
- checker = UpdateChecker()
- if self.repo.repo_type == Addon.Kind.WORKBENCH:
- checker.check_workbench(self.repo)
- elif self.repo.repo_type == Addon.Kind.MACRO:
- checker.check_macro(self.repo)
- elif self.repo.repo_type == Addon.Kind.PACKAGE:
- checker.check_package(self.repo)
-
- self.update_status.emit(self.repo.update_status)
-
-
-class CheckWorkbenchesForUpdatesWorker(QtCore.QThread):
- """This worker checks for available updates for all workbenches"""
-
- update_status = QtCore.Signal(Addon)
- progress_made = QtCore.Signal(str, int, int)
-
- def __init__(self, repos: List[Addon]):
-
- QtCore.QThread.__init__(self)
- self.repos = repos
- self.current_thread = None
- self.basedir = FreeCAD.getUserAppDataDir()
- self.moddir = os.path.join(self.basedir, "Mod")
-
- def run(self):
- """Rarely called directly: create an instance and call start() on it instead to
- launch in a new thread"""
-
- self.current_thread = QtCore.QThread.currentThread()
- checker = UpdateChecker()
- count = 1
- for repo in self.repos:
- if self.current_thread.isInterruptionRequested():
- return
- message = translate("AddonsInstaller", "Checking {} for update").format(
- repo.display_name
- )
- self.progress_made.emit(message, count, len(self.repos))
- count += 1
- if repo.status() == Addon.Status.UNCHECKED:
- if repo.repo_type == Addon.Kind.WORKBENCH:
- checker.check_workbench(repo)
- self.update_status.emit(repo)
- elif repo.repo_type == Addon.Kind.MACRO:
- checker.check_macro(repo)
- self.update_status.emit(repo)
- elif repo.repo_type == Addon.Kind.PACKAGE:
- checker.check_package(repo)
- self.update_status.emit(repo)
-
-
-class UpdateChecker:
- """A utility class used by the CheckWorkbenchesForUpdatesWorker class. Each function is
- designed for a specific Addon type, and modifies the passed-in Addon with the determined
- update status."""
-
- def __init__(self):
- self.basedir = FreeCAD.getUserAppDataDir()
- self.moddir = os.path.join(self.basedir, "Mod")
- self.git_manager = initialize_git()
-
- def override_mod_directory(self, moddir):
- """Primarily for use when testing, sets an alternate directory to use for mods"""
- self.moddir = moddir
-
- def check_workbench(self, wb):
- """Given a workbench Addon wb, check it for updates using git. If git is not
- available, does nothing."""
- if not self.git_manager:
- wb.set_status(Addon.Status.CANNOT_CHECK)
- return
- clonedir = os.path.join(self.moddir, wb.name)
- if os.path.exists(clonedir):
- # mark as already installed AND already checked for updates
- if not os.path.exists(os.path.join(clonedir, ".git")):
- with wb.git_lock:
- self.git_manager.repair(wb.url, clonedir)
- with wb.git_lock:
- try:
- status = self.git_manager.status(clonedir)
- if "(no branch)" in status:
- # By definition, in a detached-head state we cannot
- # update, so don't even bother checking.
- wb.set_status(Addon.Status.NO_UPDATE_AVAILABLE)
- wb.branch = self.git_manager.current_branch(clonedir)
- return
- except GitFailed as e:
- FreeCAD.Console.PrintWarning(
- "AddonManager: "
- + translate(
- "AddonsInstaller",
- "Unable to fetch Git updates for workbench {}",
- ).format(wb.name)
- + "\n"
- )
- FreeCAD.Console.PrintWarning(str(e) + "\n")
- wb.set_status(Addon.Status.CANNOT_CHECK)
- else:
- try:
- if self.git_manager.update_available(clonedir):
- wb.set_status(Addon.Status.UPDATE_AVAILABLE)
- else:
- wb.set_status(Addon.Status.NO_UPDATE_AVAILABLE)
- except GitFailed:
- FreeCAD.Console.PrintWarning(
- translate("AddonsInstaller", "Git status failed for {}").format(wb.name)
- + "\n"
- )
- wb.set_status(Addon.Status.CANNOT_CHECK)
-
- def _branch_name_changed(self, package: Addon) -> bool:
- clone_dir = os.path.join(self.moddir, package.name)
- installed_metadata_file = os.path.join(clone_dir, "package.xml")
- if not os.path.isfile(installed_metadata_file):
- return False
- if not hasattr(package, "metadata") or package.metadata is None:
- return False
- try:
- installed_metadata = MetadataReader.from_file(installed_metadata_file)
- installed_default_branch = get_branch_from_metadata(installed_metadata)
- remote_default_branch = get_branch_from_metadata(package.metadata)
- if installed_default_branch != remote_default_branch:
- return True
- except RuntimeError:
- return False
- return False
-
- def check_package(self, package: Addon) -> None:
- """Given a packaged Addon package, check it for updates. If git is available that is
- used. If not, the package's metadata is examined, and if the metadata file has changed
- compared to the installed copy, an update is flagged. In addition, a change to the
- default branch name triggers an update."""
-
- clone_dir = self.moddir + os.sep + package.name
- if os.path.exists(clone_dir):
-
- # First, see if the branch name changed, which automatically triggers an update
- if self._branch_name_changed(package):
- package.set_status(Addon.Status.UPDATE_AVAILABLE)
- return
-
- # Next, try to just do a git-based update, which will give the most accurate results:
- if self.git_manager:
- self.check_workbench(package)
- if package.status() != Addon.Status.CANNOT_CHECK:
- # It worked, just exit now
- return
-
- # If we were unable to do a git-based update, try using the package.xml file instead:
- installed_metadata_file = os.path.join(clone_dir, "package.xml")
- if not os.path.isfile(installed_metadata_file):
- # If there is no package.xml file, then it's because the package author added it
- # after the last time the local installation was updated. By definition, then,
- # there is an update available, if only to download the new XML file.
- package.set_status(Addon.Status.UPDATE_AVAILABLE)
- package.installed_version = None
- return
- package.updated_timestamp = os.path.getmtime(installed_metadata_file)
- try:
- installed_metadata = MetadataReader.from_file(installed_metadata_file)
- package.installed_version = installed_metadata.version
- # Packages are considered up-to-date if the metadata version matches.
- # Authors should update their version string when they want the addon
- # manager to alert users of a new version.
- if package.metadata.version != installed_metadata.version:
- package.set_status(Addon.Status.UPDATE_AVAILABLE)
- else:
- package.set_status(Addon.Status.NO_UPDATE_AVAILABLE)
- except RuntimeError:
- FreeCAD.Console.PrintWarning(
- translate(
- "AddonsInstaller",
- "Failed to read metadata from {name}",
- ).format(name=installed_metadata_file)
- + "\n"
- )
- package.set_status(Addon.Status.CANNOT_CHECK)
-
- def check_macro(self, macro_wrapper: Addon) -> None:
- """Check to see if the online copy of the macro's code differs from the local copy."""
-
- # Make sure this macro has its code downloaded:
- try:
- if not macro_wrapper.macro.parsed and macro_wrapper.macro.on_git:
- macro_wrapper.macro.fill_details_from_file(macro_wrapper.macro.src_filename)
- elif not macro_wrapper.macro.parsed and macro_wrapper.macro.on_wiki:
- mac = macro_wrapper.macro.name.replace(" ", "_")
- mac = mac.replace("&", "%26")
- mac = mac.replace("+", "%2B")
- url = "https://wiki.freecad.org/Macro_" + mac
- macro_wrapper.macro.fill_details_from_wiki(url)
- except RuntimeError:
- FreeCAD.Console.PrintWarning(
- translate(
- "AddonsInstaller",
- "Failed to fetch code for macro '{name}'",
- ).format(name=macro_wrapper.macro.name)
- + "\n"
- )
- macro_wrapper.set_status(Addon.Status.CANNOT_CHECK)
- return
-
- hasher1 = hashlib.sha1()
- hasher2 = hashlib.sha1()
- hasher1.update(macro_wrapper.macro.code.encode("utf-8"))
- new_sha1 = hasher1.hexdigest()
- test_file_one = os.path.join(FreeCAD.getUserMacroDir(True), macro_wrapper.macro.filename)
- test_file_two = os.path.join(
- FreeCAD.getUserMacroDir(True), "Macro_" + macro_wrapper.macro.filename
- )
- if os.path.exists(test_file_one):
- with open(test_file_one, "rb") as f:
- contents = f.read()
- hasher2.update(contents)
- old_sha1 = hasher2.hexdigest()
- elif os.path.exists(test_file_two):
- with open(test_file_two, "rb") as f:
- contents = f.read()
- hasher2.update(contents)
- old_sha1 = hasher2.hexdigest()
- else:
- return
- if new_sha1 == old_sha1:
- macro_wrapper.set_status(Addon.Status.NO_UPDATE_AVAILABLE)
- else:
- macro_wrapper.set_status(Addon.Status.UPDATE_AVAILABLE)
-
-
-class CacheMacroCodeWorker(QtCore.QThread):
- """Download and cache the macro code, and parse its internal metadata"""
-
- update_macro = QtCore.Signal(Addon)
- progress_made = QtCore.Signal(str, int, int)
-
- def __init__(self, repos: List[Addon]) -> None:
- QtCore.QThread.__init__(self)
- self.repos = repos
- self.workers = []
- self.terminators = []
- self.lock = threading.Lock()
- self.failed = []
- self.counter = 0
- self.repo_queue = None
-
- def run(self):
- """Rarely called directly: create an instance and call start() on it instead to
- launch in a new thread"""
-
- self.repo_queue = queue.Queue()
- num_macros = 0
- for repo in self.repos:
- if repo.macro is not None:
- self.repo_queue.put(repo)
- num_macros += 1
-
- interrupted = self._process_queue(num_macros)
- if interrupted:
- return
-
- # Make sure all of our child threads have fully exited:
- for worker in self.workers:
- worker.wait(50)
- if not worker.isFinished():
- # The Qt Python translation extractor doesn't support splitting this string (yet)
- # pylint: disable=line-too-long
- FreeCAD.Console.PrintError(
- translate(
- "AddonsInstaller",
- "Addon Manager: a worker process failed to complete while fetching {name}",
- ).format(name=worker.macro.name)
- + "\n"
- )
-
- self.repo_queue.join()
- for terminator in self.terminators:
- if terminator and terminator.isActive():
- terminator.stop()
-
- if len(self.failed) > 0:
- num_failed = len(self.failed)
- FreeCAD.Console.PrintWarning(
- translate(
- "AddonsInstaller",
- "Out of {num_macros} macros, {num_failed} timed out while processing",
- ).format(num_macros=num_macros, num_failed=num_failed)
- + "\n"
- )
-
- def _process_queue(self, num_macros) -> bool:
- """Spools up six network connections and downloads the macro code. Returns True if
- it was interrupted by user request, or False if it ran to completion."""
-
- # Emulate QNetworkAccessManager and spool up six connections:
- for _ in range(6):
- self.update_and_advance(None)
-
- current_thread = QtCore.QThread.currentThread()
- while True:
- if current_thread.isInterruptionRequested():
- for worker in self.workers:
- worker.blockSignals(True)
- worker.requestInterruption()
- if not worker.wait(100):
- FreeCAD.Console.PrintWarning(
- translate(
- "AddonsInstaller",
- "Addon Manager: a worker process failed to halt ({name})",
- ).format(name=worker.macro.name)
- + "\n"
- )
- return True
- # Ensure our signals propagate out by running an internal thread-local event loop
- QtCore.QCoreApplication.processEvents()
- with self.lock:
- if self.counter >= num_macros:
- break
- time.sleep(0.1)
- return False
-
- def update_and_advance(self, repo: Optional[Addon]) -> None:
- """Emit the updated signal and launch the next item from the queue."""
- if repo is not None:
- if repo.macro.name not in self.failed:
- self.update_macro.emit(repo)
- self.repo_queue.task_done()
- with self.lock:
- self.counter += 1
-
- if QtCore.QThread.currentThread().isInterruptionRequested():
- return
-
- if repo is not None:
- message = translate("AddonsInstaller", "Caching {} macro").format(repo.display_name)
- else:
- message = translate("AddonsInstaller", "Caching macros")
- self.progress_made.emit(message, len(self.repos) - self.repo_queue.qsize(), len(self.repos))
-
- try:
- next_repo = self.repo_queue.get_nowait()
- worker = GetMacroDetailsWorker(next_repo)
- worker.finished.connect(lambda: self.update_and_advance(next_repo))
- with self.lock:
- self.workers.append(worker)
- self.terminators.append(
- QtCore.QTimer.singleShot(10000, lambda: self.terminate(worker))
- )
- worker.start()
- except queue.Empty:
- pass
-
- def terminate(self, worker) -> None:
- """Shut down all running workers and exit the thread"""
- if not worker.isFinished():
- macro_name = worker.macro.name
- FreeCAD.Console.PrintWarning(
- translate(
- "AddonsInstaller",
- "Timeout while fetching metadata for macro {}",
- ).format(macro_name)
- + "\n"
- )
- # worker.blockSignals(True)
- worker.requestInterruption()
- worker.wait(100)
- if worker.isRunning():
- FreeCAD.Console.PrintError(
- translate(
- "AddonsInstaller",
- "Failed to kill process for macro {}!\n",
- ).format(macro_name)
- )
- with self.lock:
- self.failed.append(macro_name)
-
-
-class GetMacroDetailsWorker(QtCore.QThread):
- """Retrieve the macro details for a macro"""
-
- readme_updated = QtCore.Signal(str)
-
- def __init__(self, repo):
-
- QtCore.QThread.__init__(self)
- self.macro = repo.macro
-
- def run(self):
- """Rarely called directly: create an instance and call start() on it instead to
- launch in a new thread"""
-
- if not self.macro.parsed and self.macro.on_git:
- self.macro.fill_details_from_file(self.macro.src_filename)
- if not self.macro.parsed and self.macro.on_wiki:
- mac = self.macro.name.replace(" ", "_")
- mac = mac.replace("&", "%26")
- mac = mac.replace("+", "%2B")
- url = "https://wiki.freecad.org/Macro_" + mac
- self.macro.fill_details_from_wiki(url)
- message = (
- "
Macro location: ' - + self.macro.url - + "" - ) - if QtCore.QThread.currentThread().isInterruptionRequested(): - return - self.readme_updated.emit(message) - - -class GetBasicAddonStatsWorker(QtCore.QThread): - """Fetch data from an addon stats repository.""" - - update_addon_stats = QtCore.Signal(Addon) - - def __init__(self, url: str, addons: List[Addon], parent: QtCore.QObject = None): - super().__init__(parent) - self.url = url - self.addons = addons - - def run(self): - """Fetch the remote data and load it into the addons""" - - fetch_result = NetworkManager.AM_NETWORK_MANAGER.blocking_get(self.url, 5000) - if fetch_result is None: - FreeCAD.Console.PrintError( - translate( - "AddonsInstaller", - "Failed to get Addon statistics from {} -- only sorting alphabetically will" - " be accurate\n", - ).format(self.url) - ) - return - text_result = fetch_result.data().decode("utf8") - json_result = json.loads(text_result) - - for addon in self.addons: - if addon.url in json_result: - addon.stats = AddonStats.from_json(json_result[addon.url]) - self.update_addon_stats.emit(addon) - - -class GetAddonScoreWorker(QtCore.QThread): - """Fetch data from an addon score file.""" - - update_addon_score = QtCore.Signal(Addon) - - def __init__(self, url: str, addons: List[Addon], parent: QtCore.QObject = None): - super().__init__(parent) - self.url = url - self.addons = addons - - def run(self): - """Fetch the remote data and load it into the addons""" - - if self.url != "TEST": - fetch_result = NetworkManager.AM_NETWORK_MANAGER.blocking_get(self.url, 5000) - if fetch_result is None: - FreeCAD.Console.PrintError( - translate( - "AddonsInstaller", - "Failed to get Addon score from '{}' -- sorting by score will fail\n", - ).format(self.url) - ) - return - text_result = fetch_result.data().decode("utf8") - json_result = json.loads(text_result) - else: - FreeCAD.Console.PrintWarning("Running score generation in TEST mode...\n") - json_result = {} - for addon in self.addons: - if addon.macro: - json_result[addon.name] = len(addon.macro.comment) if addon.macro.comment else 0 - else: - json_result[addon.url] = len(addon.description) if addon.description else 0 - - for addon in self.addons: - score = None - if addon.url in json_result: - score = json_result[addon.url] - elif addon.name in json_result: - score = json_result[addon.name] - if score is not None: - try: - addon.score = int(score) - self.update_addon_score.emit(addon) - except (ValueError, OverflowError): - FreeCAD.Console.PrintLog( - f"Failed to convert score value '{score}' to an integer for {addon.name}" - ) diff --git a/src/Mod/AddonManager/addonmanager_workers_utility.py b/src/Mod/AddonManager/addonmanager_workers_utility.py deleted file mode 100644 index 5c8aa1b538..0000000000 --- a/src/Mod/AddonManager/addonmanager_workers_utility.py +++ /dev/null @@ -1,93 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -# *************************************************************************** -# * * -# * Copyright (c) 2022-2023 FreeCAD Project Association * -# * * -# * This file is part of FreeCAD. * -# * * -# * FreeCAD is free software: you can redistribute it and/or modify it * -# * under the terms of the GNU Lesser General Public License as * -# * published by the Free Software Foundation, either version 2.1 of the * -# * License, or (at your option) any later version. * -# * * -# * FreeCAD is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * -# * Lesser General Public License for more details. * -# * * -# * You should have received a copy of the GNU Lesser General Public * -# * License along with FreeCAD. If not, see * -# *
- change_branch
-
-
-
- 0
- 0
- 550
- 300
-
-
-
- Change Branch
-
-
- true
-
-
- -
-
-
- Change to branch:
-
-
- true
-
-
-
- -
-
-
- QAbstractItemView::NoEditTriggers
-
-
- false
-
-
- true
-
-
- QAbstractItemView::SingleSelection
-
-
- QAbstractItemView::SelectRows
-
-
- true
-
-
- true
-
-
- true
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
-
-
- buttonBox
- accepted()
- change_branch
- accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- change_branch
- reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
-
-
-
diff --git a/src/Mod/AddonManager/compact_view.py b/src/Mod/AddonManager/compact_view.py
deleted file mode 100644
index d92e6c4b8a..0000000000
--- a/src/Mod/AddonManager/compact_view.py
+++ /dev/null
@@ -1,95 +0,0 @@
-# -*- coding: utf-8 -*-
-
-################################################################################
-## Form generated from reading UI file 'compact_view.ui'
-##
-## Created by: Qt User Interface Compiler version 5.15.1
-##
-## WARNING! All changes made in this file will be lost when recompiling UI file!
-################################################################################
-
-from PySide.QtCore import *
-from PySide.QtGui import *
-from PySide.QtWidgets import *
-
-
-class Ui_CompactView(object):
- def setupUi(self, CompactView):
- if not CompactView.objectName():
- CompactView.setObjectName("CompactView")
- CompactView.resize(489, 16)
- sizePolicy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Fixed)
- sizePolicy.setHorizontalStretch(0)
- sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(CompactView.sizePolicy().hasHeightForWidth())
- CompactView.setSizePolicy(sizePolicy)
- self.horizontalLayout_2 = QHBoxLayout(CompactView)
- self.horizontalLayout_2.setObjectName("horizontalLayout_2")
- self.horizontalLayout_2.setSizeConstraint(QLayout.SetNoConstraint)
- self.horizontalLayout_2.setContentsMargins(3, 0, 9, 0)
- self.labelIcon = QLabel(CompactView)
- self.labelIcon.setObjectName("labelIcon")
- sizePolicy1 = QSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
- sizePolicy1.setHorizontalStretch(0)
- sizePolicy1.setVerticalStretch(0)
- sizePolicy1.setHeightForWidth(self.labelIcon.sizePolicy().hasHeightForWidth())
- self.labelIcon.setSizePolicy(sizePolicy1)
- self.labelIcon.setMinimumSize(QSize(16, 16))
- self.labelIcon.setBaseSize(QSize(16, 16))
-
- self.horizontalLayout_2.addWidget(self.labelIcon)
-
- self.labelPackageName = QLabel(CompactView)
- self.labelPackageName.setObjectName("labelPackageName")
-
- self.labelPackageNameSpacer = QLabel(CompactView)
- self.labelPackageNameSpacer.setText(" — ")
- self.labelPackageNameSpacer.setObjectName("labelPackageNameSpacer")
-
- self.horizontalLayout_2.addWidget(self.labelPackageName)
- self.horizontalLayout_2.addWidget(self.labelPackageNameSpacer)
-
- self.labelVersion = QLabel(CompactView)
- self.labelVersion.setObjectName("labelVersion")
-
- self.horizontalLayout_2.addWidget(self.labelVersion)
-
- self.labelDescription = QLabel(CompactView)
- self.labelDescription.setObjectName("labelDescription")
- sizePolicy2 = QSizePolicy(QSizePolicy.MinimumExpanding, QSizePolicy.Preferred)
- sizePolicy2.setHorizontalStretch(0)
- sizePolicy2.setVerticalStretch(0)
- sizePolicy2.setHeightForWidth(self.labelDescription.sizePolicy().hasHeightForWidth())
- self.labelDescription.setSizePolicy(sizePolicy2)
- self.labelDescription.setTextFormat(Qt.PlainText)
- self.labelDescription.setWordWrap(False)
- self.labelDescription.setTextInteractionFlags(Qt.TextSelectableByMouse)
-
- self.horizontalLayout_2.addWidget(self.labelDescription)
-
- self.labelStatus = QLabel(CompactView)
- self.labelStatus.setObjectName("labelStatus")
-
- self.horizontalLayout_2.addWidget(self.labelStatus)
-
- self.retranslateUi(CompactView)
-
- QMetaObject.connectSlotsByName(CompactView)
-
- # setupUi
-
- def retranslateUi(self, CompactView):
- # CompactView.setWindowTitle(QCoreApplication.translate("CompactView", "Form", None))
- self.labelIcon.setText(QCoreApplication.translate("CompactView", "Icon", None))
- self.labelPackageName.setText(
- QCoreApplication.translate("CompactView", "Package Name", None)
- )
- self.labelVersion.setText(QCoreApplication.translate("CompactView", "Version", None))
- self.labelDescription.setText(
- QCoreApplication.translate("CompactView", "Description", None)
- )
- self.labelStatus.setText(
- QCoreApplication.translate("CompactView", "Update Available", None)
- )
-
- # retranslateUi
diff --git a/src/Mod/AddonManager/compact_view.ui b/src/Mod/AddonManager/compact_view.ui
deleted file mode 100644
index 604fef6963..0000000000
--- a/src/Mod/AddonManager/compact_view.ui
+++ /dev/null
@@ -1,110 +0,0 @@
-
-
- CompactView
-
-
-
- 0
- 0
- 489
- 16
-
-
-
-
- 0
- 0
-
-
-
- Form
-
-
-
- QLayout::SetNoConstraint
-
-
- 3
-
-
- 0
-
-
- 9
-
-
- 0
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 16
- 16
-
-
-
-
- 16
- 16
-
-
-
- Icon
-
-
-
- -
-
-
- <b>Package Name</b>
-
-
-
- -
-
-
- Version
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Description
-
-
- Qt::PlainText
-
-
- false
-
-
- Qt::TextSelectableByMouse
-
-
-
- -
-
-
- UpdateAvailable
-
-
-
-
-
-
diff --git a/src/Mod/AddonManager/composite_view.py b/src/Mod/AddonManager/composite_view.py
deleted file mode 100644
index c20a724225..0000000000
--- a/src/Mod/AddonManager/composite_view.py
+++ /dev/null
@@ -1,170 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-# ***************************************************************************
-# * *
-# * Copyright (c) 2022-2024 The FreeCAD Project Association AISBL *
-# * *
-# * This file is part of FreeCAD. *
-# * *
-# * FreeCAD is free software: you can redistribute it and/or modify it *
-# * under the terms of the GNU Lesser General Public License as *
-# * published by the Free Software Foundation, either version 2.1 of the *
-# * License, or (at your option) any later version. *
-# * *
-# * FreeCAD is distributed in the hope that it will be useful, but *
-# * WITHOUT ANY WARRANTY; without even the implied warranty of *
-# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
-# * Lesser General Public License for more details. *
-# * *
-# * You should have received a copy of the GNU Lesser General Public *
-# * License along with FreeCAD. If not, see *
-# *
- DependencyResolutionDialog
-
-
- Qt::ApplicationModal
-
-
-
- 0
- 0
- 455
- 260
-
-
-
- Resolve Dependencies
-
-
- true
-
-
- true
-
-
- -
-
-
- This Addon has the following required and optional dependencies. You must install them before this Addon can be used.
-
-Do you want the Addon Manager to install them automatically? Choose "Ignore" to install the Addon without installing the dependencies.
-
-
- true
-
-
-
- -
-
- -
-
-
- FreeCAD Addons
-
-
- -
-
-
-
-
- -
-
-
- Required Python modules
-
-
- -
-
-
-
-
- -
-
-
- Optional Python modules
-
-
- -
-
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ignore|QDialogButtonBox::Yes
-
-
-
-
-
-
-
- buttonBox
- accepted()
- DependencyResolutionDialog
- accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- DependencyResolutionDialog
- reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
-
-
-
diff --git a/src/Mod/AddonManager/developer_mode.ui b/src/Mod/AddonManager/developer_mode.ui
deleted file mode 100644
index 999cca07ce..0000000000
--- a/src/Mod/AddonManager/developer_mode.ui
+++ /dev/null
@@ -1,364 +0,0 @@
-
-
- DeveloperModeDialog
-
-
-
- 0
- 0
- 595
- 677
-
-
-
- Addon Developer Tools
-
-
- true
-
-
- -
-
- -
-
-
- Path to Addon
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- true
-
-
-
- -
-
-
- Browse...
-
-
-
-
-
- -
-
-
- Metadata
-
-
- -
-
- -
-
- -
-
-
- Primary branch
-
-
-
- -
-
-
-
- -
-
-
- Explanation of what this Addon provides. Displayed in the Addon Manager. It is not necessary for this to state that this is a FreeCAD Addon.
-
-
- Description
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
-
- -
-
-
- Discussion URL
-
-
-
- -
-
-
- Icon
-
-
-
- -
-
-
- Bugtracker URL
-
-
-
- -
-
- -
-
-
- Semantic (1.2.3-beta) or CalVer (2022.08.30) styles supported
-
-
-
- -
-
-
- Set to today (CalVer style)
-
-
-
-
-
- -
-
- -
-
-
- (Optional)
-
-
-
- -
-
-
- Displayed in the Addon Manager's list of Addons. Should not include the word "FreeCAD", and must be a valid directory name on all support operating systems.
-
-
-
- -
-
-
- (Optional)
-
-
-
- -
-
-
- README URL
-
-
-
- -
-
-
- Explanation of what this Addon provides. Displayed in the Addon Manager. It is not necessary for this to state that this is a FreeCAD Addon.
-
-
- true
-
-
- TIP: Since this is displayed within FreeCAD, in the Addon Manager, it is not necessary to take up space saying things like "This is a FreeCAD Addon..." -- just say what it does.
-
-
-
- -
-
-
- Repository URL
-
-
-
- -
-
-
- (Optional)
-
-
-
- -
-
- -
-
- -
-
- -
-
-
- Browse...
-
-
-
-
-
- -
-
-
- Website URL
-
-
-
- -
-
-
- Documentation URL
-
-
-
- -
-
-
- (Optional)
-
-
-
- -
-
-
- Displayed in the Addon Manager's list of Addons. Should not include the word "FreeCAD", and must be a valid directory name on all support operating systems.
-
-
- Addon Name
-
-
-
- -
-
-
- Version
-
-
-
- -
-
-
- (Recommended)
-
-
-
- -
-
-
- Minimum Python
-
-
-
- -
-
- -
-
-
- (Optional, only 3.x version supported)
-
-
-
- -
-
-
- Detect...
-
-
-
-
-
-
-
-
- -
-
-
- Addon Contents
-
-
- -
-
- -
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- ...
-
-
-
- -
-
-
- ...
-
-
-
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Save
-
-
-
-
-
-
-
- buttonBox
- accepted()
- DeveloperModeDialog
- accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- DeveloperModeDialog
- reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
-
-
-
diff --git a/src/Mod/AddonManager/developer_mode_add_content.ui b/src/Mod/AddonManager/developer_mode_add_content.ui
deleted file mode 100644
index 0c6dc65d5a..0000000000
--- a/src/Mod/AddonManager/developer_mode_add_content.ui
+++ /dev/null
@@ -1,419 +0,0 @@
-
-
- addContentDialog
-
-
-
- 0
- 0
- 642
- 593
-
-
-
- Content Item
-
-
- true
-
-
- -
-
- -
-
-
- Content type:
-
-
-
- -
-
- -
-
- Macro
-
-
- -
-
- Preference Pack
-
-
- -
-
- Workbench
-
-
-
-
- -
-
-
- If this is the only thing in the Addon, all other metadata can be inherited from the top level, and does not need to be specified here.
-
-
- This is the only item in the Addon
-
-
- true
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
- 0
-
-
-
- -
-
-
- Main macro file
-
-
-
- -
-
-
- The file with the macro's metadata in it
-
-
-
- -
-
-
- Browse...
-
-
-
-
-
-
-
- -
-
-
- Preference Pack Name
-
-
-
- -
-
-
-
-
-
- -
-
-
- Workbench class name
-
-
-
- -
-
-
- Class that defines "Icon" data member
-
-
-
-
-
-
-
- -
-
- -
-
-
- Subdirectory
-
-
-
- -
-
- -
-
-
- Optional, defaults to name of content item
-
-
-
- -
-
-
- Browse...
-
-
-
-
-
- -
-
-
- Icon
-
-
-
- -
-
- -
-
-
- actualIcon
-
-
-
- -
-
-
- Optional, defaults to inheriting from top-level Addon
-
-
-
- -
-
-
- Browse...
-
-
-
-
-
-
-
- -
-
- -
-
-
- Tags...
-
-
-
- -
-
-
- Dependencies...
-
-
-
- -
-
-
- FreeCAD Versions...
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
- QSizePolicy::Fixed
-
-
-
- 20
- 20
-
-
-
-
- -
-
-
- Other Metadata
-
-
- -
-
-
- Displayed in the Addon Manager's list of Addons. Should not include the word "FreeCAD".
-
-
-
- -
-
-
- true
-
-
-
- -
-
-
- Version
-
-
-
- -
-
-
- Description
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
-
- -
-
- -
-
-
- Semantic (1.2.3-beta) or CalVer (2022.08.30) styles supported
-
-
-
- -
-
-
- Set to today (CalVer style)
-
-
-
-
-
- -
-
-
- Display Name
-
-
-
- -
-
- -
-
-
-
- 50
- true
- false
-
-
-
- Any fields left blank are inherited from the top-level Addon metadata, so technically they are all optional. For Addons with multiple content items, each item should provide a unique Display Name and Description.
-
-
- true
-
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
-
-
- buttonBox
- accepted()
- addContentDialog
- accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- addContentDialog
- reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
-
-
- addonKindComboBox
- currentIndexChanged(int)
- stackedWidget
- setCurrentIndex(int)
-
-
- 134
- 19
-
-
- 320
- 83
-
-
-
-
- singletonCheckBox
- toggled(bool)
- otherMetadataGroupBox
- setHidden(bool)
-
-
- 394
- 19
-
-
- 320
- 294
-
-
-
-
-
diff --git a/src/Mod/AddonManager/developer_mode_advanced_freecad_versions.ui b/src/Mod/AddonManager/developer_mode_advanced_freecad_versions.ui
deleted file mode 100644
index adea0c9fcd..0000000000
--- a/src/Mod/AddonManager/developer_mode_advanced_freecad_versions.ui
+++ /dev/null
@@ -1,131 +0,0 @@
-
-
- FreeCADVersionToBranchMapDialog
-
-
-
- 0
- 0
- 400
- 300
-
-
-
- Advanced Version Mapping
-
-
- -
-
-
- Upcoming versions of the FreeCAD Addon Manager will support developers' setting a specific branch or tag for use with a specific version of FreeCAD (e.g. setting a specific tag as the last version of your Addon to support v0.19, etc.)
-
-
- true
-
-
-
- -
-
-
- true
-
-
- QAbstractItemView::SelectRows
-
-
- false
-
-
- true
-
-
-
- FreeCAD Version
-
-
-
-
- Best-available branch, tag, or commit
-
-
-
-
- -
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- ...
-
-
-
- -
-
-
- ...
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
-
-
- buttonBox
- accepted()
- FreeCADVersionToBranchMapDialog
- accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- FreeCADVersionToBranchMapDialog
- reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
-
-
-
diff --git a/src/Mod/AddonManager/developer_mode_copyright_info.ui b/src/Mod/AddonManager/developer_mode_copyright_info.ui
deleted file mode 100644
index 6edebdeec3..0000000000
--- a/src/Mod/AddonManager/developer_mode_copyright_info.ui
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
- copyrightInformationDialog
-
-
-
- 0
- 0
- 345
- 93
-
-
-
- Copyright Information
-
-
- -
-
- -
-
-
- Copyright holder:
-
-
-
- -
-
- -
-
-
- Copyright year:
-
-
-
- -
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
-
-
- buttonBox
- accepted()
- copyrightInformationDialog
- accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- copyrightInformationDialog
- reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
-
-
-
diff --git a/src/Mod/AddonManager/developer_mode_dependencies.ui b/src/Mod/AddonManager/developer_mode_dependencies.ui
deleted file mode 100644
index 6feb86f535..0000000000
--- a/src/Mod/AddonManager/developer_mode_dependencies.ui
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
- DependencyDialog
-
-
-
- 0
- 0
- 348
- 242
-
-
-
- Dependencies
-
-
- -
-
-
- QAbstractItemView::NoEditTriggers
-
-
- true
-
-
- QAbstractItemView::SingleSelection
-
-
- QAbstractItemView::SelectRows
-
-
- false
-
-
- false
-
-
-
- Dependency type
-
-
-
-
- Name
-
-
-
-
- Optional?
-
-
-
-
- -
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- ...
-
-
-
- -
-
-
- ...
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
-
-
- buttonBox
- accepted()
- DependencyDialog
- accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- DependencyDialog
- reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
-
-
-
diff --git a/src/Mod/AddonManager/developer_mode_edit_dependency.ui b/src/Mod/AddonManager/developer_mode_edit_dependency.ui
deleted file mode 100644
index a70cbc0d5b..0000000000
--- a/src/Mod/AddonManager/developer_mode_edit_dependency.ui
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
- EditDependencyDialog
-
-
-
- 0
- 0
- 347
- 236
-
-
-
- Edit Dependency
-
-
- -
-
-
- Dependency Type
-
-
-
- -
-
- -
-
-
- Dependency
-
-
-
- -
-
- -
-
- -
-
-
- Package name, if "Other..."
-
-
-
- -
-
-
-
- true
-
-
-
- NOTE: If "Other..." is selected, the package is not in the ALLOWED_PYTHON_PACKAGES.txt file, and will not be automatically installed by the Addon Manager. Submit a PR at <a href="https://github.com/FreeCAD/FreeCAD-addons">https://github.com/FreeCAD/FreeCAD-addons</a> to request addition of a package.
-
-
- true
-
-
- true
-
-
-
-
-
- -
-
-
- If this is an optional dependency, the Addon Manager will offer to install it (when possible), but will not block installation if the user chooses not to, or cannot, install the package.
-
-
- Optional
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
-
-
- buttonBox
- accepted()
- EditDependencyDialog
- accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- EditDependencyDialog
- reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
-
-
-
diff --git a/src/Mod/AddonManager/developer_mode_freecad_versions.ui b/src/Mod/AddonManager/developer_mode_freecad_versions.ui
deleted file mode 100644
index 7716c27664..0000000000
--- a/src/Mod/AddonManager/developer_mode_freecad_versions.ui
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
- FreeCADVersionsDialog
-
-
-
- 0
- 0
- 400
- 120
-
-
-
- Supported FreeCAD Versions
-
-
- -
-
-
- Minimum FreeCAD Version Supported
-
-
-
- -
-
-
- Optional
-
-
-
- -
-
-
- Maximum FreeCAD Version Supported
-
-
-
- -
-
-
- Optional
-
-
-
- -
-
-
- Advanced version mapping...
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
-
-
- buttonBox
- accepted()
- FreeCADVersionsDialog
- accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- FreeCADVersionsDialog
- reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
-
-
-
diff --git a/src/Mod/AddonManager/developer_mode_license.ui b/src/Mod/AddonManager/developer_mode_license.ui
deleted file mode 100644
index c78774d1ab..0000000000
--- a/src/Mod/AddonManager/developer_mode_license.ui
+++ /dev/null
@@ -1,134 +0,0 @@
-
-
- selectLicenseDialog
-
-
-
- 0
- 0
- 533
- 124
-
-
-
- Select a license
-
-
- -
-
- -
-
-
-
- 0
- 0
-
-
-
- 11
-
-
-
- -
-
-
- About...
-
-
-
-
-
- -
-
- -
-
-
- License name:
-
-
-
- -
-
-
-
- -
-
- -
-
-
- Path to license file:
-
-
-
- -
-
-
- (if required by license)
-
-
-
- -
-
-
- Browse...
-
-
-
- -
-
-
- Create...
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
-
-
- buttonBox
- accepted()
- selectLicenseDialog
- accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- selectLicenseDialog
- reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
-
-
-
diff --git a/src/Mod/AddonManager/developer_mode_licenses_table.ui b/src/Mod/AddonManager/developer_mode_licenses_table.ui
deleted file mode 100644
index 3863ac5c8a..0000000000
--- a/src/Mod/AddonManager/developer_mode_licenses_table.ui
+++ /dev/null
@@ -1,123 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 400
- 300
-
-
-
- Form
-
-
- -
-
-
-
- 1
- 0
-
-
-
-
- 150
- 0
-
-
-
-
- 0
- 0
-
-
-
- Licenses
-
-
- -
-
-
- QAbstractItemView::NoEditTriggers
-
-
- QAbstractItemView::SingleSelection
-
-
- QAbstractItemView::SelectRows
-
-
- 2
-
-
- true
-
-
- 60
-
-
- true
-
-
- false
-
-
-
- License
-
-
-
-
- License file
-
-
-
-
- -
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- ...
-
-
- true
-
-
-
- -
-
-
- ...
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Mod/AddonManager/developer_mode_people.ui b/src/Mod/AddonManager/developer_mode_people.ui
deleted file mode 100644
index 1dc0c828fb..0000000000
--- a/src/Mod/AddonManager/developer_mode_people.ui
+++ /dev/null
@@ -1,99 +0,0 @@
-
-
- personDialog
-
-
-
- 0
- 0
- 313
- 118
-
-
-
- Add Person
-
-
- -
-
-
- A maintainer is someone with current commit access on this project. An author is anyone else you'd like to give credit to.
-
-
-
- -
-
- -
-
-
- Name:
-
-
-
- -
-
- -
-
-
- Email:
-
-
-
- -
-
-
- Email is required for maintainers, and optional for authors.
-
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
-
-
- buttonBox
- accepted()
- personDialog
- accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- personDialog
- reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
-
-
-
diff --git a/src/Mod/AddonManager/developer_mode_people_table.ui b/src/Mod/AddonManager/developer_mode_people_table.ui
deleted file mode 100644
index 468ec99416..0000000000
--- a/src/Mod/AddonManager/developer_mode_people_table.ui
+++ /dev/null
@@ -1,116 +0,0 @@
-
-
- Form
-
-
-
- 0
- 0
- 400
- 300
-
-
-
- Form
-
-
- -
-
-
-
- 2
- 0
-
-
-
- People
-
-
- -
-
-
- QAbstractItemView::NoEditTriggers
-
-
- QAbstractItemView::SingleSelection
-
-
- QAbstractItemView::SelectRows
-
-
- 3
-
-
- true
-
-
- 75
-
-
- true
-
-
- false
-
-
-
- Kind
-
-
-
-
- Name
-
-
-
-
- Email
-
-
-
-
- -
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- ...
-
-
- true
-
-
-
- -
-
-
- ...
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
diff --git a/src/Mod/AddonManager/developer_mode_select_from_list.ui b/src/Mod/AddonManager/developer_mode_select_from_list.ui
deleted file mode 100644
index 371208908c..0000000000
--- a/src/Mod/AddonManager/developer_mode_select_from_list.ui
+++ /dev/null
@@ -1,77 +0,0 @@
-
-
- SelectFromList
-
-
-
- 0
- 0
- 400
- 111
-
-
-
- Dialog
-
-
- -
-
-
- TextLabel
-
-
-
- -
-
- -
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
-
-
- buttonBox
- accepted()
- SelectFromList
- accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- SelectFromList
- reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
-
-
-
diff --git a/src/Mod/AddonManager/developer_mode_tags.ui b/src/Mod/AddonManager/developer_mode_tags.ui
deleted file mode 100644
index f149afb3dc..0000000000
--- a/src/Mod/AddonManager/developer_mode_tags.ui
+++ /dev/null
@@ -1,86 +0,0 @@
-
-
- Dialog
-
-
-
- 0
- 0
- 400
- 106
-
-
-
- Edit Tags
-
-
- -
-
-
- Comma-separated list of tags describing this item:
-
-
-
- -
-
- -
-
-
-
- true
-
-
-
- HINT: Common tags include "Assembly", "FEM", "Mesh", "NURBS", etc.
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
-
-
- buttonBox
- accepted()
- Dialog
- accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- Dialog
- reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
-
-
-
diff --git a/src/Mod/AddonManager/expanded_view.py b/src/Mod/AddonManager/expanded_view.py
deleted file mode 100644
index 765878bb19..0000000000
--- a/src/Mod/AddonManager/expanded_view.py
+++ /dev/null
@@ -1,136 +0,0 @@
-# -*- coding: utf-8 -*-
-
-################################################################################
-## Form generated from reading UI file 'expanded_view.ui'
-##
-## Created by: Qt User Interface Compiler version 5.15.1
-##
-## WARNING! All changes made in this file will be lost when recompiling UI file!
-################################################################################
-
-from PySide.QtCore import *
-from PySide.QtGui import *
-from PySide.QtWidgets import *
-
-
-class Ui_ExpandedView(object):
- def setupUi(self, ExpandedView):
- if not ExpandedView.objectName():
- ExpandedView.setObjectName("ExpandedView")
- ExpandedView.resize(807, 141)
- sizePolicy = QSizePolicy(QSizePolicy.MinimumExpanding, QSizePolicy.Preferred)
- sizePolicy.setHorizontalStretch(0)
- sizePolicy.setVerticalStretch(0)
- sizePolicy.setHeightForWidth(ExpandedView.sizePolicy().hasHeightForWidth())
- ExpandedView.setSizePolicy(sizePolicy)
- self.horizontalLayout_2 = QHBoxLayout(ExpandedView)
- self.horizontalLayout_2.setSpacing(2)
- self.horizontalLayout_2.setObjectName("horizontalLayout_2")
- self.horizontalLayout_2.setSizeConstraint(QLayout.SetNoConstraint)
- self.horizontalLayout_2.setContentsMargins(2, 0, 2, 0)
- self.labelIcon = QLabel(ExpandedView)
- self.labelIcon.setObjectName("labelIcon")
- sizePolicy1 = QSizePolicy(QSizePolicy.Fixed, QSizePolicy.Fixed)
- sizePolicy1.setHorizontalStretch(0)
- sizePolicy1.setVerticalStretch(0)
- sizePolicy1.setHeightForWidth(self.labelIcon.sizePolicy().hasHeightForWidth())
- self.labelIcon.setSizePolicy(sizePolicy1)
- self.labelIcon.setMinimumSize(QSize(48, 48))
- self.labelIcon.setMaximumSize(QSize(48, 48))
- self.labelIcon.setBaseSize(QSize(48, 48))
-
- self.horizontalLayout_2.addWidget(self.labelIcon)
-
- self.horizontalSpacer = QSpacerItem(8, 20, QSizePolicy.Fixed, QSizePolicy.Minimum)
-
- self.horizontalLayout_2.addItem(self.horizontalSpacer)
-
- self.verticalLayout = QVBoxLayout()
- self.verticalLayout.setSpacing(3)
- self.verticalLayout.setObjectName("verticalLayout")
- self.horizontalLayout = QHBoxLayout()
- self.horizontalLayout.setSpacing(10)
- self.horizontalLayout.setObjectName("horizontalLayout")
- self.labelPackageName = QLabel(ExpandedView)
- self.labelPackageName.setObjectName("labelPackageName")
-
- self.horizontalLayout.addWidget(self.labelPackageName)
-
- self.labelVersion = QLabel(ExpandedView)
- self.labelVersion.setObjectName("labelVersion")
- self.labelVersion.setTextFormat(Qt.RichText)
- sizePolicy2 = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)
- sizePolicy2.setHorizontalStretch(0)
- sizePolicy2.setVerticalStretch(0)
- sizePolicy2.setHeightForWidth(self.labelVersion.sizePolicy().hasHeightForWidth())
- self.labelVersion.setSizePolicy(sizePolicy2)
-
- self.horizontalLayout.addWidget(self.labelVersion)
-
- self.labelTags = QLabel(ExpandedView)
- self.labelTags.setObjectName("labelTags")
-
- self.horizontalLayout.addWidget(self.labelTags)
-
- self.labelSort = QLabel(ExpandedView)
- self.labelSort.setObjectName("labelSort")
-
- self.horizontalLayout.addWidget(self.labelSort)
-
- self.horizontalSpacer_2 = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
-
- self.horizontalLayout.addItem(self.horizontalSpacer_2)
-
- self.verticalLayout.addLayout(self.horizontalLayout)
-
- self.labelDescription = QLabel(ExpandedView)
- self.labelDescription.setObjectName("labelDescription")
- sizePolicy.setHeightForWidth(self.labelDescription.sizePolicy().hasHeightForWidth())
- self.labelDescription.setSizePolicy(sizePolicy)
- self.labelDescription.setTextFormat(Qt.PlainText)
- self.labelDescription.setAlignment(Qt.AlignLeading | Qt.AlignLeft | Qt.AlignTop)
- self.labelDescription.setWordWrap(True)
-
- self.verticalLayout.addWidget(self.labelDescription)
-
- self.labelMaintainer = QLabel(ExpandedView)
- self.labelMaintainer.setObjectName("labelMaintainer")
- sizePolicy2.setHeightForWidth(self.labelMaintainer.sizePolicy().hasHeightForWidth())
- self.labelMaintainer.setSizePolicy(sizePolicy2)
- self.labelMaintainer.setAlignment(Qt.AlignLeading | Qt.AlignLeft | Qt.AlignTop)
- self.labelMaintainer.setWordWrap(False)
-
- self.verticalLayout.addWidget(self.labelMaintainer)
-
- self.horizontalLayout_2.addLayout(self.verticalLayout)
-
- self.labelStatus = QLabel(ExpandedView)
- self.labelStatus.setObjectName("labelStatus")
- self.labelStatus.setTextFormat(Qt.RichText)
- self.labelStatus.setAlignment(Qt.AlignRight | Qt.AlignTrailing | Qt.AlignVCenter)
-
- self.horizontalLayout_2.addWidget(self.labelStatus)
-
- self.retranslateUi(ExpandedView)
-
- QMetaObject.connectSlotsByName(ExpandedView)
-
- # setupUi
-
- def retranslateUi(self, ExpandedView):
- # ExpandedView.setWindowTitle(QCoreApplication.translate("ExpandedView", "Form", None))
- self.labelIcon.setText(QCoreApplication.translate("ExpandedView", "Icon", None))
- self.labelPackageName.setText(
- QCoreApplication.translate("ExpandedView", "
- ExpandedView
-
-
-
- 0
- 0
- 807
- 141
-
-
-
-
- 0
- 0
-
-
-
- Form
-
-
-
- 2
-
-
- QLayout::SetNoConstraint
-
-
- 2
-
-
- 0
-
-
- 2
-
-
- 0
-
- -
-
-
-
- 0
- 0
-
-
-
-
- 48
- 48
-
-
-
-
- 48
- 48
-
-
-
-
- 48
- 48
-
-
-
- Icon
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Fixed
-
-
-
- 8
- 20
-
-
-
-
- -
-
-
- 3
-
- -
-
-
- 10
-
- -
-
-
- <h1>Package Name</h1>
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Version
-
-
-
- -
-
-
- (tags)
-
-
-
- -
-
-
- labelSort
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Description
-
-
- Qt::PlainText
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
- true
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Maintainer
-
-
- Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop
-
-
- false
-
-
-
-
-
- -
-
-
- UpdateAvailable
-
-
- Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter
-
-
-
-
-
-
diff --git a/src/Mod/AddonManager/first_run.ui b/src/Mod/AddonManager/first_run.ui
deleted file mode 100644
index 31217bddda..0000000000
--- a/src/Mod/AddonManager/first_run.ui
+++ /dev/null
@@ -1,113 +0,0 @@
-
-
- Dialog
-
-
- Qt::ApplicationModal
-
-
-
- 0
- 0
- 520
- 110
-
-
-
- Add-on Manager: Warning!
-
-
- -
-
-
- 30
-
-
- 20
-
-
- 6
-
-
- 20
-
-
- 6
-
- -
-
-
-
- 100
- 100
-
-
-
-
- 100
- 100
-
-
-
- false
-
-
- :/icons/AddonMgrWithWarning.svg
-
-
-
- -
-
-
- The Add-on Manager provides access to an extensive library of useful third-party FreeCAD extensions. No guarantees can be made regarding their safety or functionality.
-
-
- true
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
- QSizePolicy::Expanding
-
-
-
- -
-
- -
-
-
- Qt::Horizontal
-
-
- QSizePolicy::Expanding
-
-
-
- -
-
-
- Continue
-
-
-
- -
-
-
- Cancel
-
-
-
-
-
-
-
-
diff --git a/src/Mod/AddonManager/install_to_toolbar.py b/src/Mod/AddonManager/install_to_toolbar.py
deleted file mode 100644
index 9f3ba038b8..0000000000
--- a/src/Mod/AddonManager/install_to_toolbar.py
+++ /dev/null
@@ -1,293 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-# ***************************************************************************
-# * *
-# * Copyright (c) 2022-2024 The FreeCAD Project Association AISBL *
-# * *
-# * This file is part of FreeCAD. *
-# * *
-# * FreeCAD is free software: you can redistribute it and/or modify it *
-# * under the terms of the GNU Lesser General Public License as *
-# * published by the Free Software Foundation, either version 2.1 of the *
-# * License, or (at your option) any later version. *
-# * *
-# * FreeCAD is distributed in the hope that it will be useful, but *
-# * WITHOUT ANY WARRANTY; without even the implied warranty of *
-# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
-# * Lesser General Public License for more details. *
-# * *
-# * You should have received a copy of the GNU Lesser General Public *
-# * License along with FreeCAD. If not, see *
-# *
Loading...
-
-
-
- PackageDetails
-
-
-
- 0
- 0
- 755
- 367
-
-
-
- Form
-
-
- -
-
- -
-
-
-
-
-
- -
-
-
- ...
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 40
- 20
-
-
-
-
- -
-
-
- Uninstalls a selected macro or workbench
-
-
- Install
-
-
-
- -
-
-
- Uninstall
-
-
-
- -
-
-
- Update
-
-
-
- -
-
-
- Run Macro
-
-
-
- -
-
-
- Change branch
-
-
-
-
-
- -
-
-
- Installation details go here
-
-
- true
-
-
- false
-
-
-
- -
-
-
-
-
diff --git a/src/Mod/AddonManager/package_list.py b/src/Mod/AddonManager/package_list.py
deleted file mode 100644
index e946e14f12..0000000000
--- a/src/Mod/AddonManager/package_list.py
+++ /dev/null
@@ -1,792 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-# ***************************************************************************
-# * *
-# * Copyright (c) 2022-2023 FreeCAD Project Association *
-# * *
-# * This file is part of FreeCAD. *
-# * *
-# * FreeCAD is free software: you can redistribute it and/or modify it *
-# * under the terms of the GNU Lesser General Public License as *
-# * published by the Free Software Foundation, either version 2.1 of the *
-# * License, or (at your option) any later version. *
-# * *
-# * FreeCAD is distributed in the hope that it will be useful, but *
-# * WITHOUT ANY WARRANTY; without even the implied warranty of *
-# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
-# * Lesser General Public License for more details. *
-# * *
-# * You should have received a copy of the GNU Lesser General Public *
-# * License along with FreeCAD. If not, see *
-# *
" + translate("AddonsInstaller", "Installed version") + ": " - ) - if repo.installed_metadata: - installed_version_string += str(repo.installed_metadata.version) - elif repo.installed_version: - installed_version_string += str(repo.installed_version) - else: - installed_version_string = "
" + translate("AddonsInstaller", "Unknown version") - - installed_date_string = "" - if repo.updated_timestamp: - installed_date_string = "
" + translate("AddonsInstaller", "Installed on") + ": " - installed_date_string += QtCore.QLocale().toString( - QtCore.QDateTime.fromSecsSinceEpoch(int(round(repo.updated_timestamp, 0))), - QtCore.QLocale.ShortFormat, - ) - - available_version_string = "" - if repo.metadata: - available_version_string = ( - "
" + translate("AddonsInstaller", "Available version") + ": " - ) - available_version_string += str(repo.metadata.version) - - if repo.status() == Addon.Status.UNCHECKED: - result = translate("AddonsInstaller", "Installed") - result += installed_version_string - result += installed_date_string - elif repo.status() == Addon.Status.NO_UPDATE_AVAILABLE: - result = translate("AddonsInstaller", "Up-to-date") - result += installed_version_string - result += installed_date_string - elif repo.status() == Addon.Status.UPDATE_AVAILABLE: - result = translate("AddonsInstaller", "Update available") - result += installed_version_string - result += installed_date_string - result += available_version_string - elif repo.status() == Addon.Status.PENDING_RESTART: - result = translate("AddonsInstaller", "Pending restart") - - if repo.is_disabled(): - style = "style='color:" + utils.warning_color_string() + "; font-weight:bold;'" - result += ( - f"
[" + translate("AddonsInstaller", "DISABLED") + "]" - ) - - return result - - def paint( - self, - painter: QtGui.QPainter, - option: QtWidgets.QStyleOptionViewItem, - _: QtCore.QModelIndex, - ): - """Main paint function: renders this widget into a given rectangle, - successively drawing all of its children.""" - painter.save() - self.widget.resize(option.rect.size()) - painter.translate(option.rect.topLeft()) - self.widget.render( - painter, QtCore.QPoint(), QtGui.QRegion(), QtWidgets.QWidget.DrawChildren - ) - painter.restore() - - -class PackageListFilter(QtCore.QSortFilterProxyModel): - """Handle filtering the item list on various criteria""" - - def __init__(self): - super().__init__() - self.package_type = 0 # Default to showing everything - self.status = 0 # Default to showing any - self.setSortCaseSensitivity(QtCore.Qt.CaseInsensitive) - self.hide_obsolete = False - self.hide_py2 = False - self.hide_non_OSI_approved = False - self.hide_non_FSF_libre = False - self.hide_unlicensed = False - self.hide_newer_freecad_required = False - - def setPackageFilter( - self, package_type: int - ) -> None: # 0=All, 1=Workbenches, 2=Macros, 3=Preference Packs, 4=Bundles, 5=Other - """Set the package filter to package_type and refreshes.""" - self.package_type = package_type - self.invalidateFilter() - - def setStatusFilter( - self, status: int - ) -> None: # 0=Any, 1=Installed, 2=Not installed, 3=Update available - """Sets the status filter to status and refreshes.""" - self.status = status - self.invalidateFilter() - - def setHidePy2(self, hide_py2: bool) -> None: - """Sets whether to hide Python 2-only Addons""" - self.hide_py2 = hide_py2 - self.invalidateFilter() - - def setHideObsolete(self, hide_obsolete: bool) -> None: - """Sets whether to hide Addons marked obsolete""" - self.hide_obsolete = hide_obsolete - self.invalidateFilter() - - def setHideNonOSIApproved(self, hide: bool) -> None: - """Sets whether to hide Addons with non-OSI-approved licenses""" - self.hide_non_OSI_approved = hide - self.invalidateFilter() - - def setHideNonFSFLibre(self, hide: bool) -> None: - """Sets whether to hide Addons with non-FSF-Libre licenses""" - self.hide_non_FSF_libre = hide - self.invalidateFilter() - - def setHideUnlicensed(self, hide: bool) -> None: - """Sets whether to hide addons without a specified license""" - self.hide_unlicensed = hide - self.invalidateFilter() - - def setHideNewerFreeCADRequired(self, hide_nfr: bool) -> None: - """Sets whether to hide packages that have indicated they need a newer version - of FreeCAD than the one currently running.""" - self.hide_newer_freecad_required = hide_nfr - self.invalidateFilter() - - # def lessThan(self, left_in, right_in) -> bool: - # """Enable sorting of display name (not case-sensitive).""" - # - # left = self.sourceModel().data(left_in, self.sortRole) - # right = self.sourceModel().data(right_in, self.sortRole) - # - # return left.display_name.lower() < right.display_name.lower() - - def filterAcceptsRow(self, row, _parent=QtCore.QModelIndex()): - """Do the actual filtering (called automatically by Qt when drawing the list)""" - - index = self.sourceModel().createIndex(row, 0) - data = self.sourceModel().data(index, PackageListItemModel.DataAccessRole) - if self.package_type == 1: - if not data.contains_workbench(): - return False - elif self.package_type == 2: - if not data.contains_macro(): - return False - elif self.package_type == 3: - if not data.contains_preference_pack(): - return False - elif self.package_type == 4: - if not data.contains_bundle(): - return False - elif self.package_type == 5: - if not data.contains_other(): - return False - - if self.status == StatusFilter.INSTALLED: - if data.status() == Addon.Status.NOT_INSTALLED: - return False - elif self.status == StatusFilter.NOT_INSTALLED: - if data.status() != Addon.Status.NOT_INSTALLED: - return False - elif self.status == StatusFilter.UPDATE_AVAILABLE: - if data.status() != Addon.Status.UPDATE_AVAILABLE: - return False - - license_manager = get_license_manager() - if data.status() == Addon.Status.NOT_INSTALLED: - - # If it's not installed, check to see if it's Py2 only - if self.hide_py2 and data.python2: - return False - - # If it's not installed, check to see if it's marked obsolete - if self.hide_obsolete and data.obsolete: - return False - - if self.hide_unlicensed: - if not data.license or data.license in ["UNLICENSED", "UNLICENCED"]: - FreeCAD.Console.PrintLog(f"Hiding {data.name} because it has no license set\n") - return False - - # If it is not an OSI-approved license, check to see if we are hiding those - if self.hide_non_OSI_approved or self.hide_non_FSF_libre: - if not data.license: - return False - licenses_to_check = [] - if type(data.license) is str: - licenses_to_check.append(data.license) - elif type(data.license) is list: - for license_id in data.license: - if type(license_id) is str: - licenses_to_check.append(license_id) - else: - licenses_to_check.append(license_id.name) - else: - licenses_to_check.append(data.license.name) - - fsf_libre = False - osi_approved = False - for license_id in licenses_to_check: - if not osi_approved and license_manager.is_osi_approved(license_id): - osi_approved = True - if not fsf_libre and license_manager.is_fsf_libre(license_id): - fsf_libre = True - if self.hide_non_OSI_approved and not osi_approved: - # FreeCAD.Console.PrintLog( - # f"Hiding addon {data.name} because its license, {licenses_to_check}, " - # f"is " - # f"not OSI approved\n" - # ) - return False - if self.hide_non_FSF_libre and not fsf_libre: - # FreeCAD.Console.PrintLog( - # f"Hiding addon {data.name} because its license, {licenses_to_check}, is " - # f"not FSF Libre\n" - # ) - return False - - # If it's not installed, check to see if it's for a newer version of FreeCAD - if ( - data.status() == Addon.Status.NOT_INSTALLED - and self.hide_newer_freecad_required - and data.metadata - ): - # Only hide if ALL content items require a newer version, otherwise - # it's possible that this package actually provides versions of itself - # for newer and older versions - - first_supported_version = get_first_supported_freecad_version(data.metadata) - if first_supported_version is not None: - current_fc_version = Version(from_list=FreeCAD.Version()) - if first_supported_version > current_fc_version: - return False - - name = data.display_name - desc = data.description - if hasattr(self, "filterRegularExpression"): # Added in Qt 5.12 - re = self.filterRegularExpression() - if re.isValid(): - re.setPatternOptions(QtCore.QRegularExpression.CaseInsensitiveOption) - if re.match(name).hasMatch(): - return True - if re.match(desc).hasMatch(): - return True - if data.macro and data.macro.comment and re.match(data.macro.comment).hasMatch(): - return True - for tag in data.tags: - if re.match(tag).hasMatch(): - return True - return False - # Only get here for Qt < 5.12 - re = self.filterRegExp() - if re.isValid(): - re.setCaseSensitivity(QtCore.Qt.CaseInsensitive) - if re.indexIn(name) != -1: - return True - if re.indexIn(desc) != -1: - return True - if data.macro and data.macro.comment and re.indexIn(data.macro.comment) != -1: - return True - for tag in data.tags: - if re.indexIn(tag) != -1: - return True - return False - - -# pylint: disable=attribute-defined-outside-init, missing-function-docstring - - -class Ui_PackageList: - """The contents of the PackageList widget""" - - def setupUi(self, form): - if not form.objectName(): - form.setObjectName("PackageList") - self.verticalLayout = QtWidgets.QVBoxLayout(form) - self.verticalLayout.setObjectName("verticalLayout") - self.horizontalLayout_6 = QtWidgets.QHBoxLayout() - self.horizontalLayout_6.setObjectName("horizontalLayout_6") - - self.view_bar = WidgetViewControlBar(form) - self.view_bar.setObjectName("ViewControlBar") - self.horizontalLayout_6.addWidget(self.view_bar) - - self.verticalLayout.addLayout(self.horizontalLayout_6) - - self.listPackages = QtWidgets.QListView(form) - self.listPackages.setObjectName("listPackages") - self.listPackages.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers) - self.listPackages.setProperty("showDropIndicator", False) - self.listPackages.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection) - self.listPackages.setResizeMode(QtWidgets.QListView.Adjust) - self.listPackages.setUniformItemSizes(False) - self.listPackages.setAlternatingRowColors(True) - self.listPackages.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff) - self.listPackages.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) - self.listPackages.verticalScrollBar().setSingleStep(24) - - self.verticalLayout.addWidget(self.listPackages) - - self.progress_bar = WidgetProgressBar() - self.verticalLayout.addWidget(self.progress_bar) - - QtCore.QMetaObject.connectSlotsByName(form) diff --git a/src/Mod/AddonManager/proxy_authentication.ui b/src/Mod/AddonManager/proxy_authentication.ui deleted file mode 100644 index 7c804680b5..0000000000 --- a/src/Mod/AddonManager/proxy_authentication.ui +++ /dev/null @@ -1,150 +0,0 @@ - -
- proxy_authentication
-
-
-
- 0
- 0
- 536
- 276
-
-
-
- Proxy login required
-
-
- -
-
-
- Proxy requires authentication
-
-
-
- -
-
- -
-
-
- Proxy:
-
-
-
- -
-
-
-
- 0
- 0
-
-
-
- Placeholder for proxy address
-
-
-
- -
-
-
- Realm:
-
-
-
- -
-
-
- Placeholder for proxy realm
-
-
-
-
-
- -
-
- -
-
-
- Username
-
-
-
- -
-
- -
-
-
- Password
-
-
-
- -
-
-
- QLineEdit::PasswordEchoOnEdit
-
-
-
-
-
- -
-
-
- Qt::Vertical
-
-
-
- 20
- 40
-
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
-
-
- buttonBox
- accepted()
- proxy_authentication
- accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- proxy_authentication
- reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
-
-
-
diff --git a/src/Mod/AddonManager/select_toolbar_dialog.ui b/src/Mod/AddonManager/select_toolbar_dialog.ui
deleted file mode 100644
index 2dda0cb038..0000000000
--- a/src/Mod/AddonManager/select_toolbar_dialog.ui
+++ /dev/null
@@ -1,87 +0,0 @@
-
-
- select_toolbar_dialog
-
-
-
- 0
- 0
- 308
- 109
-
-
-
- Select Toolbar
-
-
- true
-
-
- true
-
-
- -
-
-
- Select a toolbar to add this macro to:
-
-
-
- -
-
- -
-
-
- Ask every time
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
-
-
- buttonBox
- accepted()
- select_toolbar_dialog
- accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- select_toolbar_dialog
- reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
-
-
-
diff --git a/src/Mod/AddonManager/toolbar_button.ui b/src/Mod/AddonManager/toolbar_button.ui
deleted file mode 100644
index 5765542490..0000000000
--- a/src/Mod/AddonManager/toolbar_button.ui
+++ /dev/null
@@ -1,56 +0,0 @@
-
-
- toolbar_button
-
-
-
- 0
- 0
- 257
- 62
-
-
-
- Add button?
-
-
- -
-
-
- Add a toolbar button for this macro?
-
-
- true
-
-
-
- -
-
- -
-
-
- Yes
-
-
-
- -
-
-
- No
-
-
-
- -
-
-
- Never
-
-
-
-
-
-
-
-
diff --git a/src/Mod/AddonManager/update_all.ui b/src/Mod/AddonManager/update_all.ui
deleted file mode 100644
index 27672917d5..0000000000
--- a/src/Mod/AddonManager/update_all.ui
+++ /dev/null
@@ -1,111 +0,0 @@
-
-
- UpdateAllDialog
-
-
-
- 0
- 0
- 400
- 300
-
-
-
- Updating Addons
-
-
- true
-
-
- -
-
-
- Updating out-of-date addons...
-
-
-
- -
-
-
- Qt::ScrollBarAlwaysOff
-
-
- QAbstractScrollArea::AdjustToContents
-
-
- QAbstractItemView::NoEditTriggers
-
-
- false
-
-
- false
-
-
- false
-
-
- QAbstractItemView::NoSelection
-
-
- QAbstractItemView::SelectItems
-
-
- false
-
-
- false
-
-
- true
-
-
- false
-
-
-
- -
-
-
- QDialogButtonBox::Cancel
-
-
-
-
-
-
-
- buttonBox
- accepted()
- UpdateAllDialog
- accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- UpdateAllDialog
- reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
-
-
-
diff --git a/src/Mod/CMakeLists.txt b/src/Mod/CMakeLists.txt
index 7f0d54c2d4..762264101c 100644
--- a/src/Mod/CMakeLists.txt
+++ b/src/Mod/CMakeLists.txt
@@ -1,4 +1,8 @@
if(BUILD_ADDONMGR)
+ if( NOT EXISTS "${CMAKE_SOURCE_DIR}/src/Mod/AddonManager/CMakeLists.txt" )
+ message(FATAL_ERROR "The Addon Manager has been moved into a git submodule. Please run
+ git submodule update --init" )
+ endif()
add_subdirectory(AddonManager)
endif(BUILD_ADDONMGR)
diff --git a/src/Tools/updatecrowdin.py b/src/Tools/updatecrowdin.py
index 79a4520ad1..d928fcb921 100755
--- a/src/Tools/updatecrowdin.py
+++ b/src/Tools/updatecrowdin.py
@@ -108,11 +108,6 @@ GENERATE_QM = {
# locations list contains Module name, relative path to translation folder and relative path to qrc file
locations = [
- [
- "AddonManager",
- "../Mod/AddonManager/Resources/translations",
- "../Mod/AddonManager/Resources/AddonManager.qrc",
- ],
["App", "../App/Resources/translations", "../App/Resources/App.qrc"],
["Arch", "../Mod/BIM/Resources/translations", "../Mod/BIM/Resources/Arch.qrc"],
[
diff --git a/src/Tools/updatets.py b/src/Tools/updatets.py
index 312d467138..45320f7219 100755
--- a/src/Tools/updatets.py
+++ b/src/Tools/updatets.py
@@ -57,11 +57,6 @@ directories = [
{"tsname": "App", "workingdir": "./src/App", "tsdir": "Resources/translations"},
{"tsname": "Base", "workingdir": "./src/Base", "tsdir": "Resources/translations"},
{"tsname": "FreeCAD", "workingdir": "./src/Gui", "tsdir": "Language"},
- {
- "tsname": "AddonManager",
- "workingdir": "./src/Mod/AddonManager/",
- "tsdir": "Resources/translations",
- },
{
"tsname": "Arch",
"workingdir": "./src/Mod/BIM/",
- #
-
-
-# @}
diff --git a/src/Mod/AddonManager/addonmanager_macro_parser.py b/src/Mod/AddonManager/addonmanager_macro_parser.py
deleted file mode 100644
index 8a560c79ae..0000000000
--- a/src/Mod/AddonManager/addonmanager_macro_parser.py
+++ /dev/null
@@ -1,257 +0,0 @@
-# SPDX-License-Identifier: LGPL-2.1-or-later
-# ***************************************************************************
-# * *
-# * Copyright (c) 2023 FreeCAD Project Association *
-# * *
-# * This file is part of FreeCAD. *
-# * *
-# * FreeCAD is free software: you can redistribute it and/or modify it *
-# * under the terms of the GNU Lesser General Public License as *
-# * published by the Free Software Foundation, either version 2.1 of the *
-# * License, or (at your option) any later version. *
-# * *
-# * FreeCAD is distributed in the hope that it will be useful, but *
-# * WITHOUT ANY WARRANTY; without even the implied warranty of *
-# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
-# * Lesser General Public License for more details. *
-# * *
-# * You should have received a copy of the GNU Lesser General Public *
-# * License along with FreeCAD. If not, see *
-# * " - + self.macro.name - + "
" - + self.macro.desc - + 'Macro location: ' - + self.macro.url - + "" - ) - if QtCore.QThread.currentThread().isInterruptionRequested(): - return - self.readme_updated.emit(message) - - -class GetBasicAddonStatsWorker(QtCore.QThread): - """Fetch data from an addon stats repository.""" - - update_addon_stats = QtCore.Signal(Addon) - - def __init__(self, url: str, addons: List[Addon], parent: QtCore.QObject = None): - super().__init__(parent) - self.url = url - self.addons = addons - - def run(self): - """Fetch the remote data and load it into the addons""" - - fetch_result = NetworkManager.AM_NETWORK_MANAGER.blocking_get(self.url, 5000) - if fetch_result is None: - FreeCAD.Console.PrintError( - translate( - "AddonsInstaller", - "Failed to get Addon statistics from {} -- only sorting alphabetically will" - " be accurate\n", - ).format(self.url) - ) - return - text_result = fetch_result.data().decode("utf8") - json_result = json.loads(text_result) - - for addon in self.addons: - if addon.url in json_result: - addon.stats = AddonStats.from_json(json_result[addon.url]) - self.update_addon_stats.emit(addon) - - -class GetAddonScoreWorker(QtCore.QThread): - """Fetch data from an addon score file.""" - - update_addon_score = QtCore.Signal(Addon) - - def __init__(self, url: str, addons: List[Addon], parent: QtCore.QObject = None): - super().__init__(parent) - self.url = url - self.addons = addons - - def run(self): - """Fetch the remote data and load it into the addons""" - - if self.url != "TEST": - fetch_result = NetworkManager.AM_NETWORK_MANAGER.blocking_get(self.url, 5000) - if fetch_result is None: - FreeCAD.Console.PrintError( - translate( - "AddonsInstaller", - "Failed to get Addon score from '{}' -- sorting by score will fail\n", - ).format(self.url) - ) - return - text_result = fetch_result.data().decode("utf8") - json_result = json.loads(text_result) - else: - FreeCAD.Console.PrintWarning("Running score generation in TEST mode...\n") - json_result = {} - for addon in self.addons: - if addon.macro: - json_result[addon.name] = len(addon.macro.comment) if addon.macro.comment else 0 - else: - json_result[addon.url] = len(addon.description) if addon.description else 0 - - for addon in self.addons: - score = None - if addon.url in json_result: - score = json_result[addon.url] - elif addon.name in json_result: - score = json_result[addon.name] - if score is not None: - try: - addon.score = int(score) - self.update_addon_score.emit(addon) - except (ValueError, OverflowError): - FreeCAD.Console.PrintLog( - f"Failed to convert score value '{score}' to an integer for {addon.name}" - ) diff --git a/src/Mod/AddonManager/addonmanager_workers_utility.py b/src/Mod/AddonManager/addonmanager_workers_utility.py deleted file mode 100644 index 5c8aa1b538..0000000000 --- a/src/Mod/AddonManager/addonmanager_workers_utility.py +++ /dev/null @@ -1,93 +0,0 @@ -# SPDX-License-Identifier: LGPL-2.1-or-later -# *************************************************************************** -# * * -# * Copyright (c) 2022-2023 FreeCAD Project Association * -# * * -# * This file is part of FreeCAD. * -# * * -# * FreeCAD is free software: you can redistribute it and/or modify it * -# * under the terms of the GNU Lesser General Public License as * -# * published by the Free Software Foundation, either version 2.1 of the * -# * License, or (at your option) any later version. * -# * * -# * FreeCAD is distributed in the hope that it will be useful, but * -# * WITHOUT ANY WARRANTY; without even the implied warranty of * -# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU * -# * Lesser General Public License for more details. * -# * * -# * You should have received a copy of the GNU Lesser General Public * -# * License along with FreeCAD. If not, see * -# *
Package Name
", None) - ) - self.labelVersion.setText(QCoreApplication.translate("ExpandedView", "Version", None)) - self.labelTags.setText(QCoreApplication.translate("ExpandedView", "(tags)", None)) - self.labelDescription.setText( - QCoreApplication.translate("ExpandedView", "Description", None) - ) - self.labelMaintainer.setText(QCoreApplication.translate("ExpandedView", "Maintainer", None)) - self.labelStatus.setText( - QCoreApplication.translate("ExpandedView", "Update Available", None) - ) - - # retranslateUi diff --git a/src/Mod/AddonManager/expanded_view.ui b/src/Mod/AddonManager/expanded_view.ui deleted file mode 100644 index f0034601df..0000000000 --- a/src/Mod/AddonManager/expanded_view.ui +++ /dev/null @@ -1,204 +0,0 @@ - -{repo.macro.comment}
" - whatsThisText = repo.macro.comment - else: - whatsThisText = translate( - "AddonsInstaller", "A macro installed with the FreeCAD Addon Manager" - ) - statustipText = ( - translate("AddonsInstaller", "Run", "Indicates a macro that can be 'run'") - + " " - + repo.display_name - ) - pixmapText = find_installed_icon(repo) - - # Add this command to that toolbar - command_name = FreeCADGui.Command.createCustomCommand( - repo.macro.filename, - menuText, - tooltipText, - whatsThisText, - statustipText, - pixmapText, - ) - toolbar.SetString(command_name, "FreeCAD") - - # Force the toolbars to be recreated - wb = FreeCADGui.activeWorkbench() - wb.reloadActive() - - -def remove_custom_toolbar_button(repo: Addon) -> None: - """If this repo contains a macro, look through the custom commands and - see if one is set up for this macro. If so, remove it, including any - toolbar entries.""" - - command = FreeCADGui.Command.findCustomCommand(repo.macro.filename) - if not command: - return - custom_toolbars = FreeCAD.ParamGet("User parameter:BaseApp/Workbench/Global/Toolbar") - toolbar_groups = custom_toolbars.GetGroups() - for group in toolbar_groups: - toolbar = custom_toolbars.GetGroup(group) - if toolbar.GetString(command, "*") != "*": - toolbar.RemString(command) - - FreeCADGui.Command.removeCustomCommand(command) - - # Force the toolbars to be recreated - wb = FreeCADGui.activeWorkbench() - wb.reloadActive() diff --git a/src/Mod/AddonManager/loading.html b/src/Mod/AddonManager/loading.html deleted file mode 100644 index 2664626d5c..0000000000 --- a/src/Mod/AddonManager/loading.html +++ /dev/null @@ -1,96 +0,0 @@ - - - - - -Loading...
-
-
diff --git a/src/Mod/AddonManager/package_details.ui b/src/Mod/AddonManager/package_details.ui
deleted file mode 100644
index 8c86eae0bb..0000000000
--- a/src/Mod/AddonManager/package_details.ui
+++ /dev/null
@@ -1,106 +0,0 @@
-
-{addon.display_name}
") - self.widget.ui.labelIcon.setPixmap(addon.icon.pixmap(QtCore.QSize(48, 48))) - self.widget.ui.labelStatus.setText(self.get_expanded_update_string(addon)) - self.widget.ui.labelIcon.setText("") - self.widget.ui.labelTags.setText("") - if addon.metadata: - self.widget.ui.labelDescription.setText(addon.metadata.description) - self.widget.ui.labelVersion.setText(f"v{addon.metadata.version}") - self._set_package_maintainer_label(addon) - elif addon.macro: - self.widget.ui.labelDescription.setText(addon.macro.comment) - self._set_macro_version_label(addon) - self._set_macro_maintainer_label(addon) - else: - self.widget.ui.labelDescription.setText("") - self.widget.ui.labelMaintainer.setText("") - self.widget.ui.labelVersion.setText("") - if addon.tags: - self.widget.ui.labelTags.setText( - translate("AddonsInstaller", "Tags") + ": " + ", ".join(addon.tags) - ) - if self.sort_order == SortOptions.Alphabetical: - self.widget.ui.labelSort.setText("") - else: - self.widget.ui.labelSort.setText(self._get_sort_label_text(addon)) - - def _setup_compact_view(self, addon: Addon) -> None: - self.widget.ui.labelPackageName.setText(f"{addon.display_name}") - self.widget.ui.labelIcon.setPixmap(addon.icon.pixmap(QtCore.QSize(16, 16))) - self.widget.ui.labelStatus.setText(self.get_compact_update_string(addon)) - self.widget.ui.labelIcon.setText("") - if addon.metadata: - self.widget.ui.labelVersion.setText(f"v{addon.metadata.version}") - elif addon.macro: - self._set_macro_version_label(addon) - else: - self.widget.ui.labelVersion.setText("") - if self.sort_order == SortOptions.Alphabetical: - description = self._get_compact_description(addon) - self.widget.ui.labelDescription.setText(description) - else: - self.widget.ui.labelDescription.setText(self._get_sort_label_text(addon)) - - def _setup_composite_view(self, addon: Addon) -> None: - self.widget.ui.labelPackageName.setText(f"{addon.display_name}") - self.widget.ui.labelIcon.setPixmap(addon.icon.pixmap(QtCore.QSize(16, 16))) - self.widget.ui.labelStatus.setText(self.get_compact_update_string(addon)) - self.widget.ui.labelIcon.setText("") - if addon.metadata: - self.widget.ui.labelVersion.setText(f"v{addon.metadata.version}") - elif addon.macro: - self._set_macro_version_label(addon) - else: - self.widget.ui.labelVersion.setText("") - if self.sort_order != SortOptions.Alphabetical: - self.widget.ui.labelDescription.setText(self._get_sort_label_text(addon)) - else: - self.widget.ui.labelDescription.setText("") - - def _set_package_maintainer_label(self, addon: Addon): - maintainers = addon.metadata.maintainer - maintainers_string = "" - if len(maintainers) == 1: - maintainers_string = ( - translate("AddonsInstaller", "Maintainer") - + f": {maintainers[0].name} <{maintainers[0].email}>" - ) - elif len(maintainers) > 1: - n = len(maintainers) - maintainers_string = translate("AddonsInstaller", "Maintainers:", "", n) - for maintainer in maintainers: - maintainers_string += f"\n{maintainer.name} <{maintainer.email}>" - self.widget.ui.labelMaintainer.setText(maintainers_string) - - def _set_macro_maintainer_label(self, repo: Addon): - if repo.macro.author: - caption = translate("AddonsInstaller", "Author") - self.widget.ui.labelMaintainer.setText(caption + ": " + repo.macro.author) - else: - self.widget.ui.labelMaintainer.setText("") - - def _set_macro_version_label(self, addon: Addon): - version_string = "" - if addon.macro.version: - version_string = addon.macro.version + " " - if addon.macro.on_wiki: - version_string += "(wiki)" - elif addon.macro.on_git: - version_string += "(git)" - else: - version_string += "(unknown source)" - self.widget.ui.labelVersion.setText("" + version_string + "") - - def _get_sort_label_text(self, addon: Addon) -> str: - if self.sort_order == SortOptions.Alphabetical: - return "" - elif self.sort_order == SortOptions.Stars: - if addon.stats and addon.stats.stars and addon.stats.stars > 0: - return translate("AddonsInstaller", "{} ★ on GitHub").format(addon.stats.stars) - return translate("AddonsInstaller", "No ★, or not on GitHub") - elif self.sort_order == SortOptions.DateAdded: - if addon.stats and addon.stats.date_created: - epoch_seconds = addon.stats.date_created.timestamp() - qdt = QtCore.QDateTime.fromSecsSinceEpoch(int(epoch_seconds)).date() - time_string = QtCore.QLocale().toString(qdt, QtCore.QLocale.ShortFormat) - return translate("AddonsInstaller", "Created ") + time_string - return "" - elif self.sort_order == SortOptions.LastUpdated: - update_date = addon.update_date - if update_date: - epoch_seconds = update_date.timestamp() - qdt = QtCore.QDateTime.fromSecsSinceEpoch(int(epoch_seconds)).date() - time_string = QtCore.QLocale().toString(qdt, QtCore.QLocale.ShortFormat) - return translate("AddonsInstaller", "Updated ") + time_string - return "" - elif self.sort_order == SortOptions.Score: - return translate("AddonsInstaller", "Score: ") + str(addon.score) - return "" - - def _get_compact_description(self, addon: Addon) -> str: - description = "" - if addon.metadata: - description = addon.metadata.description - elif addon.macro and addon.macro.comment: - description = addon.macro.comment - trimmed_text, _, _ = description.partition(".") - return trimmed_text.replace("\n", " ") - - @staticmethod - def get_compact_update_string(repo: Addon) -> str: - """Get a single-line string listing details about the installed version and - date""" - - result = "" - if repo.status() == Addon.Status.UNCHECKED: - result = translate("AddonsInstaller", "Installed") - elif repo.status() == Addon.Status.NO_UPDATE_AVAILABLE: - result = translate("AddonsInstaller", "Up-to-date") - elif repo.status() == Addon.Status.UPDATE_AVAILABLE: - result = translate("AddonsInstaller", "Update available") - elif repo.status() == Addon.Status.PENDING_RESTART: - result = translate("AddonsInstaller", "Pending restart") - - if repo.is_disabled(): - style = "style='color:" + utils.warning_color_string() + "; font-weight:bold;'" - result += f" [" + translate("AddonsInstaller", "DISABLED") + "]" - - return result - - @staticmethod - def get_expanded_update_string(repo: Addon) -> str: - """Get a multi-line string listing details about the installed version and - date""" - - result = "" - - installed_version_string = "" - if repo.status() != Addon.Status.NOT_INSTALLED: - if repo.installed_version or repo.installed_metadata: - installed_version_string = ( - "" + translate("AddonsInstaller", "Installed version") + ": " - ) - if repo.installed_metadata: - installed_version_string += str(repo.installed_metadata.version) - elif repo.installed_version: - installed_version_string += str(repo.installed_version) - else: - installed_version_string = "
" + translate("AddonsInstaller", "Unknown version") - - installed_date_string = "" - if repo.updated_timestamp: - installed_date_string = "
" + translate("AddonsInstaller", "Installed on") + ": " - installed_date_string += QtCore.QLocale().toString( - QtCore.QDateTime.fromSecsSinceEpoch(int(round(repo.updated_timestamp, 0))), - QtCore.QLocale.ShortFormat, - ) - - available_version_string = "" - if repo.metadata: - available_version_string = ( - "
" + translate("AddonsInstaller", "Available version") + ": " - ) - available_version_string += str(repo.metadata.version) - - if repo.status() == Addon.Status.UNCHECKED: - result = translate("AddonsInstaller", "Installed") - result += installed_version_string - result += installed_date_string - elif repo.status() == Addon.Status.NO_UPDATE_AVAILABLE: - result = translate("AddonsInstaller", "Up-to-date") - result += installed_version_string - result += installed_date_string - elif repo.status() == Addon.Status.UPDATE_AVAILABLE: - result = translate("AddonsInstaller", "Update available") - result += installed_version_string - result += installed_date_string - result += available_version_string - elif repo.status() == Addon.Status.PENDING_RESTART: - result = translate("AddonsInstaller", "Pending restart") - - if repo.is_disabled(): - style = "style='color:" + utils.warning_color_string() + "; font-weight:bold;'" - result += ( - f"
[" + translate("AddonsInstaller", "DISABLED") + "]" - ) - - return result - - def paint( - self, - painter: QtGui.QPainter, - option: QtWidgets.QStyleOptionViewItem, - _: QtCore.QModelIndex, - ): - """Main paint function: renders this widget into a given rectangle, - successively drawing all of its children.""" - painter.save() - self.widget.resize(option.rect.size()) - painter.translate(option.rect.topLeft()) - self.widget.render( - painter, QtCore.QPoint(), QtGui.QRegion(), QtWidgets.QWidget.DrawChildren - ) - painter.restore() - - -class PackageListFilter(QtCore.QSortFilterProxyModel): - """Handle filtering the item list on various criteria""" - - def __init__(self): - super().__init__() - self.package_type = 0 # Default to showing everything - self.status = 0 # Default to showing any - self.setSortCaseSensitivity(QtCore.Qt.CaseInsensitive) - self.hide_obsolete = False - self.hide_py2 = False - self.hide_non_OSI_approved = False - self.hide_non_FSF_libre = False - self.hide_unlicensed = False - self.hide_newer_freecad_required = False - - def setPackageFilter( - self, package_type: int - ) -> None: # 0=All, 1=Workbenches, 2=Macros, 3=Preference Packs, 4=Bundles, 5=Other - """Set the package filter to package_type and refreshes.""" - self.package_type = package_type - self.invalidateFilter() - - def setStatusFilter( - self, status: int - ) -> None: # 0=Any, 1=Installed, 2=Not installed, 3=Update available - """Sets the status filter to status and refreshes.""" - self.status = status - self.invalidateFilter() - - def setHidePy2(self, hide_py2: bool) -> None: - """Sets whether to hide Python 2-only Addons""" - self.hide_py2 = hide_py2 - self.invalidateFilter() - - def setHideObsolete(self, hide_obsolete: bool) -> None: - """Sets whether to hide Addons marked obsolete""" - self.hide_obsolete = hide_obsolete - self.invalidateFilter() - - def setHideNonOSIApproved(self, hide: bool) -> None: - """Sets whether to hide Addons with non-OSI-approved licenses""" - self.hide_non_OSI_approved = hide - self.invalidateFilter() - - def setHideNonFSFLibre(self, hide: bool) -> None: - """Sets whether to hide Addons with non-FSF-Libre licenses""" - self.hide_non_FSF_libre = hide - self.invalidateFilter() - - def setHideUnlicensed(self, hide: bool) -> None: - """Sets whether to hide addons without a specified license""" - self.hide_unlicensed = hide - self.invalidateFilter() - - def setHideNewerFreeCADRequired(self, hide_nfr: bool) -> None: - """Sets whether to hide packages that have indicated they need a newer version - of FreeCAD than the one currently running.""" - self.hide_newer_freecad_required = hide_nfr - self.invalidateFilter() - - # def lessThan(self, left_in, right_in) -> bool: - # """Enable sorting of display name (not case-sensitive).""" - # - # left = self.sourceModel().data(left_in, self.sortRole) - # right = self.sourceModel().data(right_in, self.sortRole) - # - # return left.display_name.lower() < right.display_name.lower() - - def filterAcceptsRow(self, row, _parent=QtCore.QModelIndex()): - """Do the actual filtering (called automatically by Qt when drawing the list)""" - - index = self.sourceModel().createIndex(row, 0) - data = self.sourceModel().data(index, PackageListItemModel.DataAccessRole) - if self.package_type == 1: - if not data.contains_workbench(): - return False - elif self.package_type == 2: - if not data.contains_macro(): - return False - elif self.package_type == 3: - if not data.contains_preference_pack(): - return False - elif self.package_type == 4: - if not data.contains_bundle(): - return False - elif self.package_type == 5: - if not data.contains_other(): - return False - - if self.status == StatusFilter.INSTALLED: - if data.status() == Addon.Status.NOT_INSTALLED: - return False - elif self.status == StatusFilter.NOT_INSTALLED: - if data.status() != Addon.Status.NOT_INSTALLED: - return False - elif self.status == StatusFilter.UPDATE_AVAILABLE: - if data.status() != Addon.Status.UPDATE_AVAILABLE: - return False - - license_manager = get_license_manager() - if data.status() == Addon.Status.NOT_INSTALLED: - - # If it's not installed, check to see if it's Py2 only - if self.hide_py2 and data.python2: - return False - - # If it's not installed, check to see if it's marked obsolete - if self.hide_obsolete and data.obsolete: - return False - - if self.hide_unlicensed: - if not data.license or data.license in ["UNLICENSED", "UNLICENCED"]: - FreeCAD.Console.PrintLog(f"Hiding {data.name} because it has no license set\n") - return False - - # If it is not an OSI-approved license, check to see if we are hiding those - if self.hide_non_OSI_approved or self.hide_non_FSF_libre: - if not data.license: - return False - licenses_to_check = [] - if type(data.license) is str: - licenses_to_check.append(data.license) - elif type(data.license) is list: - for license_id in data.license: - if type(license_id) is str: - licenses_to_check.append(license_id) - else: - licenses_to_check.append(license_id.name) - else: - licenses_to_check.append(data.license.name) - - fsf_libre = False - osi_approved = False - for license_id in licenses_to_check: - if not osi_approved and license_manager.is_osi_approved(license_id): - osi_approved = True - if not fsf_libre and license_manager.is_fsf_libre(license_id): - fsf_libre = True - if self.hide_non_OSI_approved and not osi_approved: - # FreeCAD.Console.PrintLog( - # f"Hiding addon {data.name} because its license, {licenses_to_check}, " - # f"is " - # f"not OSI approved\n" - # ) - return False - if self.hide_non_FSF_libre and not fsf_libre: - # FreeCAD.Console.PrintLog( - # f"Hiding addon {data.name} because its license, {licenses_to_check}, is " - # f"not FSF Libre\n" - # ) - return False - - # If it's not installed, check to see if it's for a newer version of FreeCAD - if ( - data.status() == Addon.Status.NOT_INSTALLED - and self.hide_newer_freecad_required - and data.metadata - ): - # Only hide if ALL content items require a newer version, otherwise - # it's possible that this package actually provides versions of itself - # for newer and older versions - - first_supported_version = get_first_supported_freecad_version(data.metadata) - if first_supported_version is not None: - current_fc_version = Version(from_list=FreeCAD.Version()) - if first_supported_version > current_fc_version: - return False - - name = data.display_name - desc = data.description - if hasattr(self, "filterRegularExpression"): # Added in Qt 5.12 - re = self.filterRegularExpression() - if re.isValid(): - re.setPatternOptions(QtCore.QRegularExpression.CaseInsensitiveOption) - if re.match(name).hasMatch(): - return True - if re.match(desc).hasMatch(): - return True - if data.macro and data.macro.comment and re.match(data.macro.comment).hasMatch(): - return True - for tag in data.tags: - if re.match(tag).hasMatch(): - return True - return False - # Only get here for Qt < 5.12 - re = self.filterRegExp() - if re.isValid(): - re.setCaseSensitivity(QtCore.Qt.CaseInsensitive) - if re.indexIn(name) != -1: - return True - if re.indexIn(desc) != -1: - return True - if data.macro and data.macro.comment and re.indexIn(data.macro.comment) != -1: - return True - for tag in data.tags: - if re.indexIn(tag) != -1: - return True - return False - - -# pylint: disable=attribute-defined-outside-init, missing-function-docstring - - -class Ui_PackageList: - """The contents of the PackageList widget""" - - def setupUi(self, form): - if not form.objectName(): - form.setObjectName("PackageList") - self.verticalLayout = QtWidgets.QVBoxLayout(form) - self.verticalLayout.setObjectName("verticalLayout") - self.horizontalLayout_6 = QtWidgets.QHBoxLayout() - self.horizontalLayout_6.setObjectName("horizontalLayout_6") - - self.view_bar = WidgetViewControlBar(form) - self.view_bar.setObjectName("ViewControlBar") - self.horizontalLayout_6.addWidget(self.view_bar) - - self.verticalLayout.addLayout(self.horizontalLayout_6) - - self.listPackages = QtWidgets.QListView(form) - self.listPackages.setObjectName("listPackages") - self.listPackages.setEditTriggers(QtWidgets.QAbstractItemView.NoEditTriggers) - self.listPackages.setProperty("showDropIndicator", False) - self.listPackages.setSelectionMode(QtWidgets.QAbstractItemView.NoSelection) - self.listPackages.setResizeMode(QtWidgets.QListView.Adjust) - self.listPackages.setUniformItemSizes(False) - self.listPackages.setAlternatingRowColors(True) - self.listPackages.setHorizontalScrollBarPolicy(QtCore.Qt.ScrollBarAlwaysOff) - self.listPackages.setVerticalScrollMode(QtWidgets.QAbstractItemView.ScrollPerPixel) - self.listPackages.verticalScrollBar().setSingleStep(24) - - self.verticalLayout.addWidget(self.listPackages) - - self.progress_bar = WidgetProgressBar() - self.verticalLayout.addWidget(self.progress_bar) - - QtCore.QMetaObject.connectSlotsByName(form) diff --git a/src/Mod/AddonManager/proxy_authentication.ui b/src/Mod/AddonManager/proxy_authentication.ui deleted file mode 100644 index 7c804680b5..0000000000 --- a/src/Mod/AddonManager/proxy_authentication.ui +++ /dev/null @@ -1,150 +0,0 @@ - -