6cfa3bb
# HG changeset patch
6cfa3bb
# User Cole Robinson <crobinso@redhat.com>
6cfa3bb
# Date 1238787321 14400
6cfa3bb
# Node ID 71d9208d322631118bbdc110388c333bd1f784eb
6cfa3bb
# Parent  9b4b6eb8de8d9e7b0e906715fb503a0b1ab0f30d
6cfa3bb
Reorder buttons in the delete dialog.
6cfa3bb
6cfa3bb
diff -r 9b4b6eb8de8d -r 71d9208d3226 src/vmm-delete.glade
6cfa3bb
--- a/src/vmm-delete.glade	Fri Apr 03 14:58:51 2009 -0400
6cfa3bb
+++ b/src/vmm-delete.glade	Fri Apr 03 15:35:21 2009 -0400
6cfa3bb
@@ -1,6 +1,6 @@
6cfa3bb
 
6cfa3bb
 
6cfa3bb
-
6cfa3bb
+
6cfa3bb
 <glade-interface>
6cfa3bb
   <widget class="GtkDialog" id="vmm-delete">
6cfa3bb
     <property name="width_request">500</property>
6cfa3bb
@@ -115,6 +115,17 @@
6cfa3bb
             <property name="visible">True</property>
6cfa3bb
             <property name="layout_style">GTK_BUTTONBOX_END</property>
6cfa3bb
             <child>
6cfa3bb
+              <widget class="GtkButton" id="delete-cancel">
6cfa3bb
+                <property name="visible">True</property>
6cfa3bb
+                <property name="can_focus">True</property>
6cfa3bb
+                <property name="receives_default">True</property>
6cfa3bb
+                <property name="label" translatable="yes">gtk-cancel</property>
6cfa3bb
+                <property name="use_stock">True</property>
6cfa3bb
+                <property name="response_id">0</property>
6cfa3bb
+                <signal name="clicked" handler="on_delete_cancel_clicked"/>
6cfa3bb
+              </widget>
6cfa3bb
+            </child>
6cfa3bb
+            <child>
6cfa3bb
               <widget class="GtkButton" id="delete-ok">
6cfa3bb
                 <property name="visible">True</property>
6cfa3bb
                 <property name="can_focus">True</property>
6cfa3bb
@@ -124,17 +135,6 @@
6cfa3bb
                 <property name="response_id">0</property>
6cfa3bb
                 <signal name="clicked" handler="on_delete_ok_clicked"/>
6cfa3bb
               </widget>
6cfa3bb
-            </child>
6cfa3bb
-            <child>
6cfa3bb
-              <widget class="GtkButton" id="delete-cancel">
6cfa3bb
-                <property name="visible">True</property>
6cfa3bb
-                <property name="can_focus">True</property>
6cfa3bb
-                <property name="receives_default">True</property>
6cfa3bb
-                <property name="label" translatable="yes">gtk-cancel</property>
6cfa3bb
-                <property name="use_stock">True</property>
6cfa3bb
-                <property name="response_id">0</property>
6cfa3bb
-                <signal name="clicked" handler="on_delete_cancel_clicked"/>
6cfa3bb
-              </widget>
6cfa3bb
               <packing>
6cfa3bb
                 <property name="position">1</property>
6cfa3bb
               </packing>
6cfa3bb
# HG changeset patch
6cfa3bb
# User Cole Robinson <crobinso@redhat.com>
6cfa3bb
# Date 1238787521 14400
6cfa3bb
# Node ID 6f0170f9d551ff54dcedca188bbf84313c551a30
6cfa3bb
# Parent  71d9208d322631118bbdc110388c333bd1f784eb
6cfa3bb
Change 'choose cd' button ordering.
6cfa3bb
6cfa3bb
diff -r 71d9208d3226 -r 6f0170f9d551 src/vmm-choose-cd.glade
6cfa3bb
--- a/src/vmm-choose-cd.glade	Fri Apr 03 15:35:21 2009 -0400
6cfa3bb
+++ b/src/vmm-choose-cd.glade	Fri Apr 03 15:38:41 2009 -0400
6cfa3bb
@@ -40,97 +40,19 @@
6cfa3bb
                           <placeholder/>
6cfa3bb
                         </child>
6cfa3bb
                         <child>
6cfa3bb
-                          <widget class="GtkHBox" id="hbox2">
6cfa3bb
-                            <property name="visible">True</property>
6cfa3bb
-                            <child>
6cfa3bb
-                              <widget class="GtkLabel" id="label38">
6cfa3bb
-                                <property name="visible">True</property>
6cfa3bb
-                                <property name="xpad">5</property>
6cfa3bb
-                                <property name="label" translatable="yes">_Path to install media:</property>
6cfa3bb
-                                <property name="use_underline">True</property>
6cfa3bb
-                                <property name="mnemonic_widget">cd-path</property>
6cfa3bb
-                              </widget>
6cfa3bb
-                              <packing>
6cfa3bb
-                                <property name="expand">False</property>
6cfa3bb
-                                <property name="fill">False</property>
6cfa3bb
-                              </packing>
6cfa3bb
-                            </child>
6cfa3bb
-                            <child>
6cfa3bb
-                              <widget class="GtkComboBox" id="cd-path">
6cfa3bb
-                                <property name="visible">True</property>
6cfa3bb
-                                <signal name="changed" handler="on_cd_path_changed"/>
6cfa3bb
-                              </widget>
6cfa3bb
-                              <packing>
6cfa3bb
-                                <property name="position">1</property>
6cfa3bb
-                              </packing>
6cfa3bb
-                            </child>
6cfa3bb
-                          </widget>
6cfa3bb
-                          <packing>
6cfa3bb
-                            <property name="left_attach">1</property>
6cfa3bb
-                            <property name="right_attach">3</property>
6cfa3bb
-                            <property name="top_attach">3</property>
6cfa3bb
-                            <property name="bottom_attach">4</property>
6cfa3bb
-                          </packing>
6cfa3bb
-                        </child>
6cfa3bb
-                        <child>
6cfa3bb
-                          <widget class="GtkAlignment" id="alignment5">
6cfa3bb
+                          <widget class="GtkAlignment" id="alignment4">
6cfa3bb
                             <property name="visible">True</property>
6cfa3bb
                             <property name="yalign">0</property>
6cfa3bb
                             <property name="yscale">0</property>
6cfa3bb
                             <child>
6cfa3bb
-                              <widget class="GtkRadioButton" id="iso-image">
6cfa3bb
-                                <property name="visible">True</property>
6cfa3bb
-                                <property name="can_focus">True</property>
6cfa3bb
-                                <property name="label" translatable="yes">_ISO Image Location:</property>
6cfa3bb
-                                <property name="use_underline">True</property>
6cfa3bb
-                                <property name="response_id">0</property>
6cfa3bb
-                                <property name="draw_indicator">True</property>
6cfa3bb
-                                <property name="group">physical-media</property>
6cfa3bb
-                                <signal name="toggled" handler="on_media_toggled"/>
6cfa3bb
-                              </widget>
6cfa3bb
+                              <placeholder/>
6cfa3bb
                             </child>
6cfa3bb
                           </widget>
6cfa3bb
                           <packing>
6cfa3bb
-                            <property name="right_attach">3</property>
6cfa3bb
-                            <property name="x_options">GTK_FILL</property>
6cfa3bb
-                            <property name="y_options">GTK_FILL</property>
6cfa3bb
-                          </packing>
6cfa3bb
-                        </child>
6cfa3bb
-                        <child>
6cfa3bb
-                          <widget class="GtkRadioButton" id="physical-media">
6cfa3bb
-                            <property name="visible">True</property>
6cfa3bb
-                            <property name="can_focus">True</property>
6cfa3bb
-                            <property name="label" translatable="yes">_CD-ROM or DVD:</property>
6cfa3bb
-                            <property name="use_underline">True</property>
6cfa3bb
-                            <property name="response_id">0</property>
6cfa3bb
-                            <property name="active">True</property>
6cfa3bb
-                            <property name="draw_indicator">True</property>
6cfa3bb
-                            <signal name="toggled" handler="on_media_toggled"/>
6cfa3bb
-                          </widget>
6cfa3bb
-                          <packing>
6cfa3bb
-                            <property name="right_attach">3</property>
6cfa3bb
-                            <property name="top_attach">2</property>
6cfa3bb
-                            <property name="bottom_attach">3</property>
6cfa3bb
-                            <property name="x_options">GTK_FILL</property>
6cfa3bb
-                            <property name="y_options">GTK_FILL</property>
6cfa3bb
-                          </packing>
6cfa3bb
-                        </child>
6cfa3bb
-                        <child>
6cfa3bb
-                          <widget class="GtkLabel" id="label36">
6cfa3bb
-                            <property name="visible">True</property>
6cfa3bb
-                            <property name="xalign">1</property>
6cfa3bb
-                            <property name="label" translatable="yes">ISO _Location:</property>
6cfa3bb
-                            <property name="use_underline">True</property>
6cfa3bb
-                            <property name="mnemonic_widget">iso-path</property>
6cfa3bb
-                          </widget>
6cfa3bb
-                          <packing>
6cfa3bb
-                            <property name="left_attach">1</property>
6cfa3bb
-                            <property name="right_attach">2</property>
6cfa3bb
                             <property name="top_attach">1</property>
