merge 0.9.4 to jp

[handbrake-jp/handbrake-jp.git] / macosx / HBPreferencesController.m

diff --git a/macosx/HBPreferencesController.m b/macosx/HBPreferencesController.m
index 54e6583..cae6785 100644 (file)
--- a/macosx/HBPreferencesController.m
+++ b/macosx/HBPreferencesController.m
@@ -23,12 +23,17 @@
 @interface HBPreferencesController (Private)
 
 - (void) setPrefView: (id) sender;
+- (NSToolbarItem *)toolbarItemWithIdentifier: (NSString *)identifier
+                                       label: (NSString *)label
+                                       image: (NSImage *)image;
 
 @end
 
 @implementation HBPreferencesController
 
 /**
+ * +[HBPreferencesController registerUserDefaults]
+ *
  * Registers default values to user defaults. This is called immediately
  * when HandBrake starts, from [HBController init].
  */
@@ -38,9 +43,11 @@
 
     [[NSUserDefaults standardUserDefaults] registerDefaults:[NSDictionary dictionaryWithObjectsAndKeys:
         @"YES",             @"CheckForUpdates",
+        @"Open Source",     @"LaunchSourceBehavior",
         @"English",         @"DefaultLanguage",
+        @"YES",              @"UseCoreAudio",
         @"NO",              @"DefaultMpegName",
-        @"YES",             @"DefaultCrf",
+        @"YES",              @"UseDvdNav",
         @"",                @"DefAdvancedx264Flags",
         @"YES",             @"DefaultPresetsDrawerShow",
         desktopDirectory,   @"LastDestinationDirectory",
@@ -49,13 +56,19 @@
         @"NO",              @"DisableDvdAutoDetect",
         @"Alert Window",    @"AlertWhenDone",
         @"1",               @"LoggingLevel",
-        @"4:10:15:9:10:35:9",    @"DecombCustomString",
-        @"NO",    @"EncodeLogLocation",
+        @"NO",              @"EncodeLogLocation",
+        @"10",              @"PreviewsNumber",
+        @"",                @"Drawer Size",
+        @"0.25",            @"x264CqSliderFractional",
+        @"YES",              @"AlertBuiltInPresetUpdate",
         nil]];
 }
 
 /**
+ * -[HBPreferencesController init]
+ *
  * Initializes the preferences controller by loading Preferences.nib file.
+ *
  */
 - (id)init
 {
@@ -66,6 +79,13 @@
     return self;
 }
 
+/**
+ * -[HBPreferencesController awakeFromNib]
+ *
+ * Called after all the outlets in the nib file have been attached. Sets up the
+ * toolbar and shows the "General" pane.
+ *
+ */
 - (void) awakeFromNib
 {
     NSToolbar * toolbar = [[[NSToolbar alloc] initWithIdentifier: @"Preferences Toolbar"] autorelease];
@@ -79,9 +99,11 @@
     [self setPrefView:nil];
 }
 
-- (NSToolbarItem *) toolbar: (NSToolbar *) toolbar itemForItemIdentifier: (NSString *) ident
-                    willBeInsertedIntoToolbar: (BOOL) flag
+- (NSToolbarItem *)toolbar: (NSToolbar *)toolbar
+     itemForItemIdentifier: (NSString *)ident
+ willBeInsertedIntoToolbar: (BOOL)flag
 {
+    /*
     NSToolbarItem * item;
     item = [[[NSToolbarItem alloc] initWithItemIdentifier: ident] autorelease];
 
@@ -100,29 +122,47 @@
         [item setTarget: self];
         [item setAction: @selector(setPrefView:)];
         [item setAutovalidates: NO];
+    */
+    if ( [ident isEqualToString:TOOLBAR_GENERAL] )
+    {
+        return [self toolbarItemWithIdentifier:ident
+                                         label:NSLocalizedString(@"General", @"Preferences General Toolbar Item")
+                                         image:[NSImage imageNamed:NSImageNamePreferencesGeneral]];
     }
-    else if ([ident isEqualToString: TOOLBAR_AUDIO])
+    else if ( [ident isEqualToString:TOOLBAR_PICTURE] )
     {
+       /*
         [item setLabel: NSLocalizedStringFromTable(@"Audio", @"Preferences", "Audio")];
         [item setImage: [NSImage imageNamed: @"pref-audio"]];
         [item setTarget: self];
         [item setAction: @selector(setPrefView:)];
         [item setAutovalidates: NO];
+       */
+        return [self toolbarItemWithIdentifier:ident
+                                         label:NSLocalizedString(@"Picture", @"Preferences Picture Toolbar Item")
+                                         image:[NSImage imageNamed:@"pref-picture"]];
     }
-    else if ([ident isEqualToString: TOOLBAR_ADVANCED])
+    else if ( [ident isEqualToString:TOOLBAR_AUDIO] )
     {
+       /*
         [item setLabel: NSLocalizedStringFromTable(@"Advanced", @"Preferences", "Advanced")];
         [item setImage: [NSImage imageNamed: @"NSAdvanced"]];
         [item setTarget: self];
         [item setAction: @selector(setPrefView:)];
         [item setAutovalidates: NO];
+       */
+        return [self toolbarItemWithIdentifier:ident
+                                         label:NSLocalizedString(@"Audio", @"Preferences Audio Toolbar Item")
+                                         image:[NSImage imageNamed:@"pref-audio"]];
     }
-    else
+    else if ( [ident isEqualToString:TOOLBAR_ADVANCED] )
     {
-        return nil;
+        return [self toolbarItemWithIdentifier:ident
+                                         label:NSLocalizedString(@"Advanced", @"Preferences Advanced Toolbar Item")
+                                         image:[NSImage imageNamed:NSImageNameAdvanced]];
     }
 
-    return item;
+    return nil;
 }
 
 - (NSArray *) toolbarSelectableItemIdentifiers: (NSToolbar *) toolbar
@@ -137,7 +177,7 @@
 
 - (NSArray *) toolbarAllowedItemIdentifiers: (NSToolbar *) toolbar
 {
-    return [NSArray arrayWithObjects: TOOLBAR_GENERAL, TOOLBAR_PICTURE,
+    return [NSArray arrayWithObjects: TOOLBAR_GENERAL, /*TOOLBAR_PICTURE, */
                                         TOOLBAR_AUDIO, TOOLBAR_ADVANCED, nil];
 }
 
@@ -190,4 +230,22 @@
     }
 }
 
+/**
+ * -[HBPreferencesController(Private) toolbarItemWithIdentifier:label:image:]
+ *
+ * Shared code for creating the NSToolbarItems for the Preferences toolbar.
+ *
+ */
+- (NSToolbarItem *)toolbarItemWithIdentifier: (NSString *)identifier
+                                       label: (NSString *)label
+                                       image: (NSImage *)image
+{
+    NSToolbarItem *item = [[NSToolbarItem alloc] initWithItemIdentifier:identifier];
+    [item setLabel:label];
+    [item setImage:image];
+    [item setAction:@selector(setPrefView:)];
+    [item setAutovalidates:NO];
+    return [item autorelease];
+}
+
 @end