From e993c7e5608e755a3d941d8521995bc0bf33ce1f Mon Sep 17 00:00:00 2001
From: Rodeo <tdskywalker@gmail.com>
Date: Wed, 2 Jan 2013 17:27:50 +0000
Subject: MacGui: fix fx264UseAdvancedOptionsCheck (hopefully).

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5130 b64f7644-9d1e-0410-96f1-a4d463321fa5
---
 macosx/Controller.h               |  5 +++--
 macosx/Controller.m               | 13 +++++++++----
 macosx/English.lproj/MainMenu.xib |  8 ++++----
 3 files changed, 16 insertions(+), 10 deletions(-)

(limited to 'macosx')

diff --git a/macosx/Controller.h b/macosx/Controller.h
index 7b92589a3..6b0e0968b 100644
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -302,8 +302,9 @@ BOOL                        fIsDragging;
 
 - (void)     updateUI: (NSTimer *) timer;
 - (void)     enableUI: (bool) enable;
-- (IBAction) updateX264Widgets: (bool) enable;
-- (IBAction) setupX264PresetsWidgets: (id) sender;
+- (void) setupX264PresetsWidgets: (id) sender;
+- (void) enableX264Widgets: (bool) enable;
+- (IBAction) updateX264Widgets: (id) sender;
 - (IBAction) x264PresetsSetJobVariables: (id) sender;
 - (IBAction) x264PresetsChangedDisplayExpandedOptions: (id) sender;
 
diff --git a/macosx/Controller.m b/macosx/Controller.m
index fd99f39b6..5e0a3b057 100644
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -794,7 +794,7 @@ static NSString *        ChooseSourceIdentifier             = @"Choose Source It
     }
     
     [self videoMatrixChanged:nil];
-    [self updateX264Widgets:b];
+    [self enableX264Widgets:b];
 }
 
 
@@ -5298,7 +5298,7 @@ the user is using "Custom" settings by determining the sender*/
     [fDisplayX264PresetsAdditonalOptionsTextField setStringValue:@""];
 }
 
-- (IBAction) updateX264Widgets: (bool) enable
+- (void) enableX264Widgets: (bool) enable
 {
     NSControl * controls[] =
     {
@@ -5352,6 +5352,11 @@ the user is using "Custom" settings by determining the sender*/
     [self x264PresetsChangedDisplayExpandedOptions:nil];
 }
 
+- (IBAction) updateX264Widgets: (id) sender
+{
+    [self enableX264Widgets: YES];
+}
+
 
 - (IBAction) x264PresetsSliderChanged: (id) sender
 { 
@@ -6153,7 +6158,7 @@ return YES;
                 }
                 /* we enable the advanced panel and update the widgets */
                 [fx264UseAdvancedOptionsCheck setState: NSOnState];
-                [self updateX264Widgets: YES];
+                [self updateX264Widgets:nil];
             }
             /*
              * x264UeAdvancedOptions is set to 0 (disabled),
@@ -6208,7 +6213,7 @@ return YES;
                 }
                 /* we enable the advanced panel and update the widgets */
                 [fx264UseAdvancedOptionsCheck setState: NSOffState];
-                [self updateX264Widgets: YES];
+                [self updateX264Widgets:nil];
             }
         }
         
diff --git a/macosx/English.lproj/MainMenu.xib b/macosx/English.lproj/MainMenu.xib
index 3fb52afdf..e4b943f72 100644
--- a/macosx/English.lproj/MainMenu.xib
+++ b/macosx/English.lproj/MainMenu.xib
@@ -7095,7 +7095,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">enableX264PresetWidgets:</string>
+						<string key="label">updateX264Widgets:</string>
 						<reference key="source" ref="2258723"/>
 						<reference key="destination" ref="902460295"/>
 					</object>
@@ -12085,7 +12085,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>customSettingUsed:</string>
 							<string>deleteFactoryPresets:</string>
 							<string>deletePreset:</string>
-							<string>enableX264PresetWidgets:</string>
+							<string>updateX264Widgets:</string>
 							<string>encodeStartStopPopUpChanged:</string>
 							<string>formatPopUpChanged:</string>
 							<string>getDefaultPresets:</string>
@@ -12216,7 +12216,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 							<string>customSettingUsed:</string>
 							<string>deleteFactoryPresets:</string>
 							<string>deletePreset:</string>
-							<string>enableX264PresetWidgets:</string>
+							<string>updateX264Widgets:</string>
 							<string>encodeStartStopPopUpChanged:</string>
 							<string>formatPopUpChanged:</string>
 							<string>getDefaultPresets:</string>
@@ -12362,7 +12362,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBActionInfo">
-								<string key="name">enableX264PresetWidgets:</string>
+								<string key="name">updateX264Widgets:</string>
 								<string key="candidateClassName">id</string>
 							</object>
 							<object class="IBActionInfo">
-- 
cgit v1.2.3