6cfa3bb
                             <property name="bottom_attach">2</property>
6cfa3bb
                             <property name="x_options">GTK_FILL</property>
6cfa3bb
-                            <property name="y_options"></property>
6cfa3bb
-                            <property name="x_padding">3</property>
6cfa3bb
+                            <property name="y_options">GTK_FILL</property>
6cfa3bb
                           </packing>
6cfa3bb
                         </child>
6cfa3bb
                         <child>
6cfa3bb
@@ -168,21 +90,99 @@
6cfa3bb
                           </packing>
6cfa3bb
                         </child>
6cfa3bb
                         <child>
6cfa3bb
-                          <widget class="GtkAlignment" id="alignment4">
6cfa3bb
+                          <widget class="GtkLabel" id="label36">
6cfa3bb
+                            <property name="visible">True</property>
6cfa3bb
+                            <property name="xalign">1</property>
6cfa3bb
+                            <property name="label" translatable="yes">ISO _Location:</property>
6cfa3bb
+                            <property name="use_underline">True</property>
6cfa3bb
+                            <property name="mnemonic_widget">iso-path</property>
6cfa3bb
+                          </widget>
6cfa3bb
+                          <packing>
6cfa3bb
+                            <property name="left_attach">1</property>
6cfa3bb
+                            <property name="right_attach">2</property>
6cfa3bb
+                            <property name="top_attach">1</property>
6cfa3bb
+                            <property name="bottom_attach">2</property>
6cfa3bb
+                            <property name="x_options">GTK_FILL</property>
6cfa3bb
+                            <property name="y_options"></property>
6cfa3bb
+                            <property name="x_padding">3</property>
6cfa3bb
+                          </packing>
6cfa3bb
+                        </child>
6cfa3bb
+                        <child>
6cfa3bb
+                          <widget class="GtkRadioButton" id="physical-media">
6cfa3bb
+                            <property name="visible">True</property>
6cfa3bb
+                            <property name="can_focus">True</property>
6cfa3bb
+                            <property name="label" translatable="yes">_CD-ROM or DVD:</property>
6cfa3bb
+                            <property name="use_underline">True</property>
6cfa3bb
+                            <property name="response_id">0</property>
6cfa3bb
+                            <property name="active">True</property>
6cfa3bb
+                            <property name="draw_indicator">True</property>
6cfa3bb
+                            <signal name="toggled" handler="on_media_toggled"/>
6cfa3bb
+                          </widget>
6cfa3bb
+                          <packing>
6cfa3bb
+                            <property name="right_attach">3</property>
6cfa3bb
+                            <property name="top_attach">2</property>
6cfa3bb
+                            <property name="bottom_attach">3</property>
6cfa3bb
+                            <property name="x_options">GTK_FILL</property>
6cfa3bb
+                            <property name="y_options">GTK_FILL</property>
6cfa3bb
+                          </packing>
6cfa3bb
+                        </child>
6cfa3bb
+                        <child>
6cfa3bb
+                          <widget class="GtkAlignment" id="alignment5">
6cfa3bb
                             <property name="visible">True</property>
6cfa3bb
                             <property name="yalign">0</property>
6cfa3bb
                             <property name="yscale">0</property>
6cfa3bb
                             <child>
6cfa3bb
-                              <placeholder/>
6cfa3bb
+                              <widget class="GtkRadioButton" id="iso-image">
6cfa3bb
+                                <property name="visible">True</property>
6cfa3bb
+                                <property name="can_focus">True</property>
6cfa3bb
+                                <property name="label" translatable="yes">_ISO Image Location:</property>
6cfa3bb
+                                <property name="use_underline">True</property>
6cfa3bb
+                                <property name="response_id">0</property>
6cfa3bb
+                                <property name="draw_indicator">True</property>
6cfa3bb
+                                <property name="group">physical-media</property>
6cfa3bb
+                                <signal name="toggled" handler="on_media_toggled"/>
6cfa3bb
+                              </widget>
6cfa3bb
                             </child>
