From 73277f03248a3a4d288834e9c0bab84266a2d41c Mon Sep 17 00:00:00 2001 From: dynaflash Date: Mon, 3 Dec 2007 19:23:08 +0000 Subject: MacGui: Increase size of main window by 200 px wide and 50 px high. - This should offer more room as we desperately need it. - Should still offer compatibility with 1280 x 1024 display with the presets drawer open and a dock on either the bottom or side - Also added more granularity to the Constant Quality slider, now can choose any whole percentage instead of just even. git-svn-id: svn://svn.handbrake.fr/HandBrake/trunk@1096 b64f7644-9d1e-0410-96f1-a4d463321fa5 --- macosx/Controller.mm | 26 ++- macosx/English.lproj/AdvancedView.nib/classes.nib | 192 ++++++++++++++------- macosx/English.lproj/AdvancedView.nib/info.nib | 26 +-- .../AdvancedView.nib/keyedobjects.nib | Bin 36239 -> 37836 bytes macosx/English.lproj/MainMenu.nib/info.nib | 2 +- macosx/English.lproj/MainMenu.nib/keyedobjects.nib | Bin 80040 -> 81457 bytes 6 files changed, 158 insertions(+), 88 deletions(-) (limited to 'macosx') diff --git a/macosx/Controller.mm b/macosx/Controller.mm index b09dec31f..47b24edcd 100644 --- a/macosx/Controller.mm +++ b/macosx/Controller.mm @@ -520,8 +520,8 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It currentScanCount = checkScanCount; //[fScanController Cancel: NULL]; [fScanIndicator setIndeterminate: NO]; - [fScanIndicator setDoubleValue: 0.0]; - [fScanIndicator setHidden: YES]; + //[fScanIndicator setDoubleValue: 0.0]; + //[fScanIndicator setHidden: YES]; [self showNewScan: NULL]; } @@ -537,12 +537,18 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It #define p s.param.scanning case HB_STATE_SCANNING: { + [fSrcDVD2Field setStringValue: [NSString stringWithFormat: - _( @"Scanning title %d of %d..." ), - p.title_cur, p.title_count]]; - [fScanIndicator setIndeterminate: NO]; - [fScanIndicator setDoubleValue: 100.0 * ( p.title_cur - 1 ) / - p.title_count]; + _( @"Scanning title %d of %d..." ), + p.title_cur, p.title_count]]; + float scanprogress_total; + scanprogress_total = ( p.title_cur - 1 ) / p.title_count; + /* FIX ME: currently having an issue showing progress on the scan + * indicator, for now just set to barber pole. + */ + //[fScanIndicator setHidden: NO]; + [fScanIndicator setIndeterminate: YES]; + //[fScanIndicator setDoubleValue: 100.0 * scanprogress_total]; break; } #undef p @@ -553,7 +559,7 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It [fScanIndicator setIndeterminate: NO]; [fScanIndicator setDoubleValue: 0.0]; - [fScanIndicator setHidden: YES]; + //[fScanIndicator setHidden: YES]; [self showNewScan: NULL]; [toolbar validateVisibleItems]; break; @@ -1172,7 +1178,7 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It { /* We setup the scan status in the main window to indicate a source title scan */ [fSrcDVD2Field setStringValue: _( @"Opening a new source title ..." )]; - [fScanIndicator setHidden: NO]; + //[fScanIndicator setHidden: NO]; [fScanIndicator setIndeterminate: YES]; [fScanIndicator startAnimation: nil]; @@ -1202,7 +1208,9 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It { scanTitleNum = 0; } + //[fScanIndicator setHidden: NO]; hb_scan( fHandle, [path UTF8String], scanTitleNum ); + } - (IBAction) showNewScan:(id)sender diff --git a/macosx/English.lproj/AdvancedView.nib/classes.nib b/macosx/English.lproj/AdvancedView.nib/classes.nib index 9ced59c01..0a435e595 100644 --- a/macosx/English.lproj/AdvancedView.nib/classes.nib +++ b/macosx/English.lproj/AdvancedView.nib/classes.nib @@ -1,61 +1,131 @@ -{ - IBClasses = ( - {CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; }, - { - ACTIONS = { - X264AdvancedOptionsChanged = id; - X264AdvancedOptionsSet = id; - X264AdvancedOptionsSetCurrentSettings = id; - X264AdvancedOptionsStandardizeOptString = id; - }; - CLASS = HBAdvancedController; - LANGUAGE = ObjC; - OUTLETS = { - fDisplayX264Options = NSTextField; - fDisplayX264OptionsLabel = NSTextField; - fEmptyView = NSView; - fX264opt8x8dctLabel = NSTextField; - fX264opt8x8dctSwitch = NSButton; - fX264optAlphaDeblockPopUp = NSPopUpButton; - fX264optAnalyseLabel = NSTextField; - fX264optAnalysePopUp = NSPopUpButton; - fX264optBPyramidLabel = NSTextField; - fX264optBPyramidSwitch = NSButton; - fX264optBRDOLabel = NSTextField; - fX264optBRDOSwitch = NSButton; - fX264optBetaDeblockPopUp = NSPopUpButton; - fX264optBframesLabel = NSTextField; - fX264optBframesPopUp = NSPopUpButton; - fX264optBiMELabel = NSTextField; - fX264optBiMESwitch = NSButton; - fX264optCabacLabel = NSTextField; - fX264optCabacSwitch = NSButton; - fX264optDeblockLabel = NSTextField; - fX264optDirectPredLabel = NSTextField; - fX264optDirectPredPopUp = NSPopUpButton; - fX264optMERangeLabel = NSTextField; - fX264optMERangePopUp = NSPopUpButton; - fX264optMixedRefsLabel = NSTextField; - fX264optMixedRefsSwitch = NSButton; - fX264optMotionEstLabel = NSTextField; - fX264optMotionEstPopUp = NSPopUpButton; - fX264optNfpskipLabel = NSTextField; - fX264optNfpskipSwitch = NSButton; - fX264optNodctdcmtLabel = NSTextField; - fX264optNodctdcmtSwitch = NSButton; - fX264optRefLabel = NSTextField; - fX264optRefPopUp = NSPopUpButton; - fX264optSubmeLabel = NSTextField; - fX264optSubmePopUp = NSPopUpButton; - fX264optTrellisLabel = NSTextField; - fX264optTrellisPopUp = NSPopUpButton; - fX264optView = NSView; - fX264optViewTitleLabel = NSTextField; - fX264optWeightBLabel = NSTextField; - fX264optWeightBSwitch = NSButton; - }; - SUPERCLASS = NSObject; - } - ); - IBVersion = 1; -} \ No newline at end of file + + + + + IBClasses + + + ACTIONS + + X264AdvancedOptionsChanged + id + X264AdvancedOptionsSet + id + X264AdvancedOptionsSetCurrentSettings + id + X264AdvancedOptionsStandardizeOptString + id + + CLASS + HBAdvancedController + LANGUAGE + ObjC + OUTLETS + + fDisplayX264Options + NSTextField + fDisplayX264OptionsLabel + NSTextField + fEmptyView + NSView + fX264opt8x8dctLabel + NSTextField + fX264opt8x8dctSwitch + NSButton + fX264optAlphaDeblockPopUp + NSPopUpButton + fX264optAnalyseLabel + NSTextField + fX264optAnalysePopUp + NSPopUpButton + fX264optBPyramidLabel + NSTextField + fX264optBPyramidSwitch + NSButton + fX264optBRDOLabel + NSTextField + fX264optBRDOSwitch + NSButton + fX264optBetaDeblockPopUp + NSPopUpButton + fX264optBframesLabel + NSTextField + fX264optBframesPopUp + NSPopUpButton + fX264optBiMELabel + NSTextField + fX264optBiMESwitch + NSButton + fX264optCabacLabel + NSTextField + fX264optCabacSwitch + NSButton + fX264optDeblockLabel + NSTextField + fX264optDirectPredLabel + NSTextField + fX264optDirectPredPopUp + NSPopUpButton + fX264optMERangeLabel + NSTextField + fX264optMERangePopUp + NSPopUpButton + fX264optMixedRefsLabel + NSTextField + fX264optMixedRefsSwitch + NSButton + fX264optMotionEstLabel + NSTextField + fX264optMotionEstPopUp + NSPopUpButton + fX264optNfpskipLabel + NSTextField + fX264optNfpskipSwitch + NSButton + fX264optNodctdcmtLabel + NSTextField + fX264optNodctdcmtSwitch + NSButton + fX264optRefLabel + NSTextField + fX264optRefPopUp + NSPopUpButton + fX264optSubmeLabel + NSTextField + fX264optSubmePopUp + NSPopUpButton + fX264optTrellisLabel + NSTextField + fX264optTrellisPopUp + NSPopUpButton + fX264optView + NSView + fX264optViewTitleLabel + NSTextField + fX264optWeightBLabel + NSTextField + fX264optWeightBSwitch + NSButton + + SUPERCLASS + NSObject + + + CLASS + FirstResponder + LANGUAGE + ObjC + SUPERCLASS + NSObject + + + CLASS + NSObject + LANGUAGE + ObjC + + + IBVersion + 1 + + diff --git a/macosx/English.lproj/AdvancedView.nib/info.nib b/macosx/English.lproj/AdvancedView.nib/info.nib index c21a0c3e6..00f797bb5 100644 --- a/macosx/English.lproj/AdvancedView.nib/info.nib +++ b/macosx/English.lproj/AdvancedView.nib/info.nib @@ -1,28 +1,20 @@ - + - IBDocumentLocation - 216 196 356 240 0 0 1440 878 - IBEditorPositions - - 254 - 465 444 550 282 0 0 1440 878 - 5 - 289 494 550 282 0 0 1440 878 - IBFramework Version - 446.1 - IBLockedObjects - - 5 - 254 - + 629 + IBLastKnownRelativeProjectPath + ../../HandBrake.xcodeproj + IBOldestOS + 5 IBOpenObjects 5 IBSystem Version - 8R2218 + 9B18 + targetFramework + IBCocoaFramework diff --git a/macosx/English.lproj/AdvancedView.nib/keyedobjects.nib b/macosx/English.lproj/AdvancedView.nib/keyedobjects.nib index 5fb13e9ae..3422372a3 100644 Binary files a/macosx/English.lproj/AdvancedView.nib/keyedobjects.nib and b/macosx/English.lproj/AdvancedView.nib/keyedobjects.nib differ diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib index f5ed599ef..2c679cd24 100644 --- a/macosx/English.lproj/MainMenu.nib/info.nib +++ b/macosx/English.lproj/MainMenu.nib/info.nib @@ -10,7 +10,7 @@ 5 IBOpenObjects - 1868 + 2 IBSystem Version 9B18 diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib index 46401671a..ab362c90a 100644 Binary files a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib and b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib differ -- cgit v1.2.3