Revision: 7631
http://skim-app.svn.sourceforge.net/skim-app/?rev=7631&view=rev
Author: hofman
Date: 2012-01-23 18:11:51 +0000 (Mon, 23 Jan 2012)
Log Message:
-----------
move bookmark sheet controller class to separate files
Modified Paths:
--------------
trunk/NSDocument_SKExtensions.m
trunk/SKTextFieldSheetController.h
trunk/SKTextFieldSheetController.m
trunk/Skim.xcodeproj/project.pbxproj
Added Paths:
-----------
trunk/SKBookmarkSheetController.h
trunk/SKBookmarkSheetController.m
Modified: trunk/NSDocument_SKExtensions.m
===================================================================
--- trunk/NSDocument_SKExtensions.m 2012-01-23 12:36:40 UTC (rev 7630)
+++ trunk/NSDocument_SKExtensions.m 2012-01-23 18:11:51 UTC (rev 7631)
@@ -46,7 +46,7 @@
#import "SKFDFParser.h"
#import "PDFAnnotation_SKExtensions.h"
#import "NSString_SKExtensions.h"
-#import "SKTextFieldSheetController.h"
+#import "SKBookmarkSheetController.h"
#import "SKBookmarkController.h"
#import "SKBookmark.h"
#import "NSWindowController_SKExtensions.h"
Added: trunk/SKBookmarkSheetController.h
===================================================================
--- trunk/SKBookmarkSheetController.h (rev 0)
+++ trunk/SKBookmarkSheetController.h 2012-01-23 18:11:51 UTC (rev 7631)
@@ -0,0 +1,51 @@
+//
+// SKBookmarkSheetController.h
+// Skim
+//
+// Created by Christiaan Hofman on 1/23/12.
+/*
+ This software is Copyright (c) 2012
+ Christiaan Hofman. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ - Neither the name of Christiaan Hofman nor the names of any
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import <Cocoa/Cocoa.h>
+#import "SKTextFieldSheetController.h"
+
+@class SKBookmark;
+
+@interface SKBookmarkSheetController : SKTextFieldSheetController {
+ NSPopUpButton *folderPopUp;
+}
+
+@property (nonatomic, retain) IBOutlet NSPopUpButton *folderPopUp;
+@property (nonatomic, readonly) SKBookmark *selectedFolder;
+
+@end
Added: trunk/SKBookmarkSheetController.m
===================================================================
--- trunk/SKBookmarkSheetController.m (rev 0)
+++ trunk/SKBookmarkSheetController.m 2012-01-23 18:11:51 UTC (rev 7631)
@@ -0,0 +1,86 @@
+//
+// SKBookmarkSheetController.m
+// Skim
+//
+// Created by Christiaan Hofman on 1/23/12.
+/*
+ This software is Copyright (c) 2012
+ Christiaan Hofman. All rights reserved.
+
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ - Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+
+ - Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in
+ the documentation and/or other materials provided with the
+ distribution.
+
+ - Neither the name of Christiaan Hofman nor the names of any
+ contributors may be used to endorse or promote products derived
+ from this software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+#import "SKBookmarkSheetController.h"
+#import "SKBookmarkController.h"
+#import "SKBookmark.h"
+#import "NSMenu_SKExtensions.h"
+#import "NSWindowController_SKExtensions.h"
+
+
+@implementation SKBookmarkSheetController
+
+@synthesize folderPopUp;
+@dynamic selectedFolder;
+
+- (void)dealloc {
+ SKDESTROY(folderPopUp);
+ [super dealloc];
+}
+
+- (NSString *)windowNibName { return @"BookmarkSheet"; }
+
+- (void)addMenuItemsForBookmarks:(NSArray *)bookmarks level:(NSInteger)level
toMenu:(NSMenu *)menu {
+ for (SKBookmark *bm in bookmarks) {
+ if ([bm bookmarkType] == SKBookmarkTypeFolder) {
+ NSString *label = [bm label];
+ NSMenuItem *item = [menu addItemWithTitle:label ?: @"" action:NULL
keyEquivalent:@""];
+ [item setImageAndSize:[bm icon]];
+ [item setIndentationLevel:level];
+ [item setRepresentedObject:bm];
+ [self addMenuItemsForBookmarks:[bm children] level:level+1
toMenu:menu];
+ }
+ }
+}
+
+- (void)beginSheetModalForWindow:(NSWindow *)window modalDelegate:(id)delegate
didEndSelector:(SEL)didEndSelector contextInfo:(void *)contextInfo {
+ SKBookmarkController *bookmarkController = [SKBookmarkController
sharedBookmarkController];
+ SKBookmark *root = [bookmarkController bookmarkRoot];
+ [self window];
+ [folderPopUp removeAllItems];
+ [self addMenuItemsForBookmarks:[NSArray arrayWithObjects:root, nil]
level:0 toMenu:[folderPopUp menu]];
+ [folderPopUp selectItemAtIndex:0];
+
+ [super beginSheetModalForWindow:window modalDelegate:delegate
didEndSelector:didEndSelector contextInfo:contextInfo];
+}
+
+- (SKBookmark *)selectedFolder {
+ return [[folderPopUp selectedItem] representedObject];
+}
+
+@end
Modified: trunk/SKTextFieldSheetController.h
===================================================================
--- trunk/SKTextFieldSheetController.h 2012-01-23 12:36:40 UTC (rev 7630)
+++ trunk/SKTextFieldSheetController.h 2012-01-23 18:11:51 UTC (rev 7631)
@@ -52,14 +52,3 @@
@property (nonatomic, retain) NSString *stringValue;
@end
-
-#pragma mark -
-
-@class SKBookmark;
-
-@interface SKBookmarkSheetController : SKTextFieldSheetController {
- NSPopUpButton *folderPopUp;
-}
-@property (nonatomic, retain) IBOutlet NSPopUpButton *folderPopUp;
-@property (nonatomic, readonly) SKBookmark *selectedFolder;
-@end
Modified: trunk/SKTextFieldSheetController.m
===================================================================
--- trunk/SKTextFieldSheetController.m 2012-01-23 12:36:40 UTC (rev 7630)
+++ trunk/SKTextFieldSheetController.m 2012-01-23 18:11:51 UTC (rev 7631)
@@ -37,10 +37,6 @@
*/
#import "SKTextFieldSheetController.h"
-#import "SKBookmarkController.h"
-#import "SKBookmark.h"
-#import "NSWindowController_SKExtensions.h"
-#import "NSMenu_SKExtensions.h"
#import "NSGraphics_SKExtensions.h"
@@ -83,47 +79,3 @@
}
@end
-
-#pragma mark -
-
-@implementation SKBookmarkSheetController
-
-@synthesize folderPopUp;
-@dynamic selectedFolder;
-
-- (void)dealloc {
- SKDESTROY(folderPopUp);
- [super dealloc];
-}
-
-- (NSString *)windowNibName { return @"BookmarkSheet"; }
-
-- (void)addMenuItemsForBookmarks:(NSArray *)bookmarks level:(NSInteger)level
toMenu:(NSMenu *)menu {
- for (SKBookmark *bm in bookmarks) {
- if ([bm bookmarkType] == SKBookmarkTypeFolder) {
- NSString *label = [bm label];
- NSMenuItem *item = [menu addItemWithTitle:label ?: @"" action:NULL
keyEquivalent:@""];
- [item setImageAndSize:[bm icon]];
- [item setIndentationLevel:level];
- [item setRepresentedObject:bm];
- [self addMenuItemsForBookmarks:[bm children] level:level+1
toMenu:menu];
- }
- }
-}
-
-- (void)beginSheetModalForWindow:(NSWindow *)window modalDelegate:(id)delegate
didEndSelector:(SEL)didEndSelector contextInfo:(void *)contextInfo {
- SKBookmarkController *bookmarkController = [SKBookmarkController
sharedBookmarkController];
- SKBookmark *root = [bookmarkController bookmarkRoot];
- [self window];
- [folderPopUp removeAllItems];
- [self addMenuItemsForBookmarks:[NSArray arrayWithObjects:root, nil]
level:0 toMenu:[folderPopUp menu]];
- [folderPopUp selectItemAtIndex:0];
-
- [super beginSheetModalForWindow:window modalDelegate:delegate
didEndSelector:didEndSelector contextInfo:contextInfo];
-}
-
-- (SKBookmark *)selectedFolder {
- return [[folderPopUp selectedItem] representedObject];
-}
-
-@end
Modified: trunk/Skim.xcodeproj/project.pbxproj
===================================================================
--- trunk/Skim.xcodeproj/project.pbxproj 2012-01-23 12:36:40 UTC (rev
7630)
+++ trunk/Skim.xcodeproj/project.pbxproj 2012-01-23 18:11:51 UTC (rev
7631)
@@ -248,6 +248,7 @@
CEE8DFC90E5C806400EFA97F /* Sparkle.framework in Copy Files:
Frameworks */ = {isa = PBXBuildFile; fileRef = CE2BD8200BD4127A00A5F4DB /*
Sparkle.framework */; };
CEE8DFCE0E5C809C00EFA97F /* SkimNotes.framework in Frameworks
*/ = {isa = PBXBuildFile; fileRef = CE7DC7320E09286500D6D76D /*
SkimNotes.framework */; };
CEE8DFCF0E5C809C00EFA97F /* Sparkle.framework in Frameworks */
= {isa = PBXBuildFile; fileRef = CE2BD8200BD4127A00A5F4DB /* Sparkle.framework
*/; };
+ CEE9BC0814CDD98100262718 /* SKBookmarkSheetController.m in
Sources */ = {isa = PBXBuildFile; fileRef = CEE9BC0714CDD98100262718 /*
SKBookmarkSheetController.m */; };
CEEC0A0A0DCB2594003DD9B6 /* SKMainWindowController_UI.m in
Sources */ = {isa = PBXBuildFile; fileRef = CEEC0A090DCB2594003DD9B6 /*
SKMainWindowController_UI.m */; };
CEECD61C12E9E30B00B9E35E /* NSError_SKExtensions.m in Sources
*/ = {isa = PBXBuildFile; fileRef = CEECD61B12E9E30B00B9E35E /*
NSError_SKExtensions.m */; };
CEEE7C520E7D3F2000B7B208 /* PDFAnnotationInk_SKExtensions.m in
Sources */ = {isa = PBXBuildFile; fileRef = CEEE7C510E7D3F2000B7B208 /*
PDFAnnotationInk_SKExtensions.m */; };
@@ -963,6 +964,8 @@
CEE54F8F0DA3FE9A0037169F /* NSValueTransformer_SKExtensions.m
*/ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = NSValueTransformer_SKExtensions.m; sourceTree =
"<group>"; };
CEE73ECC106CEC1900419544 /* SKSeparatorCell.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
SKSeparatorCell.h; sourceTree = "<group>"; };
CEE73ECD106CEC1900419544 /* SKSeparatorCell.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path
= SKSeparatorCell.m; sourceTree = "<group>"; };
+ CEE9BC0614CDD98100262718 /* SKBookmarkSheetController.h */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
path = SKBookmarkSheetController.h; sourceTree = "<group>"; };
+ CEE9BC0714CDD98100262718 /* SKBookmarkSheetController.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = SKBookmarkSheetController.m; sourceTree = "<group>";
};
CEEC0A080DCB2594003DD9B6 /* SKMainWindowController_UI.h */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
path = SKMainWindowController_UI.h; sourceTree = "<group>"; };
CEEC0A090DCB2594003DD9B6 /* SKMainWindowController_UI.m */ =
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType =
sourcecode.c.objc; path = SKMainWindowController_UI.m; sourceTree = "<group>";
};
CEECD61A12E9E30B00B9E35E /* NSError_SKExtensions.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
NSError_SKExtensions.h; sourceTree = "<group>"; };
@@ -1501,6 +1504,8 @@
4530D8C80B27B04D007C59F4 /*
SKApplicationController.m */,
CE4A659D0BAB1598004AD07D /*
SKBookmarkController.h */,
CE4A659E0BAB1598004AD07D /*
SKBookmarkController.m */,
+ CEE9BC0614CDD98100262718 /*
SKBookmarkSheetController.h */,
+ CEE9BC0714CDD98100262718 /*
SKBookmarkSheetController.m */,
CE31A6150C01FC45003612A9 /*
SKDocumentController.h */,
CE31A6160C01FC45003612A9 /*
SKDocumentController.m */,
2A37F4AEFDCFA73011CA2CEA /* SKMainDocument.h */,
@@ -2558,6 +2563,7 @@
CE1248C513FEDCF200FFAE20 /* SKTemplateManager.m
in Sources */,
CE139A171450207500E9C069 /*
NSGraphics_SKExtensions.m in Sources */,
CE0DE5BE149BBFC300F4085D /*
SKDictionaryFormatter.m in Sources */,
+ CEE9BC0814CDD98100262718 /*
SKBookmarkSheetController.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Try before you buy = See our experts in action!
The most comprehensive online learning library for Microsoft developers
is just $99.99! Visual Studio, SharePoint, SQL - plus HTML5, CSS3, MVC3,
Metro Style Apps, more. Free future releases when you subscribe now!
http://p.sf.net/sfu/learndevnow-dev2
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit
