From 838949dac74831e38e9f07fe7d628af7807320db Mon Sep 17 00:00:00 2001
From: Jaime van Kessel <nallath@gmail.com>
Date: Thu, 6 Dec 2018 09:45:27 +0100
Subject: [PATCH] Moved qml pages of toolbox to a loader

This dramatically improves the loading of the toolbox dialog

CURA-6006
---
 plugins/Toolbox/resources/qml/Toolbox.qml | 54 ++++++++++-----------
 plugins/Toolbox/src/Toolbox.py            | 59 +++++++++++------------
 2 files changed, 52 insertions(+), 61 deletions(-)

diff --git a/plugins/Toolbox/resources/qml/Toolbox.qml b/plugins/Toolbox/resources/qml/Toolbox.qml
index 853cec399d..d3d980b0b3 100644
--- a/plugins/Toolbox/resources/qml/Toolbox.qml
+++ b/plugins/Toolbox/resources/qml/Toolbox.qml
@@ -44,36 +44,31 @@ Window
                 top: header.bottom
                 bottom: footer.top
             }
-            // TODO: This could be improved using viewFilter instead of viewCategory
-            ToolboxLoadingPage
+
+            Loader
             {
-                id: viewLoading
-                visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "loading"
-            }
-            ToolboxErrorPage
-            {
-                id: viewErrored
-                visible: toolbox.viewCategory != "installed" && toolbox.viewPage == "errored"
-            }
-            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"
+                anchors.fill:parent
+                source:
+                {
+                    if(toolbox.viewCategory == "installed")
+                    {
+                        return "ToolboxInstalledPage.qml"
+                    }
+
+                    switch (toolbox.viewPage)
+                    {
+                        case "loading":
+                            return "ToolboxLoadingPage.qml"
+                        case "errored":
+                            return "ToolboxErrorPage.qml"
+                        case "overview":
+                            return "ToolboxDownloadsPage.qml"
+                        case "detail":
+                            return "ToolboxDetailPage.qml"
+                        case "author":
+                            return "ToolboxAuthorPage.qml"
+                    }
+                }
             }
         }
 
@@ -95,6 +90,7 @@ Window
                 licenseDialog.show();
             }
         }
+        
         ToolboxLicenseDialog
         {
             id: licenseDialog
diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py
index cd20d26eca..c8349827a9 100644
--- a/plugins/Toolbox/src/Toolbox.py
+++ b/plugins/Toolbox/src/Toolbox.py
@@ -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