Revision: 6546
http://skim-app.svn.sourceforge.net/skim-app/?rev=6546&view=rev
Author: hofman
Date: 2010-05-19 12:04:22 +0000 (Wed, 19 May 2010)
Log Message:
-----------
support bookmarks for .skim documents
Modified Paths:
--------------
trunk/SKMainWindowController_Actions.m
trunk/SKNotesDocument.h
trunk/SKNotesDocument.m
Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m 2010-05-19 11:58:08 UTC (rev
6545)
+++ trunk/SKMainWindowController_Actions.m 2010-05-19 12:04:22 UTC (rev
6546)
@@ -854,10 +854,8 @@
SKBookmarkController *bmController = [SKBookmarkController
sharedBookmarkController];
NSString *label = [controller stringValue];
NSMutableArray *setups = [NSMutableArray array];
- for (id document in [NSApp orderedDocuments]) {
- if ([document isKindOfClass:[SKMainDocument class]])
- [setups addObject:[document currentDocumentSetup]];
- }
+ for (id document in [NSApp orderedDocuments])
+ [setups addObject:[document currentDocumentSetup]];
[bmController addBookmarkForSetups:setups label:label
toFolder:[controller selectedFolder]];
}
}
Modified: trunk/SKNotesDocument.h
===================================================================
--- trunk/SKNotesDocument.h 2010-05-19 11:58:08 UTC (rev 6545)
+++ trunk/SKNotesDocument.h 2010-05-19 12:04:22 UTC (rev 6546)
@@ -67,7 +67,10 @@
- (IBAction)searchNotes:(id)sender;
- (IBAction)toggleStatusBar:(id)sender;
- (IBAction)toggleCaseInsensitiveSearch:(id)sender;
-
+- (IBAction)addBookmark:(id)sender;
+- (IBAction)addSetupBookmark:(id)sender;
+- (IBAction)addSessionBookmark:(id)sender;
+
- (void)setupToolbarForWindow:(NSWindow *)aWindow;
@end
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2010-05-19 11:58:08 UTC (rev 6545)
+++ trunk/SKNotesDocument.m 2010-05-19 12:04:22 UTC (rev 6546)
@@ -63,6 +63,9 @@
#import "NSPointerArray_SKExtensions.h"
#import "SKFloatMapTable.h"
#import "NSColor_SKExtensions.h"
+#import "SKBookmarkController.h"
+#import "SKBookmark.h"
+#import "SKTextFieldSheetController.h"
#define SKNotesDocumentWindowFrameAutosaveName @"SKNotesDocumentWindow"
@@ -457,6 +460,68 @@
[self searchNotes:searchField];
}
+- (void)bookmarkSheetDidEnd:(SKBookmarkSheetController *)controller
returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
+ if (returnCode == NSAlertDefaultReturn) {
+ SKBookmarkController *bmController = [SKBookmarkController
sharedBookmarkController];
+ NSString *path = [self fileName];
+ NSString *label = [controller stringValue];
+ [bmController addBookmarkForPath:path pageIndex:NSNotFound label:label
toFolder:[controller selectedFolder]];
+ }
+}
+
+- (IBAction)addBookmark:(id)sender {
+ SKBookmarkSheetController *bookmarkSheetController =
[[[SKBookmarkSheetController alloc] init] autorelease];
+
+ [bookmarkSheetController setStringValue:[self displayName]];
+
+ [bookmarkSheetController beginSheetModalForWindow: [self windowForSheet]
+ modalDelegate:self
+ didEndSelector:@selector(bookmarkSheetDidEnd:returnCode:contextInfo:)
+ contextInfo:NULL];
+}
+
+- (void)setupBookmarkSheetDidEnd:(SKBookmarkSheetController *)controller
returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
+ if (returnCode == NSAlertDefaultReturn) {
+ SKBookmarkController *bmController = [SKBookmarkController
sharedBookmarkController];
+ NSDictionary *setup = [self currentDocumentSetup];
+ NSString *label = [controller stringValue];
+ [bmController addBookmarkForSetup:setup label:label
toFolder:[controller selectedFolder]];
+ }
+}
+
+- (IBAction)addSetupBookmark:(id)sender {
+ SKBookmarkSheetController *bookmarkSheetController =
[[[SKBookmarkSheetController alloc] init] autorelease];
+
+ [bookmarkSheetController setStringValue:[self displayName]];
+
+ [bookmarkSheetController beginSheetModalForWindow: [self windowForSheet]
+ modalDelegate:self
+
didEndSelector:@selector(setupBookmarkSheetDidEnd:returnCode:contextInfo:)
+ contextInfo:NULL];
+}
+
+- (void)sessionBookmarkSheetDidEnd:(SKBookmarkSheetController *)controller
returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
+ if (returnCode == NSAlertDefaultReturn) {
+ SKBookmarkController *bmController = [SKBookmarkController
sharedBookmarkController];
+ NSString *label = [controller stringValue];
+ NSMutableArray *setups = [NSMutableArray array];
+ for (id document in [NSApp orderedDocuments])
+ [setups addObject:[document currentDocumentSetup]];
+ [bmController addBookmarkForSetups:setups label:label
toFolder:[controller selectedFolder]];
+ }
+}
+
+- (IBAction)addSessionBookmark:(id)sender {
+ SKBookmarkSheetController *bookmarkSheetController =
[[[SKBookmarkSheetController alloc] init] autorelease];
+
+ [bookmarkSheetController setStringValue:[self displayName]];
+
+ [bookmarkSheetController beginSheetModalForWindow: [self windowForSheet]
+ modalDelegate:self
+
didEndSelector:@selector(sessionBookmarkSheetDidEnd:returnCode:contextInfo:)
+ contextInfo:NULL];
+}
+
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem {
SEL action = [menuItem action];
if (action == @selector(toggleStatusBar:)) {
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit