Revision: 6381
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6381&view=rev
Author:   hofman
Date:     2010-03-26 13:27:07 +0000 (Fri, 26 Mar 2010)

Log Message:
-----------
move note type sheet controller to the controller classes from the outlineview

Modified Paths:
--------------
    trunk/SKMainWindowController.h
    trunk/SKMainWindowController.m
    trunk/SKMainWindowController_UI.h
    trunk/SKMainWindowController_UI.m
    trunk/SKNoteOutlineView.h
    trunk/SKNoteOutlineView.m
    trunk/SKNoteTypeSheetController.h
    trunk/SKNoteTypeSheetController.m
    trunk/SKNotesDocument.h
    trunk/SKNotesDocument.m

Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h      2010-03-26 13:05:16 UTC (rev 6380)
+++ trunk/SKMainWindowController.h      2010-03-26 13:27:07 UTC (rev 6381)
@@ -69,7 +69,7 @@
 
 @class PDFAnnotation, PDFSelection, SKGroupedSearchResult, SKFloatMapTable;
 @class SKPDFView, SKSecondaryPDFView, BDSKCollapsibleView, BDSKEdgeView, 
SKGradientView, SKColorSwatch, SKStatusBar, SKSplitView, SKThumbnailTableView, 
SKNoteOutlineView, SKTocOutlineView;
-...@class SKMainDocument, SKFullScreenWindow, SKNavigationWindow, 
SKSideWindow, SKProgressController, SKPageSheetController, 
SKScaleSheetController, SKPasswordSheetController, SKBookmarkSheetController, 
SKPresentationOptionsSheetController;
+...@class SKMainDocument, SKFullScreenWindow, SKNavigationWindow, 
SKSideWindow, SKProgressController, SKPageSheetController, 
SKScaleSheetController, SKPasswordSheetController, SKBookmarkSheetController, 
SKPresentationOptionsSheetController, SKNoteTypeSheetController;
 
 @interface SKMainWindowController : NSWindowController 
<SKSnapshotWindowControllerDelegate, SKThumbnailDelegate> {
     IBOutlet SKSplitView            *splitView;
@@ -86,7 +86,7 @@
     IBOutlet NSView                 *leftSideView;
     IBOutlet BDSKEdgeView           *leftSideEdgeView;
     IBOutlet BDSKCollapsibleView    *leftSideCollapsibleView;
-    IBOutlet SKGradientView       *leftSideGradientView;
+    IBOutlet SKGradientView         *leftSideGradientView;
     IBOutlet NSSegmentedControl     *leftSideButton;
     IBOutlet NSSearchField          *searchField;
     
@@ -94,7 +94,7 @@
     IBOutlet NSView                 *rightSideView;
     IBOutlet BDSKEdgeView           *rightSideEdgeView;
     IBOutlet BDSKCollapsibleView    *rightSideCollapsibleView;
-    IBOutlet SKGradientView       *rightSideGradientView;
+    IBOutlet SKGradientView         *rightSideGradientView;
     IBOutlet NSSegmentedControl     *rightSideButton;
     IBOutlet NSSearchField          *noteSearchField;
     
@@ -130,6 +130,7 @@
     IBOutlet NSArrayController      *noteArrayController;
     IBOutlet SKNoteOutlineView      *noteOutlineView;
     IBOutlet NSView                 *noteView;
+    SKNoteTypeSheetController       *noteTypeSheetController;
     NSMutableArray                  *notes;
     SKFloatMapTable                 *rowHeights;
 

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2010-03-26 13:05:16 UTC (rev 6380)
+++ trunk/SKMainWindowController.m      2010-03-26 13:27:07 UTC (rev 6381)
@@ -69,6 +69,7 @@
 #import "SKNoteOutlineView.h"
 #import "SKThumbnailTableView.h"
 #import "SKFindTableView.h"
+#import "SKNoteTypeSheetController.h";
 #import "SKAnnotationTypeImageCell.h"
 #import "NSWindowController_SKExtensions.h"
 #import "SKPDFToolTipWindow.h"
@@ -306,6 +307,7 @@
     SKDESTROY(presentationNotesDocument);
     SKDESTROY(leftSideButton);
     SKDESTROY(findButton);
+    SKDESTROY(noteTypeSheetController);
     [super dealloc];
 }
 
@@ -495,6 +497,10 @@
     if ([snapshotSetups count])
         [self showSnapshotsWithSetups:snapshotSetups];
     
+    noteTypeSheetController = [[SKNoteTypeSheetController alloc] init];
+    [noteTypeSheetController setDelegate:self];
+    [[noteOutlineView headerView] setMenu:[noteTypeSheetController 
noteTypeMenu]];
+    
     // typeSelectHelpers
     SKTypeSelectHelper *typeSelectHelper = [SKTypeSelectHelper 
typeSelectHelperWithMatchOption:SKFullStringMatch];
     [typeSelectHelper setMatchesImmediately:NO];
@@ -2696,7 +2702,7 @@
 }
 
 - (void)updateNoteFilterPredicate {
-    [noteArrayController setFilterPredicate:[noteOutlineView 
filterPredicateForSearchString:[noteSearchField stringValue] 
caseInsensitive:mwcFlags.caseInsensitiveNoteSearch]];
+    [noteArrayController setFilterPredicate:[noteTypeSheetController 
filterPredicateForSearchString:[noteSearchField stringValue] 
caseInsensitive:mwcFlags.caseInsensitiveNoteSearch]];
     [noteOutlineView reloadData];
 }
 

Modified: trunk/SKMainWindowController_UI.h
===================================================================
--- trunk/SKMainWindowController_UI.h   2010-03-26 13:05:16 UTC (rev 6380)
+++ trunk/SKMainWindowController_UI.h   2010-03-26 13:27:07 UTC (rev 6381)
@@ -41,9 +41,10 @@
 #import "SKThumbnailTableView.h"
 #import "SKTocOutlineView.h"
 #import "SKNoteOutlineView.h"
+#import "SKNoteTypeSheetController.h"
 
 
-...@interface SKMainWindowController (UI) <NSWindowDelegate, NSDrawerDelegate, 
SKThumbnailTableViewDelegate, NSTableViewDataSource, SKTocOutlineViewDelegate, 
SKNoteOutlineViewDelegate, SKOutlineViewDataSource>
+...@interface SKMainWindowController (UI) <NSWindowDelegate, NSDrawerDelegate, 
SKThumbnailTableViewDelegate, NSTableViewDataSource, SKTocOutlineViewDelegate, 
SKNoteOutlineViewDelegate, SKOutlineViewDataSource, 
SKNoteTypeSheetControllerDelegate>
 
 - (void)registerForNotifications;
 

Modified: trunk/SKMainWindowController_UI.m
===================================================================
--- trunk/SKMainWindowController_UI.m   2010-03-26 13:05:16 UTC (rev 6380)
+++ trunk/SKMainWindowController_UI.m   2010-03-26 13:27:07 UTC (rev 6381)
@@ -682,12 +682,6 @@
     }
 }
 
