Merge lp:~philip.scott/pantheon-photos/editable-title into lp:~pantheon-photos/pantheon-photos/trunk

[Felipe Escoto]

LibraryProperties: Change title entry for an EditableTitle

[Danielle Foré (danrabbit)]

I would like to have:
* The whole label be activatable
* save on focus out

I think without those it feels a little awkward

review: Needs Fixing

[Felipe Escoto (philip.scott)]

I kinda disagree on the save on focus out. I feel like having that confirmation is good either with clicking the button, or by pressing enter

But it does feel a lot less awkward with the whole label being clickable

[lp:~philip.scott/pantheon-photos/editable-title]

3035. By Felipe Escoto on 2016-11-05

Editable label on Library Details

[Danielle Foré (danrabbit)]

It appears that clicking the icon focuses the entry automatically, but clicking the label does not

[lp:~philip.scott/pantheon-photos/editable-title]

3036. By Felipe Escoto on 2016-11-06

Grab focus and refactoring

[Danielle Foré (danrabbit)]

I think you might have made a small oops :p

[lp:~philip.scott/pantheon-photos/editable-title]

3037. By Felipe Escoto on 2016-11-06

Fixed my oops

[Danielle Foré (danrabbit)]

LGTM. I'm happy

review: Approve

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2016-09-24 19:18:52 +0000
+++ src/CMakeLists.txt	2016-11-06 03:45:29 +0000
@@ -175,6 +175,7 @@
     sidebar/Entry.vala
     sidebar/Sidebar.vala
     sidebar/Tree.vala
+    sidebar/EditableTitle.vala
 
     sidebar/metadata/BasicProperties.vala
     sidebar/metadata/ExtendedProperties.vala
@@ -217,7 +218,7 @@
 
 include_directories (${CMAKE_SOURCE_DIR}/vapi)
 add_executable (${EXEC_NAME} ${VALA_C} ${PLUGIN_VALA_C} ${CONFIG_FILE})
-target_link_libraries (${EXEC_NAME} ${DEPS_LIBRARIES}) 
+target_link_libraries (${EXEC_NAME} ${DEPS_LIBRARIES})
 
 install (TARGETS ${EXEC_NAME} RUNTIME DESTINATION bin)
 

=== added file 'src/sidebar/EditableTitle.vala'
--- src/sidebar/EditableTitle.vala	1970-01-01 00:00:00 +0000
+++ src/sidebar/EditableTitle.vala	2016-11-06 03:45:29 +0000
@@ -0,0 +1,125 @@
+/*-
+ * Copyright (c) 2016 Pantheon Developers (https://launchpad.net/pantheon-photos)
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Library 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
+ * Library General Public License for more details.
+ *
+ * You should have received a copy of the GNU Library General Public
+ * License along with this library; if not, write to the
+ * Free Software Foundation, Inc., 59 Temple Place - Suite 330,
+ * Boston, MA 02111-1307, USA.
+ *
+ * Authored by: Corentin Noël <[e-mail]>
+ */
+
+public class EditableTitle : Gtk.EventBox {
+    public signal void changed (string new_title);
+    private Gtk.Label title;
+    private Gtk.Entry entry;
+    private Gtk.Stack stack;
+    private Gtk.Grid grid;
+
+    public string text {
+        get {
+            return title.label;
+        }
+
+        set {
+            title.label = value;
+        }
+    }
+
+    private bool editing {
+        set {
+            if (value) {
+                entry.text = title.label;
+                stack.set_visible_child (entry);
+                entry.grab_focus ();
+            } else {
+                if (entry.text.strip () != "" && title.label != entry.text) {
+                    title.label = entry.text;
+                    changed (entry.text);
+                }
+
+                stack.set_visible_child (grid);
+            }
+        }
+    }
+
+    public EditableTitle (string? title_name) {
+        valign = Gtk.Align.CENTER;
+        events |= Gdk.EventMask.ENTER_NOTIFY_MASK;
+        events |= Gdk.EventMask.LEAVE_NOTIFY_MASK;
+        events |= Gdk.EventMask.BUTTON_PRESS_MASK;
+
+        title = new Gtk.Label (title_name);
+        title.ellipsize = Pango.EllipsizeMode.END;
+        title.hexpand = true;
+        ((Gtk.Misc) title).xalign = 0;
+
+        var edit_button = new Gtk.Button ();
+        edit_button.image = new Gtk.Image.from_icon_name ("edit-symbolic", Gtk.IconSize.MENU);
+        edit_button.get_style_context ().add_class (Gtk.STYLE_CLASS_FLAT);
+        var button_revealer = new Gtk.Revealer ();
+        button_revealer.valign = Gtk.Align.CENTER;
+        button_revealer.transition_type = Gtk.RevealerTransitionType.CROSSFADE;
+        button_revealer.add (edit_button);
+
+        grid = new Gtk.Grid ();
+        grid.valign = Gtk.Align.CENTER;
+        grid.column_spacing = 12;
+        grid.add (title);
+        grid.add (button_revealer);
+
+        entry = new Gtk.Entry ();
+        entry.secondary_icon_name = "go-jump-symbolic";
+
+        stack = new Gtk.Stack ();
+        stack.transition_type = Gtk.StackTransitionType.CROSSFADE;
+        stack.add (grid);
+        stack.add (entry);
+        add (stack);
+
+        enter_notify_event.connect ((event) => {
+            if (event.detail != Gdk.NotifyType.INFERIOR) {
+                button_revealer.set_reveal_child (true);
+            }
+
+            return false;
+        });
+
+        leave_notify_event.connect ((event) => {
+            if (event.detail != Gdk.NotifyType.INFERIOR) {
+                button_revealer.set_reveal_child (false);
+            }
+
+            return false;
+        });
+
+        button_press_event.connect ((event) => {
+            editing = true;
+            return false;
+        });
+
+        edit_button.clicked.connect (() => {
+            editing = true;
+        });
+
+        entry.activate.connect (() => {
+            editing = false;
+        });
+
+        entry.icon_release.connect ((p0, p1) => {
+            if (p0 == Gtk.EntryIconPosition.SECONDARY) {
+                editing = false;
+            }
+        });
+    }
+}

=== modified file 'src/sidebar/metadata/LibraryProperties.vala'
--- src/sidebar/metadata/LibraryProperties.vala	2016-09-19 21:18:06 +0000
+++ src/sidebar/metadata/LibraryProperties.vala	2016-11-06 03:45:29 +0000
@@ -7,7 +7,7 @@
 private class LibraryProperties : Properties {
     private MediaSource? media_source;
     private string comment;
-    private Gtk.Entry title_entry;
+    private EditableTitle title_entry;
     private Gtk.Entry tags_entry;
     private PlaceHolderTextView comment_entry;
     private bool is_media;
@@ -66,9 +66,9 @@
         base.internal_update_properties (page);
 
         if (is_media) {
-            title_entry = new Gtk.Entry ();
+            title_entry = new EditableTitle (null);
             if (title != null)
-                title_entry.set_text (title);
+                title_entry.text = title;
             title_entry.changed.connect (title_entry_changed);
             add_entry_line (_("Title"), title_entry);
 
@@ -124,7 +124,7 @@
     }
 
     private void title_entry_changed () {
-        title = title_entry.get_text ();
+        title = title_entry.text;
     }
 
     private void tags_entry_changed () {