shaba/virt-manager
1
0
Fork 0
mirror of https://github.com/virt-manager/virt-manager.git synced 2024-12-22 13:34:07 +03:00
Code Issues Projects Releases Wiki Activity

virt-manager: Drop old style config- prefix for widget names

Browse Source 
It's redundant and we haven't followed that pattern for a long while
This commit is contained in:
Cole Robinson 2015-09-13 18:01:39 -04:00
parent c558bb1f56
commit a2bd31c2a6
8 changed files with 237 additions and 240 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
ui/addhardware.ui
View File

@ -131,7 +131,7 @@
<property name="valign">start</property>
<property name="spacing">18</property>
<child>
<object class="GtkAlignment" id="config-storage-align">
<object class="GtkAlignment" id="storage-align">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -157,7 +157,7 @@
<property name="halign">start</property>
<property name="label" translatable="yes">_Device type:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">config-storage-devtype</property>
<property name="mnemonic_widget">storage-devtype</property>
<property name="xalign">0</property>
</object>
<packing>
@ -166,13 +166,13 @@
</packing>
</child>
<child>
<object class="GtkComboBox" id="config-storage-devtype">
<object class="GtkComboBox" id="storage-devtype">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
<signal name="changed" handler="on_config_storage_devtype_changed" swapped="no"/>
<signal name="changed" handler="on_storage_devtype_changed" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="config-storage-devtype-atkobject">
<object class="AtkObject" id="storage-devtype-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Device Type Field</property>
</object>
</child>
@ -188,7 +188,7 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Bus type:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">config-storage-bustype</property>
<property name="mnemonic_widget">storage-bustype</property>
<property name="xalign">0</property>
</object>
<packing>
@ -197,7 +197,7 @@
</packing>
</child>
<child>
<object class="GtkComboBox" id="config-storage-bustype">
<object class="GtkComboBox" id="storage-bustype">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
@ -244,7 +244,7 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes">Cac_he mode:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">config-storage-cache</property>
<property name="mnemonic_widget">storage-cache</property>
<property name="xalign">0</property>
</object>
<packing>
@ -253,7 +253,7 @@
</packing>
</child>
<child>
<object class="GtkComboBox" id="config-storage-format">
<object class="GtkComboBox" id="storage-format">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="has_entry">True</property>
@ -269,7 +269,7 @@
</packing>
</child>
<child>
<object class="GtkComboBox" id="config-storage-cache">
<object class="GtkComboBox" id="storage-cache">
<property name="visible">True</property>
<property name="can_focus">False</property>
</object>

28
ui/addstorage.ui
View File

@ -7,18 +7,18 @@
<property name="step_increment">0.10000000000000001</property>
<property name="page_increment">10</property>
</object>
<object class="GtkVBox" id="config-storage-box">
<object class="GtkVBox" id="storage-box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkBox" id="config-storage-create-box">
<object class="GtkBox" id="storage-create-box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="spacing">3</property>
<child>
<object class="GtkRadioButton" id="config-storage-create">
<object class="GtkRadioButton" id="storage-create">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
@ -57,7 +57,7 @@
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkSpinButton" id="config-storage-size">
<object class="GtkSpinButton" id="storage-size">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="text" translatable="yes">0.0</property>
@ -78,7 +78,7 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes">_GiB</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">config-storage-size</property>
<property name="mnemonic_widget">storage-size</property>
</object>
<packing>
<property name="expand">False</property>
@ -141,15 +141,15 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkRadioButton" id="config-storage-select">
<object class="GtkRadioButton" id="storage-select">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="active">True</property>
<property name="draw_indicator">True</property>
<property name="group">config-storage-create</property>
<signal name="toggled" handler="on_config_storage_select_toggled" swapped="no"/>
<property name="group">storage-create</property>
<signal name="toggled" handler="on_storage_select_toggled" swapped="no"/>
<child>
<object class="GtkLabel" id="label124">
<property name="visible">True</property>
@ -167,22 +167,22 @@
</packing>
</child>
<child>
<object class="GtkHBox" id="config-storage-browse-box">
<object class="GtkHBox" id="storage-browse-box">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="config-storage-browse">
<object class="GtkButton" id="storage-browse">
<property name="label" translatable="yes">Bro_wse...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_config_storage_browse_clicked" swapped="no"/>
<signal name="clicked" handler="on_storage_browse_clicked" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="config-storage-browse-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">config-storage-browse</property>
<object class="AtkObject" id="storage-browse-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">storage-browse</property>
</object>
</child>
</object>
@ -193,7 +193,7 @@
</packing>
</child>
<child>
<object class="GtkEntry" id="config-storage-entry">
<object class="GtkEntry" id="storage-entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
</object>

84
ui/create.ui
View File

@ -429,10 +429,10 @@
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkComboBox" id="config-arch">
<object class="GtkComboBox" id="arch">
<property name="visible">True</property>
<property name="can_focus">False</property>
<signal name="changed" handler="on_config_arch_changed" swapped="no"/>
<signal name="changed" handler="on_arch_changed" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@ -440,10 +440,10 @@
</packing>
</child>
<child>
<object class="GtkComboBox" id="config-hv">
<object class="GtkComboBox" id="hv">
<property name="visible">True</property>
<property name="can_focus">False</property>
<signal name="changed" handler="on_config_hv_changed" swapped="no"/>
<signal name="changed" handler="on_hv_changed" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@ -456,7 +456,7 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Virt Type:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">config-hv</property>
<property name="mnemonic_widget">hv</property>
<property name="xalign">1</property>
</object>
<packing>
@ -470,7 +470,7 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Architecture:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">config-arch</property>
<property name="mnemonic_widget">arch</property>
<property name="xalign">1</property>
</object>
<packing>
@ -484,7 +484,7 @@
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Machine Type:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">config-machine</property>
<property name="mnemonic_widget">machine</property>
<property name="xalign">1</property>
</object>
<packing>
@ -493,10 +493,10 @@
</packing>
</child>
<child>
<object class="GtkComboBox" id="config-machine">
<object class="GtkComboBox" id="machine">
<property name="visible">True</property>
<property name="can_focus">False</property>
<signal name="changed" handler="on_config_machine_changed" swapped="no"/>
<signal name="changed" handler="on_machine_changed" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@ -1092,7 +1092,7 @@ User shouldn't see this.</property>
</packing>
</child>
<child>
<object class="GtkBox" id="config-kernel-box">
<object class="GtkBox" id="kernel-box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
@ -1127,7 +1127,7 @@ User shouldn't see this.</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Kernel path:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">config-kernel</property>
<property name="mnemonic_widget">kernel</property>
<property name="xalign">0</property>
</object>
<packing>
@ -1141,7 +1141,7 @@ User shouldn't see this.</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Initrd path:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">config-initrd</property>
<property name="mnemonic_widget">initrd</property>
<property name="xalign">0</property>
</object>
<packing>
@ -1155,7 +1155,7 @@ User shouldn't see this.</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_DTB path:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">config-dtb</property>
<property name="mnemonic_widget">dtb</property>
<property name="xalign">0</property>
</object>
<packing>
@ -1164,7 +1164,7 @@ User shouldn't see this.</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="config-kernel">
<object class="GtkEntry" id="kernel">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
@ -1175,7 +1175,7 @@ User shouldn't see this.</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="config-initrd">
<object class="GtkEntry" id="initrd">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
@ -1186,7 +1186,7 @@ User shouldn't see this.</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="config-dtb">
<object class="GtkEntry" id="dtb">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="hexpand">True</property>
@ -1197,16 +1197,16 @@ User shouldn't see this.</property>
</packing>
</child>
<child>
<object class="GtkButton" id="config-kernel-browse">
<object class="GtkButton" id="kernel-browse">
<property name="label" translatable="yes">Br_owse...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_config_kernel_browse_clicked" swapped="no"/>
<signal name="clicked" handler="on_kernel_browse_clicked" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="config-kernel-browse-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">config-kernel-browse</property>
<object class="AtkObject" id="kernel-browse-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">kernel-browse</property>
</object>
</child>
</object>
@ -1216,16 +1216,16 @@ User shouldn't see this.</property>
</packing>
</child>
<child>
<object class="GtkButton" id="config-initrd-browse">
<object class="GtkButton" id="initrd-browse">
<property name="label" translatable="yes">Bro_wse...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_config_initrd_browse_clicked" swapped="no"/>
<signal name="clicked" handler="on_initrd_browse_clicked" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="config-initrd-browse-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">config-initrd-browse</property>
<object class="AtkObject" id="initrd-browse-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">initrd-browse</property>
</object>
</child>
</object>
@ -1235,16 +1235,16 @@ User shouldn't see this.</property>
</packing>
</child>
<child>
<object class="GtkButton" id="config-dtb-browse">
<object class="GtkButton" id="dtb-browse">
<property name="label" translatable="yes">Brow_se...</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_config_dtb_browse_clicked" swapped="no"/>
<signal name="clicked" handler="on_dtb_browse_clicked" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="config-dtb-browse-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">config-dtb-browse</property>
<object class="AtkObject" id="dtb-browse-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">dtb-browse</property>
</object>
</child>
</object>
@ -1254,7 +1254,7 @@ User shouldn't see this.</property>
</packing>
</child>
<child>
<object class="GtkBox" id="config-dtb-warn-virtio">
<object class="GtkBox" id="dtb-warn-virtio">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@ -1296,7 +1296,7 @@ User shouldn't see this.</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Kerne_l args:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">config-kernel-args</property>
<property name="mnemonic_widget">kernel-args</property>
<property name="xalign">0</property>
</object>
<packing>
@ -1305,7 +1305,7 @@ User shouldn't see this.</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="config-kernel-args">
<object class="GtkEntry" id="kernel-args">
<property name="visible">True</property>
<property name="can_focus">True</property>
</object>
@ -1839,7 +1839,7 @@ is not yet supported.&lt;/small&gt;</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">C_PUs:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">config-cpus</property>
<property name="mnemonic_widget">cpus</property>
<property name="xalign">1</property>
</object>
<packing>
@ -1855,7 +1855,7 @@ is not yet supported.&lt;/small&gt;</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">_Memory (RAM):</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">config-mem</property>
<property name="mnemonic_widget">mem</property>
<property name="xalign">1</property>
</object>
<packing>
@ -1864,7 +1864,7 @@ is not yet supported.&lt;/small&gt;</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="config-mem">
<object class="GtkSpinButton" id="mem">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">1</property>
@ -1879,7 +1879,7 @@ is not yet supported.&lt;/small&gt;</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="config-cpus">
<object class="GtkSpinButton" id="cpus">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="xalign">1</property>
@ -2027,7 +2027,7 @@ is not yet supported.&lt;/small&gt;</property>
</packing>
</child>
<child>
<object class="GtkVBox" id="config-storage-area">
<object class="GtkVBox" id="storage-area">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@ -2050,7 +2050,7 @@ is not yet supported.&lt;/small&gt;</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="config-storage-align">
<object class="GtkAlignment" id="storage-align">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="left_padding">15</property>
@ -2370,7 +2370,7 @@ is not yet supported.&lt;/small&gt;</property>
</packing>
</child>
<child>
<object class="GtkExpander" id="config-advanced-expander">
<object class="GtkExpander" id="advanced-expander">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="spacing">6</property>
@ -2390,7 +2390,7 @@ is not yet supported.&lt;/small&gt;</property>
<property name="can_focus">False</property>
<property name="row_spacing">6</property>
<child>
<object class="GtkAlignment" id="config-netdev-ui-align">
<object class="GtkAlignment" id="netdev-ui-align">
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
@ -2403,7 +2403,7 @@ is not yet supported.&lt;/small&gt;</property>
</packing>
</child>
<child>
<object class="GtkBox" id="config-netdev-warn-box">
<object class="GtkBox" id="netdev-warn-box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@ -2420,7 +2420,7 @@ is not yet supported.&lt;/small&gt;</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="config-netdev-warn-label">
<object class="GtkLabel" id="netdev-warn-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="label">&lt;small&gt;pxe warning&lt;/small&gt;</property>
@ -2455,7 +2455,7 @@ is not yet supported.&lt;/small&gt;</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">N_etwork selection</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">config-advanced-expander</property>
<property name="mnemonic_widget">advanced-expander</property>
</object>
</child>
</object>

76
ui/details.ui
View File

