kindred/create
1
1
Fork 0
Code Issues 51 Pull Requests 1 Actions 3 Packages Projects 9 Releases 2 Wiki Activity

Addon Manager: Translation issues

Browse Source
This commit is contained in:
Chris Hennes
2023-05-05 13:54:02 -05:00
parent 8fa84433a8
commit e28fb35268
3 changed files with 36 additions and 89 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Mod/AddonManager/AddonManager.ui
View File

@@ -68,7 +68,7 @@
<item>
<widget class="QToolButton" name="buttonPauseUpdate">
<property name="toolTip">
<string>Pause cache update</string>
<string>Stop the cache update</string>
</property>
<property name="text">
<string/>

81
src/Mod/AddonManager/addonmanager_installer_gui.py
View File

@@ -39,6 +39,7 @@ import addonmanager_utilities as utils
from Addon import Addon, MissingDependencies
translate = FreeCAD.Qt.translate
from PySide.QtCore import QT_TRANSLATE_NOOP
# pylint: disable=c-extension-no-member,too-few-public-methods,too-many-instance-attributes
@@ -155,11 +156,7 @@ class AddonInstallerGUI(QtCore.QObject):
for dep in bad_packages:
message += f"<li>{dep}</li>"
else:
message += (
"<li>("
+ translate("AddonsInstaller", "Too many to list")
+ ")</li>"
)
message += "<li>(" + translate("AddonsInstaller", "Too many to list") + ")</li>"
message += "</ul>"
message += "To ignore this error and install anyway, press OK."
r = QtWidgets.QMessageBox.critical(
@@ -224,15 +221,13 @@ class AddonInstallerGUI(QtCore.QObject):
item.setCheckState(QtCore.Qt.Unchecked)
self.dependency_dialog.listWidgetPythonOptional.addItem(item)
self.dependency_dialog.buttonBox.button(
QtWidgets.QDialogButtonBox.Yes
).clicked.connect(self._dependency_dialog_yes_clicked)
self.dependency_dialog.buttonBox.button(
QtWidgets.QDialogButtonBox.Ignore
).clicked.connect(self._dependency_dialog_ignore_clicked)
self.dependency_dialog.buttonBox.button(
QtWidgets.QDialogButtonBox.Cancel
).setDefault(True)
self.dependency_dialog.buttonBox.button(QtWidgets.QDialogButtonBox.Yes).clicked.connect(
self._dependency_dialog_yes_clicked
)
self.dependency_dialog.buttonBox.button(QtWidgets.QDialogButtonBox.Ignore).clicked.connect(
self._dependency_dialog_ignore_clicked
)
self.dependency_dialog.buttonBox.button(QtWidgets.QDialogButtonBox.Cancel).setDefault(True)
self.dependency_dialog.exec()
def _check_python_version(self, missing: MissingDependencies) -> bool:
@@ -302,9 +297,7 @@ class AddonInstallerGUI(QtCore.QObject):
def _run_dependency_installer(self, addons, python_requires, python_optional):
"""Run the dependency installer (in a separate thread) for the given dependencies"""
self.dependency_installer = DependencyInstaller(
addons, python_requires, python_optional
)
self.dependency_installer = DependencyInstaller(addons, python_requires, python_optional)
self.dependency_installer.no_python_exe.connect(self._report_no_python_exe)
self.dependency_installer.no_pip.connect(self._report_no_pip)
self.dependency_installer.failure.connect(self._report_dependency_failure)
@@ -323,9 +316,7 @@ class AddonInstallerGUI(QtCore.QObject):
QtWidgets.QMessageBox.Cancel,
parent=utils.get_main_am_window(),
)
self.dependency_installation_dialog.rejected.connect(
self._cancel_dependency_installation
)
self.dependency_installation_dialog.rejected.connect(self._cancel_dependency_installation)
self.dependency_installation_dialog.show()
self.dependency_worker_thread.start()
@@ -392,9 +383,7 @@ class AddonInstallerGUI(QtCore.QObject):
if self.dependency_installation_dialog is not None:
self.dependency_installation_dialog.hide()
if self.dependency_installer and hasattr(self.dependency_installer, "finished"):
self.dependency_installer.finished.disconnect(
self._report_dependency_success
)
self.dependency_installer.finished.disconnect(self._report_dependency_success)
FreeCAD.Console.PrintError(details + "\n")
result = QtWidgets.QMessageBox.critical(
utils.get_main_am_window(),
@@ -474,9 +463,7 @@ class AddonInstallerGUI(QtCore.QObject):
while self.worker_thread.isRunning():
self.worker_thread.wait(50)
QtCore.QCoreApplication.processEvents(QtCore.QEventLoop.AllEvents)
path = os.path.join(
self.installer.installation_path, self.addon_to_install.name
)
path = os.path.join(self.installer.installation_path, self.addon_to_install.name)
if os.path.exists(path):
utils.rmdir(path)
dlg.hide()
@@ -527,12 +514,8 @@ class MacroInstallerGUI(QtCore.QObject):
self.addon_to_install = addon
self.worker_thread = None
self.installer = MacroInstaller(self.addon_to_install)
self.addon_params = FreeCAD.ParamGet(
"User parameter:BaseApp/Preferences/Addons"
)
self.toolbar_params = FreeCAD.ParamGet(
"User parameter:BaseApp/Workbench/Global/Toolbar"
)
self.addon_params = FreeCAD.ParamGet("User parameter:BaseApp/Preferences/Addons")
self.toolbar_params = FreeCAD.ParamGet("User parameter:BaseApp/Workbench/Global/Toolbar")
self.macro_dir = FreeCAD.getUserMacroDir(True)
def __del__(self):
@@ -565,20 +548,14 @@ class MacroInstallerGUI(QtCore.QObject):
def _ask_to_install_toolbar_button(self) -> None:
"""Presents a dialog to the user asking if they want to install a toolbar button for
a particular macro, and walks through that process if they agree to do so."""
do_not_show_dialog = self.addon_params.GetBool(
"dontShowAddMacroButtonDialog", False
)
do_not_show_dialog = self.addon_params.GetBool("dontShowAddMacroButtonDialog", False)
button_exists = self._macro_button_exists()
if not do_not_show_dialog and not button_exists:
add_toolbar_button_dialog = FreeCADGui.PySideUic.loadUi(
os.path.join(os.path.dirname(__file__), "add_toolbar_button_dialog.ui")
)
add_toolbar_button_dialog.setWindowFlag(
QtCore.Qt.WindowStaysOnTopHint, True
)
add_toolbar_button_dialog.buttonYes.clicked.connect(
self._install_toolbar_button
)
add_toolbar_button_dialog.setWindowFlag(QtCore.Qt.WindowStaysOnTopHint, True)
add_toolbar_button_dialog.buttonYes.clicked.connect(self._install_toolbar_button)
add_toolbar_button_dialog.buttonNever.clicked.connect(
lambda: self.addon_params.SetBool("dontShowAddMacroButtonDialog", True)
)
@@ -671,7 +648,7 @@ class MacroInstallerGUI(QtCore.QObject):
# unique.
# First, the displayed name
custom_toolbar_name = "Auto-Created Macro Toolbar"
custom_toolbar_name = QT_TRANSLATE_NOOP("Workbench", "Auto-Created Macro Toolbar")
custom_toolbars = self.toolbar_params.GetGroups()
name_taken = self._check_for_toolbar(custom_toolbar_name)
if name_taken:
@@ -730,9 +707,7 @@ class MacroInstallerGUI(QtCore.QObject):
custom_toolbar = self._ask_for_toolbar(custom_toolbars)
if custom_toolbar:
custom_toolbar_name = custom_toolbar.GetString("Name")
self.addon_params.SetString(
"CustomToolbarName", custom_toolbar_name
)
self.addon_params.SetString("CustomToolbarName", custom_toolbar_name)
else:
# Create a custom toolbar
custom_toolbar = self.toolbar_params.GetGroup("Custom_1")
@@ -742,9 +717,7 @@ class MacroInstallerGUI(QtCore.QObject):
if custom_toolbar:
self._install_macro_to_toolbar(custom_toolbar)
else:
FreeCAD.Console.PrintMessage(
"In the end, no custom toolbar was set, bailing out\n"
)
FreeCAD.Console.PrintMessage("In the end, no custom toolbar was set, bailing out\n")
def _install_macro_to_toolbar(self, toolbar: object) -> None:
"""Adds an icon for the given macro to the given toolbar."""
@@ -771,9 +744,7 @@ class MacroInstallerGUI(QtCore.QObject):
)
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"
)
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)
@@ -824,14 +795,10 @@ class MacroInstallerGUI(QtCore.QObject):
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
)
command = FreeCADGui.Command.findCustomCommand(self.addon_to_install.macro.filename)
if not command:
return
custom_toolbars = FreeCAD.ParamGet(
"User parameter:BaseApp/Workbench/Global/Toolbar"
)
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)

