diff options
Diffstat (limited to 'macosx')
| -rw-r--r-- | macosx/Controller.h | 8 | ||||
| -rw-r--r-- | macosx/Controller.m | 41 | ||||
| -rw-r--r-- | macosx/English.lproj/MainMenu.xib | 47 |
3 files changed, 91 insertions, 5 deletions
diff --git a/macosx/Controller.h b/macosx/Controller.h index 9f411a5a3..58a8e2e00 100644 --- a/macosx/Controller.h +++ b/macosx/Controller.h @@ -266,6 +266,8 @@ BOOL fIsDragging; - (void) updateUI: (NSTimer *) timer; - (void) enableUI: (bool) enable; - (IBAction) encodeStartStopPopUpChanged: (id) sender; + + - (IBAction) titlePopUpChanged: (id) sender; - (IBAction) chapterPopUpChanged: (id) sender; - (IBAction) startEndSecValueChanged: (id) sender; @@ -298,6 +300,12 @@ BOOL fIsDragging; - (IBAction) calculatePictureSizing: (id) sender; - (IBAction) openMainWindow: (id) sender; +/* Add All titles to the queue */ +- (IBAction) addAllTitlesToQueue: (id) sender; +- (void) addAllTitlesToQueueAlertDone: (NSWindow *) sheet + returnCode: (int) returnCode contextInfo: (void *) contextInfo; +- (void) doAddAllTitlesToQueue; + /* Queue File Stuff */ - (void) loadQueueFile; - (NSDictionary *)createQueueFileItem; diff --git a/macosx/Controller.m b/macosx/Controller.m index 8821e758f..865cc7f60 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -1329,7 +1329,7 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It if (fHandle) { - if (action == @selector(addToQueue:) || action == @selector(showPicturePanel:) || action == @selector(showAddPresetPanel:)) + if (action == @selector(addToQueue:) || action == @selector(addAllTitlesToQueue:) || action == @selector(showPicturePanel:) || action == @selector(showAddPresetPanel:)) return SuccessfulScan && [fWindow attachedSheet] == nil; if (action == @selector(browseSources:)) @@ -4197,6 +4197,45 @@ bool one_burned = FALSE; } #pragma mark - +#pragma mark Batch Queue Titles Methods +- (IBAction) addAllTitlesToQueue: (id) sender +{ + NSBeginCriticalAlertSheet( NSLocalizedString( @"You are about to add ALL titles to the queue!", @"" ), + NSLocalizedString( @"Cancel", @"" ), NSLocalizedString( @"Yes, I want to add all titles to the queue.", @"" ), nil, fWindow, self, + @selector( addAllTitlesToQueueAlertDone:returnCode:contextInfo: ), + NULL, NULL, [NSString stringWithFormat: + NSLocalizedString( @"Current settings will be applied to all %d titles. Are you sure you want to do this?", @"" ),[fSrcTitlePopUp numberOfItems]] ); +} + +- (void) addAllTitlesToQueueAlertDone: (NSWindow *) sheet + returnCode: (int) returnCode contextInfo: (void *) contextInfo +{ + if( returnCode == NSAlertAlternateReturn ) + [self doAddAllTitlesToQueue]; +} + +- (void) doAddAllTitlesToQueue +{ + + /* first get the currently selected index so we can choose it again after cycling through the available titles. */ + int currentlySelectedTitle = [fSrcTitlePopUp indexOfSelectedItem]; + + /* For each title in the fSrcTitlePopUp select it ... */ + for( int i = 0; i < [fSrcTitlePopUp numberOfItems]; i++ ) + { + [fSrcTitlePopUp selectItemAtIndex:i]; + /* Now call titlePopUpChanged to load it up ... */ + [self titlePopUpChanged:nil]; + /* now add the title to the queue */ + [self addToQueue:nil]; + } + /* Now that we are done, reselect the previously selected title.*/ + [fSrcTitlePopUp selectItemAtIndex: currentlySelectedTitle]; + /* Now call titlePopUpChanged to load it up ... */ + [self titlePopUpChanged:nil]; +} + +#pragma mark - #pragma mark GUI Controls Changed Methods - (IBAction) titlePopUpChanged: (id) sender diff --git a/macosx/English.lproj/MainMenu.xib b/macosx/English.lproj/MainMenu.xib index a56045276..6e9fb8a0c 100644 --- a/macosx/English.lproj/MainMenu.xib +++ b/macosx/English.lproj/MainMenu.xib @@ -2,7 +2,7 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10K540</string> + <string key="IBDocument.SystemVersion">10K549</string> <string key="IBDocument.InterfaceBuilderVersion">851</string> <string key="IBDocument.AppKitVersion">1038.36</string> <string key="IBDocument.HIToolboxVersion">461.00</string> @@ -12,6 +12,7 @@ </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="1209"/> <integer value="2"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> @@ -3140,6 +3141,15 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="NSOnImage" ref="447995298"/> <reference key="NSMixedImage" ref="760317610"/> </object> + <object class="NSMenuItem" id="232757118"> + <reference key="NSMenu" ref="567182830"/> + <string key="NSTitle">Add All Titles To Queue ...</string> + <string key="NSKeyEquiv">b</string> + <int key="NSKeyEquivModMask">1048576</int> + <int key="NSMnemonicLoc">2147483647</int> + <reference key="NSOnImage" ref="447995298"/> + <reference key="NSMixedImage" ref="760317610"/> + </object> <object class="NSMenuItem" id="17111946"> <reference key="NSMenu" ref="567182830"/> <string key="NSTitle">Start Encoding</string> @@ -6584,6 +6594,14 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> <int key="connectionID">5892</int> </object> + <object class="IBConnectionRecord"> + <object class="IBActionConnection" key="connection"> + <string key="label">addAllTitlesToQueue:</string> + <reference key="source" ref="2258723"/> + <reference key="destination" ref="232757118"/> + </object> + <int key="connectionID">5899</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -7322,6 +7340,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference ref="542310438"/> <reference ref="374169999"/> <reference ref="865776798"/> + <reference ref="232757118"/> </object> <reference key="parent" ref="966413586"/> </object> @@ -9444,6 +9463,11 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <reference key="parent" ref="0"/> <string key="objectName">Audio Inputs</string> </object> + <object class="IBObjectRecord"> + <int key="objectID">5897</int> + <reference key="object" ref="232757118"/> + <reference key="parent" ref="567182830"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -9564,6 +9588,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>1561.IBPluginDependency</string> <string>1561.ImportedFromIB2</string> <string>1562.IBPluginDependency</string> + <string>1562.IBViewBoundsToFrameTransform</string> <string>1562.ImportedFromIB2</string> <string>1623.IBPluginDependency</string> <string>1623.ImportedFromIB2</string> @@ -10086,6 +10111,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>5873.IBPluginDependency</string> <string>5874.IBPluginDependency</string> <string>5879.IBPluginDependency</string> + <string>5897.IBPluginDependency</string> + <string>5897.ImportedFromIB2</string> <string>970.IBPluginDependency</string> <string>970.ImportedFromIB2</string> <string>971.IBPluginDependency</string> @@ -10114,7 +10141,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{434, 787}, {284, 143}}</string> + <string>{{434, 673}, {281, 163}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -10216,6 +10243,9 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <object class="NSAffineTransform"> + <bytes key="NSTransformStruct">P4AAAL+AAABEPMAAw+kAAA</bytes> + </object> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> @@ -10229,7 +10259,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> - <string>{{476, 687}, {253, 243}}</string> + <string>{{476, 593}, {250, 243}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -10765,6 +10795,8 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <integer value="1"/> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> </object> </object> <object class="NSMutableDictionary" key="unlocalizedProperties"> @@ -10783,7 +10815,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> </object> </object> <nil key="sourceID"/> - <int key="maxID">5892</int> + <int key="maxID">5899</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -10818,6 +10850,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>Pause:</string> <string>Rip:</string> <string>addAllAudioTracks:</string> + <string>addAllTitlesToQueue:</string> <string>addFactoryPresets:</string> <string>addPresetPicDropdownChanged:</string> <string>addToQueue:</string> @@ -10927,6 +10960,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>id</string> <string>id</string> <string>id</string> + <string>id</string> </object> </object> <object class="NSMutableDictionary" key="actionInfosByName"> @@ -10937,6 +10971,7 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string>Pause:</string> <string>Rip:</string> <string>addAllAudioTracks:</string> + <string>addAllTitlesToQueue:</string> <string>addFactoryPresets:</string> <string>addPresetPicDropdownChanged:</string> <string>addToQueue:</string> @@ -11008,6 +11043,10 @@ AAMAAAABAAEAAAFTAAMAAAAEAAAFwgAAAAAACAAIAAgACAABAAEAAQABA</bytes> <string key="candidateClassName">id</string> </object> <object class="IBActionInfo"> + <string key="name">addAllTitlesToQueue:</string> + <string key="candidateClassName">id</string> + </object> + <object class="IBActionInfo"> <string key="name">addFactoryPresets:</string> <string key="candidateClassName">id</string> </object> |