@ -1210,7 +1210,7 @@ if you know what you are doing.&lt;/small&gt;</property>
</packing>
</child>
<child>
<object class="GtkExpander" id="config-idmap-expander">
<object class="GtkExpander" id="idmap-expander">
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
@ -1220,21 +1220,21 @@ if you know what you are doing.&lt;/small&gt;</property>
<property name="top_padding">3</property>
<property name="left_padding">12</property>
<child>
<object class="GtkGrid" id="config-idmap-grid">
<object class="GtkGrid" id="idmap-grid">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="orientation">vertical</property>
<property name="row_spacing">6</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkCheckButton" id="config-idmap-checkbutton">
<object class="GtkCheckButton" id="idmap-checkbutton">
<property name="label" translatable="yes">Enable User Namespace</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
<property name="xalign">0</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_config_idmap_check_toggled" swapped="no"/>
<signal name="toggled" handler="on_idmap_check_toggled" swapped="no"/>
</object>
<packing>
<property name="left_attach">0</property>
@ -2007,7 +2007,7 @@ if you know what you are doing.&lt;/small&gt;</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Ma_ximum allocation:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">config-maxvcpus</property>
<property name="mnemonic_widget">cpu-maxvcpus</property>
<property name="xalign">1</property>
</object>
<packing>
@ -2023,7 +2023,7 @@ if you know what you are doing.&lt;/small&gt;</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Current a_llocation:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">config-vcpus</property>
<property name="mnemonic_widget">cpu-vcpus</property>
<property name="xalign">1</property>
</object>
<packing>
@ -2034,12 +2034,12 @@ if you know what you are doing.&lt;/small&gt;</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="config-maxvcpus">
<object class="GtkSpinButton" id="cpu-maxvcpus">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<property name="adjustment">adjustment6</property>
<signal name="changed" handler="on_config_maxvcpus_changed" swapped="no"/>
<signal name="changed" handler="on_cpu_maxvcpus_changed" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
@ -2051,7 +2051,7 @@ if you know what you are doing.&lt;/small&gt;</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="config-vcpus">
<object class="GtkSpinButton" id="cpu-vcpus">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
@ -2059,9 +2059,9 @@ if you know what you are doing.&lt;/small&gt;</property>
<property name="climb_rate">1</property>
<property name="numeric">True</property>
<property name="update_policy">if-valid</property>
<signal name="changed" handler="on_config_vcpus_changed" swapped="no"/>
<signal name="changed" handler="on_cpu_vcpus_changed" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="config-vcpus-atkobject">
<object class="AtkObject" id="cpu-vcpus-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Virtual CPU Select</property>
</object>
</child>
@ -2083,7 +2083,7 @@ if you know what you are doing.&lt;/small&gt;</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="config-vcpus-warn-box">
<object class="GtkHBox" id="cpu-vcpus-warn-box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@ -2385,7 +2385,7 @@ if you know what you are doing.&lt;/small&gt;</property>
</packing>
</child>
<child>
<object class="GtkHBox" id="config-topology-warn-box">
<object class="GtkHBox" id="cpu-topology-warn-box">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
@ -2487,7 +2487,7 @@ if you know what you are doing.&lt;/small&gt;</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Default p_inning:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">config-vcpupin</property>
<property name="mnemonic_widget">cpu-vcpupin</property>
<property name="xalign">1</property>
</object>
<packing>
@ -2517,13 +2517,13 @@ if you know what you are doing.&lt;/small&gt;</property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
<object class="GtkEntry" id="config-vcpupin">
<object class="GtkEntry" id="cpu-vcpupin">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
<signal name="changed" handler="on_config_vcpupin_changed" swapped="no"/>
<signal name="changed" handler="on_cpu_vcpupin_changed" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="config-vcpupin-atkobject">
<object class="AtkObject" id="-vcpupin-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Virtual CPU Affinity Select</property>
</object>
</child>
@ -2561,13 +2561,13 @@ if you know what you are doing.&lt;/small&gt;</property>
<property name="can_focus">False</property>
<property name="spacing">3</property>
<child>
<object class="GtkButton" id="config-vcpupin-generate">
<object class="GtkButton" id="cpu-vcpupin-generate">
<property name="label" translatable="yes">Generate from host _NUMA configuration</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="use_underline">True</property>
<signal name="clicked" handler="on_config_vcpupin_generate_clicked" swapped="no"/>
<signal name="clicked" handler="on_cpu_vcpupin_generate_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@ -2580,7 +2580,7 @@ if you know what you are doing.&lt;/small&gt;</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
<object class="GtkImage" id="config-vcpupin-generate-err">
<object class="GtkImage" id="cpu-vcpupin-generate-err">
<property name="can_focus">False</property>
<property name="xalign">0</property>
<property name="stock">gtk-dialog-warning</property>
@ -2689,7 +2689,7 @@ if you know what you are doing.&lt;/small&gt;</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Current a_llocation:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">config-memory</property>
<property name="mnemonic_widget">mem-memory</property>
<property name="xalign">1</property>
</object>
<packing>
@ -2705,7 +2705,7 @@ if you know what you are doing.&lt;/small&gt;</property>
<property name="can_focus">False</property>
<property name="label" translatable="yes">Ma_ximum allocation:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">config-maxmem</property>
<property name="mnemonic_widget">mem-maxmem</property>
<property name="xalign">1</property>
</object>
<packing>
@ -2748,7 +2748,7 @@ if you know what you are doing.&lt;/small&gt;</property>
<property name="can_focus">False</property>
<property name="spacing">3</property>
<child>
<object class="GtkSpinButton" id="config-memory">
<object class="GtkSpinButton" id="mem-memory">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
@ -2756,9 +2756,9 @@ if you know what you are doing.&lt;/small&gt;</property>
<property name="climb_rate">2</property>
<property name="numeric">True</property>
<property name="update_policy">if-valid</property>
<signal name="changed" handler="on_config_memory_changed" swapped="no"/>
<signal name="changed" handler="on_mem_memory_changed" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="config-memory-atkobject">
<object class="AtkObject" id="mem-memory-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Memory Select</property>
</object>
</child>
@ -2797,7 +2797,7 @@ if you know what you are doing.&lt;/small&gt;</property>
<property name="can_focus">False</property>
<property name="spacing">3</property>
<child>
<object class="GtkSpinButton" id="config-maxmem">
<object class="GtkSpinButton" id="mem-maxmem">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="invisible_char">●</property>
@ -2805,9 +2805,9 @@ if you know what you are doing.&lt;/small&gt;</property>
<property name="climb_rate">2</property>
<property name="numeric">True</property>
<property name="update_policy">if-valid</property>
<signal name="changed" handler="on_config_maxmem_changed" swapped="no"/>
<signal name="changed" handler="on_mem_maxmem_changed" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="config-maxmem-atkobject">
<object class="AtkObject" id="mem-maxmem-atkobject">
<property name="AtkObject::accessible-name" translatable="yes">Max Memory Select</property>
</object>
</child>
@ -2894,7 +2894,7 @@ if you know what you are doing.&lt;/small&gt;</property>
<property name="top_padding">3</property>
<property name="left_padding">12</property>
<child>
<object class="GtkCheckButton" id="config-autostart">
<object class="GtkCheckButton" id="boot-autostart">
<property name="label" translatable="yes">Start virt_ual machine on host boot up</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@ -2902,7 +2902,7 @@ if you know what you are doing.&lt;/small&gt;</property>
<property name="use_underline">True</property>
<property name="xalign">0.5</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_config_autostart_changed" swapped="no"/>
<signal name="toggled" handler="on_boot_autostart_changed" swapped="no"/>
</object>
</child>
</object>
@ -3356,13 +3356,13 @@ if you know what you are doing.&lt;/small&gt;</property>
<property name="hscrollbar_policy">never</property>
<property name="shadow_type">in</property>
<child>
<object class="GtkTreeView" id="config-boot-list">
<object class="GtkTreeView" id="boot-list">
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="headers_visible">False</property>
<child internal-child="selection">
<object class="GtkTreeSelection" id="treeview-selection4">
<signal name="changed" handler="on_config_boot_list_changed" swapped="no"/>
<signal name="changed" handler="on_boot_list_changed" swapped="no"/>
</object>
</child>
</object>
@ -3380,13 +3380,13 @@ if you know what you are doing.&lt;/small&gt;</property>
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
<object class="GtkButton" id="config-boot-moveup">
<object class="GtkButton" id="boot-moveup">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="valign">start</property>
<signal name="clicked" handler="on_config_boot_moveup_clicked" swapped="no"/>
<signal name="clicked" handler="on_boot_moveup_clicked" swapped="no"/>
<child>
<object class="GtkImage" id="image7">
<property name="visible">True</property>
@ -3402,14 +3402,14 @@ if you know what you are doing.&lt;/small&gt;</property>
</packing>
</child>
<child>
<object class="GtkButton" id="config-boot-movedown">
<object class="GtkButton" id="boot-movedown">
<property name="visible">True</property>
<property name="sensitive">False</property>
<property name="can_focus">True</property>
<property name="receives_default">True</property>
<property name="valign">start</property>
<property name="vexpand">False</property>
<signal name="clicked" handler="on_config_boot_movedown_clicked" swapped="no"/>
<signal name="clicked" handler="on_boot_movedown_clicked" swapped="no"/>
<child>
<object class="GtkImage" id="image8">
<property name="visible">True</property>
@ -3627,7 +3627,7 @@ if you know what you are doing.&lt;/small&gt;</property>
</packing>
</child>
<child>
<object class="GtkButton" id="config-cdrom-connect">
<object class="GtkButton" id="disk-cdrom-connect">
<property name="label">gtk-connect</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
@ -3636,7 +3636,7 @@ if you know what you are doing.&lt;/small&gt;</property>
<property name="has_tooltip">True</property>
<property name="tooltip_text" translatable="yes">Connect or disconnect media</property>
<property name="use_stock">True</property>
<signal name="clicked" handler="on_config_cdrom_connect_clicked" swapped="no"/>
<signal name="clicked" handler="on_disk_cdrom_connect_clicked" swapped="no"/>
</object>
<packing>
<property name="expand">False</property>

