[gdm/wip/initial-setup2] initial-setup: Update for newer design



commit 9ba6c4608e56401d61a6a61055b49c757fd397d3
Author: Matthias Clasen <mclasen redhat com>
Date:   Sat Apr 28 00:41:43 2012 -0400

    initial-setup: Update for newer design
    
    The Account page got moved to a dialog, and we have a 'take tour'
    button now - it doesn't do anything yet, though.

 gui/initial-setup/gdm-initial-setup.c |   85 +++++-
 gui/initial-setup/setup.ui            |  489 ++++++++++++++++++++-------------
 2 files changed, 375 insertions(+), 199 deletions(-)
---
diff --git a/gui/initial-setup/gdm-initial-setup.c b/gui/initial-setup/gdm-initial-setup.c
index 4bacde6..4f4466f 100644
--- a/gui/initial-setup/gdm-initial-setup.c
+++ b/gui/initial-setup/gdm-initial-setup.c
@@ -789,11 +789,14 @@ out: ;
 static void
 update_account_page_status (SetupData *setup)
 {
-        gtk_assistant_set_page_complete (setup->assistant, WID("account-page"),
-                                         setup->valid_name &&
-                                         setup->valid_username &&
-                                         (setup->valid_password ||
-                                          setup->password_mode == ACT_USER_PASSWORD_MODE_NONE));
+        gboolean complete;
+
+        complete = setup->valid_name && setup->valid_username &&
+                   (setup->valid_password ||
+                    setup->password_mode == ACT_USER_PASSWORD_MODE_NONE);
+
+        gtk_assistant_set_page_complete (setup->assistant, WID("account-page"), complete);
+        gtk_widget_set_sensitive (WID("local-account-done-button"), complete);
 }
 
 static void
@@ -1099,6 +1102,39 @@ save_account_data (SetupData *setup)
 }
 
 static void
+show_local_account_dialog (GtkButton *button, gpointer data)
+{
+        SetupData *setup = data;
+        GtkWidget *dialog;
+
+        dialog = WID("local-account-dialog");
+
+        gtk_window_present (GTK_WINDOW (dialog));
+}
+
+static void
+hide_local_account_dialog (GtkButton *button, gpointer data)
+{
+        SetupData *setup = data;
+        GtkWidget *dialog;
+
+        dialog = WID("local-account-dialog");
+
+        gtk_widget_hide (dialog);
+        clear_account_page (setup);
+}
+
+static void
+create_local_account (GtkButton *button, gpointer data)
+{
+        SetupData *setup = data;
+        GtkWidget *dialog;
+
+        dialog = WID("local-account-dialog");
+        gtk_widget_hide (dialog);
+}
+
+static void
 prepare_account_page (SetupData *setup)
 {
         GtkWidget *fullname_entry;
@@ -1107,6 +1143,9 @@ prepare_account_page (SetupData *setup)
         GtkWidget *admin_check;
         GtkWidget *password_entry;
         GtkWidget *confirm_entry;
+        GtkWidget *local_account_create_button;
+        GtkWidget *local_account_cancel_button;
+        GtkWidget *local_account_done_button;
 
         fullname_entry = WID("account-fullname-entry");
         username_combo = WID("account-username-combo");
@@ -1114,6 +1153,9 @@ prepare_account_page (SetupData *setup)
         admin_check = WID("account-admin-check");
         password_entry = WID("account-password-entry");
         confirm_entry = WID("account-confirm-entry");
+        local_account_create_button = WID("local-account-button");
+        local_account_cancel_button = WID("local-account-cancel-button");
+        local_account_done_button = WID("local-account-done-button");
 
         g_signal_connect (fullname_entry, "notify::text",
                           G_CALLBACK (fullname_changed), setup);
@@ -1129,6 +1171,12 @@ prepare_account_page (SetupData *setup)
                           G_CALLBACK (confirm_changed), setup);
         g_signal_connect_after (confirm_entry, "focus-out-event",
                                 G_CALLBACK (confirm_entry_focus_out), setup);
+        g_signal_connect (local_account_create_button, "clicked",
+                          G_CALLBACK (show_local_account_dialog), setup);
+        g_signal_connect (local_account_cancel_button, "clicked",
+                          G_CALLBACK (hide_local_account_dialog), setup);
+        g_signal_connect (local_account_done_button, "clicked",
+                          G_CALLBACK (create_local_account), setup);
 
         setup->act_client = act_user_manager_get_default ();
 
