From: Michael J. Rubinsky Date: Tue, 16 Dec 2008 00:25:34 +0000 (-0500) Subject: Take some UI ideas from other iPhoto plugins (mostly iPhotoToGallery): X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=e8ce333facc1bf4d98374cd9c9132b11b2f9c5f4;p=horde.git Take some UI ideas from other iPhoto plugins (mostly iPhotoToGallery): * Use a NSPopUpButton for the server selection instead of a NSComboBox * Put the "New Server" action in the PopUp instead of a seperate button. * Auto connect to the default server (for now, it's the first gallery in the list) * The start of a better status display --- diff --git a/iPhoto2Ansel/AnselExportController.h b/iPhoto2Ansel/AnselExportController.h index 006e11d4b..3b8a1bd05 100644 --- a/iPhoto2Ansel/AnselExportController.h +++ b/iPhoto2Ansel/AnselExportController.h @@ -40,10 +40,7 @@ extern NSString * const TURAnselServerPasswordKey; IBOutlet NSProgressIndicator *spinner; IBOutlet NSImageView *defaultImageView; IBOutlet NSButton *newGalleryButton; - IBOutlet NSButton *newServerButton; - - // New Gallery Sheet (uses it's own controller) - //IBOutlet NSWindow *newGallerySheet; + IBOutlet NSPopUpButton *mServersPopUp; // New Server sheet IBOutlet NSWindow *newServerSheet; @@ -81,6 +78,7 @@ extern NSString * const TURAnselServerPasswordKey; - (IBAction) showNewGallery: (id)sender; - (IBAction) doAddServer: (id)sender; - (IBAction) doCancelAddServer: (id)sender; +- (IBAction) clickServer: (id)sender; // overrides - (void)awakeFromNib; diff --git a/iPhoto2Ansel/AnselExportController.m b/iPhoto2Ansel/AnselExportController.m index 81b23992f..380735cda 100644 --- a/iPhoto2Ansel/AnselExportController.m +++ b/iPhoto2Ansel/AnselExportController.m @@ -13,6 +13,7 @@ #import "ImageResizer.h"; @interface AnselExportController (PrivateAPI) +- (void)showNewServerSheet; - (void)doConnect; - (void)connect; - (void)disconnect; @@ -49,10 +50,7 @@ NSString * const TURAnselServerPasswordKey = @"password"; [defaultValues setObject: [[NSMutableArray alloc] init] forKey: TURAnselServersKey]; NSUserDefaults *userPrefs = [NSUserDefaults standardUserDefaults]; [userPrefs registerDefaults: defaultValues]; - - // Get any saved server data - anselServers = [userPrefs objectForKey: TURAnselServersKey]; - + // UI Defaults [mSizePopUp selectItemWithTag: [userPrefs integerForKey:TURAnselExportSize]]; [connectedLabel setStringValue:@"Not Connected"]; @@ -66,11 +64,10 @@ NSString * const TURAnselServerPasswordKey = @"password"; name: @"NSPopUpButtonWillPopUpNotification" object: nil]; - // See if we have any configured servers + // See if we have any configured servers (need a mutable array, hence the extra step here) anselServers = [[NSMutableArray alloc] initWithArray: [userPrefs objectForKey:TURAnselServersKey]]; - // Need to wait until iPhoto's export window is fully loaded before attempting - // to show a sheet? + // Wait until iPhoto's export window is fully loaded before attempting a sheet [[NSNotificationCenter defaultCenter] addObserver: self selector: @selector(exportWindowDidBecomeKey:) name: NSWindowDidBecomeKeyNotification @@ -91,8 +88,6 @@ NSString * const TURAnselServerPasswordKey = @"password"; } #pragma mark Actions - - // Put up the newGallerySheet NSPanel - (IBAction)showNewGallery: (id)sender { @@ -104,13 +99,29 @@ NSString * const TURAnselServerPasswordKey = @"password"; } } +- (IBAction)clickServer: (id)sender +{ + // Servers list +// if ([mServersPopUp indexOfSelectedItem] == [mServersPopUp numberOfItems] - 1) { +// [galleryListTable reloadData]; +// [NSApp beginSheet:galleryListPanel modalForWindow:[exportManager window] modalDelegate:self didEndSelector:@selector(sheetDidEnd:returnCode:contextInfo:) contextInfo:NULL]; +// } + + // Add new server + if ([mServersPopUp indexOfSelectedItem] == [mServersPopUp numberOfItems] - 1) { + NSLog(@"Showing sheet?"); + [self showNewServerSheet]; + } else if (![[[mServersPopUp selectedItem] title] isEqual:@"(None)"]) { + currentServer = [[mServersPopUp selectedItem] representedObject]; + [self doConnect]; + } +} // Server setup sheet -(IBAction)doAddServer: (id)sender { // Sanity Checking - // TODO - make sure we don't have more than one gallery with the same - // nick?? + // TODO - make sure we don't have more than one gallery with the same nick?? if (![[serverNickName stringValue] length]) { // TODO: Errors - for now, just silently fail, yea, I know.... return; @@ -256,6 +267,15 @@ NSString * const TURAnselServerPasswordKey = @"password"; } #pragma mark PrivateAPI +- (void) showNewServerSheet +{ + [NSApp beginSheet: newServerSheet + modalForWindow: [self window] + modalDelegate: nil + didEndSelector: nil + contextInfo: nil]; +} + // See if we have everything we need to export... - (void)canExport { @@ -272,13 +292,37 @@ NSString * const TURAnselServerPasswordKey = @"password"; } } +- (void)updateServersPopupMenu +{ + [mServersPopUp removeAllItems]; + for (NSDictionary *server in anselServers) { + NSMenuItem *menuItem = [[NSMenuItem alloc] initWithTitle: [server objectForKey: TURAnselServerNickKey] + action: nil + keyEquivalent: @""]; + [menuItem setRepresentedObject: server]; + [[mServersPopUp menu] addItem: menuItem]; + } + if ([anselServers count] == 0) { + [mServersPopUp addItemWithTitle:@"(None)"]; + //[mainStatusString setStringValue:@"No galleries configured"]; + } + + // add separator + [[mServersPopUp menu] addItem:[NSMenuItem separatorItem]]; + + // add Add Gallery... and Edit List... options + [mServersPopUp addItemWithTitle:@"Add Server..."]; + //[mServersPopUp addItemWithTitle:@"Edit Server List..."]; + + // fix selection + [mServersPopUp selectItemAtIndex:0]; +} + // Make sure we clean up from any previous connection -(void)disconnect { [galleryCombo setDelegate: nil]; [anselController release]; - - //TODO: update status/use notifications? } // Start the connection process. @@ -425,8 +469,6 @@ NSString * const TURAnselServerPasswordKey = @"password"; } // We are done - kill the progress controller and close the export window. - // TODO: Put up some kind of alert, maybe add growl support, offer to open - // the browser window?? [progressController performSelectorOnMainThread: @selector(setPercent:) withObject: nil waitUntilDone: NO]; @@ -527,16 +569,17 @@ NSString * const TURAnselServerPasswordKey = @"password"; #pragma mark export notifications - (void)exportWindowDidBecomeKey: (NSNotification *)notification { - // Make sure we have a server configured, or throw up the dialog. - if (![anselServers count]) { - [NSApp beginSheet: newServerSheet - modalForWindow: [self window] - modalDelegate: nil - didEndSelector: nil - contextInfo: nil]; + // We only want to do this once... + [[NSNotificationCenter defaultCenter] removeObserver: self + name: NSWindowDidBecomeKeyNotification + object: nil]; + [self updateServersPopupMenu]; + if ([anselServers count] == 0) { + [self showNewServerSheet]; } else { - // We have servers, fill in the drop down - + // Autoconnect to default server. For now, just make it the first one. + currentServer = [[mServersPopUp selectedItem] representedObject]; + [self doConnect]; } } - (void)sizeChoiceWillChange: (NSNotification *)notification diff --git a/iPhoto2Ansel/English.lproj/Panel.nib/classes.nib b/iPhoto2Ansel/English.lproj/Panel.nib/classes.nib deleted file mode 100644 index 254fa6127..000000000 --- a/iPhoto2Ansel/English.lproj/Panel.nib/classes.nib +++ /dev/null @@ -1,92 +0,0 @@ - - - - - IBClasses - - - CLASS - AnselExportPluginBox - LANGUAGE - ObjC - OUTLETS - - mPlugin - id - - SUPERCLASS - NSBox - - - ACTIONS - - cancelNewGallery - id - doAddServer - id - doCancelAddServer - id - showNewGallery - id - - CLASS - AnselExportController - LANGUAGE - ObjC - OUTLETS - - anselHostURL - NSTextField - connectedLabel - NSTextField - defaultImageView - NSImageView - firstView - NSControl - galleryCombo - NSComboBox - mExportMgr - id - mServers - NSComboBox - mSettingsBox - NSBox - mSizePopUp - NSPopUpButton - newGalleryButton - NSButton - newServerButton - NSButton - newServerSheet - NSWindow - password - NSSecureTextField - serverNickName - NSTextField - spinner - NSProgressIndicator - username - NSTextField - - SUPERCLASS - NSObject - - - CLASS - FirstResponder - LANGUAGE - ObjC - SUPERCLASS - NSObject - - - CLASS - NSObject - LANGUAGE - ObjC - - - IBVersion - 1 - - diff --git a/iPhoto2Ansel/English.lproj/Panel.nib/designable.nib b/iPhoto2Ansel/English.lproj/Panel.nib/designable.nib new file mode 100644 index 000000000..115e93bd5 --- /dev/null +++ b/iPhoto2Ansel/English.lproj/Panel.nib/designable.nib @@ -0,0 +1,1868 @@ + + + + 1050 + 9F33 + 672 + 949.34 + 352.00 + + YES + + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + + + YES + + AnselExportController + + + FirstResponder + + + NSApplication + + + 15 + 2 + {{220, 349}, {590, 415}} + 1886912512 + + Window + + + NSWindow + + + View + + {3.40282e+38, 3.40282e+38} + {213, 107} + + + 256 + + YES + + + 256 + + YES + + + 256 + + YES + + + 268 + + YES + + + 256 + + YES + + + 268 + {{15, 71}, {81, 17}} + + YES + + 68288064 + 272630784 + Server + + LucidaGrande + 1.200000e+01 + 16 + + + + 6 + System + controlColor + + 3 + MC42NjY2NjY2OQA + + + + 6 + System + controlTextColor + + 3 + MAA + + + + + + + 268 + {{76, 66}, {382, 26}} + + YES + + -2076049856 + 2048 + + LucidaGrande + 1.300000e+01 + 1044 + + + 109199615 + 129 + + + 400 + 75 + + + (None) + + 1048576 + 2147483647 + + NSImage + NSMenuCheckmark + + + NSImage + NSMenuMixedState + + _popUpItemAction: + + + YES + + OtherViews + + YES + + + + 1 + YES + YES + 2 + + + + + 268 + {{77, 33}, {117, 17}} + + YES + + 68288064 + 272761856 + Not Logged In + + LucidaGrande + 1.100000e+01 + 3100 + + + + + + + + + -2147482356 + + {{439, 33}, {16, 16}} + + 28938 + 1.600000e+01 + 1.000000e+02 + + + + 268 + {{15, 37}, {43, 16}} + + YES + + 68288064 + 272630784 + Status + + + + + + + + + 268 + {{367, 32}, {65, 16}} + + YES + + 67239424 + 134479872 + Cancel + + LucidaGrande + 9.000000e+00 + 3614 + + + -2038284033 + 129 + + + 200 + 25 + + + + {{1, 1}, {480, 94}} + + + + {{7, 253}, {482, 110}} + + {0, 0} + + 67239424 + 0 + Connection + + + 6 + System + textBackgroundColor + + 3 + MQA + + + + 3 + MCAwLjgwMDAwMDAxAA + + + + 1 + 0 + 2 + NO + + + + 268 + + YES + + + 256 + + YES + + + 268 + {{140, 142}, {92, 32}} + + YES + + 604110336 + 134217728 + Create New + + LucidaGrande + 1.100000e+01 + 16 + + + -2038284033 + 129 + + + + 200 + 25 + + + + + 268 + {{18, 122}, {211, 26}} + + YES + + 879885888 + 272630784 + + + + YES + + + 5 + YES + + + + 274 + {15, 0} + + + YES + + YES + + + 1.200000e+01 + 1.000000e+01 + 1.000000e+03 + + 75628032 + 0 + + + + 3 + MC4zMzMzMzI5OQA + + + + + 338820672 + 1024 + + + YES + + 6 + System + controlBackgroundColor + + + + + 3 + YES + + + + 3.000000e+00 + 2.000000e+00 + + + 6 + System + gridColor + + 3 + MC41AA + + + 1.900000e+01 + tableViewAction: + -767524864 + + + + 1 + 15 + 0 + YES + + + + + + 268 + {{15, 152}, {103, 16}} + + YES + + 68288064 + 272630784 + Gallery + + + + + + + + + 268 + + YES + + YES + Apple PDF pasteboard type + Apple PICT pasteboard type + Apple PNG pasteboard type + NSFilenamesPboardType + NeXT Encapsulated PostScript v1.2 pasteboard type + NeXT TIFF v4.0 pasteboard type + + + {{258, 38}, {214, 118}} + + YES + + 130560 + 33554432 + 0 + 0 + 1 + NO + + YES + + + + 268 + {{258, 154}, {158, 16}} + + YES + + 68288064 + 272630784 + Gallery Default Image + + + + + + + + + 256 + {{15, 65}, {114, 17}} + + YES + + 67239424 + 272629760 + Image Size: + + + + + + + + + 256 + {{15, 37}, {130, 26}} + + YES + + -2076049856 + 2048 + + + 109199615 + 1 + + LucidaGrande + 1.300000e+01 + 16 + + + + + + 400 + 75 + + + Large + + 1048576 + 2147483647 + 1 + + + _popUpItemAction: + 2 + + + YES + + + OtherViews + + + YES + + + Small + + 1048576 + 2147483647 + + + _popUpItemAction: + + + + + Medium + + 1048576 + 2147483647 + + + _popUpItemAction: + 1 + + + + + + Full Size + + 1048576 + 2147483647 + + + _popUpItemAction: + 3 + + + + + 2 + 3 + YES + YES + 1 + + + + + 268 + {{290, 6}, {185, 32}} + + YES + + 604110336 + 134217728 + Choose Default Image + + + -2038284033 + 129 + + + 200 + 25 + + + + {{1, 1}, {480, 176}} + + + + {{14, 9}, {482, 192}} + + {0, 0} + + 67239424 + 0 + Export Options + + + + 3 + MCAwLjgwMDAwMDAxAA + + + + 1 + 0 + 2 + NO + + + {{2, 2}, {510, 373}} + + + + {{59, 16}, {514, 390}} + + {0, 0} + + 67239424 + 0 + iPhoto2Ansel + + + + 3 + MCAwLjgwMDAwMDAxAA + + + + 3 + 0 + 2 + NO + + + {590, 415} + + + {{0, 0}, {1920, 1178}} + {213, 129} + {3.40282e+38, 3.40282e+38} + + + 23 + 2 + {{196, 315}, {455, 195}} + -1543503872 + Add Server + NSPanel + + {3.40282e+38, 3.40282e+38} + + + 256 + + YES + + + 268 + {{124, 124}, {311, 22}} + + YES + + -1804468671 + 272630784 + + + + YES + + + 6 + System + textColor + + + + + + + 268 + {{17, 126}, {102, 17}} + + YES + + 68288064 + 272630784 + Path to rpc.php + + + + + + + + + 268 + {{124, 92}, {311, 22}} + + YES + + -1804468671 + 272630784 + + + + YES + + + + + + + 268 + {{124, 60}, {311, 22}} + + YES + + 343014976 + 272630784 + + + + YES + + + + YES + NSAllRomanInputSourcesLocaleIdentifier + + + + + + 268 + {{17, 94}, {67, 17}} + + YES + + 68288064 + 272630784 + Username + + + + + + + + + 268 + {{17, 62}, {67, 17}} + + YES + + 68288064 + 272630784 + Password + + + + + + + + + 268 + {{17, 158}, {102, 17}} + + YES + + 68288064 + 272630784 + Nickname + + + + + + + + + 268 + {{124, 156}, {311, 22}} + + YES + + -1804468671 + 272630784 + + + + YES + + + + + + + 268 + {{345, 12}, {96, 32}} + + YES + + 67239424 + 134217728 + Save + + + -2038284033 + 129 + + + 200 + 25 + + + + + 268 + {{244, 12}, {96, 32}} + + YES + + 67239424 + 134217728 + Cancel + + + -2038284033 + 129 + + + 200 + 25 + + + + + 268 + {{18, 18}, {145, 18}} + + YES + + -2080244224 + 0 + Default Server + + + 1211912703 + 130 + + NSImage + NSSwitch + + + NSSwitch + + + + 200 + 25 + + + + {455, 195} + + {{0, 0}, {1920, 1178}} + {3.40282e+38, 3.40282e+38} + + + + + YES + + + mSettingsBox + + + + 37 + + + + mPlugin + + + + 64 + + + + mSizePopUp + + + + 65 + + + + galleryCombo + + + + 142 + + + + connectedLabel + + + + 173 + + + + spinner + + + + 239 + + + + newGalleryButton + + + + 334 + + + + showNewGallery: + + + + 336 + + + + defaultImageView + + + + 359 + + + + anselHostURL + + + + 415 + + + + username + + + + 416 + + + + password + + + + 417 + + + + serverNickName + + + + 418 + + + + doAddServer: + + + + 419 + + + + doCancelAddServer: + + + + 420 + + + + newServerSheet + + + + 421 + + + + mServersPopUp + + + + 490 + + + + clickServer: + + + + 492 + + + + + YES + + 0 + + YES + + + + + + -2 + + + RmlsZSdzIE93bmVyA + + + -1 + + + First Responder + + + -3 + + + Application + + + 5 + + + YES + + + + Window + + + 6 + + + YES + + + + + + 7 + + + YES + + + + + + + 387 + + + YES + + + + Panel (Add Server) + + + 388 + + + YES + + + + + + + + + + + + + + + + 389 + + + YES + + + + + + 391 + + + YES + + + + + + 393 + + + YES + + + + + + 395 + + + YES + + + + + + 397 + + + YES + + + + + + 399 + + + YES + + + + + + 401 + + + YES + + + + + + 403 + + + YES + + + + + + 405 + + + YES + + + + + + 407 + + + YES + + + + + + 409 + + + YES + + + + + + 472 + + + + + 473 + + + + + 474 + + + + + 475 + + + + + 476 + + + + + 477 + + + + + 478 + + + + + 479 + + + + + 480 + + + + + 481 + + + + + 482 + + + + + 136 + + + YES + + + + + + + + + + + 137 + + + YES + + + + + + + + + + + + + 138 + + + YES + + + + + + 462 + + + + + 140 + + + YES + + + + + + 463 + + + + + 169 + + + YES + + + + + + 464 + + + + + 357 + + + YES + + + + + + 465 + + + + + 360 + + + YES + + + + + + 466 + + + + + 9 + + + YES + + + + + + 460 + + + + + 18 + + + YES + + + + + + 461 + + + YES + + + + + + 19 + + + YES + + + + + + + + + 23 + + + + + 22 + + + + + 21 + + + + + 20 + + + + + 364 + + + YES + + + + + + 467 + + + + + 413 + + + YES + + + + + + 470 + + + + + 484 + + + YES + + + + + + 485 + + + YES + + + + + + 486 + + + YES + + + + + + 489 + + + + + 167 + + + YES + + + + + + 468 + + + + + 216 + + + + + 493 + + + YES + + + + + + 494 + + + + + 495 + + + YES + + + + + + 496 + + + + + + + YES + + YES + -1.IBPluginDependency + -2.IBPluginDependency + -3.IBPluginDependency + -3.ImportedFromIB2 + 136.IBPluginDependency + 136.ImportedFromIB2 + 137.IBPluginDependency + 137.ImportedFromIB2 + 138.IBPluginDependency + 138.ImportedFromIB2 + 140.IBPluginDependency + 140.ImportedFromIB2 + 167.IBPluginDependency + 167.ImportedFromIB2 + 169.IBPluginDependency + 169.ImportedFromIB2 + 18.IBPluginDependency + 18.ImportedFromIB2 + 19.IBPluginDependency + 19.ImportedFromIB2 + 20.IBPluginDependency + 20.ImportedFromIB2 + 21.IBPluginDependency + 21.ImportedFromIB2 + 216.IBPluginDependency + 216.ImportedFromIB2 + 22.IBPluginDependency + 22.ImportedFromIB2 + 23.IBPluginDependency + 23.ImportedFromIB2 + 357.IBPluginDependency + 357.ImportedFromIB2 + 360.IBPluginDependency + 360.ImportedFromIB2 + 364.IBPluginDependency + 364.ImportedFromIB2 + 387.IBEditorWindowLastContentRect + 387.IBPluginDependency + 387.IBWindowTemplateEditedContentRect + 387.ImportedFromIB2 + 388.IBPluginDependency + 388.ImportedFromIB2 + 389.IBPluginDependency + 389.ImportedFromIB2 + 391.IBPluginDependency + 391.ImportedFromIB2 + 393.IBPluginDependency + 393.ImportedFromIB2 + 395.IBPluginDependency + 395.ImportedFromIB2 + 397.IBPluginDependency + 397.ImportedFromIB2 + 399.IBPluginDependency + 399.ImportedFromIB2 + 401.IBPluginDependency + 401.ImportedFromIB2 + 403.IBPluginDependency + 403.ImportedFromIB2 + 405.IBPluginDependency + 405.ImportedFromIB2 + 407.IBPluginDependency + 407.ImportedFromIB2 + 409.IBPluginDependency + 409.ImportedFromIB2 + 413.IBPluginDependency + 413.ImportedFromIB2 + 484.IBPluginDependency + 485.IBPluginDependency + 486.IBEditorWindowLastContentRect + 486.IBPluginDependency + 489.IBPluginDependency + 493.IBPluginDependency + 494.IBPluginDependency + 495.IBPluginDependency + 496.IBPluginDependency + 5.IBEditorWindowLastContentRect + 5.IBPluginDependency + 5.IBWindowTemplateEditedContentRect + 5.ImportedFromIB2 + 5.windowTemplate.hasMinSize + 5.windowTemplate.minSize + 6.IBPluginDependency + 6.ImportedFromIB2 + 7.CustomClassName + 7.IBPluginDependency + 7.ImportedFromIB2 + 9.IBPluginDependency + 9.ImportedFromIB2 + + + YES + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + {{42, 910}, {455, 195}} + com.apple.InterfaceBuilder.CocoaPlugin + {{42, 910}, {455, 195}} + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{682, 774}, {382, 23}} + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + com.apple.InterfaceBuilder.CocoaPlugin + {{409, 544}, {590, 415}} + com.apple.InterfaceBuilder.CocoaPlugin + {{409, 544}, {590, 415}} + + + {213, 107} + com.apple.InterfaceBuilder.CocoaPlugin + + AnselExportPluginBox + com.apple.InterfaceBuilder.CocoaPlugin + + com.apple.InterfaceBuilder.CocoaPlugin + + + + + YES + + YES + + + YES + + + + + YES + + YES + + + YES + + + + 496 + + + + YES + + AnselExportController + NSObject + + YES + + YES + clickServer: + doAddServer: + doCancelAddServer: + showNewGallery: + + + YES + id + id + id + id + + + + YES + + YES + anselHostURL + connectedLabel + defaultImageView + firstView + galleryCombo + mExportMgr + mServers + mServersPopUp + mSettingsBox + mSizePopUp + newGalleryButton + newServerSheet + password + serverNickName + spinner + username + + + YES + NSTextField + NSTextField + NSImageView + NSControl + NSComboBox + id + NSComboBox + NSPopUpButton + NSBox + NSPopUpButton + NSButton + NSWindow + NSSecureTextField + NSTextField + NSProgressIndicator + NSTextField + + + + IBProjectSource + AnselExportController.h + + + + AnselExportController + NSObject + + IBUserSource + + + + + AnselExportPluginBox + NSBox + + mPlugin + id + + + IBProjectSource + AnselExportPluginBox.h + + + + AnselExportPluginBox + NSBox + + IBUserSource + + + + + FirstResponder + + IBUserSource + + + + + NSObject + + IBProjectSource + TURAnsel.h + + + + NSObject + + IBProjectSource + TURAnselGallery.h + + + + NSObject + + IBProjectSource + TURAnselGalleryPanelController.h + + + + NSObject + + IBProjectSource + xmlrpc-1.5.1/XMLRPCConnection.h + + + + NSObject + + IBUserSource + + + + + + 0 + ../iPhoto2Ansel.xcodeproj + 3 + + diff --git a/iPhoto2Ansel/English.lproj/Panel.nib/info.nib b/iPhoto2Ansel/English.lproj/Panel.nib/info.nib deleted file mode 100644 index fb256c095..000000000 --- a/iPhoto2Ansel/English.lproj/Panel.nib/info.nib +++ /dev/null @@ -1,20 +0,0 @@ - - - - - IBFramework Version - 672 - IBLastKnownRelativeProjectPath - ../iPhoto2Ansel.xcodeproj - IBOldestOS - 5 - IBOpenObjects - - 7 - - IBSystem Version - 9F33 - targetFramework - IBCocoaFramework - - diff --git a/iPhoto2Ansel/English.lproj/Panel.nib/keyedobjects.nib b/iPhoto2Ansel/English.lproj/Panel.nib/keyedobjects.nib index 2704c9568..71687f05e 100644 Binary files a/iPhoto2Ansel/English.lproj/Panel.nib/keyedobjects.nib and b/iPhoto2Ansel/English.lproj/Panel.nib/keyedobjects.nib differ