X-Git-Url: http://git.osdn.jp/view?a=blobdiff_plain;f=macosx%2FHBPreferencesController.m;h=7cba07e4787165dfcb3fd0ff44162527d71f2a78;hb=533776bbad20db93fe964bc69975f108b2a30888;hp=587214ca624bb67e013cf11764052c44c9ddb06a;hpb=12f2a1235bfce11906f7db5d524d5c5e1bc43a46;p=handbrake-jp%2Fhandbrake-jp-git.git

diff --git a/macosx/HBPreferencesController.m b/macosx/HBPreferencesController.m
index 587214ca..7cba07e4 100644
--- a/macosx/HBPreferencesController.m
+++ b/macosx/HBPreferencesController.m
@@ -19,7 +19,7 @@
  * no getter/setter code is needed in this file (unless more complicated
  * preference settings are added that cannot be handled with Cocoa bindings).
  */
- 
+
 @interface HBPreferencesController (Private)
 
 - (void) setPrefView: (id) sender;
@@ -35,25 +35,20 @@
 + (void)registerUserDefaults
 {
     NSString *desktopDirectory =  [@"~/Desktop" stringByExpandingTildeInPath];
-    
+
     [[NSUserDefaults standardUserDefaults] registerDefaults:[NSDictionary dictionaryWithObjectsAndKeys:
         @"YES",             @"CheckForUpdates",
         @"English",         @"DefaultLanguage",
         @"NO",              @"DefaultMpegName",
         @"YES",             @"DefaultCrf",
-        @"NO",              @"DefaultDeinterlaceOn",
-        @"YES",             @"DefaultPicSizeAutoiPod",
-        @"NO",              @"PixelRatio",
         @"",                @"DefAdvancedx264Flags",
         @"YES",             @"DefaultPresetsDrawerShow",
         desktopDirectory,   @"LastDestinationDirectory",
         desktopDirectory,   @"LastSourceDirectory",
         @"NO",              @"DefaultAutoNaming",
-        @"NO",              @"DefaultChapterMarkers",
-        @"NO",              @"ShowVerboseOutput",
-		@"NO",              @"AllowLargeFiles",
-		@"NO",              @"DisableDvdAutoDetect",
-		@"Alert Window",    @"AlertWhenDone",
+        @"NO",              @"DisableDvdAutoDetect",
+        @"Alert Window",    @"AlertWhenDone",
+        @"4:10:15:9:10:35:9",    @"DecombCustomString",
         nil]];
 }
 
@@ -66,18 +61,18 @@
     {
         NSAssert([self window], @"[HBPreferencesController init] window outlet is not connected in Preferences.nib");
     }
-    return self; 
+    return self;
 }
 
 - (void) awakeFromNib
 {
-    NSToolbar * toolbar = [[NSToolbar alloc] initWithIdentifier: @"Preferences Toolbar"];
+    NSToolbar * toolbar = [[[NSToolbar alloc] initWithIdentifier: @"Preferences Toolbar"] autorelease];
     [toolbar setDelegate: self];
     [toolbar setAllowsUserCustomization: NO];
     [toolbar setDisplayMode: NSToolbarDisplayModeIconAndLabel];
     [toolbar setSizeMode: NSToolbarSizeModeRegular];
     [[self window] setToolbar: toolbar];
-    
+
     [toolbar setSelectedItemIdentifier: TOOLBAR_GENERAL];
     [self setPrefView:nil];
 }
