diff --git a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py index 4d5673effe..6d19044dd7 100644 --- a/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/Cloud/CloudOutputDevice.py @@ -23,6 +23,7 @@ from cura.PrinterOutputDevice import ConnectionType from .CloudOutputController import CloudOutputController from ..MeshFormatHandler import MeshFormatHandler +from ..UM3OutputDevicePlugin import UM3OutputDevicePlugin from ..UM3PrintJobOutputModel import UM3PrintJobOutputModel from .CloudProgressMessage import CloudProgressMessage from .CloudApiClient import CloudApiClient @@ -85,8 +86,8 @@ class CloudOutputDevice(NetworkedPrinterOutputDevice): # We use the Cura Connect monitor tab to get most functionality right away. self._monitor_view_qml_path = os.path.join( - PluginRegistry.getPluginDirectory(), - "UM3NetworkPrinting", "resources", "qml", "MonitorStage.qml" + PluginRegistry.getInstance().getPluginPath(UM3OutputDevicePlugin().getPluginId()), + "resources", "qml", "MonitorStage.qml" ) # Trigger the printersChanged signal when the private signal is triggered. diff --git a/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py b/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py index 919788f10e..7ed81391a9 100644 --- a/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/ClusterUM3OutputDevice.py @@ -32,6 +32,7 @@ from .ConfigurationChangeModel import ConfigurationChangeModel from .MeshFormatHandler import MeshFormatHandler from .SendMaterialJob import SendMaterialJob from .UM3PrintJobOutputModel import UM3PrintJobOutputModel +from .UM3OutputDevicePlugin import UM3OutputDevicePlugin from PyQt5.QtNetwork import QNetworkRequest, QNetworkReply from PyQt5.QtGui import QDesktopServices, QImage @@ -66,8 +67,8 @@ class ClusterUM3OutputDevice(NetworkedPrinterOutputDevice): self._received_print_jobs = False # type: bool self._monitor_view_qml_path = os.path.join( - PluginRegistry.getPluginDirectory(), - "UM3NetworkPrinting", "resources", "qml", "MonitorStage.qml" + PluginRegistry.getInstance().getPluginPath(UM3OutputDevicePlugin().getPluginId()), + "resources", "qml", "MonitorStage.qml" ) # Trigger the printersChanged signal when the private signal is triggered diff --git a/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py b/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py index 68a4e7d42c..6bdfbbf8c8 100644 --- a/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py +++ b/plugins/UM3NetworkPrinting/src/LegacyUM3OutputDevice.py @@ -23,6 +23,7 @@ from PyQt5.QtCore import QTimer, QUrl from PyQt5.QtWidgets import QMessageBox from .LegacyUM3PrinterOutputController import LegacyUM3PrinterOutputController +from .UM3OutputDevicePlugin import UM3OutputDevicePlugin from time import time @@ -78,8 +79,8 @@ class LegacyUM3OutputDevice(NetworkedPrinterOutputDevice): self.setIconName("print") self._monitor_view_qml_path = os.path.join( - PluginRegistry.getPluginDirectory(), - "UM3NetworkPrinting", "resources", "qml", "MonitorItem.qml" + PluginRegistry.getInstance().getPluginPath(UM3OutputDevicePlugin().getPluginId()), + "resources", "qml", "MonitorStage.qml" ) self._output_controller = LegacyUM3PrinterOutputController(self) diff --git a/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py b/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py index 10476d55b4..6132c0bc42 100644 --- a/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py +++ b/plugins/UM3NetworkPrinting/src/UM3OutputDevicePlugin.py @@ -458,8 +458,8 @@ class UM3OutputDevicePlugin(OutputDevicePlugin): text = i18n_catalog.i18nc("@info:status", "Send and monitor print jobs from anywhere using your Ultimaker account."), lifetime = 0, image_source = QUrl.fromLocalFile(os.path.join( - PluginRegistry.getPluginDirectory(), - "UM3NetworkPrinting", "resources", "svg", "cloud-flow-start.svg" + PluginRegistry.getInstance().getPluginPath(self.getPluginId()), + "resources", "svg", "cloud-flow-start.svg" )), image_caption = i18n_catalog.i18nc("@info:status", "Connect to Ultimaker Cloud"), option_text = i18n_catalog.i18nc("@action", "Don't ask me again for this printer."), @@ -482,8 +482,8 @@ class UM3OutputDevicePlugin(OutputDevicePlugin): text = i18n_catalog.i18nc("@info:status", "You can now send and monitor print jobs from anywhere using your Ultimaker account."), lifetime = 30, image_source = QUrl.fromLocalFile(os.path.join( - PluginRegistry.getPluginDirectory(), - "UM3NetworkPrinting", "resources", "svg", "cloud-flow-completed.svg" + PluginRegistry.getInstance().getPluginPath(self.getPluginId()), + "resources", "svg", "cloud-flow-completed.svg" )), image_caption = i18n_catalog.i18nc("@info:status", "Connected!") )