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

delete: Improve text for storage deletion

Browse Source 
Signed-off-by: Cole Robinson <crobinso@redhat.com>
This commit is contained in:
Cole Robinson 2020-01-28 11:25:37 -05:00
parent e48ce4a31e
commit 0e355b218a
1 changed files with 39 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
virtManager/delete.py
View File

@ -57,6 +57,7 @@ class _vmmDeleteBase(vmmGObjectUI):
self.bind_escape_key_close() self.bind_escape_key_close()
self._cleanup_on_app_close() self._cleanup_on_app_close()
self.topwin.set_title(self._get_dialog_title())
self._init_state() self._init_state()
@ -98,10 +99,10 @@ class _vmmDeleteBase(vmmGObjectUI):
def _reset_state(self): def _reset_state(self):
# Set VM name or disk.target in title' # Set VM name or disk.target in title'
text = self._get_dialog_title() text = self._get_dialog_text()
title_str = ("<span size='large' color='white'>%s '%s'</span>" % title_str = ("<span size='large' color='white'>%s</span>" %
(_("Delete"), xmlutil.xml_escape(text))) xmlutil.xml_escape(text))
self.widget("header-label").set_markup(title_str) self.widget("header-label").set_markup(title_str)
self.topwin.resize(1, 1) self.topwin.resize(1, 1)
@ -163,12 +164,12 @@ class _vmmDeleteBase(vmmGObjectUI):
self.close() self.close()
def _finish(self): def _finish(self):
devs = self._get_paths_to_delete() paths = self._get_paths_to_delete()
if devs: if paths:
title = _("Are you sure you want to delete the storage?") title = _("Are you sure you want to delete the storage?")
message = (_("The following paths will be deleted:\n\n%s") % message = (_("The following paths will be deleted:\n\n%s") %
"\n".join(devs)) "\n".join(paths))
ret = self.err.chkbox_helper( ret = self.err.chkbox_helper(
self.config.get_confirm_delstorage, self.config.get_confirm_delstorage,
self.config.set_confirm_delstorage, self.config.set_confirm_delstorage,
@ -178,14 +179,14 @@ class _vmmDeleteBase(vmmGObjectUI):
self.set_finish_cursor() self.set_finish_cursor()
if not self._remove_device(devs): if not self._remove_device(paths):
# Don't delete storage if device removal failed # Don't delete storage if device removal failed
self._delete_finished_cb(None, None) self._delete_finished_cb(None, None)
return return
title, text = self._get_title_text(devs) title, text = self._get_progress_text(paths)
progWin = vmmAsyncJob(self._async_delete, [self.vm, devs], progWin = vmmAsyncJob(self._async_delete, [self.vm, paths],
self._delete_finished_cb, [], self._delete_finished_cb, [],
title, text, self.topwin) title, text, self.topwin)
progWin.run() progWin.run()
@ -261,9 +262,11 @@ class _vmmDeleteBase(vmmGObjectUI):
def _get_dialog_title(self): def _get_dialog_title(self):
raise NotImplementedError raise NotImplementedError
def _get_disk_datas(self): def _get_dialog_text(self):
raise NotImplementedError raise NotImplementedError
def _get_title_text(self, devs): def _get_progress_text(self, paths):
raise NotImplementedError
def _get_disk_datas(self):
raise NotImplementedError raise NotImplementedError
def _vm_active_status(self): def _vm_active_status(self):
raise NotImplementedError raise NotImplementedError
@ -273,7 +276,6 @@ class _vmmDeleteBase(vmmGObjectUI):
raise NotImplementedError raise NotImplementedError
def _destroy_vm(self, vm): def _destroy_vm(self, vm):
raise NotImplementedError raise NotImplementedError
def _get_remove_storage_default(self): def _get_remove_storage_default(self):
raise NotImplementedError raise NotImplementedError
@ -283,16 +285,13 @@ class vmmDeleteDialog(_vmmDeleteBase):
Dialog for deleting a VM and optionally its storage Dialog for deleting a VM and optionally its storage
""" """
def _get_dialog_title(self): def _get_dialog_title(self):
return self.vm.get_name() return _("Delete Virtual Machine")
def _get_remove_storage_default(self): def _get_dialog_text(self):
return True return _("Delete '%(vmname)s'") % {"vmname": self.vm.get_name()}
def _get_disk_datas(self): def _get_progress_text(self, paths):
return _build_diskdata_for_vm(self.vm) if paths:
def _get_title_text(self, devs):
if devs:
title = _("Deleting virtual machine '%s' and selected storage " title = _("Deleting virtual machine '%s' and selected storage "
"(this may take a while)") % self.vm.get_name() "(this may take a while)") % self.vm.get_name()
text = title text = title
@ -301,6 +300,12 @@ class vmmDeleteDialog(_vmmDeleteBase):
text = title text = title
return [title, text] return [title, text]
def _get_remove_storage_default(self):
return True
def _get_disk_datas(self):
return _build_diskdata_for_vm(self.vm)
def _vm_active_status(self): def _vm_active_status(self):
vm_active = self.vm.is_active() vm_active = self.vm.is_active()
return vm_active return vm_active
@ -364,7 +369,20 @@ class vmmDeleteStorage(_vmmDeleteBase):
self.disk = disk self.disk = disk
def _get_dialog_title(self): def _get_dialog_title(self):
return self.disk.target return _("Remove Disk Device")
def _get_dialog_text(self):
return _("Remove disk device '%(target)s'") % {
"target": self.disk.target}
def _get_progress_text(self, paths):
if paths:
title = _("Removing disk device '%s' and selected storage "
"(this may take a while)") % self.disk.target
else:
title = _("Removing disk device '%s'") % self.disk.target
text = title
return [title, text]
def _get_remove_storage_default(self): def _get_remove_storage_default(self):
return False return False
@ -372,11 +390,6 @@ class vmmDeleteStorage(_vmmDeleteBase):
def _get_disk_datas(self): def _get_disk_datas(self):
return [_DiskData.from_disk(self.disk)] return [_DiskData.from_disk(self.disk)]
def _get_title_text(self, devs):
title = _("Deleting the selected storage")
text = _('%s') % self.disk.target
return [title, text]
def _vm_active_status(self): def _vm_active_status(self):
return False return False