@@ -86,12 +81,12 @@
                     willBeInsertedIntoToolbar: (BOOL) flag
 {
     NSToolbarItem * item;
-    item = [[NSToolbarItem alloc] initWithItemIdentifier: ident];
+    item = [[[NSToolbarItem alloc] initWithItemIdentifier: ident] autorelease];
 
     if ([ident isEqualToString: TOOLBAR_GENERAL])
     {
         [item setLabel: NSLocalizedString(@"General", "General")];
-        [item setImage: [NSImage imageNamed: @"Preferences.png"]];
+        [item setImage: [NSImage imageNamed: @"NSPreferencesGeneral"]];
         [item setTarget: self];
         [item setAction: @selector(setPrefView:)];
         [item setAutovalidates: NO];
@@ -99,7 +94,7 @@
     else if ([ident isEqualToString: TOOLBAR_PICTURE])
     {
         [item setLabel: NSLocalizedString(@"Picture", "Picture")];
-//        [item setImage: [NSImage imageNamed: @"???.png"]];
+        [item setImage: [NSImage imageNamed: @"pref-picture"]];
         [item setTarget: self];
         [item setAction: @selector(setPrefView:)];
         [item setAutovalidates: NO];
@@ -107,7 +102,7 @@
     else if ([ident isEqualToString: TOOLBAR_AUDIO])
     {
         [item setLabel: NSLocalizedString(@"Audio", "Audio")];
-  //      [item setImage: [NSImage imageNamed: @"???.png"]];
+        [item setImage: [NSImage imageNamed: @"pref-audio"]];
         [item setTarget: self];
         [item setAction: @selector(setPrefView:)];
         [item setAutovalidates: NO];
@@ -115,14 +110,13 @@
     else if ([ident isEqualToString: TOOLBAR_ADVANCED])
     {
         [item setLabel: NSLocalizedString(@"Advanced", "Advanced")];
- //       [item setImage: [NSImage imageNamed: @"???.png"]];
+        [item setImage: [NSImage imageNamed: @"NSAdvanced"]];
         [item setTarget: self];
         [item setAction: @selector(setPrefView:)];
         [item setAutovalidates: NO];
     }
     else
     {
-        [item release];
         return nil;
     }
 
@@ -145,15 +139,6 @@
                                         TOOLBAR_AUDIO, TOOLBAR_ADVANCED, nil];
 }
 
-/**
- * Closes the window and stops modal state. Any changes made in field editor
- * are saved by [NSWindow endEditingFor:] before closing the window.
- */
-- (IBAction)close:(id)sender
-{
-    //[self makeFirstResponder: nil];
-}
-
 @end
 
 @implementation HBPreferencesController (Private)
@@ -161,43 +146,41 @@
 - (void) setPrefView: (id) sender
 {
     NSView * view = fGeneralView;
-    if (sender)
+    if( sender )
     {
         NSString * identifier = [sender itemIdentifier];
-        if ([identifier isEqualToString: TOOLBAR_PICTURE])
+        if( [identifier isEqualToString: TOOLBAR_PICTURE] )
             view = fPictureView;
-        else if ([identifier isEqualToString: TOOLBAR_AUDIO])
+        else if( [identifier isEqualToString: TOOLBAR_AUDIO] )
             view = fAudioView;
-        else if ([identifier isEqualToString: TOOLBAR_ADVANCED])
+        else if( [identifier isEqualToString: TOOLBAR_ADVANCED] )
             view = fAdvancedView;
         else;
     }
-    
+
     NSWindow * window = [self window];
-    if ([window contentView] == view)
+    if( [window contentView] == view )
         return;
-    
+
     NSRect windowRect = [window frame];
-    float difference = ([view frame].size.height - [[window contentView] frame].size.height) * [window userSpaceScaleFactor];
+    CGFloat difference = ( [view frame].size.height - [[window contentView] frame].size.height ) * [window userSpaceScaleFactor];
     windowRect.origin.y -= difference;
     windowRect.size.height += difference;
-    
+
     [view setHidden: YES];
     [window setContentView: view];
     [window setFrame: windowRect display: YES animate: YES];
     [view setHidden: NO];
-    
+
     //set title label
-    if (sender)
+    if( sender )
         [window setTitle: [sender label]];
     else
     {
         NSToolbar * toolbar = [window toolbar];
         NSString * itemIdentifier = [toolbar selectedItemIdentifier];
-        NSEnumerator * enumerator = [[toolbar items] objectEnumerator];
-        NSToolbarItem * item;
-        while ((item = [enumerator nextObject]))
-            if ([[item itemIdentifier] isEqualToString: itemIdentifier])
+        for( NSToolbarItem * item in [toolbar items] )
+            if( [[item itemIdentifier] isEqualToString: itemIdentifier] )
             {
                 [window setTitle: [item label]];
                 break;