Merge lp:~hannahermsen/ubuntu/trusty/ristretto/bug-1284111 into lp:ubuntu/trusty/ristretto

[Hanna Hermsen]

I previously submitted these fixes, but separately. By reading the documentation I thought it should be done like that, but on Sebastien Bacher's request I merged them to one fix.

[Łukasz Zemczak (sil2100)]

Hey! Thank you for submitting these fixes to Ubuntu!

There are a few things that we would need to know and some things you need to do:
1. As per the comment in the bug (LP: #1284111), could you make sure that the bug is reported upstream and the proposed fixed also sent to the upstream project itself? Is that the case right now?
2. The fix seems to be applied invalidly to the source - the package doesn't want to build. You applied the changes to the source tree and did not create a patch (even though you modified the debian/patches/series file). This project uses quilt [1] as the patch system, so all additional source changes need a quilt patch - introducing local source changes is not possible. We can help out with this if needed.
3. You are targeting this merge to the trusty branch - is this bug also valid for utopic? We generally prefer first landing fixes into the current development series and only then backporting to previous releases.

Thanks again!

[1] https://wiki.debian.org/UsingQuilt

review: Needs Fixing

[Sebastien Bacher (seb128)]

setting as "work in progress", please set it back to "needs reviewx" when the previous comment points are addressed, thanks

Unmerged revisions

28. By Hanna Hermsen on 2014-07-03

* Filename is now pre-filled in the "Save Copy" dialogue. (LP: #1284111)
* File -> Save Copy" now remembers the most recently used save folder
  (only for the current session, defaults to the home folder when the
  application is started). (LP: #1284111)
* The tooltip of the "File -> Save Copy" menu item now makes it clear
  that a losless copy will be made. (LP: #1284111)

=== modified file '.pc/applied-patches'
--- .pc/applied-patches	2014-04-05 14:52:07 +0000
+++ .pc/applied-patches	2014-07-03 10:06:20 +0000
@@ -1,1 +1,2 @@
 git-large-numbers-overflow.patch
+save-copy-changes

=== modified file 'debian/changelog'
--- debian/changelog	2014-04-05 03:53:05 +0000
+++ debian/changelog	2014-07-03 10:06:20 +0000
@@ -1,3 +1,14 @@
+ristretto (0.6.3-2ubuntu2) UNRELEASED; urgency=medium
+
+  * Filename is now pre-filled in the "Save Copy" dialogue. (LP: #1284111)   
+  * File -> Save Copy" now remembers the most recently used save folder
+    (only for the current session, defaults to the home folder when the
+    application is started). (LP: #1284111) 
+  * The tooltip of the "File -> Save Copy" menu item now makes it clear
+    that a losless copy will be made. (LP: #1284111)  
+
+ -- Hanna Hermsen <[e-mail]>  Thu, 03 Jul 2014 11:57:49 +0200
+
 ristretto (0.6.3-2ubuntu1) trusty; urgency=medium
 
   * Add git-large-numbers-overflow.patch from upstream git

=== modified file 'debian/patches/series'
--- debian/patches/series	2014-04-05 03:53:05 +0000
+++ debian/patches/series	2014-07-03 10:06:20 +0000
@@ -1,1 +1,2 @@
 git-large-numbers-overflow.patch
+save-copy-changes

=== modified file 'src/main_window.c'
--- src/main_window.c	2012-08-11 15:35:18 +0000
+++ src/main_window.c	2014-07-03 10:06:20 +0000
@@ -131,6 +131,8 @@
     gint                   play_timeout_id;
 
     GtkFileFilter         *filter;
+
+    gchar                 *last_save_location;
 };
 
 enum
@@ -374,7 +376,7 @@
             GTK_STOCK_SAVE_AS, /* Icon-name */
             N_ ("_Save copy..."), /* Label-text */
             "<control>s", /* Keyboard shortcut */
-            N_ ("Save a copy of the image"), /* Tooltip text */
+            N_ ("Save a losless copy of the image"), /* Tooltip text */
             G_CALLBACK (cb_rstto_main_window_save_copy), },
   { "properties",
             GTK_STOCK_PROPERTIES, /* Icon-name */
@@ -1123,6 +1125,8 @@
             G_CALLBACK (cb_rstto_thumbnailer_ready),
             window);
 
+    /* Set the last save location. Defaults to the home folder */
+    window->priv->last_save_location = "~";
 }
 
 static void
@@ -2198,10 +2202,10 @@
                     window->priv->wallpaper_manager = rstto_gnome_wallpaper_manager_new ();
                     break;
             }
-	    rstto_settings_set_string_property (
-		    window->priv->settings_manager,
-		    "desktop-type",
-		    desktop_type);
+        rstto_settings_set_string_property (
+            window->priv->settings_manager,
+            "desktop-type",
+            desktop_type);
         
         }
 
@@ -3129,6 +3133,11 @@
     GtkWidget *dialog, *err_dialog;
     gint response;
     GFile *file, *s_file;
+    RsttoFile *cur_file = NULL;
+    const gchar *file_basename = NULL;
+
+    cur_file = rstto_image_list_iter_get_file (window->priv->iter);
+    file_basename = rstto_file_get_display_name (cur_file);
 
     dialog = gtk_file_chooser_dialog_new(_("Save copy"),
                                          GTK_WINDOW(window),
@@ -3137,6 +3146,8 @@
                                          GTK_STOCK_SAVE, GTK_RESPONSE_OK,
                                          NULL);
     gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE);
+    gtk_file_chooser_set_current_folder (GTK_FILE_CHOOSER (dialog), window->priv->last_save_location);
+    gtk_file_chooser_set_current_name (GTK_FILE_CHOOSER(dialog), file_basename);
 
     response = gtk_dialog_run(GTK_DIALOG(dialog));
     if(response == GTK_RESPONSE_OK)
@@ -3160,6 +3171,8 @@
             gtk_dialog_run(GTK_DIALOG(err_dialog));
             gtk_widget_destroy(err_dialog);
         }
+        /* Strip of the URI part to get the location of the newly saved file */
+        window->priv->last_save_location = gtk_file_chooser_get_current_folder_uri(dialog) + 7;
     }
 
     gtk_widget_destroy(dialog);