diff --git a/src/virtManager/addhardware.py b/src/virtManager/addhardware.py index 645223e0b..011e60af4 100644 --- a/src/virtManager/addhardware.py +++ b/src/virtManager/addhardware.py @@ -63,13 +63,6 @@ char_widget_mappings = { "target_name" : "char-target-name", } -_comboentry_xml = """ - - - True - - -""" class vmmAddHardware(vmmGObjectUI): __gsignals__ = { @@ -77,8 +70,7 @@ class vmmAddHardware(vmmGObjectUI): } def __init__(self, vm): - vmmGObjectUI.__init__(self, - "vmm-add-hardware.ui", "vmm-add-hardware") + vmmGObjectUI.__init__(self, "vmm-add-hardware.ui", "vmm-add-hardware") self.vm = vm self.conn = vm.conn @@ -90,10 +82,6 @@ class vmmAddHardware(vmmGObjectUI): self._dev = None - self.get_window().add_from_string(_comboentry_xml) - self.widget("table7").attach(self.widget("config-storage-format"), - 1, 2, 2, 3, xoptions=Gtk.AttachOptions.FILL) - self.get_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 2b64093dc..e70d632db 100644 --- a/src/virtManager/connect.py +++ b/src/virtManager/connect.py @@ -49,15 +49,6 @@ def default_conn_user(conn): return "root" return current_user() -_hostname_xml = """ - - - True - True - - - -""" class vmmConnect(vmmGObjectUI): __gsignals__ = { @@ -86,10 +77,6 @@ class vmmConnect(vmmGObjectUI): self.browser_sigs = [] self.can_browse = False - self.get_window().add_from_string(_hostname_xml) - self.widget("table1").attach(self.widget("hostname"), - 1, 2, 4, 5, yoptions=Gtk.AttachOptions.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 a26c2c203..504522640 100644 --- a/src/virtManager/create.py +++ b/src/virtManager/create.py @@ -59,24 +59,6 @@ RHEL6_OS_SUPPORT = [ "win2k3", "winxp", "win2k8", "vista", "win7", ] -_comboentry_xml = """ - - - True - True - - - - True - True - - - - True - True - - -""" class vmmCreate(vmmGObjectUI): __gsignals__ = { @@ -119,13 +101,6 @@ class vmmCreate(vmmGObjectUI): self.config_window = None self.config_window_signals = [] - self.get_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.get_window().connect_signals({ "on_vmm_newcreate_delete_event" : self.close, diff --git a/src/virtManager/createpool.py b/src/virtManager/createpool.py index 6199c274b..4d740d55f 100644 --- a/src/virtManager/createpool.py +++ b/src/virtManager/createpool.py @@ -33,21 +33,6 @@ from virtinst import Storage PAGE_NAME = 0 PAGE_FORMAT = 1 -_comboentry_xml = """ - - - True - - - - - True - - - - -""" - class vmmCreatePool(vmmGObjectUI): def __init__(self, conn): vmmGObjectUI.__init__(self, @@ -58,12 +43,6 @@ class vmmCreatePool(vmmGObjectUI): self._pool = None self._pool_class = Storage.StoragePool - self.get_window().add_from_string(_comboentry_xml) - self.widget("pool-source-box").pack_start( - self.widget("pool-source-path"), True, True, 0) - self.widget("pool-target-box").pack_start( - self.widget("pool-target-path"), True, True, 0) - self.get_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 55f452668..7d4474e87 100644 --- a/src/virtManager/details.py +++ b/src/virtManager/details.py @@ -39,20 +39,6 @@ from virtManager import util as util import virtinst -_comboentry_xml = """ - - - True - True - - - - True - True - - - -""" # Parameters that can be editted in the details window EDIT_TOTAL = 37 @@ -368,12 +354,6 @@ class vmmDetails(vmmGObjectUI): self.ignoreDetails = False self._cpu_copy_host = False - self.get_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, self.topwin) # Set default window size diff --git a/src/vmm-add-hardware.ui b/src/vmm-add-hardware.ui index b80019ea0..4b3a791e9 100644 --- a/src/vmm-add-hardware.ui +++ b/src/vmm-add-hardware.ui @@ -425,9 +425,6 @@ 2 6 6 - - - True @@ -501,6 +498,24 @@ GTK_FILL + + + True + False + True + + + False + + + + + 1 + 2 + 2 + 3 + + True diff --git a/src/vmm-create-pool.ui b/src/vmm-create-pool.ui index 1b0186d7e..3cd978262 100644 --- a/src/vmm-create-pool.ui +++ b/src/vmm-create-pool.ui @@ -373,6 +373,25 @@ True False 6 + + + True + False + True + + + + + False + + + + + True + True + 0 + + Bro_wse @@ -403,6 +422,25 @@ True False 6 + + + True + False + True + + + + + False + + + + + True + True + 0 + + B_rowse diff --git a/src/vmm-create.ui b/src/vmm-create.ui index df994d926..5e148c759 100644 --- a/src/vmm-create.ui +++ b/src/vmm-create.ui @@ -682,11 +682,24 @@ True False 20 + + + True + False + True + + + + False + + + + True True - 0 + -1 @@ -846,7 +859,20 @@ - + + True + False + True + + + False + + + + + 1 + 2 + @@ -869,7 +895,21 @@ - + + True + False + True + + + + False + + + + + 1 + 2 + diff --git a/src/vmm-details.ui b/src/vmm-details.ui index 416e9ea34..d9a4fc814 100644 --- a/src/vmm-details.ui +++ b/src/vmm-details.ui @@ -2400,7 +2400,17 @@ I/O: True False - + + True + False + True + + + + False + + + @@ -4005,7 +4015,17 @@ I/O: True False - + + True + False + True + + + + False + + + diff --git a/src/vmm-open-connection.ui b/src/vmm-open-connection.ui index 3efe1de76..eb0f5d76c 100644 --- a/src/vmm-open-connection.ui +++ b/src/vmm-open-connection.ui @@ -102,9 +102,6 @@ 2 6 6 - - - True @@ -345,6 +342,25 @@ 4 + + + True + False + True + + + + False + + + + + 1 + 2 + 4 + 5 + + False