MacGui: Introduce Auto Naming

- Auto Naming checkbox in Preferences (default to Off)
- If  "ON" uses the DVD Name and "- Title Number" as the file output name.
- Called in -TitlePopupChanged function.

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

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index b0aed57..9baad9a 100644 (file)
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -432,6 +432,8 @@ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultPresetsDrawerShow
             }
             // Select the longuest title
                        [fSrcTitlePopUp selectItemAtIndex: indxpri];
+
+                       
                        
             [self TitlePopUpChanged: NULL];
             [self EnableUI: YES];
@@ -1001,7 +1003,15 @@ if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultPresetsDrawerShow
     hb_list_t  * list  = hb_get_titles( fHandle );
     hb_title_t * title = (hb_title_t*)
         hb_list_item( list, [fSrcTitlePopUp indexOfSelectedItem] );
-
+    /* If Auto Naming is on. We create an output filename of dvd name - title number */
+    if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultAutoNaming"] > 0)
+       {
+               [fDstFile2Field setStringValue: [NSString stringWithFormat:
+                       @"%@/%@-%d.%@", [[fDstFile2Field stringValue] stringByDeletingLastPathComponent],
+                       [NSString stringWithUTF8String: title->name],
+                       [fSrcTitlePopUp indexOfSelectedItem] + 1,
+                       [[fDstFile2Field stringValue] pathExtension]]]; 
+       }
 
     /* Update chapter popups */
     [fSrcChapterStartPopUp removeAllItems];

diff --git a/macosx/English.lproj/MainMenu.nib/classes.nib b/macosx/English.lproj/MainMenu.nib/classes.nib
index 2b248ad..86004db 100644 (file)
--- a/macosx/English.lproj/MainMenu.nib/classes.nib
+++ b/macosx/English.lproj/MainMenu.nib/classes.nib
@@ -185,6 +185,7 @@
             OUTLETS = {
                 fDefAdvancedx264FlagsView = NSButton; 
                 fDefAudioSurround = NSButton; 
+                fDefAutoNaming = NSButton; 
                 fDefCrf = NSButton; 
                 fDefDeinterlace = NSButton; 
                 fDefPicSizeAutoSetipod = NSButton; 

diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index 64beae6..02501e0 100644 (file)
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -20,10 +20,11 @@
        <key>IBOpenObjects</key>
        <array>
                <integer>29</integer>
+               <integer>1438</integer>
                <integer>1843</integer>
        </array>
        <key>IBSystem Version</key>
-       <string>8L127</string>
+       <string>8P2137</string>
        <key>IBUserGuides</key>
        <dict>
                <key>21</key>

diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index 7bfb841..0d8b165 100644 (file)
Binary files a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib and b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib differ

diff --git a/macosx/PrefsController.h b/macosx/PrefsController.h
index a9ccb54..84ccd54 100644 (file)
--- a/macosx/PrefsController.h
+++ b/macosx/PrefsController.h
@@ -14,6 +14,7 @@
        IBOutlet NSButton * fDefPixelRatio;
        IBOutlet NSButton * fDefAudioSurround;
        IBOutlet NSButton * fDefPresetDrawerShow;
+       IBOutlet NSButton * fDefAutoNaming;
 
        IBOutlet NSTextView * fDefAdvancedx264FlagsView;
 }

diff --git a/macosx/PrefsController.m b/macosx/PrefsController.m
index b417416..8d05875 100644 (file)
--- a/macosx/PrefsController.m
+++ b/macosx/PrefsController.m
@@ -33,7 +33,8 @@
        NSString *defDestDirectory =  @"~/Desktop";
        defDestDirectory = [defDestDirectory stringByExpandingTildeInPath];
        appDefaults = [NSDictionary dictionaryWithObject:defDestDirectory forKey:@"LastDestinationDirectory"];
-       
+       appDefaults = [NSDictionary dictionaryWithObject:@"NO"
+                   forKey:@"DefaultAutoNaming"];
     [defaults registerDefaults: appDefaults];
 
        /* fUpdateCheck Check or uncheck according to the preferences */
@@ -251,7 +252,9 @@
        /* fDefPresetDrawerShow Check or uncheck according to the preferences*/
     [fDefPresetDrawerShow setState: [defaults boolForKey:@"DefaultPresetsDrawerShow"] ?
                   NSOnState : NSOffState];
-       
+       /* fDefAutoNaming Check or uncheck according to the preferences*/
+    [fDefAutoNaming setState: [defaults boolForKey:@"DefaultAutoNaming"] ?
+                  NSOnState : NSOffState];
 }
 
 
@@ -368,6 +371,17 @@
         [defaults setObject:@"NO" forKey:@"DefaultPresetsDrawerShow"];
     }
 
+    /* Use Auto Naming */
+       
+       if( [fDefAutoNaming state] == NSOnState )
+    {
+        [defaults setObject:@"YES" forKey:@"DefaultAutoNaming"];
+    }
+    else
+    {
+        [defaults setObject:@"NO" forKey:@"DefaultAutoNaming"];
+    }
+
 }
 
 @end