diff options
Diffstat (limited to 'macosx')
-rw-r--r-- | macosx/Controller.m | 100 | ||||
-rw-r--r-- | macosx/English.lproj/Preferences.xib | 242 | ||||
-rw-r--r-- | macosx/HBPreferencesController.m | 1 |
3 files changed, 254 insertions, 89 deletions
diff --git a/macosx/Controller.m b/macosx/Controller.m index 47303dfc9..d0b5c9dd2 100644 --- a/macosx/Controller.m +++ b/macosx/Controller.m @@ -85,11 +85,6 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It NSString *versionStringFull = [[NSString stringWithFormat: @"Handbrake Version: %@", [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleShortVersionString"]] stringByAppendingString: [NSString stringWithFormat: @" (%@)", [[[NSBundle mainBundle] infoDictionary] objectForKey:@"CFBundleVersion"]]]; [self writeToActivityLog: "%s", [versionStringFull UTF8String]]; - /* Get the PID number for this hb instance, used in multi instance encoding */ - //pidNum = [self getThisHBInstancePID]; - /* Report this pid to the activity log */ - //[self writeToActivityLog: "Pid for this instance:%d", pidNum]; - return self; } @@ -1015,46 +1010,7 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It /* since we have successfully completed an encode, we increment the queue counter */ [self incrementQueueItemDone:currentQueueEncodeIndex]; - - /* all end of queue actions below need to be done after all queue encodes have finished - * and there are no pending jobs left to process - */ - if (fPendingCount == 0) - { - /* If Alert Window or Window and Growl has been selected */ - if( [[[NSUserDefaults standardUserDefaults] stringForKey:@"AlertWhenDone"] isEqualToString: @"Alert Window"] || - [[[NSUserDefaults standardUserDefaults] stringForKey:@"AlertWhenDone"] isEqualToString: @"Alert Window And Growl"] ) - { - /*On Screen Notification*/ - int status; - NSBeep(); - status = NSRunAlertPanel(@"Put down that cocktail...",@"Your HandBrake queue is done!", @"OK", nil, nil); - [NSApp requestUserAttention:NSCriticalRequest]; - } - - /* If sleep has been selected */ - if( [[[NSUserDefaults standardUserDefaults] stringForKey:@"AlertWhenDone"] isEqualToString: @"Put Computer To Sleep"] ) - { - /* Sleep */ - NSDictionary* errorDict; - NSAppleEventDescriptor* returnDescriptor = nil; - NSAppleScript* scriptObject = [[NSAppleScript alloc] initWithSource: - @"tell application \"Finder\" to sleep"]; - returnDescriptor = [scriptObject executeAndReturnError: &errorDict]; - [scriptObject release]; - } - /* If Shutdown has been selected */ - if( [[[NSUserDefaults standardUserDefaults] stringForKey:@"AlertWhenDone"] isEqualToString: @"Shut Down Computer"] ) - { - /* Shut Down */ - NSDictionary* errorDict; - NSAppleEventDescriptor* returnDescriptor = nil; - NSAppleScript* scriptObject = [[NSAppleScript alloc] initWithSource: - @"tell application \"Finder\" to shut down"]; - returnDescriptor = [scriptObject executeAndReturnError: &errorDict]; - [scriptObject release]; - } - } + } break; @@ -1426,6 +1382,13 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It -(void)showGrowlDoneNotification:(NSString *) filePath { /* This end of encode action is called as each encode rolls off of the queue */ + + /* If Play System Alert has been selected in Preferences */ + if( [[NSUserDefaults standardUserDefaults] boolForKey:@"AlertWhenDoneSound"] == YES ) + { + NSBeep(); + } + /* Setup the Growl stuff ... */ NSString * finishedEncode = filePath; /* strip off the path to just show the file name */ finishedEncode = [finishedEncode lastPathComponent]; @@ -1460,6 +1423,49 @@ static NSString * ChooseSourceIdentifier = @"Choose Source It } } + +- (void) queueCompletedAlerts +{ + /* If Play System Alert has been selected in Preferences */ + if( [[NSUserDefaults standardUserDefaults] boolForKey:@"AlertWhenDoneSound"] == YES ) + { + NSBeep(); + } + + /* If Alert Window or Window and Growl has been selected */ + if( [[[NSUserDefaults standardUserDefaults] stringForKey:@"AlertWhenDone"] isEqualToString: @"Alert Window"] || + [[[NSUserDefaults standardUserDefaults] stringForKey:@"AlertWhenDone"] isEqualToString: @"Alert Window And Growl"] ) + { + /*On Screen Notification*/ + int status; + status = NSRunAlertPanel(@"Put down that cocktail...",@"Your HandBrake queue is done!", @"OK", nil, nil); + [NSApp requestUserAttention:NSCriticalRequest]; + } + + /* If sleep has been selected */ + if( [[[NSUserDefaults standardUserDefaults] stringForKey:@"AlertWhenDone"] isEqualToString: @"Put Computer To Sleep"] ) + { + /* Sleep */ + NSDictionary* errorDict; + NSAppleEventDescriptor* returnDescriptor = nil; + NSAppleScript* scriptObject = [[NSAppleScript alloc] initWithSource: + @"tell application \"Finder\" to sleep"]; + returnDescriptor = [scriptObject executeAndReturnError: &errorDict]; + [scriptObject release]; + } + /* If Shutdown has been selected */ + if( [[[NSUserDefaults standardUserDefaults] stringForKey:@"AlertWhenDone"] isEqualToString: @"Shut Down Computer"] ) + { + /* Shut Down */ + NSDictionary* errorDict; + NSAppleEventDescriptor* returnDescriptor = nil; + NSAppleScript* scriptObject = [[NSAppleScript alloc] initWithSource: + @"tell application \"Finder\" to shut down"]; + returnDescriptor = [scriptObject executeAndReturnError: &errorDict]; + [scriptObject release]; + } +} + #pragma mark - #pragma mark Get New Source @@ -2524,6 +2530,8 @@ fWorkingCount = 0; else { [self writeToActivityLog: "incrementQueueItemDone there are no more pending encodes"]; + /*Since there are no more items to encode, go to queueCompletedAlerts for user specified alerts after queue completed*/ + [self queueCompletedAlerts]; } } @@ -2707,8 +2715,6 @@ fWorkingCount = 0; [self doRip]; } - - #pragma mark - #pragma mark Queue Item Editing diff --git a/macosx/English.lproj/Preferences.xib b/macosx/English.lproj/Preferences.xib index b38c37610..60c6a7338 100644 --- a/macosx/English.lproj/Preferences.xib +++ b/macosx/English.lproj/Preferences.xib @@ -2,17 +2,17 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.10"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">10C540</string> - <string key="IBDocument.InterfaceBuilderVersion">740</string> - <string key="IBDocument.AppKitVersion">1038.25</string> - <string key="IBDocument.HIToolboxVersion">458.00</string> + <string key="IBDocument.SystemVersion">10F569</string> + <string key="IBDocument.InterfaceBuilderVersion">788</string> + <string key="IBDocument.AppKitVersion">1038.29</string> + <string key="IBDocument.HIToolboxVersion">461.00</string> <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> - <string key="NS.object.0">740</string> + <string key="NS.object.0">788</string> </object> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="235"/> + <integer value="233"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -63,14 +63,45 @@ <bool key="NSSharedInstance">YES</bool> </object> <object class="NSCustomView" id="1048779201"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSButton" id="1009109497"> + <reference key="NSNextResponder" ref="1048779201"/> + <int key="NSvFlags">256</int> + <string key="NSFrame">{{123, 90}, {313, 18}}</string> + <reference key="NSSuperview" ref="1048779201"/> + <bool key="NSEnabled">YES</bool> + <object class="NSButtonCell" key="NSCell" id="878201725"> + <int key="NSCellFlags">-2080244224</int> + <int key="NSCellFlags2">131072</int> + <string key="NSContents">Play System Alert Sound</string> + <object class="NSFont" key="NSSupport" id="26"> + <string key="NSName">LucidaGrande</string> + <double key="NSSize">11</double> + <int key="NSfFlags">3100</int> + </object> + <reference key="NSControlView" ref="1009109497"/> + <int key="NSButtonFlags">1211912703</int> + <int key="NSButtonFlags2">2</int> + <object class="NSCustomResource" key="NSNormalImage" id="491838135"> + <string key="NSClassName">NSImage</string> + <string key="NSResourceName">NSSwitch</string> + </object> + <object class="NSButtonImageSource" key="NSAlternateImage" id="1056213191"> + <string key="NSImageName">NSSwitch</string> + </object> + <string key="NSAlternateContents"/> + <string key="NSKeyEquivalent"/> + <int key="NSPeriodicDelay">200</int> + <int key="NSPeriodicInterval">25</int> + </object> + </object> <object class="NSButton" id="806259169"> <reference key="NSNextResponder" ref="1048779201"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{345, 70}, {96, 16}}</string> + <string key="NSFrame">{{345, 71}, {96, 16}}</string> <reference key="NSSuperview" ref="1048779201"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="725806271"> @@ -94,18 +125,14 @@ <object class="NSTextField" id="842132572"> <reference key="NSNextResponder" ref="1048779201"/> <int key="NSvFlags">268</int> - <string key="NSFrame">{{209, 72}, {125, 14}}</string> + <string key="NSFrame">{{209, 73}, {125, 14}}</string> <reference key="NSSuperview" ref="1048779201"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="456853603"> <int key="NSCellFlags">68288064</int> <int key="NSCellFlags2">272761856</int> <string key="NSContents">None</string> - <object class="NSFont" key="NSSupport" id="26"> - <string key="NSName">LucidaGrande</string> - <double key="NSSize">11</double> - <int key="NSfFlags">3100</int> - </object> + <reference key="NSSupport" ref="26"/> <reference key="NSControlView" ref="842132572"/> <object class="NSColor" key="NSBackgroundColor" id="525377782"> <int key="NSColorSpace">6</int> @@ -130,7 +157,7 @@ <object class="NSButton" id="906899216"> <reference key="NSNextResponder" ref="1048779201"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{123, 18}, {311, 18}}</string> + <string key="NSFrame">{{125, 18}, {311, 18}}</string> <reference key="NSSuperview" ref="1048779201"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="36851657"> @@ -141,9 +168,7 @@ <reference key="NSControlView" ref="906899216"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <object class="NSButtonImageSource" key="NSAlternateImage" id="1056213191"> - <string key="NSImageName">NSSwitch</string> - </object> + <reference key="NSAlternateImage" ref="1056213191"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> <int key="NSPeriodicDelay">200</int> @@ -153,7 +178,7 @@ <object class="NSButton" id="636306431"> <reference key="NSNextResponder" ref="1048779201"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{123, 200}, {133, 18}}</string> + <string key="NSFrame">{{123, 220}, {133, 18}}</string> <reference key="NSSuperview" ref="1048779201"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="448858755"> @@ -174,7 +199,7 @@ <object class="NSButton" id="965044526"> <reference key="NSNextResponder" ref="1048779201"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{123, 38}, {303, 18}}</string> + <string key="NSFrame">{{125, 38}, {303, 18}}</string> <reference key="NSSuperview" ref="1048779201"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="419322096"> @@ -195,7 +220,7 @@ <object class="NSTextField" id="315188467"> <reference key="NSNextResponder" ref="1048779201"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{52, 97}, {69, 14}}</string> + <string key="NSFrame">{{52, 117}, {69, 14}}</string> <reference key="NSSuperview" ref="1048779201"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="718672066"> @@ -211,7 +236,7 @@ <object class="NSButton" id="581738572"> <reference key="NSNextResponder" ref="1048779201"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{123, 155}, {194, 18}}</string> + <string key="NSFrame">{{123, 175}, {194, 18}}</string> <reference key="NSSuperview" ref="1048779201"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="824062726"> @@ -232,7 +257,7 @@ <object class="NSButton" id="597305137"> <reference key="NSNextResponder" ref="1048779201"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{123, 70}, {86, 18}}</string> + <string key="NSFrame">{{123, 71}, {86, 18}}</string> <reference key="NSSuperview" ref="1048779201"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="437495050"> @@ -243,10 +268,7 @@ <reference key="NSControlView" ref="597305137"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">2</int> - <object class="NSCustomResource" key="NSNormalImage" id="476074553"> - <string key="NSClassName">NSImage</string> - <string key="NSResourceName">NSSwitch</string> - </object> + <reference key="NSNormalImage" ref="491838135"/> <reference key="NSAlternateImage" ref="1056213191"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -257,7 +279,7 @@ <object class="NSTextField" id="576686737"> <reference key="NSNextResponder" ref="1048779201"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{62, 202}, {59, 14}}</string> + <string key="NSFrame">{{62, 222}, {59, 14}}</string> <reference key="NSSuperview" ref="1048779201"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="404194395"> @@ -273,7 +295,7 @@ <object class="NSTextField" id="280291731"> <reference key="NSNextResponder" ref="1048779201"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{141, 179}, {95, 14}}</string> + <string key="NSFrame">{{141, 199}, {95, 14}}</string> <reference key="NSSuperview" ref="1048779201"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="1049782015"> @@ -289,7 +311,7 @@ <object class="NSTextField" id="713240777"> <reference key="NSNextResponder" ref="1048779201"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{50, 40}, {71, 14}}</string> + <string key="NSFrame">{{52, 40}, {71, 14}}</string> <reference key="NSSuperview" ref="1048779201"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="947435557"> @@ -305,7 +327,7 @@ <object class="NSPopUpButton" id="317169558"> <reference key="NSNextResponder" ref="1048779201"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{123, 90}, {189, 22}}</string> + <string key="NSFrame">{{123, 110}, {189, 22}}</string> <reference key="NSSuperview" ref="1048779201"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="792374025"> @@ -419,7 +441,7 @@ <object class="NSPopUpButton" id="954667708"> <reference key="NSNextResponder" ref="1048779201"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{141, 128}, {102, 22}}</string> + <string key="NSFrame">{{141, 148}, {102, 22}}</string> <reference key="NSSuperview" ref="1048779201"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="841218599"> @@ -493,7 +515,7 @@ <object class="NSPopUpButton" id="54712339"> <reference key="NSNextResponder" ref="1048779201"/> <int key="NSvFlags">256</int> - <string key="NSFrame">{{238, 174}, {205, 22}}</string> + <string key="NSFrame">{{238, 194}, {205, 22}}</string> <reference key="NSSuperview" ref="1048779201"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="310956178"> @@ -562,7 +584,8 @@ </object> </object> </object> - <string key="NSFrameSize">{492, 236}</string> + <string key="NSFrameSize">{460, 256}</string> + <reference key="NSSuperview"/> <string key="NSClassName">NSView</string> <string key="NSExtension">NSControl</string> </object> @@ -597,7 +620,7 @@ <string key="NSExtension">NSResponder</string> </object> <object class="NSCustomView" id="332598366"> - <reference key="NSNextResponder"/> + <nil key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -938,7 +961,7 @@ <reference key="NSControlView" ref="1054432492"/> <int key="NSButtonFlags">1211912703</int> <int key="NSButtonFlags2">130</int> - <reference key="NSNormalImage" ref="476074553"/> + <reference key="NSNormalImage" ref="491838135"/> <reference key="NSAlternateImage" ref="1056213191"/> <string key="NSAlternateContents"/> <string key="NSKeyEquivalent"/> @@ -948,7 +971,6 @@ </object> </object> <string key="NSFrameSize">{492, 91}</string> - <reference key="NSSuperview"/> <object class="NSMutableString" key="NSClassName"> <characters key="NS.bytes">NSView</characters> </object> @@ -1742,6 +1764,22 @@ </object> <int key="connectionID">456</int> </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: values.AlertWhenDoneSound</string> + <reference key="source" ref="1009109497"/> + <reference key="destination" ref="580534391"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="1009109497"/> + <reference key="NSDestination" ref="580534391"/> + <string key="NSLabel">value: values.AlertWhenDoneSound</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">values.AlertWhenDoneSound</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">460</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -1790,20 +1828,21 @@ <reference key="object" ref="1048779201"/> <object class="NSMutableArray" key="children"> <bool key="EncodedWithXMLCoder">YES</bool> - <reference ref="906899216"/> <reference ref="636306431"/> - <reference ref="965044526"/> <reference ref="315188467"/> <reference ref="581738572"/> <reference ref="597305137"/> <reference ref="576686737"/> <reference ref="280291731"/> - <reference ref="713240777"/> <reference ref="317169558"/> <reference ref="954667708"/> <reference ref="54712339"/> <reference ref="842132572"/> <reference ref="806259169"/> + <reference ref="1009109497"/> + <reference ref="713240777"/> + <reference ref="965044526"/> + <reference ref="906899216"/> </object> <reference key="parent" ref="0"/> <string key="objectName">General</string> @@ -2529,6 +2568,20 @@ <reference key="object" ref="725806271"/> <reference key="parent" ref="806259169"/> </object> + <object class="IBObjectRecord"> + <int key="objectID">457</int> + <reference key="object" ref="1009109497"/> + <object class="NSMutableArray" key="children"> + <bool key="EncodedWithXMLCoder">YES</bool> + <reference ref="878201725"/> + </object> + <reference key="parent" ref="1048779201"/> + </object> + <object class="IBObjectRecord"> + <int key="objectID">458</int> + <reference key="object" ref="878201725"/> + <reference key="parent" ref="1009109497"/> + </object> </object> </object> <object class="NSMutableDictionary" key="flattenedProperties"> @@ -2692,6 +2745,9 @@ <string>449.IBPluginDependency</string> <string>450.IBPluginDependency</string> <string>451.IBPluginDependency</string> + <string>457.IBPluginDependency</string> + <string>457.ImportedFromIB2</string> + <string>458.IBPluginDependency</string> <string>5.IBEditorWindowLastContentRect</string> <string>5.IBPluginDependency</string> <string>5.IBWindowTemplateEditedContentRect</string> @@ -2708,7 +2764,7 @@ <object class="NSMutableArray" key="dict.values"> <bool key="EncodedWithXMLCoder">YES</bool> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{275, 582}, {492, 236}}</string> + <string>{{275, 562}, {460, 256}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <boolean value="YES"/> <integer value="1"/> @@ -2864,6 +2920,9 @@ <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> + <integer value="1"/> + <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{69, 656}, {500, 200}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>{{69, 656}, {500, 200}}</string> @@ -2894,7 +2953,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">456</int> + <int key="maxID">461</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> @@ -2906,6 +2965,13 @@ <string key="NS.key.0">browseSendToApp:</string> <string key="NS.object.0">id</string> </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <string key="NS.key.0">browseSendToApp:</string> + <object class="IBActionInfo" key="NS.object.0"> + <string key="name">browseSendToApp:</string> + <string key="candidateClassName">id</string> + </object> + </object> <object class="NSMutableDictionary" key="outlets"> <bool key="EncodedWithXMLCoder">YES</bool> <object class="NSArray" key="dict.sortedKeys"> @@ -2925,6 +2991,40 @@ <string>NSTextField</string> </object> </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>fAdvancedView</string> + <string>fAudioView</string> + <string>fGeneralView</string> + <string>fPictureView</string> + <string>fSendEncodeToAppField</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="IBToOneOutletInfo"> + <string key="name">fAdvancedView</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">fAudioView</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">fGeneralView</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">fPictureView</string> + <string key="candidateClassName">NSView</string> + </object> + <object class="IBToOneOutletInfo"> + <string key="name">fSendEncodeToAppField</string> + <string key="candidateClassName">NSTextField</string> + </object> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBProjectSource</string> <string key="minorKey">HBPreferencesController.h</string> @@ -2937,6 +3037,13 @@ <string key="NS.key.0">runModal:</string> <string key="NS.object.0">id</string> </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <string key="NS.key.0">runModal:</string> + <object class="IBActionInfo" key="NS.object.0"> + <string key="name">runModal:</string> + <string key="candidateClassName">id</string> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBUserSource</string> <string key="minorKey"/> @@ -2966,10 +3073,24 @@ <string key="NS.key.0">checkForUpdates:</string> <string key="NS.object.0">id</string> </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <string key="NS.key.0">checkForUpdates:</string> + <object class="IBActionInfo" key="NS.object.0"> + <string key="name">checkForUpdates:</string> + <string key="candidateClassName">id</string> + </object> + </object> <object class="NSMutableDictionary" key="outlets"> <string key="NS.key.0">delegate</string> <string key="NS.object.0">id</string> </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <string key="NS.key.0">delegate</string> + <object class="IBToOneOutletInfo" key="NS.object.0"> + <string key="name">delegate</string> + <string key="candidateClassName">id</string> + </object> + </object> <reference key="sourceIdentifier" ref="606901004"/> </object> </object> @@ -3606,6 +3727,13 @@ <string key="NS.key.0">showWindow:</string> <string key="NS.object.0">id</string> </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <string key="NS.key.0">showWindow:</string> + <object class="IBActionInfo" key="NS.object.0"> + <string key="name">showWindow:</string> + <string key="candidateClassName">id</string> + </object> + </object> <object class="IBClassDescriptionSource" key="sourceIdentifier"> <string key="majorKey">IBFrameworkSource</string> <string key="minorKey">AppKit.framework/Headers/NSWindowController.h</string> @@ -3618,15 +3746,30 @@ <string key="NS.key.0">checkForUpdates:</string> <string key="NS.object.0">id</string> </object> + <object class="NSMutableDictionary" key="actionInfosByName"> + <string key="NS.key.0">checkForUpdates:</string> + <object class="IBActionInfo" key="NS.object.0"> + <string key="name">checkForUpdates:</string> + <string key="candidateClassName">id</string> + </object> + </object> <object class="NSMutableDictionary" key="outlets"> <string key="NS.key.0">delegate</string> <string key="NS.object.0">id</string> </object> + <object class="NSMutableDictionary" key="toOneOutletInfosByName"> + <string key="NS.key.0">delegate</string> + <object class="IBToOneOutletInfo" key="NS.object.0"> + <string key="name">delegate</string> + <string key="candidateClassName">id</string> + </object> + </object> <reference key="sourceIdentifier" ref="568667533"/> </object> </object> </object> <int key="IBDocument.localizationMode">0</int> + <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencies"> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> <integer value="1050" key="NS.object.0"/> @@ -3638,5 +3781,20 @@ <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool> <string key="IBDocument.LastKnownRelativeProjectPath">../HandBrake.xcodeproj</string> <int key="IBDocument.defaultPropertyAccessControl">3</int> + <object class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes"> + <bool key="EncodedWithXMLCoder">YES</bool> + <object class="NSArray" key="dict.sortedKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>NSMenuCheckmark</string> + <string>NSMenuMixedState</string> + <string>NSSwitch</string> + </object> + <object class="NSMutableArray" key="dict.values"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>{9, 8}</string> + <string>{7, 2}</string> + <string>{15, 15}</string> + </object> + </object> </data> </archive> diff --git a/macosx/HBPreferencesController.m b/macosx/HBPreferencesController.m index 3e7018507..aa5d64788 100644 --- a/macosx/HBPreferencesController.m +++ b/macosx/HBPreferencesController.m @@ -55,6 +55,7 @@ @"NO", @"DefaultAutoNaming", @"NO", @"DisableDvdAutoDetect", @"Alert Window", @"AlertWhenDone", + @"YES", @"AlertWhenDoneSound", @"1", @"LoggingLevel", @"NO", @"EncodeLogLocation", @"10", @"PreviewsNumber", |