[ocrfeeder/new_fixes: 5/10] Remember the last directories in image add / file save.

[Joaquim Manuel Pereira Rocha <jrocha src gnome org>]

commit ce494d1b5cb4ed7deb4b79d2bcdf3547fe41b0ce
Author: Jan Losinski <losinski wh2 tu-dresden de>
Date:   Thu Jul 26 20:44:12 2012 +0200

    Remember the last directories in image add / file save.
    
    This makes the image-add and file-save dialogs remembering the last
    directory. I found it annoing to start every time from $HOME to navigate
    three or more levels to the scanned image.

 src/ocrfeeder/studio/studioBuilder.py |    6 +++++-
 src/ocrfeeder/studio/widgetModeler.py |    7 ++++++-
 2 files changed, 11 insertions(+), 2 deletions(-)
---
diff --git a/src/ocrfeeder/studio/studioBuilder.py b/src/ocrfeeder/studio/studioBuilder.py
index ea3ad13..c53a4bb 100644
--- a/src/ocrfeeder/studio/studioBuilder.py
+++ b/src/ocrfeeder/studio/studioBuilder.py
@@ -189,10 +189,14 @@ class Studio:
         return True
 
     def addImage(self, widget):
-        file_open_dialog = widgetPresenter.FileDialog('open', file_filters = [(_('Images'), ['image/*'], [])])
+        location = getattr(self, "image_location", None)
+        if location is None:
+            location = "~"
+        file_open_dialog = widgetPresenter.FileDialog('open', current_folder=location, file_filters = [(_('Images'), ['image/*'], [])])
         response = file_open_dialog.run()
         if response == gtk.RESPONSE_OK:
             for file_name in file_open_dialog.get_filenames():
+                self.image_location = os.path.dirname(file_name)
                 self.__addImagesToReviewer([file_name])
         file_open_dialog.destroy()
 
diff --git a/src/ocrfeeder/studio/widgetModeler.py b/src/ocrfeeder/studio/widgetModeler.py
index 7d27554..864a67f 100644
--- a/src/ocrfeeder/studio/widgetModeler.py
+++ b/src/ocrfeeder/studio/widgetModeler.py
@@ -755,10 +755,15 @@ class ImageReviewer_Controler:
             return None
 
     def __askForFileName(self, extension = ''):
-        save_dialog = FileDialog('save')
+        location = getattr(self, "file_save_path", None)
+        if location is None:
+            location = "~"
+        save_dialog = FileDialog('save', current_folder=location)
         response = save_dialog.run()
         if response == gtk.RESPONSE_OK:
             file_name = save_dialog.get_filename()
+            if file_name is not None:
+                self.file_save_path = os.path.dirname(file_name)
             if extension:
                 if not file_name.endswith(extension):
                     file_name += extension