Merge lp:~elementary-dev-community/granite/fix-1184312 into lp:~elementary-pantheon/granite/granite

[Jesse Cheun]

Added double click to rename tab in DynamicNotebook. Edited GraniteDemo app to test tab renaming.

[lp:~elementary-dev-community/granite/fix-1184312]

750. By Launchpad Translations on behalf of elementary-pantheon on 2014-07-16

Launchpad automatic translations update.

751. By xapantu on 2014-07-19

Merge Phillip's branch, catalog upate

752. By Danielle Foré on 2014-07-19

fix cmakelists.txt to install open-menu icon

753. By Cody Garver on 2014-07-19

Update translation template

754. By Launchpad Translations on behalf of elementary-pantheon on 2014-07-20

Launchpad automatic translations update.

755. By Launchpad Translations on behalf of elementary-pantheon on 2014-07-21

Launchpad automatic translations update.

756. By Launchpad Translations on behalf of elementary-pantheon on 2014-07-23

Launchpad automatic translations update.

757. By Danielle Foré on 2014-07-27

Remove all the custom drawing code in in Granite's About dialog

758. By Launchpad Translations on behalf of elementary-pantheon on 2014-07-28

Launchpad automatic translations update.

759. By Launchpad Translations on behalf of elementary-pantheon on 2014-07-30

Launchpad automatic translations update.

[David Gomes (davidgomes)]

Pressing Escape should exit the text box.

review: Needs Fixing

[David Gomes (davidgomes)]

Also, a lot of flaws in your code style.

Check http://elementaryos.org/docs/code/code-style/. If you change the branch ownership to ~elementary-dev-community I'll gladly fix all the code for you.

review: Needs Fixing

[lp:~elementary-dev-community/granite/fix-1184312]

760. By Niclas Lockner on 2014-07-31

Implements show_icon property in tab objects which allows for correct icon visibility state after changing the 'working' property of a given tab.

[Jesse Cheun (jcheun93)]

Hey thanks for reviewing my code. I added the option to close the entry box when the escape key is pressed. I also fixed all the code style error I could find. The branch ownership has been changed to ~elementary-dev-community so you can edit the code if needed.

[lp:~elementary-dev-community/granite/fix-1184312]

761. By Launchpad Translations on behalf of elementary-pantheon on 2014-08-01

Launchpad automatic translations update.

762. By Launchpad Translations on behalf of elementary-pantheon on 2014-08-02

Launchpad automatic translations update.

763. By Launchpad Translations on behalf of elementary-pantheon on 2014-08-03

Launchpad automatic translations update.

764. By Launchpad Translations on behalf of elementary-pantheon on 2014-08-05

Launchpad automatic translations update.

765. By xapantu on 2014-08-05

Merge Olivier Duchateau's patch, via Cameron Norman's branch: Support BSD systems (prctl, setproctitle)

766. By Launchpad Translations on behalf of elementary-pantheon on 2014-08-06

Launchpad automatic translations update.

767. By Cody Garver on 2014-08-07

Updated translation template

768. By Launchpad Translations on behalf of elementary-pantheon on 2014-08-07

Launchpad automatic translations update.

769. By Launchpad Translations on behalf of elementary-pantheon on 2014-08-08

Launchpad automatic translations update.

770. By Cody Garver on 2014-08-09

"Translate This App" → "Suggest Translations"

771. By Cody Garver on 2014-08-09

Updated translation template

772. By Launchpad Translations on behalf of elementary-pantheon on 2014-08-10

Launchpad automatic translations update.

773. By Launchpad Translations on behalf of elementary-pantheon on 2014-08-11

Launchpad automatic translations update.

774. By Launchpad Translations on behalf of elementary-pantheon on 2014-08-12

Launchpad automatic translations update.

775. By Launchpad Translations on behalf of elementary-pantheon on 2014-08-13

Launchpad automatic translations update.

776. By Launchpad Translations on behalf of elementary-pantheon on 2014-08-14

Launchpad automatic translations update.

777. By Launchpad Translations on behalf of elementary-pantheon on 2014-08-16

Launchpad automatic translations update.

778. By Launchpad Translations on behalf of elementary-pantheon on 2014-08-18

Launchpad automatic translations update.

779. By Launchpad Translations on behalf of elementary-pantheon on 2014-08-23

Launchpad automatic translations update.

780. By Launchpad Translations on behalf of elementary-pantheon on 2014-08-26

Launchpad automatic translations update.

781. By xapantu on 2014-08-30

Solve crash when using the --about command line parameter by avoiding improper type casting.

782. By Rico Tzschichholz on 2014-08-30

Follow gtk+ binding updates and fix build with valac >= 0.25.2

783. By Launchpad Translations on behalf of elementary-pantheon on 2014-09-04

Launchpad automatic translations update.

