From b1b966065161d509508a3cdd0e162330f5413041 Mon Sep 17 00:00:00 2001 From: Saumya Jain Date: Fri, 1 Mar 2024 15:43:37 +0100 Subject: [PATCH] removing select same profile checkbox CURA-11403 --- plugins/3MFReader/SpecificSettingsModel.py | 2 +- plugins/3MFReader/ThreeMFWorkspaceReader.py | 1 - plugins/3MFReader/WorkspaceDialog.py | 11 ----------- plugins/3MFReader/WorkspaceDialog.qml | 11 ----------- 4 files changed, 1 insertion(+), 24 deletions(-) diff --git a/plugins/3MFReader/SpecificSettingsModel.py b/plugins/3MFReader/SpecificSettingsModel.py index fd5719d6b3..d541e50b7f 100644 --- a/plugins/3MFReader/SpecificSettingsModel.py +++ b/plugins/3MFReader/SpecificSettingsModel.py @@ -27,7 +27,7 @@ class SpecificSettingsModel(ListModel): setting_type = stack.getProperty(setting, "type") if setting_type is not None: # This is not very good looking, but will do for now - value = SettingDefinition.settingValueToString(setting_type, value) + " " + unit + value = str(SettingDefinition.settingValueToString(setting_type, value)) + " " + str(unit) else: value = str(value) diff --git a/plugins/3MFReader/ThreeMFWorkspaceReader.py b/plugins/3MFReader/ThreeMFWorkspaceReader.py index 6cbf054e4b..108ba3f09b 100755 --- a/plugins/3MFReader/ThreeMFWorkspaceReader.py +++ b/plugins/3MFReader/ThreeMFWorkspaceReader.py @@ -702,7 +702,6 @@ class ThreeMFWorkspaceReader(WorkspaceReader): self._dialog.setIsAbstractMachine(is_abstract_machine) self._dialog.setMachineName(machine_name) self._dialog.updateCompatibleMachine() - self._dialog.setSelectSameProfileChecked(self._dialog.isCompatibleMachine) # Block until the dialog is closed. self._dialog.waitForClose() diff --git a/plugins/3MFReader/WorkspaceDialog.py b/plugins/3MFReader/WorkspaceDialog.py index 0f7095ce0a..13e2650971 100644 --- a/plugins/3MFReader/WorkspaceDialog.py +++ b/plugins/3MFReader/WorkspaceDialog.py @@ -74,7 +74,6 @@ class WorkspaceDialog(QObject): self._is_abstract_machine = False self._is_networked_machine = False self._is_compatible_machine = False - self._select_same_profile_checked = True self._allow_create_machine = True self._exported_settings_model = SpecificSettingsModel() self._is_ucp = False @@ -103,7 +102,6 @@ class WorkspaceDialog(QObject): missingPackagesChanged = pyqtSignal() isCompatibleMachineChanged = pyqtSignal() isUcpChanged = pyqtSignal() - selectSameProfileCheckedChanged = pyqtSignal() @pyqtProperty(bool, notify = isPrinterGroupChanged) def isPrinterGroup(self) -> bool: @@ -327,15 +325,6 @@ class WorkspaceDialog(QObject): def isUcp(self): return self._is_ucp - def setSelectSameProfileChecked(self, select_same_profile_checked): - if select_same_profile_checked != self._select_same_profile_checked: - self._select_same_profile_checked = select_same_profile_checked - self.selectSameProfileCheckedChanged.emit() - - @pyqtProperty(bool, notify = selectSameProfileCheckedChanged, fset = setSelectSameProfileChecked) - def selectSameProfileChecked(self): - return self._select_same_profile_checked - def setAllowCreatemachine(self, allow_create_machine): self._allow_create_machine = allow_create_machine diff --git a/plugins/3MFReader/WorkspaceDialog.qml b/plugins/3MFReader/WorkspaceDialog.qml index 5212c799df..90b15378c5 100644 --- a/plugins/3MFReader/WorkspaceDialog.qml +++ b/plugins/3MFReader/WorkspaceDialog.qml @@ -226,17 +226,6 @@ UM.Dialog rows: manager.exportedSettingModel.items } } - - UM.CheckBox - { - text: catalog.i18nc("@action:checkbox", "Select the same profile") - onEnabledChanged: manager.selectSameProfileChecked = enabled - tooltip: enabled ? "" : catalog.i18nc("@tooltip", "You can use the same profile only if you have the same printer as the project was published with") - visible: manager.isUcp - - checked: manager.selectSameProfileChecked - onCheckedChanged: manager.selectSameProfileChecked = checked - } } comboboxVisible: manager.qualityChangesConflict