-- (void)outlineViewNoteTypesDidChange:(NSOutlineView *)ov {
-    if ([ov isEqual:noteOutlineView]) {
-        [self updateNoteFilterPredicate];
-    }
-}
-
 - (CGFloat)outlineView:(NSOutlineView *)ov heightOfRowByItem:(id)item {
     if ([ov isEqual:noteOutlineView]) {
         CGFloat rowHeight = [rowHeights floatForKey:item];
@@ -841,10 +835,6 @@
     return nil;
 }
 
-- (NSWindow *)outlineViewWindowForSheet:(NSOutlineView *)anOutlineView {
-    return [self window];
-}
-
 - (void)outlineView:(NSOutlineView *)ov typeSelectHelper:(SKTypeSelectHelper 
*)typeSelectHelper didFailToFindMatchForSearchString:(NSString *)searchString {
     if ([ov isEqual:noteOutlineView]) {
         [statusBar setRightStringValue:[NSString 
stringWithFormat:NSLocalizedString(@"No match: \"%...@\"", @"Status message"), 
searchString]];
@@ -1105,6 +1095,16 @@
     }
 }
 
+#pragma mark SKNoteTypeSheetController delegate protocol
+
+- (void)noteTypeSheetControllerNoteTypesDidChange:(SKNoteTypeSheetController 
*)controller {
+    [self updateNoteFilterPredicate];
+}
+
+- (NSWindow *)windowForNoteTypeSheetController:(SKNoteTypeSheetController 
*)controller {
+    return [self window];
+}
+
 #pragma mark SKPDFView delegate protocol
 
 - (void)PDFViewOpenPDF:(PDFView *)sender 
forRemoteGoToAction:(PDFActionRemoteGoTo *)action {

Modified: trunk/SKNoteOutlineView.h
===================================================================
--- trunk/SKNoteOutlineView.h   2010-03-26 13:05:16 UTC (rev 6380)
+++ trunk/SKNoteOutlineView.h   2010-03-26 13:27:07 UTC (rev 6381)
@@ -38,7 +38,6 @@
 
 #import <Cocoa/Cocoa.h>
 #import "SKOutlineView.h";
-#import "SKNoteTypeSheetController.h";
 
 
 @protocol SKNoteOutlineViewDelegate <SKOutlineViewDelegate>
@@ -46,19 +45,13 @@
 
 - (BOOL)outlineView:(NSOutlineView *)anOutlineView canResizeRowByItem:(id)item;
 - (void)outlineView:(NSOutlineView *)anOutlineView 
setHeightOfRow:(CGFloat)newHeight byItem:(id)item;
-- (void)outlineViewNoteTypesDidChange:(NSOutlineView *)anOutlineView;
 - (void)outlineViewCommandKeyPressedDuringNavigation:(NSOutlineView 
*)anOutlineView;
-- (NSWindow *)outlineViewWindowForSheet:(NSOutlineView *)anOutlineView;
 
 @end
 
 
-...@interface SKNoteOutlineView : SKOutlineView 
<SKNoteTypeSheetControllerDelegate> {    
-    SKNoteTypeSheetController *noteTypeSheetController;
-}
+...@interface SKNoteOutlineView : SKOutlineView
 
-- (NSPredicate *)filterPredicateForSearchString:(NSString *)searchString 
caseInsensitive:(BOOL)caseInsensitive;
-
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
 - (id <SKNoteOutlineViewDelegate>)delegate;
 - (void)setDelegate:(id <SKNoteOutlineViewDelegate>)newDelegate;

Modified: trunk/SKNoteOutlineView.m
===================================================================
--- trunk/SKNoteOutlineView.m   2010-03-26 13:05:16 UTC (rev 6380)
+++ trunk/SKNoteOutlineView.m   2010-03-26 13:27:07 UTC (rev 6381)
@@ -51,18 +51,9 @@
 
 + (BOOL)usesDefaultFontSize { return YES; }
 
-- (void)dealloc {
-    SKDESTROY(noteTypeSheetController);
-    [super dealloc];
-}
-
 - (void)awakeFromNib {
     [super awakeFromNib];
     
-    noteTypeSheetController = [[SKNoteTypeSheetController alloc] init];
-    [noteTypeSheetController setDelegate:self];
-    [[self headerView] setMenu:[noteTypeSheetController noteTypeMenu]];
-    
     [[self tableColumnWithIdentifier:COLOR_COLUMNID] 
setDataCell:[[[SKColorCell alloc] init] autorelease]];
     [[[self tableColumnWithIdentifier:NOTE_COLUMNID] headerCell] 
setTitle:NSLocalizedString(@"Note", @"Table header title")];
     [[[self tableColumnWithIdentifier:PAGE_COLUMNID] headerCell] 
setTitle:NSLocalizedString(@"Page", @"Table header title")];
@@ -201,55 +192,6 @@
     }
 }
 
-- (NSPredicate *)filterPredicateForSearchString:(NSString *)searchString 
caseInsensitive:(BOOL)caseInsensitive {
-    NSPredicate *filterPredicate = nil;
-    NSPredicate *typePredicate = nil;
-    NSPredicate *searchPredicate = nil;
-    NSArray *types = [noteTypeSheetController noteTypes];
-    if ([types count] < NUMBER_OF_TYPES) {
-        NSExpression *lhs = [NSExpression expressionForKeyPath:@"type"];
-        NSMutableArray *predicateArray = [NSMutableArray array];
-        
-        for (NSString *type in types) {
-            NSExpression *rhs = [NSExpression expressionForConstantValue:type];
-            NSPredicate *predicate = [NSComparisonPredicate 
predicateWithLeftExpression:lhs rightExpression:rhs 
modifier:NSDirectPredicateModifier type:NSEqualToPredicateOperatorType 
options:0];
-            [predicateArray addObject:predicate];
-        }
-        typePredicate = [NSCompoundPredicate 
orPredicateWithSubpredicates:predicateArray];
-    }
-    if (searchString && [searchString isEqualToString:@""] == NO) {
-        NSExpression *lhs = [NSExpression 
expressionForConstantValue:searchString];
-        NSExpression *rhs = [NSExpression expressionForKeyPath:@"string"];
-        NSUInteger options = NSDiacriticInsensitivePredicateOption;
-        if (caseInsensitive)
-            options |= NSCaseInsensitivePredicateOption;
-        NSPredicate *stringPredicate = [NSComparisonPredicate 
predicateWithLeftExpression:lhs rightExpression:rhs 
modifier:NSDirectPredicateModifier type:NSInPredicateOperatorType 
options:options];
-        rhs = [NSExpression expressionForKeyPath:@"text.string"];
-        NSPredicate *textPredicate = [NSComparisonPredicate 
predicateWithLeftExpression:lhs rightExpression:rhs 
modifier:NSDirectPredicateModifier type:NSInPredicateOperatorType 
options:options];
-        searchPredicate = [NSCompoundPredicate 
orPredicateWithSubpredicates:[NSArray arrayWithObjects:stringPredicate, 
textPredicate, nil]];
-    }
-    if (typePredicate) {
-        if (searchPredicate)
-            filterPredicate = [NSCompoundPredicate 
andPredicateWithSubpredicates:[NSArray arrayWithObjects:typePredicate, 
searchPredicate, nil]];
-        else
-            filterPredicate = typePredicate;
-    } else if (searchPredicate) {
-        filterPredicate = searchPredicate;
-    }
-    return filterPredicate;
-}
-
-#pragma mark SKNoteTypeSheetController delegate
-
-- (void)noteTypeSheetControllerNoteTypesDidChange:(SKNoteTypeSheetController 
*)controller {
-    if ([[self delegate] 
respondsToSelector:@selector(outlineViewNoteTypesDidChange:)])
-        [[self delegate] outlineViewNoteTypesDidChange:self];
-}
-
-- (NSWindow *)windowForNoteTypeSheetController:(SKNoteTypeSheetController 
*)controller {
-    return [[self delegate] 
respondsToSelector:@selector(outlineViewWindowForSheet:)] ? [[self delegate] 
outlineViewWindowForSheet:self] : [self window];
-}
-
 #pragma mark Delegate
 
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5

Modified: trunk/SKNoteTypeSheetController.h
===================================================================
--- trunk/SKNoteTypeSheetController.h   2010-03-26 13:05:16 UTC (rev 6380)
+++ trunk/SKNoteTypeSheetController.h   2010-03-26 13:27:07 UTC (rev 6381)
@@ -26,8 +26,11 @@
 }
 
 - (NSArray *)noteTypes;
