Revision: 6376
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6376&view=rev
Author:   hofman
Date:     2010-03-25 18:27:56 +0000 (Thu, 25 Mar 2010)

Log Message:
-----------
add separate controller class for note type sheet

Modified Paths:
--------------
    trunk/NoteTypeSheet.xib
    trunk/SKNoteOutlineView.h
    trunk/SKNoteOutlineView.m
    trunk/Skim.xcodeproj/project.pbxproj

Added Paths:
-----------
    trunk/SKNoteTypeSheetController.h
    trunk/SKNoteTypeSheetController.m

Modified: trunk/NoteTypeSheet.xib
===================================================================
--- trunk/NoteTypeSheet.xib     2010-03-25 16:23:50 UTC (rev 6375)
+++ trunk/NoteTypeSheet.xib     2010-03-25 18:27:56 UTC (rev 6376)
@@ -29,7 +29,7 @@
                <object class="NSMutableArray" key="IBDocument.RootObjects" 
id="587001468">
                        <bool key="EncodedWithXMLCoder">YES</bool>
                        <object class="NSCustomObject" id="1064028447">
-                               <string 
key="NSClassName">SKNoteOutlineView</string>
+                               <string 
key="NSClassName">SKNoteTypeSheetController</string>
                        </object>
                        <object class="NSCustomObject" id="56364642">
                                <string 
key="NSClassName">FirstResponder</string>
@@ -51,7 +51,7 @@
                                </object>
                                <string 
key="NSWindowContentMaxSize">{1.79769e+308, 1.79769e+308}</string>
                                <object class="NSView" key="NSWindowView" 
id="1020513606">
-                                       <nil key="NSNextResponder"/>
+                                       <reference key="NSNextResponder"/>
                                        <int key="NSvFlags">256</int>
                                        <object class="NSMutableArray" 
key="NSSubviews">
                                                <bool 
key="EncodedWithXMLCoder">YES</bool>
@@ -60,6 +60,7 @@
                                                        <int 
key="NSvFlags">256</int>
                                                        <string 
key="NSFrame">{{18, 60}, {238, 98}}</string>
                                                        <reference 
key="NSSuperview" ref="1020513606"/>
+                                                       <reference 
key="NSWindow"/>
                                                        <bool 
key="NSEnabled">YES</bool>
                                                        <int 
key="NSNumRows">5</int>
                                                        <int 
key="NSNumCols">2</int>
@@ -491,6 +492,7 @@
                                                        <int 
key="NSvFlags">256</int>
                                                        <string 
key="NSFrame">{{17, 166}, {233, 17}}</string>
                                                        <reference 
key="NSSuperview" ref="1020513606"/>
+                                                       <reference 
key="NSWindow"/>
                                                        <bool 
key="NSEnabled">YES</bool>
                                                        <object 
class="NSTextFieldCell" key="NSCell" id="276208791">
                                                                <int 
key="NSCellFlags">68288064</int>
@@ -515,6 +517,7 @@
                                                        <int 
key="NSvFlags">289</int>
                                                        <string 
key="NSFrame">{{178, 12}, {82, 32}}</string>
                                                        <reference 
key="NSSuperview" ref="1020513606"/>
+                                                       <reference 
key="NSWindow"/>
                                                        <int key="NSTag">1</int>
                                                        <bool 
key="NSEnabled">YES</bool>
                                                        <object 
class="NSButtonCell" key="NSCell" id="409954052">
@@ -538,6 +541,7 @@
                                                        <int 
key="NSvFlags">289</int>
                                                        <string 
key="NSFrame">{{96, 12}, {82, 32}}</string>
                                                        <reference 
key="NSSuperview" ref="1020513606"/>
+                                                       <reference 
key="NSWindow"/>
                                                        <bool 
key="NSEnabled">YES</bool>
                                                        <object 
class="NSButtonCell" key="NSCell" id="736292350">
                                                                <int 
key="NSCellFlags">67239424</int>
@@ -556,6 +560,8 @@
                                                </object>
                                        </object>
                                        <string key="NSFrameSize">{274, 
203}</string>
+                                       <reference key="NSSuperview"/>
+                                       <reference key="NSWindow"/>
                                </object>
                                <string key="NSScreenRect">{{0, 0}, {1440, 
938}}</string>
                                <string key="NSMaxSize">{1.79769e+308, 
1.79769e+308}</string>
@@ -568,76 +574,76 @@
                        <object class="NSMutableArray" key="connectionRecords">
                                <bool key="EncodedWithXMLCoder">YES</bool>
                                <object class="IBConnectionRecord">
+                                       <object 
class="IBAccessibilityConnection" key="connection">
+                                               <string 
key="label">link</string>
+                                               <reference key="source" 
ref="901007758"/>
+                                               <reference key="destination" 
ref="549627329"/>
+                                       </object>
+                                       <int key="connectionID">41</int>
+                               </object>
+                               <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" 
key="connection">
-                                               <string 
key="label">noteTypeSheet</string>
-                                               <reference key="source" 
ref="1064028447"/>
-                                               <reference key="destination" 
ref="987824132"/>
+                                               <string 
key="label">object1</string>
+                                               <reference key="source" 
ref="1038100127"/>
+                                               <reference key="destination" 
ref="901007758"/>
                                        </object>
-                                       <int key="connectionID">20</int>
+                                       <int key="connectionID">43</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" 
key="connection">
-                                               <string 
key="label">noteTypeMatrix</string>
-                                               <reference key="source" 
ref="1064028447"/>
-                                               <reference key="destination" 
ref="296787853"/>
+                                               <string 
key="label">object2</string>
+                                               <reference key="source" 
ref="1038100127"/>
+                                               <reference key="destination" 
ref="549627329"/>
                                        </object>
-                                       <int key="connectionID">21</int>
+                                       <int key="connectionID">44</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" 
key="connection">
-                                               <string 
key="label">dismissNoteTypeSheet:</string>
+                                               <string 
key="label">dismissSheet:</string>
                                                <reference key="source" 
ref="1064028447"/>
                                                <reference key="destination" 
ref="549627329"/>
                                        </object>
-                                       <int key="connectionID">22</int>
+                                       <int key="connectionID">46</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBActionConnection" 
key="connection">
-                                               <string 
key="label">dismissNoteTypeSheet:</string>
+                                               <string 
key="label">dismissSheet:</string>
                                                <reference key="source" 
ref="1064028447"/>
                                                <reference key="destination" 
ref="901007758"/>
                                        </object>
-                                       <int key="connectionID">23</int>
+                                       <int key="connectionID">47</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" 
key="connection">
-                                               <string 
key="label">noteTypeMessageField</string>
+                                               <string 
key="label">buttons</string>
                                                <reference key="source" 
ref="1064028447"/>
-                                               <reference key="destination" 
ref="302712256"/>
+                                               <reference key="destination" 
ref="1038100127"/>
                                        </object>
-                                       <int key="connectionID">40</int>
+                                       <int key="connectionID">48</int>
                                </object>
                                <object class="IBConnectionRecord">
-                                       <object 
class="IBAccessibilityConnection" key="connection">
-                                               <string 
key="label">link</string>
-                                               <reference key="source" 
ref="901007758"/>
-                                               <reference key="destination" 
ref="549627329"/>
-                                       </object>
-                                       <int key="connectionID">41</int>
-                               </object>
-                               <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" 
key="connection">
-                                               <string 
key="label">object1</string>
-                                               <reference key="source" 
ref="1038100127"/>
-                                               <reference key="destination" 
ref="901007758"/>
+                                               <string 
key="label">matrix</string>
+                                               <reference key="source" 
ref="1064028447"/>
+                                               <reference key="destination" 
ref="296787853"/>
                                        </object>
-                                       <int key="connectionID">43</int>
+                                       <int key="connectionID">49</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" 
key="connection">
-                                               <string 
key="label">object2</string>
-                                               <reference key="source" 
ref="1038100127"/>
-                                               <reference key="destination" 
ref="549627329"/>
+                                               <string 
key="label">messageField</string>
+                                               <reference key="source" 
ref="1064028447"/>
+                                               <reference key="destination" 
ref="302712256"/>
                                        </object>
-                                       <int key="connectionID">44</int>
+                                       <int key="connectionID">50</int>
                                </object>
                                <object class="IBConnectionRecord">
                                        <object class="IBOutletConnection" 
key="connection">
-                                               <string 
key="label">noteTypeButtons</string>
+                                               <string 
key="label">window</string>
                                                <reference key="source" 
ref="1064028447"/>
-                                               <reference key="destination" 
ref="1038100127"/>
+                                               <reference key="destination" 
ref="987824132"/>
                                        </object>
-                                       <int key="connectionID">45</int>
+                                       <int key="connectionID">51</int>
                                </object>
                        </object>
                        <object class="IBMutableOrderedSet" key="objectRecords">
@@ -845,7 +851,6 @@
                                        <string>35.IBPluginDependency</string>
                                        <string>36.IBPluginDependency</string>
                                        <string>37.IBPluginDependency</string>
-                                       <string>42.IBPluginDependency</string>
                                        
<string>5.IBEditorWindowLastContentRect</string>
                                        <string>5.IBPluginDependency</string>
                                        
<string>5.IBWindowTemplateEditedContentRect</string>
@@ -891,7 +896,6 @@
                                        
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
-                                       
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>{{445, 144}, {274, 
203}}</string>
                                        
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
                                        <string>{{445, 144}, {274, 
203}}</string>
@@ -924,7 +928,7 @@
                                </object>
                        </object>
                        <nil key="sourceID"/>
-                       <int key="maxID">45</int>
+                       <int key="maxID">51</int>
                </object>
                <object class="IBClassDescriber" key="IBDocument.Classes">
                        <object class="NSMutableArray" 
key="referencedPartialClassDescriptions">
@@ -1155,6 +1159,17 @@
                                        </object>
                                </object>
                                <object class="IBPartialClassDescription">
+                                       <string 
key="className">NSWindowController</string>
+                                       <object class="NSMutableDictionary" 
key="actions">
+                                               <string 
key="NS.key.0">dismissSheet:</string>
+                                               <string 
key="NS.object.0">id</string>
+                                       </object>
+                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string 
key="majorKey">IBProjectSource</string>
+                                               <string 
key="minorKey">NSWindowController_SKExtensions.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
                                        <string 
key="className">SKIBArray</string>
                                        <string 
key="superclassName">NSArray</string>
                                        <object class="NSMutableDictionary" 
key="outlets">
@@ -1166,6 +1181,10 @@
                                                        <string>object3</string>
                                                        <string>object4</string>
                                                        <string>object5</string>
+                                                       <string>object6</string>
+                                                       <string>object7</string>
+                                                       <string>object8</string>
+                                                       <string>object9</string>
                                                </object>
                                                <object class="NSMutableArray" 
key="dict.values">
                                                        <bool 
key="EncodedWithXMLCoder">YES</bool>
@@ -1174,6 +1193,10 @@
                                                        <string>id</string>
                                                        <string>id</string>
                                                        <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
