3D-printing/Cura
1
0
Fork 0
mirror of https://github.com/Ultimaker/Cura.git synced 2025-07-15 02:37:49 -06:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Fix connecting undo action to undo button

Browse source 
Also hiding the message afterwards. Apparently that's not done automatically.

Contributes to issue CURA-2822.
This commit is contained in:
Ghostkeeper 2017-06-22 12:28:00 +02:00
parent b37fa6f718
commit c192d37daa
No known key found for this signature in database
GPG key ID: C5F96EE2BC0F7E75
1 changed files with 3 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

5
cura/Settings/MaterialManager.py
View file

@ -23,7 +23,7 @@ class MaterialManager(QObject):
self._material_diameter_warning_message = Message(catalog.i18nc("@info:status Has a cancel button next to it.", self._material_diameter_warning_message = Message(catalog.i18nc("@info:status Has a cancel button next to it.",
"The selected material diameter causes the material to become incompatible with the current printer.")) "The selected material diameter causes the material to become incompatible with the current printer."))
self._material_diameter_warning_message.addAction("Undo", catalog.i18nc("@action:button", "Undo"), None, catalog.i18nc("@action", "Undo changing the material diameter.")) self._material_diameter_warning_message.addAction("Undo", catalog.i18nc("@action:button", "Undo"), None, catalog.i18nc("@action", "Undo changing the material diameter."))
self._material_diameter_warning_message.actionTriggered = self._materialWarningMessageAction self._material_diameter_warning_message.actionTriggered.connect(self._materialWarningMessageAction)
## Creates an instance of the MaterialManager. ## Creates an instance of the MaterialManager.
# #
@ -45,12 +45,13 @@ class MaterialManager(QObject):
# This executes the undo action, restoring the material diameter. # This executes the undo action, restoring the material diameter.
# #
# \param button The identifier of the button that was pressed. # \param button The identifier of the button that was pressed.
def _materialWarningMessageAction(self, button): def _materialWarningMessageAction(self, message, button):
if button == "Undo": if button == "Undo":
container_registry = ContainerRegistry.getInstance() container_registry = ContainerRegistry.getInstance()
matches = container_registry.findInstanceContainers(type = "material", id = self._material_diameter_warning_message.material_id) matches = container_registry.findInstanceContainers(type = "material", id = self._material_diameter_warning_message.material_id)
if matches: if matches:
matches[0].setMetaDataEntry("diameter", self._material_diameter_warning_message.previous_diameter) matches[0].setMetaDataEntry("diameter", self._material_diameter_warning_message.previous_diameter)
#No matches? Then the material has been deleted in the meanwhile. #No matches? Then the material has been deleted in the meanwhile.
message.hide()
else: else:
Logger.log("w", "Unknown button action for material diameter warning message: {action}".format(action = button)) Logger.log("w", "Unknown button action for material diameter warning message: {action}".format(action = button))