From 2ac75a70d17f26b7efcf8f84a1b1c6f3049904ad Mon Sep 17 00:00:00 2001 From: dynaflash Date: Tue, 9 Nov 2010 04:12:37 +0000 Subject: MacGui: fix alignment of the widgets in the Advanced Panel. - Patch by Rodeo. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@3665 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- macosx/English.lproj/AdvancedView.xib | 916 +++++++++++----------------------- macosx/HBAdvancedController.m | 3 +- 2 files changed, 302 insertions(+), 617 deletions(-) (limited to 'macosx') diff --git a/macosx/English.lproj/AdvancedView.xib b/macosx/English.lproj/AdvancedView.xib index 332713b10..eee243f26 100644 --- a/macosx/English.lproj/AdvancedView.xib +++ b/macosx/English.lproj/AdvancedView.xib @@ -3,12 +3,12 @@ 1050 10D573 - 732 + 788 1038.29 460.00 com.apple.InterfaceBuilder.CocoaPlugin - 732 + 788 YES @@ -46,7 +46,7 @@ 268 - {{242, 278}, {61, 14}} + {{242, 275}, {61, 14}} YES @@ -82,7 +82,7 @@ 268 - {{-3, 278}, {66, 14}} + {{-3, 275}, {66, 14}} YES @@ -98,7 +98,7 @@ 268 - {{-3, 126}, {91, 14}} + {{-3, 128}, {91, 14}} YES @@ -114,7 +114,7 @@ 256 - {{120, 153}, {88, 15}} + {{120, 151}, {88, 15}} YES @@ -194,7 +194,7 @@ 256 - {{277, 107}, {116, 14}} + {{277, 107}, {116, 16}} YES @@ -214,7 +214,7 @@ 268 - {{398, 103}, {114, 16}} + {{398, 105}, {114, 16}} YES @@ -236,7 +236,7 @@ 256 - {{14, 172}, {102, 14}} + {{14, 170}, {102, 16}} YES @@ -349,7 +349,7 @@ 256 - {{22, 256}, {94, 14}} + {{22, 254}, {94, 16}} YES @@ -365,7 +365,7 @@ 256 - {{11, 232}, {105, 17}} + {{11, 233}, {105, 16}} YES @@ -381,7 +381,7 @@ 256 - {{293, 253}, {100, 17}} + {{293, 254}, {100, 16}} YES @@ -541,7 +541,7 @@ 256 - {{397, 194}, {117, 15}} + {{397, 193}, {117, 15}} YES @@ -611,7 +611,7 @@ 256 - {{568, 234}, {37, 17}} + {{568, 233}, {37, 16}} YES @@ -627,7 +627,7 @@ 256 - {{13, 101}, {103, 17}} + {{13, 107}, {103, 16}} YES @@ -673,7 +673,7 @@ 256 - {{397, 215}, {117, 15}} + {{397, 214}, {117, 15}} YES @@ -743,7 +743,7 @@ 256 - {{258, 212}, {135, 17}} + {{258, 212}, {135, 16}} YES @@ -759,7 +759,7 @@ 256 - {{264, 173}, {129, 14}} + {{264, 170}, {129, 16}} YES @@ -775,7 +775,7 @@ 256 - {{397, 173}, {117, 15}} + {{397, 172}, {117, 15}} YES @@ -845,7 +845,7 @@ 256 - {{242, 195}, {151, 14}} + {{242, 191}, {151, 16}} YES @@ -861,7 +861,7 @@ 256 - {{11, 153}, {105, 14}} + {{11, 149}, {105, 16}} YES @@ -877,7 +877,7 @@ 256 - {{248, 86}, {145, 14}} + {{248, 86}, {145, 16}} YES @@ -893,7 +893,7 @@ 256 - {{281, 233}, {112, 17}} + {{281, 233}, {112, 16}} YES @@ -909,7 +909,7 @@ 256 - {{397, 236}, {117, 15}} + {{397, 235}, {117, 15}} YES @@ -995,7 +995,7 @@ 256 - {{606, 107}, {96, 15}} + {{606, 109}, {96, 15}} YES @@ -1135,7 +1135,7 @@ 256 - {{543, 104}, {62, 17}} + {{543, 107}, {62, 16}} YES @@ -1151,7 +1151,7 @@ 256 - {{118, 102}, {22, 16}} + {{118, 109}, {22, 16}} YES @@ -1242,7 +1242,7 @@ 256 - {{606, 254}, {96, 15}} + {{606, 256}, {96, 15}} YES @@ -1312,7 +1312,7 @@ 256 - {{522, 254}, {83, 14}} + {{522, 254}, {83, 16}} YES @@ -1349,7 +1349,7 @@ 256 - {{36, 193}, {80, 14}} + {{36, 191}, {80, 16}} YES @@ -1386,7 +1386,7 @@ 256 - {{-3, 215}, {119, 13}} + {{-3, 212}, {119, 16}} YES @@ -1402,7 +1402,7 @@ 268 - {{398, 80}, {114, 16}} + {{398, 84}, {114, 16}} YES @@ -1424,7 +1424,7 @@ 256 - {{291, 65}, {102, 14}} + {{291, 65}, {102, 16}} YES @@ -1440,7 +1440,7 @@ 268 - {{398, 59}, {114, 16}} + {{398, 63}, {114, 16}} YES @@ -3836,6 +3836,40 @@ id + + YES + + YES + X264AdvancedOptionsAnimate: + X264AdvancedOptionsChanged: + X264AdvancedOptionsSet: + X264AdvancedOptionsSetCurrentSettings: + X264AdvancedOptionsStandardizeOptString: + + + YES + + X264AdvancedOptionsAnimate: + id + + + X264AdvancedOptionsChanged: + id + + + X264AdvancedOptionsSet: + id + + + X264AdvancedOptionsSetCurrentSettings: + id + + + X264AdvancedOptionsStandardizeOptString: + id + + + YES @@ -3929,6 +3963,225 @@ NSButton + + YES + + YES + fDisplayX264Options + fDisplayX264OptionsLabel + fEmptyView + fX264opt8x8dctLabel + fX264opt8x8dctSwitch + fX264optAlphaDeblockPopUp + fX264optAnalyseLabel + fX264optAnalysePopUp + fX264optAqLabel + fX264optAqSlider + fX264optBAdaptLabel + fX264optBAdaptPopUp + fX264optBPyramidLabel + fX264optBPyramidPopUp + fX264optBetaDeblockPopUp + fX264optBframesLabel + fX264optBframesPopUp + fX264optCabacLabel + fX264optCabacSwitch + fX264optDeblockLabel + fX264optDirectPredLabel + fX264optDirectPredPopUp + fX264optMERangeLabel + fX264optMERangePopUp + fX264optMotionEstLabel + fX264optMotionEstPopUp + fX264optNodctdcmtLabel + fX264optNodctdcmtSwitch + fX264optPsyRDLabel + fX264optPsyRDSlider + fX264optPsyTrellisLabel + fX264optPsyTrellisSlider + fX264optRefLabel + fX264optRefPopUp + fX264optSubmeLabel + fX264optSubmePopUp + fX264optTrellisLabel + fX264optTrellisPopUp + fX264optView + fX264optViewTitleLabel + fX264optWeightPLabel + fX264optWeightPSwitch + + + YES + + fDisplayX264Options + NSTextField + + + fDisplayX264OptionsLabel + NSTextField + + + fEmptyView + NSView + + + fX264opt8x8dctLabel + NSTextField + + + fX264opt8x8dctSwitch + NSButton + + + fX264optAlphaDeblockPopUp + NSPopUpButton + + + fX264optAnalyseLabel + NSTextField + + + fX264optAnalysePopUp + NSPopUpButton + + + fX264optAqLabel + NSTextField + + + fX264optAqSlider + NSSlider + + + fX264optBAdaptLabel + NSTextField + + + fX264optBAdaptPopUp + NSPopUpButton + + + fX264optBPyramidLabel + NSTextField + + + fX264optBPyramidPopUp + NSPopUpButton + + + fX264optBetaDeblockPopUp + NSPopUpButton + + + fX264optBframesLabel + NSTextField + + + fX264optBframesPopUp + NSPopUpButton + + + fX264optCabacLabel + NSTextField + + + fX264optCabacSwitch + NSButton + + + fX264optDeblockLabel + NSTextField + + + fX264optDirectPredLabel + NSTextField + + + fX264optDirectPredPopUp + NSPopUpButton + + + fX264optMERangeLabel + NSTextField + + + fX264optMERangePopUp + NSPopUpButton + + + fX264optMotionEstLabel + NSTextField + + + fX264optMotionEstPopUp + NSPopUpButton + + + fX264optNodctdcmtLabel + NSTextField + + + fX264optNodctdcmtSwitch + NSButton + + + fX264optPsyRDLabel + NSTextField + + + fX264optPsyRDSlider + NSSlider + + + fX264optPsyTrellisLabel + NSTextField + + + fX264optPsyTrellisSlider + NSSlider + + + fX264optRefLabel + NSTextField + + + fX264optRefPopUp + NSPopUpButton + + + fX264optSubmeLabel + NSTextField + + + fX264optSubmePopUp + NSPopUpButton + + + fX264optTrellisLabel + NSTextField + + + fX264optTrellisPopUp + NSPopUpButton + + + fX264optView + NSView + + + fX264optViewTitleLabel + NSTextField + + + fX264optWeightPLabel + NSTextField + + + fX264optWeightPSwitch + NSButton + + + IBProjectSource HBAdvancedController.h @@ -3950,589 +4203,9 @@ - - YES - - NSActionCell - NSCell - - IBFrameworkSource - AppKit.framework/Headers/NSActionCell.h - - - - NSApplication - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSApplication.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSApplicationScripting.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSColorPanel.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSHelpManager.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSPageLayout.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSUserInterfaceItemSearching.h - - - - NSButton - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSButton.h - - - - NSButtonCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSButtonCell.h - - - - NSCell - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSCell.h - - - - NSControl - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSControl.h - - - - NSFormatter - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFormatter.h - - - - NSMenu - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSMenu.h - - - - NSMenuItem - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSMenuItem.h - - - - NSMenuItemCell - NSButtonCell - - IBFrameworkSource - AppKit.framework/Headers/NSMenuItemCell.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSAccessibility.h - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDictionaryController.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDragging.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontManager.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontPanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSKeyValueBinding.h - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSNibLoading.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSOutlineView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSPasteboard.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSSavePanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTableView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSToolbarItem.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSView.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObjectScripting.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSPortCoder.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptObjectSpecifiers.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptWhoseTests.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLDownload.h - - - - NSObject - - IBFrameworkSource - Growl.framework/Headers/GrowlApplicationBridge.h - - - - NSObject - - IBFrameworkSource - ImageKit.framework/Headers/IKImageBrowserView.h - - - - NSObject - - IBFrameworkSource - ImageKit.framework/Headers/IKSaveOptions.h - - - - NSObject - - IBFrameworkSource - ImageKit.framework/Headers/ImageKitDeprecated.h - - - - NSObject - - IBFrameworkSource - PDFKit.framework/Headers/PDFDocument.h - - - - NSObject - - IBFrameworkSource - PDFKit.framework/Headers/PDFView.h - - - - NSObject - - IBFrameworkSource - QTKit.framework/Headers/QTCaptureDecompressedAudioOutput.h - - - - NSObject - - IBFrameworkSource - QTKit.framework/Headers/QTCaptureDecompressedVideoOutput.h - - - - NSObject - - IBFrameworkSource - QTKit.framework/Headers/QTCaptureFileOutput.h - - - - NSObject - - IBFrameworkSource - QTKit.framework/Headers/QTCaptureVideoPreviewOutput.h - - - - NSObject - - IBFrameworkSource - QTKit.framework/Headers/QTCaptureView.h - - - - NSObject - - IBFrameworkSource - QTKit.framework/Headers/QTMovie.h - - - - NSObject - - IBFrameworkSource - QTKit.framework/Headers/QTMovieView.h - - - - NSObject - - IBFrameworkSource - QuartzComposer.framework/Headers/QCCompositionParameterView.h - - - - NSObject - - IBFrameworkSource - QuartzComposer.framework/Headers/QCCompositionPickerView.h - - - - NSObject - - IBFrameworkSource - QuartzFilters.framework/Headers/QuartzFilterManager.h - - - - NSObject - - IBFrameworkSource - QuickLookUI.framework/Headers/QLPreviewPanel.h - - - - NSObject - - IBFrameworkSource - Sparkle.framework/Headers/SUAppcast.h - - - - NSObject - - IBFrameworkSource - Sparkle.framework/Headers/SUUpdater.h - - - - NSPopUpButton - NSButton - - IBFrameworkSource - AppKit.framework/Headers/NSPopUpButton.h - - - - NSPopUpButtonCell - NSMenuItemCell - - IBFrameworkSource - AppKit.framework/Headers/NSPopUpButtonCell.h - - - - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSInterfaceStyle.h - - - - NSResponder - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSResponder.h - - - - NSSlider - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSSlider.h - - - - NSSliderCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSSliderCell.h - - - - NSTextField - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSTextField.h - - - - NSTextFieldCell - NSActionCell - - IBFrameworkSource - AppKit.framework/Headers/NSTextFieldCell.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSClipView.h - - - - NSView - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSRulerView.h - - - - NSView - NSResponder - - - 0 + IBCocoaFramework com.apple.InterfaceBuilder.CocoaPlugin.macosx @@ -4544,5 +4217,18 @@ YES ../HandBrake.xcodeproj 3 + + YES + + YES + NSMenuCheckmark + NSMenuMixedState + + + YES + {9, 8} + {7, 2} + + diff --git a/macosx/HBAdvancedController.m b/macosx/HBAdvancedController.m index 9557ca20d..c8c8b12dc 100644 --- a/macosx/HBAdvancedController.m +++ b/macosx/HBAdvancedController.m @@ -1039,8 +1039,7 @@ } else { - /* Otherwise the format is deblock=a,b, where a and b both have an array - offset of 7 because deblocking values start at -6 instead of at zero. */ + /* Otherwise the format is psy-rd=a,b */ thisOpt = [NSString stringWithFormat:@"%@=%0.1f,%0.2f", optName, [fX264optPsyRDSlider floatValue], [fX264optPsyTrellisSlider floatValue] ]; } } -- cgit v1.2.3