MacGui: rename a variable.

git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@5393 b64f7644-9d1e-0410-96f1-a4d463321fa5

diff --git a/macosx/Controller.h b/macosx/Controller.h
index 5182ac6febc0e25c0be0e5b6a9adb3bc5a0c79a1..ad4ae349afd4ba7ee1901d0210c859550ae03ffd 100644 (file)
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -62,7 +62,7 @@ BOOL                        fIsDragging;
     /* x264 Presets Box */
     NSArray                      * fX264PresetNames;
     NSUInteger                     fX264MediumPresetIndex;
-    IBOutlet NSButton            * fx264UseAdvancedOptionsCheck;
+    IBOutlet NSButton            * fX264UseAdvancedOptionsCheck;
     IBOutlet NSBox               * fX264PresetsBox;
     IBOutlet NSSlider            * fX264PresetsSlider;
     IBOutlet NSTextField         * fX264PresetSliderLabel;

diff --git a/macosx/Controller.m b/macosx/Controller.m
index eb7585d637bd312645f110387fae996fc8db4cd7..7f36778a1b13eab79a5502689eec66dda73c500d 100644 (file)
--- a/macosx/Controller.m
+++ b/macosx/Controller.m
@@ -2592,7 +2592,7 @@ fWorkingCount = 0;
        [queueFileJob setObject:[fVidEncoderPopUp titleOfSelectedItem] forKey:@"VideoEncoder"];
        
     /* x264 advanced options */
-    if ([fx264UseAdvancedOptionsCheck state])
+    if ([fX264UseAdvancedOptionsCheck state])
     {
         // we are using the advanced panel
         [queueFileJob setObject:[NSNumber numberWithInt:1]       forKey: @"x264UseAdvancedOptions"];
@@ -3024,7 +3024,7 @@ fWorkingCount = 0;
         [self setH264Profile:    nil];
         [self setH264Level:      nil];
         // enable the advanced panel and update the widgets
-        [fx264UseAdvancedOptionsCheck setState:NSOnState];
+        [fX264UseAdvancedOptionsCheck setState:NSOnState];
         [self updateX264Widgets:nil];
     }
     else
@@ -3038,7 +3038,7 @@ fWorkingCount = 0;
         // preset does not use the advanced panel, reset it
         [fAdvancedOptions setOptions:@""];
         // disable the advanced panel and update the widgets
-        [fx264UseAdvancedOptionsCheck setState:NSOffState];
+        [fX264UseAdvancedOptionsCheck setState:NSOffState];
         [self updateX264Widgets:nil];
     }
     
@@ -3326,7 +3326,7 @@ fWorkingCount = 0;
         const char *advanced_opts = NULL;
         const char *h264_profile  = NULL;
         const char *h264_level    = NULL;
-        if ([fx264UseAdvancedOptionsCheck state])
+        if ([fX264UseAdvancedOptionsCheck state])
         {
             // we are using the advanced panel
             if ([(tmpString = [fAdvancedOptions optionsString]) length])
@@ -5407,11 +5407,11 @@ the user is using "Custom" settings by determining the sender*/
     };
     
     // check whether the x264 preset system and the advanced panel should be enabled
-    BOOL enable_x264_controls  = (enable && [fx264UseAdvancedOptionsCheck state] == NSOffState);
-    BOOL enable_advanced_panel = (enable && [fx264UseAdvancedOptionsCheck state] == NSOnState);
+    BOOL enable_x264_controls  = (enable && [fX264UseAdvancedOptionsCheck state] == NSOffState);
+    BOOL enable_advanced_panel = (enable && [fX264UseAdvancedOptionsCheck state] == NSOnState);
     
     // enable/disable the checkbox and advanced panel
-    [fx264UseAdvancedOptionsCheck setEnabled:enable];
+    [fX264UseAdvancedOptionsCheck setEnabled:enable];
     [fAdvancedOptions enableUI:enable_advanced_panel];
     
     // enable/disable the x264 preset system controls
