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

diff --git a/macosx/HBPreferencesController.m b/macosx/HBPreferencesController.m
index 70b3ac4c..7cba07e4 100644
--- a/macosx/HBPreferencesController.m
+++ b/macosx/HBPreferencesController.m
@@ -41,16 +41,13 @@
         @"English",         @"DefaultLanguage",
         @"NO",              @"DefaultMpegName",
         @"YES",             @"DefaultCrf",
-        @"NO",              @"DefaultDeinterlaceOn",
-        @"NO",              @"PixelRatio",
         @"",                @"DefAdvancedx264Flags",
         @"YES",             @"DefaultPresetsDrawerShow",
         desktopDirectory,   @"LastDestinationDirectory",
         desktopDirectory,   @"LastSourceDirectory",
         @"NO",              @"DefaultAutoNaming",
-        @"NO",              @"DefaultChapterMarkers",
         @"NO",              @"DisableDvdAutoDetect",
-		@"Alert Window",    @"AlertWhenDone",
+        @"Alert Window",    @"AlertWhenDone",
         @"4:10:15:9:10:35:9",    @"DecombCustomString",
         nil]];
 }
@@ -69,7 +66,7 @@
 
 - (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];
@@ -149,24 +146,24 @@
 - (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;
 
@@ -176,16 +173,14 @@
     [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;