Merge lp:~artem-anufrij/granite/change-label-description-after-creating into lp:~elementary-pantheon/granite/granite

[Artem Anufrij]

Functionality for changing label, description and icon of a welcome screen button after creating them.

[Corentin Noël (tintou)]

I would prefer a :
    public Granite.Widgets.WelcomeButton get_button_from_index (int index)
in the Welcome widget.

And a :
   public string title { get {…}, set {…} }
   public string description { get {…}, set {…} }
   public Gtk.Image icon { get {…}, private set; }
in the WelcomeButton widget.

[Corentin Noël (tintou)]

Also please remove the
using Gtk;

[Artem Anufrij (artem-anufrij)]

Screenshot:
https://launchpadlibrarian.net/193359775/Bildschirmfoto%20vom%202014-12-24%2013%3A15%3A31.png

[Artem Anufrij (artem-anufrij)]

Added a click event on welcome screen (DEMO):
https://launchpadlibrarian.net/193361508/Bildschirmfoto%20vom%202014-12-24%2014%3A21%3A54.png

The properties (title, description, icon) were moved on the top of the class.

[Corentin Noël (tintou)]

Now it's perfect!

review: Approve

[Corentin Noël (tintou)]

In the right request…
Now it's perfect!

review: Approve

[Corentin Noël (tintou)]

Can someone confirm that this won't break anything ABI-wise ?

[lp:~artem-anufrij/granite/change-label-description-after-creating]

829. By Fabio Zaramella on 2015-01-30

Wrap long Welcome subtitles and descriptions

830. By Launchpad Translations on behalf of elementary-pantheon on 2015-02-05

Launchpad automatic translations update.

831. By Launchpad Translations on behalf of elementary-pantheon on 2015-02-07

Launchpad automatic translations update.

832. By Launchpad Translations on behalf of elementary-pantheon on 2015-02-10

Launchpad automatic translations update.

833. By Launchpad Translations on behalf of elementary-pantheon on 2015-02-11

Launchpad automatic translations update.

834. By Launchpad Translations on behalf of elementary-pantheon on 2015-02-12

Launchpad automatic translations update.

835. By Launchpad Translations on behalf of elementary-pantheon on 2015-02-13

Launchpad automatic translations update.

836. By Launchpad Translations on behalf of elementary-pantheon on 2015-02-19

Launchpad automatic translations update.

837. By Launchpad Translations on behalf of elementary-pantheon on 2015-02-23

Launchpad automatic translations update.

838. By Launchpad Translations on behalf of elementary-pantheon on 2015-03-03

Launchpad automatic translations update.

839. By Launchpad Translations on behalf of elementary-pantheon on 2015-03-05

Launchpad automatic translations update.

840. By Corentin Noël on 2015-03-10

[CellRendererExpander] Gtk+ 3.14 now uses Gtk.StateFlags.CHECKED instead of Gtk.StateFlags.ACTIVE.

841. By Cody Garver on 2015-03-10

CMake: bump minimum version of Gtk to >= 3.14

842. By Corentin Noël on 2015-03-11

Adds the deprecation annotation to deprecate widgets officially.
[WrapLabel] No need for this widget when Gtk.Label provides wrapping label.
[PopOver] Replaced by Gtk.Popover.

Fixed some deprecations annotations as we deprecate widgets when they are available in Gtk.

843. By Launchpad Translations on behalf of elementary-pantheon on 2015-03-18

Launchpad automatic translations update.

844. By Launchpad Translations on behalf of elementary-pantheon on 2015-03-20

Launchpad automatic translations update.

845. By Launchpad Translations on behalf of elementary-pantheon on 2015-03-21

Launchpad automatic translations update.

846. By Launchpad Translations on behalf of elementary-pantheon on 2015-03-22

Launchpad automatic translations update.

847. By Victor Martinez on 2015-03-23

ContractorView: Fix error when building with vala 0.28

[Victor Martinez (victored)]

Looks good, I couldn't spot any API or ABI break. Make sure all the documentation items include "@since 0.3" at the bottom.

review: Needs Fixing

[Artem Anufrij (artem-anufrij)]

@Victor: done

[Victor Martinez (victored)]

I could not find any problems. Since this is an API change it'd be good to have at least a second review or opinion.

review: Approve

[Victor Martinez (victored)]

btw the code from granite-demo seems to be using 8 spaces for indentation. Should be 4 :P

[Artem Anufrij (artem-anufrij)]

@Victor: done

[lp:~artem-anufrij/granite/change-label-description-after-creating]

848. By Artem Anufrij on 2015-03-25

Label and Description label can be changed after creating them.

=== modified file 'demo/GraniteDemo.vala'
--- demo/GraniteDemo.vala	2014-05-12 02:42:17 +0000
+++ demo/GraniteDemo.vala	2015-03-25 22:33:58 +0000
@@ -410,6 +410,14 @@
         welcome.append_with_image (image, "Open", "Select a file.");
         welcome.append ("document-save", "Save", "With a much longer description.");
 