42
src/Mod/AddonManager/expanded_view.py
View File

@@ -41,9 +41,7 @@ class Ui_ExpandedView(object):
self.horizontalLayout_2.addWidget(self.labelIcon)
self.horizontalSpacer = QSpacerItem(
8, 20, QSizePolicy.Fixed, QSizePolicy.Minimum
)
self.horizontalSpacer = QSpacerItem(8, 20, QSizePolicy.Fixed, QSizePolicy.Minimum)
self.horizontalLayout_2.addItem(self.horizontalSpacer)
@@ -64,9 +62,7 @@ class Ui_ExpandedView(object):
sizePolicy2 = QSizePolicy(QSizePolicy.Preferred, QSizePolicy.Preferred)
sizePolicy2.setHorizontalStretch(0)
sizePolicy2.setVerticalStretch(0)
sizePolicy2.setHeightForWidth(
self.labelVersion.sizePolicy().hasHeightForWidth()
)
sizePolicy2.setHeightForWidth(self.labelVersion.sizePolicy().hasHeightForWidth())
self.labelVersion.setSizePolicy(sizePolicy2)
self.horizontalLayout.addWidget(self.labelVersion)
@@ -76,9 +72,7 @@ class Ui_ExpandedView(object):
self.horizontalLayout.addWidget(self.labelTags)
self.horizontalSpacer_2 = QSpacerItem(
40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum
)
self.horizontalSpacer_2 = QSpacerItem(40, 20, QSizePolicy.Expanding, QSizePolicy.Minimum)
self.horizontalLayout.addItem(self.horizontalSpacer_2)
@@ -86,9 +80,7 @@ class Ui_ExpandedView(object):
self.labelDescription = QLabel(ExpandedView)
self.labelDescription.setObjectName("labelDescription")
sizePolicy.setHeightForWidth(
self.labelDescription.sizePolicy().hasHeightForWidth()
)
sizePolicy.setHeightForWidth(self.labelDescription.sizePolicy().hasHeightForWidth())
self.labelDescription.setSizePolicy(sizePolicy)
self.labelDescription.setTextFormat(Qt.PlainText)
self.labelDescription.setAlignment(Qt.AlignLeading | Qt.AlignLeft | Qt.AlignTop)
@@ -98,9 +90,7 @@ class Ui_ExpandedView(object):
self.labelMaintainer = QLabel(ExpandedView)
self.labelMaintainer.setObjectName("labelMaintainer")
sizePolicy2.setHeightForWidth(
self.labelMaintainer.sizePolicy().hasHeightForWidth()
)
sizePolicy2.setHeightForWidth(self.labelMaintainer.sizePolicy().hasHeightForWidth())
self.labelMaintainer.setSizePolicy(sizePolicy2)
self.labelMaintainer.setAlignment(Qt.AlignLeading | Qt.AlignLeft | Qt.AlignTop)
self.labelMaintainer.setWordWrap(False)
@@ -112,9 +102,7 @@ class Ui_ExpandedView(object):
self.labelStatus = QLabel(ExpandedView)
self.labelStatus.setObjectName("labelStatus")
self.labelStatus.setTextFormat(Qt.RichText)
self.labelStatus.setAlignment(
Qt.AlignRight | Qt.AlignTrailing | Qt.AlignVCenter
)
self.labelStatus.setAlignment(Qt.AlignRight | Qt.AlignTrailing | Qt.AlignVCenter)
self.horizontalLayout_2.addWidget(self.labelStatus)
@@ -125,27 +113,19 @@ class Ui_ExpandedView(object):
# setupUi
def retranslateUi(self, ExpandedView):
ExpandedView.setWindowTitle(
QCoreApplication.translate("ExpandedView", "Form", None)
)
ExpandedView.setWindowTitle(QCoreApplication.translate("ExpandedView", "Form", None))
self.labelIcon.setText(QCoreApplication.translate("ExpandedView", "Icon", None))
self.labelPackageName.setText(
QCoreApplication.translate("ExpandedView", "<h1>Package Name</h1>", None)
)
self.labelVersion.setText(
QCoreApplication.translate("ExpandedView", "Version", None)
)
self.labelTags.setText(
QCoreApplication.translate("ExpandedView", "(tags)", 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.labelMaintainer.setText(QCoreApplication.translate("ExpandedView", "Maintainer", None))
self.labelStatus.setText(
QCoreApplication.translate("ExpandedView", "UpdateAvailable", None)
QCoreApplication.translate("ExpandedView", "Update Available", None)
)
# retranslateUi