From d8e8430285c5d3994592adbf8fbb0fd3c056249b Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Thu, 5 Nov 2009 15:22:00 -0500
Subject: [PATCH] details: Always have the apply button showing.

Also, swap the order of remove and apply so remove is less likely to be
pushed by accident.
---
 src/virtManager/details.py |  6 +-----
 src/vmm-details.glade      | 32 ++++++++++++++++----------------
 2 files changed, 17 insertions(+), 21 deletions(-)

diff --git a/src/virtManager/details.py b/src/virtManager/details.py
index fd8e0ada9..88c49b8c1 100644
--- a/src/virtManager/details.py
+++ b/src/virtManager/details.py
@@ -60,11 +60,9 @@ HW_LIST_TYPE_CHAR = 10
 HW_LIST_TYPE_HOSTDEV = 11
 HW_LIST_TYPE_VIDEO = 12
 
-apply_pages  = [ HW_LIST_TYPE_GENERAL, HW_LIST_TYPE_CPU, HW_LIST_TYPE_MEMORY,
-                 HW_LIST_TYPE_BOOT, HW_LIST_TYPE_DISK, HW_LIST_TYPE_VIDEO]
 remove_pages = [ HW_LIST_TYPE_NIC, HW_LIST_TYPE_INPUT,
                  HW_LIST_TYPE_GRAPHICS, HW_LIST_TYPE_SOUND, HW_LIST_TYPE_CHAR,
-                 HW_LIST_TYPE_HOSTDEV]
+                 HW_LIST_TYPE_HOSTDEV, HW_LIST_TYPE_DISK, HW_LIST_TYPE_VIDEO]
 
 # Main tab pages
 PAGE_CONSOLE = 0
@@ -544,11 +542,9 @@ class vmmDetails(gobject.GObject):
         else:
             pagetype = -1
 
-        app = pagetype in apply_pages
         rem = pagetype in remove_pages
         if selected:
             self.window.get_widget("config-apply").set_sensitive(False)
-        self.window.get_widget("config-apply").set_property("visible", app)
         self.window.get_widget("config-remove").set_property("visible", rem)
 
         self.window.get_widget("hw-panel").set_current_page(pagetype)
diff --git a/src/vmm-details.glade b/src/vmm-details.glade
index 419e74f4a..06ef38889 100644
--- a/src/vmm-details.glade
+++ b/src/vmm-details.glade
@@ -3723,6 +3723,22 @@ I/O:</property>
                         <property name="visible">True</property>
                         <property name="spacing">12</property>
                         <property name="layout_style">end</property>
+                        <child>
+                          <widget class="GtkButton" id="config-remove">
+                            <property name="label">gtk-remove</property>
+                            <property name="visible">True</property>
+                            <property name="can_focus">True</property>
+                            <property name="can_default">True</property>
+                            <property name="receives_default">False</property>
+                            <property name="use_stock">True</property>
+                            <signal name="clicked" handler="on_config_remove_clicked"/>
+                          </widget>
+                          <packing>
+                            <property name="expand">False</property>
+                            <property name="fill">False</property>
+                            <property name="position">0</property>
+                          </packing>
+                        </child>
                         <child>
                           <widget class="GtkButton" id="config-apply">
                             <property name="label">gtk-apply</property>
@@ -3734,22 +3750,6 @@ I/O:</property>
                             <property name="use_stock">True</property>
                             <signal name="clicked" handler="on_config_apply_clicked"/>
                           </widget>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
-                        <child>
-                          <widget class="GtkButton" id="config-remove">
-                            <property name="label">gtk-remove</property>
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="can_default">True</property>
-                            <property name="receives_default">False</property>
-                            <property name="use_stock">True</property>
-                            <signal name="clicked" handler="on_config_remove_clicked"/>
-                          </widget>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>