diff --git a/cura/CuraAppSignals.py b/cura/CuraAppSignals.py deleted file mode 100644 index b3cf97bb8b..0000000000 --- a/cura/CuraAppSignals.py +++ /dev/null @@ -1,9 +0,0 @@ -from PyQt5.QtCore import pyqtSignal, QObject - - -class CuraAppSignals(QObject): - - showMoreInfoOnAnonymousDataCollection = pyqtSignal() - - def __init__(self, parent = None): - super().__init__(parent) diff --git a/cura/CuraApplication.py b/cura/CuraApplication.py index 38ee645a0d..315c23b228 100755 --- a/cura/CuraApplication.py +++ b/cura/CuraApplication.py @@ -74,7 +74,6 @@ from cura.Settings.SimpleModeSettingsManager import SimpleModeSettingsManager from cura.Machines.VariantManager import VariantManager -from .CuraAppSignals import CuraAppSignals from . import PlatformPhysics from . import BuildVolume from . import CameraAnimation @@ -646,8 +645,6 @@ class CuraApplication(QtApplication): def run(self): self.preRun() - self._app_signals = CuraAppSignals(self) - container_registry = ContainerRegistry.getInstance() Logger.log("i", "Initializing variant manager") @@ -783,10 +780,6 @@ class CuraApplication(QtApplication): def hasGui(self): return self._use_gui - @pyqtSlot(result = QObject) - def getCuraAppSignals(self, *args) -> CuraAppSignals: - return self._app_signals - @pyqtSlot(result = QObject) def getSettingVisibilityPresetsModel(self, *args) -> SettingVisibilityPresetsModel: return self._setting_visibility_presets_model @@ -1739,3 +1732,7 @@ class CuraApplication(QtApplication): node = node.getParent() Selection.add(node) + + @pyqtSlot() + def showMoreInformationDialogForAnonymousDataCollection(self): + self._plugin_registry.getPluginObject("SliceInfoPlugin").showMoreInfoDialog() diff --git a/plugins/SliceInfoPlugin/MoreInfoWindow.qml b/plugins/SliceInfoPlugin/MoreInfoWindow.qml index bb909418f4..985ebe94a2 100644 --- a/plugins/SliceInfoPlugin/MoreInfoWindow.qml +++ b/plugins/SliceInfoPlugin/MoreInfoWindow.qml @@ -43,15 +43,6 @@ UM.Dialog Item { - Connections - { - target: CuraApplication.getCuraAppSignals() - onShowMoreInfoOnAnonymousDataCollection: - { - baseDialog.show(); - } - } - id: textRow anchors { diff --git a/plugins/SliceInfoPlugin/SliceInfo.py b/plugins/SliceInfoPlugin/SliceInfo.py index 5f1c2a25bc..82e07da464 100755 --- a/plugins/SliceInfoPlugin/SliceInfo.py +++ b/plugins/SliceInfoPlugin/SliceInfo.py @@ -64,10 +64,10 @@ class SliceInfo(QObject, Extension): def messageActionTriggered(self, message_id, action_id): Preferences.getInstance().setValue("info/asked_send_slice_info", True) if action_id == "MoreInfo": - self._showMoreInfoDialog() + self.showMoreInfoDialog() self.send_slice_info_message.hide() - def _showMoreInfoDialog(self): + def showMoreInfoDialog(self): if self._more_info_dialog is None: self._more_info_dialog = self._createDialog("MoreInfoWindow.qml") self._more_info_dialog.open() diff --git a/resources/qml/Preferences/GeneralPage.qml b/resources/qml/Preferences/GeneralPage.qml index 1ff45bcf93..d68eb8d5aa 100644 --- a/resources/qml/Preferences/GeneralPage.qml +++ b/resources/qml/Preferences/GeneralPage.qml @@ -7,6 +7,7 @@ import QtQuick.Layouts 1.1 import QtQuick.Controls.Styles 1.1 import UM 1.1 as UM +import Cura 1.0 as Cura UM.PreferencesPage { @@ -672,7 +673,7 @@ UM.PreferencesPage text: catalog.i18nc("@action:button", "More information") onClicked: { - CuraApplication.getCuraAppSignals().showMoreInfoOnAnonymousDataCollection(); + CuraApplication.showMoreInformationDialogForAnonymousDataCollection(); } } }