+                                                       <string>id</string>
                                                </object>
                                        </object>
                                        <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -1182,13 +1205,12 @@
                                        </object>
                                </object>
                                <object class="IBPartialClassDescription">
-                                       <string 
key="className">SKNoteOutlineView</string>
-                                       <string 
key="superclassName">SKOutlineView</string>
+                                       <string 
key="className">SKNoteTypeSheetController</string>
+                                       <string 
key="superclassName">SKWindowController</string>
                                        <object class="NSMutableDictionary" 
key="actions">
                                                <bool 
key="EncodedWithXMLCoder">YES</bool>
                                                <object class="NSArray" 
key="dict.sortedKeys">
                                                        <bool 
key="EncodedWithXMLCoder">YES</bool>
-                                                       
<string>dismissNoteTypeSheet:</string>
                                                        
<string>displayAllNoteTypes:</string>
                                                        
<string>selectNoteTypes:</string>
                                                        
<string>toggleDisplayNoteType:</string>
@@ -1198,72 +1220,38 @@
                                                        <string>id</string>
                                                        <string>id</string>
                                                        <string>id</string>
-                                                       <string>id</string>
                                                </object>
                                        </object>
                                        <object class="NSMutableDictionary" 
key="outlets">
                                                <bool 
key="EncodedWithXMLCoder">YES</bool>
                                                <object class="NSArray" 
key="dict.sortedKeys">
                                                        <bool 
key="EncodedWithXMLCoder">YES</bool>
-                                                       
<string>noteTypeButtons</string>
-                                                       
<string>noteTypeMatrix</string>
-                                                       
<string>noteTypeMessageField</string>
-                                                       
<string>noteTypeSheet</string>
+                                                       <string>buttons</string>
+                                                       
<string>delegate</string>
+                                                       <string>matrix</string>
+                                                       
<string>messageField</string>
                                                </object>
                                                <object class="NSMutableArray" 
key="dict.values">
                                                        <bool 
key="EncodedWithXMLCoder">YES</bool>
-                                                       
<string>SKIBArray</string>
+                                                       <string>NSArray</string>
+                                                       <string>id</string>
                                                        
<string>NSMatrix</string>
                                                        
<string>NSTextField</string>
-                                                       
<string>NSWindow</string>
                                                </object>
                                        </object>
                                        <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string 
key="majorKey">IBProjectSource</string>
-                                               <string 
key="minorKey">SKNoteOutlineView.h</string>
+                                               <string 
key="minorKey">SKNoteTypeSheetController.h</string>
                                        </object>
                                </object>
                                <object class="IBPartialClassDescription">
-                                       <string 
key="className">SKNoteOutlineView</string>
-                                       <string 
key="superclassName">SKOutlineView</string>
+                                       <string 
key="className">SKWindowController</string>
+                                       <string 
key="superclassName">NSWindowController</string>
                                        <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string 
key="majorKey">IBUserSource</string>
-                                               <string key="minorKey"/>
-                                       </object>
-                               </object>
-                               <object class="IBPartialClassDescription">
-                                       <string 
key="className">SKOutlineView</string>
-                                       <string 
key="superclassName">NSOutlineView</string>
-                                       <object class="NSMutableDictionary" 
key="actions">
-                                               <bool 
key="EncodedWithXMLCoder">YES</bool>
-                                               <object class="NSArray" 
key="dict.sortedKeys">
-                                                       <bool 
key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>copy:</string>
-                                                       <string>delete:</string>
-                                                       
<string>scrollToBeginningOfDocument:</string>
-                                                       
<string>scrollToEndOfDocument:</string>
-                                               </object>
-                                               <object class="NSMutableArray" 
key="dict.values">
-                                                       <bool 
key="EncodedWithXMLCoder">YES</bool>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                                       <string>id</string>
-                                               </object>
-                                       </object>
-                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string 
key="majorKey">IBProjectSource</string>
-                                               <string 
key="minorKey">SKOutlineView.h</string>
+                                               <string 
key="minorKey">SKWindowController.h</string>
                                        </object>
                                </object>
-                               <object class="IBPartialClassDescription">
-                                       <string 
key="className">SKOutlineView</string>
-                                       <string 
key="superclassName">NSOutlineView</string>
-                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
-                                               <string 
key="majorKey">IBUserSource</string>
-                                               <string key="minorKey"/>
-                                       </object>
-                               </object>
                        </object>
                        <object class="NSMutableArray" 
key="referencedPartialClassDescriptionsV3.2+">
                                <bool key="EncodedWithXMLCoder">YES</bool>
@@ -1488,7 +1476,7 @@
                                </object>
                                <object class="IBPartialClassDescription">
                                        <string 
key="className">NSObject</string>
-                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier" id="33404510">
+                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string 
key="majorKey">IBFrameworkSource</string>
                                                <string 
key="minorKey">AppKit.framework/Headers/NSOutlineView.h</string>
                                        </object>
@@ -1509,7 +1497,7 @@
                                </object>
                                <object class="IBPartialClassDescription">
                                        <string 
key="className">NSObject</string>
-                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier" id="761297795">
+                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
                                                <string 
key="majorKey">IBFrameworkSource</string>
                                                <string 
key="minorKey">AppKit.framework/Headers/NSTableView.h</string>
                                        </object>
@@ -1733,11 +1721,6 @@
                                        </object>
                                </object>
                                <object class="IBPartialClassDescription">
