Revision: 6604
http://skim-app.svn.sourceforge.net/skim-app/?rev=6604&view=rev
Author: hofman
Date: 2010-07-04 10:21:48 +0000 (Sun, 04 Jul 2010)
Log Message:
-----------
move add bookmark actions to document category as they're essentially the same
for all our document classes
Modified Paths:
--------------
trunk/NSDocument_SKExtensions.h
trunk/NSDocument_SKExtensions.m
trunk/SKMainWindowController_Actions.h
trunk/SKMainWindowController_Actions.m
trunk/SKNotesDocument.h
trunk/SKNotesDocument.m
Modified: trunk/NSDocument_SKExtensions.h
===================================================================
--- trunk/NSDocument_SKExtensions.h 2010-07-01 22:00:19 UTC (rev 6603)
+++ trunk/NSDocument_SKExtensions.h 2010-07-04 10:21:48 UTC (rev 6604)
@@ -59,6 +59,12 @@
- (PDFDocument *)pdfDocument;
+#pragma mark Bookmark Actions
+
+- (IBAction)addBookmark:(id)sender;
+- (IBAction)addSetupBookmark:(id)sender;
+- (IBAction)addSessionBookmark:(id)sender;
+
#pragma mark Notes
- (NSArray *)notes;
Modified: trunk/NSDocument_SKExtensions.m
===================================================================
--- trunk/NSDocument_SKExtensions.m 2010-07-01 22:00:19 UTC (rev 6603)
+++ trunk/NSDocument_SKExtensions.m 2010-07-04 10:21:48 UTC (rev 6604)
@@ -46,6 +46,10 @@
#import "SKFDFParser.h"
#import "PDFAnnotation_SKExtensions.h"
#import "NSString_SKExtensions.h"
+#import "SKTextFieldSheetController.h"
+#import "SKBookmarkController.h"
+#import "NSWindowController_SKExtensions.h"
+#import "PDFPage_SKExtensions.h"
NSString *SKDocumentErrorDomain = @"SKDocumentErrorDomain";
@@ -75,6 +79,71 @@
return setup;
}
+#pragma mark Bookmark Actions
+
+
+- (void)bookmarkSheetDidEnd:(SKBookmarkSheetController *)controller
returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
+ if (returnCode == NSAlertDefaultReturn) {
+ SKBookmarkController *bmController = [SKBookmarkController
sharedBookmarkController];
+ NSString *path = [[self fileURL] path];
+ NSString *label = [controller stringValue];
+ PDFPage *page = [self currentPage];
+ NSUInteger pageIndex = page ? [page pageIndex] : NSNotFound;
+ [bmController addBookmarkForPath:path pageIndex:pageIndex 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];
+ NSArray *setups = [[NSApp orderedDocuments]
valueForKey:@"currentDocumentSetup"];
+ NSString *label = [controller stringValue];
+ [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];
+}
+
#pragma mark PDF Document
- (PDFDocument *)pdfDocument { return nil; }
Modified: trunk/SKMainWindowController_Actions.h
===================================================================
--- trunk/SKMainWindowController_Actions.h 2010-07-01 22:00:19 UTC (rev
6603)
+++ trunk/SKMainWindowController_Actions.h 2010-07-04 10:21:48 UTC (rev
6604)
@@ -115,8 +115,5 @@
- (IBAction)toggleCaseInsensitiveSearch:(id)sender;
- (IBAction)toggleWholeWordSearch:(id)sender;
- (IBAction)toggleCaseInsensitiveNoteSearch:(id)sender;
-- (IBAction)addBookmark:(id)sender;
-- (IBAction)addSetupBookmark:(id)sender;
-- (IBAction)addSessionBookmark:(id)sender;
@end
Modified: trunk/SKMainWindowController_Actions.m
===================================================================
--- trunk/SKMainWindowController_Actions.m 2010-07-01 22:00:19 UTC (rev
6603)
+++ trunk/SKMainWindowController_Actions.m 2010-07-04 10:21:48 UTC (rev
6604)
@@ -58,7 +58,6 @@
#import "SKStatusBar.h"
#import "SKSideWindow.h"
#import "SKImageToolTipWindow.h"
-#import "SKBookmarkController.h"
#import "SKSplitView.h"
#import "SKLineInspector.h"
#import "NSEvent_SKExtensions.h"
@@ -795,67 +794,6 @@
contextInfo:NULL];
}
-- (void)bookmarkSheetDidEnd:(SKBookmarkSheetController *)controller
returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
- if (returnCode == NSAlertDefaultReturn) {
- SKBookmarkController *bmController = [SKBookmarkController
sharedBookmarkController];
- NSString *path = [[self document] fileName];
- NSString *label = [controller stringValue];
- NSUInteger pageIndex = [[pdfView currentPage] pageIndex];
- [bmController addBookmarkForPath:path pageIndex:pageIndex label:label
toFolder:[controller selectedFolder]];
- }
-}
-
-- (IBAction)addBookmark:(id)sender {
- SKBookmarkSheetController *bookmarkSheetController =
[[[SKBookmarkSheetController alloc] init] autorelease];
-
- [bookmarkSheetController setStringValue:[[self document] displayName]];
-
- [bookmarkSheetController beginSheetModalForWindow: [self window]
- 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 document] 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 document] displayName]];
-
- [bookmarkSheetController beginSheetModalForWindow: [self window]
- 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];
- NSArray *setups = [[NSApp orderedDocuments]
valueForKey:@"currentDocumentSetup"];
- NSString *label = [controller stringValue];
- [bmController addBookmarkForSetups:setups label:label
toFolder:[controller selectedFolder]];
- }
-}
-
-- (IBAction)addSessionBookmark:(id)sender {
- SKBookmarkSheetController *bookmarkSheetController =
[[[SKBookmarkSheetController alloc] init] autorelease];
-
- [bookmarkSheetController setStringValue:[[self document] displayName]];
-
- [bookmarkSheetController beginSheetModalForWindow: [self window]
- modalDelegate:self
-
didEndSelector:@selector(sessionBookmarkSheetDidEnd:returnCode:contextInfo:)
- contextInfo:NULL];
-}
-
- (IBAction)toggleReadingBar:(id)sender {
[pdfView toggleReadingBar];
}
Modified: trunk/SKNotesDocument.h
===================================================================
--- trunk/SKNotesDocument.h 2010-07-01 22:00:19 UTC (rev 6603)
+++ trunk/SKNotesDocument.h 2010-07-04 10:21:48 UTC (rev 6604)
@@ -68,9 +68,6 @@
- (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;
Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m 2010-07-01 22:00:19 UTC (rev 6603)
+++ trunk/SKNotesDocument.m 2010-07-04 10:21:48 UTC (rev 6604)
@@ -63,9 +63,6 @@
#import "NSPointerArray_SKExtensions.h"
#import "SKFloatMapTable.h"
#import "NSColor_SKExtensions.h"
-#import "SKBookmarkController.h"
-#import "SKBookmark.h"
-#import "SKTextFieldSheetController.h"
#define SKNotesDocumentWindowFrameAutosaveName @"SKNotesDocumentWindow"
@@ -469,68 +466,6 @@
[self searchNotes:searchField];
}
-- (void)bookmarkSheetDidEnd:(SKBookmarkSheetController *)controller
returnCode:(NSInteger)returnCode contextInfo:(void *)contextInfo {
- if (returnCode == NSAlertDefaultReturn) {
- SKBookmarkController *bmController = [SKBookmarkController
sharedBookmarkController];
- NSString *path = [[self fileURL] path];
- 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.
------------------------------------------------------------------------------
This SF.net email is sponsored by Sprint
What will you do first with EVO, the first 4G phone?
Visit sprint.com/first -- http://p.sf.net/sfu/sprint-com-first
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit