From 3c9f3a16e19f825bbc2d3782e88a24baa0de3fbb Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Mon, 9 Sep 2013 11:37:32 -0400 Subject: [PATCH] addhw: Use gtkgrid for network UI --- ui/vmm-add-hardware.ui | 267 ++++++++++++++-------------------- ui/vmm-create.ui | 52 ++++--- ui/vmm-details.ui | 306 ++++++++++++++++++++------------------- virtManager/uihelpers.py | 3 +- 4 files changed, 292 insertions(+), 336 deletions(-) diff --git a/ui/vmm-add-hardware.ui b/ui/vmm-add-hardware.ui index 0ac5e57c2..02ed5d0c9 100644 --- a/ui/vmm-add-hardware.ui +++ b/ui/vmm-add-hardware.ui @@ -580,46 +580,11 @@ False 24 - + True False - 3 - 2 - 6 9 - - - True - False - 0 - _MAC address: - True - True - create-mac-address - - - 1 - 2 - GTK_FILL - - - - - - True - False - 0 - D_evice model: - True - net-model - - - 2 - 3 - GTK_FILL - GTK_FILL - - + 6 True @@ -660,66 +625,12 @@ 1 - - - True - False - - - - - - True - True - 2 - - 1 - 2 - 1 - 2 - - - - - - True - False - 6 - - - True - False - - - False - True - 0 - - - - - True - False - - - - - - True - True - 1 - - - - - 1 - 2 2 - 3 - GTK_FILL + 1 + 1 @@ -733,42 +644,57 @@ net-list - GTK_FILL - GTK_FILL + 0 + 0 + 1 + 1 - + True False + 0 + _MAC address: + True + True + create-mac-address + + + 0 + 2 + 1 + 1 + + + + + True + False + 0 + D_evice model: + True + net-model + + + 0 + 3 + 1 + 1 + + + + + True + False + 6 - + True False - 6 - - - True - False - - - False - True - 0 - - - - - True - False - gtk-dialog-warning - - - False - True - 1 - - + _Bridge name: + True + net-bridge False @@ -777,43 +703,11 @@ - + True - False - 6 - - - True - False - 6 - - - True - False - _Bridge name: - True - net-bridge - - - False - True - 0 - - - - - True - True - ● - - - False - True - 1 - - - - + True + ● + True False @@ -824,10 +718,63 @@ 1 - 2 - GTK_FILL + 1 + 1 + 1 + + + True + False + 6 + + + True + False + + + False + True + 0 + + + + + True + False + gtk-dialog-warning + + + False + True + 1 + + + + + 1 + 0 + 1 + 1 + + + + + True + False + start + + + 1 + 3 + 1 + 1 + + + + + @@ -1009,7 +956,7 @@ True False - 12 + 24 True diff --git a/ui/vmm-create.ui b/ui/vmm-create.ui index 72bdac317..4ddd47218 100644 --- a/ui/vmm-create.ui +++ b/ui/vmm-create.ui @@ -2364,35 +2364,41 @@ is not yet supported.</small> 6 12 - + True False - 6 - + True False - _Bridge name: - True - config-netdev-bridge + 6 + + + True + False + _Bridge name: + True + config-netdev-bridge + + + False + True + 0 + + + + + True + True + ● + + + False + True + 1 + + - - False - True - 0 - - - - - True - True - ● - - - False - True - 1 - diff --git a/ui/vmm-details.ui b/ui/vmm-details.ui index 9ce87f497..1b89c72ce 100644 --- a/ui/vmm-details.ui +++ b/ui/vmm-details.ui @@ -4485,71 +4485,25 @@ I/O: 3 12 - + True False 3 - 4 - 2 - 8 - 4 - - - True - False - 1 - Source device: - - - GTK_FILL - GTK_FILL - - - - - True - False - 1 - MAC address: - True - - - 2 - 3 - GTK_FILL - - - - - - True - False - 1 - 0.47999998927116394 - Device m_odel: - True - network-model-combo - - - 1 - 2 - GTK_FILL - - - + 6 + 6 True False 0 + mac True 1 - 2 - 2 - 3 - GTK_FILL + 3 + 1 + 1 @@ -4585,97 +4539,9 @@ I/O: 1 - 2 - 1 - 2 - GTK_FILL - - - - - - True - False - - - True - False - - - True - False - - - - False - True - 0 - - - - - True - False - 0 - label401 - True - - - False - True - 1 - - - - - False - True - 0 - - - - - True - False - 6 - - - True - False - _Bridge name: - True - - - False - True - 0 - - - - - True - True - ● - - - - False - True - 1 - - - - - False - True - 1 - - - - - 1 - 2 - GTK_FILL + 2 + 1 + 1 @@ -4711,10 +4577,55 @@ I/O: 1 - 2 + 4 + 1 + 1 + + + + + True + False + 1 + Source device: + + + 0 + 0 + 1 + 1 + + + + + True + False + 1 + 0.47999998927116394 + Device m_odel: + True + network-model-combo + + + 0 + 2 + 1 + 1 + + + + + True + False + 1 + MAC address: + True + + + 0 3 - 4 - GTK_FILL + 1 + 1 @@ -4726,10 +4637,103 @@ I/O: True - 3 - 4 - GTK_FILL - GTK_FILL + 0 + 4 + 1 + 1 + + + + + True + False + 6 + + + True + False + _Bridge name: + True + + + False + True + 0 + + + + + True + True + ● + True + + + + False + True + 1 + + + + + 1 + 1 + 1 + 1 + + + + + True + False + + + + + + 0 + 1 + 1 + 1 + + + + + True + False + + + True + False + + + + False + True + 0 + + + + + True + False + 0 + label401 + True + + + False + True + 1 + + + + + 1 + 0 + 1 + 1 diff --git a/virtManager/uihelpers.py b/virtManager/uihelpers.py index f14b2de70..68fd32ed0 100644 --- a/virtManager/uihelpers.py +++ b/virtManager/uihelpers.py @@ -522,8 +522,7 @@ def net_list_changed(net_list, bridge_box, vport_expander.set_visible(show_source_mode) show_bridge = row[5] - - bridge_box.set_visible(show_bridge) + set_grid_row_visible(bridge_box, show_bridge) def get_network_selection(net_list, bridge_entry):