7344db959d
OBS-URL: https://build.opensuse.org/package/show/Virtualization/virt-manager?expand=0&rev=086244c20ab5b11387af1571a0b5180c
46 lines
2.0 KiB
Diff
46 lines
2.0 KiB
Diff
Index: virt-manager-0.8.4/src/virtManager/engine.py
|
|
===================================================================
|
|
--- virt-manager-0.8.4.orig/src/virtManager/engine.py
|
|
+++ virt-manager-0.8.4/src/virtManager/engine.py
|
|
@@ -40,7 +40,8 @@ from virtManager.manager import vmmManag
|
|
from virtManager.migrate import vmmMigrateDialog
|
|
from virtManager.details import vmmDetails
|
|
from virtManager.asyncjob import vmmAsyncJob
|
|
-from virtManager.create import vmmCreate
|
|
+#from virtManager.create import vmmCreate
|
|
+from vminstall.gtk.interface import VMCreate as vmmCreate
|
|
from virtManager.host import vmmHost
|
|
from virtManager.error import vmmErrorDialog
|
|
from virtManager.systray import vmmSystray
|
|
@@ -650,13 +651,27 @@ class vmmEngine(gobject.GObject):
|
|
return False
|
|
return True
|
|
|
|
+ def _vmmcreate_closing(self,signal,key):
|
|
+ self.windowCreate = None
|
|
+
|
|
def show_create(self, uri):
|
|
if self.windowCreate == None:
|
|
- create = vmmCreate(self.get_config(), self)
|
|
+ try:
|
|
+ create = vmmCreate(virtman=True,key=0)
|
|
+ except Exception, e:
|
|
+ self.err.show_err("%s" % str(e),"".join(traceback.format_exc()))
|
|
create.connect("action-show-console", self._do_show_console)
|
|
- create.connect("action-show-help", self._do_show_help)
|
|
+ create.connect("vmmcreate-closing", self._vmmcreate_closing)
|
|
self.windowCreate = create
|
|
- self.windowCreate.show(uri)
|
|
+ self.windowCreate.show()
|
|
+ else:
|
|
+ message_box = gtk.MessageDialog(None,
|
|
+ gtk.DIALOG_MODAL,
|
|
+ gtk.MESSAGE_WARNING,
|
|
+ gtk.BUTTONS_OK,
|
|
+ _("A new installation is already in progress.\n\nUse the YaST \"Create Virtual Machines\" utility for concurrent installations."))
|
|
+ message_box.run()
|
|
+ message_box.destroy()
|
|
|
|
def add_connection(self, uri, readOnly=None, autoconnect=False):
|
|
conn = vmmConnection(self.get_config(), uri, readOnly, self)
|