GitHub-Proxy/Cura
1
0
Fork 0
mirror of https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura synced 2025-08-14 04:55:54 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix updating active quality

Browse Source 
Contributes to CURA-2006
This commit is contained in:
Arjen Hiemstra 2016-08-04 17:55:16 +02:00
parent 354a467d8e
commit 324d1415d7
2 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
cura/Settings/ContainerManager.py
View File

@ -377,6 +377,8 @@ class ContainerManager(QObject):
for merge_into, merge in containers_to_merge: for merge_into, merge in containers_to_merge:
self._performMerge(merge_into, merge) self._performMerge(merge_into, merge)
cura.Settings.MachineManager.getInstance().activeQualityChanged.emit()
@pyqtSlot() @pyqtSlot()
def clearUserContainers(self): def clearUserContainers(self):
global_stack = UM.Application.getInstance().getGlobalContainerStack() global_stack = UM.Application.getInstance().getGlobalContainerStack()
@ -432,6 +434,7 @@ class ContainerManager(QObject):
stack.replaceContainer(stack.getContainerIndex(quality_changes_container), new_quality_changes) stack.replaceContainer(stack.getContainerIndex(quality_changes_container), new_quality_changes)
stack.getTop().clear() stack.getTop().clear()
cura.Settings.MachineManager.getInstance().activeQualityChanged.emit()
return True return True
# Factory function, used by QML # Factory function, used by QML

2
cura/Settings/MachineManager.py
View File

@ -605,6 +605,8 @@ class MachineManager(QObject):
catalog.i18nc("@label", "If you transfer your settings they will override settings in the profile."), details, catalog.i18nc("@label", "If you transfer your settings they will override settings in the profile."), details,
buttons = QMessageBox.Yes + QMessageBox.No, icon = QMessageBox.Question, callback = self._keepUserSettingsDialogCallback) buttons = QMessageBox.Yes + QMessageBox.No, icon = QMessageBox.Question, callback = self._keepUserSettingsDialogCallback)
self.activeQualityChanged.emit()
def _keepUserSettingsDialogCallback(self, button): def _keepUserSettingsDialogCallback(self, button):
if button == QMessageBox.Yes: if button == QMessageBox.Yes:
# Yes, keep the settings in the user profile with this profile # Yes, keep the settings in the user profile with this profile