@@ -1,6 +1,6 @@ #import "SUMoveApplicationHelper.h" -static NSString *SUHasCheckedApplicationFolder = @"SUHasCheckedApplicationFolder"; +static NSString *SUDefaultKeyHasCheckedApplicationFolder = @"SUHasCheckedApplicationFolder"; static NSString *newPath = NULL; @interface SUMoveApplicationHelper (Private) @@ -32,7 +32,7 @@ static NSString *newPath = NULL; @implementation SUMoveApplicationHelper (Private) - (BOOL) shouldCheckApplicationFolder { - return ![[NSUserDefaults standardUserDefaults] boolForKey:SUHasCheckedApplicationFolder]; + return ![[NSUserDefaults standardUserDefaults] boolForKey:SUDefaultKeyHasCheckedApplicationFolder]; } - (BOOL) applicationIsInApplicationsFolder { @@ -79,7 +79,7 @@ static NSString *newPath = NULL; } - (void) setHasCheckedFolder { - [[NSUserDefaults standardUserDefaults] setBool:YES forKey:SUHasCheckedApplicationFolder]; + [[NSUserDefaults standardUserDefaults] setBool:YES forKey:SUDefaultKeyHasCheckedApplicationFolder]; } - (void) relaunch { Classes/Controller/Helpers/SUMoveApplicationHelper.m @@ -1,6 +1,7 @@ #import "SUScribdAPI.h" static SUScribdAPI *sharedAPI = NULL; +static NSString *SUDefaultKeyMaximumSimultaneousUploads = @"SUMaximumSimultaneousUploads"; @interface SUScribdAPI (Private) @@ -42,7 +43,7 @@ static SUScribdAPI *sharedAPI = NULL; + (void) initialize { NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - NSDictionary *appDefaults = [[NSDictionary alloc] initWithObject:[NSNumber numberWithInteger:4] forKey:@"SUMaximumSimultaneousUploads"]; + NSDictionary *appDefaults = [[NSDictionary alloc] initWithObject:[NSNumber numberWithInteger:4] forKey:@"SUDefaultKeyMaximumSimultaneousUploads"]; [defaults registerDefaults:appDefaults]; [appDefaults release]; } @@ -54,7 +55,7 @@ static SUScribdAPI *sharedAPI = NULL; - (id) init { if (self = [super init]) { uploadQueue = [[NSOperationQueue alloc] init]; - [uploadQueue setMaxConcurrentOperationCount:[[NSUserDefaults standardUserDefaults] integerForKey:@"SUMaximumSimultaneousUploads"]]; + [uploadQueue setMaxConcurrentOperationCount:[[NSUserDefaults standardUserDefaults] integerForKey:SUDefaultKeyMaximumSimultaneousUploads]]; } return self; } Classes/Model/SUScribdAPI.m @@ -19,10 +19,10 @@ NSString *SUUploadAction = @"Upload"; NSString *SUChangeSettingsAction = @"ChangeSettings"; /* User defaults keys */ -NSString *SUDefaultKeySessionUsername = @"sessionUsername"; -NSString *SUDefaultKeyLastCategoryLoad = @"lastCategoryLoad"; -NSString *SUDefaultKeyUploadPrivateDefault = @"privateUploadsByDefault"; -NSString *SUDefaultKeyManualMetadataDrawer = @"manualMetadataDrawer"; +NSString *SUDefaultKeySessionUsername = @"SUSessionUsername"; +NSString *SUDefaultKeyLastCategoryLoad = @"SULastCategoryLoad"; +NSString *SUDefaultKeyUploadPrivateDefault = @"SUUploadPrivateDefault"; +NSString *SUDefaultKeyManualMetadataDrawer = @"SUManualMetadataDrawer"; /* Notifications */ NSString *SUUploadCompleteNotification = @"SUUploadCompleteNotification"; Other Sources/SUConstants.m @@ -8,6 +8,7 @@ <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> + <integer value="2"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -427,7 +428,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes> <string key="NSWindowContentMaxSize">{3.40282e+38, 3.40282e+38}</string> <string key="NSWindowContentMinSize">{491, 450}</string> <object class="NSView" key="NSWindowView" id="823886803"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">256</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -805,6 +806,7 @@ ELIAAAAAAAgACAAIAAgAAQABAAEAAQ</bytes> </object> </object> <string key="NSFrameSize">{491, 496}</string> + <reference key="NSSuperview"/> </object> <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string> <string key="NSMinSize">{491, 528}</string> @@ -2225,6 +2227,10 @@ ciBoZWxwIHZpZXdlci4</string> <string key="NSClassName">SUDatabaseHelper</string> </object> <object class="NSUserDefaultsController" id="706999351"> + <object class="NSMutableArray" key="NSDeclaredKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>SUSessionUsername</string> + </object> <bool key="NSSharedInstance">YES</bool> </object> <object class="NSCustomObject" id="27757150"> @@ -4036,26 +4042,6 @@ ciBoZWxwIHZpZXdlci4</string> <int key="connectionID">1068</int> </object> <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.sessionUsername</string> - <reference key="source" ref="231784562"/> - <reference key="destination" ref="706999351"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="231784562"/> - <reference key="NSDestination" ref="706999351"/> - <string key="NSLabel">value: values.sessionUsername</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">values.sessionUsername</string> - <object class="NSDictionary" key="NSOptions"> - <string key="NS.key.0">NSValueTransformerName</string> - <string key="NS.object.0">SULoginLabel</string> - </object> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">1085</int> - </object> - <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">uploader</string> <reference key="source" ref="612578685"/> @@ -5598,26 +5584,6 @@ ciBoZWxwIHZpZXdlci4</string> </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">title: values.sessionUsername</string> - <reference key="source" ref="985169099"/> - <reference key="destination" ref="706999351"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="985169099"/> - <reference key="NSDestination" ref="706999351"/> - <string key="NSLabel">title: values.sessionUsername</string> - <string key="NSBinding">title</string> - <string key="NSKeyPath">values.sessionUsername</string> - <object class="NSDictionary" key="NSOptions"> - <string key="NS.key.0">NSValueTransformerName</string> - <string key="NS.object.0">SULogInButtonTitle</string> - </object> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">1809</int> - </object> - <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> <string key="label">value: selectedObjects.hidden</string> <reference key="source" ref="372162428"/> <reference key="destination" ref="603642860"/> @@ -6042,6 +6008,46 @@ ciBoZWxwIHZpZXdlci4</string> </object> <int key="connectionID">1982</int> </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: values.SUSessionUsername</string> + <reference key="source" ref="231784562"/> + <reference key="destination" ref="706999351"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="231784562"/> + <reference key="NSDestination" ref="706999351"/> + <string key="NSLabel">value: values.SUSessionUsername</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">values.SUSessionUsername</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSValueTransformerName</string> + <string key="NS.object.0">SULoginLabel</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">1983</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">title: values.SUSessionUsername</string> + <reference key="source" ref="985169099"/> + <reference key="destination" ref="706999351"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="985169099"/> + <reference key="NSDestination" ref="706999351"/> + <string key="NSLabel">title: values.SUSessionUsername</string> + <string key="NSBinding">title</string> + <string key="NSKeyPath">values.SUSessionUsername</string> + <object class="NSDictionary" key="NSOptions"> + <string key="NS.key.0">NSValueTransformerName</string> + <string key="NS.object.0">SULogInButtonTitle</string> + </object> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">1984</int> + </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> <object class="NSArray" key="orderedObjects"> @@ -9009,7 +9015,7 @@ dG8gc2VlIHRoaXMgZG9jdW1lbnQuA</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> - <string>{{414, 763}, {617, 0}}</string> + <string>{{359, 763}, {617, 0}}</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> <string>com.apple.InterfaceBuilder.CocoaPlugin</string> @@ -9130,7 +9136,7 @@ dG8gc2VlIHRoaXMgZG9jdW1lbnQuA</string> </object> </object> <nil key="sourceID"/> - <int key="maxID">1982</int> + <int key="maxID">1984</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> Resources/English.lproj/MainMenu.xib @@ -2,13 +2,12 @@ <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="7.03"> <data> <int key="IBDocument.SystemTarget">1050</int> - <string key="IBDocument.SystemVersion">9G55</string> + <string key="IBDocument.SystemVersion">9J61</string> <string key="IBDocument.InterfaceBuilderVersion">677</string> - <string key="IBDocument.AppKitVersion">949.43</string> + <string key="IBDocument.AppKitVersion">949.46</string> <string key="IBDocument.HIToolboxVersion">353.00</string> <object class="NSMutableArray" key="IBDocument.EditedObjectIDs"> <bool key="EncodedWithXMLCoder">YES</bool> - <integer value="57"/> </object> <object class="NSArray" key="IBDocument.PluginDependencies"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -36,7 +35,7 @@ <string key="NSClassName">NSApplication</string> </object> <object class="NSCustomView" id="370770609"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">268</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -45,6 +44,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{18, 169}, {225, 18}}</string> <reference key="NSSuperview" ref="370770609"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="488766910"> <int key="NSCellFlags">-2080244224</int> @@ -86,6 +86,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{15, 70}, {124, 17}}</string> <reference key="NSSuperview" ref="264518523"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="316448714"> <int key="NSCellFlags">68288064</int> @@ -118,6 +119,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{141, 64}, {100, 26}}</string> <reference key="NSSuperview" ref="264518523"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSPopUpButtonCell" key="NSCell" id="239329108"> <int key="NSCellFlags">-2076049856</int> @@ -193,6 +195,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{16, 32}, {272, 18}}</string> <reference key="NSSuperview" ref="264518523"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="891877962"> <int key="NSCellFlags">-2080244224</int> @@ -215,6 +218,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{16, 12}, {228, 18}}</string> <reference key="NSSuperview" ref="264518523"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="127030959"> <int key="NSCellFlags">-2080244224</int> @@ -235,10 +239,12 @@ </object> <string key="NSFrame">{{1, 1}, {304, 100}}</string> <reference key="NSSuperview" ref="590990902"/> + <reference key="NSWindow"/> </object> </object> <string key="NSFrame">{{17, 56}, {306, 102}}</string> <reference key="NSSuperview" ref="370770609"/> + <reference key="NSWindow"/> <string key="NSOffsets">{0, 0}</string> <object class="NSTextFieldCell" key="NSTitleCell"> <int key="NSCellFlags">67239424</int> @@ -274,6 +280,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{14, 12}, {109, 32}}</string> <reference key="NSSuperview" ref="370770609"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="979281650"> <int key="NSCellFlags">67239424</int> @@ -294,6 +301,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{122, 22}, {75, 17}}</string> <reference key="NSSuperview" ref="370770609"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="641882303"> <int key="NSCellFlags">68288064</int> @@ -310,6 +318,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{199, 22}, {190, 17}}</string> <reference key="NSSuperview" ref="370770609"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="214274329"> <int key="NSCellFlags">68288064</int> @@ -347,6 +356,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{364, 164}, {25, 25}}</string> <reference key="NSSuperview" ref="370770609"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="240091443"> <int key="NSCellFlags">67239424</int> @@ -364,13 +374,20 @@ </object> </object> <string key="NSFrameSize">{406, 208}</string> + <reference key="NSSuperview"/> + <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> <object class="NSUserDefaultsController" id="342030020"> + <object class="NSMutableArray" key="NSDeclaredKeys"> + <bool key="EncodedWithXMLCoder">YES</bool> + <string>SUManualMetadataDrawer</string> + <string>SUPrivateUploadsByDefault</string> + </object> <bool key="NSSharedInstance">YES</bool> </object> <object class="NSCustomView" id="781727162"> - <nil key="NSNextResponder"/> + <reference key="NSNextResponder"/> <int key="NSvFlags">268</int> <object class="NSMutableArray" key="NSSubviews"> <bool key="EncodedWithXMLCoder">YES</bool> @@ -379,6 +396,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{18, 96}, {199, 18}}</string> <reference key="NSSuperview" ref="781727162"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="599123206"> <int key="NSCellFlags">-2080244224</int> @@ -401,6 +419,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{37, 20}, {218, 70}}</string> <reference key="NSSuperview" ref="781727162"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="717456478"> <int key="NSCellFlags">67239424</int> @@ -421,6 +440,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{264, 91}, {25, 25}}</string> <reference key="NSSuperview" ref="781727162"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="491752793"> <int key="NSCellFlags">67239424</int> @@ -438,6 +458,8 @@ </object> </object> <string key="NSFrameSize">{306, 135}</string> + <reference key="NSSuperview"/> + <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> <object class="NSCustomView" id="738941364"> @@ -450,6 +472,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{18, 68}, {329, 18}}</string> <reference key="NSSuperview" ref="738941364"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="886870888"> <int key="NSCellFlags">-2080244224</int> @@ -472,6 +495,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{37, 20}, {312, 42}}</string> <reference key="NSSuperview" ref="738941364"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSTextFieldCell" key="NSCell" id="711037523"> <int key="NSCellFlags">67239424</int> @@ -488,6 +512,7 @@ <int key="NSvFlags">268</int> <string key="NSFrame">{{354, 63}, {25, 25}}</string> <reference key="NSSuperview" ref="738941364"/> + <reference key="NSWindow"/> <bool key="NSEnabled">YES</bool> <object class="NSButtonCell" key="NSCell" id="991009048"> <int key="NSCellFlags">67239424</int> @@ -506,6 +531,7 @@ </object> <string key="NSFrameSize">{396, 107}</string> <reference key="NSSuperview"/> + <reference key="NSWindow"/> <string key="NSClassName">NSView</string> </object> </object> @@ -689,22 +715,6 @@ <int key="connectionID">46</int> </object> <object class="IBConnectionRecord"> - <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.privateUploadsByDefault</string> - <reference key="source" ref="539124372"/> - <reference key="destination" ref="342030020"/> - <object class="NSNibBindingConnector" key="connector"> - <reference key="NSSource" ref="539124372"/> - <reference key="NSDestination" ref="342030020"/> - <string key="NSLabel">value: values.privateUploadsByDefault</string> - <string key="NSBinding">value</string> - <string key="NSKeyPath">values.privateUploadsByDefault</string> - <int key="NSNibBindingConnectorVersion">2</int> - </object> - </object> - <int key="connectionID">52</int> - </object> - <object class="IBConnectionRecord"> <object class="IBOutletConnection" key="connection"> <string key="label">uploadingView</string> <reference key="source" ref="1001"/> @@ -738,15 +748,15 @@ </object> <object class="IBConnectionRecord"> <object class="IBBindingConnection" key="connection"> - <string key="label">value: values.manualMetadataDrawer</string> + <string key="label">value: values.SUManualMetadataDrawer</string> <reference key="source" ref="568791029"/> <reference key="destination" ref="342030020"/> <object class="NSNibBindingConnector" key="connector"> <reference key="NSSource" ref="568791029"/> <reference key="NSDestination" ref="342030020"/> - <string key="NSLabel">value: values.manualMetadataDrawer</string> + <string key="NSLabel">value: values.SUManualMetadataDrawer</string> <string key="NSBinding">value</string> - <string key="NSKeyPath">values.manualMetadataDrawer</string> + <string key="NSKeyPath">values.SUManualMetadataDrawer</string> <object class="NSDictionary" key="NSOptions"> <string key="NS.key.0">NSValueTransformerName</string> <string key="NS.object.0">NSNegateBoolean</string> @@ -754,7 +764,23 @@ <int key="NSNibBindingConnectorVersion">2</int> </object> </object> - <int key="connectionID">68</int> + <int key="connectionID">69</int> + </object> + <object class="IBConnectionRecord"> + <object class="IBBindingConnection" key="connection"> + <string key="label">value: values.SUPrivateUploadsByDefault</string> + <reference key="source" ref="539124372"/> + <reference key="destination" ref="342030020"/> + <object class="NSNibBindingConnector" key="connector"> + <reference key="NSSource" ref="539124372"/> + <reference key="NSDestination" ref="342030020"/> + <string key="NSLabel">value: values.SUPrivateUploadsByDefault</string> + <string key="NSBinding">value</string> + <string key="NSKeyPath">values.SUPrivateUploadsByDefault</string> + <int key="NSNibBindingConnectorVersion">2</int> + </object> + </object> + <int key="connectionID">70</int> </object> </object> <object class="IBMutableOrderedSet" key="objectRecords"> @@ -1259,7 +1285,7 @@ </object> </object> <nil key="sourceID"/> - <int key="maxID">68</int> + <int key="maxID">70</int> </object> <object class="IBClassDescriber" key="IBDocument.Classes"> <object class="NSMutableArray" key="referencedPartialClassDescriptions"> Resources/English.lproj/Preferences.xib f8f9e311f52a8d1bca1bfb4019c160839044501d Tim Morgan riscfuture@gmail.com http://github.com/RISCfuture/scribd-uploader/commit/cbfe1e57f6c82491c2c5a269b88950f12a0ceca6 cbfe1e57f6c82491c2c5a269b88950f12a0ceca6 2009-05-31T14:42:24-07:00 2009-05-31T14:42:24-07:00 Renamed some defaults a8e04ce51aa34ecd247a53cc12d2217492097559 Tim Morgan riscfuture@gmail.com