@@ -5434,7 +5434,7 @@ the user is using "Custom" settings by determining the sender*/
 
 - (IBAction) updateX264Widgets: (id) sender
 {
-    if ([fx264UseAdvancedOptionsCheck state] == NSOnState)
+    if ([fX264UseAdvancedOptionsCheck state] == NSOnState)
     {
         /*
          * we are using or switching to the advanced panel
@@ -5445,7 +5445,7 @@ the user is using "Custom" settings by determining the sender*/
          * if triggered by the advanced panel on/off checkbox, set the options
          * string to the value of the unparsed x264 preset system string.
          */
-        if (fx264UseAdvancedOptionsCheck == sender)
+        if (sender == fX264UseAdvancedOptionsCheck)
         {
             if (fX264PresetsUnparsedUTF8String != NULL)
             {
@@ -5458,8 +5458,8 @@ the user is using "Custom" settings by determining the sender*/
             }
         }
     }
+    // enable/disable, populate and update the various widgets
     [self             enableX264Widgets:       YES];
-    // update and/or populate the various widgets
     [self             x264PresetsSliderChanged:nil];
     [fAdvancedOptions X264AdvancedOptionsSet:  nil];
 }
@@ -6383,7 +6383,7 @@ return YES;
                 [self setH264Profile:nil];
                 [self setH264Level:  nil];
                 /* we enable the advanced panel and update the widgets */
-                [fx264UseAdvancedOptionsCheck setState:NSOnState];
+                [fX264UseAdvancedOptionsCheck setState:NSOnState];
                 [self updateX264Widgets:nil];
             }
             else
@@ -6400,7 +6400,7 @@ return YES;
                 /* preset does not use the advanced panel, reset it */
                 [fAdvancedOptions setOptions:@""];
                 /* we disable the advanced panel and update the widgets */
-                [fx264UseAdvancedOptionsCheck setState:NSOffState];
+                [fX264UseAdvancedOptionsCheck setState:NSOffState];
                 [self updateX264Widgets:nil];
             }
         }
@@ -7020,7 +7020,7 @@ return YES;
         [preset setObject:[fVidEncoderPopUp titleOfSelectedItem] forKey:@"VideoEncoder"];
         /* x264 Options, this will either be advanced panel or the video tabs x264 presets panel with modded option string */
         
-        if ([fx264UseAdvancedOptionsCheck state] == NSOnState)
+        if ([fX264UseAdvancedOptionsCheck state] == NSOnState)
         {
             /* use the old advanced panel */
             [preset setObject:[NSNumber numberWithInt:1]       forKey:@"x264UseAdvancedOptions"];

diff --git a/macosx/English.lproj/MainMenu.xib b/macosx/English.lproj/MainMenu.xib
index a77f08d6348e7f8af68482ea61b4f261ca4e8d5a..24c36d7641704bed6cd3f5518aed8b4f758ba691 100644 (file)
--- a/macosx/English.lproj/MainMenu.xib
+++ b/macosx/English.lproj/MainMenu.xib
@@ -7215,7 +7215,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" key="connection">
-                                               <string key="label">fx264UseAdvancedOptionsCheck</string>
+                                               <string key="label">fX264UseAdvancedOptionsCheck</string>
                                                <reference key="source" ref="2258723"/>
                                                <reference key="destination" ref="902460295"/>
                                        </object>
@@ -12729,7 +12729,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                                                        <string>fX264ProfilePopUpLabel</string>
                                                        <string>fX264TunePopUp</string>
                                                        <string>fX264TunePopUpLabel</string>
-                                                       <string>fx264UseAdvancedOptionsCheck</string>
+                                                       <string>fX264UseAdvancedOptionsCheck</string>
                                                </object>
                                                <object class="NSArray" key="dict.values">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -12948,7 +12948,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                                                        <string>fX264ProfilePopUpLabel</string>
                                                        <string>fX264TunePopUp</string>
                                                        <string>fX264TunePopUpLabel</string>
-                                                       <string>fx264UseAdvancedOptionsCheck</string>
+                                                       <string>fX264UseAdvancedOptionsCheck</string>
                                                </object>
                                                <object class="NSArray" key="dict.values">
                                                        <bool key="EncodedWithXMLCoder">YES</bool>
@@ -13369,7 +13369,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes>
                                                                <string key="candidateClassName">NSTextField</string>
                                                        </object>
                                                        <object class="IBToOneOutletInfo">
-                                                               <string key="name">fx264UseAdvancedOptionsCheck</string>
+                                                               <string key="name">fX264UseAdvancedOptionsCheck</string>
                                                                <string key="candidateClassName">NSButton</string>
                                                        </object>
                                                </object>