6cfa3bb
                           </widget>
6cfa3bb
                           <packing>
6cfa3bb
-                            <property name="top_attach">1</property>
6cfa3bb
-                            <property name="bottom_attach">2</property>
6cfa3bb
+                            <property name="right_attach">3</property>
6cfa3bb
                             <property name="x_options">GTK_FILL</property>
6cfa3bb
                             <property name="y_options">GTK_FILL</property>
6cfa3bb
                           </packing>
6cfa3bb
                         </child>
6cfa3bb
+                        <child>
6cfa3bb
+                          <widget class="GtkHBox" id="hbox2">
6cfa3bb
+                            <property name="visible">True</property>
6cfa3bb
+                            <child>
6cfa3bb
+                              <widget class="GtkLabel" id="label38">
6cfa3bb
+                                <property name="visible">True</property>
6cfa3bb
+                                <property name="xpad">5</property>
6cfa3bb
+                                <property name="label" translatable="yes">_Path to install media:</property>
6cfa3bb
+                                <property name="use_underline">True</property>
6cfa3bb
+                                <property name="mnemonic_widget">cd-path</property>
6cfa3bb
+                              </widget>
6cfa3bb
+                              <packing>
6cfa3bb
+                                <property name="expand">False</property>
6cfa3bb
+                                <property name="fill">False</property>
6cfa3bb
+                              </packing>
6cfa3bb
+                            </child>
6cfa3bb
+                            <child>
6cfa3bb
+                              <widget class="GtkComboBox" id="cd-path">
6cfa3bb
+                                <property name="visible">True</property>
6cfa3bb
+                                <signal name="changed" handler="on_cd_path_changed"/>
6cfa3bb
+                              </widget>
6cfa3bb
+                              <packing>
6cfa3bb
+                                <property name="position">1</property>
6cfa3bb
+                              </packing>
6cfa3bb
+                            </child>
6cfa3bb
+                          </widget>
6cfa3bb
+                          <packing>
6cfa3bb
+                            <property name="left_attach">1</property>
6cfa3bb
+                            <property name="right_attach">3</property>
6cfa3bb
+                            <property name="top_attach">3</property>
6cfa3bb
+                            <property name="bottom_attach">4</property>
6cfa3bb
+                          </packing>
6cfa3bb
+                        </child>
6cfa3bb
                       </widget>
6cfa3bb
                     </child>
6cfa3bb
                   </widget>
6cfa3bb
@@ -209,6 +209,17 @@
6cfa3bb
             <property name="visible">True</property>
6cfa3bb
             <property name="layout_style">GTK_BUTTONBOX_END</property>
6cfa3bb
             <child>
6cfa3bb
+              <widget class="GtkButton" id="Cancel">
6cfa3bb
+                <property name="visible">True</property>
6cfa3bb
+                <property name="can_focus">True</property>
6cfa3bb
+                <property name="can_default">True</property>
6cfa3bb
+                <property name="label">gtk-cancel</property>
6cfa3bb
+                <property name="use_stock">True</property>
6cfa3bb
+                <property name="response_id">-6</property>
6cfa3bb
+                <signal name="clicked" handler="on_cancel_clicked"/>
6cfa3bb
+              </widget>
6cfa3bb
+            </child>
6cfa3bb
+            <child>
6cfa3bb
               <widget class="GtkButton" id="OK">
6cfa3bb
                 <property name="visible">True</property>
6cfa3bb
                 <property name="can_focus">True</property>
6cfa3bb
@@ -218,17 +229,6 @@
6cfa3bb
                 <property name="response_id">-5</property>
6cfa3bb
                 <signal name="clicked" handler="on_ok_clicked"/>
6cfa3bb
               </widget>
6cfa3bb
-            </child>
6cfa3bb
-            <child>
6cfa3bb
-              <widget class="GtkButton" id="Cancel">
6cfa3bb
-                <property name="visible">True</property>
6cfa3bb
-                <property name="can_focus">True</property>
6cfa3bb
-                <property name="can_default">True</property>
6cfa3bb
-                <property name="label">gtk-cancel</property>
6cfa3bb
-                <property name="use_stock">True</property>
6cfa3bb
-                <property name="response_id">-6</property>
6cfa3bb
-                <signal name="clicked" handler="on_cancel_clicked"/>
6cfa3bb
-              </widget>
6cfa3bb
               <packing>
6cfa3bb
                 <property name="position">1</property>
6cfa3bb
               </packing>