Revision: 11510
http://bibdesk.svn.sourceforge.net/bibdesk/?rev=11510&view=rev
Author: hofman
Date: 2007-11-09 11:41:04 -0800 (Fri, 09 Nov 2007)
Log Message:
-----------
Choose folder to add new search bookmarks to.
Modified Paths:
--------------
trunk/bibdesk/BibDocument.h
trunk/bibdesk/BibDocument_Groups.m
trunk/bibdesk/English.lproj/BibDocument.nib/classes.nib
trunk/bibdesk/English.lproj/BibDocument.nib/info.nib
trunk/bibdesk/English.lproj/BibDocument.nib/keyedobjects.nib
trunk/bibdesk/French.lproj/BibDocument.nib/classes.nib
trunk/bibdesk/French.lproj/BibDocument.nib/info.nib
trunk/bibdesk/French.lproj/BibDocument.nib/keyedobjects.nib
Modified: trunk/bibdesk/BibDocument.h
===================================================================
--- trunk/bibdesk/BibDocument.h 2007-11-09 19:24:43 UTC (rev 11509)
+++ trunk/bibdesk/BibDocument.h 2007-11-09 19:41:04 UTC (rev 11510)
@@ -184,6 +184,7 @@
IBOutlet NSWindow *searchBookmarkSheet;
IBOutlet NSTextField *searchBookmarkField;
+ IBOutlet NSPopUpButton *searchBookmarkPopUp;
#pragma mark Macros, Document Info and Front Matter variables
Modified: trunk/bibdesk/BibDocument_Groups.m
===================================================================
--- trunk/bibdesk/BibDocument_Groups.m 2007-11-09 19:24:43 UTC (rev 11509)
+++ trunk/bibdesk/BibDocument_Groups.m 2007-11-09 19:41:04 UTC (rev 11510)
@@ -1009,10 +1009,26 @@
- (void)searchBookmarkSheetDidEnd:(NSWindow *)sheet returnCode:(int)returnCode
contextInfo:(void *)contextInfo {
if (returnCode == NSOKButton) {
BDSKGroup *group = [[self selectedGroups] lastObject];
- [[BDSKSearchBookmarkController sharedBookmarkController]
addBookmarkWithInfo:[group dictionaryValue] label:[searchBookmarkField
stringValue] toFolder:nil];
+ BDSKSearchBookmark *folder = [[searchBookmarkPopUp selectedItem]
representedObject];
+ [[BDSKSearchBookmarkController sharedBookmarkController]
addBookmarkWithInfo:[group dictionaryValue] label:[searchBookmarkField
stringValue] toFolder:folder];
}
}
+- (void)addMenuItemsForBookmarks:(NSArray *)bookmarksArray level:(int)level
toMenu:(NSMenu *)menu {
+ int i, iMax = [bookmarksArray count];
+ for (i = 0; i < iMax; i++) {
+ BDSKSearchBookmark *bm = [bookmarksArray objectAtIndex:i];
+ if ([bm bookmarkType] == BDSKSearchBookmarkTypeFolder) {
+ NSString *label = [bm label];
+ NSMenuItem *item = [menu addItemWithTitle:label ? label : @""
action:NULL keyEquivalent:@""];
+ [item setImage:[bm icon]];
+ [item setIndentationLevel:level];
+ [item setRepresentedObject:bm];
+ [self addMenuItemsForBookmarks:[bm children] level:level+1
toMenu:menu];
+ }
+ }
+}
+
- (IBAction)addSearchBookmark:(id)sender {
if ([self hasSearchGroupsSelected] == NO) {
NSBeep();
@@ -1021,6 +1037,12 @@
BDSKSearchGroup *group = (BDSKSearchGroup *)[[self selectedGroups]
lastObject];
[searchBookmarkField setStringValue:[NSString stringWithFormat:@"%@:
%@", [[group serverInfo] name], [group name]]];
+ [searchBookmarkPopUp removeAllItems];
+ NSArray *bookmarks = [[BDSKSearchBookmarkController
sharedBookmarkController] bookmarks];
+ NSMenuItem *item = [[searchBookmarkPopUp menu]
addItemWithTitle:NSLocalizedString(@"Bookmarks Menu", @"Menu item title")
action:NULL keyEquivalent:@""];
+ [item setImage:[NSImage imageNamed:@"SmallMenu"]];
+ [self addMenuItemsForBookmarks:bookmarks level:1
toMenu:[searchBookmarkPopUp menu]];
+ [searchBookmarkPopUp selectItemAtIndex:0];
[NSApp beginSheet:searchBookmarkSheet
modalForWindow:[self windowForSheet]
Modified: trunk/bibdesk/English.lproj/BibDocument.nib/classes.nib
===================================================================
--- trunk/bibdesk/English.lproj/BibDocument.nib/classes.nib 2007-11-09
19:24:43 UTC (rev 11509)
+++ trunk/bibdesk/English.lproj/BibDocument.nib/classes.nib 2007-11-09
19:41:04 UTC (rev 11510)
@@ -146,6 +146,7 @@
saveAccessoryView = NSView;
saveTextEncodingPopupButton = BDSKEncodingPopUpButton;
searchBookmarkField = NSTextField;
+ searchBookmarkPopUp = NSPopUpButton;
searchBookmarkSheet = NSWindow;
searchField = NSSearchField;
splitView = BDSKSplitView;
Modified: trunk/bibdesk/English.lproj/BibDocument.nib/info.nib
===================================================================
--- trunk/bibdesk/English.lproj/BibDocument.nib/info.nib 2007-11-09
19:24:43 UTC (rev 11509)
+++ trunk/bibdesk/English.lproj/BibDocument.nib/info.nib 2007-11-09
19:41:04 UTC (rev 11510)
@@ -23,14 +23,14 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
- <integer>1112</integer>
+ <integer>702</integer>
+ <integer>433</integer>
+ <integer>923</integer>
<integer>661</integer>
- <integer>433</integer>
<integer>819</integer>
- <integer>923</integer>
<integer>5</integer>
+ <integer>1112</integer>
<integer>101126</integer>
- <integer>702</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/bibdesk/English.lproj/BibDocument.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/bibdesk/French.lproj/BibDocument.nib/classes.nib
===================================================================
--- trunk/bibdesk/French.lproj/BibDocument.nib/classes.nib 2007-11-09
19:24:43 UTC (rev 11509)
+++ trunk/bibdesk/French.lproj/BibDocument.nib/classes.nib 2007-11-09
19:41:04 UTC (rev 11510)
@@ -146,6 +146,7 @@
saveAccessoryView = NSView;
saveTextEncodingPopupButton = BDSKEncodingPopUpButton;
searchBookmarkField = NSTextField;
+ searchBookmarkPopUp = NSPopUpButton;
searchBookmarkSheet = NSWindow;
searchField = NSSearchField;
splitView = BDSKSplitView;
Modified: trunk/bibdesk/French.lproj/BibDocument.nib/info.nib
===================================================================
--- trunk/bibdesk/French.lproj/BibDocument.nib/info.nib 2007-11-09 19:24:43 UTC
(rev 11509)
+++ trunk/bibdesk/French.lproj/BibDocument.nib/info.nib 2007-11-09 19:41:04 UTC
(rev 11510)
@@ -9,7 +9,7 @@
<key>101126</key>
<string>89 370 193 68 0 0 1600 1178 </string>
<key>433</key>
- <string>81 314 323 408 0 0 1440 938 </string>
+ <string>81 314 319 408 0 0 1440 938 </string>
<key>661</key>
<string>532 585 376 112 0 0 1440 938 </string>
<key>702</key>
@@ -24,10 +24,11 @@
<key>IBOpenObjects</key>
<array>
<integer>661</integer>
+ <integer>1112</integer>
+ <integer>923</integer>
<integer>5</integer>
+ <integer>433</integer>
<integer>702</integer>
- <integer>923</integer>
- <integer>433</integer>
</array>
<key>IBSystem Version</key>
<string>8R218</string>
Modified: trunk/bibdesk/French.lproj/BibDocument.nib/keyedobjects.nib
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
-------------------------------------------------------------------------
This SF.net email is sponsored by: Splunk Inc.
Still grepping through log files to find problems? Stop.
Now Search log events and configuration files using AJAX and a browser.
Download your FREE copy of Splunk now >> http://get.splunk.com/
_______________________________________________
Bibdesk-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/bibdesk-commit
