From 842689d88eac8ae10d041fbe830d7f33ae0aba0f Mon Sep 17 00:00:00 2001 From: Arjen Hiemstra Date: Wed, 5 Aug 2015 17:26:52 +0200 Subject: [PATCH] Update all uses of the Resources API with the changed API --- cura/CuraApplication.py | 18 +++++++++++++----- plugins/CuraEngineBackend/CuraEngineBackend.py | 2 +- resources/qml/Cura.qml | 2 +- 3 files changed, 15 insertions(+), 7 deletions(-) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 9da84163e6..2a62cbaa2e 100644 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -38,7 +38,7 @@ from . import PrintInformation from . import CuraActions from . import MultiMaterialDecorator -from PyQt5.QtCore import pyqtSlot, QUrl, Qt, pyqtSignal, pyqtProperty +from PyQt5.QtCore import pyqtSlot, QUrl, Qt, pyqtSignal, pyqtProperty, Q_ENUMS from PyQt5.QtGui import QColor, QIcon import platform @@ -50,14 +50,19 @@ import numpy numpy.seterr(all="ignore") class CuraApplication(QtApplication): + class ResourceTypes: + QmlFiles = Resources.UserType + 1 + Firmware = Resources.UserType + 2 + Q_ENUMS(ResourceTypes) + def __init__(self): - Resources.addResourcePath(os.path.join(QtApplication.getInstallPrefix(), "share", "cura")) + Resources.addSearchPath(os.path.join(QtApplication.getInstallPrefix(), "share", "cura")) if not hasattr(sys, "frozen"): - Resources.addResourcePath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..")) + Resources.addSearchPath(os.path.join(os.path.abspath(os.path.dirname(__file__)), "..")) super().__init__(name = "cura", version = "master") - self.setWindowIcon(QIcon(Resources.getPath(Resources.ImagesLocation, "cura-icon.png"))) + self.setWindowIcon(QIcon(Resources.getPath(Resources.Images, "cura-icon.png"))) self.setRequiredPlugins([ "CuraEngineBackend", @@ -80,6 +85,9 @@ class CuraApplication(QtApplication): self.activeMachineChanged.connect(self._onActiveMachineChanged) + Resources.addType(self.ResourceTypes.QmlFiles, "qml") + Resources.addType(self.ResourceTypes.Firmware, "firmware") + Preferences.getInstance().addPreference("cura/active_machine", "") Preferences.getInstance().addPreference("cura/active_mode", "simple") Preferences.getInstance().addPreference("cura/recent_files", "") @@ -151,7 +159,7 @@ class CuraApplication(QtApplication): self.showSplashMessage(self._i18n_catalog.i18nc("Splash screen message", "Loading interface...")) - self.setMainQml(Resources.getPath(Resources.QmlFilesLocation, "Cura.qml")) + self.setMainQml(Resources.getPath(self.ResourceTypes.QmlFiles, "Cura.qml")) self.initializeEngine() if self.getMachines(): diff --git a/plugins/CuraEngineBackend/CuraEngineBackend.py b/plugins/CuraEngineBackend/CuraEngineBackend.py index f6b56b9386..e204285e23 100644 --- a/plugins/CuraEngineBackend/CuraEngineBackend.py +++ b/plugins/CuraEngineBackend/CuraEngineBackend.py @@ -71,7 +71,7 @@ class CuraEngineBackend(Backend): self.backendConnected.connect(self._onBackendConnected) def getEngineCommand(self): - return [Preferences.getInstance().getValue("backend/location"),"connect", "127.0.0.1:{0}".format(self._port), "-j", Resources.getPath(Resources.SettingsLocation, "fdmprinter.json"), "-vv"] + return [Preferences.getInstance().getValue("backend/location"), "connect", "127.0.0.1:{0}".format(self._port), "-j", Resources.getPath(Resources.Settings, "fdmprinter.json"), "-vv"] ## Emitted when we get a message containing print duration and material amount. This also implies the slicing has finished. # \param time The amount of time the print will take. diff --git a/resources/qml/Cura.qml b/resources/qml/Cura.qml index 637a4298eb..22eb376066 100644 --- a/resources/qml/Cura.qml +++ b/resources/qml/Cura.qml @@ -506,6 +506,6 @@ UM.MainWindow { } } - Component.onCompleted: UM.Theme.load(UM.Resources.getPath(UM.Resources.ThemesLocation, "cura")) + Component.onCompleted: UM.Theme.load(UM.Resources.getPath(UM.Resources.Themes, "cura")) }