[virt-tools-list] [virt-manager PATCHv2 10/13] Convert GtkTable to GtkGrid
Radostin Stoyanov
rstoyanov1 at gmail.com
Wed May 31 13:08:40 UTC 2017
GtkTable was deprecated since Gtk version 3.4 and should not be used
in newly-written code. It should be replaced by GtkGrid.
https://developer.gnome.org/gtk3/stable/GtkTable.html
https://developer.gnome.org/gtk3/stable/GtkGrid.html
GtkTable is mapped to GtkGrid following these rules:
----------------
- n_(row|columns) are removed because they are not required for
GtkGrid
----------------
- Missing "left_attach" and "top_attach" are added with value set to
0.
Example:
<property name="left_attach">0</property>
<property name="top_attach">0</property>
----------------
- (right_attach - left_attach) > 1 is stored in new "width" property
Example:
In case of: (GtkTable)
<property name="left_attach">1</property>
<property name="right_attach">4</property>
Equivalent to: (GtkGrid)
<property name="width">3</property>
----------------
- (bottom_attach - top_attach) > 1 is stored in new "height" property
Example:
In case of: (GtkTable)
<property name="top_attach">1</property>
<property name="bottom_attach">3</property>
Equivalent to: (GtkGrid)
<property name="height">2</property>
----------------
- Missing packing "(x|y)_options" property is represented as no
"(h|v)align" object property and "(h|v)expand" object property
set to "true"
Example:
In case of: (GtkTable)
# Missing y_options property
Equivalent to: (GtkGrid)
<property name="vexpand">True</property>
# No valign property
----------------
- Packing "(x|y)_options" property set to "GTK_FILL" is represented
as no "(h|v)expand" object property and no "(h|v)align" object
property
Example:
In case of: (GtkTable)
<property name="x_options">GTK_FILL</property>
Equivalent to: (GtkGrid)
# No hexpand property
# No halign property
----------------
- Packing "(x|y)_options" property set to "GTK_EXPAND" is
represented as "(h|v)expand" object property set to "true" and
"(h|v)align" object property set to "center"
Example:
In case of: (GtkTable)
<property name="x_options">GTK_EXPAND</property>
Equivalent to: (GtkGrid)
<property name="hexpand">True</property>
<property name="halign">center</property>
----------------
- Packing "(x|y)_options" property set to nothing is represented as
"(h|v)align" object property set to "center"
Example:
In case of: (GtkTable)
<property name="y_options" />
Equivalent to: (GtkGrid)
<property name="valign">center</property>
----------------
- All "(x|y)_options" rules apply but don't change existing
"(h|v)align" and "(h|v)expand" object properties
----------------
- Packing "x_padding" property is converted to "margin_(start|end)"
object property
Example:
In case of: (GtkTable)
<property name="x_padding">6</property>
Equivalent to: (GtkGrid)
<property name="margin_start">6</property>
<property name="margin_end">6</property>
----------------
- Packing "y_padding" property is converted to "margin_(top|bottom)"
object property
Example:
In case of: (GtkTable)
<property name="y_padding">6</property>
Equivalent to: (GtkGrid)
<property name="margin_top">6</property>
<property name="margin_bottom">6</property>
---
ui/addhardware.ui | 91 ++++++++++---------------
ui/choosecd.ui | 34 +++-------
ui/clone.ui | 146 +++++++++++++++-------------------------
ui/create.ui | 135 ++++++++++++++++---------------------
ui/createinterface.ui | 180 +++++++++++++++-----------------------------------
ui/createnet.ui | 11 +--
ui/details.ui | 175 ++++++++++++++++++------------------------------
ui/host.ui | 93 +++++++++-----------------
ui/netlist.ui | 56 ++++++----------
9 files changed, 332 insertions(+), 589 deletions(-)
diff --git a/ui/addhardware.ui b/ui/addhardware.ui
index 2cf387e..f41f652 100644
--- a/ui/addhardware.ui
+++ b/ui/addhardware.ui
@@ -554,24 +554,23 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="table33">
+ <object class="GtkGrid" id="table33">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="label395">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="halign">end</property>
+ <property name="valign">center</property>
<property name="label" translatable="yes">_Type:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">input-type</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -581,9 +580,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
@@ -626,12 +623,11 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="table2">
+ <object class="GtkGrid" id="table2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkComboBox" id="sound-model">
<property name="visible">True</property>
@@ -639,9 +635,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -649,13 +643,14 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
+ <property name="valign">center</property>
<property name="label" translatable="yes">_Model:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">sound-model</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
@@ -675,12 +670,11 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="table3">
+ <object class="GtkGrid" id="table3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="label20">
<property name="visible">True</property>
@@ -693,8 +687,8 @@
<property name="mnemonic_widget">host-device</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -702,6 +696,8 @@
<property name="width_request">500</property>
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="shadow_type">etched-in</property>
<child>
<object class="GtkTreeView" id="host-device">
@@ -715,8 +711,8 @@
</child>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
</object>
@@ -1094,12 +1090,11 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="table5">
+ <object class="GtkGrid" id="table5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkComboBox" id="video-model">
<property name="visible">True</property>
@@ -1107,9 +1102,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -1122,8 +1115,8 @@
<property name="mnemonic_widget">video-model</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
@@ -1143,13 +1136,11 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="table6">
+ <object class="GtkGrid" id="table6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkComboBox" id="watchdog-model">
<property name="visible">True</property>
@@ -1157,9 +1148,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -1172,8 +1161,8 @@
<property name="mnemonic_widget">watchdog-model</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -1185,10 +1174,8 @@
<property name="mnemonic_widget">watchdog-action</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -1198,11 +1185,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
</object>
@@ -1246,12 +1229,11 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="table10">
+ <object class="GtkGrid" id="table10">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkComboBox" id="smartcard-mode">
<property name="visible">True</property>
@@ -1259,9 +1241,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -1269,13 +1249,14 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
+ <property name="valign">center</property>
<property name="label" translatable="yes">_Mode:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">smartcard-mode</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
diff --git a/ui/choosecd.ui b/ui/choosecd.ui
index 79c1b28..f5d0e6f 100644
--- a/ui/choosecd.ui
+++ b/ui/choosecd.ui
@@ -76,17 +76,16 @@
<property name="top_padding">6</property>
<property name="left_padding">10</property>
<child>
- <object class="GtkTable" id="table1">
+ <object class="GtkGrid" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">4</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkBox" id="hbox1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkEntry" id="iso-path">
@@ -118,10 +117,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -136,11 +132,9 @@
<signal name="toggled" handler="on_media_toggled" swapped="no"/>
</object>
<packing>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
@@ -163,9 +157,9 @@
</child>
</object>
<packing>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
@@ -185,10 +179,8 @@
</child>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -207,10 +199,8 @@
</child>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -225,11 +215,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
</object>
diff --git a/ui/clone.ui b/ui/clone.ui
index ad08597..c7e6a78 100644
--- a/ui/clone.ui
+++ b/ui/clone.ui
@@ -164,17 +164,16 @@
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkTable" id="table1">
+ <object class="GtkGrid" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">12</property>
<property name="row_spacing">10</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkBox" id="vbox6">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="clone-no-net">
@@ -208,10 +207,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -224,16 +220,16 @@
<property name="use_markup">True</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkBox" id="vbox77">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkLabel" id="clone-no-storage-pass">
@@ -338,9 +334,7 @@
</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>
<child>
@@ -349,13 +343,13 @@
<property name="can_focus">False</property>
<property name="halign">end</property>
<property name="valign">start</property>
+ <property name="vexpand">True</property>
<property name="label" translatable="yes"><span color='#484848'>Storage:</span></property>
<property name="use_markup">True</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -363,27 +357,29 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
+ <property name="valign">center</property>
<property name="label" translatable="yes"><span color='#484848'>_Name:</span></property>
<property name="use_markup">True</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">clone-new-name</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="clone-new-name">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="margin_top">3</property>
+ <property name="margin_bottom">3</property>
<property name="invisible_char">●</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"/>
- <property name="y_padding">3</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
@@ -634,13 +630,11 @@ like change passwords or static IPs, please see the virt-sysprep(1) tool.</sp
<property name="can_focus">False</property>
<property name="spacing">12</property>
<child>
- <object class="GtkTable" id="table6">
+ <object class="GtkGrid" id="table6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">3</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkAlignment" id="alignment9">
<property name="visible">True</property>
@@ -657,15 +651,14 @@ like change passwords or static IPs, please see the virt-sysprep(1) tool.</sp
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="alignment8">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="left_padding">2</property>
<child>
<object class="GtkLabel" id="change-mac-orig">
@@ -679,23 +672,18 @@ like change passwords or static IPs, please see the virt-sysprep(1) tool.</sp
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="change-mac-new">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -708,11 +696,9 @@ like change passwords or static IPs, please see the virt-sysprep(1) tool.</sp
<property name="mnemonic_widget">change-mac-new</property>
</object>
<packing>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
@@ -731,9 +717,9 @@ like change passwords or static IPs, please see the virt-sysprep(1) tool.</sp
</child>
</object>
<packing>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="height">2</property>
</packing>
</child>
<child>
@@ -741,14 +727,13 @@ like change passwords or static IPs, please see the virt-sysprep(1) tool.</sp
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
+ <property name="valign">center</property>
<property name="label" translatable="yes"><span color='#484848'>Type:</span></property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -756,16 +741,13 @@ like change passwords or static IPs, please see the virt-sysprep(1) tool.</sp
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
+ <property name="valign">center</property>
<property name="label" translatable="yes"><span color='#484848'>MAC:</span></property>
<property name="use_markup">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
</packing>
</child>
</object>
@@ -863,13 +845,11 @@ like change passwords or static IPs, please see the virt-sysprep(1) tool.</sp
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
- <object class="GtkTable" id="table4">
+ <object class="GtkGrid" id="table4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkAlignment" id="alignment6">
<property name="visible">True</property>
@@ -886,20 +866,18 @@ like change passwords or static IPs, please see the virt-sysprep(1) tool.</sp
</child>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
- <object class="GtkTable" id="table5">
+ <object class="GtkGrid" id="table5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">12</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="change-storage-size">
<property name="visible">True</property>
@@ -909,10 +887,7 @@ like change passwords or static IPs, please see the virt-sysprep(1) tool.</sp
</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>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -924,10 +899,7 @@ like change passwords or static IPs, please see the virt-sysprep(1) tool.</sp
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -942,8 +914,7 @@ like change passwords or static IPs, please see the virt-sysprep(1) tool.</sp
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -956,10 +927,8 @@ like change passwords or static IPs, please see the virt-sysprep(1) tool.</sp
<property name="use_markup">True</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -971,10 +940,8 @@ like change passwords or static IPs, please see the virt-sysprep(1) tool.</sp
<property name="use_markup">True</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -982,21 +949,19 @@ like change passwords or static IPs, please see the virt-sysprep(1) tool.</sp
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
+ <property name="valign">center</property>
<property name="label" translatable="yes"><span color='#484848'>Path:</span></property>
<property name="use_markup">True</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -1007,8 +972,9 @@ like change passwords or static IPs, please see the virt-sysprep(1) tool.</sp
<property name="label" translatable="yes">Existing disk</property>
</object>
<packing>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
</packing>
</child>
</object>
@@ -1019,14 +985,12 @@ like change passwords or static IPs, please see the virt-sysprep(1) tool.</sp
</packing>
</child>
<child>
- <object class="GtkTable" id="table3">
+ <object class="GtkGrid" id="table3">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">6</property>
- <property name="n_rows">2</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkAlignment" id="alignment5">
<property name="visible">True</property>
@@ -1045,10 +1009,8 @@ like change passwords or static IPs, please see the virt-sysprep(1) tool.</sp
</child>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -1057,27 +1019,27 @@ like change passwords or static IPs, please see the virt-sysprep(1) tool.</sp
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="halign">center</property>
<property name="use_underline">True</property>
<property name="draw_indicator">True</property>
<signal name="toggled" handler="on_change_storage_doclone_toggled" swapped="no"/>
</object>
<packing>
- <property name="right_attach">3</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">3</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="change-storage-new">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="halign">center</property>
<property name="width_chars">25</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -1091,11 +1053,7 @@ like change passwords or static IPs, please see the virt-sysprep(1) tool.</sp
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
</object>
diff --git a/ui/create.ui b/ui/create.ui
index f1c27cd..d457abd 100644
--- a/ui/create.ui
+++ b/ui/create.ui
@@ -432,13 +432,12 @@
</packing>
</child>
<child>
- <object class="GtkTable" id="table5">
+ <object class="GtkGrid" id="table5">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="vexpand">False</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">4</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="label77">
<property name="visible">True</property>
@@ -449,14 +448,15 @@
<property name="mnemonic_widget">create-conn</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="hbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">center</property>
<child>
<object class="GtkComboBox" id="create-conn">
<property name="width_request">200</property>
@@ -489,8 +489,8 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
</packing>
</child>
</object>
@@ -972,17 +972,16 @@ bar</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkTable" id="table2">
+ <object class="GtkGrid" id="table2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">4</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkAlignment" id="alignment17">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
<property name="left_padding">15</property>
<child>
<object class="GtkLabel" id="label24">
@@ -996,14 +995,16 @@ bar</property>
</child>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkAlignment" id="alignment16">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="left_padding">13</property>
<child>
<object class="GtkExpander" id="install-url-options">
@@ -1014,12 +1015,11 @@ bar</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<child>
- <object class="GtkTable" id="table7">
+ <object class="GtkGrid" id="table7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">4</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="label26">
<property name="visible">True</property>
@@ -1030,20 +1030,21 @@ bar</property>
<property name="mnemonic_widget">install-urlopts-entry</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="install-urlopts-entry">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
<property name="invisible_char">•</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"/>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
@@ -1062,15 +1063,17 @@ bar</property>
</child>
</object>
<packing>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="install-url-combo">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
<property name="has_entry">True</property>
<child internal-child="entry">
<object class="GtkEntry" id="install-url-entry">
@@ -1082,8 +1085,7 @@ bar</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"/>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
@@ -1844,18 +1846,17 @@ is not yet supported.</small></property>
<property name="can_focus">False</property>
<property name="left_padding">15</property>
<child>
- <object class="GtkTable" id="table1">
+ <object class="GtkGrid" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">4</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="install-os-version-label">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
+ <property name="valign">center</property>
<property name="label">-</property>
<child internal-child="accessible">
<object class="AtkObject" id="install-os-version-label-atkobject">
@@ -1865,10 +1866,7 @@ is not yet supported.</small></property>
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -1876,6 +1874,7 @@ is not yet supported.</small></property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
+ <property name="valign">center</property>
<property name="label">-</property>
<child internal-child="accessible">
<object class="AtkObject" id="install-os-type-label-atkobject">
@@ -1885,15 +1884,14 @@ is not yet supported.</small></property>
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="install-os-type">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
<signal name="changed" handler="on_install_os_type_changed" swapped="no"/>
<child internal-child="accessible">
<object class="AtkObject" id="install-os-type-atkobject">
@@ -1903,9 +1901,7 @@ is not yet supported.</small></property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -1913,15 +1909,14 @@ is not yet supported.</small></property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
+ <property name="valign">center</property>
<property name="label" translatable="yes">_Version:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">install-os-version</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -1929,19 +1924,21 @@ is not yet supported.</small></property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
+ <property name="valign">center</property>
<property name="label" translatable="yes">OS _type:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">install-os-type</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkComboBox" id="install-os-version">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
<property name="has_entry">True</property>
<signal name="changed" handler="on_install_os_version_changed" swapped="no"/>
<child internal-child="entry">
@@ -1962,11 +1959,7 @@ is not yet supported.</small></property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
</packing>
</child>
</object>
@@ -2037,13 +2030,11 @@ is not yet supported.</small></property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table3">
+ <object class="GtkGrid" id="table3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">4</property>
- <property name="n_columns">3</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">4</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="label27">
<property name="visible">True</property>
@@ -2054,10 +2045,8 @@ is not yet supported.</small></property>
<property name="mnemonic_widget">cpus</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -2070,8 +2059,8 @@ is not yet supported.</small></property>
<property name="mnemonic_widget">mem</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -2084,9 +2073,7 @@ is not yet supported.</small></property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -2099,11 +2086,7 @@ is not yet supported.</small></property>
</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>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -2111,51 +2094,46 @@ is not yet supported.</small></property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
+ <property name="hexpand">True</property>
<property name="label">Insert Phys cpu count</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label1">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">center</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options"/>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="halign">center</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"/>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkLabel" id="label13">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="vexpand">True</property>
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -2163,12 +2141,12 @@ is not yet supported.</small></property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
+ <property name="hexpand">True</property>
<property name="label" translatable="yes">MiB</property>
</object>
<packing>
<property name="left_attach">2</property>
- <property name="right_attach">3</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -2181,6 +2159,7 @@ is not yet supported.</small></property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
+ <property name="hexpand">True</property>
<property name="label" translatable="yes">(Insert host mem)</property>
</object>
<packing>
@@ -2192,10 +2171,8 @@ is not yet supported.</small></property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">3</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="width">2</property>
</packing>
</child>
</object>
diff --git a/ui/createinterface.ui b/ui/createinterface.ui
index 48c7a98..2601d33 100644
--- a/ui/createinterface.ui
+++ b/ui/createinterface.ui
@@ -70,13 +70,11 @@
<property name="top_padding">3</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkTable" id="table2">
+ <object class="GtkGrid" id="table2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="label9">
<property name="visible">True</property>
@@ -87,8 +85,8 @@
<property name="mnemonic_widget">bridge-delay</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -101,10 +99,8 @@
<property name="mnemonic_widget">bridge-stp</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -116,11 +112,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -158,9 +150,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
@@ -272,13 +262,11 @@
<property name="orientation">vertical</property>
<property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table4">
+ <object class="GtkGrid" id="table4">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="label22">
<property name="visible">True</property>
@@ -287,10 +275,8 @@
<property name="label" translatable="yes">Bond monitor mode:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -300,9 +286,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -313,11 +297,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -328,8 +308,8 @@
<property name="label" translatable="yes">Bond mode:</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
@@ -356,13 +336,11 @@
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkTable" id="table3">
+ <object class="GtkGrid" id="table3">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="label18">
<property name="visible">True</property>
@@ -371,10 +349,8 @@
<property name="label" translatable="yes">Target address:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -385,8 +361,8 @@
<property name="label" translatable="yes">Interval:</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -423,29 +399,26 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="arp-target">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
<property name="invisible_char">●</property>
</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>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkBox" id="hbox8">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<child>
<object class="GtkComboBox" id="arp-validate">
<property name="visible">True</property>
@@ -463,10 +436,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -477,10 +447,8 @@
<property name="label" translatable="yes">Validate mode:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
</object>
@@ -519,13 +487,11 @@
<property name="can_focus">False</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkTable" id="table5">
+ <object class="GtkGrid" id="table5">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">4</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="label23">
<property name="visible">True</property>
@@ -534,8 +500,8 @@
<property name="label" translatable="yes">Frequency:</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -546,10 +512,8 @@
<property name="label" translatable="yes">Up delay:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -560,10 +524,8 @@
<property name="label" translatable="yes">Down delay:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -574,16 +536,15 @@
<property name="label" translatable="yes">Carrier type:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkBox" id="hbox5">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="spacing">3</property>
<child>
<object class="GtkSpinButton" id="mii-frequency">
@@ -614,14 +575,14 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="hbox9">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="spacing">3</property>
<child>
<object class="GtkSpinButton" id="mii-updelay">
@@ -652,16 +613,14 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkBox" id="hbox10">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="spacing">3</property>
<child>
<object class="GtkSpinButton" id="mii-downdelay">
@@ -692,16 +651,14 @@
</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>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkBox" id="hbox11">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<child>
<object class="GtkComboBox" id="mii-carrier">
<property name="visible">True</property>
@@ -719,10 +676,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
</object>
@@ -995,13 +949,11 @@
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
- <object class="GtkTable" id="table1">
+ <object class="GtkGrid" id="table1">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">5</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">12</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="label14">
<property name="visible">True</property>
@@ -1012,14 +964,15 @@
<property name="mnemonic_widget">interface-name-entry</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="hbox3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<child>
<object class="GtkEntry" id="interface-name-entry">
<property name="visible">True</property>
@@ -1048,8 +1001,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -1062,16 +1014,15 @@
<property name="mnemonic_widget">interface-startmode</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkBox" id="hbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkComboBox" id="interface-startmode">
@@ -1090,10 +1041,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -1106,10 +1054,8 @@
<property name="mnemonic_widget">interface-activate</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -1117,14 +1063,12 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="receives_default">False</property>
+ <property name="hexpand">True</property>
<property name="draw_indicator">True</property>
</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>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -1175,16 +1119,15 @@
</child>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkBox" id="vbox9">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="orientation">vertical</property>
<child>
<object class="GtkBox" id="vlan-box">
@@ -1297,10 +1240,7 @@
</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>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -1311,16 +1251,15 @@
<property name="label" translatable="yes">IP settings:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkBox" id="ip-box">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="hexpand">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkLabel" id="ip-config-label">
@@ -1353,10 +1292,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
</object>
@@ -1752,13 +1688,11 @@
<property name="can_focus">False</property>
<property name="left_padding">6</property>
<child>
- <object class="GtkTable" id="table6">
+ <object class="GtkGrid" id="table6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="label41">
<property name="visible">True</property>
@@ -1769,8 +1703,8 @@
<property name="mnemonic_widget">ipv4-address</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -1783,36 +1717,32 @@
<property name="mnemonic_widget">ipv4-gateway</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="ipv4-address">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
<property name="invisible_char">●</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="ipv4-gateway">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
<property name="invisible_char">●</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
</object>
diff --git a/ui/createnet.ui b/ui/createnet.ui
index fd55812..843e257 100644
--- a/ui/createnet.ui
+++ b/ui/createnet.ui
@@ -1286,22 +1286,24 @@
<property name="can_focus">False</property>
<property name="left_padding">25</property>
<child>
- <object class="GtkTable" id="net-forward-hostdev-table">
+ <object class="GtkGrid" id="net-forward-hostdev-table">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">4</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="label393">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
+ <property name="vexpand">True</property>
<property name="label" translatable="yes">Device _List:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">net-forward</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -1309,10 +1311,11 @@
<property name="width_request">200</property>
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="vexpand">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="x_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
diff --git a/ui/details.ui b/ui/details.ui
index 8a3f616..dce332c 100644
--- a/ui/details.ui
+++ b/ui/details.ui
@@ -2010,27 +2010,24 @@ if you know what you are doing.</small></property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table30">
+ <object class="GtkGrid" id="table30">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">12</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="state-host-cpus">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
+ <property name="valign">center</property>
<property name="label">8</property>
<property name="selectable">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -2038,11 +2035,12 @@ if you know what you are doing.</small></property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
+ <property name="valign">center</property>
<property name="label" translatable="yes">Logical host CPUs:</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -2050,15 +2048,14 @@ if you know what you are doing.</small></property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
+ <property name="valign">center</property>
<property name="label" translatable="yes">Ma_ximum allocation:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">cpu-maxvcpus</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -2066,15 +2063,14 @@ if you know what you are doing.</small></property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
+ <property name="valign">center</property>
<property name="label" translatable="yes">Current a_llocation:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">cpu-vcpus</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -2087,17 +2083,14 @@ if you know what you are doing.</small></property>
</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>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkSpinButton" id="cpu-vcpus">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="valign">center</property>
<property name="invisible_char">●</property>
<property name="adjustment">adjustment7</property>
<property name="climb_rate">1</property>
@@ -2112,11 +2105,7 @@ if you know what you are doing.</small></property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
</packing>
</child>
</object>
@@ -2320,13 +2309,11 @@ if you know what you are doing.</small></property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <object class="GtkTable" id="cpu-topology-table">
+ <object class="GtkGrid" id="cpu-topology-table">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">12</property>
<property name="row_spacing">4</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="label59">
<property name="visible">True</property>
@@ -2337,10 +2324,8 @@ if you know what you are doing.</small></property>
<property name="mnemonic_widget">cpu-threads</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -2353,10 +2338,8 @@ if you know what you are doing.</small></property>
<property name="mnemonic_widget">cpu-cores</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -2369,8 +2352,8 @@ if you know what you are doing.</small></property>
<property name="mnemonic_widget">cpu-sockets</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -2385,7 +2368,7 @@ if you know what you are doing.</small></property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -2394,15 +2377,14 @@ if you know what you are doing.</small></property>
<property name="can_focus">True</property>
<property name="halign">start</property>
<property name="hexpand">False</property>
+ <property name="vexpand">True</property>
<property name="invisible_char">●</property>
<property name="adjustment">adjustment4</property>
<signal name="changed" handler="on_cpu_cores_changed" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
</packing>
</child>
<child>
@@ -2410,15 +2392,15 @@ if you know what you are doing.</small></property>
<property name="visible">True</property>
<property name="can_focus">True</property>
<property name="halign">start</property>
+ <property name="hexpand">True</property>
+ <property name="vexpand">True</property>
<property name="invisible_char">●</property>
<property name="adjustment">adjustment5</property>
<signal name="changed" handler="on_cpu_threads_changed" swapped="no"/>
</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>
@@ -2535,28 +2517,25 @@ if you know what you are doing.</small></property>
<property name="top_padding">3</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkTable" id="table6">
+ <object class="GtkGrid" id="table6">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
- <property name="n_rows">3</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="label60">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
+ <property name="valign">center</property>
<property name="label" translatable="yes">Current a_llocation:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">mem-memory</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -2564,15 +2543,14 @@ if you know what you are doing.</small></property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
+ <property name="valign">center</property>
<property name="label" translatable="yes">Ma_ximum allocation:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">mem-maxmem</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -2580,11 +2558,12 @@ if you know what you are doing.</small></property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
+ <property name="valign">center</property>
<property name="label" translatable="yes">Total host memory:</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -2592,20 +2571,21 @@ if you know what you are doing.</small></property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
+ <property name="valign">center</property>
<property name="label">2 GiB</property>
<property name="selectable">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkBox" id="hbox46">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
<property name="spacing">3</property>
<child>
<object class="GtkSpinButton" id="mem-memory">
@@ -2645,16 +2625,14 @@ if you know what you are doing.</small></property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkBox" id="hbox47">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
<property name="spacing">3</property>
<child>
<object class="GtkSpinButton" id="mem-maxmem">
@@ -2694,11 +2672,7 @@ if you know what you are doing.</small></property>
</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>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
</packing>
</child>
</object>
@@ -2910,11 +2884,9 @@ if you know what you are doing.</small></property>
<property name="can_focus">False</property>
<property name="spacing">6</property>
<child>
- <object class="GtkTable" id="table13">
+ <object class="GtkGrid" id="table13">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">4</property>
- <property name="n_columns">2</property>
<property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="label38">
@@ -2928,8 +2900,8 @@ if you know what you are doing.</small></property>
<property name="mnemonic_widget">boot-kernel</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -2944,16 +2916,16 @@ if you know what you are doing.</small></property>
<property name="mnemonic_widget">boot-initrd</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkBox" id="box3">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkEntry" id="boot-initrd">
@@ -2985,16 +2957,15 @@ if you know what you are doing.</small></property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkBox" id="box4">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkEntry" id="boot-kernel">
@@ -3026,8 +2997,7 @@ if you know what you are doing.</small></property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"/>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -3042,26 +3012,22 @@ if you know what you are doing.</small></property>
<property name="mnemonic_widget">boot-kernel-args</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="boot-kernel-args">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="hexpand">True</property>
<property name="invisible_char">●</property>
<property name="width_chars">40</property>
<signal name="changed" handler="on_boot_kernel_args_changed" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -3076,16 +3042,16 @@ if you know what you are doing.</small></property>
<property name="mnemonic_widget">boot-dtb</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkBox" id="boot-dtb-box">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
<property name="spacing">6</property>
<child>
<object class="GtkEntry" id="boot-dtb">
@@ -3117,10 +3083,7 @@ if you know what you are doing.</small></property>
</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>
- <property name="y_options"/>
</packing>
</child>
</object>
@@ -4282,25 +4245,25 @@ if you know what you are doing.</small></property>
<property name="top_padding">3</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkTable" id="table36">
+ <object class="GtkGrid" id="table36">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="border_width">3</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">8</property>
<property name="row_spacing">4</property>
+ <property name="column_spacing">8</property>
<child>
<object class="GtkLabel" id="label452">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
+ <property name="valign">center</property>
<property name="label" translatable="yes">Device m_odel:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">combobox-entry12</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -4317,9 +4280,7 @@ if you know what you are doing.</small></property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
@@ -4853,27 +4814,24 @@ if you know what you are doing.</small></property>
<property name="top_padding">3</property>
<property name="left_padding">12</property>
<child>
- <object class="GtkTable" id="table8">
+ <object class="GtkGrid" id="table8">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">8</property>
<property name="row_spacing">4</property>
+ <property name="column_spacing">8</property>
<child>
<object class="GtkLabel" id="label27">
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
+ <property name="valign">center</property>
<property name="label" translatable="yes">Ac_tion:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">combobox-entry14</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -4881,13 +4839,14 @@ if you know what you are doing.</small></property>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
+ <property name="valign">center</property>
<property name="label" translatable="yes">M_odel:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">combobox-entry15</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -4904,11 +4863,7 @@ if you know what you are doing.</small></property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -4925,9 +4880,7 @@ if you know what you are doing.</small></property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
diff --git a/ui/host.ui b/ui/host.ui
index bb4651b..d255804 100644
--- a/ui/host.ui
+++ b/ui/host.ui
@@ -1397,13 +1397,11 @@
<property name="orientation">vertical</property>
<property name="spacing">12</property>
<child>
- <object class="GtkTable" id="table2">
+ <object class="GtkGrid" id="table2">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">5</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">12</property>
<property name="row_spacing">6</property>
+ <property name="column_spacing">12</property>
<child>
<object class="GtkLabel" id="interface-name">
<property name="visible">True</property>
@@ -1413,9 +1411,9 @@
<property name="use_markup">True</property>
</object>
<packing>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
+ <property name="width">2</property>
</packing>
</child>
<child>
@@ -1427,10 +1425,8 @@
<property name="label" translatable="yes">MAC:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -1444,10 +1440,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -1455,19 +1448,20 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
+ <property name="valign">center</property>
<property name="label" translatable="yes">State:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkBox" id="hbox4">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="vexpand">True</property>
<property name="spacing">3</property>
<child>
<object class="GtkImage" id="interface-state-icon">
@@ -1497,10 +1491,7 @@
</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>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -1511,16 +1502,16 @@
<property name="label" translatable="yes">Start mode:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
<object class="GtkBox" id="hbox8">
<property name="visible">True</property>
<property name="can_focus">False</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
<child>
<object class="GtkComboBox" id="interface-startmode">
<property name="visible">True</property>
@@ -1548,10 +1539,7 @@
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -1562,10 +1550,8 @@
<property name="label" translatable="yes">In use by:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -1573,15 +1559,12 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
+ <property name="valign">center</property>
<property name="label">foo, bar</property>
</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>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
</packing>
</child>
</object>
@@ -1596,13 +1579,11 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <object class="GtkTable" id="table6">
+ <object class="GtkGrid" id="table6">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">5</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="label28">
<property name="visible">True</property>
@@ -1611,8 +1592,8 @@
<property name="label" translatable="yes">Mode:</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -1620,12 +1601,13 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
+ <property name="valign">start</property>
+ <property name="hexpand">True</property>
<property name="label">label</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options"/>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -1636,10 +1618,8 @@
<property name="label" translatable="yes">Address:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -1647,15 +1627,14 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
+ <property name="valign">center</property>
+ <property name="hexpand">True</property>
<property name="label">label</property>
<property name="selectable">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options"/>
</packing>
</child>
</object>
@@ -1680,13 +1659,11 @@
<property name="visible">True</property>
<property name="can_focus">True</property>
<child>
- <object class="GtkTable" id="table7">
+ <object class="GtkGrid" id="table7">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">2</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">5</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkLabel" id="label29">
<property name="visible">True</property>
@@ -1695,8 +1672,8 @@
<property name="label" translatable="yes">Mode:</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -1704,12 +1681,12 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">start</property>
+ <property name="hexpand">True</property>
<property name="label">label</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="y_options">GTK_FILL</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
@@ -1721,10 +1698,8 @@
<property name="label" translatable="yes">Address:</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
<child>
@@ -1733,15 +1708,13 @@
<property name="can_focus">False</property>
<property name="halign">start</property>
<property name="valign">start</property>
+ <property name="hexpand">True</property>
<property name="label">label</property>
<property name="selectable">True</property>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="y_options">GTK_FILL</property>
</packing>
</child>
</object>
diff --git a/ui/netlist.ui b/ui/netlist.ui
index c639f9c..909f167 100644
--- a/ui/netlist.ui
+++ b/ui/netlist.ui
@@ -203,28 +203,23 @@
<property name="can_focus">False</property>
<property name="spacing">2</property>
<child>
- <object class="GtkTable" id="table10">
+ <object class="GtkGrid" id="table10">
<property name="visible">True</property>
<property name="can_focus">False</property>
- <property name="n_rows">5</property>
- <property name="n_columns">2</property>
- <property name="column_spacing">6</property>
<property name="row_spacing">3</property>
+ <property name="column_spacing">6</property>
<child>
<object class="GtkEntry" id="vport-instanceid">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="valign">center</property>
<property name="invisible_char">●</property>
<property name="width_chars">30</property>
<signal name="changed" handler="on_vport_instanceid_changed" swapped="no"/>
</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>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -232,32 +227,28 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
+ <property name="valign">center</property>
<property name="label" translatable="yes">Ins_tance id:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">vport-instanceid</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkEntry" id="vport-typeidversion">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="valign">center</property>
<property name="invisible_char">●</property>
<property name="width_chars">30</property>
<signal name="changed" handler="on_vport_typeidversion_changed" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -265,32 +256,28 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
+ <property name="valign">center</property>
<property name="label" translatable="yes">Typ_eid version:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">vport-typeidversion</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">3</property>
- <property name="bottom_attach">4</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkEntry" id="vport-typeid">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="valign">center</property>
<property name="invisible_char">●</property>
<property name="width_chars">30</property>
<signal name="changed" handler="on_vport_typeid_changed" swapped="no"/>
</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>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -298,32 +285,28 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
+ <property name="valign">center</property>
<property name="label" translatable="yes">T_ypeid:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">vport-typeid</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
</packing>
</child>
<child>
<object class="GtkEntry" id="vport-managerid">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="valign">center</property>
<property name="invisible_char">●</property>
<property name="width_chars">30</property>
<signal name="changed" handler="on_vport_managerid_changed" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -331,15 +314,14 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
+ <property name="valign">center</property>
<property name="label" translatable="yes">M_anagerid:</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">vport-managerid</property>
</object>
<packing>
+ <property name="left_attach">0</property>
<property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
</packing>
</child>
<child>
@@ -347,29 +329,29 @@
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="halign">end</property>
+ <property name="valign">center</property>
<property name="label" translatable="yes">_Type:</property>
<property name="use_markup">True</property>
<property name="use_underline">True</property>
<property name="mnemonic_widget">vport-type</property>
</object>
<packing>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="left_attach">0</property>
+ <property name="top_attach">0</property>
</packing>
</child>
<child>
<object class="GtkEntry" id="vport-type">
<property name="visible">True</property>
<property name="can_focus">True</property>
+ <property name="valign">center</property>
<property name="invisible_char">●</property>
<property name="width_chars">30</property>
<signal name="changed" handler="on_vport_type_changed" swapped="no"/>
</object>
<packing>
<property name="left_attach">1</property>
- <property name="right_attach">2</property>
- <property name="x_options">GTK_FILL</property>
- <property name="y_options"/>
+ <property name="top_attach">0</property>
</packing>
</child>
</object>
--
2.9.4
More information about the virt-tools-list
mailing list