File virtman-allow-destroy-from-shutdown-menu-of-cra... of Package virt-manager

Overview Repositories Revisions Requests Users Attributes Meta

File virtman-allow-destroy-from-shutdown-menu-of-crashed-vm.patch of Package virt-manager (Revision 48707180a8f337085ccba0342ac56f0e)

Currently displaying revision 48707180a8f337085ccba0342ac56f0e , Show latest

bnc#875111
Index: virt-manager-1.1.0/virtManager/manager.py
===================================================================
--- virt-manager-1.1.0.orig/virtManager/manager.py
+++ virt-manager-1.1.0/virtManager/manager.py
@@ -921,7 +921,7 @@ class vmmManager(vmmGObjectUI):
             show_pause = bool(vm and vm.is_unpauseable())
         else:
             show_pause = bool(vm and vm.is_pauseable())
-        show_shutdown = bool(vm and vm.is_stoppable())
+        show_shutdown = bool(vm and vm.is_destroyable())
 
         if vm and vm.managedsave_supported:
             self.change_run_text(vm.hasSavedImage())
Index: virt-manager-1.1.0/virtManager/vmmenu.py
===================================================================
--- virt-manager-1.1.0.orig/virtManager/vmmenu.py
+++ virt-manager-1.1.0/virtManager/vmmenu.py
@@ -22,6 +22,7 @@ from gi.repository import Gtk
 from virtManager import config
 
 import platform
+import logging
 
 ####################################################################
 # Build toolbar new button menu (manager and details toolbar)      #
@@ -53,6 +54,7 @@ class _VMMenu(Gtk.Menu):
         self._parent = src
         self._current_vm_cb = current_vm_cb
         self._show_open = show_open
+        self._shutdown = None
 
         self._init_state()
 
@@ -114,6 +116,7 @@ class VMShutdownMenu(_VMMenu):
             name = getattr(child, "vmm_widget_name", None)
             if name in statemap:
                 child.set_sensitive(statemap[name])
+                child.set_visible(statemap[name])
 
 
 class VMActionMenu(_VMMenu):
@@ -122,7 +125,8 @@ class VMActionMenu(_VMMenu):
         self._add_action(_("_Pause"), "suspend", Gtk.STOCK_MEDIA_PAUSE)
         self._add_action(_("R_esume"), "resume", Gtk.STOCK_MEDIA_PAUSE)
         s = self._add_action(_("_Shut Down"), "shutdown", addcb=False)
-        s.set_submenu(VMShutdownMenu(self._parent, self._current_vm_cb))
+        self._shutdown = VMShutdownMenu(self._parent, self._current_vm_cb)
+        s.set_submenu(self._shutdown)
 
         self.add(Gtk.SeparatorMenuItem())
         self._add_action(_("Clone..."), "clone", None)
@@ -138,7 +142,7 @@ class VMActionMenu(_VMMenu):
     def update_widget_states(self, vm):
         statemap = {
             "run": bool(vm and vm.is_runable()),
-            "shutdown": bool(vm and vm.is_stoppable()),
+            "shutdown": bool(vm and vm.is_destroyable()),
             "suspend": bool(vm and vm.is_stoppable()),
             "resume": bool(vm and vm.is_paused()),
             "migrate": bool(vm and vm.is_stoppable()),
@@ -155,6 +159,8 @@ class VMActionMenu(_VMMenu):
                 child.update_widget_states(vm)
             if name in statemap:
                 child.set_sensitive(statemap[name])
+                if name == "shutdown" and self._shutdown:
+                    self._shutdown.update_widget_states(vm)
             if name in vismap:
                 child.set_visible(vismap[name])

Places

File virtman-allow-destroy-from-shutdown-menu-of-crashed-vm.patch of Package virt-manager (Revision 48707180a8f337085ccba0342ac56f0e)

Places