+
 - (NSMenu *)noteTypeMenu;
 
+- (NSPredicate *)filterPredicateForSearchString:(NSString *)searchString 
caseInsensitive:(BOOL)caseInsensitive;
+
 - (id <SKNoteTypeSheetControllerDelegate>)delegate;
 - (void)setDelegate:(id <SKNoteTypeSheetControllerDelegate>)newDelegate;
 

Modified: trunk/SKNoteTypeSheetController.m
===================================================================
--- trunk/SKNoteTypeSheetController.m   2010-03-26 13:05:16 UTC (rev 6380)
+++ trunk/SKNoteTypeSheetController.m   2010-03-26 13:27:07 UTC (rev 6381)
@@ -75,6 +75,44 @@
     return types;
 }
 
+- (NSPredicate *)filterPredicateForSearchString:(NSString *)searchString 
caseInsensitive:(BOOL)caseInsensitive {
+    NSPredicate *filterPredicate = nil;
+    NSPredicate *typePredicate = nil;
+    NSPredicate *searchPredicate = nil;
+    NSArray *types = [self noteTypes];
+    if ([types count] < (NSUInteger)[noteTypeMenu numberOfItems]) {
+        NSExpression *lhs = [NSExpression expressionForKeyPath:@"type"];
+        NSMutableArray *predicateArray = [NSMutableArray array];
+        
+        for (NSString *type in types) {
+            NSExpression *rhs = [NSExpression expressionForConstantValue:type];
+            NSPredicate *predicate = [NSComparisonPredicate 
predicateWithLeftExpression:lhs rightExpression:rhs 
modifier:NSDirectPredicateModifier type:NSEqualToPredicateOperatorType 
options:0];
+            [predicateArray addObject:predicate];
+        }
+        typePredicate = [NSCompoundPredicate 
orPredicateWithSubpredicates:predicateArray];
+    }
+    if (searchString && [searchString isEqualToString:@""] == NO) {
+        NSExpression *lhs = [NSExpression 
expressionForConstantValue:searchString];
+        NSExpression *rhs = [NSExpression expressionForKeyPath:@"string"];
+        NSUInteger options = NSDiacriticInsensitivePredicateOption;
+        if (caseInsensitive)
+            options |= NSCaseInsensitivePredicateOption;
+        NSPredicate *stringPredicate = [NSComparisonPredicate 
predicateWithLeftExpression:lhs rightExpression:rhs 
modifier:NSDirectPredicateModifier type:NSInPredicateOperatorType 
options:options];
+        rhs = [NSExpression expressionForKeyPath:@"text.string"];
+        NSPredicate *textPredicate = [NSComparisonPredicate 
predicateWithLeftExpression:lhs rightExpression:rhs 
modifier:NSDirectPredicateModifier type:NSInPredicateOperatorType 
options:options];
+        searchPredicate = [NSCompoundPredicate 
orPredicateWithSubpredicates:[NSArray arrayWithObjects:stringPredicate, 
textPredicate, nil]];
+    }
+    if (typePredicate) {
+        if (searchPredicate)
+            filterPredicate = [NSCompoundPredicate 
andPredicateWithSubpredicates:[NSArray arrayWithObjects:typePredicate, 
searchPredicate, nil]];
+        else
+            filterPredicate = typePredicate;
+    } else if (searchPredicate) {
+        filterPredicate = searchPredicate;
+    }
+    return filterPredicate;
+}
+
 - (void)noteTypesUpdated {
     [delegate noteTypeSheetControllerNoteTypesDidChange:self];
 }

