[gnome-initial-setup] Move summary page closer to the design

[Matthias Clasen <matthiasc src gnome org>]

commit 15470e2d9586178e59f2b18d88c7932a4f1a547d
Author: Matthias Clasen <mclasen redhat com>
Date:   Wed Jan 9 20:00:32 2013 -0500

    Move summary page closer to the design
    
    We just have a single button now, and we always start the welcome
    tour. The button is using the suggested-action style.

 .../pages/summary/gis-summary-page.c               |    3 +-
 .../pages/summary/gis-summary-page.ui              |   87 +++++---------------
 2 files changed, 22 insertions(+), 68 deletions(-)
---
diff --git a/gnome-initial-setup/pages/summary/gis-summary-page.c b/gnome-initial-setup/pages/summary/gis-summary-page.c
index 2883dbc..f70df21 100644
--- a/gnome-initial-setup/pages/summary/gis-summary-page.c
+++ b/gnome-initial-setup/pages/summary/gis-summary-page.c
@@ -284,8 +284,7 @@ gis_summary_page_constructed (GObject *object)
 
   g_signal_connect_object (assistant, "prepare", G_CALLBACK (prepare_cb), page, 0);
 
-  g_signal_connect (WID("summary-start-button"), "clicked", G_CALLBACK (byebye_cb), page);
-  g_signal_connect (WID("summary-tour-button"), "clicked", G_CALLBACK (tour_cb), page);
+  g_signal_connect (WID("summary-start-button"), "clicked", G_CALLBACK (tour_cb), page);
 
   gis_page_set_title (GIS_PAGE (page), _("Thank You"));
   gis_page_set_complete (GIS_PAGE (page), TRUE);
diff --git a/gnome-initial-setup/pages/summary/gis-summary-page.ui b/gnome-initial-setup/pages/summary/gis-summary-page.ui
index 6a9b0f5..048db98 100644
--- a/gnome-initial-setup/pages/summary/gis-summary-page.ui
+++ b/gnome-initial-setup/pages/summary/gis-summary-page.ui
@@ -1,45 +1,22 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <requires lib="gtk+" version="3.0"/>
-  <object class="GtkSizeGroup" id="summary-sizegroup">
-    <widgets>
-      <widget name="summary-start-button"/>
-      <widget name="summary-tour-button"/>
-    </widgets>
-  </object>
+  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkGrid" id="summary-page">
-    <property name="name">summary-page</property>
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <property name="halign">center</property>
     <child>
-      <object class="GtkLabel" id="summary-title">
-        <property name="visible">True</property>
-        <property name="label" translatable="yes">Enjoy GNOME!</property>
-        <property name="halign">center</property>
-        <property name="valign">start</property>
-        <property name="margin-bottom">18</property>
-        <attributes>
-          <attribute name="weight" value="bold"/>
-          <attribute name="scale" value="1.2"/>
-        </attributes>
-      </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">0</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
-      </packing>
-    </child>
-    <child>
       <object class="GtkLabel" id="summary-details">
         <property name="visible">True</property>
-        <property name="label" translatable="yes">Your new account is ready to use.</property>
+        <property name="can_focus">False</property>
         <property name="halign">center</property>
         <property name="valign">start</property>
+        <property name="margin_top">48</property>
+        <property name="label" translatable="yes">Your computer is ready to use.</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">1</property>
+        <property name="top_attach">0</property>
         <property name="width">1</property>
         <property name="height">1</property>
       </packing>
@@ -47,63 +24,41 @@
     <child>
       <object class="GtkLabel" id="summary-details2">
         <property name="visible">True</property>
-        <property name="label" translatable="yes">You may change any of these options at any time in the System Settings.</property>
+        <property name="can_focus">False</property>
         <property name="halign">center</property>
         <property name="valign">start</property>
+        <property name="margin_top">16</property>
+        <property name="label" translatable="yes">You may change these options at any time in Settings.</property>
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">2</property>
+        <property name="top_attach">1</property>
         <property name="width">1</property>
         <property name="height">1</property>
       </packing>
     </child>
     <child>
       <object class="GtkButton" id="summary-start-button">
-        <property name="visible">True</property>
-        <property name="use-underline">True</property>
         <property name="label" translatable="yes">_Start using GNOME 3</property>
-        <property name="halign">center</property>
-        <property name="valign">start</property>
-        <property name="vexpand">True</property>
-        <property name="margin">18</property>
-      </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">3</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkLabel" id="summary-tour-details">
         <property name="visible">True</property>
-        <property name="label" translatable="yes">New to GNOME 3 and need help finding your way around?</property>
+        <property name="can_focus">False</property>
+        <property name="receives_default">False</property>
         <property name="halign">center</property>
         <property name="valign">start</property>
+        <property name="margin_top">24</property>
+        <property name="vexpand">True</property>
+        <property name="use_underline">True</property>
+        <style>
+          <class name="suggested-action"/>
+        </style>
       </object>
       <packing>
         <property name="left_attach">0</property>
-        <property name="top_attach">4</property>
-        <property name="width">1</property>
-        <property name="height">1</property>
-      </packing>
-    </child>
-    <child>
-      <object class="GtkButton" id="summary-tour-button">
-        <property name="visible">True</property>
-        <property name="use-underline">True</property>
-        <property name="label" translatable="yes">_Take a Tour</property>
-        <property name="halign">center</property>
-        <property name="valign">start</property>
-        <property name="margin">18</property>
-      </object>
-      <packing>
-        <property name="left_attach">0</property>
-        <property name="top_attach">5</property>
+        <property name="top_attach">2</property>
         <property name="width">1</property>
         <property name="height">1</property>
       </packing>
     </child>
   </object>
+  <object class="GtkSizeGroup" id="summary-sizegroup"/>
 </interface>