@@ -1324,7 +1372,7 @@ prepare_location_page (SetupData *setup)
                           G_CALLBACK (location_changed_cb), setup);
 }
 
-/* Online accounts {{{1 */
+/* Online accounts page {{{1 */
 
 static GtkWidget *
 create_provider_button (const gchar *type, const gchar *name, GIcon *icon)
@@ -1822,12 +1870,32 @@ begin_autologin (SetupData *setup)
 }
 
 static void
-close_cb (GtkAssistant *assi, SetupData *setup)
+byebye_cb (GtkButton *button, SetupData *setup)
+{
+        begin_autologin (setup);
+}
+
+static void
+tour_cb (GtkButton *button, SetupData *setup)
 {
+        /* TODO: arrange for tour to begin */
         begin_autologin (setup);
 }
 
 static void
+prepare_summary_page (SetupData *setup)
+{
+        GtkWidget *button;
+
+        button = WID("byebye");
+        g_signal_connect (button, "clicked",
+                          G_CALLBACK (byebye_cb), setup);
+        button = WID("byebye-tour");
+        g_signal_connect (button, "clicked",
+                          G_CALLBACK (tour_cb), setup);
+}
+
+static void
 prepare_cb (GtkAssistant *assi, GtkWidget *page, SetupData *setup)
 {
         g_debug ("Preparing page %s", gtk_widget_get_name (page));
@@ -1851,8 +1919,6 @@ prepare_assistant (SetupData *setup)
 
         g_signal_connect (G_OBJECT (setup->assistant), "prepare",
                           G_CALLBACK (prepare_cb), setup);
-        g_signal_connect (G_OBJECT (setup->assistant), "close",
-                          G_CALLBACK (close_cb), setup);
 
         /* connect to gdm slave */
         connect_to_slave (setup);
@@ -1862,6 +1928,7 @@ prepare_assistant (SetupData *setup)
         prepare_account_page (setup);
         prepare_location_page (setup);
         prepare_online_page (setup);
+        prepare_summary_page (setup);
 }
 
 /* main {{{1 */
diff --git a/gui/initial-setup/setup.ui b/gui/initial-setup/setup.ui
index 28027a0..1082e82 100644
--- a/gui/initial-setup/setup.ui
+++ b/gui/initial-setup/setup.ui
@@ -30,6 +30,210 @@
       </object>
     </child>
   </object>