Modified: trunk/SKNotesDocument.h
===================================================================
--- trunk/SKNotesDocument.h     2010-03-26 13:05:16 UTC (rev 6380)
+++ trunk/SKNotesDocument.h     2010-03-26 13:27:07 UTC (rev 6381)
@@ -39,10 +39,11 @@
 #import <Cocoa/Cocoa.h>
 #import <Quartz/Quartz.h>
 #import "SKNoteOutlineView.h"
+#import "SKNoteTypeSheetController.h"
 
 @class SKNoteOutlineView, SKStatusBar, SKFloatMapTable;
 
-...@interface SKNotesDocument : NSDocument <NSWindowDelegate, 
NSToolbarDelegate, SKNoteOutlineViewDelegate, NSOutlineViewDataSource> {
+...@interface SKNotesDocument : NSDocument <NSWindowDelegate, 
NSToolbarDelegate, SKNoteOutlineViewDelegate, NSOutlineViewDataSource, 
SKNoteTypeSheetControllerDelegate> {
     IBOutlet SKNoteOutlineView *outlineView;
     IBOutlet NSArrayController *arrayController;
     IBOutlet SKStatusBar *statusBar;
@@ -51,6 +52,7 @@
     NSArray *notes;
     PDFDocument *pdfDocument;
     SKFloatMapTable *rowHeights;
+    SKNoteTypeSheetController *noteTypeSheetController;
     BOOL exportUsingPanel;
     BOOL caseInsensitiveSearch;
 }

Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m     2010-03-26 13:05:16 UTC (rev 6380)
+++ trunk/SKNotesDocument.m     2010-03-26 13:27:07 UTC (rev 6381)
@@ -100,6 +100,7 @@
        SKDESTROY(rowHeights);
     SKDESTROY(toolbarItems);
     SKDESTROY(statusBar);
+    SKDESTROY(noteTypeSheetController);
     [super dealloc];
 }
 