+        welcome.activated.connect ((index) => {
+            var button = welcome.get_button_from_index (index);
+
+            button.title = "You clicked on the button: %d".printf(index);
+            button.description = "This label, description and icon were changed after creating of this button.";
+            button.icon.icon_name = "edit";
+        });
+
         return welcome;
     }
 

=== modified file 'lib/CMakeLists.txt'
--- lib/CMakeLists.txt	2014-09-04 12:39:00 +0000
+++ lib/CMakeLists.txt	2015-03-25 22:33:58 +0000
@@ -32,6 +32,7 @@
     Widgets/CompositedWindow.vala
     Widgets/AppMenu.vala
     Widgets/Welcome.vala
+    Widgets/WelcomeButton.vala
     Widgets/ToolButtonWithMenu.vala
     Widgets/PopOver.vala
     Widgets/ContractorView.vala

=== modified file 'lib/Widgets/Welcome.vala'
--- lib/Widgets/Welcome.vala	2015-01-28 14:51:39 +0000
+++ lib/Widgets/Welcome.vala	2015-03-25 22:33:58 +0000
@@ -23,7 +23,7 @@
 /**
  * This class is for making a first-launch screen easily
  *
- * It can be used to create a list of one-time action items that need to be executed in order to setup the app. 
+ * It can be used to create a list of one-time action items that need to be executed in order to setup the app.
  *
  * {{../../doc/images/Welcome.png}}
  */
@@ -40,7 +40,7 @@
      * Box for action items
      */
     protected Gtk.Box options;
-    
+
     /**
      * This is the title of the welcome widget.
      */
@@ -187,43 +187,7 @@
       */
     public int append_with_image (Gtk.Image? image, string option_text, string description_text) {
         // Option label
-        var label = new Gtk.Label (option_text);
-        label.get_style_context ().add_class ("h3");
-        label.halign = Gtk.Align.START;
-        label.valign = Gtk.Align.CENTER;
-
-        // Description label
-        var description = new Gtk.Label (description_text);
-        description.halign = Gtk.Align.START;
-        description.valign = Gtk.Align.CENTER;
-        description.set_line_wrap (true);
-        description.set_line_wrap_mode (Pango.WrapMode.WORD);
-
-        // 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);
+        var button = new WelcomeButton (image, option_text, description_text);
         children.append (button);
         options.pack_start (button, false, false, 0);
 
@@ -235,4 +199,18 @@
 
         return this.children.index (button);
     }
+
+    /**
+     * Returns a welcome button by index
+     *
+     * @param index index of action item to be returned
+     * @return welcome button at //index//, or //null// if //index// is invalid.
+     * @since 0.3
+     */
+    public Granite.Widgets.WelcomeButton? get_button_from_index (int index) {
+        if (index >= 0 && index < children.length ())
+            return children.nth_data (index) as WelcomeButton;
+
+        return null;
+    }
 }

