NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Handle the warning messages for disk device and non-disk device differently

Browse Source 
add a remove-non-disk function and move the yes/no confirmation handling there

Reviewed-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Lily Nie 2019-12-19 17:35:08 +08:00 committed by Cole Robinson
parent d62ca8220b
commit 2138cca6a5
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
virtManager/delete.py
View File

@ -112,7 +112,7 @@ class vmmDeleteDialog(vmmGObjectUI):
self.widget("delete-cancel").grab_focus() self.widget("delete-cancel").grab_focus()
# Show warning message if VM is running # Show warning message if VM is running
vm_active = self.vm.is_active() vm_active = self.vm.is_active() and not self.disk
uiutil.set_grid_row_visible( uiutil.set_grid_row_visible(
self.widget("delete-warn-running-vm-box"), vm_active) self.widget("delete-warn-running-vm-box"), vm_active)

13
virtManager/details/details.py
View File

@ -1107,6 +1107,12 @@ class vmmDetails(vmmGObjectUI):
except Exception as e: except Exception as e:
self.err.show_err((_("Error launching hardware dialog: %s") % self.err.show_err((_("Error launching hardware dialog: %s") %
str(e))) str(e)))
def remove_non_disk(self, devobj):
if not self.err.chkbox_helper(self.config.get_confirm_removedev,
self.config.set_confirm_removedev,
text1=(_("Are you sure you want to remove this device?"))):
return
self.remove_device(devobj)
def remove_disk(self, disk): def remove_disk(self, disk):
from ..delete import vmmDeleteDialog from ..delete import vmmDeleteDialog
@ -1119,7 +1125,7 @@ class vmmDetails(vmmGObjectUI):
if devobj.DEVICE_TYPE == "disk": if devobj.DEVICE_TYPE == "disk":
self.remove_disk(devobj) self.remove_disk(devobj)
else: else:
self.remove_device(devobj) self.remove_non_disk(devobj)
############################ ############################
@ -1934,11 +1940,6 @@ class vmmDetails(vmmGObjectUI):
def remove_device(self, devobj): def remove_device(self, devobj):
log.debug("Removing device: %s", devobj) log.debug("Removing device: %s", devobj)
if not self.err.chkbox_helper(self.config.get_confirm_removedev,
self.config.set_confirm_removedev,
text1=(_("Are you sure you want to remove this device?"))):
return
# Define the change # Define the change
try: try:
self.vm.remove_device(devobj) self.vm.remove_device(devobj)