@@ -137,6 +138,11 @@
     [outlineView reloadData];
     
     [outlineView setTypeSelectHelper:[SKTypeSelectHelper 
typeSelectHelperWithMatchOption:SKSubstringMatch]];
+    
+    noteTypeSheetController = [[SKNoteTypeSheetController alloc] init];
+    [noteTypeSheetController setDelegate:self];
+    [[outlineView headerView] setMenu:[noteTypeSheetController noteTypeMenu]];
+    
 }
 
 - (NSArray *)writableTypesForSaveOperation:(NSSaveOperationType)saveOperation {
@@ -302,7 +308,7 @@
 }
 
 - (void)updateNoteFilterPredicate {
-    [arrayController setFilterPredicate:[outlineView 
filterPredicateForSearchString:[searchField stringValue] 
caseInsensitive:caseInsensitiveSearch]];
+    [arrayController setFilterPredicate:[noteTypeSheetController 
filterPredicateForSearchString:[searchField stringValue] 
caseInsensitive:caseInsensitiveSearch]];
     [outlineView reloadData];
 }
 
@@ -515,10 +521,6 @@
     [ov reloadData];
 }
 
-- (void)outlineViewNoteTypesDidChange:(NSOutlineView *)ov {
-    [self updateNoteFilterPredicate];
-}
-
 - (void)outlineView:(NSOutlineView *)ov copyItems:(NSArray *)items  {
     NSPasteboard *pboard = [NSPasteboard generalPasteboard];
     NSMutableArray *types = [NSMutableArray array];
@@ -634,6 +636,16 @@
     }
 }
 
+#pragma mark SKNoteTypeSheetController delegate protocol
+
+- (void)noteTypeSheetControllerNoteTypesDidChange:(SKNoteTypeSheetController 
*)controller {
+    [self updateNoteFilterPredicate];
+}
+
+- (NSWindow *)windowForNoteTypeSheetController:(SKNoteTypeSheetController 
*)controller {
+    return [outlineView window];
+}
+
 #pragma mark Toolbar
 
 - (void)setupToolbar:(NSWindowController *)aController {


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

------------------------------------------------------------------------------
Download Intel&#174; Parallel Studio Eval
Try the new software tools for yourself. Speed compiling, find bugs
proactively, and fine-tune applications for parallel performance.
See why Intel Parallel Studio got high marks during beta.
http://p.sf.net/sfu/intel-sw-dev
_______________________________________________
Skim-app-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/skim-app-commit

Reply via email to