=== added file 'lib/Widgets/WelcomeButton.vala'
--- lib/Widgets/WelcomeButton.vala	1970-01-01 00:00:00 +0000
+++ lib/Widgets/WelcomeButton.vala	2015-03-25 22:33:58 +0000
@@ -0,0 +1,94 @@
+/*
+ *  Copyright (C) 2014-2015 Granite Developers
+ *
+ *  This program or library is free software; you can redistribute it
+ *  and/or modify it under the terms of the GNU Lesser General Public
+ *  License as published by the Free Software Foundation; either
+ *  version 3 of the License, or (at your option) any later version.
+ *
+ *  This library 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
+ *  Lesser General Public License for more details.
+ *
+ *  You should have received a copy of the GNU Lesser General
+ *  Public License along with this library; if not, write to the
+ *  Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+ *  Boston, MA 02110-1301 USA.
+ *
+ *  Authored by:    Artem Anufrij <[e-mail]>
+ */
+
+public class Granite.Widgets.WelcomeButton : Gtk.Button {
+
+    Gtk.Label button_title;
+    Gtk.Label button_description;
+
+    /**
+     * Title property of the Welcome Button
+     *
+     * @since 0.3
+     */
+    public string title {
+        get { return button_title.get_text (); }
+        set { button_title.set_text (value); }
+    }
+
+    /**
+     * Description property of the Welcome Button
+     *
+     * @since 0.3
+     */
+    public string description {
+        get { return button_description.get_text (); }
+        set { button_description.set_text (value); }
+    }
+
+    /**
+     * Image of the Welcome Button
+     *
+     * @since 0.3
+     */
+    public Gtk.Image? icon { get; private set; }
+
+    public WelcomeButton (Gtk.Image? image, string option_text, string description_text) {
+        icon = image;
+
+        // Title label
+        button_title = new Gtk.Label (option_text);
+        button_title.get_style_context ().add_class ("h3");
+        button_title.halign = Gtk.Align.START;
+        button_title.valign = Gtk.Align.CENTER;
+
+        // Description label
+        button_description = new Gtk.Label (description_text);
+        button_description.halign = Gtk.Align.START;
+        button_description.valign = Gtk.Align.CENTER;
+        button_description.set_line_wrap (true);
+        button_description.set_line_wrap_mode (Pango.WrapMode.WORD);
+
+        this.set_relief (Gtk.ReliefStyle.NONE);
+
+        // Button contents wrapper
+        var button_contents = new Gtk.Box (Gtk.Orientation.HORIZONTAL, 7);
+
+        // Add left image
+        if (icon != null) {
+            icon.set_pixel_size (48);
+            button_contents.pack_start (icon, 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 (button_title, false, false, 0);
+        text_wrapper.pack_start (button_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);
+
+        this.add (button_contents);
+    }
+}

=== modified file 'po/am.po'
--- po/am.po	2015-03-18 05:59:56 +0000
+++ po/am.po	2015-03-25 22:33:58 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: granite\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-10-29 15:12-0500\n"
 "PO-Revision-Date: 2014-12-21 18:13+0000\n"
 "Last-Translator: samson <Unknown>\n"
 "Language-Team: Amharic <[e-mail]>\n"
+"Language: am\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/cs.po'
--- po/cs.po	2015-03-18 05:59:56 +0000
+++ po/cs.po	2015-03-25 22:33:58 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: granite\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-10-29 15:12-0500\n"
 "PO-Revision-Date: 2014-12-24 11:55+0000\n"
 "Last-Translator: Marek Doležel <[e-mail]>\n"
 "Language-Team: Czech <[e-mail]>\n"
+"Language: cs\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -127,8 +128,7 @@
 
 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/ContractorView.vala:105
 msgid "Could not contact Contractor. You may need to install it"
-msgstr ""
-"Nelze se spojit s programem Contractor. Možná jej musíte doinstalovat"
+msgstr "Nelze se spojit s programem Contractor. Možná jej musíte doinstalovat"
 
 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Widgets/ContractorView.vala:105
 msgid "No action found for this file"

=== modified file 'po/de.po'
--- po/de.po	2015-03-18 05:59:56 +0000
+++ po/de.po	2015-03-25 22:33:58 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: granite\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-10-29 15:12-0500\n"
 "PO-Revision-Date: 2015-01-08 16:50+0000\n"
 "Last-Translator: Tobias Bannert <Unknown>\n"
 "Language-Team: German <[e-mail]>\n"
+"Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/he.po'
--- po/he.po	2015-03-18 05:59:56 +0000
+++ po/he.po	2015-03-25 22:33:58 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: granite\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-10-29 15:12-0500\n"
 "PO-Revision-Date: 2014-12-21 02:12+0000\n"
 "Last-Translator: Dor <[e-mail]>\n"
 "Language-Team: Hebrew <[e-mail]>\n"
+"Language: he\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/pt_BR.po'
--- po/pt_BR.po	2015-03-18 05:59:56 +0000
+++ po/pt_BR.po	2015-03-25 22:33:58 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: granite\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-10-29 15:12-0500\n"
 "PO-Revision-Date: 2014-12-23 11:16+0000\n"
 "Last-Translator: Murilo Venturoso <[e-mail]>\n"
 "Language-Team: Brazilian Portuguese <[e-mail]>\n"
+"Language: pt_BR\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
@@ -49,8 +50,7 @@
 
 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//GtkPatch/AboutDialog.vala:456
 msgid " license, it comes with ABSOLUTELY NO WARRANTY; for details, visit "
-msgstr ""
-" , ele vem com ABSOLUTAMENTE NENHUMA GARANTIA; para detalhes, visite "
+msgstr " , ele vem com ABSOLUTAMENTE NENHUMA GARANTIA; para detalhes, visite "
 
 #: /tmp/tmp.nk1L7TnOTp/granite/po/../lib//Application.vala:248
 msgid "Developers"

=== modified file 'po/ru.po'
--- po/ru.po	2015-03-18 05:59:56 +0000
+++ po/ru.po	2015-03-25 22:33:58 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: granite\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-10-29 15:12-0500\n"
 "PO-Revision-Date: 2014-12-20 17:05+0000\n"
 "Last-Translator: Artem Anufrij <Unknown>\n"
 "Language-Team: Russian <[e-mail]>\n"
+"Language: ru\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/sl.po'
--- po/sl.po	2015-03-18 05:59:56 +0000
+++ po/sl.po	2015-03-25 22:33:58 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: granite\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-10-29 15:12-0500\n"
 "PO-Revision-Date: 2014-12-27 09:41+0000\n"
 "Last-Translator: Jernej Virag <Unknown>\n"
 "Language-Team: Slovenian <[e-mail]>\n"
+"Language: sl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"

=== modified file 'po/uk.po'
--- po/uk.po	2015-03-22 05:19:00 +0000
+++ po/uk.po	2015-03-25 22:33:58 +0000
@@ -6,11 +6,12 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: granite\n"
-"Report-Msgid-Bugs-To: FULL NAME <EMAIL@ADDRESS>\n"
+"Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2014-10-29 15:12-0500\n"
 "PO-Revision-Date: 2015-03-21 21:16+0000\n"
 "Last-Translator: PsyClip-R <Unknown>\n"
 "Language-Team: Ukrainian <[e-mail]>\n"
+"Language: uk\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"