Merge lp:~adam-davies/granite/fix-1071944 into lp:~elementary-pantheon/granite/granite

[Adam Davies]

Fixes bug 1071944.

[lp:~adam-davies/granite/fix-1071944]

458. By Adam Davies <email address hidden> on 2012-11-16

Fixed code style

459. By Adam Davies <email address hidden> on 2012-11-16

Replaced tabs with spaces

460. By Adam Davies <email address hidden> on 2012-11-16

Fixed typo

[Victor Martinez (victored)]

Looks perfect to me. Thank you!

review: Approve

[lp:~adam-davies/granite/fix-1071944]

461. By Adam Davies <email address hidden> on 2012-11-16

Fixed whitespace

462. By Adam Davies <email address hidden> on 2012-11-16

Code style change

=== modified file 'lib/Widgets/Welcome.vala'
--- lib/Widgets/Welcome.vala	2012-11-10 21:41:04 +0000
+++ lib/Widgets/Welcome.vala	2012-11-16 03:13:20 +0000
@@ -39,7 +39,33 @@
      * Box for action items
      */
     protected Gtk.Box options;
-
+    
+    /**
+     * This is the title of the welcome widget.
+     */
+    public string title {
+        get {
+            return title_label.get_label ();
+        }
+        set {
+            title_label.set_label (value);
+        }
+    }
+
+    /**
+     * This is the subtitle of the welcome widget.
+     */
+    public string subtitle {
+        get {
+            return subtitle_label.get_label ();
+        }
+        set {
+            subtitle_label.set_label (value);
+        }
+    }
+
+    private Gtk.Label title_label;
+    private Gtk.Label subtitle_label;
     /**
      * Makes new Welcome Page
      *
@@ -60,19 +86,19 @@
         content.pack_start (new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0), true, true, 0);
 
         // Labels
-        var title = new Gtk.Label (title_text);
-        Utils.apply_text_style_to_label (TextStyle.H1, title);
-
-        title.set_justify (Gtk.Justification.CENTER);
-        content.pack_start (title, false, true, 0);
-
-        var subtitle = new Gtk.Label (subtitle_text);
-        Utils.apply_text_style_to_label (TextStyle.H2, subtitle);
-
-        subtitle.sensitive = false;
-        subtitle.set_justify (Gtk.Justification.CENTER);
-
-        content.pack_start (subtitle, false, true, 2);
+        title_label = new Gtk.Label (title_text);
+        Utils.apply_text_style_to_label (TextStyle.H1, title_label);
+
+        title_label.set_justify (Gtk.Justification.CENTER);
+        content.pack_start (title_label, false, true, 0);
+
+        subtitle_label = new Gtk.Label (subtitle_text);
+        Utils.apply_text_style_to_label (TextStyle.H2, subtitle_label);
+
+        subtitle_label.sensitive = false;
+        subtitle_label.set_justify (Gtk.Justification.CENTER);
+
+        content.pack_start (subtitle_label, false, true, 2);
 
         // Options wrapper
         this.options = new Gtk.Box (Gtk.Orientation.VERTICAL, 8);