+  <object class="GtkDialog" id="local-account-dialog">
+    <property name="title"></property>
+    <property name="transient-for">gnome-setup-assistant</property>
+    <property name="modal">True</property>
+    <property name="resizable">False</property>
+    <child internal-child="action_area">
+      <object class="GtkBox" id="local-account-action-area">
+        <child>
+          <object class="GtkButton" id="local-account-cancel-button">
+            <property name="visible">True</property>
+            <property name="label" translatable="True">_Cancel</property>
+            <property name="use-underline">True</property>
+          </object>
+        </child>
+        <child>
+          <object class="GtkButton" id="local-account-done-button">
+            <property name="visible">True</property>
+            <property name="sensitive">False</property>
+            <property name="label" translatable="True">_Done</property>
+            <property name="use-underline">True</property>
+          </object>
+        </child>
+      </object>
+    </child>
+    <child internal-child="vbox">
+      <object class="GtkBox" id="local-account-content-area">
+        <property name="margin">12</property>
+        <child>
+          <object class="GtkGrid" id="local-account-grid">
+            <property name="visible">True</property>
+            <property name="row-spacing">6</property>
+            <property name="column-spacing">12</property>
+            <property name="margin-bottom">18</property>
+            <child>
+              <object class="GtkLabel" id="account-fullname-label">
+                <property name="visible">True</property>
+                <property name="label" translatable="yes">_Fullname</property>
+                <property name="use_underline">True</property>
+                <property name="mnemonic_widget">account-fullname-entry</property>
+                <property name="halign">end</property>
+                <style>
+                  <class name="dim-label"/>
+                </style>
+              </object>
+              <packing>
+                <property name="left-attach">0</property>
+                <property name="top-attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkEntry" id="account-fullname-entry">
+                <property name="visible">True</property>
+                <property name="halign">start</property>
+              </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">1</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+
+        <child>
+          <object class="GtkLabel" id="account-username-label">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">_Username</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">account-username-combo</property>
+            <property name="halign">end</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">2</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkComboBoxText" id="account-username-combo">
+            <property name="visible">True</property>
+            <property name="halign">start</property>
+            <property name="has_entry">True</property>
+            <property name="entry_text_column">0</property>
+            <property name="model">account-username-model</property>
+          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">2</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+
+        <child>
+          <object class="GtkCheckButton" id="account-password-check">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">_Require a password to use this account</property>
+            <property name="use_underline">True</property>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">3</property>
+            <property name="width">2</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+
+        <child>
+          <object class="GtkLabel" id="account-password-label">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">_Password</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">account-password-entry</property>
+            <property name="halign">end</property>
+            <style>
+              <class name="dim-label"/>
+            </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="GtkEntry" id="account-password-entry">
+            <property name="visible">True</property>
+            <property name="halign">start</property>
+            <property name="visibility">False</property>
+          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">4</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+
+        <child>
+          <object class="GtkLabel" id="account-confirm-label">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">_Confirm Password</property>
+            <property name="use_underline">True</property>
+            <property name="mnemonic_widget">account-confirm-entry</property>
+            <property name="halign">end</property>
+            <style>
+              <class name="dim-label"/>
+            </style>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">5</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkEntry" id="account-confirm-entry">
+            <property name="visible">True</property>
+            <property name="halign">start</property>
+            <property name="visibility">False</property>
+          </object>
+          <packing>
+            <property name="left-attach">1</property>
+            <property name="top-attach">5</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+
+        <child>
+          <object class="GtkCheckButton" id="account-admin-check">
+            <property name="visible">True</property>
+            <property name="label" translatable="yes">_Act as administrator of this computer</property>
+            <property name="use_underline">True</property>
+          </object>
+          <packing>
+            <property name="left-attach">0</property>
+            <property name="top-attach">6</property>
+            <property name="width">2</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+      </object>
+    </child>
+    <action-widgets>
+      <action-widget response="-6">local-account-cancel-button</action-widget>
+      <action-widget response="-5">local-account-done-button</action-widget>
+    </action-widgets>
+  </object>
+  <object class="GtkSizeGroup" id="byebye-sizegroup">
+    <widgets>
+      <widget name="byebye"/>
+      <widget name="byebye-tour"/>
+    </widgets>
+  </object>
   <object class="GtkAssistant" id="gnome-setup-assistant">
     <!-- interface-naming-policy toplevel-contextual -->
     <property name="border-width">12</property>
@@ -46,8 +250,8 @@
         <child>
           <object class="GtkLabel" id="welcome-title">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">Welcome to GNOME</property>
-            <property name="halign">start</property>
+            <property name="label" translatable="yes">Welcome to GNOME 3</property>
+            <property name="halign">center</property>
             <property name="valign">start</property>
             <property name="margin-bottom">18</property>
             <attributes>
@@ -63,7 +267,7 @@
         <child>
           <object class="GtkImage" id="welcome-image">
             <property name="visible">True</property>
-            <property name="halign">start</property>
+            <property name="halign">center</property>
             <property name="valign">start</property>
             <property name="file">resource:///image/welcome-image.jpg</property>
           </object>
@@ -75,13 +279,10 @@
         <child>
           <object class="GtkLabel" id="welcome-subtitle">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">Now let's set up some essentials for your account.</property>
-            <property name="halign">start</property>
-            <property name="xalign">0.0</property>
+            <property name="label" translatable="yes">Let's set up some essentials.</property>
+            <property name="halign">center</property>
             <property name="margin-top">18</property>
             <property name="margin-bottom">18</property>
-            <property name="wrap">True</property>
-            <property name="width-chars">50</property>
             <attributes>
               <attribute name="weight" value="bold"/>
             </attributes>
@@ -104,8 +305,8 @@
         <child>
           <object class="GtkLabel" id="network-title">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">Connect to the Network</property>
-            <property name="halign">start</property>
+            <property name="label" translatable="yes">Wireless Networks</property>
+            <property name="center">start</property>
             <property name="valign">start</property>
             <property name="margin-bottom">18</property>
             <attributes>
@@ -121,24 +322,6 @@
           </packing>
         </child>
         <child>
