Revision: 6417
http://skim-app.svn.sourceforge.net/skim-app/?rev=6417&view=rev
Author: hofman
Date: 2010-04-05 08:56:26 +0000 (Mon, 05 Apr 2010)
Log Message:
-----------
use declared properties
Modified Paths:
--------------
trunk/SKPDFView.h
trunk/SKPDFView.m
Modified: trunk/SKPDFView.h
===================================================================
--- trunk/SKPDFView.h 2010-04-05 08:40:47 UTC (rev 6416)
+++ trunk/SKPDFView.h 2010-04-05 08:56:26 UTC (rev 6417)
@@ -129,41 +129,24 @@
NSInteger spellingTag;
}
-- (SKToolMode)toolMode;
-- (void)setToolMode:(SKToolMode)newToolMode;
+...@property (nonatomic) SKToolMode toolMode;
+...@property (nonatomic) SKNoteType annotationMode;
+...@property (nonatomic, readonly) SKInteractionMode interactionMode;
+...@property (nonatomic, assign) PDFAnnotation *activeAnnotation;
+...@property (nonatomic, readonly) BOOL isEditing;
+...@property (nonatomic) NSRect currentSelectionRect;
+...@property (nonatomic, retain) PDFPage *currentSelectionPage;
+...@property (nonatomic, readonly) CGFloat currentMagnification;
+...@property (nonatomic) BOOL hideNotes;
+...@property (nonatomic, readonly) BOOL hasReadingBar;
+...@property (nonatomic, readonly) SKReadingBar *readingBar;
+...@property (nonatomic, readonly) SKTransitionController
*transitionController;
+...@property (nonatomic, retain) SKTypeSelectHelper *typeSelectHelper;
+...@property (nonatomic, readonly) NSUndoManager *undoManager;
-- (SKNoteType)annotationMode;
-- (void)setAnnotationMode:(SKNoteType)newAnnotationMode;
-
-- (SKInteractionMode)interactionMode;
- (void)setInteractionMode:(SKInteractionMode)newInteractionMode
screen:(NSScreen *)screen;
-
-- (PDFAnnotation *)activeAnnotation;
-- (void)setActiveAnnotation:(PDFAnnotation *)newAnnotation;
-
-- (BOOL)isEditing;
-
-- (NSRect)currentSelectionRect;
-- (void)setCurrentSelectionRect:(NSRect)rect;
-
-- (PDFPage *)currentSelectionPage;
-- (void)setCurrentSelectionPage:(PDFPage *)page;
-
-- (CGFloat)currentMagnification;
-
-- (BOOL)hideNotes;
-- (void)setHideNotes:(BOOL)flag;
-
-- (BOOL)hasReadingBar;
-- (SKReadingBar *)readingBar;
-
- (void)toggleReadingBar;
-- (SKTransitionController *)transitionController;
-
-- (SKTypeSelectHelper *)typeSelectHelper;
-- (void)setTypeSelectHelper:(SKTypeSelectHelper *)newTypeSelectHelper;
-
- (IBAction)delete:(id)sender;
- (IBAction)paste:(id)sender;
- (IBAction)alternatePaste:(id)sender;
@@ -208,8 +191,6 @@
- (id)accessibilityChildAtPoint:(NSPoint)point;
- (id)accessibilityFocusedChild;
-- (NSUndoManager *)undoManager;
-
@end
#pragma mark -
Modified: trunk/SKPDFView.m
===================================================================
--- trunk/SKPDFView.m 2010-04-05 08:40:47 UTC (rev 6416)
+++ trunk/SKPDFView.m 2010-04-05 08:56:26 UTC (rev 6417)
@@ -176,6 +176,10 @@
@implementation SKPDFView
+...@synthesize toolMode, annotationMode, interactionMode, activeAnnotation,
hideNotes, readingBar, transitionController, typeSelectHelper;
+...@synthesize currentMagnification=magnification;
+...@dynamic isEditing, hasReadingBar, currentSelectionPage,
currentSelectionRect, undoManager;
+
+ (void)initialize {
SKINITIALIZE;
@@ -452,10 +456,6 @@
[self resetPDFToolTipRects];
}
-- (SKToolMode)toolMode {
- return toolMode;
-}
-
- (void)setToolMode:(SKToolMode)newToolMode {
if (toolMode != newToolMode) {
if ((toolMode == SKTextToolMode || toolMode == SKNoteToolMode) &&
newToolMode != SKTextToolMode && newToolMode != SKNoteToolMode) {
@@ -475,10 +475,6 @@
}
}
-- (SKNoteType)annotationMode {
- return annotationMode;
-}
-
- (void)setAnnotationMode:(SKNoteType)newAnnotationMode {
if (annotationMode != newAnnotationMode) {
annotationMode = newAnnotationMode;
@@ -489,10 +485,6 @@
}
}
-- (SKInteractionMode)interactionMode {
- return interactionMode;
-}
-
- (void)setInteractionMode:(SKInteractionMode)newInteractionMode
screen:(NSScreen *)screen {
if (interactionMode != newInteractionMode) {
if (interactionMode == SKPresentationMode && [[self documentView]
isHidden])
@@ -506,10 +498,6 @@
}
}
-- (PDFAnnotation *)activeAnnotation {
- return activeAnnotation;
-}
-
- (void)setActiveAnnotation:(PDFAnnotation *)newAnnotation {
BOOL changed = newAnnotation != activeAnnotation;
@@ -600,14 +588,6 @@
}
}
-- (CGFloat)currentMagnification {
- return magnification;
-}
-
-- (BOOL)hideNotes {
- return hideNotes;
-}
-
- (void)setHideNotes:(BOOL)flag {
if (hideNotes != flag) {
hideNotes = flag;
@@ -629,17 +609,6 @@
return transitionController;
}
-- (SKTypeSelectHelper *)typeSelectHelper {
- return typeSelectHelper;
-}
-
-- (void)setTypeSelectHelper:(SKTypeSelectHelper *)newTypeSelectHelper {
- if (typeSelectHelper != newTypeSelectHelper) {
- [typeSelectHelper release];
- typeSelectHelper = [newTypeSelectHelper retain];
- }
-}
-
#pragma mark Reading bar
- (BOOL)hasReadingBar {
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