summaryrefslogtreecommitdiffstats
path: root/macosx
diff options
context:
space:
mode:
Diffstat (limited to 'macosx')
-rw-r--r--macosx/Controller.mm26
-rw-r--r--macosx/English.lproj/AdvancedView.nib/classes.nib192
-rw-r--r--macosx/English.lproj/AdvancedView.nib/info.nib26
-rw-r--r--macosx/English.lproj/AdvancedView.nib/keyedobjects.nibbin36239 -> 37836 bytes
-rw-r--r--macosx/English.lproj/MainMenu.nib/info.nib2
-rw-r--r--macosx/English.lproj/MainMenu.nib/keyedobjects.nibbin80040 -> 81457 bytes
6 files changed, 158 insertions, 88 deletions
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
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+ <key>IBClasses</key>
+ <array>
+ <dict>
+ <key>ACTIONS</key>
+ <dict>
+ <key>X264AdvancedOptionsChanged</key>
+ <string>id</string>
+ <key>X264AdvancedOptionsSet</key>
+ <string>id</string>
+ <key>X264AdvancedOptionsSetCurrentSettings</key>
+ <string>id</string>
+ <key>X264AdvancedOptionsStandardizeOptString</key>
+ <string>id</string>
+ </dict>
+ <key>CLASS</key>
+ <string>HBAdvancedController</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>OUTLETS</key>
+ <dict>
+ <key>fDisplayX264Options</key>
+ <string>NSTextField</string>
+ <key>fDisplayX264OptionsLabel</key>
+ <string>NSTextField</string>
+ <key>fEmptyView</key>
+ <string>NSView</string>
+ <key>fX264opt8x8dctLabel</key>
+ <string>NSTextField</string>
+ <key>fX264opt8x8dctSwitch</key>
+ <string>NSButton</string>
+ <key>fX264optAlphaDeblockPopUp</key>
+ <string>NSPopUpButton</string>
+ <key>fX264optAnalyseLabel</key>
+ <string>NSTextField</string>
+ <key>fX264optAnalysePopUp</key>
+ <string>NSPopUpButton</string>
+ <key>fX264optBPyramidLabel</key>
+ <string>NSTextField</string>
+ <key>fX264optBPyramidSwitch</key>
+ <string>NSButton</string>
+ <key>fX264optBRDOLabel</key>
+ <string>NSTextField</string>
+ <key>fX264optBRDOSwitch</key>
+ <string>NSButton</string>
+ <key>fX264optBetaDeblockPopUp</key>
+ <string>NSPopUpButton</string>
+ <key>fX264optBframesLabel</key>
+ <string>NSTextField</string>
+ <key>fX264optBframesPopUp</key>
+ <string>NSPopUpButton</string>
+ <key>fX264optBiMELabel</key>
+ <string>NSTextField</string>
+ <key>fX264optBiMESwitch</key>
+ <string>NSButton</string>
+ <key>fX264optCabacLabel</key>
+ <string>NSTextField</string>
+ <key>fX264optCabacSwitch</key>
+ <string>NSButton</string>
+ <key>fX264optDeblockLabel</key>
+ <string>NSTextField</string>
+ <key>fX264optDirectPredLabel</key>
+ <string>NSTextField</string>
+ <key>fX264optDirectPredPopUp</key>
+ <string>NSPopUpButton</string>
+ <key>fX264optMERangeLabel</key>
+ <string>NSTextField</string>
+ <key>fX264optMERangePopUp</key>
+ <string>NSPopUpButton</string>
+ <key>fX264optMixedRefsLabel</key>
+ <string>NSTextField</string>
+ <key>fX264optMixedRefsSwitch</key>
+ <string>NSButton</string>
+ <key>fX264optMotionEstLabel</key>
+ <string>NSTextField</string>
+ <key>fX264optMotionEstPopUp</key>
+ <string>NSPopUpButton</string>
+ <key>fX264optNfpskipLabel</key>
+ <string>NSTextField</string>
+ <key>fX264optNfpskipSwitch</key>
+ <string>NSButton</string>
+ <key>fX264optNodctdcmtLabel</key>
+ <string>NSTextField</string>
+ <key>fX264optNodctdcmtSwitch</key>
+ <string>NSButton</string>
+ <key>fX264optRefLabel</key>
+ <string>NSTextField</string>
+ <key>fX264optRefPopUp</key>
+ <string>NSPopUpButton</string>
+ <key>fX264optSubmeLabel</key>
+ <string>NSTextField</string>
+ <key>fX264optSubmePopUp</key>
+ <string>NSPopUpButton</string>
+ <key>fX264optTrellisLabel</key>
+ <string>NSTextField</string>
+ <key>fX264optTrellisPopUp</key>
+ <string>NSPopUpButton</string>
+ <key>fX264optView</key>
+ <string>NSView</string>
+ <key>fX264optViewTitleLabel</key>
+ <string>NSTextField</string>
+ <key>fX264optWeightBLabel</key>
+ <string>NSTextField</string>
+ <key>fX264optWeightBSwitch</key>
+ <string>NSButton</string>
+ </dict>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>FirstResponder</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ <key>SUPERCLASS</key>
+ <string>NSObject</string>
+ </dict>
+ <dict>
+ <key>CLASS</key>
+ <string>NSObject</string>
+ <key>LANGUAGE</key>
+ <string>ObjC</string>
+ </dict>
+ </array>
+ <key>IBVersion</key>
+ <string>1</string>
+</dict>
+</plist>
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 @@
<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
<plist version="1.0">
<dict>
- <key>IBDocumentLocation</key>
- <string>216 196 356 240 0 0 1440 878 </string>
- <key>IBEditorPositions</key>
- <dict>
- <key>254</key>
- <string>465 444 550 282 0 0 1440 878 </string>
- <key>5</key>
- <string>289 494 550 282 0 0 1440 878 </string>
- </dict>
<key>IBFramework Version</key>
- <string>446.1</string>
- <key>IBLockedObjects</key>
- <array>
- <integer>5</integer>
- <integer>254</integer>
- </array>
+ <string>629</string>
+ <key>IBLastKnownRelativeProjectPath</key>
+ <string>../../HandBrake.xcodeproj</string>
+ <key>IBOldestOS</key>
+ <integer>5</integer>
<key>IBOpenObjects</key>
<array>
<integer>5</integer>
</array>
<key>IBSystem Version</key>
- <string>8R2218</string>
+ <string>9B18</string>
+ <key>targetFramework</key>
+ <string>IBCocoaFramework</string>
</dict>
</plist>
diff --git a/macosx/English.lproj/AdvancedView.nib/keyedobjects.nib b/macosx/English.lproj/AdvancedView.nib/keyedobjects.nib
index 5fb13e9ae..3422372a3 100644
--- a/macosx/English.lproj/AdvancedView.nib/keyedobjects.nib
+++ b/macosx/English.lproj/AdvancedView.nib/keyedobjects.nib
Binary files 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 @@
<integer>5</integer>
<key>IBOpenObjects</key>
<array>
- <integer>1868</integer>
+ <integer>2</integer>
</array>
<key>IBSystem Version</key>
<string>9B18</string>
diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
index 46401671a..ab362c90a 100644
--- a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
+++ b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib
Binary files differ
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-21 03:59:40 +0000