-          <object class="GtkLabel" id="network-subtitle">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">Select a wireless network</property>
-            <property name="margin-bottom">12</property>
-            <property name="halign">start</property>
-            <property name="valign">start</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
-          </object>
-          <packing>
-            <property name="left_attach">0</property>
-            <property name="top_attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
           <object class="GtkScrolledWindow" id="network-scrolledwindow">
             <property name="visible">True</property>
             <property name="halign">fill</property>
@@ -147,7 +330,6 @@
             <property name="vexpand">True</property>
             <property name="margin-top">0</property>
             <property name="margin-bottom">32</property>
-            <property name="margin-right">64</property>
             <property name="hscrollbar-policy">never</property>
             <property name="vscrollbar-policy">automatic</property>
             <property name="shadow-type">in</property>
@@ -176,7 +358,7 @@
           </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>
@@ -190,7 +372,7 @@
               <object class="GtkSpinner" id="no-network-spinner">
                 <property name="visible">True</property>
                 <property name="active">True</property>
-                <property name="halign">start</property>
+                <property name="halign">center</property>
                 <property name="valign">center</property>
                 <property name="margin-left">6</property>
                 <property name="margin-right">6</property>
@@ -206,7 +388,7 @@
               <object class="GtkLabel" id="no-network-label">
                 <property name="visible">True</property>
                 <property name="label">No text</property>
-                <property name="halign">start</property>
+                <property name="halign">center</property>
                 <property name="valign">center</property>
               </object>
               <packing>
@@ -233,15 +415,14 @@
       <object class="GtkGrid" id="account-page">
         <property name="name">account-page</property>
         <property name="visible">True</property>
-        <property name="row-spacing">6</property>
-        <property name="column-spacing">12</property>
         <child>
           <object class="GtkLabel" id="account-title">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">Create an Account</property>
-            <property name="halign">start</property>
+            <property name="label" translatable="yes">Choose How to Login</property>
+            <property name="hexpand">True</property>
+            <property name="halign">center</property>
             <property name="valign">start</property>
-            <property name="margin-bottom">12</property>
+            <property name="margin-bottom">18</property>
             <attributes>
               <attribute name="weight" value="bold"/>
               <attribute name="scale" value="1.2"/>
@@ -250,166 +431,38 @@
           <packing>
             <property name="left_attach">0</property>
             <property name="top_attach">0</property>
-            <property name="width">2</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkLabel" id="account-fullname-label">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">_Fullname</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">account-fullname-entry</property>
-            <property name="halign">end</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
-          </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">1</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="account-fullname-entry">
-            <property name="visible">True</property>
-            <property name="halign">start</property>
-          </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">1</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
         </child>
-
         <child>
-          <object class="GtkLabel" id="account-username-label">
+          <object class="GtkButton" id="local-account-button">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">_Username</property>
+            <property name="label" translatable="yes">Create a _Local Account</property>
             <property name="use_underline">True</property>
-            <property name="mnemonic_widget">account-username-combo</property>
-            <property name="halign">end</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
+            <property name="halign">center</property>
           </object>
           <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkComboBoxText" id="account-username-combo">
-            <property name="visible">True</property>
-            <property name="halign">start</property>
-            <property name="has_entry">True</property>
-            <property name="entry_text_column">0</property>
-            <property name="model">account-username-model</property>
-          </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">2</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-
-        <child>
-          <object class="GtkCheckButton" id="account-password-check">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">_Require a password to use this account</property>
-            <property name="use_underline">True</property>
-          </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">3</property>
-            <property name="width">2</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-
-        <child>
-          <object class="GtkLabel" id="account-password-label">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">_Password</property>
-            <property name="use_underline">True</property>
-            <property name="mnemonic_widget">account-password-entry</property>
-            <property name="halign">end</property>
-            <style>
-              <class name="dim-label"/>
-            </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="GtkEntry" id="account-password-entry">
-            <property name="visible">True</property>
-            <property name="halign">start</property>
-            <property name="visibility">False</property>
-          </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">4</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">1</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
         </child>
-
         <child>
-          <object class="GtkLabel" id="account-confirm-label">
+          <object class="GtkButton" id="remote-account-button">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">_Confirm Password</property>
+            <property name="label" translatable="yes">Use an _Enterprise Login</property>
+            <property name="halign">center</property>
             <property name="use_underline">True</property>
