From fa47586b3788c461fc99211d47b9d6b0de9ec0b9 Mon Sep 17 00:00:00 2001 From: Cole Robinson Date: Fri, 27 Sep 2013 13:36:22 -0400 Subject: [PATCH] createnet: Use blue header like other wizards --- ui/createnet.ui | 2475 +++++++++++++++++++------------------- virtManager/createnet.py | 9 +- 2 files changed, 1276 insertions(+), 1208 deletions(-) diff --git a/ui/createnet.ui b/ui/createnet.ui index de3c3ebf..ec906799 100644 --- a/ui/createnet.ui +++ b/ui/createnet.ui @@ -1,4 +1,5 @@ + @@ -8,31 +9,89 @@ False - 12 Create a new virtual network False dialog - + True False - 12 + vertical + 6 - + True False - + True False - 0 - 0 - 5 - 6 - <span weight="heavy" size="xx-large" foreground="#FFF">Creating a new virtual network </span> - True - fill + 6 + 10 + + + True + False + network-idle + 6 + + + False + False + 0 + + + + + True + False + + + True + False + + + True + False + 0 + <span size='large' color='white'>Create virtual network</span> + True + + + False + True + 0 + + + + + True + False + 0 + <span color='#59B0E2'>Step foo of bar</span> + True + + + False + True + 1 + + + + + True + True + 0 + + + + + True + True + 1 + + @@ -43,221 +102,79 @@ - + True - True - + False + 12 + 12 - + True - False - 12 + True + - + True False - 0 - Choose a name for your virtual network: - True - True - - - False - False - 0 - - - - - True - False - 15 + 12 - + True False - True - 3 - 4 - - - True - True - 16 - 25 - False - False - - - Net Name Field - - - - - - 1 - 0 - 1 - 1 - - - - - True - False - - - True - False - gtk-dialog-info - - - False - True - 0 - - - - - True - False - <b>Example:</b> network1 - True - - - False - False - 1 - - - - - 1 - 1 - 1 - 1 - - - - - True - False - 1 - Network _Name: - True - True - right - net-name - - - 0 - 0 - 1 - 1 - - - - - True - False - - - - - - 0 - 1 - 1 - 1 - - + 0 + Choose a name for your virtual network: + True + True + + False + False + 0 + - - - False - True - 1 - - - - - - - True - False - Name - - - False - - - - - True - False - 6 - - - True - False - 0 - Choose <b>IPv4</b> address space for the virtual network: - True - True - 45 - - - False - True - 0 - - - - - Enable IPv4 network address space definition - True - True - False - 0.5 - True - - - - False - True - 1 - - - - - True - False - 15 - + True False - vertical - 18 + 15 - + True False - vertical - 3 + True + 3 + 4 - + + True + True + 16 + 25 + False + False + + + Net Name Field + + + + + + 1 + 0 + 1 + 1 + + + + True False - 6 - + True False - 1 - _Network: - True + gtk-dialog-info False @@ -266,67 +183,190 @@ - + True - True - start - 20 - ● - 25 - True - False - False - + False + <b>Example:</b> network1 + True False - True + False 1 - False - True - 0 + 1 + 1 + 1 + 1 - + + True + False + 1 + Network _Name: + True + True + right + net-name + + + 0 + 0 + 1 + 1 + + + + True False - + + + + + 0 + 1 + 1 + 1 + + + + + + + False + True + 1 + + + + + + + True + False + Name + + + False + + + + + True + False + 6 + + + True + False + 0 + Choose <b>IPv4</b> address space for the virtual network: + True + True + 45 + + + False + True + 0 + + + + + Enable IPv4 network address space definition + True + True + False + 0.5 + True + + + + False + True + 1 + + + + + True + False + 15 + + + True + False + vertical + 18 + + + True + False + vertical + 3 + + True False - 0 - 3 - 3 - gtk-dialog-info + 6 + + + True + False + 1 + _Network: + True + + + False + True + 0 + + + + + True + True + start + 20 + ● + 25 + False + False + + + + False + True + 1 + + False - False + True 0 - + True False - vertical - 6 - + True False - 0 0 - <b>Hint:</b> The network should be chosen from one of the IPv4 private address ranges. eg 10.0.0.0/8 or 192.168.0.0/16 - True - True - 40 - 50 + 3 + 3 + gtk-dialog-info False @@ -335,65 +375,96 @@ - + True False - 3 - 6 + vertical + 6 - + True False 0 - 192.168.100.1 + 0 + <b>Hint:</b> The network should be chosen from one of the IPv4 private address ranges. eg 10.0.0.0/8 or 192.168.0.0/16 + True + True + 40 + 50 - 1 - 0 - 1 - 1 + False + False + 0 - + True False - 0 - ? + 3 + 6 + + + True + False + 0 + 192.168.100.1 + + + 1 + 0 + 1 + 1 + + + + + True + False + 0 + ? + + + 1 + 1 + 1 + 1 + + + + + True + False + 1 + Gateway: + + + 0 + 0 + 1 + 1 + + + + + True + False + 1 + Type: + + + 0 + 1 + 1 + 1 + + - 1 - 1 - 1 - 1 - - - - - True - False - 1 - Gateway: - - - 0 - 0 - 1 - 1 - - - - - True - False - 1 - Type: - - - 0 - 1 - 1 - 1 + False + True + 1 @@ -411,329 +482,6 @@ - - False - True - 1 - - - - - False - True - 0 - - - - - True - False - 3 - 6 - - - True - True - 15 - ● - 25 - True - False - False - - - - 1 - 1 - 1 - 1 - - - - - True - True - 15 - ● - True - False - False - - - - 1 - 2 - 1 - 1 - - - - - True - False - 1 - Start: - - - 0 - 1 - 1 - 1 - - - - - True - False - 1 - End: - - - 0 - 2 - 1 - 1 - - - - - Enable DHCPv4 - True - True - False - 0 - True - - - - 0 - 0 - 2 - 1 - - - - - False - True - 1 - - - - - True - False - 3 - 6 - - - Enable Static Route Definition - True - True - False - 0 - True - - - - 0 - 0 - 2 - 1 - - - - - True - True - 20 - ● - True - False - False - - - - 1 - 1 - 1 - 1 - - - - - True - False - 1 - <b>to</b> Network: - True - - - 0 - 1 - 1 - 1 - - - - - True - False - 1 - <b>via</b> Gateway: - True - - - 0 - 2 - 1 - 1 - - - - - True - True - 15 - ● - 25 - True - False - False - - - - 1 - 2 - 1 - 1 - - - - - False - True - 2 - - - - - - - True - True - 2 - - - - - 1 - - - - - True - False - IPv4 - - - 1 - False - - - - - True - False - 6 - - - True - False - 0 - Choose <b>IPv6</b> address space for the virtual network: - True - True - 45 - - - False - True - 0 - - - - - Enable IPv6 network address space definition - True - True - False - 0.5 - True - - - - False - True - 1 - - - - - True - False - 15 - - - True - False - vertical - 18 - - - True - False - vertical - 3 - - - True - False - 6 - - - True - False - 1 - _Network: - True - - - False - True - 0 - - - - - True - True - start - 40 - ● - 25 - True - False - False - - - - False - True - 1 - - - False True @@ -741,433 +489,89 @@ - + True False + 3 + 6 - + True - False - 0 - 3 - 3 - gtk-dialog-info + True + 15 + ● + 25 + False + False + - False - False - 0 + 1 + 1 + 1 + 1 - + True - False - vertical - 6 - - - True - False - 0 - 0 - <b>Note:</b> The network could be chosen from one of the IPv6 private address ranges. eg FC00::/7. The prefix must be <b>64</b>. A typical IPv6 network address will look something like: fd00:dead:beef:55::/64 - True - True - 45 - - - False - True - 0 - - - - - True - False - 3 - 6 - - - True - False - 0 - fd00:100::1 - - - 1 - 0 - 1 - 1 - - - - - True - False - 0 - ? - - - 1 - 1 - 1 - 1 - - - - - True - False - 1 - Type: - - - 0 - 1 - 1 - 1 - - - - - True - False - 1 - Gateway: - - - 0 - 0 - 1 - 1 - - - - - False - True - 1 - - + True + 15 + ● + False + False + - False - True - 1 + 1 + 2 + 1 + 1 - - - False - True - 1 - - - - - False - False - 0 - - - - - True - False - 3 - 6 - - - True - True - 40 - ● - 25 - True - False - False - - - - 1 - 1 - 1 - 1 - - - - - True - True - 40 - ● - True - False - False - - - - 1 - 2 - 1 - 1 - - - - - True - False - 1 - Start: - - - 0 - 1 - 1 - 1 - - - - - True - False - 0 - End: - - - 0 - 2 - 1 - 1 - - - - - Enable DHCPv6 - True - True - False - 0 - True - - - - 0 - 0 - 2 - 1 - - - - - False - True - 1 - - - - - True - False - 3 - 6 - - - Enable Static Route Definition - True - True - False - 0 - True - - - - 0 - 0 - 2 - 1 - - - - - True - False - 0 - <b>to</b> Network: - True - - - 0 - 1 - 1 - 1 - - - - - True - False - 1 - <b>via</b> Gateway: - True - - - 0 - 2 - 1 - 1 - - - - - True - True - 45 - ● - 25 - True - False - False - - - - 1 - 1 - 1 - 1 - - - - - True - True - 40 - ● - True - False - False - - - - 1 - 2 - 1 - 1 - - - - - False - True - 2 - - - - - - - True - True - 2 - - - - - 2 - - - - - True - False - IPv6 - - - 2 - False - - - - - True - False - 6 - - - True - False - 0 - Connected to a <b>physical network</b>: - True - True - 50 - - - False - False - 0 - - - - - True - False - 15 - - - True - False - vertical - 18 - - - True - False - vertical - 6 - - - True - False - vertical - - _Isolated virtual network + + True + False + 1 + Start: + + + 0 + 1 + 1 + 1 + + + + + True + False + 1 + End: + + + 0 + 2 + 1 + 1 + + + + + Enable DHCPv4 True True False - start - True 0 True - net-forward-dev - + - False - True - 0 - - - - - For_warding to physical network - True - True - False - start - True - 0 - True - True - - - - False - True - 1 + 0 + 0 + 2 + 1 @@ -1178,79 +582,92 @@ - + True False - 25 + 3 + 6 - + + Enable Static Route Definition + True + True + False + 0 + True + + + + 0 + 0 + 2 + 1 + + + + + True + True + 20 + ● + False + False + + + + 1 + 1 + 1 + 1 + + + + True False - 4 - 6 - - - True - False - start - 1 - _Destination: - True - net-forward-dev - - - 0 - 0 - 1 - 1 - - - - - True - False - start - 1 - _Mode: - True - - - 0 - 1 - 1 - 1 - - - - - True - False - - - Physical Network - - - - - 1 - 0 - 1 - 1 - - - - - True - False - - - 1 - 1 - 1 - 1 - - + 1 + <b>to</b> Network: + True + + 0 + 1 + 1 + 1 + + + + + True + False + 1 + <b>via</b> Gateway: + True + + + 0 + 2 + 1 + 1 + + + + + True + True + 15 + ● + 25 + False + False + + + + 1 + 2 + 1 + 1 + @@ -1260,49 +677,345 @@ - - False - True - 0 - + + + True + True + 2 + + + + + 1 + + + + + True + False + IPv4 + + + 1 + False + + + + + True + False + 6 + + + True + False + 0 + Choose <b>IPv6</b> address space for the virtual network: + True + True + 45 + + + False + True + 0 + + + + + Enable IPv6 network address space definition + True + True + False + 0.5 + True + + + + False + True + 1 + + + + + True + False + 15 - + True False vertical - 3 + 18 - - Enable IPv6 internal routing/networking + True - True - False - 12 - 0 - True + False + vertical + 3 + + + True + False + 6 + + + True + False + 1 + _Network: + True + + + False + True + 0 + + + + + True + True + start + 40 + ● + 25 + False + False + + + + False + True + 1 + + + + + False + True + 0 + + + + + True + False + + + True + False + 0 + 3 + 3 + gtk-dialog-info + + + False + False + 0 + + + + + True + False + vertical + 6 + + + True + False + 0 + 0 + <b>Note:</b> The network could be chosen from one of the IPv6 private address ranges. eg FC00::/7. The prefix must be <b>64</b>. A typical IPv6 network address will look something like: fd00:dead:beef:55::/64 + True + True + 45 + + + False + True + 0 + + + + + True + False + 3 + 6 + + + True + False + 0 + fd00:100::1 + + + 1 + 0 + 1 + 1 + + + + + True + False + 0 + ? + + + 1 + 1 + 1 + 1 + + + + + True + False + 1 + Type: + + + 0 + 1 + 1 + 1 + + + + + True + False + 1 + Gateway: + + + 0 + 0 + 1 + 1 + + + + + False + True + 1 + + + + + False + True + 1 + + + + + False + True + 1 + + False - True + False 0 - + True False - 25 + 3 + 6 - + + True + True + 40 + ● + 25 + False + False + + + + 1 + 1 + 1 + 1 + + + + + True + True + 40 + ● + False + False + + + + 1 + 2 + 1 + 1 + + + + + True + False + 1 + Start: + + + 0 + 1 + 1 + 1 + + + + True False 0 - If an IPv6 network address is <b>not</b> specified, this will enable IPv6 internal routing between virtual machines. By default, IPv4 internal routing is enabled. - True - True - 30 + End: + + 0 + 2 + 1 + 1 + + + + + Enable DHCPv6 + True + True + False + 0 + True + + + + 0 + 0 + 2 + 1 + @@ -1311,159 +1024,507 @@ 1 - - - False - True - 1 - - - - - True - False - 6 - + True False - 0 - DNS Domain Name: + 3 + 6 + + + Enable Static Route Definition + True + True + False + 0 + True + + + + 0 + 0 + 2 + 1 + + + + + True + False + 0 + <b>to</b> Network: + True + + + 0 + 1 + 1 + 1 + + + + + True + False + 1 + <b>via</b> Gateway: + True + + + 0 + 2 + 1 + 1 + + + + + True + True + 45 + ● + 25 + False + False + + + + 1 + 1 + 1 + 1 + + + + + True + True + 40 + ● + False + False + + + + 1 + 2 + 1 + 1 + + False - False + True + 2 + + + + + + + True + True + 2 + + + + + 2 + + + + + True + False + IPv6 + + + 2 + False + + + + + True + False + 6 + + + True + False + 0 + Connected to a <b>physical network</b>: + True + True + 50 + + + False + False + 0 + + + + + True + False + 15 + + + True + False + vertical + 18 + + + True + False + vertical + 6 + + + True + False + vertical + + + _Isolated virtual network + True + True + False + start + True + 0 + True + net-forward-dev + + + + False + True + 0 + + + + + For_warding to physical network + True + True + False + start + True + 0 + True + True + + + + False + True + 1 + + + + + False + True + 1 + + + + + True + False + 25 + + + True + False + 4 + 6 + + + True + False + start + 1 + _Destination: + True + net-forward-dev + + + 0 + 0 + 1 + 1 + + + + + True + False + start + 1 + _Mode: + True + + + 0 + 1 + 1 + 1 + + + + + True + False + + + Physical Network + + + + + 1 + 0 + 1 + 1 + + + + + True + False + + + 1 + 1 + 1 + 1 + + + + + + + False + True + 2 + + + + + False + True 0 - + True - True - 20 - ● - 20 - True - False - False + False + vertical + 3 + + + Enable IPv6 internal routing/networking + True + True + False + 12 + 0 + True + + + False + True + 0 + + + + + True + False + 25 + + + True + False + 0 + If an IPv6 network address is <b>not</b> specified, this will enable IPv6 internal routing between virtual machines. By default, IPv4 internal routing is enabled. + True + True + 30 + + + + + False + True + 1 + + False - False + True 1 + + + True + False + 6 + + + True + False + 0 + DNS Domain Name: + + + False + False + 0 + + + + + True + True + 20 + ● + 20 + False + False + + + False + False + 1 + + + + + False + True + 2 + + - - False - True - 2 - + + True + True + 1 + - True - True - 1 + 3 + + + + + True + False + Misc + + + 3 + False - 3 - - - - - True - False - Misc - - - 3 - False - - - - - True - True - 1 - - - - - True - False - 12 - end - - - gtk-cancel - True - True - True - True - - - - False - False + True + True 1 - - gtk-go-back + True - True - True - True - + False + 12 + end + + + gtk-cancel + True + True + True + True + + + + False + False + 1 + + + + + gtk-go-back + True + True + True + True + + + + False + False + 2 + + + + + gtk-go-forward + True + True + True + True + True + + + + False + False + 3 + + + + + _Finish + True + True + image2 + True + + + + False + False + 4 + + False - False + True 2 - - - gtk-go-forward - True - True - True - True - True - - - - False - False - 3 - - - - - _Finish - True - True - image2 - True - - - - False - False - 4 - - False True - 2 + 1 diff --git a/virtManager/createnet.py b/virtManager/createnet.py index 7a60845c..110cea11 100644 --- a/virtManager/createnet.py +++ b/virtManager/createnet.py @@ -117,7 +117,8 @@ class vmmCreateNetwork(vmmGObjectUI): notebook = self.widget("create-pages") notebook.set_show_tabs(False) - self.widget("title-eventbox").modify_bg(Gtk.StateType.NORMAL, _black) + blue = Gdk.Color.parse("#0072A8")[1] + self.widget("header").modify_bg(Gtk.StateType.NORMAL, blue) # [ label, dev name ] fw_list = self.widget("net-forward") @@ -470,6 +471,12 @@ class vmmCreateNetwork(vmmGObjectUI): notebook.prev_page() def page_changed(self, ignore1, ignore2, page_number): + page_lbl = ("%s" % + _("Step %(current_page)d of %(max_page)d") % + {'current_page': page_number + 1, + 'max_page': PAGE_MISC + 1}) + self.widget("header-pagenum").set_markup(page_lbl) + if page_number == PAGE_NAME: name_widget = self.widget("net-name") name_widget.set_sensitive(True)