openkylin
/
virt-manager
mirror of https://gitee.com/openkylin/virt-manager.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

uihelpers: Drop global error dialog 

Just have callers pass one in.
This commit is contained in:
Cole Robinson 2013-07-09 09:20:43 -04:00
parent f08313513b
commit 2ca9e364a5
5 changed files with 41 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
virtManager/addhardware.py
View File

@ -1356,8 +1356,7 @@ class vmmAddHardware(vmmGObjectUI):
if not res:
return False
uihelpers.check_path_search_for_qemu(self.topwin,
self.conn, disk.path)
uihelpers.check_path_search_for_qemu(self.err, self.conn, disk.path)
# Add a SCSI controller with model virtio-scsi if needed
disk.vmm_controller = None
@ -1394,7 +1393,7 @@ class vmmAddHardware(vmmGObjectUI):
return self.err.val_err(_("Invalid MAC address"),
_("A MAC address must be entered."))
ret = uihelpers.validate_network(self.topwin, self.conn,
ret = uihelpers.validate_network(self.err, self.conn,
nettype, devname, mac, model)
if ret is False:
return False

2
virtManager/choosecd.py
View File

@ -112,7 +112,7 @@ class vmmChooseCD(vmmGObjectUI):
except Exception, e:
return self.err.val_err(_("Invalid Media Path"), e)
uihelpers.check_path_search_for_qemu(self.topwin, self.conn, path)
uihelpers.check_path_search_for_qemu(self.err, self.conn, path)
self.emit("cdrom-chosen", self.disk, path)
self.close()

7
virtManager/create.py
View File

@ -1591,8 +1591,7 @@ class vmmCreate(vmmGObjectUI):
path = None
if path:
uihelpers.check_path_search_for_qemu(self.topwin,
self.conn, path)
uihelpers.check_path_search_for_qemu(self.err, self.conn, path)
# Validation passed, store the install path (if there is one) in
# gconf
@ -1712,7 +1711,7 @@ class vmmCreate(vmmGObjectUI):
return False
if not oldguest:
uihelpers.check_path_search_for_qemu(self.topwin,
uihelpers.check_path_search_for_qemu(self.err,
self.conn, disk.path)
self.disk = disk
@ -1742,7 +1741,7 @@ class vmmCreate(vmmGObjectUI):
_("Network device required for %s install.") %
methname)
nic = uihelpers.validate_network(self.topwin,
nic = uihelpers.validate_network(self.err,
self.conn, nettype, devname, macaddr)
if nic is False:
return False

2
virtManager/engine.py
View File

@ -32,7 +32,6 @@ import libvirt
import virtinst
from virtManager import packageutils
from virtManager import uihelpers
from virtManager import util
from virtManager.about import vmmAbout
from virtManager.baseclass import vmmGObject
@ -343,7 +342,6 @@ class vmmEngine(vmmGObject):
self.idle_add(self.exit_app, src)
def _cleanup(self):
uihelpers.cleanup()
self.err = None
if self.inspection:

77
virtManager/uihelpers.py
View File

@ -29,7 +29,6 @@ from gi.repository import Gtk
import virtinst
from virtManager import util
from virtManager.error import vmmErrorDialog
OPTICAL_DEV_PATH = 0
OPTICAL_LABEL = 1
@ -39,39 +38,10 @@ OPTICAL_MEDIA_KEY = 4
OPTICAL_IS_VALID = 5
##############################################################
# Initialize an error object to use for validation functions #
##############################################################
err_dial = vmmErrorDialog()
def set_error_parent(parent):
global err_dial
err_dial.set_parent(parent)
err_dial = err_dial
def cleanup():
global err_dial
err_dial = None
def spin_get_helper(widget):
adj = widget.get_adjustment()
txt = widget.get_text()
try:
ret = int(txt)
except:
ret = adj.get_value()
return ret
############################################################
# Helpers for shared storage UI between create/addhardware #
############################################################
def set_sparse_tooltip(widget):
sparse_str = _("Fully allocating storage may take longer now, "
"but the OS install phase will be quicker. \n\n"
@ -136,11 +106,11 @@ def check_default_pool_active(err, conn):
(default_pool.get_name(), str(e)))
return True
#####################################################
# Hardware model list building (for details, addhw) #
#####################################################
def build_video_combo(vm, video_dev, no_default=None):
video_dev_model = Gtk.ListStore(str, str)
video_dev.set_model(video_dev_model)
@ -441,11 +411,11 @@ def build_vnc_keymap_combo(vm, combo, no_default=False):
combo.set_active(-1)
#####################################
# Storage format list/combo helpers #
#####################################
def build_storage_format_combo(vm, combo):
dev_model = Gtk.ListStore(str)
combo.set_model(dev_model)
@ -461,11 +431,11 @@ def build_storage_format_combo(vm, combo):
combo.set_active(0)
#######################################################################
# Widgets for listing network device options (in create, addhardware) #
#######################################################################
def pretty_network_desc(nettype, source=None, netobj=None):
if nettype == virtinst.VirtualNetworkInterface.TYPE_USER:
return _("Usermode networking")
@ -700,9 +670,7 @@ def populate_network_list(net_list, conn, show_direct_interfaces=True):
return return_warn
def validate_network(parent, conn, nettype, devname, macaddr, model=None):
set_error_parent(parent)
def validate_network(err, conn, nettype, devname, macaddr, model=None):
net = None
addr = None
@ -718,7 +686,7 @@ def validate_network(parent, conn, nettype, devname, macaddr, model=None):
break
if netobj and not netobj.is_active():
res = err_dial.yes_no(_("Virtual Network is not active."),
res = err.yes_no(_("Virtual Network is not active."),
_("Virtual Network '%s' is not active. "
"Would you like to start the network "
"now?") % devname)
@ -731,7 +699,7 @@ def validate_network(parent, conn, nettype, devname, macaddr, model=None):
netobj.tick()
logging.info("Started network '%s'", devname)
except Exception, e:
return err_dial.show_err(_("Could not start virtual network "
return err.show_err(_("Could not start virtual network "
"'%s': %s") % (devname, str(e)))
# Create network device
@ -759,14 +727,14 @@ def validate_network(parent, conn, nettype, devname, macaddr, model=None):
net.set_address(addr)
except Exception, e:
return err_dial.val_err(_("Error with network parameters."), e)
return err.val_err(_("Error with network parameters."), e)
# Make sure there is no mac address collision
isfatal, errmsg = net.is_conflict_net(conn.get_backend())
if isfatal:
return err_dial.val_err(_("Mac address collision."), errmsg)
return err.val_err(_("Mac address collision."), errmsg)
elif errmsg is not None:
retv = err_dial.yes_no(_("Mac address collision."),
retv = err.yes_no(_("Mac address collision."),
_("%s Are you sure you want to use this "
"address?") % errmsg)
if not retv:
@ -972,14 +940,12 @@ def build_shutdown_button_menu(widget, shutdown_cb, reboot_cb, reset_cb,
save.connect("activate", save_cb)
menu.add(save)
#####################################
# Path permissions checker for qemu #
#####################################
def check_path_search_for_qemu(parent, conn, path):
set_error_parent(parent)
def check_path_search_for_qemu(err, conn, path):
if conn.is_remote() or not conn.is_qemu_system():
return
@ -997,7 +963,7 @@ def check_path_search_for_qemu(parent, conn, path):
return
logging.debug("No search access for dirs: %s", broken_paths)
resp, chkres = err_dial.warn_chkbox(
resp, chkres = err.warn_chkbox(
_("The emulator may not have search permissions "
"for the path '%s'.") % path,
_("Do you want to correct this now?"),
@ -1025,17 +991,17 @@ def check_path_search_for_qemu(parent, conn, path):
logging.debug("Permission errors:\n%s", details)
ignore, chkres = err_dial.err_chkbox(errmsg, details,
ignore, chkres = err.err_chkbox(errmsg, details,
_("Don't ask about these directories again."))
if chkres:
util.running_config.add_perms_fix_ignore(errors.keys())
######################################
# Interface startmode widget builder #
######################################
def build_startmode_combo(start_list):
start_model = Gtk.ListStore(str)
start_list.set_model(start_model)
@ -1072,3 +1038,18 @@ def build_keycombo_menu(cb):
menu.show_all()
return menu
#############
# Misc bits #
#############
def spin_get_helper(widget):
adj = widget.get_adjustment()
txt = widget.get_text()
try:
ret = int(txt)
except:
ret = adj.get_value()
return ret