Merge lp:~victored/granite/welcome-screen into lp:~elementary-pantheon/granite/granite

[Victor Martinez]

Welcome Screen:
- Style changes (white background, etc.)
- New functions:
  append_with_image (Gtk.Image? icon, string option, string description);
  append_with_pixbuf (Gdk.Pixbuf? icon, string option, string description);

This fixes lp:909067

[lp:~victored/granite/welcome-screen]

151. By Victor Martinez on 2012-01-02

- More logical function names
- Code cleanup
- Finished basic button styling

152. By Victor Martinez on 2012-01-02

Small tweaks

153. By Victor Martinez on 2012-01-02

* Font and spacing adjustments
* Smarter case correction

154. By Victor Martinez on 2012-01-07

- Added Daniel's CSS theme
- Minor code Fixes

155. By Victor Martinez on 2012-01-11

Removed style provider

=== modified file 'demo/main.vala'
--- demo/main.vala	2012-01-06 20:47:23 +0000
+++ demo/main.vala	2012-01-11 19:46:23 +0000
@@ -25,35 +25,35 @@
 {
     construct
     {
-		application_id = "demo.granite.org";
-		program_name = "Granite Demo";
-		app_years = "2011";
-		
-		build_version = "1.0";
-		app_icon = "text-editor";
-		main_url = "https://launchpad.net/granite";
-		bug_url = "https://bugs.launchpad.net/granite";
-		help_url = "https://answers.launchpad.net/granite";
-		translate_url = "https://translations.launchpad.net/granite";
-		about_authors = {"Kekun",
-						 null
-						 };
-		about_documenters = {"Valadoc",
-							 null
-							 };
-		about_artists = {"Daniel P. Fore",
-						 null
-						 };
-		
-		about_authors = {"Maxwell Barvian <[e-mail]>",
-						 "Daniel Foré <[e-mail]>",
-						 "Avi Romanoff <[e-mail]>",
-						 null
-						 };
-
-		about_comments = "A demo of the Granite toolkit";
-		about_translators = "Launchpad Translators";
-		about_license_type = Gtk.License.GPL_3_0;
+        application_id = "demo.granite.org";
+        program_name = "Granite Demo";
+        app_years = "2011";
+
+        build_version = "1.0";
+        app_icon = "text-editor";
+        main_url = "https://launchpad.net/granite";
+        bug_url = "https://bugs.launchpad.net/granite";
+        help_url = "https://answers.launchpad.net/granite";
+        translate_url = "https://translations.launchpad.net/granite";
+        about_authors = {"Kekun",
+                         null
+                         };
+        about_documenters = {"Valadoc",
+                             null
+                             };
+        about_artists = {"Daniel P. Fore",
+                         null
+                         };
+
+        about_authors = {"Maxwell Barvian <[e-mail]>",
+                         "Daniel Foré <[e-mail]>",
+                         "Avi Romanoff <[e-mail]>",
+                         null
+                         };
+
+        about_comments = "A demo of the Granite toolkit";
+        about_translators = "Launchpad Translators";
+        about_license_type = Gtk.License.GPL_3_0;
     }
     public Demo()
     {
@@ -62,16 +62,33 @@
     public override void activate() {
         var win = new Gtk.Window();
         win.delete_event.connect( () => { Gtk.main_quit(); return false; });
-        
+
         var notebook = new Gtk.Notebook();
         win.add(notebook);
-        
+
         /* welcome */
-        var welcome = new Welcome("Granite", "Let's try...");
+
+        // These strings will be automatically corrected by the widget
+        var welcome = new Welcome("welcome widget", "description text");
         notebook.append_page(welcome, new Gtk.Label("Welcome"));
-        welcome.append("gtk-open", "Open", "Open a file");
-        welcome.append("gtk-save", "Save", "Save with a much longer description");
-        
+
+        Gdk.Pixbuf? pixbuf = null;
+
+        try {
+            pixbuf = Gtk.IconTheme.get_default().load_icon ("document-new", 48, Gtk.IconLookupFlags.GENERIC_FALLBACK);
+        }
+        catch(Error e) {
+            warning("Could not load icon, %s", e.message);
+        }
+
+        Gtk.Image? image = new Gtk.Image.from_icon_name("document-open", Gtk.IconSize.DIALOG);
+
+        // Adding elements. Use the most convenient function to add an icon
+        welcome.append_with_pixbuf(pixbuf, "create", "write a new document");
+        welcome.append_with_image(image, "open", "select a file");
+        welcome.append("document-save", "save", "with a much longer description");
+        welcome.append("help-info", "Discover", "Learn more about this app");
+
         /* modebutton */
         var mode_button = new ModeButton();
         mode_button.valign = Gtk.Align.CENTER;
@@ -80,8 +97,8 @@
         mode_button.append(new Gtk.Label("Input"));
         mode_button.append(new Gtk.Label("Output"));
         mode_button.append(new Gtk.Label("Quite long"));
-        mode_button.append(new Gtk.Label("Veruy very long \n with a line break"));
-        
+        mode_button.append(new Gtk.Label("Very very long \n with a line break"));
+
         var vbox = new Gtk.VBox(false, 0);
         var toolbar = new Gtk.Toolbar();
         toolbar.get_style_context().add_class("primary-toolbar");
@@ -105,7 +122,7 @@
         toolbutton.add(tool_mode);
         toolbar.insert(toolbutton, -1);
         vbox.pack_start(toolbar, false, false);
-        
+
         vbox.pack_start(mode_button);
 
         mode_button = new ModeButton();
@@ -115,26 +132,26 @@
         mode_button.append(new Gtk.Label("a"));
         vbox.pack_start(mode_button);
         notebook.append_page(vbox, new Gtk.Label("ModeButton"));
-        
+
         /* static notebook */
         var staticbox = new Gtk.VBox (false, 5);
         var staticnotebook = new StaticNotebook ();
-        
+
         var pageone = new Gtk.Label("Page 1");
-        
+
         staticnotebook.append_page (new Gtk.Label("Page 1"), pageone);
         staticnotebook.append_page (new Gtk.Label("Page 2"), new Gtk.Label("Page 2"));
         staticnotebook.append_page (new Gtk.Label("Page 3"), new Gtk.Label("Page 3"));
-        
+
         staticnotebook.page_changed.connect(() => pageone.set_text("Page changed"));
-        
+
         staticbox.add (staticnotebook);
-        
+
         notebook.append_page (staticbox, new Gtk.Label ("Static Notebook"));
         var button_about = new Gtk.Button.with_label("show_about");
         notebook.append_page (button_about, new Gtk.Label ("About Dialog"));
         button_about.clicked.connect(() => { show_about(win); } );
-        
+
         var popover_buttons = new Gtk.VBox(false, 0);
         var hbox3 = new Gtk.HBox(false, 0);
         hbox3.halign = Gtk.Align.END;
@@ -145,7 +162,7 @@
             var pop = new PopOver();
             var pop_hbox = (Gtk.Box)pop.get_content_area();
             pop_hbox.add(new HintedEntry("This is an HIntedEntry"));
-            pop_hbox.add(new Gtk.Label("Another label")); 
+            pop_hbox.add(new Gtk.Label("Another label"));
             var mode_pop = new ModeButton();
             mode_pop.append(new Gtk.Label("ele"));
             mode_pop.append(new Gtk.Label("ment"));
@@ -160,13 +177,13 @@
         popover_buttons.pack_start(new Gtk.Label("Let's try the PopOvers!"), false, false);
         popover_buttons.pack_start(hbox3, false, false);
         notebook.append_page (popover_buttons, new Gtk.Label ("PopOvers"));
-        
+
         var calendar_button = new Gtk.HBox(false, 0);
         var date_button = new Granite.Widgets.DatePicker.with_format("%d-%m-%y");
         date_button.valign = date_button.halign = Gtk.Align.CENTER;
         calendar_button.add(date_button);
         notebook.append_page (calendar_button, new Gtk.Label ("Calendar"));
-        
+
         /* Contractor */
         var contractor_tab = new Gtk.VBox (false, 0);
         notebook.append_page (contractor_tab, new Gtk.Label ("Contractor"));
@@ -174,7 +191,7 @@
         GLib.HashTable<string, string>[] hash_ = Contractor.get_contract("/.zip", "application/zip");
         foreach(var hash in hash_)
         {
-            text_view.buffer.text += hash.lookup("Name") + ": " + hash.lookup("Description") +  " icon: " + hash.lookup("Exec") + "\n";    
+            text_view.buffer.text += hash.lookup("Name") + ": " + hash.lookup("Description") +  " icon: " + hash.lookup("Exec") + "\n";
         }
         contractor_tab.add(text_view);
         contractor_tab.add(new ContractorView("file:///home/user/file.txt", "text/plain"));
@@ -187,9 +204,9 @@
     public static int main(string[] args)
     {
         new Granite.Demo().run(args);
-        
+
         Gtk.main();
-        
+
         return 0;
     }
 }

=== modified file 'lib/Widgets/Welcome.vala'
--- lib/Widgets/Welcome.vala	2011-08-04 12:44:27 +0000
+++ lib/Widgets/Welcome.vala	2012-01-11 19:46:23 +0000
@@ -1,116 +1,204 @@
-//  
+//
 //  Copyright (C) 2011 Maxwell Barvian
-// 
+//
 //  This program is free software: you can redistribute it and/or modify
 //  it under the terms of the GNU General Public License as published by
 //  the Free Software Foundation, either version 3 of the License, or
 //  (at your option) any later version.
-// 
+//
 //  This program is distributed in the hope that it will be useful,
 //  but WITHOUT ANY WARRANTY; without even the implied warranty of
 //  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 //  GNU General Public License for more details.
-// 
+//
 //  You should have received a copy of the GNU General Public License
 //  along with this program.  If not, see <http://www.gnu.org/licenses/>.
 //
 
 using Gtk;
 
-public class Granite.Widgets.Welcome : VBox {
+public class Granite.Widgets.Welcome : Gtk.EventBox {
 
     // Signals
     public signal void activated (int index);
 
-    protected new List<Button> children;
-    protected VBox options;
+    protected new GLib.List<Gtk.Button> children = new GLib.List<Gtk.Button> ();
+    protected Gtk.Box options;
+
+    private enum CaseConversionMode {
+        TITLE,
+        SENTENCE
+    }
 
     public Welcome (string title_text, string subtitle_text) {
-
-        children = new List<Button> ();
-        options = new Gtk.VBox (false, 6);
-
-        // VBox properties
-        spacing = 5;
-        homogeneous = false;
+        string _title_text = modify_text_case (title_text, CaseConversionMode.TITLE);
+        string _subtitle_text = modify_text_case (subtitle_text, CaseConversionMode.SENTENCE);
+
+        Gtk.Box content = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+
+        // Set theming
+        this.get_style_context().add_class ("GraniteWelcomeScreen");
+
+        // Box properties
+        content.homogeneous = false;
 
         // Top spacer
-        pack_start (new Gtk.VBox (false, 0), true, true, 0);
+        content.pack_start (new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0), true, true, 0);
 
         // Labels
-        var title = new Label ("<span weight='heavy' size='15000'>" + title_text + "</span>");
+        var title = new Gtk.Label ("<span weight='medium' size='14700'>" + _title_text + "</span>");
+
+        title.get_style_context().add_class ("title");
+
         title.use_markup = true;
-        title.set_justify (Justification.CENTER);
-        pack_start (title, false, true, 0);
+        title.set_justify (Gtk.Justification.CENTER);
+        content.pack_start (title, false, true, 0);
 
-        var subtitle = new Label (subtitle_text);
+        var subtitle = new Gtk.Label ("<span weight='medium' size='11500'>" + _subtitle_text + "</span>");
+        subtitle.use_markup = true;
         subtitle.sensitive = false;
-        subtitle.set_justify (Justification.CENTER);
-        pack_start (subtitle, false, true, 6);
+        subtitle.set_justify (Gtk.Justification.CENTER);
+        content.pack_start (subtitle, false, true, 2);
+
+        subtitle.get_style_context().add_class("subtitle");
 
         // Options wrapper
-
-        var options_wrapper = new HBox (false, 0);
-
-        options_wrapper.pack_start (new Gtk.VBox (false, 0), true, true, 0); // left padding
-        options_wrapper.pack_start (options, false, false, 0); // actual options
-        options_wrapper.pack_end (new Gtk.VBox (false, 0), true, true, 0); // right padding
-
-        pack_start (options_wrapper, false, false, 0);
+        this.options = new Gtk.Box (Gtk.Orientation.VERTICAL, 8);
+        var options_wrapper = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0);
+
+        options_wrapper.pack_start (new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0), true, true, 0); // left padding
+        options_wrapper.pack_start (this.options, false, false, 0); // actual options
+        options_wrapper.pack_end (new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0), true, true, 0); // right padding
+
+        content.pack_start (options_wrapper, false, false, 20);
 
         // Bottom spacer
-        pack_end (new Gtk.VBox (false, 0), true, true, 0);
-    }
-
-    public void append (string icon_name, string label_text, string description_text) {
-
-        // Button
-        var button = new Button ();
-        button.set_relief (ReliefStyle.NONE);
-
-        // HBox wrapper
-        var hbox = new HBox (false, 6);
-
-        // Add left image
-        var icon = new Image.from_icon_name (icon_name, IconSize.DIALOG);
-        hbox.pack_start (icon, false, true, 6);
-
-        // Add right vbox
-        var vbox = new VBox (false, 0);
-
-        vbox.pack_start (new HBox (false, 0), true, true, 0); // top spacing
+        content.pack_end (new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0), true, true, 0);
+
+        add (content);
+    }
+
+    public void set_sensitivity (uint index, bool val) {
+        if(index < children.length () && children.nth_data (index) is Gtk.Widget)
+            children.nth_data (index).set_sensitive (val);
+    }
+
+    public void append (string icon_name, string option_text, string description_text) {
+        Gtk.Image? image = new Gtk.Image.from_icon_name (icon_name, Gtk.IconSize.DIALOG);
+        append_with_image (image, option_text, description_text);
+    }
+
+    public void append_with_pixbuf (Gdk.Pixbuf? pixbuf, string option_text, string description_text) {
+        var image = new Gtk.Image.from_pixbuf (pixbuf);
+        append_with_image (image, option_text, description_text);
+    }
+
+    public void append_with_image (Gtk.Image? image, string option_text, string description_text) {
+        string _option_text = modify_text_case (option_text, CaseConversionMode.TITLE);
+        string _description_text = modify_text_case (description_text, CaseConversionMode.SENTENCE);
 
         // Option label
-        var label = new Label ("<span weight='medium' size='12500'>" + label_text + "</span>");
+        var label = new Gtk.Label ("<span weight='medium' size='11700'>" + _option_text + "</span>");
         label.use_markup = true;
-        label.set_alignment(0.0f, 0.5f);
-        vbox.pack_start (label, false, false, 0);
+        label.halign = Gtk.Align.START;
+        label.valign = Gtk.Align.CENTER;
+        label.get_style_context().add_class ("option-title");
 
         // Description label
-        var description = new Label (description_text);
+        var description = new Gtk.Label ("<span weight='medium' size='11400'>" + _description_text + "</span>");
+        description.use_markup = true;
+        description.halign = Gtk.Align.START;
+        description.valign = Gtk.Align.CENTER;
         description.sensitive = false;
-        description.set_alignment(0.0f, 0.5f);
-        vbox.pack_start (description, false, false, 0);
-
-        vbox.pack_end (new Gtk.VBox (false, 0), true, true, 0); // bottom spacing
-
-        hbox.pack_start (vbox, false, true, 6);
-
-        button.add (hbox);
+        description.get_style_context().add_class ("option-description");
+
+        // Button
+        var button = new Gtk.Button ();
+        button.set_relief (Gtk.ReliefStyle.NONE);
+
+        // Button contents wrapper
+        var button_contents = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 7);
+
+        // Add left image
+        if (image != null) {
+            image.set_pixel_size (48);
+            button_contents.pack_start (image, false, true, 8);
+        }
+
+        // Add right text wrapper
+        var text_wrapper = new Gtk.Box (Gtk.Orientation.VERTICAL, 3);
+        // top spacing
+        text_wrapper.pack_start (new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0), true, true, 0);
+        text_wrapper.pack_start (label, false, false, 0);
+        text_wrapper.pack_start (description, false, false, 0);
+        // bottom spacing
+        text_wrapper.pack_end (new Gtk.Box (Gtk.Orientation.HORIZONTAL, 0), true, true, 0);
+
+        button_contents.pack_start (text_wrapper, false, true, 8);
+
+        button.add (button_contents);
         children.append (button);
         options.pack_start (button, false, false, 0);
 
         button.button_release_event.connect ( () => {
-            int index = children.index (button);
+            int index = this.children.index (button);
             activated (index); // send signal
-
             return false;
         } );
-
-    }
-
-    public new void set_sensitive (int index, bool sensitivity) {
-        children.nth_data (index).sensitive = sensitivity;
-    }
-
+    }
+
+    private string modify_text_case (string text, CaseConversionMode mode) {
+
+        /**
+         * This function will not modify the text if any the following conditions are met:
+         * - @text ends with a dot.
+         * - @text contains at least one character outside the English alphabet.
+         */
+
+        var fixed_text = new StringBuilder ();
+        unichar c;
+
+        // Disabling this feature for other languages
+        for (int i = 0; text.get_next_char (ref i, out c);) {
+            if (c.isgraph () && !('a' <= c.tolower () && c.tolower () <= 'z'))
+                return text;
+        }
+        // Checking if @text ends with a dot.
+        if (c == '.')
+            return text;
+
+        switch (mode) {
+            case CaseConversionMode.TITLE:
+                unichar last_char = ' ';
+                for (int i = 0; text.get_next_char (ref i, out c);) {
+                    if (last_char.isspace () && c.islower ())
+                        fixed_text.append_unichar (c.totitle ());
+                    else
+                        fixed_text.append_unichar (c);
+
+                    last_char = c;
+                }
+                break;
+            case CaseConversionMode.SENTENCE:
+                bool fixed = false;
+                unichar last_char = ' ';
+                for (int i = 0; text.get_next_char (ref i, out c);) {
+                    if (!fixed && last_char.isspace ()) {
+                        if (c.islower ())
+                            fixed_text.append_unichar (c.totitle ());
+                        else
+                            fixed_text.append_unichar (c);
+                        fixed = true;
+                    }
+                    else {
+                        fixed_text.append_unichar (c);
+                    }
+                }
+                fixed_text.append_unichar ('.');
+                break;
+        }
+
+        return fixed_text.str;
+    }
 }
+