MacGui: Small fix in main window

- gray out the auto crop field during encode

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

diff --git a/macosx/Controller.h b/macosx/Controller.h
index bd098577489ec8b4c9a525bb5b4a33783ce3deca..da13996729484bc1d9824448d6619ffc8374624f 100644 (file)
--- a/macosx/Controller.h
+++ b/macosx/Controller.h
@@ -76,7 +76,7 @@
     IBOutlet NSButton            * fVidTwoPassCheck;
     IBOutlet NSButton            * fVidTurboPassCheck;
        
-       /* Picture Settings box fPicSettingAutoCropDsply*/
+       /* Picture Settings box */
        IBOutlet NSTextField         * fPicLabelSettings;
        IBOutlet NSTextField         * fPicLabelSrc;
        IBOutlet NSTextField         * fPicLabelOutp;
@@ -94,6 +94,7 @@
        IBOutlet NSTextField         * fPicSettingDeinterlace;
        IBOutlet NSTextField         * fPicSettingARkeepDsply;
        IBOutlet NSTextField         * fPicSettingPARDsply;
+       IBOutlet NSTextField         * fPicSettingAutoCropLabel;
        IBOutlet NSTextField         * fPicSettingAutoCrop;
        IBOutlet NSTextField         * fPicSettingAutoCropDsply;
        IBOutlet NSTextField         * fPicSettingDeinterlaceDsply;

diff --git a/macosx/Controller.mm b/macosx/Controller.mm
index 5ad5a854eea88e42864d9538cc8708e9de84ef11..869f8fd249a999c477fb61d606aafa3e1b60b1f6 100644 (file)
--- a/macosx/Controller.mm
+++ b/macosx/Controller.mm
@@ -685,7 +685,8 @@ return registrationDictionary;
                fX264optWeightBLabel,fX264optWeightBSwitch,fX264optBRDOLabel,fX264optBRDOSwitch,
                fX264optBPyramidLabel,fX264optBPyramidSwitch,fX264optBiMELabel,fX264optBiMESwitch,
                fX264optDirectPredLabel,fX264optDirectPredPopUp,fX264optDeblockLabel,
-               fX264optAlphaDeblockPopUp,fX264optBetaDeblockPopUp,fVidTurboPassCheck,fDstMpgLargeFileCheck};
+               fX264optAlphaDeblockPopUp,fX264optBetaDeblockPopUp,fVidTurboPassCheck,fDstMpgLargeFileCheck,fPicSettingAutoCropLabel,
+               fPicSettingAutoCropDsply};
 
     for( unsigned i = 0;
          i < sizeof( controls ) / sizeof( NSControl * ); i++ )

diff --git a/macosx/English.lproj/MainMenu.nib/classes.nib b/macosx/English.lproj/MainMenu.nib/classes.nib
index 15620d1ece4ab0908e81626c5408d7aac1718e84..795ddf3ce81c900adec9da145708fbf42face3e2 100644 (file)
--- a/macosx/English.lproj/MainMenu.nib/classes.nib
+++ b/macosx/English.lproj/MainMenu.nib/classes.nib
@@ -90,6 +90,7 @@
                 fPicSettingARkeepDsply = NSTextField; 
                 fPicSettingAutoCrop = NSTextField; 
                 fPicSettingAutoCropDsply = NSTextField; 
+                fPicSettingAutoCropLabel = NSTextField; 
                 fPicSettingDeinterlace = NSTextField; 
                 fPicSettingDeinterlaceDsply = NSTextField; 
                 fPicSettingHeight = NSTextField; 

diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib
index fe3ea1c921a559d2ed426530f56c229d8d331e5e..67485c2268969a0fa6dbb69787c67a500fb2d5da 100644 (file)
--- a/macosx/English.lproj/MainMenu.nib/info.nib
+++ b/macosx/English.lproj/MainMenu.nib/info.nib
@@ -19,8 +19,8 @@
        </array>
        <key>IBOpenObjects</key>
        <array>
-               <integer>1348</integer>
                <integer>29</integer>
+               <integer>21</integer>
        </array>
        <key>IBSystem Version</key>
        <string>8R2218</string>

diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index 02b83790fbca15a6285c190f7629280c49153cb2..a10566a0c9727116038061f1ae79cf3f4b71b623 100644 (file)
Binary files a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib and b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib differ