Merge lp:~jeremywootten/pantheon-files/fix-1644854-filechooser-forgets-last-folder into lp:~elementary-apps/pantheon-files/trunk

[Jeremy Wootten]

This branch (re)implements a last-folder-uri setting for the pantheon-files filechooser module. It was not found possible to access the gtk file chooser setting so a new setting is created in the pantheon-files schema.

[Cody Garver (codygarver)]

See diff comments

review: Needs Fixing

[lp:~jeremywootten/pantheon-files/fix-1644854-filechooser-forgets-last-folder]

2388. By Jeremy Wootten on 2016-12-20

Fix format; remove commented out line

[Zisu Andrei (matzipan)]

LGTM.

review: Approve

[lp:~jeremywootten/pantheon-files/fix-1644854-filechooser-forgets-last-folder]

2389. By Jeremy Wootten on 2017-01-16

Merge trunk r2445

2390. By Jeremy Wootten on 2017-02-04

Merge changes from parent

Unmerged revisions

=== modified file 'data/schemas/org.pantheon.files.gschema.xml'
--- data/schemas/org.pantheon.files.gschema.xml	2015-11-14 13:04:42 +0000
+++ data/schemas/org.pantheon.files.gschema.xml	2016-12-20 18:38:12 +0000
@@ -210,5 +210,12 @@
       <description>The column width preferred by the  Miller Column View.</description>
     </key>
   </schema>
+  <schema path="/org/pantheon/files/file-chooser/" id="org.pantheon.files.file-chooser">
+    <key type ="s" name="last-folder-uri">
+      <default>''</default>
+      <summary>Last folder uri</summary>
+      <description>Uri of the last folder shown by the filechooser</description>
+    </key>
+  </schema>
 
 </schemalist>

=== modified file 'filechooser-module/FileChooserDialog.vala'
--- filechooser-module/FileChooserDialog.vala	2016-08-12 10:13:52 +0000
+++ filechooser-module/FileChooserDialog.vala	2016-12-20 18:38:12 +0000
@@ -60,6 +60,8 @@
         var settings = new Settings ("org.pantheon.files.preferences");
         is_single_click = settings.get_boolean ("single-click");
 
+        var chooser_settings = new Settings ("org.pantheon.files.file-chooser");
+
         assign_container_box ();
         remove_gtk_widgets ();
         setup_filter_box ();
@@ -125,9 +127,15 @@
             location_bar.set_display_path (current_path);
         });
 
+        chooser_dialog.unrealize.connect (() => {
+            chooser_settings.set_string ("last-folder-uri", location_bar.get_display_path ());
+        });
+
         location_bar.path_change_request.connect ((uri) => {
             chooser_dialog.set_current_folder (uri);
         });
+
+        chooser_dialog.set_current_folder_uri (chooser_settings.get_string ("last-folder-uri"));
     }
 
     /*

=== modified file 'libwidgets/Chrome/BasicLocationBar.vala'
--- libwidgets/Chrome/BasicLocationBar.vala	2016-04-29 11:47:42 +0000
+++ libwidgets/Chrome/BasicLocationBar.vala	2016-12-20 18:38:12 +0000
@@ -131,6 +131,10 @@
             display_path = path;  /* Will also change breadcrumbs */
         }
 
+        public string get_display_path () {
+            return display_path;
+        }
+
         public bool set_focussed () {
             bread.grab_focus ();
             return bread.has_focus;

=== modified file 'libwidgets/Interfaces/LocatableInterface.vala'
--- libwidgets/Interfaces/LocatableInterface.vala	2016-05-06 10:36:16 +0000
+++ libwidgets/Interfaces/LocatableInterface.vala	2016-12-20 18:38:12 +0000
@@ -21,6 +21,7 @@
         public signal void path_change_request (string path, Marlin.OpenFlag flag = Marlin.OpenFlag.DEFAULT);
 
         public abstract void set_display_path (string path);
+        public abstract string get_display_path ();
         public abstract bool set_focussed ();
     }
 }