784. By Launchpad Translations on behalf of elementary-pantheon on 2014-09-05

Launchpad automatic translations update.

785. By Launchpad Translations on behalf of elementary-pantheon on 2014-09-07

Launchpad automatic translations update.

786. By Launchpad Translations on behalf of elementary-pantheon on 2014-09-11

Launchpad automatic translations update.

787. By Launchpad Translations on behalf of elementary-pantheon on 2014-09-13

Launchpad automatic translations update.

788. By Launchpad Translations on behalf of elementary-pantheon on 2014-09-18

Launchpad automatic translations update.

789. By Launchpad Translations on behalf of elementary-pantheon on 2014-09-19

Launchpad automatic translations update.

790. By Launchpad Translations on behalf of elementary-pantheon on 2014-09-20

Launchpad automatic translations update.

791. By Launchpad Translations on behalf of elementary-pantheon on 2014-09-21

Launchpad automatic translations update.

792. By Launchpad Translations on behalf of elementary-pantheon on 2014-09-22

Launchpad automatic translations update.

793. By Launchpad Translations on behalf of elementary-pantheon on 2014-09-23

Launchpad automatic translations update.

794. By Rico Tzschichholz on 2014-09-23

DynamicNotebook: Fix destructor name

795. By Launchpad Translations on behalf of elementary-pantheon on 2014-09-25

Launchpad automatic translations update.

796. By Launchpad Translations on behalf of elementary-pantheon on 2014-09-26

Launchpad automatic translations update.

797. By Launchpad Translations on behalf of elementary-pantheon on 2014-10-03

Launchpad automatic translations update.

798. By Launchpad Translations on behalf of elementary-pantheon on 2014-10-18

Launchpad automatic translations update.

799. By Launchpad Translations on behalf of elementary-pantheon on 2014-10-19

Launchpad automatic translations update.

800. By Launchpad Translations on behalf of elementary-pantheon on 2014-10-21

Launchpad automatic translations update.

801. By Launchpad Translations on behalf of elementary-pantheon on 2014-10-25

Launchpad automatic translations update.

802. By Launchpad Translations on behalf of elementary-pantheon on 2014-11-04

Launchpad automatic translations update.

803. By Cody Garver on 2014-11-06

Only use copyright symbol ©, not actual word 'Copyright' (lp:1358969)

804. By Launchpad Translations on behalf of elementary-pantheon on 2014-11-07

Launchpad automatic translations update.

805. By Launchpad Translations on behalf of elementary-pantheon on 2014-11-08

Launchpad automatic translations update.

806. By Launchpad Translations on behalf of elementary-pantheon on 2014-11-09

Launchpad automatic translations update.

807. By Launchpad Translations on behalf of elementary-pantheon on 2014-11-10

Launchpad automatic translations update.

808. By Launchpad Translations on behalf of elementary-pantheon on 2014-11-12

Launchpad automatic translations update.

809. By Launchpad Translations on behalf of elementary-pantheon on 2014-11-13

Launchpad automatic translations update.

810. By Launchpad Translations on behalf of elementary-pantheon on 2014-11-14

Launchpad automatic translations update.

811. By Launchpad Translations on behalf of elementary-pantheon on 2014-11-15

Launchpad automatic translations update.

812. By Launchpad Translations on behalf of elementary-pantheon on 2014-11-20

Launchpad automatic translations update.

813. By Launchpad Translations on behalf of elementary-pantheon on 2014-11-25

Launchpad automatic translations update.

814. By Tom Beckmann on 2014-11-25

Adapt to standard style for copyright headers, add VAPI_COMMENTS option to cmake

815. By Launchpad Translations on behalf of elementary-pantheon on 2014-11-26

Launchpad automatic translations update.

816. By Launchpad Translations on behalf of elementary-pantheon on 2014-11-28

Launchpad automatic translations update.

817. By Launchpad Translations on behalf of elementary-pantheon on 2014-12-08

Launchpad automatic translations update.

818. By Launchpad Translations on behalf of elementary-pantheon on 2014-12-11

Launchpad automatic translations update.

819. By Launchpad Translations on behalf of elementary-pantheon on 2014-12-12

Launchpad automatic translations update.

820. By Launchpad Translations on behalf of elementary-pantheon on 2014-12-21

Launchpad automatic translations update.

821. By Launchpad Translations on behalf of elementary-pantheon on 2014-12-22

Launchpad automatic translations update.

822. By Launchpad Translations on behalf of elementary-pantheon on 2014-12-23

Launchpad automatic translations update.

823. By Launchpad Translations on behalf of elementary-pantheon on 2014-12-24

Launchpad automatic translations update.

824. By Launchpad Translations on behalf of elementary-pantheon on 2014-12-25

Launchpad automatic translations update.

825. By Launchpad Translations on behalf of elementary-pantheon on 2014-12-28

