3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-08 07:27:29 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Moved qml pages of toolbox to a loader

Browse source 
This dramatically improves the loading of the toolbox dialog

CURA-6006
This commit is contained in:
Jaime van Kessel 2018-12-06 09:45:27 +01:00
parent 00e95e68eb
commit 838949dac7
2 changed files with 52 additions and 61 deletions
Download patch file Download diff file Expand all files Collapse all files

59
plugins/Toolbox/src/Toolbox.py
View file

@ -622,44 +622,39 @@ class Toolbox(QObject, Extension):
if reply.operation() == QNetworkAccessManager.GetOperation:
for response_type, url in self._request_urls.items():
if reply.url() == url:
if reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) == 200:
try:
json_data = json.loads(bytes(reply.readAll()).decode("utf-8"))
if reply.url() != url:
continue
# Check for errors:
if "errors" in json_data:
for error in json_data["errors"]:
Logger.log("e", "%s", error["title"])
return
if reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) == 200:
try:
json_data = json.loads(bytes(reply.readAll()).decode("utf-8"))
except json.decoder.JSONDecodeError:
Logger.log("w", "Received invalid JSON for %s.", response_type)
break
# Create model and apply metadata:
if not self._models[response_type]:
Logger.log("e", "Could not find the %s model.", response_type)
break
self._server_response_data[response_type] = json_data["data"]
self._models[response_type].setMetadata(self._server_response_data[response_type])
# Check for errors:
if "errors" in json_data:
for error in json_data["errors"]:
Logger.log("e", "%s", error["title"])
return
if response_type is "packages":
self._models[response_type].setFilter({"type": "plugin"})
self.reBuildMaterialsModels()
self.reBuildPluginsModels()
elif response_type is "authors":
self._models[response_type].setFilter({"package_types": "material"})
self._models[response_type].setFilter({"tags": "generic"})
self._server_response_data[response_type] = json_data["data"]
self._models[response_type].setMetadata(json_data["data"])
self.metadataChanged.emit()
if response_type is "packages":
self._models["packages"].setFilter({"type": "plugin"})
self.reBuildMaterialsModels()
self.reBuildPluginsModels()
elif response_type is "authors":
self._models["authors"].setFilter({"tags": "generic"})
if self.isLoadingComplete():
self.setViewPage("overview")
self.metadataChanged.emit()
except json.decoder.JSONDecodeError:
Logger.log("w", "Received invalid JSON for %s.", response_type)
break
else:
self.setViewPage("errored")
self.resetDownload()
if self.isLoadingComplete():
self.setViewPage("overview")
else:
self.setViewPage("errored")
self.resetDownload()
else:
# Ignore any operation that is not a get operation
pass