NuKVM/virt-manager
3
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2025-02-25 18:55:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Drop comboboxentry RHEL6 compat

Browse Source
This commit is contained in:
Cole Robinson 2012-11-09 10:46:37 +01:00
parent bdfd0d4143
commit eac0f93da7
10 changed files with 141 additions and 103 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/virtManager/addhardware.py
View File

@ -63,13 +63,6 @@ char_widget_mappings = {
"target_name" : "char-target-name", "target_name" : "char-target-name",
} }
_comboentry_xml = """
<interface>
<object class="GtkComboBoxEntry" id="config-storage-format">
<property name="visible">True</property>
</object>
</interface>
"""
class vmmAddHardware(vmmGObjectUI): class vmmAddHardware(vmmGObjectUI):
__gsignals__ = { __gsignals__ = {
@ -77,8 +70,7 @@ class vmmAddHardware(vmmGObjectUI):
} }
def __init__(self, vm): def __init__(self, vm):
vmmGObjectUI.__init__(self, vmmGObjectUI.__init__(self, "vmm-add-hardware.ui", "vmm-add-hardware")
"vmm-add-hardware.ui", "vmm-add-hardware")
self.vm = vm self.vm = vm
self.conn = vm.conn self.conn = vm.conn
@ -90,10 +82,6 @@ class vmmAddHardware(vmmGObjectUI):
self._dev = None 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({ self.get_window().connect_signals({
"on_create_cancel_clicked" : self.close, "on_create_cancel_clicked" : self.close,
"on_vmm_create_delete_event" : self.close, "on_vmm_create_delete_event" : self.close,

13
src/virtManager/connect.py
View File

@ -49,15 +49,6 @@ def default_conn_user(conn):
return "root" return "root"
return current_user() return current_user()
_hostname_xml = """
<interface>
<object class="GtkComboBoxText" id="hostname">
<property name="visible">True</property>
<property name="has_entry">True</property>
<signal name="changed" handler="on_hostname_combo_changed"/>
</object>
</interface>
"""
class vmmConnect(vmmGObjectUI): class vmmConnect(vmmGObjectUI):
__gsignals__ = { __gsignals__ = {
@ -86,10 +77,6 @@ class vmmConnect(vmmGObjectUI):
self.browser_sigs = [] self.browser_sigs = []
self.can_browse = False 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 # Set this if we can't resolve 'hostname.local': means avahi
# prob isn't configured correctly, and we should strip .local # prob isn't configured correctly, and we should strip .local
self.can_resolve_local = None self.can_resolve_local = None

25
src/virtManager/create.py
View File

@ -59,24 +59,6 @@ RHEL6_OS_SUPPORT = [
"win2k3", "winxp", "win2k8", "vista", "win7", "win2k3", "winxp", "win2k8", "vista", "win7",
] ]
_comboentry_xml = """
<interface>
<object class="GtkComboBoxText" id="install-local-box">
<property name="visible">True</property>
<property name="has_entry">True</property>
<signal name="changed" handler="on_install_local_box_changed"/>
</object>
<object class="GtkComboBoxText" id="install-url-box">
<property name="visible">True</property>
<property name="has_entry">True</property>
<signal name="changed" handler="on_install_url_box_changed"/>
</object>
<object class="GtkComboBoxText" id="install-ks-box">
<property name="visible">True</property>
<property name="has_entry">True</property>
</object>
</interface>
"""
class vmmCreate(vmmGObjectUI): class vmmCreate(vmmGObjectUI):
__gsignals__ = { __gsignals__ = {
@ -119,13 +101,6 @@ class vmmCreate(vmmGObjectUI):
self.config_window = None self.config_window = None
self.config_window_signals = [] 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({ self.get_window().connect_signals({
"on_vmm_newcreate_delete_event" : self.close, "on_vmm_newcreate_delete_event" : self.close,

21
src/virtManager/createpool.py
View File

@ -33,21 +33,6 @@ from virtinst import Storage
PAGE_NAME = 0 PAGE_NAME = 0
PAGE_FORMAT = 1 PAGE_FORMAT = 1
_comboentry_xml = """
<interface>
<object class="GtkComboBoxEntry" id="pool-source-path">
<property name="visible">True</property>
<signal name="changed" handler="on_pool_source_path_changed"/>
<signal name="focus" handler="on_pool_source_path_focus"/>
</object>
<object class="GtkComboBoxEntry" id="pool-target-path">
<property name="visible">True</property>
<signal name="changed" handler="on_pool_target_path_changed"/>
<signal name="focus_in_event" handler="on_pool_target_path_focus_in_event"/>
</object>
</interface>
"""
class vmmCreatePool(vmmGObjectUI): class vmmCreatePool(vmmGObjectUI):
def __init__(self, conn): def __init__(self, conn):
vmmGObjectUI.__init__(self, vmmGObjectUI.__init__(self,
@ -58,12 +43,6 @@ class vmmCreatePool(vmmGObjectUI):
self._pool = None self._pool = None
self._pool_class = Storage.StoragePool 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({ self.get_window().connect_signals({
"on_pool_forward_clicked" : self.forward, "on_pool_forward_clicked" : self.forward,
"on_pool_back_clicked" : self.back, "on_pool_back_clicked" : self.back,

20
src/virtManager/details.py
View File

@ -39,20 +39,6 @@ from virtManager import util as util
import virtinst import virtinst
_comboentry_xml = """
<interface>
<object class="GtkComboBoxText" id="cpu-model">
<property name="visible">True</property>
<property name="has_entry">True</property>
<signal name="changed" handler="on_cpu_model_changed"/>
</object>
<object class="GtkComboBoxText" id="disk-format">
<property name="visible">True</property>
<property name="has_entry">True</property>
<signal name="changed" handler="on_disk_format_changed"/>
</object>
</interface>
"""
# Parameters that can be editted in the details window # Parameters that can be editted in the details window
EDIT_TOTAL = 37 EDIT_TOTAL = 37
@ -368,12 +354,6 @@ class vmmDetails(vmmGObjectUI):
self.ignoreDetails = False self.ignoreDetails = False
self._cpu_copy_host = 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) self.console = vmmConsolePages(self.vm, self.window, self.topwin)
# Set default window size # Set default window size

21
src/vmm-add-hardware.ui
View File

@ -425,9 +425,6 @@
<property name="n_columns">2</property> <property name="n_columns">2</property>
<property name="column_spacing">6</property> <property name="column_spacing">6</property>
<property name="row_spacing">6</property> <property name="row_spacing">6</property>
<child>
<placeholder/>
</child>
<child> <child>
<object class="GtkComboBox" id="config-storage-devtype"> <object class="GtkComboBox" id="config-storage-devtype">
<property name="visible">True</property> <property name="visible">True</property>
@ -501,6 +498,24 @@
<property name="x_options">GTK_FILL</property> <property name="x_options">GTK_FILL</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkComboBox" id="config-storage-format">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry" id="combobox-entry">
<property name="can_focus">False</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">2</property>
<property name="bottom_attach">3</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>

38
src/vmm-create-pool.ui
View File

@ -373,6 +373,25 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child>
<object class="GtkComboBox" id="pool-source-path">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_entry">True</property>
<signal name="changed" handler="on_pool_source_path_changed" swapped="no"/>
<signal name="focus" handler="on_pool_source_path_focus" swapped="no"/>
<child internal-child="entry">
<object class="GtkEntry" id="combobox-entry">
<property name="can_focus">False</property>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child> <child>
<object class="GtkButton" id="pool-source-button"> <object class="GtkButton" id="pool-source-button">
<property name="label" translatable="yes">Bro_wse</property> <property name="label" translatable="yes">Bro_wse</property>
@ -403,6 +422,25 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="spacing">6</property> <property name="spacing">6</property>
<child>
<object class="GtkComboBox" id="pool-target-path">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_entry">True</property>
<signal name="changed" handler="on_pool_target_path_changed" swapped="no"/>
<signal name="focus" handler="on_pool_target_path_focus_in_event" swapped="no"/>
<child internal-child="entry">
<object class="GtkEntry" id="combobox-entry1">
<property name="can_focus">False</property>
</object>
</child>
</object>
<packing>
<property name="expand">True</property>
<property name="fill">True</property>
<property name="position">0</property>
</packing>
</child>
<child> <child>
<object class="GtkButton" id="pool-target-button"> <object class="GtkButton" id="pool-target-button">
<property name="label" translatable="yes">B_rowse</property> <property name="label" translatable="yes">B_rowse</property>

46
src/vmm-create.ui
View File

@ -682,11 +682,24 @@
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<property name="left_padding">20</property> <property name="left_padding">20</property>
<child>
<object class="GtkComboBox" id="install-local-box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_entry">True</property>
<signal name="changed" handler="on_install_local_box_changed" swapped="no"/>
<child internal-child="entry">
<object class="GtkEntry" id="combobox-entry">
<property name="can_focus">False</property>
</object>
</child>
</object>
</child>
</object> </object>
<packing> <packing>
<property name="expand">True</property> <property name="expand">True</property>
<property name="fill">True</property> <property name="fill">True</property>
<property name="position">0</property> <property name="position">-1</property>
</packing> </packing>
</child> </child>
<child> <child>
@ -846,7 +859,20 @@
</packing> </packing>
</child> </child>
<child> <child>
<placeholder/> <object class="GtkComboBox" id="install-ks-box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry" id="combobox-entry2">
<property name="can_focus">False</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
</packing>
</child> </child>
</object> </object>
</child> </child>
@ -869,7 +895,21 @@
</packing> </packing>
</child> </child>
<child> <child>
<placeholder/> <object class="GtkComboBox" id="install-url-box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_entry">True</property>
<signal name="changed" handler="on_install_url_box_changed" swapped="no"/>
<child internal-child="entry">
<object class="GtkEntry" id="combobox-entry1">
<property name="can_focus">False</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
</packing>
</child> </child>
</object> </object>
</child> </child>

24
src/vmm-details.ui
View File

@ -2400,7 +2400,17 @@ I/O:</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child> <child>
<placeholder/> <object class="GtkComboBox" id="cpu-model">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_entry">True</property>
<signal name="changed" handler="on_cpu_model_changed" swapped="no"/>
<child internal-child="entry">
<object class="GtkEntry" id="combobox-entry">
<property name="can_focus">False</property>
</object>
</child>
</object>
</child> </child>
</object> </object>
<packing> <packing>
@ -4005,7 +4015,17 @@ I/O:</property>
<property name="visible">True</property> <property name="visible">True</property>
<property name="can_focus">False</property> <property name="can_focus">False</property>
<child> <child>
<placeholder/> <object class="GtkComboBox" id="disk-format">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_entry">True</property>
<signal name="changed" handler="on_disk_format_changed" swapped="no"/>
<child internal-child="entry">
<object class="GtkEntry" id="combobox-entry1">
<property name="can_focus">False</property>
</object>
</child>
</object>
</child> </child>
</object> </object>
<packing> <packing>

22
src/vmm-open-connection.ui
View File

@ -102,9 +102,6 @@
<property name="n_columns">2</property> <property name="n_columns">2</property>
<property name="column_spacing">6</property> <property name="column_spacing">6</property>
<property name="row_spacing">6</property> <property name="row_spacing">6</property>
<child>
<placeholder/>
</child>
<child> <child>
<object class="GtkComboBox" id="hypervisor"> <object class="GtkComboBox" id="hypervisor">
<property name="visible">True</property> <property name="visible">True</property>
@ -345,6 +342,25 @@
<property name="bottom_attach">4</property> <property name="bottom_attach">4</property>
</packing> </packing>
</child> </child>
<child>
<object class="GtkComboBox" id="hostname">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_entry">True</property>
<signal name="changed" handler="on_hostname_combo_changed" swapped="no"/>
<child internal-child="entry">
<object class="GtkEntry" id="combobox-entry">
<property name="can_focus">False</property>
</object>
</child>
</object>
<packing>
<property name="left_attach">1</property>
<property name="right_attach">2</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
</packing>
</child>
</object> </object>
<packing> <packing>
<property name="expand">False</property> <property name="expand">False</property>