Launchpad automatic translations update.

826. By Sergey Zolotarev on 2015-01-07

Prevent notebook tabs from stealing focus (lp:1395686)

827. By Launchpad Translations on behalf of elementary-pantheon on 2015-01-09

Launchpad automatic translations update.

828. By Cody Garver on 2015-01-28

Deprecate Granite.ThinPaned in favor of Gtk.Paned

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

848. By Djax on 2015-03-25

Increase max-tab width for dynamic notebook tabs by 24px

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

Launchpad automatic translations update.

850. By Artem Anufrij on 2015-03-28

Functionality for changing label, description and icon of a welcome screen button after creating them. (lp:1403647)

851. By Launchpad Translations on behalf of elementary-pantheon on 2015-04-05

Launchpad automatic translations update.

852. By Corentin Noël on 2015-04-23

Use GObject style for creating the Welcome widget.
Style changes to the WelcomeButton.

853. By Launchpad Translations on behalf of elementary-pantheon on 2015-04-26

Launchpad automatic translations update.

854. By Launchpad Translations on behalf of elementary-pantheon on 2015-04-27

Launchpad automatic translations update.

855. By Launchpad Translations on behalf of elementary-pantheon on 2015-05-19

Launchpad automatic translations update.

856. By Cody Garver on 2015-05-25

Install a basic .desktop for granite-demo

857. By Corentin Noël on 2015-05-25

Granite Demo rewrite, removed deprecated widgets.

858. By Launchpad Translations on behalf of elementary-pantheon on 2015-05-27

Launchpad automatic translations update.

859. By Corentin Noël on 2015-06-08

New AlertView widget

860. By Launchpad Translations on behalf of elementary-pantheon on 2015-06-16

Launchpad automatic translations update.

861. By Corentin Noël on 2015-06-24

New widget StorageBar

862. By Launchpad Translations on behalf of elementary-pantheon on 2015-06-30

Launchpad automatic translations update.

863. By xapantu on 2015-08-14

Update the patch to avoid conflicts with latest trunk

864. By xapantu on 2015-08-14

Minor cosmetics

[xapantu (xapantu)]

Thanks for your patch, I just updated it to work with latest trunk, we are going to merge this sooner or later :)

[Danielle Foré (danrabbit)]

If you're in edit mode and double click (to select all the text), it will reset its contents to the last saved contents.

Clicking outside the entry should save (like it does in the file manager)

review: Needs Fixing

Unmerged revisions

864. By xapantu on 2015-08-14

Minor cosmetics

863. By xapantu on 2015-08-14

Update the patch to avoid conflicts with latest trunk

=== modified file 'demo/GraniteDemo.vala'
--- demo/GraniteDemo.vala	2015-06-16 17:39:23 +0000
+++ demo/GraniteDemo.vala	2015-08-14 20:32:19 +0000
@@ -269,9 +269,12 @@
         notebook.new_tab_requested.connect (() => {
             var page = new Gtk.Label ("Page %d".printf (i));
             var tab = new Granite.Widgets.Tab ("Tab %d".printf (i), new ThemedIcon ("mail-mark-important-symbolic"), page);
+            tab.restore_data = i.to_string ();
             notebook.insert_tab (tab, i-1);
             i++;
         });
+
+        notebook.allow_edit = true;
     }
 
     public static int main (string[] args) {

=== modified file 'lib/Widgets/DynamicNotebook.vala'
--- lib/Widgets/DynamicNotebook.vala	2015-03-25 21:40:53 +0000
+++ lib/Widgets/DynamicNotebook.vala	2015-08-14 20:32:19 +0000
@@ -89,6 +89,12 @@
                 _pinnable = value;
             }
         }
+        
+        private bool _editable = false;
+        public bool editable {
+            get { return _editable; }
+            set { _editable = value; }
+        }
 
         /**
          * Data which will be kept once the tab is deleted, and which will be used by
@@ -96,7 +102,12 @@
          * the tab should not be restored.
          **/
         public string restore_data { get; set; }
