diff --git a/src/virtManager/addhardware.py b/src/virtManager/addhardware.py index 8d31a2de..1cc34807 100644 --- a/src/virtManager/addhardware.py +++ b/src/virtManager/addhardware.py @@ -61,6 +61,14 @@ char_widget_mappings = { "target_name" : "char-target-name", } +_comboentry_xml = """ + + + True + + +""" + class vmmAddHardware(vmmGObjectUI): def __init__(self, vm): vmmGObjectUI.__init__(self, @@ -76,6 +84,10 @@ class vmmAddHardware(vmmGObjectUI): self._dev = None + self.window.add_from_string(_comboentry_xml) + self.widget("table7").attach(self.widget("config-storage-format"), + 1, 2, 2, 3, xoptions=gtk.FILL) + self.window.connect_signals({ "on_create_cancel_clicked" : self.close, "on_vmm_create_delete_event" : self.close, diff --git a/src/virtManager/connect.py b/src/virtManager/connect.py index 822b27ae..d694477a 100644 --- a/src/virtManager/connect.py +++ b/src/virtManager/connect.py @@ -48,6 +48,15 @@ def default_conn_user(conn): return "root" return current_user() +_hostname_xml = """ + + + True + + + +""" + class vmmConnect(vmmGObjectUI): def __init__(self): vmmGObjectUI.__init__(self, @@ -70,6 +79,10 @@ class vmmConnect(vmmGObjectUI): self.browser_sigs = [] self.can_browse = False + self.window.add_from_string(_hostname_xml) + self.widget("table1").attach(self.widget("hostname"), + 1, 2, 4, 5, yoptions=gtk.FILL) + # Set this if we can't resolve 'hostname.local': means avahi # prob isn't configured correctly, and we should strip .local self.can_resolve_local = None diff --git a/src/virtManager/create.py b/src/virtManager/create.py index 2328ab5b..a9cdd466 100644 --- a/src/virtManager/create.py +++ b/src/virtManager/create.py @@ -61,6 +61,22 @@ RHEL6_OS_SUPPORT = [ "win2k3", "winxp", "win2k8", "vista", "win7", ] +_comboentry_xml = """ + + + True + + + + True + + + + True + + +""" + class vmmCreate(vmmGObjectUI): def __init__(self, engine): vmmGObjectUI.__init__(self, "vmm-create.ui", "vmm-create") @@ -98,6 +114,13 @@ class vmmCreate(vmmGObjectUI): self.config_window = None self.config_window_signals = [] + self.window.add_from_string(_comboentry_xml) + self.widget("table2").attach(self.widget("install-url-box"), + 1, 2, 0, 1) + self.widget("table7").attach(self.widget("install-ks-box"), + 1, 2, 0, 1) + self.widget("alignment8").add(self.widget("install-local-box")) + self.window.connect_signals({ "on_vmm_newcreate_delete_event" : self.close, diff --git a/src/virtManager/createpool.py b/src/virtManager/createpool.py index 48509a31..aa25090d 100644 --- a/src/virtManager/createpool.py +++ b/src/virtManager/createpool.py @@ -33,6 +33,21 @@ from virtinst import Storage PAGE_NAME = 0 PAGE_FORMAT = 1 +_comboentry_xml = """ + + + True + + + + + True + + + + +""" + class vmmCreatePool(vmmGObjectUI): def __init__(self, conn): vmmGObjectUI.__init__(self, @@ -43,6 +58,12 @@ class vmmCreatePool(vmmGObjectUI): self._pool = None self._pool_class = Storage.StoragePool + self.window.add_from_string(_comboentry_xml) + self.widget("pool-source-box").pack_start( + self.widget("pool-source-path")) + self.widget("pool-target-box").pack_start( + self.widget("pool-target-path")) + self.window.connect_signals({ "on_pool_forward_clicked" : self.forward, "on_pool_back_clicked" : self.back, diff --git a/src/virtManager/details.py b/src/virtManager/details.py index 9b13d7de..55ea957c 100644 --- a/src/virtManager/details.py +++ b/src/virtManager/details.py @@ -37,6 +37,19 @@ from virtManager import util as util import virtinst +_comboentry_xml = """ + + + True + + + + True + + + +""" + # Parameters that can be editted in the details window EDIT_TOTAL = 36 (EDIT_NAME, @@ -326,6 +339,12 @@ class vmmDetails(vmmGObjectUI): self.ignoreDetails = False self._cpu_copy_host = False + self.window.add_from_string(_comboentry_xml) + self.widget("hbox17").pack_start(self.widget("disk-format"), + False, True, 0) + self.widget("hbox21").pack_start(self.widget("cpu-model"), + False, True, 0) + self.console = vmmConsolePages(self.vm, self.window) # Set default window size diff --git a/src/vmm-create-pool.ui b/src/vmm-create-pool.ui index 344e3af1..35aa39bc 100644 --- a/src/vmm-create-pool.ui +++ b/src/vmm-create-pool.ui @@ -387,6 +387,7 @@ False False 1 + end @@ -417,6 +418,7 @@ False False 1 + end diff --git a/src/vmm-details.ui b/src/vmm-details.ui index 61e5c218..b0682a16 100644 --- a/src/vmm-details.ui +++ b/src/vmm-details.ui @@ -2389,6 +2389,7 @@ I/O: True True + end 1 @@ -4000,6 +4001,7 @@ I/O: True True + end 1