Changeset 13319
- Timestamp:
- May 28, 2012, 2:28:50 PM (9 years ago)
- Location:
- trunk/macosx
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/macosx/Controller.m
r13318 r13319 1066 1066 { 1067 1067 NSDictionary * dict = [notification userInfo]; 1068 [self openFiles: [NSArray arrayWithObject: [dict objectForKey: @"File"]] addType: ADD_CREATED 1069 forcePath: [dict objectForKey: @"Path"]]; 1068 [self openFiles: [NSArray arrayWithObject: [dict objectForKey: @"File"]] addType: ADD_CREATED forcePath: [dict objectForKey: @"Path"]]; 1070 1069 [dict release]; 1071 1070 } … … 2832 2831 return; 2833 2832 2834 NSString * location = [ notification object],2833 NSString * location = [(NSURL *)[notification object] path], 2835 2834 * path = [fDefaults stringForKey: @"AutoImportDirectory"]; 2836 2835 … … 3166 3165 { 3167 3166 if (!torrent && [files count] == 1) 3168 [CreatorWindowController createTorrentFile: fLib forFile: [ files objectAtIndex: 0]];3167 [CreatorWindowController createTorrentFile: fLib forFile: [NSURL fileURLWithPath: [files objectAtIndex: 0]]]; 3169 3168 else 3170 3169 accept = NO; -
trunk/macosx/CreatorWindowController.h
r13162 r13319 40 40 41 41 tr_metainfo_builder * fInfo; 42 NS String* fPath, * fLocation;42 NSURL * fPath, * fLocation; 43 43 NSMutableArray * fTrackers; 44 44 … … 49 49 } 50 50 51 + ( void) createTorrentFile: (tr_session *) handle;52 + ( void) createTorrentFile: (tr_session *) handle forFile: (NSString*) file;51 + (CreatorWindowController *) createTorrentFile: (tr_session *) handle; 52 + (CreatorWindowController *) createTorrentFile: (tr_session *) handle forFile: (NSURL *) file; 53 53 54 - (id) initWithHandle: (tr_session *) handle path: (NS String*) path;54 - (id) initWithHandle: (tr_session *) handle path: (NSURL *) path; 55 55 56 - ( void) setLocation: (id) sender;57 - ( void) create: (id) sender;58 - ( void) cancelCreateWindow: (id) sender;59 - ( void) cancelCreateProgress: (id) sender;56 - (IBAction) setLocation: (id) sender; 57 - (IBAction) create: (id) sender; 58 - (IBAction) cancelCreateWindow: (id) sender; 59 - (IBAction) cancelCreateProgress: (id) sender; 60 60 61 - ( void) addRemoveTracker: (id) sender;61 - (IBAction) addRemoveTracker: (id) sender; 62 62 63 63 - (void) copy: (id) sender; -
trunk/macosx/CreatorWindowController.m
r13251 r13319 24 24 25 25 #import "CreatorWindowController.h" 26 #import "Controller.h" 26 27 #import "NSStringAdditions.h" 27 28 … … 34 35 @interface CreatorWindowController (Private) 35 36 36 + (NS String*) chooseFile;37 + (NSURL *) chooseFile; 37 38 38 39 - (void) createBlankAddressAlertDidEnd: (NSAlert *) alert returnCode: (NSInteger) returnCode contextInfo: (void *) contextInfo; … … 45 46 @implementation CreatorWindowController 46 47 47 + ( void) createTorrentFile: (tr_session *) handle48 + (CreatorWindowController *) createTorrentFile: (tr_session *) handle 48 49 { 49 50 //get file/folder for torrent 50 NS String* path;51 NSURL * path; 51 52 if (!(path = [CreatorWindowController chooseFile])) 52 return ;53 return nil; 53 54 54 55 CreatorWindowController * creator = [[self alloc] initWithHandle: handle path: path]; 55 56 [creator showWindow: nil]; 56 } 57 58 + (void) createTorrentFile: (tr_session *) handle forFile: (NSString *) file 57 return creator; 58 } 59 60 + (CreatorWindowController *) createTorrentFile: (tr_session *) handle forFile: (NSURL *) file 59 61 { 60 62 CreatorWindowController * creator = [[self alloc] initWithHandle: handle path: file]; 61 63 [creator showWindow: nil]; 62 } 63 64 - (id) initWithHandle: (tr_session *) handle path: (NSString *) path 64 return creator; 65 } 66 67 - (id) initWithHandle: (tr_session *) handle path: (NSURL *) path 65 68 { 66 69 if ((self = [super initWithWindowNibName: @"Creator"])) … … 69 72 70 73 fPath = [path retain]; 71 fInfo = tr_metaInfoBuilderCreate([ fPathUTF8String]);74 fInfo = tr_metaInfoBuilderCreate([[fPath path] UTF8String]); 72 75 73 76 if (fInfo->fileCount == 0) … … 109 112 if (!(fTrackers = [[fDefaults arrayForKey: @"CreatorTrackers"] mutableCopy])) 110 113 { 111 fTrackers = [[NSMutableArray alloc] init WithCapacity: 1];114 fTrackers = [[NSMutableArray alloc] init]; 112 115 113 116 //check for single tracker from versions before 1.3 … … 136 139 - (void) awakeFromNib 137 140 { 141 [[self window] setRestorationClass: [self class]]; 142 138 143 NSString * name = [fPath lastPathComponent]; 139 144 … … 141 146 142 147 [fNameField setStringValue: name]; 143 [fNameField setToolTip: fPath];148 [fNameField setToolTip: [fPath path]]; 144 149 145 150 const BOOL multifile = !fInfo->isSingleFile; … … 171 176 fInfo->pieceCount, [NSString stringForFileSize: fInfo->pieceSize]]]; 172 177 173 fLocation = [[[[fDefaults stringForKey: @"CreatorLocation"] stringByExpandingTildeInPath] stringByAppendingPathComponent: 174 [name stringByAppendingPathExtension: @"torrent"]] retain]; 175 [fLocationField setStringValue: [fLocation stringByAbbreviatingWithTildeInPath]]; 176 [fLocationField setToolTip: fLocation]; 178 fLocation = [[[fDefaults URLForKey: @"CreatorLocationURL"] URLByAppendingPathComponent: [name stringByAppendingPathExtension: @"torrent"]] retain]; 179 if (!fLocation) 180 { 181 //for 2.5 and earlier 182 #warning we still store "CreatorLocation" in Defaults.plist, and not "CreatorLocationURL" 183 NSString * location = [fDefaults stringForKey: @"CreatorLocation"]; 184 fLocation = [[NSURL alloc] initFileURLWithPath: [[location stringByExpandingTildeInPath] stringByAppendingPathComponent: [name stringByAppendingPathExtension: @"torrent"]]]; 185 } 186 NSString * pathString = [fLocation path]; 187 [fLocationField setStringValue: [pathString stringByAbbreviatingWithTildeInPath]]; 188 [fLocationField setToolTip: pathString]; 177 189 178 190 //set previously saved values … … 198 210 } 199 211 200 - (void) setLocation: (id) sender 212 + (void) restoreWindowWithIdentifier: (NSString *) identifier state: (NSCoder *) state completionHandler: (void (^)(NSWindow *, NSError *)) completionHandler 213 { 214 NSURL * path = [state decodeObjectForKey: @"TRCreatorPath"]; 215 if (!path || ![path checkResourceIsReachableAndReturnError: nil]) 216 { 217 completionHandler(nil, [NSError errorWithDomain: NSURLErrorDomain code: NSURLErrorCannotOpenFile userInfo: nil]); 218 return; 219 } 220 221 NSWindow * window = [[self createTorrentFile: [(Controller *)[NSApp delegate] sessionHandle] forFile: path] window]; 222 completionHandler(window, nil); 223 } 224 225 - (void) window: (NSWindow *) window willEncodeRestorableState: (NSCoder *) state 226 { 227 [state encodeObject: fPath forKey: @"TRCreatorPath"]; 228 [state encodeObject: fLocation forKey: @"TRCreatorLocation"]; 229 [state encodeObject: fTrackers forKey: @"TRCreatorTrackers"]; 230 [state encodeInteger: [fOpenCheck state] forKey: @"TRCreatorOpenCheck"]; 231 [state encodeInteger: [fPrivateCheck state] forKey: @"TRCreatorPrivateCheck"]; 232 [state encodeObject: [fCommentView string] forKey: @"TRCreatorPrivateComment"]; 233 } 234 235 - (void) window: (NSWindow *) window didDecodeRestorableState: (NSCoder *) coder 236 { 237 #warning done in 3 places - make a separate method 238 [fLocation release]; 239 fLocation = [[coder decodeObjectForKey: @"TRCreatorLocation"] retain]; 240 NSString * pathString = [fLocation path]; 241 [fLocationField setStringValue: [pathString stringByAbbreviatingWithTildeInPath]]; 242 [fLocationField setToolTip: pathString]; 243 244 [fTrackers release]; 245 fTrackers = [[coder decodeObjectForKey: @"TRCreatorTrackers"] retain]; 246 [fTrackerTable reloadData]; 247 248 [fOpenCheck setState: [coder decodeIntegerForKey: @"TRCreatorOpenCheck"]]; 249 [fPrivateCheck setState: [coder decodeIntegerForKey: @"TRCreatorPrivateCheck"]]; 250 [fCommentView setString: [coder decodeObjectForKey: @"TRCreatorPrivateComment"]]; 251 } 252 253 - (IBAction) setLocation: (id) sender 201 254 { 202 255 NSSavePanel * panel = [NSSavePanel savePanel]; … … 209 262 [panel setCanSelectHiddenExtension: YES]; 210 263 211 [panel setDirectoryURL: [ NSURL fileURLWithPath: [fLocation stringByDeletingLastPathComponent]]];264 [panel setDirectoryURL: [fLocation URLByDeletingLastPathComponent]]; 212 265 [panel setNameFieldStringValue: [fLocation lastPathComponent]]; 213 266 … … 216 269 { 217 270 [fLocation release]; 218 fLocation = [[[panel URL] path] retain]; 219 220 [fLocationField setStringValue: [fLocation stringByAbbreviatingWithTildeInPath]]; 221 [fLocationField setToolTip: fLocation]; 271 fLocation = [[panel URL] retain]; 272 273 NSString * pathString = [fLocation path]; 274 [fLocationField setStringValue: [pathString stringByAbbreviatingWithTildeInPath]]; 275 [fLocationField setToolTip: pathString]; 222 276 } 223 277 }]; 224 278 } 225 279 226 - ( void) create: (id) sender280 - (IBAction) create: (id) sender 227 281 { 228 282 //make sure the trackers are no longer being verified … … 257 311 } 258 312 259 - ( void) cancelCreateWindow: (id) sender313 - (IBAction) cancelCreateWindow: (id) sender 260 314 { 261 315 [[self window] close]; … … 267 321 } 268 322 269 - ( void) cancelCreateProgress: (id) sender323 - (IBAction) cancelCreateProgress: (id) sender 270 324 { 271 325 fInfo->abortFlag = 1; … … 283 337 } 284 338 285 - ( void) addRemoveTracker: (id) sender339 - (IBAction) addRemoveTracker: (id) sender 286 340 { 287 341 //don't allow add/remove when currently adding - it leads to weird results … … 400 454 @implementation CreatorWindowController (Private) 401 455 402 + (NS String*) chooseFile456 + (NSURL *) chooseFile 403 457 { 404 458 NSOpenPanel * panel = [NSOpenPanel openPanel]; … … 414 468 415 469 BOOL success = [panel runModal] == NSOKButton; 416 return success ? [[ [panel URLs] objectAtIndex: 0] path] : nil;470 return success ? [[panel URLs] objectAtIndex: 0] : nil; 417 471 } 418 472 … … 435 489 { 436 490 //check if the location currently exists 437 if (![[ NSFileManager defaultManager] fileExistsAtPath: [fLocation stringByDeletingLastPathComponent]])491 if (![[fLocation URLByDeletingLastPathComponent] checkResourceIsReachableAndReturnError: NULL]) 438 492 { 439 493 NSAlert * alert = [[[NSAlert alloc] init] autorelease]; … … 445 499 "Create this directory or choose a different one to create the torrent file.", 446 500 "Create torrent -> directory doesn't exist warning -> warning"), 447 [ fLocation stringByDeletingLastPathComponent]]];501 [[fLocation URLByDeletingLastPathComponent] path]]]; 448 502 [alert setAlertStyle: NSWarningAlertStyle]; 449 503 … … 453 507 454 508 //check if a file with the same name and location already exists 455 if ([ [NSFileManager defaultManager] fileExistsAtPath: fLocation])509 if ([fLocation checkResourceIsReachableAndReturnError: NULL]) 456 510 { 457 511 NSArray * pathComponents = [fLocation pathComponents]; … … 486 540 [fDefaults setBool: [fPrivateCheck state] == NSOnState forKey: @"CreatorPrivate"]; 487 541 [fDefaults setBool: [fOpenCheck state] == NSOnState forKey: @"CreatorOpen"]; 488 [fDefaults set Object: [fLocation stringByDeletingLastPathComponent] forKey: @"CreatorLocation"];542 [fDefaults setURL: [fLocation URLByDeletingLastPathComponent] forKey: @"CreatorLocationURL"]; 489 543 490 544 [[NSNotificationCenter defaultCenter] postNotificationName: @"BeginCreateTorrentFile" object: fLocation userInfo: nil]; 491 tr_makeMetaInfo(fInfo, [ fLocationUTF8String], trackerInfo, [fTrackers count], [[fCommentView string] UTF8String],545 tr_makeMetaInfo(fInfo, [[fLocation path] UTF8String], trackerInfo, [fTrackers count], [[fCommentView string] UTF8String], 492 546 [fPrivateCheck state] == NSOnState); 493 547 tr_free(trackerInfo); … … 508 562 { 509 563 case TR_MAKEMETA_OK: 564 #warning this isn't safe - what if another window changes it after hitting the create button on this window? 510 565 if ([fDefaults boolForKey: @"CreatorOpen"]) 511 566 { 512 NSDictionary * dict = [[NSDictionary alloc] initWithObjectsAndKeys: fLocation, @"File",513 [ fPath stringByDeletingLastPathComponent], @"Path", nil];567 NSDictionary * dict = [[NSDictionary alloc] initWithObjectsAndKeys: [fLocation path], @"File", 568 [[fPath URLByDeletingLastPathComponent] path], @"Path", nil]; 514 569 [[NSNotificationCenter defaultCenter] postNotificationName: @"OpenCreatedTorrentFile" object: self userInfo: dict]; 515 570 } -
trunk/macosx/en.lproj/Creator.xib
r12940 r13319 3 3 <data> 4 4 <int key="IBDocument.SystemTarget">1060</int> 5 <string key="IBDocument.SystemVersion">11 B26</string>6 <string key="IBDocument.InterfaceBuilderVersion"> 1617</string>7 <string key="IBDocument.AppKitVersion">1138 </string>8 <string key="IBDocument.HIToolboxVersion">56 6.00</string>5 <string key="IBDocument.SystemVersion">11E53</string> 6 <string key="IBDocument.InterfaceBuilderVersion">2182</string> 7 <string key="IBDocument.AppKitVersion">1138.47</string> 8 <string key="IBDocument.HIToolboxVersion">569.00</string> 9 9 <object class="NSMutableDictionary" key="IBDocument.PluginVersions"> 10 10 <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> 11 <string key="NS.object.0"> 1617</string>11 <string key="NS.object.0">2182</string> 12 12 </object> 13 13 <array key="IBDocument.IntegratedClassDependencies"> … … 35 35 <string>com.apple.InterfaceBuilder.CocoaPlugin</string> 36 36 </array> 37 <dictionary class="NSMutableDictionary" key="IBDocument.Metadata"/> 37 <object class="NSMutableDictionary" key="IBDocument.Metadata"> 38 <string key="NS.key.0">PluginDependencyRecalculationVersion</string> 39 <integer value="1" key="NS.object.0"/> 40 </object> 38 41 <array class="NSMutableArray" key="IBDocument.RootObjects" id="373145165"> 39 42 <object class="NSCustomObject" id="578092914"> … … 75 78 <string key="NSFrame">{{20, 334}, {64, 64}}</string> 76 79 <reference key="NSSuperview" ref="755547124"/> 80 <reference key="NSWindow"/> 77 81 <reference key="NSNextKeyView" ref="164784781"/> 78 82 <bool key="NSEnabled">YES</bool> … … 96 100 <string key="NSFrame">{{89, 367}, {602, 22}}</string> 97 101 <reference key="NSSuperview" ref="755547124"/> 102 <reference key="NSWindow"/> 98 103 <reference key="NSNextKeyView" ref="1020546775"/> 99 104 <bool key="NSEnabled">YES</bool> … … 133 138 <string key="NSFrame">{{89, 342}, {602, 17}}</string> 134 139 <reference key="NSSuperview" ref="755547124"/> 140 <reference key="NSWindow"/> 135 141 <reference key="NSNextKeyView" ref="421942629"/> 136 142 <bool key="NSEnabled">YES</bool> … … 160 166 <reference key="NSNextResponder" ref="468443008"/> 161 167 <int key="NSvFlags">2322</int> 168 <set class="NSMutableSet" key="NSDragTypes"> 169 <string>Apple HTML pasteboard type</string> 170 <string>Apple PDF pasteboard type</string> 171 <string>Apple PICT pasteboard type</string> 172 <string>Apple PNG pasteboard type</string> 173 <string>Apple URL pasteboard type</string> 174 <string>CorePasteboardFlavorType 0x6D6F6F76</string> 175 <string>NSColor pasteboard type</string> 176 <string>NSFilenamesPboardType</string> 177 <string>NSStringPboardType</string> 178 <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string> 179 <string>NeXT RTFD pasteboard type</string> 180 <string>NeXT Rich Text Format v1.0 pasteboard type</string> 181 <string>NeXT TIFF v4.0 pasteboard type</string> 182 <string>NeXT font pasteboard type</string> 183 <string>NeXT ruler pasteboard type</string> 184 <string>WebURLsWithTitlesPboardType</string> 185 <string>public.url</string> 186 </set> 162 187 <string key="NSFrameSize">{583, 14}</string> 163 188 <reference key="NSSuperview" ref="468443008"/> 164 <reference key="NSNextKeyView" ref="704686863"/> 189 <reference key="NSWindow"/> 190 <reference key="NSNextKeyView" ref="947788581"/> 165 191 <object class="NSTextContainer" key="NSTextContainer" id="742813744"> 166 192 <object class="NSLayoutManager" key="NSLayoutManager"> … … 223 249 <string key="NSFrame">{{1, 1}, {583, 73}}</string> 224 250 <reference key="NSSuperview" ref="1007617591"/> 251 <reference key="NSWindow"/> 225 252 <reference key="NSNextKeyView" ref="428363936"/> 226 253 <reference key="NSDocView" ref="428363936"/> … … 257 284 <string key="NSFrame">{{569, 1}, {15, 73}}</string> 258 285 <reference key="NSSuperview" ref="1007617591"/> 286 <reference key="NSWindow"/> 259 287 <reference key="NSNextKeyView" ref="22400418"/> 260 288 <reference key="NSTarget" ref="1007617591"/> … … 267 295 <string key="NSFrame">{{-100, -100}, {87, 18}}</string> 268 296 <reference key="NSSuperview" ref="1007617591"/> 297 <reference key="NSWindow"/> 269 298 <reference key="NSNextKeyView" ref="468443008"/> 270 299 <int key="NSsFlags">1</int> … … 277 306 <string key="NSFrame">{{103, 121}, {585, 75}}</string> 278 307 <reference key="NSSuperview" ref="755547124"/> 279 <reference key="NSNextKeyView" ref="468443008"/> 308 <reference key="NSWindow"/> 309 <reference key="NSNextKeyView" ref="704686863"/> 280 310 <int key="NSsFlags">133138</int> 281 311 <reference key="NSVScroller" ref="947788581"/> … … 288 318 <string key="NSFrame">{{28, 179}, {70, 17}}</string> 289 319 <reference key="NSSuperview" ref="755547124"/> 320 <reference key="NSWindow"/> 290 321 <reference key="NSNextKeyView" ref="1007617591"/> 291 322 <bool key="NSEnabled">YES</bool> … … 305 336 <string key="NSFrame">{{35, 309}, {63, 17}}</string> 306 337 <reference key="NSSuperview" ref="755547124"/> 338 <reference key="NSWindow"/> 307 339 <reference key="NSNextKeyView" ref="453590654"/> 308 340 <bool key="NSEnabled">YES</bool> … … 322 354 <string key="NSFrame">{{12, 85}, {684, 5}}</string> 323 355 <reference key="NSSuperview" ref="755547124"/> 356 <reference key="NSWindow"/> 324 357 <reference key="NSNextKeyView" ref="631224046"/> 325 358 <string key="NSOffsets">{0, 0}</string> … … 350 383 <string key="NSFrame">{{615, 53}, {78, 28}}</string> 351 384 <reference key="NSSuperview" ref="755547124"/> 385 <reference key="NSWindow"/> 352 386 <reference key="NSNextKeyView" ref="631380462"/> 353 387 <bool key="NSEnabled">YES</bool> … … 382 416 <string key="NSFrame">{{17, 60}, {81, 17}}</string> 383 417 <reference key="NSSuperview" ref="755547124"/> 418 <reference key="NSWindow"/> 384 419 <reference key="NSNextKeyView" ref="795084797"/> 385 420 <bool key="NSEnabled">YES</bool> … … 399 434 <string key="NSFrame">{{123, 45}, {492, 30}}</string> 400 435 <reference key="NSSuperview" ref="755547124"/> 436 <reference key="NSWindow"/> 401 437 <reference key="NSNextKeyView" ref="833650385"/> 402 438 <bool key="NSEnabled">YES</bool> … … 424 460 <string key="NSFrame">{{103, 60}, {16, 16}}</string> 425 461 <reference key="NSSuperview" ref="755547124"/> 462 <reference key="NSWindow"/> 426 463 <reference key="NSNextKeyView" ref="371133969"/> 427 464 <bool key="NSEnabled">YES</bool> … … 445 482 <string key="NSFrame">{{101, 97}, {65, 18}}</string> 446 483 <reference key="NSSuperview" ref="755547124"/> 484 <reference key="NSWindow"/> 447 485 <reference key="NSNextKeyView" ref="644564296"/> 448 486 <bool key="NSEnabled">YES</bool> … … 473 511 <string key="NSFrame">{{613, 12}, {81, 32}}</string> 474 512 <reference key="NSSuperview" ref="755547124"/> 513 <reference key="NSWindow"/> 514 <reference key="NSNextKeyView"/> 475 515 <bool key="NSEnabled">YES</bool> 476 516 <object class="NSButtonCell" key="NSCell" id="671503663"> … … 494 534 <string key="NSFrame">{{531, 12}, {82, 32}}</string> 495 535 <reference key="NSSuperview" ref="755547124"/> 536 <reference key="NSWindow"/> 496 537 <reference key="NSNextKeyView" ref="697506694"/> 497 538 <bool key="NSEnabled">YES</bool> … … 516 557 <string key="NSFrame">{{169, 98}, {522, 17}}</string> 517 558 <reference key="NSSuperview" ref="755547124"/> 559 <reference key="NSWindow"/> 518 560 <reference key="NSNextKeyView" ref="490783512"/> 519 561 <bool key="NSEnabled">YES</bool> … … 533 575 <string key="NSFrame">{{101, 21}, {144, 18}}</string> 534 576 <reference key="NSSuperview" ref="755547124"/> 577 <reference key="NSWindow"/> 535 578 <reference key="NSNextKeyView" ref="142097578"/> 536 579 <bool key="NSEnabled">YES</bool> … … 563 606 <string key="NSFrameSize">{583, 94}</string> 564 607 <reference key="NSSuperview" ref="87995314"/> 565 <reference key="NSNextKeyView" ref="864982587"/> 608 <reference key="NSWindow"/> 609 <reference key="NSNextKeyView" ref="512681079"/> 566 610 <bool key="NSEnabled">YES</bool> 567 611 <object class="_NSCornerView" key="NSCornerView"> … … 637 681 <string key="NSFrame">{{1, 1}, {583, 94}}</string> 638 682 <reference key="NSSuperview" ref="453590654"/> 683 <reference key="NSWindow"/> 639 684 <reference key="NSNextKeyView" ref="910757453"/> 640 685 <reference key="NSDocView" ref="910757453"/> … … 647 692 <string key="NSFrame">{{569, 1}, {15, 94}}</string> 648 693 <reference key="NSSuperview" ref="453590654"/> 694 <reference key="NSWindow"/> 649 695 <reference key="NSNextKeyView" ref="904557624"/> 650 696 <reference key="NSTarget" ref="453590654"/> … … 657 703 <string key="NSFrame">{{-100, -100}, {344, 15}}</string> 658 704 <reference key="NSSuperview" ref="453590654"/> 705 <reference key="NSWindow"/> 659 706 <reference key="NSNextKeyView" ref="87995314"/> 660 707 <int key="NSsFlags">1</int> … … 666 713 <string key="NSFrame">{{103, 230}, {585, 96}}</string> 667 714 <reference key="NSSuperview" ref="755547124"/> 668 <reference key="NSNextKeyView" ref="87995314"/> 715 <reference key="NSWindow"/> 716 <reference key="NSNextKeyView" ref="864982587"/> 669 717 <int key="NSsFlags">133138</int> 670 718 <reference key="NSVScroller" ref="512681079"/> … … 678 726 <string key="NSFrame">{{103, 203}, {67, 23}}</string> 679 727 <reference key="NSSuperview" ref="755547124"/> 728 <reference key="NSWindow"/> 680 729 <reference key="NSNextKeyView" ref="415165203"/> 681 730 <bool key="NSEnabled">YES</bool> … … 716 765 <string key="NSFrame">{{175, 207}, {516, 14}}</string> 717 766 <reference key="NSSuperview" ref="755547124"/> 767 <reference key="NSWindow"/> 718 768 <reference key="NSNextKeyView" ref="38646839"/> 719 769 <bool key="NSEnabled">YES</bool> … … 739 789 <string key="NSFrameSize">{708, 408}</string> 740 790 <reference key="NSSuperview"/> 791 <reference key="NSWindow"/> 741 792 <reference key="NSNextKeyView" ref="452137672"/> 742 793 </object> … … 745 796 <string key="NSMaxSize">{10000000000000, 10000000000000}</string> 746 797 <string key="NSFrameAutosaveName">CreatorWindow</string> 747 <bool key="NSWindowIsRestorable"> NO</bool>798 <bool key="NSWindowIsRestorable">YES</bool> 748 799 </object> 749 800 <object class="NSCustomView" id="313634217"> 750 < referencekey="NSNextResponder"/>801 <nil key="NSNextResponder"/> 751 802 <int key="NSvFlags">256</int> 752 803 <array class="NSMutableArray" key="NSSubviews"> … … 801 852 </array> 802 853 <string key="NSFrameSize">{348, 84}</string> 803 <reference key="NSSuperview"/>804 854 <object class="NSMutableString" key="NSClassName"> 805 855 <characters key="NS.bytes">NSView</characters> … … 888 938 </object> 889 939 <object class="IBConnectionRecord"> 940 <object class="IBActionConnection" key="connection"> 941 <string key="label">cancelCreateWindow:</string> 942 <reference key="source" ref="578092914"/> 943 <reference key="destination" ref="142097578"/> 944 </object> 945 <int key="connectionID">52</int> 946 </object> 947 <object class="IBConnectionRecord"> 948 <object class="IBOutletConnection" key="connection"> 949 <string key="label">fProgressView</string> 950 <reference key="source" ref="578092914"/> 951 <reference key="destination" ref="313634217"/> 952 </object> 953 <int key="connectionID">60</int> 954 </object> 955 <object class="IBConnectionRecord"> 956 <object class="IBOutletConnection" key="connection"> 957 <string key="label">fProgressIndicator</string> 958 <reference key="source" ref="578092914"/> 959 <reference key="destination" ref="162810738"/> 960 </object> 961 <int key="connectionID">61</int> 962 </object> 963 <object class="IBConnectionRecord"> 964 <object class="IBActionConnection" key="connection"> 965 <string key="label">cancelCreateProgress:</string> 966 <reference key="source" ref="578092914"/> 967 <reference key="destination" ref="930188623"/> 968 </object> 969 <int key="connectionID">62</int> 970 </object> 971 <object class="IBConnectionRecord"> 972 <object class="IBOutletConnection" key="connection"> 973 <string key="label">fOpenCheck</string> 974 <reference key="source" ref="578092914"/> 975 <reference key="destination" ref="631380462"/> 976 </object> 977 <int key="connectionID">64</int> 978 </object> 979 <object class="IBConnectionRecord"> 980 <object class="IBOutletConnection" key="connection"> 981 <string key="label">fIconView</string> 982 <reference key="source" ref="578092914"/> 983 <reference key="destination" ref="452137672"/> 984 </object> 985 <int key="connectionID">65</int> 986 </object> 987 <object class="IBConnectionRecord"> 988 <object class="IBOutletConnection" key="connection"> 989 <string key="label">fTrackerTable</string> 990 <reference key="source" ref="578092914"/> 991 <reference key="destination" ref="910757453"/> 992 </object> 993 <int key="connectionID">99</int> 994 </object> 995 <object class="IBConnectionRecord"> 996 <object class="IBOutletConnection" key="connection"> 997 <string key="label">fTrackerAddRemoveControl</string> 998 <reference key="source" ref="578092914"/> 999 <reference key="destination" ref="904557624"/> 1000 </object> 1001 <int key="connectionID">105</int> 1002 </object> 1003 <object class="IBConnectionRecord"> 1004 <object class="IBActionConnection" key="connection"> 1005 <string key="label">addRemoveTracker:</string> 1006 <reference key="source" ref="578092914"/> 1007 <reference key="destination" ref="904557624"/> 1008 </object> 1009 <int key="connectionID">106</int> 1010 </object> 1011 <object class="IBConnectionRecord"> 890 1012 <object class="IBOutletConnection" key="connection"> 891 1013 <string key="label">delegate</string> … … 896 1018 </object> 897 1019 <object class="IBConnectionRecord"> 898 <object class="IBActionConnection" key="connection">899 <string key="label">cancelCreateWindow:</string>900 <reference key="source" ref="578092914"/>901 <reference key="destination" ref="142097578"/>902 </object>903 <int key="connectionID">52</int>904 </object>905 <object class="IBConnectionRecord">906 <object class="IBOutletConnection" key="connection">907 <string key="label">fProgressView</string>908 <reference key="source" ref="578092914"/>909 <reference key="destination" ref="313634217"/>910 </object>911 <int key="connectionID">60</int>912 </object>913 <object class="IBConnectionRecord">914 <object class="IBOutletConnection" key="connection">915 <string key="label">fProgressIndicator</string>916 <reference key="source" ref="578092914"/>917 <reference key="destination" ref="162810738"/>918 </object>919 <int key="connectionID">61</int>920 </object>921 <object class="IBConnectionRecord">922 <object class="IBActionConnection" key="connection">923 <string key="label">cancelCreateProgress:</string>924 <reference key="source" ref="578092914"/>925 <reference key="destination" ref="930188623"/>926 </object>927 <int key="connectionID">62</int>928 </object>929 <object class="IBConnectionRecord">930 <object class="IBOutletConnection" key="connection">931 <string key="label">fOpenCheck</string>932 <reference key="source" ref="578092914"/>933 <reference key="destination" ref="631380462"/>934 </object>935 <int key="connectionID">64</int>936 </object>937 <object class="IBConnectionRecord">938 <object class="IBOutletConnection" key="connection">939 <string key="label">fIconView</string>940 <reference key="source" ref="578092914"/>941 <reference key="destination" ref="452137672"/>942 </object>943 <int key="connectionID">65</int>944 </object>945 <object class="IBConnectionRecord">946 <object class="IBOutletConnection" key="connection">947 <string key="label">fTrackerTable</string>948 <reference key="source" ref="578092914"/>949 <reference key="destination" ref="910757453"/>950 </object>951 <int key="connectionID">99</int>952 </object>953 <object class="IBConnectionRecord">954 1020 <object class="IBOutletConnection" key="connection"> 955 1021 <string key="label">dataSource</string> … … 966 1032 </object> 967 1033 <int key="connectionID">101</int> 968 </object>969 <object class="IBConnectionRecord">970 <object class="IBOutletConnection" key="connection">971 <string key="label">fTrackerAddRemoveControl</string>972 <reference key="source" ref="578092914"/>973 <reference key="destination" ref="904557624"/>974 </object>975 <int key="connectionID">105</int>976 </object>977 <object class="IBConnectionRecord">978 <object class="IBActionConnection" key="connection">979 <string key="label">addRemoveTracker:</string>980 <reference key="source" ref="578092914"/>981 <reference key="destination" ref="904557624"/>982 </object>983 <int key="connectionID">106</int>984 1034 </object> 985 1035 </array> … … 1439 1489 <dictionary class="NSMutableDictionary" key="localizations"/> 1440 1490 <nil key="sourceID"/> 1441 <int key="maxID">10 8</int>1491 <int key="maxID">109</int> 1442 1492 </object> 1443 <object class="IBClassDescriber" key="IBDocument.Classes"/> 1493 <object class="IBClassDescriber" key="IBDocument.Classes"> 1494 <array class="NSMutableArray" key="referencedPartialClassDescriptions"> 1495 <object class="IBPartialClassDescription"> 1496 <string key="className">CreatorWindowController</string> 1497 <string key="superclassName">NSWindowController</string> 1498 <dictionary class="NSMutableDictionary" key="actions"> 1499 <string key="addRemoveTracker:">id</string> 1500 <string key="cancelCreateProgress:">id</string> 1501 <string key="cancelCreateWindow:">id</string> 1502 <string key="create:">id</string> 1503 <string key="setLocation:">id</string> 1504 </dictionary> 1505 <dictionary class="NSMutableDictionary" key="actionInfosByName"> 1506 <object class="IBActionInfo" key="addRemoveTracker:"> 1507 <string key="name">addRemoveTracker:</string> 1508 <string key="candidateClassName">id</string> 1509 </object> 1510 <object class="IBActionInfo" key="cancelCreateProgress:"> 1511 <string key="name">cancelCreateProgress:</string> 1512 <string key="candidateClassName">id</string> 1513 </object> 1514 <object class="IBActionInfo" key="cancelCreateWindow:"> 1515 <string key="name">cancelCreateWindow:</string> 1516 <string key="candidateClassName">id</string> 1517 </object> 1518 <object class="IBActionInfo" key="create:"> 1519 <string key="name">create:</string> 1520 <string key="candidateClassName">id</string> 1521 </object> 1522 <object class="IBActionInfo" key="setLocation:"> 1523 <string key="name">setLocation:</string> 1524 <string key="candidateClassName">id</string> 1525 </object> 1526 </dictionary> 1527 <dictionary class="NSMutableDictionary" key="outlets"> 1528 <string key="fCommentView">NSTextView</string> 1529 <string key="fIconView">NSImageView</string> 1530 <string key="fLocationField">NSTextField</string> 1531 <string key="fNameField">NSTextField</string> 1532 <string key="fOpenCheck">NSButton</string> 1533 <string key="fPiecesField">NSTextField</string> 1534 <string key="fPrivateCheck">NSButton</string> 1535 <string key="fProgressIndicator">NSProgressIndicator</string> 1536 <string key="fProgressView">NSView</string> 1537 <string key="fStatusField">NSTextField</string> 1538 <string key="fTrackerAddRemoveControl">NSSegmentedControl</string> 1539 <string key="fTrackerTable">NSTableView</string> 1540 </dictionary> 1541 <dictionary class="NSMutableDictionary" key="toOneOutletInfosByName"> 1542 <object class="IBToOneOutletInfo" key="fCommentView"> 1543 <string key="name">fCommentView</string> 1544 <string key="candidateClassName">NSTextView</string> 1545 </object> 1546 <object class="IBToOneOutletInfo" key="fIconView"> 1547 <string key="name">fIconView</string> 1548 <string key="candidateClassName">NSImageView</string> 1549 </object> 1550 <object class="IBToOneOutletInfo" key="fLocationField"> 1551 <string key="name">fLocationField</string> 1552 <string key="candidateClassName">NSTextField</string> 1553 </object> 1554 <object class="IBToOneOutletInfo" key="fNameField"> 1555 <string key="name">fNameField</string> 1556 <string key="candidateClassName">NSTextField</string> 1557 </object> 1558 <object class="IBToOneOutletInfo" key="fOpenCheck"> 1559 <string key="name">fOpenCheck</string> 1560 <string key="candidateClassName">NSButton</string> 1561 </object> 1562 <object class="IBToOneOutletInfo" key="fPiecesField"> 1563 <string key="name">fPiecesField</string> 1564 <string key="candidateClassName">NSTextField</string> 1565 </object> 1566 <object class="IBToOneOutletInfo" key="fPrivateCheck"> 1567 <string key="name">fPrivateCheck</string> 1568 <string key="candidateClassName">NSButton</string> 1569 </object> 1570 <object class="IBToOneOutletInfo" key="fProgressIndicator"> 1571 <string key="name">fProgressIndicator</string> 1572 <string key="candidateClassName">NSProgressIndicator</string> 1573 </object> 1574 <object class="IBToOneOutletInfo" key="fProgressView"> 1575 <string key="name">fProgressView</string> 1576 <string key="candidateClassName">NSView</string> 1577 </object> 1578 <object class="IBToOneOutletInfo" key="fStatusField"> 1579 <string key="name">fStatusField</string> 1580 <string key="candidateClassName">NSTextField</string> 1581 </object> 1582 <object class="IBToOneOutletInfo" key="fTrackerAddRemoveControl"> 1583 <string key="name">fTrackerAddRemoveControl</string> 1584 <string key="candidateClassName">NSSegmentedControl</string> 1585 </object> 1586 <object class="IBToOneOutletInfo" key="fTrackerTable"> 1587 <string key="name">fTrackerTable</string> 1588 <string key="candidateClassName">NSTableView</string> 1589 </object> 1590 </dictionary> 1591 <object class="IBClassDescriptionSource" key="sourceIdentifier"> 1592 <string key="majorKey">IBProjectSource</string> 1593 <string key="minorKey">./Classes/CreatorWindowController.h</string> 1594 </object> 1595 </object> 1596 </array> 1597 </object> 1444 1598 <int key="IBDocument.localizationMode">0</int> 1445 1599 <string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string> … … 1450 1604 <object class="NSMutableDictionary" key="IBDocument.PluginDeclaredDependencyDefaults"> 1451 1605 <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin.macosx</string> 1452 < integer value="1060" key="NS.object.0"/>1606 <real value="1070" key="NS.object.0"/> 1453 1607 </object> 1454 1608 <bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
Note: See TracChangeset
for help on using the changeset viewer.