[[PATCH rhel7-branch] 5/5] Move the Quit button to the right and make it consistently sized (#1038802).

Chris Lumens clumens at redhat.com
Mon Jan 27 15:09:18 UTC 2014


---
 pyanaconda/ui/gui/hubs/summary.glade | 8 ++++----
 widgets/src/StandaloneWindow.c       | 3 ++-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/pyanaconda/ui/gui/hubs/summary.glade b/pyanaconda/ui/gui/hubs/summary.glade
index a553102..0727f40 100644
--- a/pyanaconda/ui/gui/hubs/summary.glade
+++ b/pyanaconda/ui/gui/hubs/summary.glade
@@ -71,6 +71,8 @@
             <property name="can_focus">False</property>
             <property name="margin_left">6</property>
             <property name="margin_right">6</property>
+            <property name="spacing">12</property>
+            <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="quitButton">
                 <property name="label" translatable="yes">_Quit</property>
@@ -78,7 +80,6 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="halign">start</property>
                 <property name="hexpand">True</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
@@ -96,13 +97,12 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="receives_default">True</property>
-                <property name="halign">end</property>
-                <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
+                <property name="pack_type">end</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -120,7 +120,7 @@
             <property name="xalign">1</property>
             <property name="margin_right">6</property>
             <property name="margin_bottom">6</property>
-            <property name="label" translatable="yes">We won't touch your disks until you hit this button.</property>
+            <property name="label" translatable="yes">We won't touch your disks until you click 'Begin Installation'.</property>
             <attributes>
               <attribute name="font-desc" value="Cantarell Italic"/>
               <attribute name="foreground" value="grey"/>
diff --git a/widgets/src/StandaloneWindow.c b/widgets/src/StandaloneWindow.c
index 28b25e2..2b04c49 100644
--- a/widgets/src/StandaloneWindow.c
+++ b/widgets/src/StandaloneWindow.c
@@ -148,7 +148,8 @@ static void anaconda_standalone_window_init(AnacondaStandaloneWindow *win) {
     gtk_widget_set_margin_left(win->priv->button_box, 6);
     gtk_widget_set_margin_right(win->priv->button_box, 6);
     gtk_widget_set_margin_bottom(win->priv->button_box, 6);
-    gtk_button_box_set_layout(GTK_BUTTON_BOX(win->priv->button_box), GTK_BUTTONBOX_EDGE);
+    gtk_button_box_set_layout(GTK_BUTTON_BOX(win->priv->button_box), GTK_BUTTONBOX_END);
+    gtk_box_set_spacing(GTK_BOX(win->priv->button_box), 12);
     gtk_container_add(GTK_CONTAINER(win->priv->button_box), win->priv->quit_button);
     gtk_container_add(GTK_CONTAINER(win->priv->button_box), win->priv->continue_button);
 
-- 
1.8.3.1



More information about the anaconda-patches mailing list