diff options
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/DriveDetector.m | 19 | ||||
| -rw-r--r-- | macosx/English.lproj/MainMenu.nib/info.nib | 2 | ||||
| -rw-r--r-- | macosx/English.lproj/MainMenu.nib/keyedobjects.nib | bin | 122200 -> 122179 bytes | |||
| -rw-r--r-- | macosx/English.lproj/Preferences.nib/info.nib | 2 | ||||
| -rw-r--r-- | macosx/English.lproj/Preferences.nib/keyedobjects.nib | bin | 18304 -> 18829 bytes | |||
| -rw-r--r-- | macosx/HBPreferencesController.m | 1 | ||||
| -rw-r--r-- | macosx/ScanController.mm | 50 |
7 files changed, 52 insertions, 22 deletions
diff --git a/macosx/DriveDetector.m b/macosx/DriveDetector.m index 61f722960..b79e969de 100644 --- a/macosx/DriveDetector.m +++ b/macosx/DriveDetector.m @@ -40,14 +40,17 @@ - (void) run { - /* Set up a timer to check devices every second */ - fTimer = [NSTimer scheduledTimerWithTimeInterval: 1.0 target: self - selector: @selector( detectTimer: ) userInfo: nil repeats: YES]; - [[NSRunLoop currentRunLoop] addTimer: fTimer forMode: - NSModalPanelRunLoopMode]; - - /* Do a first update right away */ - [fTimer fire]; + if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DisableDvdAutoDetect"] == 0) + { + /* Set up a timer to check devices every second */ + fTimer = [NSTimer scheduledTimerWithTimeInterval: 1.0 target: self + selector: @selector( detectTimer: ) userInfo: nil repeats: YES]; + [[NSRunLoop currentRunLoop] addTimer: fTimer forMode: + NSModalPanelRunLoopMode]; + + /* Do a first update right away */ + [fTimer fire]; + } } - (void) stop diff --git a/macosx/English.lproj/MainMenu.nib/info.nib b/macosx/English.lproj/MainMenu.nib/info.nib index 5734329b9..f582e6f45 100644 --- a/macosx/English.lproj/MainMenu.nib/info.nib +++ b/macosx/English.lproj/MainMenu.nib/info.nib @@ -19,8 +19,8 @@ </array> <key>IBOpenObjects</key> <array> - <integer>21</integer> <integer>29</integer> + <integer>1162</integer> </array> <key>IBSystem Version</key> <string>8P2137</string> diff --git a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib Binary files differindex e450ce219..79978bf84 100644 --- a/macosx/English.lproj/MainMenu.nib/keyedobjects.nib +++ b/macosx/English.lproj/MainMenu.nib/keyedobjects.nib diff --git a/macosx/English.lproj/Preferences.nib/info.nib b/macosx/English.lproj/Preferences.nib/info.nib index 5555c9b51..59db7cce5 100644 --- a/macosx/English.lproj/Preferences.nib/info.nib +++ b/macosx/English.lproj/Preferences.nib/info.nib @@ -3,7 +3,7 @@ <plist version="1.0"> <dict> <key>IBDocumentLocation</key> - <string>90 269 674 609 0 0 1440 878 </string> + <string>84 122 674 609 0 0 1440 878 </string> <key>IBFramework Version</key> <string>446.1</string> <key>IBOpenObjects</key> diff --git a/macosx/English.lproj/Preferences.nib/keyedobjects.nib b/macosx/English.lproj/Preferences.nib/keyedobjects.nib Binary files differindex 79d30633d..13dbbefd0 100644 --- a/macosx/English.lproj/Preferences.nib/keyedobjects.nib +++ b/macosx/English.lproj/Preferences.nib/keyedobjects.nib diff --git a/macosx/HBPreferencesController.m b/macosx/HBPreferencesController.m index 2bb38bfc0..5afe02bac 100644 --- a/macosx/HBPreferencesController.m +++ b/macosx/HBPreferencesController.m @@ -41,6 +41,7 @@ @"NO", @"DefaultChapterMarkers", @"NO", @"ShowVerboseOutput", @"NO", @"AllowLargeFiles", + @"NO", @"DisableDvdAutoDetect", nil]]; } diff --git a/macosx/ScanController.mm b/macosx/ScanController.mm index f352cb57b..a88ff40e7 100644 --- a/macosx/ScanController.mm +++ b/macosx/ScanController.mm @@ -40,9 +40,24 @@ - (void) Show { - - fDriveDetector = [[DriveDetector alloc] initWithCallback:self selector:@selector(openUpdateDrives:)]; - [fDriveDetector run]; + if ([[NSUserDefaults standardUserDefaults] boolForKey:@"DisableDvdAutoDetect"] == 0) + { + [fSelectString setStringValue:@"Select a DVD Source:"]; + fDriveDetector = [[DriveDetector alloc] initWithCallback:self selector:@selector(openUpdateDrives:)]; + [fDriveDetector run]; + } + else + { + [fSelectString setStringValue:@"Select a DVD Source: (DVD drive auto-detect is disabled)"]; + + [fDetectedCell setEnabled: 0]; + [fDetectedPopUp setEnabled: 0]; + [fFolderField setEnabled: 1]; + [fBrowseButton setEnabled: 1]; + [fOpenButton setEnabled: 0]; + [fBrowseButton setEnabled: 1]; + [fMatrix selectCell: fFolderCell]; + } [NSApp beginSheet:fPanel modalForWindow:fWindow modalDelegate:nil didEndSelector:NULL contextInfo:NULL]; } @@ -140,25 +155,36 @@ - (IBAction) MatrixChanged: (id) sender { - /* Do we have detected drives */ + /* Do we have detected drives and is "Disable DVD Drive Auto Scan" off in prefs*/ - if( [fDetectedPopUp numberOfItems] > 0 ) + if( [fDetectedPopUp numberOfItems] > 0 && [[NSUserDefaults standardUserDefaults] boolForKey:@"DisableDvdAutoDetect"] == 0) { [fDetectedCell setEnabled: YES]; + //[fMatrix selectCellAtRow:0 column:0]; + } else { - [fMatrix selectCell: fFolderCell]; + //[fMatrix selectCell: fFolderCell]; [fDetectedCell setEnabled: NO]; - [fMatrix selectCellAtRow:1 column:0]; + } /* Enable controls related to the current choice */ - bool foo; - foo = ( [fMatrix selectedRow] == 0 ); - [fDetectedPopUp setEnabled: foo]; - [fFolderField setEnabled: !foo]; - [fBrowseButton setEnabled: !foo]; + /* If Detected Volume is selected */ + if ( [fMatrix selectedRow] == 0 ) + { + [fDetectedPopUp setEnabled: YES]; + [fFolderField setEnabled: NO]; + [fBrowseButton setEnabled: NO]; + } + else + { + [fDetectedPopUp setEnabled: NO]; + [fFolderField setEnabled: YES]; + [fBrowseButton setEnabled: YES]; + } + } |