From 965570670b72f9503faadd9f698a0bede6f08e36 Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Sat, 11 Dec 2010 14:51:08 -0500
Subject: [PATCH] addhardware: Don't resize dialog until we switch pages

This way, large UI pieces like char page or host device combo won't
balloon out the UI.
---
 src/virtManager/addhardware.py | 32 +++++++++++---------------------
 src/vmm-add-hardware.glade     |  7 +++++--
 2 files changed, 16 insertions(+), 23 deletions(-)

diff --git a/src/virtManager/addhardware.py b/src/virtManager/addhardware.py
index b374f0a0b..191ce8e81 100644
--- a/src/virtManager/addhardware.py
+++ b/src/virtManager/addhardware.py
@@ -35,11 +35,6 @@ from virtManager.createmeter import vmmCreateMeter
 from virtManager.storagebrowse import vmmStorageBrowser
 from virtManager.baseclass import vmmGObjectUI
 
-VM_STORAGE_PARTITION = 1
-VM_STORAGE_FILE = 2
-
-DEFAULT_STORAGE_FILE_SIZE = 500
-
 PAGE_ERROR = 0
 PAGE_DISK = 1
 PAGE_NETWORK = 2
@@ -317,12 +312,6 @@ class vmmAddHardware(vmmGObjectUI):
         is_local = not self.conn.is_remote()
         is_storage_capable = self.conn.is_storage_capable()
 
-        notebook = self.window.get_widget("create-pages")
-        notebook.set_current_page(0)
-
-        # Hide the "finish" button until the appropriate time
-        self.window.get_widget("create-help").hide()
-
         # Storage init
         label_widget = self.window.get_widget("phys-hd-label")
         if not self.host_storage_timer:
@@ -442,6 +431,13 @@ class vmmAddHardware(vmmGObjectUI):
                       self.vm.is_hvm(),
                       _("Not supported for this guest type."))
 
+        # Hide all notebook pages, so the wizard isn't as big as the largest
+        # page
+        notebook = self.window.get_widget("create-pages")
+        for page in range(notebook.get_n_pages()):
+            widget = notebook.get_nth_page(page)
+            widget.hide()
+
         self.set_hw_selection(0)
 
     #########################
@@ -676,9 +672,7 @@ class vmmAddHardware(vmmGObjectUI):
     def hw_selected(self, src=None):
         ignore = src
         self._dev = None
-
-        devbox = self.window.get_widget("host-device")
-        devbox.hide()
+        notebook = self.window.get_widget("create-pages")
 
         row = self.get_hw_selection()
         if not row:
@@ -690,20 +684,16 @@ class vmmAddHardware(vmmGObjectUI):
         msg = row[4] or ""
 
         if not sens:
-            self.window.get_widget("create-pages").set_current_page(
-                                                                PAGE_ERROR)
+            page = PAGE_ERROR
             self.window.get_widget("hardware-info").set_text(msg)
-            return
 
         if page == PAGE_CHAR:
             devtype = self.window.get_widget("char-device-type")
             self.change_char_device_type(devtype)
 
-        elif page == PAGE_HOSTDEV:
-            devbox.show()
-
         self.set_page_title(page)
-        self.window.get_widget("create-pages").set_current_page(page)
+        notebook.get_nth_page(page).show()
+        notebook.set_current_page(page)
 
     def finish(self, ignore=None):
         notebook = self.window.get_widget("create-pages")
diff --git a/src/vmm-add-hardware.glade b/src/vmm-add-hardware.glade
index 58efa8fd5..18ab18252 100644
--- a/src/vmm-add-hardware.glade
+++ b/src/vmm-add-hardware.glade
@@ -65,6 +65,7 @@
                   <widget class="GtkAlignment" id="pages-align">
                     <property name="visible">True</property>
                     <property name="left_padding">6</property>
+                    <property name="right_padding">12</property>
                     <child>
                       <widget class="GtkNotebook" id="create-pages">
                         <property name="visible">True</property>
@@ -1316,7 +1317,9 @@ to connect to the virtual machine.</property>
                                         <property name="column_spacing">12</property>
                                         <property name="row_spacing">6</property>
                                         <child>
-                                          <widget class="GtkComboBox" id="host-device"/>
+                                          <widget class="GtkComboBox" id="host-device">
+                                            <property name="visible">True</property>
+                                          </widget>
                                           <packing>
                                             <property name="left_attach">1</property>
                                             <property name="right_attach">2</property>
@@ -1476,7 +1479,7 @@ to connect to the virtual machine.</property>
                                               <widget class="GtkAlignment" id="alignment9">
                                                 <property name="visible">True</property>
                                                 <property name="top_padding">2</property>
-                                                <property name="left_padding">22</property>
+                                                <property name="left_padding">24</property>
                                                 <child>
                                                   <widget class="GtkTable" id="char-param-table">
                                                     <property name="visible">True</property>