32
virtManager/addhardware.py
View File

@ -89,7 +89,7 @@ class vmmAddHardware(vmmGObjectUI):
self.widget("network-vport-align").add(self._netlist.top_vport)
self.addstorage = vmmAddStorage(self.conn, self.builder, self.topwin)
self.widget("config-storage-align").add(self.addstorage.top_box)
self.widget("storage-align").add(self.addstorage.top_box)
self.addstorage.connect("browse-clicked", self._browse_storage_cb)
self.addstorage.connect("storage-toggled", self._toggle_storage_select)
@ -99,7 +99,7 @@ class vmmAddHardware(vmmGObjectUI):
"on_create_finish_clicked" : self._finish,
"on_hw_list_changed": self._hw_selected,
"on_config_storage_devtype_changed": self._change_storage_devtype,
"on_storage_devtype_changed": self._change_storage_devtype,
"on_mac_address_clicked" : self._change_macaddr_use,
@ -200,10 +200,10 @@ class vmmAddHardware(vmmGObjectUI):
# Disk bus type
self.build_disk_bus_combo(self.vm,
self.widget("config-storage-bustype"))
self.widget("storage-bustype"))
# Disk device type
target_list = self.widget("config-storage-devtype")
target_list = self.widget("storage-devtype")
# [device, icon, label]
target_model = Gtk.ListStore(str, str, str)
target_list.set_model(target_model)
@ -227,7 +227,7 @@ class vmmAddHardware(vmmGObjectUI):
target_list.set_active(0)
# Disk cache mode
cache_list = self.widget("config-storage-cache")
cache_list = self.widget("storage-cache")
self.build_disk_cache_combo(self.vm, cache_list)
# Disk format mode
@ -409,8 +409,8 @@ class vmmAddHardware(vmmGObjectUI):
def _reset_state(self):
# Storage init
self._populate_disk_format_combo_wrapper(True)
self.widget("config-storage-devtype").set_active(0)
self.widget("config-storage-devtype").emit("changed")
self.widget("storage-devtype").set_active(0)
self.widget("storage-devtype").emit("changed")
self.addstorage.reset_state()
# Network init
@ -863,7 +863,7 @@ class vmmAddHardware(vmmGObjectUI):
#########################
def _refresh_disk_bus(self, devtype):
widget = self.widget("config-storage-bustype")
widget = self.widget("storage-bustype")
model = widget.get_model()
self.populate_disk_bus_combo(self.vm, devtype, model)
@ -912,7 +912,7 @@ class vmmAddHardware(vmmGObjectUI):
uiutil.set_list_selection_by_number(devlist, 0)
def _populate_disk_format_combo_wrapper(self, create):
format_list = self.widget("config-storage-format")
format_list = self.widget("storage-format")
self.populate_disk_format_combo(self.vm, format_list, create)
if not create:
format_list.get_child().set_text("")
@ -1173,14 +1173,14 @@ class vmmAddHardware(vmmGObjectUI):
def _change_storage_devtype(self, ignore):
devtype = uiutil.get_list_selection(
self.widget("config-storage-devtype"))
self.widget("storage-devtype"))
self._refresh_disk_bus(devtype)
allow_create = devtype not in ["cdrom", "floppy"]
self.addstorage.widget("config-storage-create-box").set_sensitive(
self.addstorage.widget("storage-create-box").set_sensitive(
allow_create)
if not allow_create:
self.addstorage.widget("config-storage-select").set_active(True)
self.addstorage.widget("storage-select").set_active(True)
def _change_macaddr_use(self, ignore=None):
if self.widget("mac-address").get_active():
@ -1515,12 +1515,12 @@ class vmmAddHardware(vmmGObjectUI):
def _validate_page_storage(self):
bus = uiutil.get_list_selection(
self.widget("config-storage-bustype"))
self.widget("storage-bustype"))
device = uiutil.get_list_selection(
self.widget("config-storage-devtype"))
self.widget("storage-devtype"))
cache = uiutil.get_list_selection(
self.widget("config-storage-cache"))
fmt = uiutil.get_list_selection(self.widget("config-storage-format"))
self.widget("storage-cache"))
fmt = uiutil.get_list_selection(self.widget("storage-format"))
controller_model = None
if (bus == "scsi" and

30
virtManager/addstorage.py
View File

@ -41,11 +41,11 @@ class vmmAddStorage(vmmGObjectUI):
self.conn = conn
self.builder.connect_signals({
"on_config_storage_browse_clicked": self._browse_storage,
"on_config_storage_select_toggled": self._toggle_storage_select,
"on_storage_browse_clicked": self._browse_storage,
"on_storage_select_toggled": self._toggle_storage_select,
})
self.top_box = self.widget("config-storage-box")
self.top_box = self.widget("storage-box")
def _cleanup(self):
self.conn = None
@ -179,17 +179,17 @@ class vmmAddStorage(vmmGObjectUI):
def reset_state(self):
self._update_host_space()
self.widget("config-storage-create").set_active(True)
self.widget("config-storage-size").set_value(8)
self.widget("config-storage-entry").set_text("")
self.widget("config-storage-create-box").set_sensitive(True)
self.widget("storage-create").set_active(True)
self.widget("storage-size").set_value(8)
self.widget("storage-entry").set_text("")
self.widget("storage-create-box").set_sensitive(True)
storage_tooltip = None
can_storage = (not self.conn.is_remote() or
self.conn.is_storage_capable())
use_storage = self.widget("config-storage-select")
storage_area = self.widget("config-storage-box")
use_storage = self.widget("storage-select")
storage_area = self.widget("storage-box")
storage_area.set_sensitive(can_storage)
if not can_storage:
@ -240,12 +240,12 @@ class vmmAddStorage(vmmGObjectUI):
return path
def is_default_storage(self):
return self.widget("config-storage-create").get_active()
return self.widget("storage-create").get_active()
def validate_storage(self, vmname, path=None,
device="disk", collidelist=None, fmt=None):
collidelist = collidelist or []
use_storage = self.widget("config-storage-box").is_sensitive()
use_storage = self.widget("storage-box").is_sensitive()
is_default = self.is_default_storage()
conn = self.conn.get_backend()
@ -264,12 +264,12 @@ class vmmAddStorage(vmmGObjectUI):
readonly = True
size = uiutil.spin_get_helper(
self.widget("config-storage-size"))
self.widget("storage-size"))
if path is None:
if is_default:
path = self.get_default_path(vmname, collidelist)
else:
path = self.widget("config-storage-entry").get_text().strip()
path = self.widget("storage-entry").get_text().strip()
if not path and device in ["disk", "lun"]:
return self.err.val_err(_("A storage path must be specified."))
@ -324,9 +324,9 @@ class vmmAddStorage(vmmGObjectUI):
#############
def _browse_storage(self, ignore):
self.emit("browse-clicked", self.widget("config-storage-entry"))
self.emit("browse-clicked", self.widget("storage-entry"))
def _toggle_storage_select(self, src):
act = src.get_active()
self.widget("config-storage-browse-box").set_sensitive(act)
self.widget("storage-browse-box").set_sensitive(act)
self.emit("storage-toggled", src)

