Merge lp:~evfool/pantheon-files/lp883553-properties-rename into lp:~elementary-apps/pantheon-files/trunk

[Robert Roth]

Rename file/folder from properties dialog (lp:883553)

Rename file/folder from properties dialog (lp:883553)

Renaming currently happens on entry focus out (properties window close) and on entry activate (enter pressed).

[Danielle Foré (danrabbit)]

This looks good! Focus on save out is probably appropriate. That mimics the way it's done in the view.

My only small request would be if we could try to exclude extensions when it's selected, so you can start typing without worrying about that.

review: Approve (ux)

[lp:~evfool/pantheon-files/lp883553-properties-rename]

1664. By Robert Roth on 2014-12-04

Only preselect filename without extension on properties dialog

[Cody Garver (codygarver)]

This is the coolest!!!!

I could not find any way to break it

My only concern is perhaps a little cancel icon or something could appear so you could revert

review: Approve

[Robert Roth (evfool)]

Maybe the UX team could suggest a way to cancel the rename. I feel that might be unnecessary if we had undo for renaming, but as we don't have that yet, maybe a way to cancel would be ok.

[PerfectCarl (name-is-carl)]

Very minor remarks on the code (use var) and about improving a warning message

[lp:~evfool/pantheon-files/lp883553-properties-rename]

1665. By Robert Roth on 2014-12-08

Fixed based on code review

[Robert Roth (evfool)]

Minor fixes based on code review added.

[PerfectCarl (name-is-carl)]

Great!

review: Approve

=== modified file 'src/View/PropertiesWindow.vala'
--- src/View/PropertiesWindow.vala	2014-11-24 21:55:13 +0000
+++ src/View/PropertiesWindow.vala	2014-12-08 22:02:18 +0000
@@ -45,7 +45,7 @@
 
     private Gee.Set<string>? mimes;
 
-    private Granite.Widgets.WrapLabel header_title;
+    private Gtk.Widget header_title;
     private Granite.Widgets.WrapLabel type_label;
     private Gtk.Label size_label;
     private Gtk.Widget type_key_label;
@@ -201,6 +201,14 @@
         content_area.show_all ();
         show_all ();
 
+        if (count == 1) {
+            int start_offset= 0, end_offset = -1;
+
+            Marlin.get_rename_region (goffile.info.get_name (), out start_offset, out end_offset, goffile.is_folder ());
+            (header_title as Gtk.Entry).select_region (start_offset, end_offset);
+        }
+        
+
         /* Action area */
         add_button (_("Close"), Gtk.ResponseType.CLOSE);
         response.connect ((source, type) => {
@@ -319,6 +327,18 @@
         deep_count_directories = null;
     }
 */
+
+    private void rename_file (GOF.File file, string new_name) {
+        /* Only rename if name actually changed */
+        var original_name = file.info.get_name ();
+        if (new_name != original_name) {
+            file.rename (new_name, (file, result_location, error) => {
+            if (error != null)
+                warning ("Rename Error while renaming %s to %s:  %s", original_name, new_name, error.message);
+            });
+        }
+    }
+
     private void add_header_box (Gtk.Box vbox, Gtk.Box content) {
         type_label = new Granite.Widgets.WrapLabel ("");
         size_label = new Gtk.Label ("");
@@ -377,11 +397,25 @@
         file_img.set_valign (Gtk.Align.CENTER);
         content.pack_start (file_img, false, false);
 
-        header_title = new Granite.Widgets.WrapLabel ();
-        if (count > 1)
-            header_title.set_markup ("<span>" + _("%u selected items").printf(count) + "</span>");
-        else
-            header_title.set_markup ("<span>" + goffile.info.get_name () + "</span>");
+        if (count > 1 || (count == 1 && !goffile.is_writable ())) {
+            var label = new Granite.Widgets.WrapLabel ();
+            label.set_markup ("<span>" + _("%u selected items").printf(count) + "</span>");
+            header_title = label;
+        } else if (count == 1 && goffile.is_writable ()) {
+            var entry = new Gtk.Entry ();
+
+            entry.set_text (goffile.info.get_name ());
+
+            entry.activate.connect (() => {
+                rename_file (goffile, entry.get_text ());
+            });
+
+            entry.focus_out_event.connect (() => {
+                rename_file (goffile, entry.get_text ());
+                return false;
+            });
+            header_title = entry;
+        }
         header_title.get_style_context ().add_class ("h2");
         header_title.margin_top = 5;