diff options
| -rw-r--r-- | macosx/Controller.mm | 22 | ||||
| -rw-r--r-- | macosx/English.lproj/MainMenu.nib/info.nib | 7 | ||||
| -rw-r--r-- | macosx/English.lproj/MainMenu.nib/keyedobjects.nib | bin | 55538 -> 55538 bytes | |||
| -rw-r--r-- | macosx/HandBrake.plist | 4 | ||||
| -rw-r--r-- | macosx/ScanController.mm | 56 |
5 files changed, 50 insertions, 39 deletions
diff --git a/macosx/Controller.mm b/macosx/Controller.mm index e182acdff..a38d0d062 100644 --- a/macosx/Controller.mm +++ b/macosx/Controller.mm @@ -57,6 +57,8 @@ static int FormatSettings[3][4] = if( ( build = hb_check_update( fHandle, &version ) ) > -1 ) { /* Update available - tell the user */ + /* TEMPORARILY COMMENT OUT AS UPDATE CHECK IS NOT ACCURATE */ + /* NSBeginInformationalAlertSheet( _( @"Update is available" ), _( @"Go get it!" ), _( @"Discard" ), NULL, fWindow, self, @selector( UpdateAlertDone:returnCode:contextInfo: ), @@ -64,6 +66,7 @@ static int FormatSettings[3][4] = _( @"HandBrake %s (build %d) is now available for download." ), version, build] ); return; + */ } /* Show scan panel ASAP */ @@ -286,14 +289,25 @@ static int FormatSettings[3][4] = for( int i = 0; i < hb_list_count( list ); i++ ) { title = (hb_title_t *) hb_list_item( list, i ); - [fSrcDVD2Field setStringValue: [NSString + /*Set DVD Name at top of window*/ + [fSrcDVD2Field setStringValue: [NSString stringWithUTF8String: title->name]]; - - [fSrcTitlePopUp addItemWithTitle: [NSString + + /* Use the dvd name in the default output field here + May want to add code to remove blank spaces for some dvd names*/ + [fDstFile2Field setStringValue: [NSString stringWithFormat: + @"%@/Desktop/%@.mp4", NSHomeDirectory(),[NSString + stringWithUTF8String: title->name]]]; + + [fSrcTitlePopUp addItemWithTitle: [NSString stringWithFormat: @"%d - %02dh%02dm%02ds", title->index, title->hours, title->minutes, title->seconds]]; - } + + + + + } [self TitlePopUpChanged: NULL]; [self EnableUI: YES]; diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib index f1098ef24..24b755c8a 100644 --- a/macosx/English.lproj/MainMenu.nib/info.nib +++ b/macosx/English.lproj/MainMenu.nib/info.nib @@ -3,7 +3,7 @@ <plist version="1.0"> <dict> <key>IBDocumentLocation</key> - <string>69 85 356 240 0 0 1440 878 </string> + <string>36 281 376 264 0 0 1440 878 </string> <key>IBEditorPositions</key> <dict> <key>29</key> @@ -11,11 +11,6 @@ </dict> <key>IBFramework Version</key> <string>446.1</string> - <key>IBOpenObjects</key> - <array> - <integer>21</integer> - <integer>29</integer> - </array> <key>IBSystem Version</key> <string>8L127</string> </dict> diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib Binary files differindex d8e86a1e3..f84e1e0d4 100644 --- a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib +++ b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib diff --git a/macosx/HandBrake.plist b/macosx/HandBrake.plist index 6c0abfefc..482e5a9bf 100644 --- a/macosx/HandBrake.plist +++ b/macosx/HandBrake.plist @@ -9,7 +9,7 @@ <key>CFBundleExecutable</key> <string>HandBrake</string> <key>CFBundleGetInfoString</key> - <string>0.7.1</string> + <string>0.7.1a5</string> <key>CFBundleIconFile</key> <string>HandBrake.icns</string> <key>CFBundleIdentifier</key> @@ -21,7 +21,7 @@ <key>CFBundlePackageType</key> <string>APPL</string> <key>CFBundleShortVersionString</key> - <string>0.7.1a2</string> + <string>0.7.1a5</string> <key>CFBundleSignature</key> <string>HB##</string> <key>CFBundleVersion</key> diff --git a/macosx/ScanController.mm b/macosx/ScanController.mm index 92621056b..b38d2b999 100644 --- a/macosx/ScanController.mm +++ b/macosx/ScanController.mm @@ -41,13 +41,7 @@ - (void) Show { - /* rev63 Drive Detector - DriveDetector * driveDetector; - driveDetector = [[DriveDetector alloc] initWithCallback: self - selector: @selector( UpdatePopup: )]; - [driveDetector run]; - */ - // Taken From IHB for Post rev 63 drive detector + fDriveDetector = [[DriveDetector alloc] initWithCallback: self selector: @selector( openUpdateDrives: )]; [fDriveDetector run]; @@ -59,9 +53,6 @@ [NSApp endSheet: fPanel]; [fPanel orderOut: self]; - //driveDetector stop/release not needed - //[driveDetector stop]; - //[driveDetector release]; } - (void) openUpdateDrives: (NSDictionary *) drives @@ -79,31 +70,40 @@ { [fDetectedPopUp addItemWithTitle: device]; } + + if( ![fDetectedPopUp numberOfItems] ) { - [fDetectedPopUp addItemWithTitle: INSERT_STRING]; + [fDetectedPopUp addItemWithTitle: INSERT_STRING]; + [fDetectedPopUp setEnabled: 0]; + [fFolderField setEnabled: 1]; + [fBrowseButton setEnabled: 1]; + [fOpenButton setEnabled: 0]; + [fBrowseButton setEnabled: 0]; + //fOpenButton + + } - [fDetectedPopUp selectItemAtIndex: 0]; - /* May not have any bearing on anything - here as this is from IHB. Need to test - + else + { + [fDetectedPopUp setEnabled: 1]; + [fFolderField setEnabled: 0]; + [fBrowseButton setEnabled: 0]; + [fOpenButton setEnabled: 1]; + [fBrowseButton setEnabled: 0]; + } + + [fDetectedPopUp selectItemAtIndex: 0]; + + /* if( [fMatrix isEnabled] ) { - [self openEnable: YES]; + [self EnableUI: YES]; + } */ } - -// UpdatePopup Not used for post rev 63 dd -/* -- (void) UpdatePopup: (NSArray *) drives -{ - [fDetectedPopUp removeAllItems]; - [fDetectedPopUp addItemsWithTitles: drives]; - [self MatrixChanged: self]; -} -*/ - (void) EnableUI: (bool) b { [fMatrix setEnabled: b]; @@ -156,6 +156,7 @@ - (IBAction) MatrixChanged: (id) sender { /* Do we have detected drives */ + if( [fDetectedPopUp numberOfItems] > 0 ) { [fDetectedCell setEnabled: YES]; @@ -165,13 +166,14 @@ [fMatrix selectCell: fFolderCell]; [fDetectedCell setEnabled: NO]; } - + /* Enable controls related to the current choice */ bool foo; foo = ( [fMatrix selectedRow] == 0 ); [fDetectedPopUp setEnabled: foo]; [fFolderField setEnabled: !foo]; [fBrowseButton setEnabled: !foo]; + } /* Browse: |