From c2896649f89d28dd34852861e9b3cf0570df2d63 Mon Sep 17 00:00:00 2001 From: Miltiadis Vasilakis Date: Tue, 10 Apr 2012 02:13:36 +0300 Subject: [PATCH] Show dock icon and menu. Fix context menu bugs. --- pithos-macos/PithosBrowserController.m | 173 +- pithos-macos/en.lproj/MainMenu.xib | 3213 +++++--------------------------- pithos-macos/pithos-macos-Info.plist | 2 - 3 files changed, 547 insertions(+), 2841 deletions(-) diff --git a/pithos-macos/PithosBrowserController.m b/pithos-macos/PithosBrowserController.m index fac1f5d..2186c60 100644 --- a/pithos-macos/PithosBrowserController.m +++ b/pithos-macos/PithosBrowserController.m @@ -2192,10 +2192,8 @@ forDraggedRowsWithIndexes:(NSIndexSet *)rowIndexes inColumn:(NSInteger)column { ([menuNode class] == [PithosSharingAccountsNode class]) || ([menuNode class] == [PithosEmptyNode class])) return; - BOOL shared = menuNode.shared; - BOOL sharingAccount = (menuNode.sharingAccount != nil); // New Folder - if (!shared && !sharingAccount) { + if (!menuNode.shared && !menuNode.sharingAccount) { menuItem = [[[NSMenuItem alloc] initWithTitle:@"New Folder" action:@selector(menuNewFolder:) keyEquivalent:@""] autorelease]; [menuItem setRepresentedObject:menuNode]; [menu addItem:menuItem]; @@ -2212,49 +2210,48 @@ forDraggedRowsWithIndexes:(NSIndexSet *)rowIndexes inColumn:(NSInteger)column { [menuItem setRepresentedObject:[NSArray arrayWithObject:menuNode]]; [menu addItem:menuItem]; // Paste - if (!shared && !sharingAccount) { - if (clipboardNodes) { - NSUInteger clipboardNodesCount = [clipboardNodes count]; - if (clipboardNodesCount == 0) { - self.clipboardNodes = nil; - } else if (clipboardCopy || ![menuNode isEqualTo:clipboardParentNode]) { - if (clipboardNodesCount == 1) - menuItemTitle = [NSString stringWithString:@"Paste Item"]; - else - menuItemTitle = [NSString stringWithString:@"Paste Items"]; - [menu addItem:[NSMenuItem separatorItem]]; - menuItem = [[[NSMenuItem alloc] initWithTitle:menuItemTitle action:@selector(menuPaste:) keyEquivalent:@""] autorelease]; - [menuItem setRepresentedObject:menuNode]; - [menu addItem:menuItem]; - } + if (clipboardNodes && !menuNode.shared && !menuNode.sharingAccount && + (([menuNode class] == [PithosContainerNode class]) || + (([menuNode class] == [PithosSubdirNode class]) && + (menuNode.pithosObject.subdir || ![menuNode.pithosObject.name hasSuffix:@"/"])))) { + NSUInteger clipboardNodesCount = [clipboardNodes count]; + if (clipboardNodesCount == 0) { + self.clipboardNodes = nil; + } else if (clipboardCopy || ![menuNode isEqualTo:clipboardParentNode]) { + if (clipboardNodesCount == 1) + menuItemTitle = [NSString stringWithString:@"Paste Item"]; + else + menuItemTitle = [NSString stringWithString:@"Paste Items"]; + [menu addItem:[NSMenuItem separatorItem]]; + menuItem = [[[NSMenuItem alloc] initWithTitle:menuItemTitle action:@selector(menuPaste:) keyEquivalent:@""] autorelease]; + [menuItem setRepresentedObject:menuNode]; + [menu addItem:menuItem]; } } } else { // Node context menu NSUInteger menuNodesCount = [menuNodes count]; - PithosNode *firstMenuNode = (PithosNode *)[menuNodes objectAtIndex:0]; - BOOL shared = firstMenuNode.shared; - BOOL sharingAccount = (firstMenuNode.sharingAccount != nil); + PithosNode *firstMenuNode = [menuNodes objectAtIndex:0]; // Move to Trash (pithos container only) // Delete - if (!shared && !sharingAccount) { - if ([rootNode class] == [PithosContainerNode class]) { - if ([rootNode.pithosContainer.name isEqualToString:@"pithos"]) { - menuItem = [[[NSMenuItem alloc] initWithTitle:@"Move to Trash" action:@selector(menuMoveToTrash:) keyEquivalent:@""] autorelease]; - [menuItem setRepresentedObject:menuNodes]; - [menu addItem:menuItem]; - } - menuItem = [[[NSMenuItem alloc] initWithTitle:@"Delete" action:@selector(menuDelete:) keyEquivalent:@""] autorelease]; + if (!firstMenuNode.shared && !firstMenuNode.sharingAccount && ([rootNode class] == [PithosContainerNode class])) { + if ([rootNode.pithosContainer.name isEqualToString:@"pithos"]) { + menuItem = [[[NSMenuItem alloc] initWithTitle:@"Move to Trash" + action:@selector(menuMoveToTrash:) + keyEquivalent:@""] autorelease]; [menuItem setRepresentedObject:menuNodes]; [menu addItem:menuItem]; - [menu addItem:[NSMenuItem separatorItem]]; } + menuItem = [[[NSMenuItem alloc] initWithTitle:@"Delete" action:@selector(menuDelete:) keyEquivalent:@""] autorelease]; + [menuItem setRepresentedObject:menuNodes]; + [menu addItem:menuItem]; + [menu addItem:[NSMenuItem separatorItem]]; } // Refresh menuItem = [[[NSMenuItem alloc] initWithTitle:@"Refresh" action:@selector(refresh:) keyEquivalent:@""] autorelease]; [menu addItem:menuItem]; // Get Info - if (!sharingAccount || ([firstMenuNode class] != [PithosAccountNode class])) { + if (!firstMenuNode.sharingAccount || ([firstMenuNode class] != [PithosAccountNode class])) { [menu addItem:[NSMenuItem separatorItem]]; menuItem = [[[NSMenuItem alloc] initWithTitle:(([firstMenuNode class] == [PithosContainerNode class]) ? @"Info" : @"Info and Sharing") action:@selector(menuGetInfo:) @@ -2262,11 +2259,11 @@ forDraggedRowsWithIndexes:(NSIndexSet *)rowIndexes inColumn:(NSInteger)column { [menuItem setRepresentedObject:menuNodes]; [menu addItem:menuItem]; - if ((!shared && !sharingAccount) || ([firstMenuNode class] != [PithosContainerNode class])) + if ((!firstMenuNode.shared && !firstMenuNode.sharingAccount) || ([firstMenuNode class] != [PithosContainerNode class])) [menu addItem:[NSMenuItem separatorItem]]; } // Cut - if (!shared && !sharingAccount) { + if (!firstMenuNode.shared && !firstMenuNode.sharingAccount) { if (menuNodesCount == 1) menuItemTitle = [NSString stringWithFormat:@"Cut \"%@\"", ((PithosNode *)[menuNodes objectAtIndex:0]).displayName]; else @@ -2276,7 +2273,7 @@ forDraggedRowsWithIndexes:(NSIndexSet *)rowIndexes inColumn:(NSInteger)column { [menu addItem:menuItem]; } // Copy - if ((!shared && !sharingAccount) || + if ((!firstMenuNode.shared && !firstMenuNode.sharingAccount) || (([firstMenuNode class] != [PithosContainerNode class]) && ([firstMenuNode class] != [PithosAccountNode class]))) { if (menuNodesCount == 1) menuItemTitle = [NSString stringWithFormat:@"Copy \"%@\"", ((PithosNode *)[menuNodes objectAtIndex:0]).displayName]; @@ -2287,32 +2284,94 @@ forDraggedRowsWithIndexes:(NSIndexSet *)rowIndexes inColumn:(NSInteger)column { [menu addItem:menuItem]; } // Paste - if (!shared && !sharingAccount) { - if (menuNodesCount == 1) { - PithosNode *menuNode = [menuNodes objectAtIndex:0]; - if (([menuNode class] == [PithosSubdirNode class]) && - (menuNode.pithosObject.subdir || ![menuNode.pithosObject.name hasSuffix:@"/"])) { - if (clipboardNodes) { - NSUInteger clipboardNodesCount = [clipboardNodes count]; - if (clipboardNodesCount == 0) { - self.clipboardNodes = nil; - } else if (clipboardCopy || ![menuNode isEqualTo:clipboardParentNode]) { - if (clipboardNodesCount == 1) - menuItemTitle = [NSString stringWithString:@"Paste Item"]; - else - menuItemTitle = [NSString stringWithString:@"Paste Items"]; - menuItem = [[[NSMenuItem alloc] initWithTitle:menuItemTitle action:@selector(menuPaste:) keyEquivalent:@""] autorelease]; - [menuItem setRepresentedObject:menuNode]; - [menu addItem:menuItem]; - } - } - } + if (clipboardNodes && !firstMenuNode.shared && !firstMenuNode.sharingAccount && (menuNodesCount == 1) && + ([firstMenuNode class] == [PithosSubdirNode class]) && + (firstMenuNode.pithosObject.subdir || ![firstMenuNode.pithosObject.name hasSuffix:@"/"])) { + NSUInteger clipboardNodesCount = [clipboardNodes count]; + if (clipboardNodesCount == 0) { + self.clipboardNodes = nil; + } else if (clipboardCopy || ![firstMenuNode isEqualTo:clipboardParentNode]) { + if (clipboardNodesCount == 1) + menuItemTitle = [NSString stringWithString:@"Paste Item"]; + else + menuItemTitle = [NSString stringWithString:@"Paste Items"]; + menuItem = [[[NSMenuItem alloc] initWithTitle:menuItemTitle action:@selector(menuPaste:) keyEquivalent:@""] autorelease]; + [menuItem setRepresentedObject:firstMenuNode]; + [menu addItem:menuItem]; } } } } #pragma mark - +#pragma mark NSMenuValidation + +- (BOOL)validateMenuItem:(NSMenuItem *)menuItem { + if ((menuItem.action == @selector(cut:)) || (menuItem.action == @selector(copy:)) || (menuItem.action == @selector(delete:))) { + NSArray *menuNodesIndexPaths = [browser selectionIndexPaths]; + if ([menuNodesIndexPaths count] == 0) + return NO; + + PithosNode *firstMenuNode = [browser itemAtIndexPath:[menuNodesIndexPaths objectAtIndex:0]]; + if (((menuItem.action == @selector(cut:)) && (firstMenuNode.shared || firstMenuNode.sharingAccount)) || + ((menuItem.action == @selector(copy:)) && (firstMenuNode.shared || firstMenuNode.sharingAccount) && + (([firstMenuNode class] == [PithosContainerNode class]) || ([firstMenuNode class] == [PithosAccountNode class]))) || + ((menuItem.action == @selector(delete:)) && + (firstMenuNode.shared || firstMenuNode.sharingAccount || ([rootNode class] != [PithosContainerNode class]) || + ((menuItem.tag == 0) && ![rootNode.pithosContainer.name isEqualToString:@"pithos"])))) + return NO; + + NSMutableArray *menuNodes = [NSMutableArray arrayWithCapacity:[menuNodesIndexPaths count]]; + for (NSIndexPath *nodeIndexPath in menuNodesIndexPaths) { + [menuNodes addObject:[browser itemAtIndexPath:nodeIndexPath]]; + } + menuItem.representedObject = menuNodes; + } else if (menuItem.action == @selector(paste:)) { + if (!clipboardNodes || ![clipboardNodes count]) + return NO; + + NSArray *menuNodesIndexPaths = [browser selectionIndexPaths]; + PithosNode *menuNode; + if ([menuNodesIndexPaths count] == 0) + menuNode = [browser parentForItemsInColumn:0]; + else if (([menuNodesIndexPaths count] != 1) || + ([[browser itemAtIndexPath:[menuNodesIndexPaths objectAtIndex:0]] class] == [PithosObjectNode class])) + menuNode = [browser parentForItemsInColumn:([[menuNodesIndexPaths objectAtIndex:0] length] - 1)]; + else + menuNode = [browser itemAtIndexPath:[menuNodesIndexPaths objectAtIndex:0]]; + + if (menuNode.shared || menuNode.sharingAccount || + (([menuNode class] != [PithosContainerNode class]) && + (([menuNode class] != [PithosSubdirNode class]) || + (!menuNode.pithosObject.subdir && [menuNode.pithosObject.name hasSuffix:@"/"]))) || + (!clipboardCopy && [menuNode isEqualTo:clipboardParentNode])) + return NO; + + menuItem.representedObject = menuNode; + } + return YES; +} + +- (void)cut:(NSMenuItem *)sender { + [self menuCut:sender]; +} + +- (void)copy:(NSMenuItem *)sender { + [self menuCopy:sender]; +} + +- (void)paste:(NSMenuItem *)sender { + [self menuPaste:sender]; +} + +- (void)delete:(NSMenuItem *)sender { + if (sender.tag == 0) + [self menuMoveToTrash:sender]; + else + [self menuDelete:sender]; +} + +#pragma mark - #pragma mark Menu Actions - (void)menuNewFolder:(NSMenuItem *)sender { @@ -2665,12 +2724,12 @@ forDraggedRowsWithIndexes:(NSIndexSet *)rowIndexes inColumn:(NSInteger)column { return; PithosNode *dropNode = (PithosNode *)[sender representedObject]; NSArray *localClipboardNodes = [NSArray arrayWithArray:clipboardNodes]; - if (!clipboardCopy && ![dropNode isEqualTo:clipboardParentNode]) { + if (clipboardCopy) { + [self copyNodes:localClipboardNodes toNode:dropNode]; + } else if (![dropNode isEqualTo:clipboardParentNode]) { self.clipboardNodes = nil; self.clipboardParentNode = nil; [self moveNodes:localClipboardNodes toNode:dropNode]; - } else { - [self copyNodes:localClipboardNodes toNode:dropNode]; } } diff --git a/pithos-macos/en.lproj/MainMenu.xib b/pithos-macos/en.lproj/MainMenu.xib index b221913..897f540 100644 --- a/pithos-macos/en.lproj/MainMenu.xib +++ b/pithos-macos/en.lproj/MainMenu.xib @@ -41,7 +41,7 @@ YES - pithos-macos + Pithos+ 1048576 2147483647 @@ -55,12 +55,12 @@ submenuAction: - pithos-macos + Pithos+ YES - About pithos-macos + About Pithos+ 2147483647 @@ -189,61 +189,6 @@ File YES - - - New - n - 1048576 - 2147483647 - - - - - - Open… - o - 1048576 - 2147483647 - - - - - - Open Recent - - 1048576 - 2147483647 - - - submenuAction: - - Open Recent - - YES - - - Clear Menu - - 1048576 - 2147483647 - - - - - _NSRecentDocumentsMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - Close @@ -253,32 +198,6 @@ - - - Save - s - 1048576 - 2147483647 - - - - - - Save As… - S - 1179648 - 2147483647 - - - - - - Revert to Saved - - 2147483647 - - - YES @@ -325,35 +244,6 @@ Edit YES - - - Undo - z - 1048576 - 2147483647 - - - - - - Redo - Z - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - Cut @@ -381,23 +271,23 @@ - + - Paste and Match Style - V - 1572864 + Move to Trash + CA + 1048576 2147483647 - + Delete - 1048576 2147483647 + 1 @@ -408,823 +298,6 @@ - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Find - - 1048576 - 2147483647 - - - submenuAction: - - Find - - YES - - - Find… - f - 1048576 - 2147483647 - - - 1 - - - - Find Next - g - 1048576 - 2147483647 - - - 2 - - - - Find Previous - G - 1179648 - 2147483647 - - - 3 - - - - Use Selection for Find - e - 1048576 - 2147483647 - - - 7 - - - - Jump to Selection - j - 1048576 - 2147483647 - - - - - - - - - Spelling and Grammar - - 1048576 - 2147483647 - - - submenuAction: - - Spelling and Grammar - - YES - - - Show Spelling and Grammar - : - 1048576 - 2147483647 - - - - - - Check Document Now - ; - 1048576 - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Check Spelling While Typing - - 1048576 - 2147483647 - - - - - - Check Grammar With Spelling - - 1048576 - 2147483647 - - - - - - Correct Spelling Automatically - - 2147483647 - - - - - - - - - Substitutions - - 1048576 - 2147483647 - - - submenuAction: - - Substitutions - - YES - - - Show Substitutions - - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Smart Copy/Paste - f - 1048576 - 2147483647 - - - 1 - - - - Smart Quotes - g - 1048576 - 2147483647 - - - 2 - - - - Smart Dashes - - 2147483647 - - - - - - Smart Links - G - 1179648 - 2147483647 - - - 3 - - - - Text Replacement - - 2147483647 - - - - - - - - - Transformations - - 2147483647 - - - submenuAction: - - Transformations - - YES - - - Make Upper Case - - 2147483647 - - - - - - Make Lower Case - - 2147483647 - - - - - - Capitalize - - 2147483647 - - - - - - - - - Speech - - 1048576 - 2147483647 - - - submenuAction: - - Speech - - YES - - - Start Speaking - - 1048576 - 2147483647 - - - - - - Stop Speaking - - 1048576 - 2147483647 - - - - - - - - - - - - Format - - 2147483647 - - - submenuAction: - - Format - - YES - - - Font - - 2147483647 - - - submenuAction: - - Font - - YES - - - Show Fonts - t - 1048576 - 2147483647 - - - - - - Bold - b - 1048576 - 2147483647 - - - 2 - - - - Italic - i - 1048576 - 2147483647 - - - 1 - - - - Underline - u - 1048576 - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Bigger - + - 1048576 - 2147483647 - - - 3 - - - - Smaller - - - 1048576 - 2147483647 - - - 4 - - - - YES - YES - - - 2147483647 - - - - - - Kern - - 2147483647 - - - submenuAction: - - Kern - - YES - - - Use Default - - 2147483647 - - - - - - Use None - - 2147483647 - - - - - - Tighten - - 2147483647 - - - - - - Loosen - - 2147483647 - - - - - - - - - Ligature - - 2147483647 - - - submenuAction: - - Ligature - - YES - - - Use Default - - 2147483647 - - - - - - Use None - - 2147483647 - - - - - - Use All - - 2147483647 - - - - - - - - - Baseline - - 2147483647 - - - submenuAction: - - Baseline - - YES - - - Use Default - - 2147483647 - - - - - - Superscript - - 2147483647 - - - - - - Subscript - - 2147483647 - - - - - - Raise - - 2147483647 - - - - - - Lower - - 2147483647 - - - - - - - - - YES - YES - - - 2147483647 - - - - - - Show Colors - C - 1048576 - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Copy Style - c - 1572864 - 2147483647 - - - - - - Paste Style - v - 1572864 - 2147483647 - - - - - _NSFontMenu - - - - - Text - - 2147483647 - - - submenuAction: - - Text - - YES - - - Align Left - { - 1048576 - 2147483647 - - - - - - Center - | - 1048576 - 2147483647 - - - - - - Justify - - 2147483647 - - - - - - Align Right - } - 1048576 - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Writing Direction - - 2147483647 - - - submenuAction: - - Writing Direction - - YES - - - YES - Paragraph - - 2147483647 - - - - - - CURlZmF1bHQ - - 2147483647 - - - - - - CUxlZnQgdG8gUmlnaHQ - - 2147483647 - - - - - - CVJpZ2h0IHRvIExlZnQ - - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - YES - Selection - - 2147483647 - - - - - - CURlZmF1bHQ - - 2147483647 - - - - - - CUxlZnQgdG8gUmlnaHQ - - 2147483647 - - - - - - CVJpZ2h0IHRvIExlZnQ - - 2147483647 - - - - - - - - - YES - YES - - - 2147483647 - - - - - - Show Ruler - - 2147483647 - - - - - - Copy Ruler - c - 1310720 - 2147483647 - - - - - - Paste Ruler - v - 1310720 - 2147483647 - - - - - - - - - - - - View - - 1048576 - 2147483647 - - - submenuAction: - - View - - YES - - - Show Toolbar - t - 1572864 - 2147483647 - - - - - - Customize Toolbar… - - 1048576 - 2147483647 - - - @@ -1283,31 +356,6 @@ _NSWindowsMenu - - - Help - - 2147483647 - - - submenuAction: - - Help - - YES - - - pithos-macos Help - ? - 1048576 - 2147483647 - - - - - _NSHelpMenu - - _NSMainMenu @@ -1351,7 +399,8 @@ Preferences... - + , + 1048576 2147483647 @@ -1463,14 +512,6 @@ 552 - - orderFrontStandardAboutPanel: - - - - 142 - - delegate @@ -1496,231 +537,55 @@ - print: + copy: - + - 86 + 224 - runPageLayout: + paste: - + - 87 + 226 - clearRecentDocuments: + cut: - + - 127 + 228 - performClose: + selectAll: - + - 193 + 232 - toggleContinuousSpellChecking: + delete: - + - 222 + 235 - undo: + performZoom: - + - 223 + 240 - copy: - - - - 224 - - - - checkSpelling: - - - - 225 - - - - paste: - - - - 226 - - - - stopSpeaking: - - - - 227 - - - - cut: - - - - 228 - - - - showGuessPanel: - - - - 230 - - - - redo: - - - - 231 - - - - selectAll: - - - - 232 - - - - startSpeaking: - - - - 233 - - - - delete: - - - - 235 - - - - performZoom: - - - - 240 - - - - performFindPanelAction: - - - - 241 - - - - centerSelectionInVisibleArea: - - - - 245 - - - - toggleGrammarChecking: - - - - 347 - - - - toggleSmartInsertDelete: - - - - 355 - - - - toggleAutomaticQuoteSubstitution: - - - - 356 - - - - toggleAutomaticLinkDetection: - - - - 357 - - - - saveDocument: - - - - 362 - - - - saveDocumentAs: - - - - 363 - - - - revertDocumentToSaved: - - - - 364 - - - - runToolbarCustomizationPalette: - - - - 365 - - - - toggleToolbarShown: - - - - 366 - - - - hide: + hide: @@ -1744,1561 +609,429 @@ - newDocument: + performClose: - + - 373 + 193 - openDocument: + runPageLayout: - + - 374 + 87 - raiseBaseline: + print: - + - 426 + 86 - lowerBaseline: + delete: - + - 427 + 625 - - copyFont: - - + + statusMenu + + - 428 + 549 - subscript: - - + showPithosBrowser: + + - 429 + 553 - superscript: - - + showPithosPreferences: + + - 430 + 554 - - tightenKerning: - - + + accountsMenu + + - 431 + 596 - - underline: - - + + lastSyncMenu + + - 432 + 600 - orderFrontColorPanel: - - + showPithosAbout: + + - 433 + 604 - useAllLigatures: - - + showPithosPreferences: + + - 434 + 621 - loosenKerning: - - + showPithosAbout: + + - 435 + 622 - - pasteFont: - - + + enabled: delegate.alwaysNo + + + + + + enabled: delegate.alwaysNo + enabled + delegate.alwaysNo + 2 + - 436 + 570 - - unscript: - - + + title: delegate.pithosBrowserController.accountNode.pithosAccount + + + + + + title: delegate.pithosBrowserController.accountNode.pithosAccount + title + delegate.pithosBrowserController.accountNode.pithosAccount + + NSValueTransformerName + UsingSizeTransformer + + 2 + - 437 + 575 - - useStandardKerning: - - + + delegate + + - 438 + 593 - - useStandardLigatures: - - + + delegate + + - 439 + 599 - - turnOffLigatures: - - + + value: delegate.openAtLogin + + + + + + value: delegate.openAtLogin + value + delegate.openAtLogin + + YES + + YES + NSAllowsEditingMultipleValuesSelection + NSValidatesImmediately + + + YES + + + + + 2 + - 440 + 618 - - turnOffKerning: - - - - 441 - - - - toggleAutomaticSpellingCorrection: - - - - 456 - - - - orderFrontSubstitutionsPanel: - - - - 458 - - - - toggleAutomaticDashSubstitution: - - - - 461 - - - - toggleAutomaticTextReplacement: - - - - 463 - - - - uppercaseWord: - - - - 464 - - - - capitalizeWord: - - - - 467 - - - - lowercaseWord: - - - - 468 - - - - pasteAsPlainText: - - - - 486 - - - - performFindPanelAction: - - - - 487 - - - - performFindPanelAction: - - - - 488 - - - - performFindPanelAction: - - - - 489 - - - - showHelp: - - - - 493 - - - - alignCenter: - - - - 518 - - - - pasteRuler: - - - - 519 - - - - toggleRuler: - - - - 520 - - - - alignRight: - - - - 521 - - - - copyRuler: - - - - 522 - - - - alignJustified: - - - - 523 - - - - alignLeft: - - - - 524 - - - - makeBaseWritingDirectionNatural: - - - - 525 - - - - makeBaseWritingDirectionLeftToRight: - - - - 526 - - - - makeBaseWritingDirectionRightToLeft: - - - - 527 - - - - makeTextWritingDirectionNatural: - - - - 528 - - - - makeTextWritingDirectionLeftToRight: - - - - 529 - - - - makeTextWritingDirectionRightToLeft: - - - - 530 - - - - addFontTrait: - - - - 421 - - - - addFontTrait: - - - - 422 - - - - modifyFont: - - - - 423 - - - - orderFrontFontPanel: - - - - 424 - - - - modifyFont: - - - - 425 - - - - statusMenu - - - - 549 - - - - showPithosBrowser: - - - - 553 - - - - showPithosPreferences: - - - - 554 - - - - accountsMenu - - - - 596 - - - - lastSyncMenu - - - - 600 - - - - showPithosAbout: - - - - 604 - - - - enabled: delegate.alwaysNo - - - - - - enabled: delegate.alwaysNo - enabled - delegate.alwaysNo - 2 - - - 570 - - - - title: delegate.pithosBrowserController.accountNode.pithosAccount - - - - - - title: delegate.pithosBrowserController.accountNode.pithosAccount - title - delegate.pithosBrowserController.accountNode.pithosAccount - - NSValueTransformerName - UsingSizeTransformer - - 2 - - - 575 - - - - delegate - - - - 593 - - - - delegate - - - - 599 - - - - value: delegate.openAtLogin - - - - - - value: delegate.openAtLogin - value - delegate.openAtLogin - - YES - - YES - NSAllowsEditingMultipleValuesSelection - NSValidatesImmediately - - - YES - - - - - 2 - - - 618 - - - - enabled: delegate.openAtLoginEnabled - - - - - - enabled: delegate.openAtLoginEnabled - enabled - delegate.openAtLoginEnabled - 2 - - - 619 - - - - - YES - - 0 - - YES - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - YES - - - - - - - - - - - - 19 - - - YES - - - - - - 56 - - - YES - - - - - - 217 - - - YES - - - - - - 83 - - - YES - - - - - - 81 - - - YES - - - - - - - - - - - - - - - - 75 - - - - - 80 - - - - - 78 - - - - - 72 - - - - - 82 - - - - - 124 - - - YES - - - - - - 77 - - - - - 73 - - - - - 79 - - - - - 112 - - - - - 74 - - - - - 125 - - - YES - - - - - - 126 - - - - - 205 - - - YES - - - - - - - - - - - - - - - - - - - - 202 - - - - - 198 - - - - - 207 - - - - - 214 - - - - - 199 - - - - - 203 - - - - - 197 - - - - - 206 - - - - - 215 - - - - - 218 - - - YES - - - - - - 216 - - - YES - - - - - - 200 - - - YES - - - - - - - - - - - 219 - - - - - 201 - - - - - 204 - - - - - 220 - - - YES - - - - - - - - - - 213 - - - - - 210 - - - - - 221 - - - - - 208 - - - - - 209 - - - - - 57 - - - YES - - - - - - - - - - - - - - - - 58 - - - - - 134 - - - - - 150 - - - - - 136 - - - - - 144 - - - - - 129 - - - - - 143 - - - - - 236 - - - - - 131 - - - YES - - - - - - 149 - - - - - 145 - - - - - 130 - - - - - 24 - - - YES - - - - - - - - - 92 - - - - - 5 - - - - - 239 - - - - - 23 - - - - - 295 - - - YES - - - - - - 296 - - - YES - - - - - - - 297 - - - - - 298 - - - - - 211 - - - YES - + + enabled: delegate.openAtLoginEnabled + + + + + + enabled: delegate.openAtLoginEnabled + enabled + delegate.openAtLoginEnabled + 2 - + 619 + + + + + YES - 212 - - + 0 + YES - - - - - - 195 - - + + - 196 - - + -2 + + + File's Owner - 346 - - + -1 + + + First Responder - 348 - - - YES - - - + -3 + + + Application - 349 - + 29 + YES - - - - - - - + + + + - - - - 350 - - - - - 351 - - - - - 354 - - + - 375 - + 19 + YES - + - 376 - - - YES - - - - - - - 377 - - - YES - - - - - - 388 - - - YES - - - - - - - - - - - - - - - - - - - - - 389 - - - - - 390 - - - - - 391 - - - - - 392 - - - - - 393 - - - - - 394 - - - - - 395 - - - - - 396 - - - - - 397 - - - YES - - - - - - 398 - - - YES - - - - - - 399 - - - YES - - - - - - 400 - - - - - 401 - - - - - 402 - - - - - 403 - - - - - 404 - - - - - 405 - + 56 + YES - - - - - + - - - - 406 - - - - - 407 - - - - - 408 - - - - - 409 - - - - - 410 - - + - 411 - + 217 + YES - - - + - - - - 412 - - - - - 413 - - - - - 414 - - + - 415 - + 205 + YES - - - - + + + + + + - - - - 416 - - - - - 417 - - - - - 418 - - - - - 419 - - - - - 420 - - + - 450 - - - YES - - + 202 + - 451 - - - YES - - - - - - - - 452 - - - - - 453 - - - - - 454 - - - - - 457 - - - - - 459 - - - - - 460 - - - - - 462 - - - - - 465 - - + 198 + + - 466 - - + 199 + + - 485 - + 203 + - 490 - - - YES - - - + 197 + + - 491 - + 57 + YES - + + + + + + + + + + + - - - - 492 - - + - 494 - - + 58 + + - 496 - - - YES - - - + 134 + + - 497 - - - YES - - - - - - - - - - - - + 150 + + - 498 - - + 136 + + - 499 - - + 144 + + - 500 - - + 129 + + - 501 - - + 143 + + - 502 - - + 236 + + - 503 - + 131 + YES - + - - - - 504 - - + - 505 - - + 149 + + - 506 - - + 145 + + - 507 - - + 130 + + - 508 - + 24 + YES - - - - - - - - - + + + + - - - - 509 - - - - - 510 - - - - - 511 - - + - 512 - - + 92 + + - 513 - - + 5 + + - 514 - - + 239 + + - 515 - - + 23 + + - 516 - - + 420 + + - 517 - - + 494 + + 535 @@ -3404,6 +1137,52 @@ Menu Item - Open at Login + + 83 + + + YES + + + + + + 81 + + + YES + + + + + + + + + 74 + + + + + 73 + + + + + 77 + + + + + 78 + + + + + 623 + + + @@ -3413,10 +1192,6 @@ -1.IBPluginDependency -2.IBPluginDependency -3.IBPluginDependency - 112.IBPluginDependency - 124.IBPluginDependency - 125.IBPluginDependency - 126.IBPluginDependency 129.IBPluginDependency 130.IBPluginDependency 131.IBPluginDependency @@ -3428,123 +1203,21 @@ 149.IBPluginDependency 150.IBPluginDependency 19.IBPluginDependency - 195.IBPluginDependency - 196.IBPluginDependency 197.IBPluginDependency 198.IBPluginDependency 199.IBPluginDependency - 200.IBPluginDependency - 201.IBPluginDependency 202.IBPluginDependency 203.IBPluginDependency - 204.IBPluginDependency 205.IBPluginDependency - 206.IBPluginDependency - 207.IBPluginDependency - 208.IBPluginDependency - 209.IBPluginDependency - 210.IBPluginDependency - 211.IBPluginDependency - 212.IBPluginDependency - 213.IBPluginDependency - 214.IBPluginDependency - 215.IBPluginDependency - 216.IBPluginDependency 217.IBPluginDependency - 218.IBPluginDependency - 219.IBPluginDependency - 220.IBPluginDependency - 221.IBPluginDependency 23.IBPluginDependency 236.IBPluginDependency 239.IBPluginDependency 24.IBPluginDependency 29.IBPluginDependency - 295.IBPluginDependency - 296.IBPluginDependency - 297.IBPluginDependency - 298.IBPluginDependency - 346.IBPluginDependency - 348.IBPluginDependency - 349.IBPluginDependency - 350.IBPluginDependency - 351.IBPluginDependency - 354.IBPluginDependency - 375.IBPluginDependency - 376.IBPluginDependency - 377.IBPluginDependency - 388.IBPluginDependency - 389.IBPluginDependency - 390.IBPluginDependency - 391.IBPluginDependency - 392.IBPluginDependency - 393.IBPluginDependency - 394.IBPluginDependency - 395.IBPluginDependency - 396.IBPluginDependency - 397.IBPluginDependency - 398.IBPluginDependency - 399.IBPluginDependency - 400.IBPluginDependency - 401.IBPluginDependency - 402.IBPluginDependency - 403.IBPluginDependency - 404.IBPluginDependency - 405.IBPluginDependency - 406.IBPluginDependency - 407.IBPluginDependency - 408.IBPluginDependency - 409.IBPluginDependency - 410.IBPluginDependency - 411.IBPluginDependency - 412.IBPluginDependency - 413.IBPluginDependency - 414.IBPluginDependency - 415.IBPluginDependency - 416.IBPluginDependency - 417.IBPluginDependency - 418.IBPluginDependency - 419.IBPluginDependency 420.IBPluginDependency - 450.IBPluginDependency - 451.IBPluginDependency - 452.IBPluginDependency - 453.IBPluginDependency - 454.IBPluginDependency - 457.IBPluginDependency - 459.IBPluginDependency - 460.IBPluginDependency - 462.IBPluginDependency - 465.IBPluginDependency - 466.IBPluginDependency - 485.IBPluginDependency - 490.IBPluginDependency - 491.IBPluginDependency - 492.IBPluginDependency 494.IBPluginDependency - 496.IBPluginDependency - 497.IBPluginDependency - 498.IBPluginDependency - 499.IBPluginDependency 5.IBPluginDependency - 500.IBPluginDependency - 501.IBPluginDependency - 502.IBPluginDependency - 503.IBPluginDependency - 504.IBPluginDependency - 505.IBPluginDependency - 506.IBPluginDependency - 507.IBPluginDependency - 508.IBPluginDependency - 509.IBPluginDependency - 510.IBPluginDependency - 511.IBPluginDependency - 512.IBPluginDependency - 513.IBPluginDependency - 514.IBPluginDependency - 515.IBPluginDependency - 516.IBPluginDependency - 517.IBPluginDependency 535.IBPluginDependency 536.IBPluginDependency 537.IBPluginDependency @@ -3565,16 +1238,12 @@ 603.IBPluginDependency 606.IBPluginDependency 607.IBPluginDependency - 72.IBPluginDependency + 623.IBPluginDependency 73.IBPluginDependency 74.IBPluginDependency - 75.IBPluginDependency 77.IBPluginDependency 78.IBPluginDependency - 79.IBPluginDependency - 80.IBPluginDependency 81.IBPluginDependency - 82.IBPluginDependency 83.IBPluginDependency 92.IBPluginDependency @@ -3622,112 +1291,6 @@ 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 - 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 - 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 - 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 - 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 - 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 YES @@ -3751,10 +1314,6 @@ 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 @@ -3769,9 +1328,99 @@ - 619 + 625 + + + + YES + + pithos_macosAppDelegate + NSObject + + YES + + YES + showPithosAbout: + showPithosBrowser: + showPithosPreferences: + + + YES + id + id + id + + + + YES + + YES + showPithosAbout: + showPithosBrowser: + showPithosPreferences: + + + YES + + showPithosAbout: + id + + + showPithosBrowser: + id + + + showPithosPreferences: + id + + + + + YES + + YES + accountsMenu + lastSyncMenu + statusMenu + + + YES + NSMenu + NSMenu + NSMenu + + + + YES + + YES + accountsMenu + lastSyncMenu + statusMenu + + + YES + + accountsMenu + NSMenu + + + lastSyncMenu + NSMenu + + + statusMenu + NSMenu + + + + + IBProjectSource + ./Classes/pithos_macosAppDelegate.h + + + - 0 IBCocoaFramework diff --git a/pithos-macos/pithos-macos-Info.plist b/pithos-macos/pithos-macos-Info.plist index bb59adb..909bbc7 100644 --- a/pithos-macos/pithos-macos-Info.plist +++ b/pithos-macos/pithos-macos-Info.plist @@ -35,8 +35,6 @@ 20120326a LSMinimumSystemVersion ${MACOSX_DEPLOYMENT_TARGET} - LSUIElement - NSMainNibFile MainMenu NSPrincipalClass -- 1.7.10.4