-
+        
+        /* Store the default tab title */
+        public string default_title { get; set; }
+        public bool edited { get; set; }
+        private bool entry_menu_popup = false;
+        
         /**
          * An optional delegate that is called when the tab is dropped from the set
          * of restorable tabs in DynamicNotebook.
@@ -191,7 +202,7 @@
                 update_close_button_visibility ();
             }
         }
-
+        
         private bool cursor_over_tab = false;
         private bool cursor_over_close_button = false;
         private Gtk.Revealer close_button_revealer;
@@ -212,6 +223,12 @@
                 padding: 0;
             }
         """;
+        
+        private static const string ENTRY_STYLE = """
+            * {
+                padding: 1px;
+            }
+        """;
 
         public Tab (string label="", GLib.Icon? icon=null, Gtk.Widget? page=null) {
             this._label = new Gtk.Label (label);
@@ -235,10 +252,72 @@
             close_button_revealer.transition_type = Gtk.RevealerTransitionType.CROSSFADE;
             close_button_revealer.add (close_button);
 
+            /* Entry box to edit tab title */
+            var entry_box = new Gtk.Entry ();
+            entry_box.hexpand = true;
+            
+            Utils.set_theming (entry_box, ENTRY_STYLE, null,
+                               Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
+    
+            /* Set tab title and close entry box */
+            entry_box.activate.connect (() => {
+                this.visible_window = true;
+                edited = (default_title != entry_box.get_text ());
+                if (entry_box.get_text () == "") {    
+                    this.label = default_title;
+                    edited = false;
+                } else {
+                    this.label = entry_box.get_text ();
+                }
+                _label.visible = true;
+                entry_box.hide ();
+            });
+            
+            /* checks if popup menu has been populated */
+            entry_box.populate_popup.connect (() => {
+                entry_menu_popup = true;
+            });
+
+            /* Allow right clicks and close entry_box if out of foucs  */            
+            entry_box.focus_out_event.connect (() => {
+                // prevent right click popup menu from closing entry
+                if (entry_menu_popup) { 
+                    entry_menu_popup = false;
+                } else {
+                    this.visible_window = true;
+                    _label.visible = true;
+                    entry_box.hide ();
+                }
+                return false;
+            });    
+
+            /* Close entry box on escape key press */
+            entry_box.key_press_event.connect ((e) => {
+                if (e.keyval == Gdk.Key.Escape) {
+                    this.visible_window = true;
+                    
+                    /* Uncomment if tab should save new string on escape */    
+                    /* edited = (default_title != entry_box.get_text ());
+   
+                    if (entry_box.get_text () == "") {    
+                        this.label = default_title;
+                        edited = false;
+                    } else {
+                        this.label = entry_box.get_text ();
+                    } */
+
+                    _label.visible = true;
+                    entry_box.hide ();
+                    return true;
+                }               
+                return false;
+            });                        
+                               
             var tab_layout = new Gtk.Grid ();
             tab_layout.hexpand = false;
             tab_layout.orientation = Gtk.Orientation.HORIZONTAL;
             tab_layout.add (close_button_revealer);
+            tab_layout.add (entry_box);
             tab_layout.add (_label);
             tab_layout.add (_icon);
             tab_layout.add (_working);
@@ -263,6 +342,9 @@
             restore_data = "";
 
             this.show_all ();
+            
+            entry_box.hide ();
+            edited = false;
 
             menu = new Gtk.Menu ();
             var close_m = new Gtk.MenuItem.with_label (_("Close Tab"));
@@ -313,6 +395,12 @@
                     this.closed ();
                 } else if (e.button == 2 && e.state == Gdk.ModifierType.SHIFT_MASK && close_button_is_visible ()) {
                     this.close_others ();
+                } else if (e.button == 1 && e.type == Gdk.EventType.2BUTTON_PRESS && _editable) { 
+                    this.visible_window = false;
+                    _label.visible = false;
+                    entry_box.set_text (_label.get_text ());
+                    entry_box.show ();
+                    entry_box.grab_focus ();
                 } else if (e.button == 1 && e.type == Gdk.EventType.2BUTTON_PRESS && duplicate_m.visible) {
                     this.duplicate ();
                 } else if (e.button == 3) {
@@ -324,6 +412,9 @@
                     if (this.pinned) {
                         pin_m.label = "Unpin";
                     }
+                // allow double/triple clicks when current tab is focused
+                } else if (e.button == 1 && e.type == Gdk.EventType.BUTTON_PRESS && _is_current_tab ){
+                    return true;
                 } else {
                     return false;
                 }
@@ -603,7 +694,6 @@
             get { return _allow_duplication; }
             set {
                 _allow_duplication = value;
-
                 foreach (var tab in tabs) {
                     tab.duplicate_m.visible = value;
                 }
@@ -622,6 +712,21 @@
                 restore_button.visible = value;
             }
         }
+        
+        /**
+         * Allow editable tabs
+         */
+        bool _allow_edit = false;
+        public bool allow_edit {
+            get { return _allow_edit; }
+            set {
+                _allow_edit = value;
+
+                foreach (var tab in tabs) {
+                    tab.editable= value;
+                }
+            }
+        }
 
         /**
          * Set or get the upper limit of the size of the set
@@ -1150,6 +1255,7 @@
             this.notebook.set_tab_detachable  (tab.page_container, this.allow_new_window);
 
             tab.show_icon = show_icons;
+            tab.editable = allow_edit;
             tab.duplicate_m.visible = allow_duplication;
             tab.new_window_m.visible = allow_new_window;
             tab.pin_m.visible = allow_pinning;