-            <property name="mnemonic_widget">account-confirm-entry</property>
-            <property name="halign">end</property>
-            <style>
-              <class name="dim-label"/>
-            </style>
           </object>
           <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">5</property>
-            <property name="width">1</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
-        <child>
-          <object class="GtkEntry" id="account-confirm-entry">
-            <property name="visible">True</property>
-            <property name="halign">start</property>
-            <property name="visibility">False</property>
-          </object>
-          <packing>
-            <property name="left-attach">1</property>
-            <property name="top-attach">5</property>
+            <property name="left_attach">0</property>
+            <property name="top_attach">2</property>
             <property name="width">1</property>
             <property name="height">1</property>
           </packing>
         </child>
-
-        <child>
-          <object class="GtkCheckButton" id="account-admin-check">
-            <property name="visible">True</property>
-            <property name="label" translatable="yes">_Act as administrator of this computer</property>
-            <property name="use_underline">True</property>
-          </object>
-          <packing>
-            <property name="left-attach">0</property>
-            <property name="top-attach">6</property>
-            <property name="width">2</property>
-            <property name="height">1</property>
-          </packing>
-        </child>
       </object>
       <packing>
         <property name="title" translatable="yes">Account</property>
@@ -422,8 +475,8 @@
         <child>
           <object class="GtkLabel" id="location-title">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">Select your Location</property>
-            <property name="halign">start</property>
+            <property name="label" translatable="yes">Choose your Location</property>
+            <property name="halign">center</property>
             <property name="valign">start</property>
             <property name="margin-bottom">18</property>
             <attributes>
@@ -545,8 +598,8 @@
         <child>
           <object class="GtkLabel" id="online-title">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">Web Accounts</property>
-            <property name="halign">start</property>
+            <property name="label" translatable="yes">Online Accounts</property>
+            <property name="halign">center</property>
             <property name="valign">start</property>
             <property name="margin-bottom">18</property>
             <attributes>
@@ -564,7 +617,7 @@
         <child>
           <object class="GtkLabel" id="online-subtitle">
             <property name="visible">True</property>
-            <property name="label" translatable="yes">Associate your new account with your existing online accounts</property>
+            <property name="label" translatable="yes">Associate your new account with your existing online accounts.</property>
             <property name="halign">start</property>
             <property name="valign">start</property>
             <property name="margin-bottom">18</property>
@@ -612,7 +665,7 @@
         </child>
       </object>
       <packing>
-        <property name="title" translatable="yes">Web Accounts</property>
+        <property name="title" translatable="yes">Online Accounts</property>
       </packing>
     </child>
     <child>
@@ -623,7 +676,7 @@
           <object class="GtkLabel" id="summary-title">
             <property name="visible">True</property>
             <property name="label" translatable="yes">Enjoy GNOME !</property>
-            <property name="halign">start</property>
+            <property name="halign">center</property>
             <property name="valign">start</property>
             <property name="margin-bottom">18</property>
             <attributes>
@@ -641,14 +694,9 @@
         <child>
           <object class="GtkLabel" id="summary-details">
             <property name="visible">True</property>
-            <property name="xalign">0.0</property>
-            <property name="label" translatable="yes">Your new account is ready to use. You may change any of these options at any time in the System Settings.</property>
-            <property name="wrap">True</property>
-            <property name="halign">start</property>
+            <property name="label" translatable="yes">Your new account is ready to use.</property>
+            <property name="halign">center</property>
             <property name="valign">start</property>
-            <attributes>
-              <attribute name="weight" value="bold"/>
-            </attributes>
           </object>
           <packing>
             <property name="left_attach">0</property>
@@ -657,10 +705,71 @@
             <property name="height">1</property>
           </packing>
         </child>
+        <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="halign">center</property>
+            <property name="valign">start</property>
+          </object>
+          <packing>
+            <property name="left_attach">0</property>
+            <property name="top_attach">2</property>
+            <property name="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkButton" id="byebye">
+            <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="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="halign">center</property>
+            <property name="valign">start</property>
+          </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="byebye-tour">
+            <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="width">1</property>
+            <property name="height">1</property>
+          </packing>
+        </child>
       </object>
       <packing>
         <property name="title" translatable="yes">Summary</property>
-        <property name="page-type">summary</property>
+        <property name="page-type">custom</property>
       </packing>
     </child>
   </object>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]