-                                       <string 
key="className">NSOutlineView</string>
-                                       <string 
key="superclassName">NSTableView</string>
-                                       <reference key="sourceIdentifier" 
ref="33404510"/>
-                               </object>
-                               <object class="IBPartialClassDescription">
                                        <string key="className">NSPanel</string>
                                        <string 
key="superclassName">NSWindow</string>
                                        <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -1761,11 +1744,6 @@
                                        </object>
                                </object>
                                <object class="IBPartialClassDescription">
-                                       <string 
key="className">NSTableView</string>
-                                       <string 
key="superclassName">NSControl</string>
-                                       <reference key="sourceIdentifier" 
ref="761297795"/>
-                               </object>
-                               <object class="IBPartialClassDescription">
                                        <string 
key="className">NSTextField</string>
                                        <string 
key="superclassName">NSControl</string>
                                        <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
@@ -1830,6 +1808,18 @@
                                        </object>
                                </object>
                                <object class="IBPartialClassDescription">
+                                       <string 
key="className">NSWindowController</string>
+                                       <string 
key="superclassName">NSResponder</string>
+                                       <object class="NSMutableDictionary" 
key="actions">
+                                               <string 
key="NS.key.0">showWindow:</string>
+                                               <string 
key="NS.object.0">id</string>
+                                       </object>
+                                       <object 
class="IBClassDescriptionSource" key="sourceIdentifier">
+                                               <string 
key="majorKey">IBFrameworkSource</string>
+                                               <string 
key="minorKey">AppKit.framework/Headers/NSWindowController.h</string>
+                                       </object>
+                               </object>
+                               <object class="IBPartialClassDescription">
                                        <string key="className">PDFView</string>
                                        <string 
key="superclassName">NSView</string>
                                        <object class="NSMutableDictionary" 
key="actions">

Modified: trunk/SKNoteOutlineView.h
===================================================================
--- trunk/SKNoteOutlineView.h   2010-03-25 16:23:50 UTC (rev 6375)
+++ trunk/SKNoteOutlineView.h   2010-03-25 18:27:56 UTC (rev 6376)
@@ -38,6 +38,7 @@
 
 #import <Cocoa/Cocoa.h>
 #import "SKOutlineView.h";
+#import "SKNoteTypeSheetController.h";
 
 
 @protocol SKNoteOutlineViewDelegate <SKOutlineViewDelegate>
@@ -51,24 +52,17 @@
 
 @end
 
