From 80c21acf795a9c40085b422fe1b55367f546bf24 Mon Sep 17 00:00:00 2001 From: Ian Paschal Date: Wed, 11 Apr 2018 11:08:50 +0200 Subject: [PATCH] Merge branch 'CURA-4644-package-reader' into feature_material_marketplace --- plugins/Toolbox/src/Toolbox.py | 8 -------- 1 file changed, 8 deletions(-) diff --git a/plugins/Toolbox/src/Toolbox.py b/plugins/Toolbox/src/Toolbox.py index 9876bffa4e..fef45dec7c 100644 --- a/plugins/Toolbox/src/Toolbox.py +++ b/plugins/Toolbox/src/Toolbox.py @@ -223,7 +223,6 @@ class Toolbox(QObject, Extension): plugin["update_url"] = item["file_location"] return self._plugins_model -<<<<<<< HEAD:plugins/Toolbox/src/Toolbox.py @pyqtProperty(QObject, notify = showcaseMetadataChanged) def materialShowcaseModel(self): return self._showcase_model @@ -239,10 +238,6 @@ class Toolbox(QObject, Extension): @pyqtProperty(bool, notify = packagesMetadataChanged) def dataReady(self): return self._packages_model is not None -======= - def _checkCanUpgrade(self, id, version): - # TODO: This could maybe be done more efficiently using a dictionary... ->>>>>>> CURA-4644-package-reader:plugins/PluginBrowser/PluginBrowser.py def _checkCanUpgrade(self, id, version): # Scan plugin server data for plugin with the given id: @@ -255,7 +250,6 @@ class Toolbox(QObject, Extension): return True return False -<<<<<<< HEAD:plugins/Toolbox/src/Toolbox.py def _checkAlreadyInstalled(self, id): metadata = self._plugin_registry.getMetaData(id) # We already installed this plugin, but the registry just doesn't know it yet. @@ -348,8 +342,6 @@ class Toolbox(QObject, Extension): self._download_reply.abort() self._download_reply = None -======= ->>>>>>> CURA-4644-package-reader:plugins/PluginBrowser/PluginBrowser.py def _onRequestFinished(self, reply): reply_url = reply.url().toString() if reply.error() == QNetworkReply.TimeoutError: