Attempting to address mypaint#375

gui/filehandling.py

@@ -570,8 +570,7 @@ def set_filename(self, value):
 
         if self.filename:
             if self.filename.startswith(
-                self.get_scrap_folder() + self.get_scrap_prefix()
-            ):
+                self.get_scrap_folder() + self.get_scrap_prefix()):
                 self.active_scrap_filename = self.filename
 
     filename = property(get_filename, set_filename)

gui/preferenceswindow.py

@@ -295,6 +295,31 @@ def pressure_curve_changed_cb(self, widget):
         self.app.preferences['input.global_pressure_mapping'] = points
         self.app.apply_settings()
 
+    def scrap_folder_button_pressed_cb(self, widget):
+        dialog = Gtk.FileChooserDialog(
+        title="Choose a folder...",
+        transient_for=self.app.drawWindow,
+        action=Gtk.FileChooserAction.SELECT_FOLDER,
+        )
+        dialog.add_button(Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL)
+        dialog.add_button(Gtk.STOCK_OPEN, Gtk.ResponseType.OK)
+        response = dialog.run()
+        # for formating the output nicely when in a home folder
+        if sys.platform == 'win32':
+            ud_docs = lib.glib.get_user_special_dir(
+                GLib.UserDirectory.DIRECTORY_DOCUMENTS,
+            )
+            folderprefix = os.path.join(ud_docs, u)
+        else:
+            folderprefix = u'~/'
+        if response == Gtk.ResponseType.OK:
+            folder = dialog.get_filename()
+            folder = folder.replace(
+                os.path.expanduser('~') + os.sep, folderprefix)
+            self.app.preferences['saving.scrap_folder'] = folder
+            self.app.apply_settings()
+        dialog.destroy()
+
     def scrap_folder_entry_changed_cb(self, widget):
         scrap_folder = widget.get_text()
         if isinstance(scrap_folder, bytes):

gui/userconfig.py

@@ -57,7 +57,7 @@ def default_configuration():
         )
         scrapfldr = os.path.join(ud_docs, u'MyPaint', u'scrap')
     else:
-        scrapfldr = u'~/MyPaint/'
+        scrapfldr = u'~/MyPaint'
     default_config = {
         'saving.scrap_folder': scrapfldr,
         'saving.scrap_prefix': 'scrap',