Revision: 6437
http://skim-app.svn.sourceforge.net/skim-app/?rev=6437&view=rev
Author: hofman
Date: 2010-04-08 11:46:10 +0000 (Thu, 08 Apr 2010)
Log Message:
-----------
setup transformer in toolbar controller
Modified Paths:
--------------
trunk/SKMainToolbarController.h
trunk/SKMainToolbarController.m
trunk/SKMainWindowController.h
trunk/SKMainWindowController.m
Modified: trunk/SKMainToolbarController.h
===================================================================
--- trunk/SKMainToolbarController.h 2010-04-08 11:31:32 UTC (rev 6436)
+++ trunk/SKMainToolbarController.h 2010-04-08 11:46:10 UTC (rev 6437)
@@ -38,6 +38,8 @@
#import <Cocoa/Cocoa.h>
+extern NSString *SKUnarchiveFromDataArrayTransformerName;
+
@class SKMainWindowController, SKPDFView, SKColorSwatch;
@interface SKMainToolbarController : NSViewController {
Modified: trunk/SKMainToolbarController.m
===================================================================
--- trunk/SKMainToolbarController.m 2010-04-08 11:31:32 UTC (rev 6436)
+++ trunk/SKMainToolbarController.m 2010-04-08 11:46:10 UTC (rev 6437)
@@ -94,6 +94,8 @@
#define SKDocumentToolbarPrintItemIdentifier
@"SKDocumentToolbarPrintItemIdentifier"
#define SKDocumentToolbarCustomizeItemIdentifier
@"SKDocumentToolbarCustomizeItemIdentifier"
+NSString *SKUnarchiveFromDataArrayTransformerName =
@"SKUnarchiveFromDataArrayTransformer";
+
static NSString *noteToolImageNames[] = {@"ToolbarTextNoteMenu",
@"ToolbarAnchoredNoteMenu", @"ToolbarCircleNoteMenu", @"ToolbarSquareNoteMenu",
@"ToolbarHighlightNoteMenu", @"ToolbarUnderlineNoteMenu",
@"ToolbarStrikeOutNoteMenu", @"ToolbarLineNoteMenu", @"ToolbarInkNoteMenu"};
@interface SKToolbar : NSToolbar
@@ -114,6 +116,13 @@
@synthesize mainController, backForwardButton, pageNumberField,
previousNextPageButton, previousPageButton, nextPageButton,
previousNextFirstLastPageButton, zoomInOutButton, zoomInActualOutButton,
zoomActualButton, zoomFitButton, zoomSelectionButton, rotateLeftButton,
rotateRightButton, rotateLeftRightButton, cropButton, fullScreenButton,
presentationButton, leftPaneButton, rightPaneButton, toolModeButton,
textNoteButton, circleNoteButton, markupNoteButton, lineNoteButton,
singleTwoUpButton, continuousButton, displayModeButton, displayBoxButton,
infoButton, colorsButton, fontsButton, linesButton, printButton,
customizeButton, scaleField, noteButton, colorSwatch;
++ (void)initialize {
+ SKINITIALIZE;
+
+ [NSValueTransformer setValueTransformer:[NSValueTransformer
arrayTransformerWithValueTransformerForName:NSUnarchiveFromDataTransformerName]
+
forName:SKUnarchiveFromDataArrayTransformerName];
+}
+
- (void)dealloc {
@try { [colorSwatch unbind:@"colors"]; }
@catch (id e) {}
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2010-04-08 11:31:32 UTC (rev 6436)
+++ trunk/SKMainWindowController.h 2010-04-08 11:46:10 UTC (rev 6437)
@@ -65,8 +65,6 @@
SKFitWindowOption
};
-extern NSString *SKUnarchiveFromDataArrayTransformerName;
-
@class PDFAnnotation, PDFSelection, SKGroupedSearchResult, SKFloatMapTable;
@class SKPDFView, SKSecondaryPDFView, BDSKCollapsibleView, BDSKEdgeView,
SKGradientView, SKColorSwatch, SKStatusBar, SKSplitView, SKThumbnailTableView,
SKNoteOutlineView, SKTocOutlineView;
@class SKMainDocument, SKLeftSideViewController, SKRightSideViewController,
SKMainToolbarController, SKFullScreenWindow, SKNavigationWindow, SKSideWindow,
SKProgressController, SKPageSheetController, SKScaleSheetController,
SKPasswordSheetController, SKBookmarkSheetController,
SKPresentationOptionsSheetController, SKNoteTypeSheetController;
Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m 2010-04-08 11:31:32 UTC (rev 6436)
+++ trunk/SKMainWindowController.m 2010-04-08 11:46:10 UTC (rev 6437)
@@ -96,7 +96,6 @@
#import "NSImage_SKExtensions.h"
#import "NSMenu_SKExtensions.h"
#import "SKGroupedSearchResult.h"
-#import "NSValueTransformer_SKExtensions.h"
#import "RemoteControl.h"
#import "NSView_SKExtensions.h"
#import "NSResponder_SKExtensions.h"
@@ -162,8 +161,6 @@
#define SKDisplayNoteBoundsKey @"SKDisplayNoteBounds"
-NSString *SKUnarchiveFromDataArrayTransformerName =
@"SKUnarchiveFromDataArrayTransformer";
-
@interface SKMainWindowController (SKPrivate)
- (void)applyLeftSideWidth:(CGFloat)leftSideWidth
rightSideWidth:(CGFloat)rightSideWidth;
@@ -205,9 +202,6 @@
+ (void)initialize {
SKINITIALIZE;
- [NSValueTransformer setValueTransformer:[NSValueTransformer
arrayTransformerWithValueTransformerForName:NSUnarchiveFromDataTransformerName]
-
forName:SKUnarchiveFromDataArrayTransformerName];
-
[PDFPage setUsesSequentialPageNumbering:[[NSUserDefaults
standardUserDefaults] boolForKey:SKSequentialPageNumberingKey]];
}
This was sent by the SourceForge.net collaborative development platform, the
world's largest Open Source development site.
------------------------------------------------------------------------------
Download Intel® 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