Added missing typing to toolbox

plugins/Toolbox/src/Toolbox.py

@@ -6,7 +6,7 @@ import json
 import os
 import tempfile
 import platform
-from typing import cast, List
+from typing import cast, List, TYPE_CHECKING, Tuple, Optional
 
 from PyQt5.QtCore import QUrl, QObject, pyqtProperty, pyqtSignal, pyqtSlot
 from PyQt5.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply
@@ -20,9 +20,13 @@ from UM.Version import Version
 
 import cura
 from cura.CuraApplication import CuraApplication
+
 from .AuthorsModel import AuthorsModel
 from .PackagesModel import PackagesModel
 
+if TYPE_CHECKING:
+    from cura.Settings.GlobalStack import GlobalStack
+
 i18n_catalog = i18nCatalog("cura")
 
 
@@ -117,8 +121,6 @@ class Toolbox(QObject, Extension):
 
         self._application.initializationFinished.connect(self._onAppInitialized)
 
-
-
     # Signals:
     # --------------------------------------------------------------------------
     # Downloading changes
@@ -137,11 +139,11 @@ class Toolbox(QObject, Extension):
     showLicenseDialog = pyqtSignal()
     uninstallVariablesChanged = pyqtSignal()
 
-    def _resetUninstallVariables(self):
+    def _resetUninstallVariables(self) -> None:
-        self._package_id_to_uninstall = None
+        self._package_id_to_uninstall = None  # type: Optional[str]
         self._package_name_to_uninstall = ""
-        self._package_used_materials = []
+        self._package_used_materials = []  # type: List[Tuple[GlobalStack, str, str]]
-        self._package_used_qualities = []
+        self._package_used_qualities = []  # type: List[Tuple[GlobalStack, str, str]]
 
     @pyqtSlot(result = str)
     def getLicenseDialogPluginName(self) -> str:
@@ -344,26 +346,26 @@ class Toolbox(QObject, Extension):
             self.uninstall(package_id)
 
     @pyqtProperty(str, notify = uninstallVariablesChanged)
-    def pluginToUninstall(self):
+    def pluginToUninstall(self) -> str:
         return self._package_name_to_uninstall
 
     @pyqtProperty(str, notify = uninstallVariablesChanged)
-    def uninstallUsedMaterials(self):
+    def uninstallUsedMaterials(self) -> str:
         return "\n".join(["%s (%s)" % (str(global_stack.getName()), material) for global_stack, extruder_nr, material in self._package_used_materials])
 
     @pyqtProperty(str, notify = uninstallVariablesChanged)
-    def uninstallUsedQualities(self):
+    def uninstallUsedQualities(self) -> str:
         return "\n".join(["%s (%s)" % (str(global_stack.getName()), quality) for global_stack, extruder_nr, quality in self._package_used_qualities])
 
     @pyqtSlot()
-    def closeConfirmResetDialog(self):
+    def closeConfirmResetDialog(self) -> None:
         if self._confirm_reset_dialog is not None:
             self._confirm_reset_dialog.close()
 
     ##  Uses "uninstall variables" to reset qualities and materials, then uninstall
     #   It's used as an action on Confirm reset on Uninstall
     @pyqtSlot()
-    def resetMaterialsQualitiesAndUninstall(self):
+    def resetMaterialsQualitiesAndUninstall(self) -> None:
         application = CuraApplication.getInstance()
         material_manager = application.getMaterialManager()
         quality_manager = application.getQualityManager()
@@ -376,8 +378,8 @@ class Toolbox(QObject, Extension):
             default_quality_group = quality_manager.getDefaultQualityType(global_stack)
             machine_manager.setQualityGroup(default_quality_group, global_stack = global_stack)
 
+        if self._package_id_to_uninstall is not None:
             self._markPackageMaterialsAsToBeUninstalled(self._package_id_to_uninstall)
-
             self.uninstall(self._package_id_to_uninstall)
         self._resetUninstallVariables()
         self.closeConfirmResetDialog()
@@ -686,7 +688,7 @@ class Toolbox(QObject, Extension):
                 self._temp_plugin_file.close()
                 self._onDownloadComplete(file_path)
 
-    def _onDownloadComplete(self, file_path: str):
+    def _onDownloadComplete(self, file_path: str) -> None:
         Logger.log("i", "Toolbox: Download complete.")
         package_info = self._package_manager.getPackageInfo(file_path)
         if not package_info:
@@ -745,9 +747,7 @@ class Toolbox(QObject, Extension):
     def viewPage(self) -> str:
         return self._view_page
 
-
+    # Exposed Models:
-
-    # Expose Models:
     # --------------------------------------------------------------------------
     @pyqtProperty(QObject, notify = metadataChanged)
     def authorsModel(self) -> AuthorsModel:
@@ -785,8 +785,6 @@ class Toolbox(QObject, Extension):
     def materialsGenericModel(self) -> PackagesModel:
         return cast(PackagesModel, self._models["materials_generic"])
 
-
-
     # Filter Models:
     # --------------------------------------------------------------------------
     @pyqtSlot(str, str, str)
@@ -813,11 +811,9 @@ class Toolbox(QObject, Extension):
         self._models[model_type].setFilter({})
         self.filterChanged.emit()
 
-
     # HACK(S):
     # --------------------------------------------------------------------------
     def buildMaterialsModels(self) -> None:
-
         self._metadata["materials_showcase"] = []
         self._metadata["materials_available"] = []
 
@@ -841,7 +837,6 @@ class Toolbox(QObject, Extension):
         self._models["materials_available"].setMetadata(self._metadata["materials_available"])
 
     def buildPluginsModels(self) -> None:
-
         self._metadata["plugins_showcase"] = []
         self._metadata["plugins_available"] = []