From f1785ad0133f41f4076e66c8476c79751050b375 Mon Sep 17 00:00:00 2001 From: dynaflash Date: Sun, 19 Aug 2007 07:16:14 +0000 Subject: [PATCH] MacGui: Small pre release bug fixes - Deinterlace On in preferences now sets deinterlacing to "Fast" upon launch - Fixed bug AutoCrop was set to "Custom" upon launch. - Changed verbage in Preference Panel to Activity Window instead of Debug Window. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@836 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- macosx/Controller.mm | 23 +++++++++++++----- .../Preferences.nib/keyedobjects.nib | Bin 20249 -> 20243 bytes 2 files changed, 17 insertions(+), 6 deletions(-) diff --git a/macosx/Controller.mm b/macosx/Controller.mm index 54bd924ba..b3d7f1dbc 100644 --- a/macosx/Controller.mm +++ b/macosx/Controller.mm @@ -197,7 +197,6 @@ static NSString* ChooseSourceIdentifier = @"Choose Source Item Identifie } - /* Destination box*/ [fDstFormatPopUp removeAllItems]; [fDstFormatPopUp addItemWithTitle: _( @"MP4 file" )]; @@ -272,6 +271,18 @@ static NSString* ChooseSourceIdentifier = @"Choose Source Item Identifie /*Set detelecine to Off upon launch */ [fPicSettingDetelecine setStringValue: @"No"]; [fPicSettingDenoise setStringValue: @"0"]; + /* if Deinterlace upon launch is specified in the prefs, then set to 1 for "Fast", + if not, then set to 0 for none */ + if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DefaultDeinterlaceOn"] > 0) + { + [fPicSettingDeinterlace setStringValue: @"1"]; + } + else + { + [fPicSettingDeinterlace setStringValue: @"0"]; + } + /* Set Auto Crop to On at launch */ + [fPicSettingAutoCrop setStringValue: @"1"]; /* Audio bitrate */ [fAudBitratePopUp removeAllItems]; @@ -1032,10 +1043,7 @@ list = hb_get_titles( fHandle ); // Select the longuest title [fSrcTitlePopUp selectItemAtIndex: indxpri]; [self TitlePopUpChanged: NULL]; - /* We set the auto crop in the main window to value "1" just as in PictureController, - as it does not seem to be taken from any job-> variable */ - [fPicSettingAutoCrop setStringValue: [NSString stringWithFormat: - @"%d", 0]]; + [self EnableUI: YES]; @@ -1760,6 +1768,9 @@ list = hb_get_titles( fHandle ); [fPicSrcHeight setStringValue: [NSString stringWithFormat: @"%d", fTitle->height]]; + /* Set Auto Crop to on upon selecting a new title */ + [fPicSettingAutoCrop setStringValue: @"1"]; + /* We get the originial output picture width and height and put them in variables for use with some presets later on */ PicOrigOutputWidth = job->width; @@ -3946,7 +3957,7 @@ the user is using "Custom" settings by determining the sender*/ /* Video encoder */ [preset setObject:@"x264 (h.264 Main)" forKey:@"VideoEncoder"]; /* x264 Option String (We can use this to tweak the appleTV output)*/ - [preset setObject:@"bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:trellis=2" forKey:@"x264Option"]; + [preset setObject:@"bframes=3:ref=1:subme=5:me=umh:no-fast-pskip=1:trellis=2:cabac=0" forKey:@"x264Option"]; /* Video quality */ [preset setObject:[NSNumber numberWithInt:1] forKey:@"VideoQualityType"]; [preset setObject:[fVidTargetSizeField stringValue] forKey:@"VideoTargetSize"]; diff --git a/macosx/English.lproj/Preferences.nib/keyedobjects.nib b/macosx/English.lproj/Preferences.nib/keyedobjects.nib index d50f0596d115a1932464ba54147365040fb2e313..c4997993ebef4376c61fb36274602a1d8715ca23 100644 GIT binary patch delta 3033 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 delta 3037 zcmbu9d2|)^6~|{X$r~VogX|!X0Gaj8@@AjkyqOoagcy>@X0Tu|NZ1TKgv207-V7jU zDut4kN(-_Hh#*9t0Tn@@Kv}{Pgit)Pr->1Tq7=lUIFE?I_8j|1=XcKB-|wC~_uk(< z-_Ml44ljKjuILdTgrdGxzSU4AROwsed&9RDszlcN*7?@^-t=woz2)2J+vI!Ox7oJ^ zIpC}Cz2ke=7xlg8i$!nsZ7a`<@2sLaYM=l$(I9G}HX4E!qN!+av=7=B?Fa8i`=e=S zIywN3q8aF8XeK%k%|f#gBf2>rNlxrIbEc>({vjj71_Rkz-IDG%mr7&qdC_5OOJD z8N3X+097I9k;}*_!hQ}lI$O)tlsYw_M;wRXk&7S$hz_UFlJRm%6U4$|`Mb<-4AQwDTmO%rc$DzScCUPRd z_4Jno4Mi^B!=?@z0_7s-p@C33(twI2Ya( zah`}_MR9NcZF&%o;?Dg=9F*VBR=H$8X2abA=q}85g(_DCm2VEmz z9$MR7_<+ZuV>`_~06k_MK1QLZ53ks9C)*>hk=gqKj}Eds!OwKY+G7@$gtf-nV!g4Q zSO%7ep;#NNCw3l7z>=|}SSofFJB}T}x?mw}4fY|{2kV7hz|ydfuv1ubtQB?|+m4;Y zc3^!m8@q_L!`6Y)Ykj8Daj@#*+X{5AZ~_%eJ2 zz7k)Juf=!b-{3d#+xQ*)E)hp05-o{`iMB)sf+SdiCjx{_^e57Z3?ef^j3*`%g+!Q` zLQEr`Cl(SFM3kr`wh~*!7NLHaO#gg#DJ(;6^#H~j1UTm0|)KlY#S*Rcqjz@lsmHj!<`wq_Z2 z3_F$`&pyi*vXj~8*lFzZ>!jzo4I$m_qem%1@1Ce$JKLRa9{B) z_?G;`{3Cojz9XN^_u>P*#1G|j`6u}id>%iFAI(R2m!HGW?fv+kBM30T`A3Z%p-@d~Q6 zP+BUjl-5dTrK^&p^i*U;Q-ESAsmgGrSSe9vD6|Qd_8P z)JN5xDo``kY;}-2RLxbxs-w>DMcdGl;v+8&19rdmj zrzL2p)Dm}=tTsU_)WX_xT9LL`+n^oNPHHvU8SOLeymm>e)#`OrPtsXk(RJO_ zZN0bNPk&m^*C*;>{Y8DbzCvHEuhrkwH|lTe6?&C^QNOBR*Kg>zBKmjw_eOi8yD{E) z)|hNeF{T>D#&lz*G0Sj_ImS!I%SM^8z*uCI8%vDWjK3Jmjg`h4W392?c*}U(s4$|& zR^xqRyRpOAW$ZEb83&ANqsBN7NI(NW;D7)mpaLBL5CkF68}tSJK|06)nIH?~fXE;) z1PlYY;7Kq7JOxI9eDDky3&w+qpb&(?R8Ry;fCCPKDsT)`gHJ#WI0HTd=fFi!3+g}v zxB{+%>)-~s1#W{o;0F^n<4vF0%uF;}nXS#XW(TvA`KZ~=Ofq|#xJj9!InyjPU30EE z-z+m1ly}K8BDH3{dBeOLY#!_w>=_IMt>A#*(BSCclwc%S7F-fs72Fiu7W`}QNbu8O zUGSO(TZvW&tCuBOrWLe8)&MKR8fXo(_FDU`gVtf|h;`ih#5!gD-TKrzYn`_)S+!Q3 z)nI*TU9-NnZdf<1+twZHt{rE`+djJ)uoLZ;HfFc6+u0rL&URP3yPa(JvI(2ES(~>5 zwrp#*VVkyX_qO}lX?BJ^(9W?3+at10(%V%Zho5w=cp-)1eh0ca9gc?F$guV*h b4BZNSmx`n|gYG?Xag7#zuF>9qr*`-e9kbkm -- 2.40.0