GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-06-30 19:05:11 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/4.0'

Browse Source
This commit is contained in:
Lipu Fei 2019-01-15 12:22:46 +01:00
commit ea0a6827ff
2 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cura/MultiplyObjectsJob.py
View File

@ -25,7 +25,7 @@ class MultiplyObjectsJob(Job):
def run(self): def run(self):
status_message = Message(i18n_catalog.i18nc("@info:status", "Multiplying and placing objects"), lifetime=0, status_message = Message(i18n_catalog.i18nc("@info:status", "Multiplying and placing objects"), lifetime=0,
dismissable=False, progress=0, title = i18n_catalog.i18nc("@info:title", "Placing Object")) dismissable=False, progress=0, title = i18n_catalog.i18nc("@info:title", "Placing Objects"))
status_message.show() status_message.show()
scene = Application.getInstance().getController().getScene() scene = Application.getInstance().getController().getScene()

7
plugins/Toolbox/src/Toolbox.py
View File

@ -235,12 +235,17 @@ class Toolbox(QObject, Extension):
def _convertPluginMetadata(self, plugin_data: Dict[str, Any]) -> Optional[Dict[str, Any]]: def _convertPluginMetadata(self, plugin_data: Dict[str, Any]) -> Optional[Dict[str, Any]]:
try: try:
highest_sdk_version_supported = Version(0)
for supported_version in plugin_data["plugin"]["supported_sdk_versions"]:
if supported_version > highest_sdk_version_supported:
highest_sdk_version_supported = supported_version
formatted = { formatted = {
"package_id": plugin_data["id"], "package_id": plugin_data["id"],
"package_type": "plugin", "package_type": "plugin",
"display_name": plugin_data["plugin"]["name"], "display_name": plugin_data["plugin"]["name"],
"package_version": plugin_data["plugin"]["version"], "package_version": plugin_data["plugin"]["version"],
"sdk_version": plugin_data["plugin"]["api"], "sdk_version": highest_sdk_version_supported,
"author": { "author": {
"author_id": plugin_data["plugin"]["author"], "author_id": plugin_data["plugin"]["author"],
"display_name": plugin_data["plugin"]["author"] "display_name": plugin_data["plugin"]["author"]