96
virtManager/create.py
View File

@ -117,7 +117,7 @@ class vmmCreate(vmmGObjectUI):
self._mediacombo = None
self._addstorage = vmmAddStorage(self.conn, self.builder, self.topwin)
self.widget("config-storage-align").add(self._addstorage.top_box)
self.widget("storage-align").add(self._addstorage.top_box)
def _browse_file_cb(ignore, widget):
self._browse_file(widget)
self._addstorage.connect("browse-clicked", _browse_file_cb)
@ -133,9 +133,9 @@ class vmmCreate(vmmGObjectUI):
"on_create_conn_changed": self._conn_changed,
"on_method_changed": self._method_changed,
"on_config_machine_changed": self._machine_changed,
"on_config_hv_changed": self._hv_changed,
"on_config_arch_changed": self._arch_changed,
"on_machine_changed": self._machine_changed,
"on_hv_changed": self._hv_changed,
"on_arch_changed": self._arch_changed,
"on_install_cdrom_radio_toggled": self._local_media_toggled,
"on_install_iso_entry_changed": self._iso_changed,
@ -153,9 +153,9 @@ class vmmCreate(vmmGObjectUI):
"on_install_detect_os_box_show": self._os_detect_visibility_changed,
"on_install_detect_os_box_hide": self._os_detect_visibility_changed,
"on_config_kernel_browse_clicked": self._browse_kernel,
"on_config_initrd_browse_clicked": self._browse_initrd,
"on_config_dtb_browse_clicked": self._browse_dtb,
"on_kernel_browse_clicked": self._browse_kernel,
"on_initrd_browse_clicked": self._browse_initrd,
"on_dtb_browse_clicked": self._browse_dtb,
"on_enable_storage_toggled": self._toggle_enable_storage,
})
@ -318,19 +318,19 @@ class vmmCreate(vmmGObjectUI):
# Archtecture
# [value, label]
archList = self.widget("config-arch")
archList = self.widget("arch")
archModel = Gtk.ListStore(str, str)
archList.set_model(archModel)
uiutil.init_combo_text_column(archList, 1)
archList.set_row_separator_func(
lambda m, i, ignore: m[i][0] is None, None)
hyperList = self.widget("config-hv")
hyperList = self.widget("hv")
hyperModel = Gtk.ListStore(str, str)
hyperList.set_model(hyperModel)
uiutil.init_combo_text_column(hyperList, 0)
lst = self.widget("config-machine")
lst = self.widget("machine")
model = Gtk.ListStore(str)
lst.set_model(model)
uiutil.init_combo_text_column(lst, 0)
@ -399,9 +399,9 @@ class vmmCreate(vmmGObjectUI):
# Install import
self.widget("install-import-entry").set_text("")
self.widget("config-kernel").set_text("")
self.widget("config-initrd").set_text("")
self.widget("config-dtb").set_text("")
self.widget("kernel").set_text("")
self.widget("initrd").set_text("")
self.widget("dtb").set_text("")
# Install container app
self.widget("install-app-entry").set_text("/bin/sh")
@ -412,8 +412,8 @@ class vmmCreate(vmmGObjectUI):
# Storage
self.widget("enable-storage").set_active(True)
self._addstorage.reset_state()
self._addstorage.widget("config-storage-create").set_active(True)
self._addstorage.widget("config-storage-entry").set_text("")
self._addstorage.widget("storage-create").set_active(True)
self._addstorage.widget("storage-entry").set_text("")
# Final page
self.widget("summary-customize").set_active(False)
@ -519,8 +519,8 @@ class vmmCreate(vmmGObjectUI):
show_dtb = ("arm" in self._capsinfo.arch or
"microblaze" in self._capsinfo.arch or
"ppc" in self._capsinfo.arch)
self.widget("config-kernel-box").set_visible(not installable_arch)
uiutil.set_grid_row_visible(self.widget("config-dtb"), show_dtb)
self.widget("kernel-box").set_visible(not installable_arch)
uiutil.set_grid_row_visible(self.widget("dtb"), show_dtb)
def _set_conn_state(self):
"""
@ -553,9 +553,9 @@ class vmmCreate(vmmGObjectUI):
self._populate_hv()
self._populate_arch()
show_arch = (self.widget("config-hv").get_visible() or
self.widget("config-arch").get_visible() or
self.widget("config-machine").get_visible())
show_arch = (self.widget("hv").get_visible() or
self.widget("arch").get_visible() or
self.widget("machine").get_visible())
uiutil.set_grid_row_visible(self.widget("arch-expander"), show_arch)
if self.conn.is_xen():
@ -616,7 +616,7 @@ class vmmCreate(vmmGObjectUI):
{'maxmem': _pretty_memory(memory)})
mem_label = ("<span size='small' color='#484848'>%s</span>" %
mem_label)
self.widget("config-mem").set_range(50, memory / 1024)
self.widget("mem").set_range(50, memory / 1024)
self.widget("phys-mem-label").set_markup(mem_label)
# CPU
@ -628,7 +628,7 @@ class vmmCreate(vmmGObjectUI):
{'numcpus': int(phys_cpus)})
cpu_label = ("<span size='small' color='#484848'>%s</span>" %
cpu_label)
self.widget("config-cpus").set_range(1, cmax)
self.widget("cpus").set_range(1, cmax)
self.widget("phys-cpu-label").set_markup(cpu_label)
# Storage
@ -636,15 +636,15 @@ class vmmCreate(vmmGObjectUI):
self._addstorage.reset_state()
# Networking
self.widget("config-advanced-expander").set_expanded(False)
self.widget("advanced-expander").set_expanded(False)
if self._netlist:
self.widget("config-netdev-ui-align").remove(self._netlist.top_box)
self.widget("netdev-ui-align").remove(self._netlist.top_box)
self._netlist.cleanup()
self._netlist = None
self._netlist = vmmNetworkList(self.conn, self.builder, self.topwin)
self.widget("config-netdev-ui-align").add(self._netlist.top_box)
self.widget("netdev-ui-align").add(self._netlist.top_box)
self._netlist.connect("changed", self._netdev_changed)
self._netlist.reset_state()
@ -682,7 +682,7 @@ class vmmCreate(vmmGObjectUI):
##################################################
def _populate_hv(self):
hv_list = self.widget("config-hv")
hv_list = self.widget("hv")
model = hv_list.get_model()
model.clear()
@ -720,7 +720,7 @@ class vmmCreate(vmmGObjectUI):
hv_list.set_active(default)
def _populate_arch(self):
arch_list = self.widget("config-arch")
arch_list = self.widget("arch")
model = arch_list.get_model()
model.clear()
@ -763,7 +763,7 @@ class vmmCreate(vmmGObjectUI):
arch_list.set_active(default)
def _populate_machine(self):
lst = self.widget("config-machine")
lst = self.widget("machine")
model = lst.get_model()
model.clear()
@ -1045,7 +1045,7 @@ class vmmCreate(vmmGObjectUI):
return self.widget("create-vm-name").get_text()
def _get_config_machine(self):
return uiutil.get_list_selection(self.widget("config-machine"),
return uiutil.get_list_selection(self.widget("machine"),
check_visible=True)
def _get_config_install_page(self):
@ -1210,7 +1210,7 @@ class vmmCreate(vmmGObjectUI):
show_dtb_virtio = (self._capsinfo.arch == "armv7l" and
machine in ["vexpress-a9", "vexpress-15"])
uiutil.set_grid_row_visible(
self.widget("config-dtb-warn-virtio"), show_dtb_virtio)
self.widget("dtb-warn-virtio"), show_dtb_virtio)
def _hv_changed(self, src):
hv = uiutil.get_list_selection(src, column=1)
@ -1341,16 +1341,16 @@ class vmmCreate(vmmGObjectUI):
self.widget("install-iso-entry").set_text(path)
self._browse_file(None, cb=set_path, is_media=True)
def _browse_kernel(self, ignore):
self._browse_file("config-kernel")
self._browse_file("kernel")
def _browse_initrd(self, ignore):
self._browse_file("config-initrd")
self._browse_file("initrd")
def _browse_dtb(self, ignore):
self._browse_file("config-dtb")
self._browse_file("dtb")
# Storage page listeners
def _toggle_enable_storage(self, src):
self.widget("config-storage-align").set_sensitive(src.get_active())
self.widget("storage-align").set_sensitive(src.get_active())
# Summary page listeners
@ -1377,9 +1377,9 @@ class vmmCreate(vmmGObjectUI):
show_warn = (show_pxe_warn and pxe_install)
if expand or show_warn:
self.widget("config-advanced-expander").set_expanded(True)
self.widget("config-netdev-warn-box").set_visible(show_warn)
self.widget("config-netdev-warn-label").set_markup(
self.widget("advanced-expander").set_expanded(True)
self.widget("netdev-warn-box").set_visible(show_warn)
self.widget("netdev-warn-label").set_markup(
"<small>%s</small>" % _("Network selection does not support PXE"))
@ -1751,14 +1751,14 @@ class vmmCreate(vmmGObjectUI):
# Setting kernel
if instmethod == INSTALL_PAGE_IMPORT:
kernel = self.widget("config-kernel").get_text() or None
kargs = self.widget("config-kernel-args").get_text() or None
initrd = self.widget("config-initrd").get_text() or None
dtb = self.widget("config-dtb").get_text() or None
kernel = self.widget("kernel").get_text() or None
kargs = self.widget("kernel-args").get_text() or None
initrd = self.widget("initrd").get_text() or None
dtb = self.widget("dtb").get_text() or None
if not self.widget("config-dtb").get_visible():
if not self.widget("dtb").get_visible():
dtb = None
if not self.widget("config-kernel").get_visible():
if not self.widget("kernel").get_visible():
kernel = None
initrd = None
kargs = None
@ -1809,17 +1809,17 @@ class vmmCreate(vmmGObjectUI):
ram_size = DEFAULT_MEM
if res and res.get("ram") > 0:
ram_size = res["ram"] / (1024 ** 2)
self.widget("config-mem").set_value(ram_size)
self.widget("mem").set_value(ram_size)
n_cpus = 1
if res and res.get("n-cpus") > 0:
n_cpus = res["n-cpus"]
self.widget("config-cpus").set_value(n_cpus)
self.widget("cpus").set_value(n_cpus)
storage_size = 20
if res and res.get("storage"):
storage_size = int(res["storage"]) / (1024 ** 3)
self._addstorage.widget("config-storage-size").set_value(storage_size)
self._addstorage.widget("storage-size").set_value(storage_size)
# Validation passed, store the install path (if there is one) in
# gsettings
@ -1828,8 +1828,8 @@ class vmmCreate(vmmGObjectUI):
return True
def _validate_mem_page(self):
cpus = self.widget("config-cpus").get_value()
mem = self.widget("config-mem").get_value()
cpus = self.widget("cpus").get_value()
mem = self.widget("mem").get_value()
# VCPUS
try:

111
virtManager/details.py
View File

@ -416,7 +416,6 @@ class vmmDetails(vmmGObjectUI):
"on_vmm_details_configure_event": self.window_resized,
"on_details_menu_quit_activate": self.exit_app,
"on_hw_list_changed": self.hw_changed,
"on_config_boot_list_changed": self.config_bootdev_selected,
"on_control_vm_details_toggled": self.details_console_changed,
"on_control_vm_console_toggled": self.details_console_changed,
@ -459,12 +458,12 @@ class vmmDetails(vmmGObjectUI):
"on_idmap_uid_count_changed": lambda *x: self.enable_apply(x, EDIT_IDMAP),
"on_idmap_gid_target_changed": lambda *x: self.enable_apply(x, EDIT_IDMAP),
"on_idmap_gid_count_changed": lambda *x: self.enable_apply(x, EDIT_IDMAP),
"on_config_idmap_check_toggled": self.config_idmap_enable,
"on_idmap_check_toggled": self.config_idmap_enable,
"on_config_vcpus_changed": self.config_vcpus_changed,
"on_config_maxvcpus_changed": self.config_maxvcpus_changed,
"on_config_vcpupin_changed": lambda *x: self.enable_apply(x, EDIT_CPUSET),
"on_config_vcpupin_generate_clicked": self.config_vcpupin_generate,
"on_cpu_vcpus_changed": self.config_vcpus_changed,
"on_cpu_maxvcpus_changed": self.config_maxvcpus_changed,
"on_cpu_vcpupin_changed": lambda *x: self.enable_apply(x, EDIT_CPUSET),
"on_cpu_vcpupin_generate_clicked": self.config_vcpupin_generate,
"on_cpu_model_changed": lambda *x: self.config_cpu_model_changed(x),
"on_cpu_copy_host_clicked": self.on_cpu_copy_host_clicked,
"on_cpu_cores_changed": self.config_cpu_topology_changed,
@ -472,13 +471,14 @@ class vmmDetails(vmmGObjectUI):
"on_cpu_threads_changed": self.config_cpu_topology_changed,
"on_cpu_topology_enable_toggled": self.config_cpu_topology_enable,
"on_config_memory_changed": self.config_memory_changed,
"on_config_maxmem_changed": self.config_maxmem_changed,
"on_mem_memory_changed": self.config_memory_changed,
"on_mem_maxmem_changed": self.config_maxmem_changed,
"on_config_boot_moveup_clicked" : lambda *x: self.config_boot_move(x, True),
"on_config_boot_movedown_clicked" : lambda *x: self.config_boot_move(x, False),
"on_config_autostart_changed": lambda *x: self.enable_apply(x, x, EDIT_AUTOSTART),
"on_boot_list_changed": self.config_bootdev_selected,
"on_boot_moveup_clicked" : lambda *x: self.config_boot_move(x, True),
"on_boot_movedown_clicked" : lambda *x: self.config_boot_move(x, False),
"on_boot_autostart_changed": lambda *x: self.enable_apply(x, x, EDIT_AUTOSTART),
"on_boot_menu_changed": lambda *x: self.enable_apply(x, EDIT_BOOTMENU),
"on_boot_kernel_enable_toggled": self.boot_kernel_toggled,
"on_boot_kernel_changed": lambda *x: self.enable_apply(x, EDIT_KERNEL),
@ -491,6 +491,7 @@ class vmmDetails(vmmGObjectUI):
"on_boot_init_path_changed": lambda *x: self.enable_apply(x, EDIT_INIT),
"on_boot_init_args_changed": lambda *x: self.enable_apply(x, EDIT_INIT),
"on_disk_cdrom_connect_clicked": self.toggle_storage_media,
"on_disk_readonly_changed": lambda *x: self.enable_apply(x, EDIT_DISK_RO),
"on_disk_shareable_changed": lambda *x: self.enable_apply(x, EDIT_DISK_SHARE),
"on_disk_removable_changed": lambda *x: self.enable_apply(x, EDIT_DISK_REMOVABLE),
@ -527,7 +528,6 @@ class vmmDetails(vmmGObjectUI):
"on_config_apply_clicked": self.config_apply,
"on_config_cancel_clicked": self.config_cancel,
"on_config_cdrom_connect_clicked": self.toggle_storage_media,
"on_config_remove_clicked": self.remove_xml_dev,
"on_add_hardware_button_clicked": self.add_hardware,
@ -904,8 +904,8 @@ class vmmDetails(vmmGObjectUI):
# VCPU Pinning list
generate_cpuset = self.widget("config-vcpupin-generate")
generate_warn = self.widget("config-vcpupin-generate-err")
generate_cpuset = self.widget("cpu-vcpupin-generate")
generate_warn = self.widget("cpu-vcpupin-generate-err")
if not self.conn.caps.host.topology:
generate_cpuset.set_sensitive(False)
generate_warn.show()
@ -914,7 +914,7 @@ class vmmDetails(vmmGObjectUI):
# Boot device list
boot_list = self.widget("config-boot-list")
boot_list = self.widget("boot-list")
# [XML boot type, display name, icon name, enabled, can select]
boot_list_model = Gtk.ListStore(str, str, str, bool, bool)
boot_list.set_model(boot_list_model)
@ -1074,7 +1074,7 @@ class vmmDetails(vmmGObjectUI):
self.widget("toolbar-box").hide()
def get_boot_selection(self):
return uiutil.get_list_selected_row(self.widget("config-boot-list"))
return uiutil.get_list_selected_row(self.widget("boot-list"))
def set_hw_selection(self, page, disable_apply=True):
if disable_apply:
@ -1519,7 +1519,7 @@ class vmmDetails(vmmGObjectUI):
############################
def get_config_boot_order(self):
boot_model = self.widget("config-boot-list").get_model()
boot_model = self.widget("boot-list").get_model()
devs = []
for row in boot_model:
@ -1599,17 +1599,14 @@ class vmmDetails(vmmGObjectUI):
def config_idmap_enable(self, src):
do_enable = src.get_active()
self.widget("idmap-spin-grid").set_sensitive(do_enable)
self.config_idmap_changed()
def config_idmap_changed(self, ignore=None):
self.enable_apply(EDIT_IDMAP)
# Memory
def config_get_maxmem(self):
return uiutil.spin_get_helper(self.widget("config-maxmem"))
return uiutil.spin_get_helper(self.widget("mem-maxmem"))
def config_get_memory(self):
return uiutil.spin_get_helper(self.widget("config-memory"))
return uiutil.spin_get_helper(self.widget("mem-memory"))
def config_maxmem_changed(self, src_ignore):
self.enable_apply(EDIT_MEM)
@ -1617,7 +1614,7 @@ class vmmDetails(vmmGObjectUI):
def config_memory_changed(self, src_ignore):
self.enable_apply(EDIT_MEM)
maxadj = self.widget("config-maxmem")
maxadj = self.widget("mem-maxmem")
mem = self.config_get_memory()
if maxadj.get_value() < mem:
@ -1633,9 +1630,9 @@ class vmmDetails(vmmGObjectUI):
# VCPUS
def config_get_vcpus(self):
return uiutil.spin_get_helper(self.widget("config-vcpus"))
return uiutil.spin_get_helper(self.widget("cpu-vcpus"))
def config_get_maxvcpus(self):
return uiutil.spin_get_helper(self.widget("config-maxvcpus"))
return uiutil.spin_get_helper(self.widget("cpu-maxvcpus"))
def config_vcpupin_generate(self, ignore):
try:
@ -1644,8 +1641,8 @@ class vmmDetails(vmmGObjectUI):
return self.err.val_err(
_("Error generating CPU configuration"), e)
self.widget("config-vcpupin").set_text("")
self.widget("config-vcpupin").set_text(pinstr)
self.widget("cpu-vcpupin").set_text("")
self.widget("cpu-vcpupin").set_text(pinstr)
def config_vcpus_changed(self, src):
self.enable_apply(EDIT_VCPUS)
@ -1656,9 +1653,9 @@ class vmmDetails(vmmGObjectUI):
# Warn about overcommit
warn = bool(cur > host_active_count)
self.widget("config-vcpus-warn-box").set_visible(warn)
self.widget("cpu-vcpus-warn-box").set_visible(warn)
maxadj = self.widget("config-maxvcpus")
maxadj = self.widget("cpu-maxvcpus")
maxval = self.config_get_maxvcpus()
if maxval < cur:
if maxadj.get_sensitive():
@ -1670,7 +1667,7 @@ class vmmDetails(vmmGObjectUI):
maxadj.set_range(cur, upper)
def config_maxvcpus_changed(self, ignore):
if self.widget("config-maxvcpus").get_sensitive():
if self.widget("cpu-maxvcpus").get_sensitive():
self.config_cpu_topology_changed()
# As this callback can be triggered by other events, set EDIT_MAXVCPUS
@ -1688,30 +1685,30 @@ class vmmDetails(vmmGObjectUI):
cpu_model = self.get_config_cpu_model()
threads = self.widget("cpu-threads").get_value()
warn_ht = _warn_cpu_thread_topo(threads, cpu_model)
self.widget("config-topology-warn-box").set_visible(warn_ht)
self.widget("cpu-topology-warn-box").set_visible(warn_ht)
self.enable_apply(EDIT_CPU)
def config_cpu_topology_changed(self, ignore=None):
manual_top = self.widget("cpu-topology-table").is_sensitive()
self.widget("config-maxvcpus").set_sensitive(not manual_top)
self.widget("cpu-maxvcpus").set_sensitive(not manual_top)
if manual_top:
cores = uiutil.spin_get_helper(self.widget("cpu-cores")) or 1
sockets = uiutil.spin_get_helper(self.widget("cpu-sockets")) or 1
threads = uiutil.spin_get_helper(self.widget("cpu-threads")) or 1
total = cores * sockets * threads
if uiutil.spin_get_helper(self.widget("config-vcpus")) > total:
self.widget("config-vcpus").set_value(total)
self.widget("config-maxvcpus").set_value(total)
if uiutil.spin_get_helper(self.widget("cpu-vcpus")) > total:
self.widget("cpu-vcpus").set_value(total)
self.widget("cpu-maxvcpus").set_value(total)
# Warn about hyper-threading setting
cpu_model = self.get_config_cpu_model()
warn_ht = _warn_cpu_thread_topo(threads, cpu_model)
self.widget("config-topology-warn-box").set_visible(warn_ht)
self.widget("cpu-topology-warn-box").set_visible(warn_ht)
else:
maxvcpus = uiutil.spin_get_helper(self.widget("config-maxvcpus"))
maxvcpus = uiutil.spin_get_helper(self.widget("cpu-maxvcpus"))
self.widget("cpu-sockets").set_value(maxvcpus or 1)
self.widget("cpu-cores").set_value(1)
self.widget("cpu-threads").set_value(1)
@ -1728,8 +1725,8 @@ class vmmDetails(vmmGObjectUI):
boot_row = self.get_boot_selection()
boot_selection = boot_row and boot_row[BOOT_KEY]
boot_devs = self.get_config_boot_order()
up_widget = self.widget("config-boot-moveup")
down_widget = self.widget("config-boot-movedown")
up_widget = self.widget("boot-moveup")
down_widget = self.widget("boot-movedown")
down_widget.set_sensitive(bool(boot_devs and
boot_selection and
@ -1740,7 +1737,7 @@ class vmmDetails(vmmGObjectUI):
boot_selection != boot_devs[0]))
def config_boot_toggled(self, ignore, index):
model = self.widget("config-boot-list").get_model()
model = self.widget("boot-list").get_model()
row = model[index]
row[BOOT_ACTIVE] = not row[BOOT_ACTIVE]
@ -1765,7 +1762,7 @@ class vmmDetails(vmmGObjectUI):
# Somehow we went out of bounds
return
boot_list = self.widget("config-boot-list")
boot_list = self.widget("boot-list")
model = boot_list.get_model()
prev_row = None
for row in model:
@ -1931,7 +1928,7 @@ class vmmDetails(vmmGObjectUI):
hotplug_args["description"] = kwargs["description"]
if self.edited(EDIT_IDMAP):
enable_idmap = self.widget("config-idmap-checkbutton").get_active()
enable_idmap = self.widget("idmap-checkbutton").get_active()
if enable_idmap:
uid_target = self.widget("uid-target").get_text().strip()
uid_count = self.widget("uid-count").get_text().strip()
@ -1968,7 +1965,7 @@ class vmmDetails(vmmGObjectUI):
kwargs["maxvcpus"] = self.config_get_maxvcpus()
if self.edited(EDIT_CPUSET):
kwargs["cpuset"] = self.get_text("config-vcpupin")
kwargs["cpuset"] = self.get_text("cpu-vcpupin")
if self.edited(EDIT_CPU):
kwargs["model"] = self.get_config_cpu_model()
@ -1994,7 +1991,7 @@ class vmmDetails(vmmGObjectUI):
if self.edited(EDIT_MEM):
curmem = None
maxmem = self.config_get_maxmem()
if self.widget("config-memory").get_sensitive():
if self.widget("mem-memory").get_sensitive():
curmem = self.config_get_memory()
if curmem:
@ -2015,7 +2012,7 @@ class vmmDetails(vmmGObjectUI):
kwargs = {}
if self.edited(EDIT_AUTOSTART):
auto = self.widget("config-autostart")
auto = self.widget("boot-autostart")
try:
self.vm.set_autostart(auto.get_active())
except Exception, e:
@ -2366,7 +2363,7 @@ class vmmDetails(vmmGObjectUI):
# User namespace idmap setting
is_container = self.vm.is_container()
self.widget("config-idmap-expander").set_visible(is_container)
self.widget("idmap-expander").set_visible(is_container)
self.widget("uid-target").set_text('1000')
self.widget("uid-count").set_text('10')
@ -2376,7 +2373,7 @@ class vmmDetails(vmmGObjectUI):
IdMap = self.vm.get_idmap()
show_config = IdMap.uid_start is not None
self.widget("config-idmap-checkbutton").set_active(show_config)
self.widget("idmap-checkbutton").set_active(show_config)
self.widget("idmap-spin-grid").set_sensitive(show_config)
if show_config:
Name = ["uid-target", "uid-count", "gid-target", "gid-count"]
@ -2488,8 +2485,8 @@ class vmmDetails(vmmGObjectUI):
maxvcpus = self.vm.vcpu_max_count()
curvcpus = self.vm.vcpu_count()
curadj = self.widget("config-vcpus")
maxadj = self.widget("config-maxvcpus")
curadj = self.widget("cpu-vcpus")
maxadj = self.widget("cpu-maxvcpus")
curadj.set_value(int(curvcpus))
maxadj.set_value(int(maxvcpus))
@ -2497,7 +2494,7 @@ class vmmDetails(vmmGObjectUI):
# Warn about overcommit
warn = bool(self.config_get_vcpus() > host_active_count)
self.widget("config-vcpus-warn-box").set_visible(warn)
self.widget("cpu-vcpus-warn-box").set_visible(warn)
# CPU model config
sockets = cpu.sockets or 1
@ -2525,7 +2522,7 @@ class vmmDetails(vmmGObjectUI):
# Warn about hyper-threading setting
cpu_model = self.get_config_cpu_model()
warn_ht = _warn_cpu_thread_topo(threads, cpu_model)
self.widget("config-topology-warn-box").set_visible(warn_ht)
self.widget("cpu-topology-warn-box").set_visible(warn_ht)
is_host = (cpu.mode == "host-model")
self.widget("cpu-copy-host").set_active(bool(is_host))
@ -2539,12 +2536,12 @@ class vmmDetails(vmmGObjectUI):
host_mem_widget.set_text("%d MiB" % (int(round(host_mem))))
curmem = self.widget("config-memory")
maxmem = self.widget("config-maxmem")
curmem = self.widget("mem-memory")
maxmem = self.widget("mem-maxmem")
curmem.set_value(int(round(vm_cur_mem)))
maxmem.set_value(int(round(vm_max_mem)))
if not self.widget("config-memory").get_sensitive():
if not self.widget("mem-memory").get_sensitive():
ignore, upper = maxmem.get_range()
maxmem.set_range(curmem.get_value(), upper)
@ -2627,7 +2624,7 @@ class vmmDetails(vmmGObjectUI):
uiutil.set_list_selection(self.widget("disk-bus"), bus)
self.widget("disk-serial").set_text(serial or "")
button = self.widget("config-cdrom-connect")
button = self.widget("disk-cdrom-connect")
if is_cdrom or is_floppy:
if not path:
# source device not connected
@ -2986,7 +2983,7 @@ class vmmDetails(vmmGObjectUI):
autoval = None
# Autostart
autostart_chk = self.widget("config-autostart")
autostart_chk = self.widget("boot-autostart")
enable_autostart = (autoval is not None)
autostart_chk.set_sensitive(enable_autostart)
autostart_chk.set_active(enable_autostart and autoval or False)
@ -3193,7 +3190,7 @@ class vmmDetails(vmmGObjectUI):
return ret
def repopulate_boot_order(self):
boot_list = self.widget("config-boot-list")
boot_list = self.widget("boot-list")
boot_model = boot_list.get_model()
boot_model.clear()
boot_rows = self._make_boot_rows()