-...@interface SKNoteOutlineView : SKOutlineView {    
+
+...@interface SKNoteOutlineView : SKOutlineView 
<SKNoteTypeSheetControllerDelegate> {    
     IBOutlet NSWindow *noteTypeSheet;
     IBOutlet NSMatrix *noteTypeMatrix;
     IBOutlet NSTextField *noteTypeMessageField;
     IBOutlet NSArray *noteTypeButtons;
+    SKNoteTypeSheetController *noteTypeSheetController;
 }
 
-- (NSArray *)noteTypes;
-- (void)setNoteTypes:(NSArray *)types;
-- (NSMenu *)noteTypeMenu;
-
 - (NSPredicate *)filterPredicateForSearchString:(NSString *)searchString 
caseInsensitive:(BOOL)caseInsensitive;
 
-- (IBAction)toggleDisplayNoteType:(id)sender;
-- (IBAction)displayAllNoteTypes:(id)sender;
-- (IBAction)selectNoteTypes:(id)sender;
-- (IBAction)dismissNoteTypeSheet:(id)sender;
-
 #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-25 16:23:50 UTC (rev 6375)
+++ trunk/SKNoteOutlineView.m   2010-03-25 18:27:56 UTC (rev 6376)
@@ -37,14 +37,9 @@
  */
 
 #import "SKNoteOutlineView.h"
-#import "NSString_SKExtensions.h"
 #import "SKTypeSelectHelper.h"
-#import <SkimNotes/SkimNotes.h>
 #import "NSEvent_SKExtensions.h"
-#import "NSMenu_SKExtensions.h"
-#import "NSGeometry_SKExtensions.h"
 #import "SKColorCell.h"
-#import "SKLocalization.h"
 
 #define NUMBER_OF_TYPES 9
 
@@ -57,18 +52,20 @@
 + (BOOL)usesDefaultFontSize { return YES; }
 
 - (void)dealloc {
-    SKDESTROY(noteTypeSheet);
+    SKDESTROY(noteTypeSheetController);
     [super dealloc];
 }
 
 - (void)awakeFromNib {
-    if (noteTypeMatrix == nil) {
-        [self noteTypeMenu]; // this sets the menu for the header view
-        [super awakeFromNib];
-        [[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")];
-    }
+    [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")];
 }
 
 - (void)resizeRow:(NSInteger)row withEvent:(NSEvent *)theEvent {
@@ -208,7 +205,7 @@
     NSPredicate *filterPredicate = nil;
     NSPredicate *typePredicate = nil;
     NSPredicate *searchPredicate = nil;
-    NSArray *types = [self noteTypes];
+    NSArray *types = [noteTypeSheetController noteTypes];
     if ([types count] < NUMBER_OF_TYPES) {
         NSExpression *lhs = [NSExpression expressionForKeyPath:@"type"];
         NSMutableArray *predicateArray = [NSMutableArray array];
@@ -242,150 +239,19 @@
     return filterPredicate;
 }
 
-#pragma mark Note Types
+#pragma mark SKNoteTypeSheetController delegate
 
-- (NSMenu *)noteTypeMenu {
-    NSMenu *menu = [[self headerView] menu];
-    
-    if (menu == nil) {
-        menu = [[[NSMenu allocWithZone:[NSMenu menuZone]] init] autorelease];
-        NSMenuItem *menuItem = nil;
-        menuItem = [menu addItemWithTitle:[SKNFreeTextString typeName] 
action:@selector(toggleDisplayNoteType:) target:self];
-        [menuItem setRepresentedObject:SKNFreeTextString];
-        [menuItem setState:NSOnState];
-        menuItem = [menu addItemWithTitle:[SKNNoteString typeName] 
action:@selector(toggleDisplayNoteType:) target:self];
-        [menuItem setState:NSOnState];
-        [menuItem setRepresentedObject:SKNNoteString];
-        menuItem = [menu addItemWithTitle:[SKNCircleString typeName] 
action:@selector(toggleDisplayNoteType:) target:self];
-        [menuItem setRepresentedObject:SKNCircleString];
-        [menuItem setState:NSOnState];
-        menuItem = [menu addItemWithTitle:[SKNSquareString typeName] 
action:@selector(toggleDisplayNoteType:) target:self];
-        [menuItem setRepresentedObject:SKNSquareString];
-        [menuItem setState:NSOnState];
-        menuItem = [menu addItemWithTitle:[SKNHighlightString typeName] 
action:@selector(toggleDisplayNoteType:) target:self];
-        [menuItem setRepresentedObject:SKNHighlightString];
-        [menuItem setState:NSOnState];
-        menuItem = [menu addItemWithTitle:[SKNUnderlineString typeName] 
action:@selector(toggleDisplayNoteType:) target:self];
-        [menuItem setRepresentedObject:SKNUnderlineString];
-        [menuItem setState:NSOnState];
-        menuItem = [menu addItemWithTitle:[SKNStrikeOutString typeName] 
action:@selector(toggleDisplayNoteType:) target:self];
-        [menuItem setRepresentedObject:SKNStrikeOutString];
-        [menuItem setState:NSOnState];
-        menuItem = [menu addItemWithTitle:[SKNLineString typeName] 
action:@selector(toggleDisplayNoteType:) target:self];
-        [menuItem setRepresentedObject:SKNLineString];
-        [menuItem setState:NSOnState];
-        menuItem = [menu addItemWithTitle:[SKNInkString typeName] 
action:@selector(toggleDisplayNoteType:) target:self];
-        [menuItem setRepresentedObject:SKNInkString];
-        [menuItem setState:NSOnState];
-        [menu addItem:[NSMenuItem separatorItem]];
-        menuItem = [menu addItemWithTitle:NSLocalizedString(@"Show All", 
@"Menu item title") action:@selector(displayAllNoteTypes:) target:self];
-        menuItem = [menu addItemWithTitle:[NSLocalizedString(@"Select", @"Menu 
item title") stringByAppendingEllipsis] action:@selector(selectNoteTypes:) 
target:self];
-        [[self headerView] setMenu:menu];
-    }
-    
-    return menu;
-}
-
-- (NSArray *)noteTypes {
-    NSMutableArray *types = [NSMutableArray array];
-    NSMenu *menu = [self noteTypeMenu];
-    NSInteger i;
-    
-    for (i = 0; i < NUMBER_OF_TYPES; i++) {
-        NSMenuItem *item = [menu itemAtIndex:i];
-        if ([item state] == NSOnState)
-            [types addObject:[item representedObject]];
-    }
-    return types;
-}
-
-- (void)setNoteTypes:(NSArray *)types {
-    NSMenu *menu = [self noteTypeMenu];
-    NSInteger i;
-    
-    for (i = 0; i < NUMBER_OF_TYPES; i++) {
-        NSMenuItem *item = [menu itemAtIndex:i];
-        [item setState:[types containsObject:[item representedObject]] ? 
NSOnState : NSOffState];
-    }
-}
-
-- (void)noteTypesUpdated {
+- (void)noteTypeSheetControllerNoteTypesDidChange:(SKNoteTypeSheetController 
*)controller {
     if ([[self delegate] 
respondsToSelector:@selector(outlineViewNoteTypesDidChange:)])
         [[self delegate] outlineViewNoteTypesDidChange:self];
 }
 
-- (IBAction)toggleDisplayNoteType:(id)sender {
-    [sender setState:![sender state]];
-    [self noteTypesUpdated];
+- (NSWindow *)windowForNoteTypeSheetController:(SKNoteTypeSheetController 
*)controller {
+    return [[self delegate] 
respondsToSelector:@selector(outlineViewWindowForSheet:)] ? [[self delegate] 
outlineViewWindowForSheet:self] : [self window];
 }
 
-- (IBAction)displayAllNoteTypes:(id)sender {
-    NSMenu *menu = [self noteTypeMenu];
-    NSInteger i;
-    for (i = 0; i < NUMBER_OF_TYPES; i++)
-        [[menu itemAtIndex:i] setState:NSOnState];
-    [self noteTypesUpdated];
-}
+#pragma mark Delegate
 
-- (BOOL)loadNoteTypeSheet {
-    if (NO == [NSBundle loadNibNamed:@"NoteTypeSheet" owner:self]) {
-        NSLog(@"Failed to load NoteTypeSheet.nib");
-        return NO;
-    }
-    
-    [noteTypeSheet localizeStringsFromTable:@"NoteTypeSheet"];
-    
-    NSMenu *menu = [self noteTypeMenu];
-    NSInteger i;
-    for (i = 0; i < NUMBER_OF_TYPES; i++)
-        [[noteTypeMatrix cellWithTag:i] setTitle:[[menu itemAtIndex:i] title]];
-    [noteTypeMatrix sizeToFit];
-    
-    [noteTypeMessageField sizeToFit];
-    
-    SKAutoSizeRightButtons(noteTypeButtons);
-    
-    NSRect frame = [noteTypeSheet frame];
-    NSRect matrixFrame = [noteTypeMatrix frame];
-    NSRect messageFrame = [noteTypeMessageField frame];
-    frame.size.width = fmax(NSWidth(matrixFrame) + 2.0 * NSMinX(matrixFrame), 
NSWidth(messageFrame) + 2.0 * NSMinX(messageFrame));
-    [noteTypeSheet setFrame:frame display:NO];
-    
-    return YES;
-}
-
-- (void)noteTypeSheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode 
contextInfo:(void *)contextInfo {
-    if (returnCode == NSOKButton) {
-        NSMenu *menu = [self noteTypeMenu];
-        NSInteger i;
-        for (i = 0; i < NUMBER_OF_TYPES; i++)
-            [[menu itemAtIndex:i] setState:[[noteTypeMatrix cellWithTag:i] 
state]];
-        [self noteTypesUpdated];
-    }
-}
-
-- (IBAction)selectNoteTypes:(id)sender {
-    if (noteTypeSheet == nil && NO == [self loadNoteTypeSheet])
-        return;
-    
-    NSMenu *menu = [self noteTypeMenu];
-    NSInteger i;
-    for (i = 0; i < NUMBER_OF_TYPES; i++)
-        [[noteTypeMatrix cellWithTag:i] setState:[[menu itemAtIndex:i] state]];
-       
-    [NSApp beginSheet:noteTypeSheet
-       modalForWindow:[[self delegate] 
respondsToSelector:@selector(outlineViewWindowForSheet:)] ? [[self delegate] 
outlineViewWindowForSheet:self] : [self window]
-        modalDelegate:self 
-       didEndSelector:@selector(noteTypeSheetDidEnd:returnCode:contextInfo:)
-          contextInfo:NULL];
-}
-
-- (IBAction)dismissNoteTypeSheet:(id)sender {
-    [NSApp endSheet:noteTypeSheet returnCode:[sender tag]];
-    [noteTypeSheet orderOut:self];
-}
-
-
 #if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
 - (id <SKNoteOutlineViewDelegate>)delegate {
     return (id <SKNoteOutlineViewDelegate>)[super delegate];

Added: trunk/SKNoteTypeSheetController.h
===================================================================
--- trunk/SKNoteTypeSheetController.h                           (rev 0)
+++ trunk/SKNoteTypeSheetController.h   2010-03-25 18:27:56 UTC (rev 6376)
@@ -0,0 +1,34 @@
+//
+//  SKNoteTypeSheetController.h
+//  Skim
+//
+//  Created by Christiaan on 3/25/10.
+//  Copyright 2010 Christiaan Hofman. All rights reserved.
+//
+
+#import <Cocoa/Cocoa.h>
+#import "SKWindowController.h"
+
+...@class SKNoteTypeSheetController;
+
+...@protocol SKNoteTypeSheetControllerDelegate <NSObject>
+- (void)noteTypeSheetControllerNoteTypesDidChange:(SKNoteTypeSheetController 
*)controller;
+- (NSWindow *)windowForNoteTypeSheetController:(SKNoteTypeSheetController 
*)controller;
+...@end
+
+
+...@interface SKNoteTypeSheetController : SKWindowController {
+    IBOutlet NSMatrix *matrix;
+    IBOutlet NSTextField *messageField;
+    IBOutlet NSArray *buttons;
+    NSMenu *noteTypeMenu;
+    id <SKNoteTypeSheetControllerDelegate> delegate;
+}
+
+- (NSArray *)noteTypes;
+- (NSMenu *)noteTypeMenu;
+
+- (id <SKNoteTypeSheetControllerDelegate>)delegate;
+- (void)setDelegate:(id <SKNoteTypeSheetControllerDelegate>)newDelegate;
+
+...@end

Added: trunk/SKNoteTypeSheetController.m
===================================================================
--- trunk/SKNoteTypeSheetController.m                           (rev 0)
+++ trunk/SKNoteTypeSheetController.m   2010-03-25 18:27:56 UTC (rev 6376)
@@ -0,0 +1,146 @@
+//
+//  SKNoteTypeSheetController.m
+//  Skim
+//
+//  Created by Christiaan on 3/25/10.
+//  Copyright 2010 Christiaan Hofman. All rights reserved.
+//
+
+#import "SKNoteTypeSheetController.h"
+#import "NSWindowController_SKExtensions.h"
+#import "NSGeometry_SKExtensions.h"
+#import "NSString_SKExtensions.h"
+#import "NSMenu_SKExtensions.h"
+#import <SKimNotes/SkimNotes.h>
+
+#define NUMBER_OF_TYPES 9
+
+...@implementation SKNoteTypeSheetController
+
+- (void)dealloc {
+    delegate = nil;
+    SKDESTROY(noteTypeMenu);
+    [super dealloc];
+}
+
+- (NSString *)windowNibName {
+    return @"NoteTypeSheet";
+}
+
+- (void)windowDidLoad {
+    NSMenu *menu = [self noteTypeMenu];
+    NSInteger i;
+    for (i = 0; i < NUMBER_OF_TYPES; i++)
+        [[matrix cellWithTag:i] setTitle:[[menu itemAtIndex:i] title]];
+    [matrix sizeToFit];
+    
+    [messageField sizeToFit];
+    
+    SKAutoSizeRightButtons(buttons);
+    
+    NSRect frame = [[self window] frame];
+    NSRect matrixFrame = [matrix frame];
+    NSRect messageFrame = [messageField frame];
+    frame.size.width = fmax(NSWidth(matrixFrame) + 2.0 * NSMinX(matrixFrame), 
NSWidth(messageFrame) + 2.0 * NSMinX(messageFrame));
+    [[self window] setFrame:frame display:NO];
+}
+
+- (void)noteTypesUpdated {
+    [delegate noteTypeSheetControllerNoteTypesDidChange:self];
+}
+
+- (void)toggleDisplayNoteType:(id)sender {
+    [sender setState:NO == [sender state]];
+    [self noteTypesUpdated];
+}
+
+- (void)displayAllNoteTypes:(id)sender {
+    NSInteger i;
+    for (i = 0; i < NUMBER_OF_TYPES; i++)
+        [[noteTypeMenu itemAtIndex:i] setState:NSOnState];
+    [self noteTypesUpdated];
+}
+
+- (void)noteTypeSheetDidEnd:(NSWindow *)sheet returnCode:(NSInteger)returnCode 
contextInfo:(void *)contextInfo {
+    if (returnCode == NSOKButton) {
+        NSInteger i;
+        for (i = 0; i < NUMBER_OF_TYPES; i++)
+            [[noteTypeMenu itemAtIndex:i] setState:[[matrix cellWithTag:i] 
state]];
+        [self noteTypesUpdated];
+    }
+}
+
+- (void)selectNoteTypes:(id)sender {
+    [self window];
+    
+    NSInteger i;
+    for (i = 0; i < NUMBER_OF_TYPES; i++)
+        [[matrix cellWithTag:i] setState:[[noteTypeMenu itemAtIndex:i] state]];
+       
+    [self beginSheetModalForWindow:[delegate 
windowForNoteTypeSheetController:self]
+        modalDelegate:self 
+       didEndSelector:@selector(noteTypeSheetDidEnd:returnCode:contextInfo:)
+          contextInfo:NULL];
+}
+
+- (NSMenu *)noteTypeMenu {
+    if (noteTypeMenu == nil) {
+        noteTypeMenu = [[NSMenu allocWithZone:[NSMenu menuZone]] init];
+        NSMenuItem *menuItem = nil;
+        menuItem = [noteTypeMenu addItemWithTitle:[SKNFreeTextString typeName] 
action:@selector(toggleDisplayNoteType:) target:self];
+        [menuItem setRepresentedObject:SKNFreeTextString];
+        [menuItem setState:NSOnState];
+        menuItem = [noteTypeMenu addItemWithTitle:[SKNNoteString typeName] 
action:@selector(toggleDisplayNoteType:) target:self];
+        [menuItem setState:NSOnState];
+        [menuItem setRepresentedObject:SKNNoteString];
+        menuItem = [noteTypeMenu addItemWithTitle:[SKNCircleString typeName] 
action:@selector(toggleDisplayNoteType:) target:self];
+        [menuItem setRepresentedObject:SKNCircleString];
+        [menuItem setState:NSOnState];
+        menuItem = [noteTypeMenu addItemWithTitle:[SKNSquareString typeName] 
action:@selector(toggleDisplayNoteType:) target:self];
+        [menuItem setRepresentedObject:SKNSquareString];
+        [menuItem setState:NSOnState];
+        menuItem = [noteTypeMenu addItemWithTitle:[SKNHighlightString 
typeName] action:@selector(toggleDisplayNoteType:) target:self];
+        [menuItem setRepresentedObject:SKNHighlightString];
+        [menuItem setState:NSOnState];
+        menuItem = [noteTypeMenu addItemWithTitle:[SKNUnderlineString 
typeName] action:@selector(toggleDisplayNoteType:) target:self];
+        [menuItem setRepresentedObject:SKNUnderlineString];
+        [menuItem setState:NSOnState];
+        menuItem = [noteTypeMenu addItemWithTitle:[SKNStrikeOutString 
typeName] action:@selector(toggleDisplayNoteType:) target:self];
+        [menuItem setRepresentedObject:SKNStrikeOutString];
+        [menuItem setState:NSOnState];
+        menuItem = [noteTypeMenu addItemWithTitle:[SKNLineString typeName] 
action:@selector(toggleDisplayNoteType:) target:self];
+        [menuItem setRepresentedObject:SKNLineString];
+        [menuItem setState:NSOnState];
+        menuItem = [noteTypeMenu addItemWithTitle:[SKNInkString typeName] 
action:@selector(toggleDisplayNoteType:) target:self];
+        [menuItem setRepresentedObject:SKNInkString];
+        [menuItem setState:NSOnState];
+        [noteTypeMenu addItem:[NSMenuItem separatorItem]];
+        menuItem = [noteTypeMenu addItemWithTitle:NSLocalizedString(@"Show 
All", @"noteTypeMenu item title") action:@selector(displayAllNoteTypes:) 
target:self];
+        menuItem = [noteTypeMenu 
addItemWithTitle:[NSLocalizedString(@"Select", @"noteTypeMenu item title") 
stringByAppendingEllipsis] action:@selector(selectNoteTypes:) target:self];
+    }
+    
+    return noteTypeMenu;
+}
+
+- (NSArray *)noteTypes {
+    NSMutableArray *types = [NSMutableArray array];
+    NSMenu *menu = [self noteTypeMenu];
+    NSInteger i;
+    
+    for (i = 0; i < NUMBER_OF_TYPES; i++) {
+        NSMenuItem *item = [menu itemAtIndex:i];
+        if ([item state] == NSOnState)
+            [types addObject:[item representedObject]];
+    }
+    return types;
+}
+
+- (id <SKNoteTypeSheetControllerDelegate>)delegate {
+    return delegate;
+}
+
+- (void)setDelegate:(id <SKNoteTypeSheetControllerDelegate>)newDelegate {
+    delegate = newDelegate;
+}
+
+...@end

Modified: trunk/Skim.xcodeproj/project.pbxproj
===================================================================
--- trunk/Skim.xcodeproj/project.pbxproj        2010-03-25 16:23:50 UTC (rev 
6375)
+++ trunk/Skim.xcodeproj/project.pbxproj        2010-03-25 18:27:56 UTC (rev 
6376)
@@ -173,6 +173,7 @@
                CE80A81E0FDAB1690086A46C /* SKHighlightingPopUpButton.m in 
Sources */ = {isa = PBXBuildFile; fileRef = CE80A81D0FDAB1690086A46C /* 
SKHighlightingPopUpButton.m */; };
                CE816A060D70F9A7008D807D /* Skim.qlgenerator in Copy Files: 
QuickLook */ = {isa = PBXBuildFile; fileRef = CEC7B4EE0CF607CA008CCD63 /* 
Skim.qlgenerator */; };
                CE820A220C8A0E310020E6B0 /* NSTask_SKExtensions.m in Sources */ 
= {isa = PBXBuildFile; fileRef = CE820A200C8A0E310020E6B0 /* 
NSTask_SKExtensions.m */; };
+               CE8388BC115BC61F00DB1AD7 /* SKNoteTypeSheetController.m in 
Sources */ = {isa = PBXBuildFile; fileRef = CE8388BB115BC61F00DB1AD7 /* 
SKNoteTypeSheetController.m */; };
                CE8978CE0CBFC70B00EA2D98 /* SKTemplateTag.m in Sources */ = 
{isa = PBXBuildFile; fileRef = CE8978CC0CBFC70B00EA2D98 /* SKTemplateTag.m */; 
};
                CE898F060C843A8B008A0856 /* PDFDDocument.icns in Resources */ = 
{isa = PBXBuildFile; fileRef = CE898F050C843A8B008A0856 /* PDFDDocument.icns 
*/; };
                CE8B46E90C29CA00005CE7F1 /* SKLineInspector.m in Sources */ = 
{isa = PBXBuildFile; fileRef = CE8B46E70C29CA00005CE7F1 /* SKLineInspector.m 
*/; };
@@ -772,6 +773,8 @@
                CE816AA30D718C8C008D807D /* SKPrintAccessoryController.m */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 
sourcecode.c.objc; path = SKPrintAccessoryController.m; sourceTree = "<group>"; 
};
                CE820A1F0C8A0E310020E6B0 /* NSTask_SKExtensions.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
NSTask_SKExtensions.h; sourceTree = "<group>"; };
                CE820A200C8A0E310020E6B0 /* NSTask_SKExtensions.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= NSTask_SKExtensions.m; sourceTree = "<group>"; };
+               CE8388BA115BC61F00DB1AD7 /* SKNoteTypeSheetController.h */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; 
path = SKNoteTypeSheetController.h; sourceTree = "<group>"; };
+               CE8388BB115BC61F00DB1AD7 /* SKNoteTypeSheetController.m */ = 
{isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = 
sourcecode.c.objc; path = SKNoteTypeSheetController.m; sourceTree = "<group>"; 
};
                CE87EF690BA9FF5A0027BBDD /* skimhelp.css */ = {isa = 
PBXFileReference; explicitFileType = text; fileEncoding = 30; name = 
skimhelp.css; path = "English.lproj/Skim Help/sty/skimhelp.css"; sourceTree = 
"<group>"; };
                CE8978CB0CBFC70B00EA2D98 /* SKTemplateTag.h */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = 
SKTemplateTag.h; sourceTree = "<group>"; };
                CE8978CC0CBFC70B00EA2D98 /* SKTemplateTag.m */ = {isa = 
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path 
= SKTemplateTag.m; sourceTree = "<group>"; };
@@ -1464,6 +1467,8 @@
                                CEEC0A090DCB2594003DD9B6 /* 
SKMainWindowController_UI.m */,
                                CEE54F6A0DA3FB060037169F /* 
SKMainWindowController_Toolbar.h */,
                                CEE54F6B0DA3FB060037169F /* 
SKMainWindowController_Toolbar.m */,
+                               CE8388BA115BC61F00DB1AD7 /* 
SKNoteTypeSheetController.h */,
+                               CE8388BB115BC61F00DB1AD7 /* 
SKNoteTypeSheetController.m */,
                                CE4EC4F30B7E24490091F228 /* 
SKPreferenceController.h */,
                                CE4EC4F40B7E24490091F228 /* 
SKPreferenceController.m */,
                                CE05A7350E9024ED0060BB07 /* 
SKPresentationOptionsSheetController.h */,
@@ -2439,6 +2444,7 @@
                                CE0E8651114DBF7000E37F38 /* 
SKPreferenceWindow.m in Sources */,
                                CE121BFB11529D15001D92ED /* SKIBArray.m in 
Sources */,
                                CE01E6A21154FE0B00004111 /* SKPreferencePane.m 
in Sources */,
+                               CE8388BC115BC61F00DB1AD7 /* 
SKNoteTypeSheetController.m in Sources */,
                        );
                        runOnlyForDeploymentPostprocessing = 0;
                };


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