Revision: 5906
          http://skim-app.svn.sourceforge.net/skim-app/?rev=5906&view=rev
Author:   hofman
Date:     2009-10-18 14:11:45 +0000 (Sun, 18 Oct 2009)

Log Message:
-----------
also set label of root bookmark, so we don't need to add it separately to the 
popup

Modified Paths:
--------------
    trunk/SKBookmark.m
    trunk/SKTextFieldSheetController.m

Modified: trunk/SKBookmark.m
===================================================================
--- trunk/SKBookmark.m  2009-10-18 14:08:11 UTC (rev 5905)
+++ trunk/SKBookmark.m  2009-10-18 14:11:45 UTC (rev 5906)
@@ -250,7 +250,7 @@
 }
 
 - (id)initRootWithChildren:(NSArray *)aChildren {
-    return [[SKRootBookmark alloc] initFolderWithChildren:aChildren label:nil];
+    return [[SKRootBookmark alloc] initFolderWithChildren:aChildren 
label:NSLocalizedString(@"Bookmarks Menu", @"Menu item title")];
 }
 
 - (id)initSessionWithChildren:(NSArray *)aChildren label:(NSString *)aLabel {

Modified: trunk/SKTextFieldSheetController.m
===================================================================
--- trunk/SKTextFieldSheetController.m  2009-10-18 14:08:11 UTC (rev 5905)
+++ trunk/SKTextFieldSheetController.m  2009-10-18 14:11:45 UTC (rev 5906)
@@ -107,10 +107,7 @@
     SKBookmarkController *bookmarkController = [SKBookmarkController 
sharedBookmarkController];
     SKBookmark *root = [bookmarkController bookmarkRoot];
     [folderPopUp removeAllItems];
-    NSMenuItem *item = [[folderPopUp menu] 
addItemWithTitle:NSLocalizedString(@"Bookmarks Menu", @"Menu item title") 
action:NULL keyEquivalent:@""];
-    [item setImage:[root icon]];
-    [item setRepresentedObject:root];
-    [self addMenuItemsForBookmarks:[root children] level:1 toMenu:[folderPopUp 
menu]];
+    [self addMenuItemsForBookmarks:[NSArray arrayWithObjects:root, nil] 
level:0 toMenu:[folderPopUp menu]];
     [folderPopUp selectItemAtIndex:0];
     
     [super beginSheetModalForWindow:window modalDelegate:delegate 
didEndSelector:didEndSelector contextInfo:contextInfo];


This was sent by the SourceForge.net collaborative development platform, the 
world's largest Open Source development site.

------------------------------------------------------------------------------
Come build with us! The BlackBerry(R) Developer Conference in SF, CA
is the only developer event you need to attend this year. Jumpstart your
developing skills, take BlackBerry mobile applications to market and stay 
ahead of the curve. Join us from November 9 - 12, 2009. Register now!
http://p.sf.net/sfu/devconference
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to