mirror of
https://github.com/Ultimaker/Cura.git
synced 2025-07-25 15:44:04 -06:00
Merge branch 'master' of github.com:Ultimaker/Cura
This commit is contained in:
commit
dccf18c4e7
5 changed files with 8 additions and 6 deletions
|
@ -101,6 +101,8 @@ class BuildVolume(SceneNode):
|
||||||
" with printed models."))
|
" with printed models."))
|
||||||
|
|
||||||
# Must be after setting _build_volume_message, apparently that is used in getMachineManager.
|
# Must be after setting _build_volume_message, apparently that is used in getMachineManager.
|
||||||
|
# activeQualityChanged is always emitted after setActiveVariant, setActiveMaterial and setActiveQuality.
|
||||||
|
# Therefore this works.
|
||||||
Application.getInstance().getMachineManager().activeQualityChanged.connect(self._onStackChanged)
|
Application.getInstance().getMachineManager().activeQualityChanged.connect(self._onStackChanged)
|
||||||
|
|
||||||
def _onSceneChanged(self, source):
|
def _onSceneChanged(self, source):
|
||||||
|
|
|
@ -113,4 +113,9 @@ class RemovableDriveOutputDevice(OutputDevice):
|
||||||
def _onActionTriggered(self, message, action):
|
def _onActionTriggered(self, message, action):
|
||||||
if action == "eject":
|
if action == "eject":
|
||||||
if Application.getInstance().getOutputDeviceManager().getOutputDevicePlugin("RemovableDriveOutputDevice").ejectDevice(self):
|
if Application.getInstance().getOutputDeviceManager().getOutputDevicePlugin("RemovableDriveOutputDevice").ejectDevice(self):
|
||||||
message.hide()
|
message.hide()
|
||||||
|
|
||||||
|
eject_message = Message(catalog.i18nc("@info:status", "Ejected {0}. You can now safely remove the drive.").format(self.getName()))
|
||||||
|
else:
|
||||||
|
eject_message = Message(catalog.i18nc("@info:status", "Failed to eject {0}. Another program may be using the drive.").format(self.getName()))
|
||||||
|
eject_message.show()
|
||||||
|
|
|
@ -46,11 +46,6 @@ class RemovableDrivePlugin(OutputDevicePlugin):
|
||||||
|
|
||||||
if result:
|
if result:
|
||||||
Logger.log("i", "Succesfully ejected the device")
|
Logger.log("i", "Succesfully ejected the device")
|
||||||
message = Message(catalog.i18nc("@info:status", "Ejected {0}. You can now safely remove the drive.").format(device.getName()))
|
|
||||||
message.show()
|
|
||||||
else:
|
|
||||||
message = Message(catalog.i18nc("@info:status", "Failed to eject {0}. Another program may be using the drive.").format(device.getName()))
|
|
||||||
message.show()
|
|
||||||
return result
|
return result
|
||||||
|
|
||||||
def performEjectDevice(self, device):
|
def performEjectDevice(self, device):
|
||||||
|
|
Binary file not shown.
Binary file not shown.
Loading…
Add table
Add a link
Reference in a new issue