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

Merge branch 'CURA-4644-package-reader' into feature_material_marketplace

Browse source
This commit is contained in:
Ian Paschal 2018-04-11 11:08:50 +02:00
parent 94b15b0498
commit 80c21acf79
1 changed files with 0 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -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: