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

Merge branch '3.3'

Browse Source
This commit is contained in:
Lipu Fei 2018-04-10 11:41:13 +02:00
commit 107c10b860
5 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cura/CuraApplication.py
View File

@ -1562,8 +1562,8 @@ class CuraApplication(QtApplication):
openProjectFile = pyqtSignal(QUrl, arguments = ["project_file"]) # Emitted when a project file is about to open.
@pyqtSlot(QUrl)
def readLocalFile(self, file):
@pyqtSlot(QUrl, bool)
def readLocalFile(self, file, skip_project_file_check = False):
if not file.isValid():
return
@ -1574,7 +1574,7 @@ class CuraApplication(QtApplication):
self.deleteAll()
break
if self.checkIsValidProjectFile(file):
if not skip_project_file_check and self.checkIsValidProjectFile(file):
self.callLater(self.openProjectFile.emit, file)
return

10
plugins/PluginBrowser/PluginBrowser.py
View File

@ -6,6 +6,7 @@ from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkRepl
from UM.Application import Application
from UM.Logger import Logger
from UM.PluginError import PluginNotFoundError
from UM.PluginRegistry import PluginRegistry
from UM.Qt.Bindings.PluginsModel import PluginsModel
from UM.Extension import Extension
@ -302,10 +303,15 @@ class PluginBrowser(QObject, Extension):
return self._plugins_model
def _checkCanUpgrade(self, plugin_id, version):
if plugin_id not in self._plugin_registry.getInstalledPlugins():
if not self._plugin_registry.isInstalledPlugin(plugin_id):
return False
try:
plugin_object = self._plugin_registry.getPluginObject(plugin_id)
except PluginNotFoundError:
Logger.log("w", "Could not find plugin %s", plugin_id)
return False
plugin_object = self._plugin_registry.getPluginObject(plugin_id)
# Scan plugin server data for plugin with the given id:
for plugin in self._plugins_metadata:
if plugin_id == plugin["id"]:

2
resources/qml/AskOpenAsProjectOrModelsDialog.qml
View File

@ -53,7 +53,7 @@ UM.Dialog
UM.Preferences.setValue("cura/choice_on_open_project", "open_as_model")
}
CuraApplication.readLocalFile(base.fileUrl)
CuraApplication.readLocalFile(base.fileUrl, true)
var meshName = backgroundItem.getMeshName(base.fileUrl.toString())
backgroundItem.hasMesh(decodeURIComponent(meshName))

2
resources/qml/Menus/RecentFilesMenu.qml
View File

@ -61,7 +61,7 @@ Menu
}
else if (toOpenAsModel)
{
CuraApplication.readLocalFile(modelData);
CuraApplication.readLocalFile(modelData, true);
}
var meshName = backgroundItem.getMeshName(modelData.toString())
backgroundItem.hasMesh(decodeURIComponent(meshName))

2
resources/qml/OpenFilesIncludingProjectsDialog.qml
View File

@ -42,7 +42,7 @@ UM.Dialog
{
for (var i in fileUrls)
{
CuraApplication.readLocalFile(fileUrls[i]);
CuraApplication.readLocalFile(fileUrls[i], true);
}
var meshName = backgroundItem.getMeshName(fileUrls[0].toString());