GtkTable was deprecated since Gtk version 3.4 and should not be used in newly-written code. It should be replaced by GtkGrid. One major difference between GtkTable and GtkGrid are the child properties used, for GtkGrid these are only "left-attach", "top-attach", "width" and "height". Another difference is GtkGrid does not requre the number of row/columns to be specified. https://developer.gnome.org/gtk3/stable/GtkTable.html https://developer.gnome.org/gtk3/stable/GtkGrid.html --- ui/addhardware.ui | 87 +++++++---------- ui/choosecd.ui | 33 ++----- ui/clone.ui | 140 +++++++++------------------- ui/create.ui | 161 ++++++++++---------------------- ui/createinterface.ui | 169 +++++++++------------------------ ui/createnet.ui | 9 +- ui/details.ui | 251 +++++++++++--------------------------------------- ui/host.ui | 81 +++++----------- ui/netlist.ui | 46 ++------- 9 files changed, 270 insertions(+), 707 deletions(-) diff --git a/ui/addhardware.ui b/ui/addhardware.ui index 2cf387e..1ecb61a 100644 --- a/ui/addhardware.ui +++ b/ui/addhardware.ui @@ -554,12 +554,11 @@ </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> @@ -570,8 +569,8 @@ <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> @@ -654,8 +648,8 @@ <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 +669,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 +686,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 +695,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 +710,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 +1089,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 +1101,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 +1114,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 +1135,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 +1147,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 +1160,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 +1173,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 +1184,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 +1228,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 +1240,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> @@ -1274,8 +1253,8 @@ <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..9e423be 100644 --- a/ui/choosecd.ui +++ b/ui/choosecd.ui @@ -76,13 +76,11 @@ <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> @@ -118,10 +116,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 +131,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 +156,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 +178,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 +198,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 +214,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..db851e6 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,15 @@ <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="orientation">vertical</property> <child> <object class="GtkLabel" id="clone-no-storage-pass"> @@ -338,9 +333,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> @@ -353,9 +346,8 @@ <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> @@ -369,21 +361,20 @@ <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="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="y_padding">3</property> + <property name="top_attach">0</property> </packing> </child> </object> @@ -634,17 +625,16 @@ 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> <property name="can_focus">False</property> + <property name="halign">start</property> <property name="left_padding">2</property> <child> <object class="GtkLabel" id="change-mac-type"> @@ -657,45 +647,40 @@ 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="halign">start</property> + <property name="hexpand">True</property> <property name="left_padding">2</property> <child> <object class="GtkLabel" id="change-mac-orig"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="halign">start</property> <property name="label">orig-mac</property> - <property name="width_chars">20</property> + <property name="selectable">True</property> </object> </child> </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 +693,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 +714,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> @@ -746,9 +729,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="x_options">GTK_FILL</property> - <property name="y_options"/> + <property name="top_attach">0</property> </packing> </child> <child> @@ -761,11 +742,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="x_options">GTK_FILL</property> - <property name="y_options"/> </packing> </child> </object> @@ -863,13 +840,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 +861,16 @@ 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="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 +880,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 +892,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 +907,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 +920,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 +933,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> @@ -986,17 +946,14 @@ like change passwords or static IPs, please see the virt-sysprep(1) tool.</sp <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 +964,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 +977,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 +1001,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> @@ -1062,8 +1016,9 @@ like change passwords or static IPs, please see the virt-sysprep(1) tool.</sp <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> @@ -1074,10 +1029,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> @@ -1091,11 +1043,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..9e9253c 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,8 +448,8 @@ <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> @@ -489,8 +488,7 @@ </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> </packing> </child> </object> @@ -972,13 +970,11 @@ 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> @@ -996,30 +992,31 @@ 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">False</property> <property name="left_padding">13</property> <child> <object class="GtkExpander" id="install-url-options"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="hexpand">True</property> <child> <object class="GtkAlignment" id="alignment18"> <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 +1027,20 @@ 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="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 +1059,16 @@ 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="hexpand">True</property> <property name="has_entry">True</property> <child internal-child="entry"> <object class="GtkEntry" id="install-url-entry"> @@ -1082,8 +1080,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,13 +1841,11 @@ 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> @@ -1865,10 +1860,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> @@ -1885,9 +1877,7 @@ 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> @@ -1903,9 +1893,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> @@ -1918,10 +1906,8 @@ is not yet supported.</small></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> @@ -1934,8 +1920,8 @@ is not yet supported.</small></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> @@ -1962,11 +1948,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 +2019,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 +2034,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,40 +2048,34 @@ 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> <object class="GtkSpinButton" id="mem"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="halign">end</property> + <property name="halign">start</property> <property name="adjustment">adjustment3</property> <property name="climb_rate">1</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> <object class="GtkSpinButton" id="cpus"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="halign">end</property> + <property name="halign">start</property> <property name="adjustment">adjustment2</property> <property name="climb_rate">1</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> @@ -2115,47 +2087,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">3</property> - <property name="bottom_attach">4</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <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> - </object> - <packing> - <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> - </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> + <property name="width">2</property> </packing> </child> <child> @@ -2167,8 +2100,7 @@ is not yet supported.</small></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> @@ -2192,16 +2124,23 @@ 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> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> diff --git a/ui/createinterface.ui b/ui/createinterface.ui index 48c7a98..c6c82cf 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,9 +399,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> @@ -436,10 +410,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">GTK_FILL</property> </packing> </child> <child> @@ -463,10 +434,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 +445,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 +485,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 +498,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 +510,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 +522,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,10 +534,8 @@ <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> @@ -614,8 +572,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> @@ -652,10 +609,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> @@ -692,10 +646,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">GTK_FILL</property> </packing> </child> <child> @@ -719,10 +670,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 +943,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,8 +958,8 @@ <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> @@ -1048,8 +994,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,10 +1007,8 @@ <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> @@ -1090,10 +1033,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 +1046,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> @@ -1121,10 +1059,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">GTK_FILL</property> </packing> </child> <child> @@ -1175,10 +1110,8 @@ </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> @@ -1297,10 +1230,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,10 +1241,8 @@ <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> @@ -1353,10 +1281,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 +1677,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 +1692,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 +1706,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..2522961 100644 --- a/ui/createnet.ui +++ b/ui/createnet.ui @@ -1286,11 +1286,11 @@ <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> @@ -1301,7 +1301,8 @@ <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> @@ -1312,7 +1313,7 @@ </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..499dc51 100644 --- a/ui/details.ui +++ b/ui/details.ui @@ -2010,14 +2010,12 @@ 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> @@ -2028,9 +2026,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"/> + <property name="top_attach">0</property> </packing> </child> <child> @@ -2041,8 +2037,8 @@ if you know what you are doing.</small></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> @@ -2055,10 +2051,8 @@ if you know what you are doing.</small></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> @@ -2071,10 +2065,8 @@ if you know what you are doing.</small></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,11 +2079,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">GTK_FILL</property> </packing> </child> <child> @@ -2112,11 +2100,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 +2304,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 +2319,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 +2333,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 +2347,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 +2363,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> @@ -2400,9 +2378,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> </packing> </child> <child> @@ -2416,9 +2392,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> </packing> </child> </object> @@ -2535,14 +2509,12 @@ 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> @@ -2553,10 +2525,8 @@ if you know what you are doing.</small></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> @@ -2569,10 +2539,8 @@ if you know what you are doing.</small></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> @@ -2583,8 +2551,8 @@ if you know what you are doing.</small></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> @@ -2597,9 +2565,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"/> + <property name="top_attach">0</property> </packing> </child> <child> @@ -2645,10 +2611,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="y_options"/> </packing> </child> <child> @@ -2694,11 +2657,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 +2869,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 +2885,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,10 +2901,8 @@ 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> @@ -2985,10 +2940,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="y_options"/> </packing> </child> <child> @@ -3026,8 +2978,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,10 +2993,8 @@ 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> @@ -3058,10 +3007,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">3</property> - <property name="bottom_attach">4</property> - <property name="y_options">GTK_FILL</property> </packing> </child> <child> @@ -3076,10 +3022,8 @@ 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> @@ -3117,10 +3061,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> @@ -3130,20 +3071,6 @@ if you know what you are doing.</small></property> <property name="position">0</property> </packing> </child> - <child> - <object class="GtkAlignment" id="alignment12"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> </object> <packing> <property name="expand">False</property> @@ -4282,13 +4209,12 @@ 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> @@ -4299,8 +4225,8 @@ if you know what you are doing.</small></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 +4243,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,13 +4777,11 @@ 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> @@ -4870,10 +4792,8 @@ if you know what you are doing.</small></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> @@ -4886,8 +4806,8 @@ if you know what you are doing.</small></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 +4824,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 +4841,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> @@ -5124,13 +5038,12 @@ 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="table18"> + <object class="GtkGrid" id="table18"> <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="label74"> <property name="visible">True</property> @@ -5141,8 +5054,8 @@ if you know what you are doing.</small></property> <property name="mnemonic_widget">combobox-entry17</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> @@ -5159,9 +5072,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> @@ -5921,14 +5832,14 @@ if you know what you are doing.</small></property> </packing> </child> <child> - <object class="GtkTable" id="console-auth"> + <object class="GtkGrid" id="console-auth"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="halign">center</property> + <property name="valign">start</property> <property name="border_width">3</property> - <property name="n_rows">3</property> - <property name="n_columns">3</property> - <property name="column_spacing">3</property> <property name="row_spacing">3</property> + <property name="column_spacing">3</property> <child> <object class="GtkLabel" id="label-auth-password"> <property name="visible">True</property> @@ -5939,10 +5850,8 @@ if you know what you are doing.</small></property> <property name="mnemonic_widget">console-auth-password</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> @@ -5954,10 +5863,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="y_options"/> </packing> </child> <child> @@ -5973,11 +5879,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> <child> @@ -5990,8 +5892,8 @@ if you know what you are doing.</small></property> <property name="mnemonic_widget">console-auth-username</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> @@ -6002,8 +5904,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> @@ -6018,59 +5919,17 @@ if you know what you are doing.</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="x_options">GTK_FILL</property> - <property name="y_options"/> </packing> </child> <child> - <object class="GtkAlignment" id="alignment17"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <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> + <placeholder/> </child> <child> - <object class="GtkAlignment" id="alignment18"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - </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> - </packing> + <placeholder/> </child> <child> - <object class="GtkAlignment" id="alignment19"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <placeholder/> - </child> - </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="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> + <placeholder/> </child> </object> <packing> diff --git a/ui/host.ui b/ui/host.ui index bb4651b..953ea82 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> @@ -1458,10 +1451,8 @@ <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> @@ -1497,10 +1488,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,10 +1499,8 @@ <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> @@ -1548,10 +1534,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 +1545,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> @@ -1577,11 +1558,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="x_options">GTK_FILL</property> - <property name="y_options"/> </packing> </child> </object> @@ -1596,13 +1573,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 +1586,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> @@ -1624,8 +1599,7 @@ </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 +1610,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> @@ -1652,10 +1624,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> </object> @@ -1680,13 +1649,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 +1662,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> @@ -1708,8 +1675,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> @@ -1721,10 +1687,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> @@ -1738,10 +1702,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> </object> diff --git a/ui/netlist.ui b/ui/netlist.ui index c639f9c..e15e155 100644 --- a/ui/netlist.ui +++ b/ui/netlist.ui @@ -203,13 +203,11 @@ <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> @@ -220,11 +218,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="x_options">GTK_FILL</property> - <property name="y_options"/> </packing> </child> <child> @@ -237,10 +231,8 @@ <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> @@ -253,11 +245,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"/> </packing> </child> <child> @@ -270,10 +258,8 @@ <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> @@ -286,11 +272,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="x_options">GTK_FILL</property> - <property name="y_options"/> </packing> </child> <child> @@ -303,10 +285,8 @@ <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> @@ -319,11 +299,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"/> </packing> </child> <child> @@ -336,10 +312,8 @@ <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> @@ -353,8 +327,8 @@ <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> @@ -367,9 +341,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"/> + <property name="top_attach">0</property> </packing> </child> </object> -- 2.9.4 _______________________________________________ virt-tools-list mailing list virt-tools-list@xxxxxxxxxx https://www.redhat.com/mailman/listinfo/virt-tools-list
