MacGui: Last source directory used is now remembered and used the next time instead...

git-svn-id: svn://localhost/HandBrake/trunk@481 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index e4314c4..7ebcd9a 100644 (file)
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -939,7 +939,7 @@ static int FormatSettings[3][4] =
             [fDstFile2Field stringValue]] );
         return;
     }
-       /* We get the destination directory from the destingation field here */
+       /* We get the destination directory from the destination field here */
        NSString *destinationDirectory = [[fDstFile2Field stringValue] stringByDeletingLastPathComponent];
        /* We check for a valid destination here */
        if ([[NSFileManager defaultManager] fileExistsAtPath:destinationDirectory] == 0) 

diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index 8f5dd61..9ce0243 100644 (file)
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -33,6 +33,11 @@
        NSString *defDestDirectory =  @"~/Desktop";
        defDestDirectory = [defDestDirectory stringByExpandingTildeInPath];
        appDefaults = [NSDictionary dictionaryWithObject:defDestDirectory forKey:@"LastDestinationDirectory"];
+       
+       NSString *defSrcDirectory =  @"~/Desktop";
+       defSrcDirectory = [defSrcDirectory stringByExpandingTildeInPath];
+       appDefaults = [NSDictionary dictionaryWithObject:defSrcDirectory forKey:@"LastSourceDirectory"];
+       
        appDefaults = [NSDictionary dictionaryWithObject:@"NO"
                    forKey:@"DefaultAutoNaming"];
        appDefaults = [NSDictionary dictionaryWithObject:@"NO"

diff --git a/macosx/ScanController.mm b/macosx/ScanController.mm
index 9ce44f8..cad7833 100644 (file)
--- a/macosx/ScanController.mm
+++ b/macosx/ScanController.mm
@@ -196,8 +196,17 @@
     [panel setAllowsMultipleSelection: NO];
     [panel setCanChooseFiles: YES];
     [panel setCanChooseDirectories: YES ];
-
-    [panel beginSheetForDirectory: nil file: nil types: nil
+    NSString * sourceDirectory;
+       if ([[NSUserDefaults standardUserDefaults] stringForKey:@"LastSourceDirectory"])
+       {
+       sourceDirectory = [[NSUserDefaults standardUserDefaults] stringForKey:@"LastSourceDirectory"];
+       }
+       else
+       {
+       sourceDirectory = @"~/Desktop";
+       sourceDirectory = [sourceDirectory stringByExpandingTildeInPath];
+       }
+    [panel beginSheetForDirectory: sourceDirectory file: nil types: nil
         modalForWindow: [NSApp mainWindow] modalDelegate: self
         didEndSelector: @selector( BrowseDone:returnCode:contextInfo: )
         contextInfo: nil];
@@ -239,6 +248,9 @@
 
     if( [fMatrix selectedRow] )
     {
+       /* we set the last source directory in the prefs here */
+       NSString *sourceDirectory = [[fFolderField stringValue] stringByDeletingLastPathComponent];
+       [[NSUserDefaults standardUserDefaults] setObject:sourceDirectory forKey:@"LastSourceDirectory"];
        hb_scan( fHandle, [[fFolderField stringValue] UTF8String], 0 );
     }
     else