mirror of
https://git.mirrors.martin98.com/https://github.com/Ultimaker/Cura
synced 2025-04-24 06:39:38 +08:00
Move showing eject success message until after the safe to remove message is hidden
CURA-2341
This commit is contained in:
parent
962381be59
commit
cdba3640a0
@ -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):
|
||||||
|
Loading…
x
Reference in New Issue
Block a user