47ffb48dd8
virt-manager-1.1.0.tar.bz2 * Switch to libosinfo as OS metadata database (Giuseppe Scrivano) * Use libosinfo for OS detection from CDROM media labels (Giuseppe Scrivano) * Use libosinfo for improved OS defaults, like recommended disk size (Giuseppe Scrivano) * virt-image tool has been removed, as previously announced * Enable Hyper-V enlightenments for Windows VMs * Revert virtio-console default, back to plain serial console * Experimental q35 option in new VM ‘customize’ dialog * UI for virtual network QoS settings (Giuseppe Scrivano) * virt-install: –disk discard= support (Jim Minter) * addhardware: Add spiceport UI (Marc-André Lureau) * virt-install: –events on_poweroff etc. support (Chen Hanxiao) * cli –network portgroup= support and UI support * cli –boot initargs= and UI support * addhardware: allow setting controller model (Chen Hanxiao) * virt-install: support setting hugepage options (Chen Hanxiao) - Drop upstream patches and old tarball virt-manager-1.0.1.tar.bz2 5332ee4d-enable-media-detection-for-ISO-images.patch 53341e7e-hide-hardware-removal-for-non-devices.patch 53342f31-set-right-ip-address-for-ipv6.patch 53375bad-raise-value-error-when-no-ipaddr-set.patch 53388de2-show-port-number-for-active-autoport-VM.patch 53397ae0-check-ip-address-format.patch 53399b45-hook-into-domain-balloon-event.patch 533d708d-fix-showing-vcpus-values.patch 533d7602-fix-changing-graphics-type.patch 533d7be7-clarify-iscsi-IQN-fields.patch 5345682c-addstorage-remove-whitespace-for-storage-path.patch OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=207
71 lines
2.9 KiB
Diff
71 lines
2.9 KiB
Diff
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])
|
|
|