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

Revert "Moved qml pages of toolbox to a loader"

Browse source 
This reverts commit 838949dac7.
This commit is contained in:
Jaime van Kessel 2018-12-06 14:12:35 +01:00
parent 2602d5bf02
commit 54def4edee
2 changed files with 62 additions and 52 deletions
Download patch file Download diff file Expand all files Collapse all files

45
plugins/Toolbox/resources/qml/Toolbox.qml
View file

@ -44,31 +44,36 @@ Window
top: header.bottom top: header.bottom
bottom: footer.top bottom: footer.top
} }
// TODO: This could be improved using viewFilter instead of viewCategory
Loader ToolboxLoadingPage
{ {
anchors.fill:parent id: viewLoading
source: visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "loading"
{
if(toolbox.viewCategory == "installed")
{
return "ToolboxInstalledPage.qml"
} }
ToolboxErrorPage
switch (toolbox.viewPage)
{ {
case "loading": id: viewErrored
return "ToolboxLoadingPage.qml" visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "errored"
case "errored":
return "ToolboxErrorPage.qml"
case "overview":
return "ToolboxDownloadsPage.qml"
case "detail":
return "ToolboxDetailPage.qml"
case "author":
return "ToolboxAuthorPage.qml"
} }
ToolboxDownloadsPage
{
id: viewDownloads
visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "overview"
} }
ToolboxDetailPage
{
id: viewDetail
visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "detail"
}
ToolboxAuthorPage
{
id: viewAuthor
visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "author"
}
ToolboxInstalledPage
{
id: installedPluginList
visible: toolbox.viewCategory == "installed"
} }
} }

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

@ -622,15 +622,10 @@ class Toolbox(QObject, Extension):
if reply.operation() == QNetworkAccessManager.GetOperation: if reply.operation() == QNetworkAccessManager.GetOperation:
for response_type, url in self._request_urls.items(): for response_type, url in self._request_urls.items():
if reply.url() != url: if reply.url() == url:
continue
if reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) == 200: if reply.attribute(QNetworkRequest.HttpStatusCodeAttribute) == 200:
try: try:
json_data = json.loads(bytes(reply.readAll()).decode("utf-8")) 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
# Check for errors: # Check for errors:
if "errors" in json_data: if "errors" in json_data:
@ -638,20 +633,30 @@ class Toolbox(QObject, Extension):
Logger.log("e", "%s", error["title"]) Logger.log("e", "%s", error["title"])
return return
# 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._server_response_data[response_type] = json_data["data"]
self._models[response_type].setMetadata(json_data["data"]) self._models[response_type].setMetadata(self._server_response_data[response_type])
if response_type is "packages": if response_type is "packages":
self._models["packages"].setFilter({"type": "plugin"}) self._models[response_type].setFilter({"type": "plugin"})
self.reBuildMaterialsModels() self.reBuildMaterialsModels()
self.reBuildPluginsModels() self.reBuildPluginsModels()
elif response_type is "authors": elif response_type is "authors":
self._models["authors"].setFilter({"tags": "generic"}) self._models[response_type].setFilter({"package_types": "material"})
self._models[response_type].setFilter({"tags": "generic"})
self.metadataChanged.emit() self.metadataChanged.emit()
if self.isLoadingComplete(): if self.isLoadingComplete():
self.setViewPage("overview") self.setViewPage("overview")
except json.decoder.JSONDecodeError:
Logger.log("w", "Received invalid JSON for %s.", response_type)
break
else: else:
self.setViewPage("errored") self.setViewPage("errored")
self.resetDownload() self.resetDownload()