Revision: 6414
http://skim-app.svn.sourceforge.net/skim-app/?rev=6414&view=rev
Author: hofman
Date: 2010-04-04 15:15:08 +0000 (Sun, 04 Apr 2010)
Log Message:
-----------
more declared properties
Modified Paths:
--------------
trunk/SKApplication.h
trunk/SKApplication.m
trunk/SKBookmarkController.h
trunk/SKBookmarkController.m
trunk/SKDownload.h
trunk/SKDownload.m
trunk/SKFindController.h
trunk/SKLineInspector.h
trunk/SKNoteWindowController.h
trunk/SKPDFSyncRecord.h
trunk/SKPrintAccessoryController.h
trunk/SKPrintAccessoryController.m
trunk/SKProgressController.h
trunk/SKSnapshotWindowController.h
trunk/SKSnapshotWindowController.m
trunk/SKTextFieldSheetController.h
trunk/SKTextFieldSheetController.m
trunk/SKTransitionController.h
trunk/SKTransitionController.m
Modified: trunk/SKApplication.h
===================================================================
--- trunk/SKApplication.h 2010-04-03 17:26:43 UTC (rev 6413)
+++ trunk/SKApplication.h 2010-04-04 15:15:08 UTC (rev 6414)
@@ -50,8 +50,7 @@
BOOL userAttentionDisabled;
}
-- (BOOL)isUserAttentionDisabled;
-- (void)setUserAttentionDisabled:(BOOL)flag;
+...@property (nonatomic, getter=isUserAttentionDisabled) BOOL
userAttentionDisabled;
#if MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_5
- (id <SKApplicationDelegate>)delegate;
Modified: trunk/SKApplication.m
===================================================================
--- trunk/SKApplication.m 2010-04-03 17:26:43 UTC (rev 6413)
+++ trunk/SKApplication.m 2010-04-04 15:15:08 UTC (rev 6414)
@@ -49,14 +49,8 @@
@implementation SKApplication
-- (BOOL)isUserAttentionDisabled {
- return userAttentionDisabled;
-}
+...@synthesize userAttentionDisabled;
-- (void)setUserAttentionDisabled:(BOOL)flag {
- userAttentionDisabled = flag;
-}
-
- (NSInteger)requestUserAttention:(NSRequestUserAttentionType)requestType {
return userAttentionDisabled ? 0 : [super
requestUserAttention:requestType];
}
Modified: trunk/SKBookmarkController.h
===================================================================
--- trunk/SKBookmarkController.h 2010-04-03 17:26:43 UTC (rev 6413)
+++ trunk/SKBookmarkController.h 2010-04-04 15:15:08 UTC (rev 6414)
@@ -54,7 +54,8 @@
+ (id)sharedBookmarkController;
-- (SKBookmark *)bookmarkRoot;
+...@property (nonatomic, readonly) SKBookmark *bookmarkRoot;
+...@property (nonatomic, readonly) NSArray *recentDocuments;
- (void)addBookmarkForPath:(NSString *)path pageIndex:(NSUInteger)pageIndex
label:(NSString *)label toFolder:(SKBookmark *)folder;
- (void)addBookmarkForSetup:(NSDictionary *)setupDict label:(NSString *)label
toFolder:(SKBookmark *)folder;
@@ -69,7 +70,6 @@
- (IBAction)deleteBookmark:(id)sender;
- (IBAction)toggleStatusBar:(id)sender;
-- (NSArray *)recentDocuments;
- (void)addRecentDocumentForPath:(NSString *)path
pageIndex:(NSUInteger)pageIndex snapshots:(NSArray *)setups;
- (NSUInteger)pageIndexForRecentDocumentAtPath:(NSString *)path;
- (NSArray *)snapshotsForRecentDocumentAtPath:(NSString *)path;
Modified: trunk/SKBookmarkController.m
===================================================================
--- trunk/SKBookmarkController.m 2010-04-03 17:26:43 UTC (rev 6413)
+++ trunk/SKBookmarkController.m 2010-04-04 15:15:08 UTC (rev 6414)
@@ -91,6 +91,8 @@
@implementation SKBookmarkController
+...@synthesize bookmarkRoot, recentDocuments;
+
static NSUInteger maxRecentDocumentsCount = 0;
+ (void)initialize {
@@ -194,10 +196,6 @@
#pragma mark Bookmarks
-- (SKBookmark *)bookmarkRoot {
- return bookmarkRoot;
-}
-
static NSArray *minimumCoverForBookmarks(NSArray *items) {
SKBookmark *lastBm = nil;
NSMutableArray *minimalCover = [NSMutableArray array];
@@ -266,10 +264,6 @@
#pragma mark Recent Documents
-- (NSArray *)recentDocuments {
- return recentDocuments;
-}
-
- (NSUInteger)indexOfRecentDocumentAtPath:(NSString *)path {
NSUInteger idx = NSNotFound, i, iMax = [recentDocuments count];
for (i = 0; i < iMax; i++) {
Modified: trunk/SKDownload.h
===================================================================
--- trunk/SKDownload.h 2010-04-03 17:26:43 UTC (rev 6413)
+++ trunk/SKDownload.h 2010-04-04 15:15:08 UTC (rev 6414)
@@ -88,8 +88,7 @@
@property (nonatomic, readonly) NSString *filePath;
@property (nonatomic, readonly) NSString *fileName;
@property (nonatomic, readonly) NSImage *fileIcon;
-...@property (nonatomic, readonly) long long expectedContentLength;
-...@property (nonatomic, readonly) long long receivedContentLength;
+...@property (nonatomic, readonly) long long expectedContentLength,
receivedContentLength;
@property (nonatomic, readonly) NSURLDownload *URLDownload;
@@ -97,6 +96,8 @@
@property (nonatomic, readonly) NSDictionary *info;
+...@property (nonatomic, readonly) BOOL canCancel, canRemove, canResume;
+
- (id)initWithURL:(NSURL *)aURL delegate:(id <SKDownloadDelegate>)aDelegate;
- (void)start;
@@ -104,10 +105,6 @@
- (void)resume;
- (void)cleanup;
-- (BOOL)canCancel;
-- (BOOL)canRemove;
-- (BOOL)canResume;
-
- (void)removeProgressIndicatorFromSuperview;
@end
Modified: trunk/SKDownload.m
===================================================================
--- trunk/SKDownload.m 2010-04-03 17:26:43 UTC (rev 6413)
+++ trunk/SKDownload.m 2010-04-04 15:15:08 UTC (rev 6414)
@@ -58,7 +58,7 @@
@implementation SKDownload
@synthesize URL, URLDownload, filePath, fileIcon, expectedContentLength,
receivedContentLength, status, delegate;
-...@dynamic fileName, info;
+...@dynamic fileName, info, canCancel, canRemove, canResume;
+ (NSSet *)infoKeys {
return [NSSet setWithObjects:SKDownloadFileNameKey, SKDownloadStatusKey,
SKDownloadProgressIndicatorKey, nil];
Modified: trunk/SKFindController.h
===================================================================
--- trunk/SKFindController.h 2010-04-03 17:26:43 UTC (rev 6413)
+++ trunk/SKFindController.h 2010-04-04 15:15:08 UTC (rev 6414)
@@ -55,8 +55,7 @@
@property (nonatomic, retain) NSString *findString;
@property (nonatomic) BOOL ignoreCase;
@property (nonatomic, readonly) NSInteger findOptions;
-...@property (nonatomic, readonly) id target;
-...@property (nonatomic, readonly) id selectionSource;
+...@property (nonatomic, readonly) id target, selectionSource;
+ (id)sharedFindController;
Modified: trunk/SKLineInspector.h
===================================================================
--- trunk/SKLineInspector.h 2010-04-03 17:26:43 UTC (rev 6413)
+++ trunk/SKLineInspector.h 2010-04-04 15:15:08 UTC (rev 6414)
@@ -79,8 +79,7 @@
@property (nonatomic) CGFloat lineWidth;
@property (nonatomic) PDFBorderStyle style;
@property (nonatomic, copy) NSArray *dashPattern;
-...@property (nonatomic) PDFLineStyle startLineStyle;
-...@property (nonatomic) PDFLineStyle endLineStyle;
+...@property (nonatomic) PDFLineStyle startLineStyle, endLineStyle;
@property (nonatomic, readonly) SKLineChangeAction currentLineChangeAction;
+ (id)sharedLineInspector;
Modified: trunk/SKNoteWindowController.h
===================================================================
--- trunk/SKNoteWindowController.h 2010-04-03 17:26:43 UTC (rev 6413)
+++ trunk/SKNoteWindowController.h 2010-04-04 15:15:08 UTC (rev 6414)
@@ -62,9 +62,7 @@
}
@property (nonatomic, readonly) PDFAnnotation *note;
-...@property (nonatomic) BOOL keepOnTop;
-...@property (nonatomic) BOOL forceOnTop;
-...@property (nonatomic, readonly) BOOL isNoteType;
+...@property (nonatomic) BOOL keepOnTop, forceOnTop, isNoteType;
- (id)initWithNote:(PDFAnnotation *)aNote;
Modified: trunk/SKPDFSyncRecord.h
===================================================================
--- trunk/SKPDFSyncRecord.h 2010-04-03 17:26:43 UTC (rev 6413)
+++ trunk/SKPDFSyncRecord.h 2010-04-04 15:15:08 UTC (rev 6414)
@@ -50,8 +50,7 @@
@property (nonatomic, readonly) NSInteger recordIndex;
@property (nonatomic) NSInteger pageIndex;
@property (nonatomic) NSPoint point;
-...@property (nonatomic, readonly) CGFloat x;
-...@property (nonatomic, readonly) CGFloat y;
+...@property (nonatomic, readonly) CGFloat x, y;
@property (nonatomic, retain) NSString *file;
@property (nonatomic) NSInteger line;
Modified: trunk/SKPrintAccessoryController.h
===================================================================
--- trunk/SKPrintAccessoryController.h 2010-04-03 17:26:43 UTC (rev 6413)
+++ trunk/SKPrintAccessoryController.h 2010-04-04 15:15:08 UTC (rev 6414)
@@ -46,10 +46,7 @@
IBOutlet NSMatrix *printScalingModeMatrix;
}
-- (BOOL)autoRotate;
-- (void)setAutoRotate:(BOOL)autoRotate;
+...@property (nonatomic) BOOL autoRotate;
+...@property (nonatomic) PDFPrintScalingMode printScalingMode;
-- (PDFPrintScalingMode)printScalingMode;
-- (void)setPrintScalingMode:(PDFPrintScalingMode)printScalingMode;
-
@end
Modified: trunk/SKPrintAccessoryController.m
===================================================================
--- trunk/SKPrintAccessoryController.m 2010-04-03 17:26:43 UTC (rev 6413)
+++ trunk/SKPrintAccessoryController.m 2010-04-04 15:15:08 UTC (rev 6414)
@@ -41,6 +41,8 @@
@implementation SKPrintAccessoryController
+...@dynamic autoRotate, printScalingMode;
+
+ (NSSet *)keyPathsForValuesAffectingLocalizedSummaryItems {
return [NSSet setWithObjects:@"autoRotate", @"printScalingMode", nil];
}
Modified: trunk/SKProgressController.h
===================================================================
--- trunk/SKProgressController.h 2010-04-03 17:26:43 UTC (rev 6413)
+++ trunk/SKProgressController.h 2010-04-04 15:15:08 UTC (rev 6414)
@@ -47,9 +47,7 @@
@property (nonatomic, readonly) NSProgressIndicator *progressBar;
@property (nonatomic, retain) NSString *message;
@property (nonatomic, getter=isIndeterminate) BOOL indeterminate;
-...@property (nonatomic) double minValue;
-...@property (nonatomic) double maxValue;
-...@property (nonatomic) double doubleValue;
+...@property (nonatomic) double minValue, maxValue, doubleValue;
- (void)incrementBy:(double)delta;
Modified: trunk/SKSnapshotWindowController.h
===================================================================
--- trunk/SKSnapshotWindowController.h 2010-04-03 17:26:43 UTC (rev 6413)
+++ trunk/SKSnapshotWindowController.h 2010-04-04 15:15:08 UTC (rev 6414)
@@ -65,6 +65,23 @@
BOOL forceOnTop;
}
+...@property (nonatomic, assign) id <SKSnapshotWindowControllerDelegate>
delegate;
+...@property (nonatomic, readonly) PDFView *pdfView;
+...@property (nonatomic, retain) NSImage *thumbnail;
+...@property (nonatomic, readonly) NSUInteger pageIndex;
+...@property (nonatomic, readonly) NSString *pageLabel;
+...@property (nonatomic, readonly) BOOL hasWindow;
+...@property (nonatomic, readonly) NSDictionary *pageAndWindow;
+...@property (nonatomic, readonly) NSDictionary *currentSetup;
+...@property (nonatomic) BOOL forceOnTop;
+
+...@property (nonatomic, readonly) NSAttributedString *thumbnailAttachment;
+...@property (nonatomic, readonly) NSAttributedString *thumbnail512Attachment;
+...@property (nonatomic, readonly) NSAttributedString *thumbnail256Attachment;
+...@property (nonatomic, readonly) NSAttributedString *thumbnail128Attachment;
+...@property (nonatomic, readonly) NSAttributedString *thumbnail64Attachment;
+...@property (nonatomic, readonly) NSAttributedString *thumbnail32Attachment;
+
- (void)setPdfDocument:(PDFDocument *)pdfDocument scaleFactor:(CGFloat)factor
goToPageNumber:(NSInteger)pageNum rect:(NSRect)rect autoFits:(BOOL)autoFits;
- (void)setPdfDocument:(PDFDocument *)pdfDocument setup:(NSDictionary *)setup;
@@ -72,33 +89,10 @@
- (void)redisplay;
-- (id <SKSnapshotWindowControllerDelegate>)delegate;
-- (void)setDelegate:(id <SKSnapshotWindowControllerDelegate>)newDelegate;
-
-- (PDFView *)pdfView;
-- (NSImage *)thumbnail;
-- (void)setThumbnail:(NSImage *)newThumbnail;
-
-- (NSUInteger)pageIndex;
-- (NSString *)pageLabel;
-- (BOOL)hasWindow;
-- (NSDictionary *)pageAndWindow;
-
-- (NSDictionary *)currentSetup;
-
-- (BOOL)forceOnTop;
-- (void)setForceOnTop:(BOOL)flag;
-
- (NSImage *)thumbnailWithSize:(CGFloat)size;
- (NSImage *)thumbnailWithSize:(CGFloat)size
shadowBlurRadius:(CGFloat)shadowBlurRadius shadowOffset:(NSSize)shadowOffset;
- (NSAttributedString *)thumbnailAttachmentWithSize:(CGFloat)size;
-- (NSAttributedString *)thumbnailAttachment;
-- (NSAttributedString *)thumbnail512Attachment;
-- (NSAttributedString *)thumbnail256Attachment;
-- (NSAttributedString *)thumbnail128Attachment;
-- (NSAttributedString *)thumbnail64Attachment;
-- (NSAttributedString *)thumbnail32Attachment;
- (void)miniaturize;
- (void)deminiaturize;
Modified: trunk/SKSnapshotWindowController.m
===================================================================
--- trunk/SKSnapshotWindowController.m 2010-04-03 17:26:43 UTC (rev 6413)
+++ trunk/SKSnapshotWindowController.m 2010-04-04 15:15:08 UTC (rev 6414)
@@ -77,6 +77,9 @@
@implementation SKSnapshotWindowController
+...@synthesize delegate, pdfView, thumbnail, pageLabel, hasWindow, forceOnTop;
+...@dynamic pageIndex, pageAndWindow, currentSetup, thumbnailAttachment,
thumbnail512Attachment, thumbnail256Attachment, thumbnail128Attachment,
thumbnail64Attachment, thumbnail32Attachment;
+
+ (NSSet *)keyPathsForValuesAffectingPageAndWindow {
return [NSSet setWithObjects:PAGELABEL_KEY, HASWINDOW_KEY, nil];
}
@@ -271,29 +274,6 @@
#pragma mark Acessors
-- (id <SKSnapshotWindowControllerDelegate>)delegate {
- return delegate;
-}
-
-- (void)setDelegate:(id <SKSnapshotWindowControllerDelegate>)newDelegate {
- delegate = newDelegate;
-}
-
-- (PDFView *)pdfView {
- return pdfView;
-}
-
-- (NSImage *)thumbnail {
- return thumbnail;
-}
-
-- (void)setThumbnail:(NSImage *)newThumbnail {
- if (thumbnail != newThumbnail) {
- [thumbnail release];
- thumbnail = [newThumbnail retain];
- }
-}
-
- (NSRect)bounds {
NSView *clipView = [[[pdfView documentView] enclosingScrollView]
contentView];
return [pdfView convertRect:[pdfView convertRect:[clipView bounds]
fromView:clipView] toPage:[pdfView currentPage]];
@@ -303,10 +283,6 @@
return [[pdfView currentPage] pageIndex];
}
-- (NSString *)pageLabel {
- return pageLabel;
-}
-
- (void)setPageLabel:(NSString *)newPageLabel {
if (pageLabel != newPageLabel) {
[pageLabel release];
@@ -315,10 +291,6 @@
}
}
-- (BOOL)hasWindow {
- return hasWindow;
-}
-
- (void)setHasWindow:(BOOL)flag {
hasWindow = flag;
}
@@ -327,10 +299,6 @@
return [NSDictionary dictionaryWithObjectsAndKeys:[self pageLabel],
SKSnapshotPageCellLabelKey, [NSNumber numberWithBool:[self hasWindow]],
SKSnapshotPageCellHasWindowKey, nil];
}
-- (BOOL)forceOnTop {
- return forceOnTop;
-}
-
- (void)setForceOnTop:(BOOL)flag {
forceOnTop = flag;
BOOL keepOnTop = [[NSUserDefaults standardUserDefaults]
boolForKey:SKSnapshotsOnTopKey];
Modified: trunk/SKTextFieldSheetController.h
===================================================================
--- trunk/SKTextFieldSheetController.h 2010-04-03 17:26:43 UTC (rev 6413)
+++ trunk/SKTextFieldSheetController.h 2010-04-04 15:15:08 UTC (rev 6414)
@@ -46,19 +46,14 @@
IBOutlet NSArray *controls;
IBOutlet NSArray *buttons;
}
-
-- (NSTextField *)textField;
-
-- (NSString *)stringValue;
-- (void)setStringValue:(NSString *)string;
-
+...@property (nonatomic, readonly) NSTextField *textField;
+...@property (nonatomic, retain) NSString *stringValue;
@end
#pragma mark -
@interface SKPageSheetController : SKTextFieldSheetController
-- (NSArray *)objectValues;
-- (void)setObjectValues:(NSArray *)objects;
+...@property (nonatomic, retain) NSArray *objectValues;
@end
#pragma mark -
@@ -73,9 +68,7 @@
@interface SKBookmarkSheetController : SKTextFieldSheetController {
IBOutlet NSPopUpButton *folderPopUp;
}
-
-- (SKBookmark *)selectedFolder;
-
+...@property (nonatomic, readonly) SKBookmark *selectedFolder;
@end
#pragma mark -
Modified: trunk/SKTextFieldSheetController.m
===================================================================
--- trunk/SKTextFieldSheetController.m 2010-04-03 17:26:43 UTC (rev 6413)
+++ trunk/SKTextFieldSheetController.m 2010-04-04 15:15:08 UTC (rev 6414)
@@ -46,6 +46,8 @@
@implementation SKTextFieldSheetController
+...@dynamic textField, stringValue;
+
- (void)windowDidLoad {
NSRect frame = [[self window] frame];
CGFloat buttonMargin = NSWidth(frame) - NSMaxX([[buttons objectAtIndex:0]
frame]);
@@ -77,6 +79,8 @@
@implementation SKPageSheetController
+...@dynamic objectValues;
+
- (NSString *)windowNibName { return @"PageSheet"; }
- (NSArray *)objectValues {
@@ -102,6 +106,8 @@
@implementation SKBookmarkSheetController
+...@dynamic selectedFolder;
+
- (NSString *)windowNibName { return @"BookmarkSheet"; }
- (void)addMenuItemsForBookmarks:(NSArray *)bookmarks level:(NSInteger)level
toMenu:(NSMenu *)menu {
Modified: trunk/SKTransitionController.h
===================================================================
--- trunk/SKTransitionController.h 2010-04-03 17:26:43 UTC (rev 6413)
+++ trunk/SKTransitionController.h 2010-04-04 15:15:08 UTC (rev 6414)
@@ -83,6 +83,12 @@
NSArray *pageTransitions;
}
+...@property (nonatomic, assign) NSView *view;
+...@property (nonatomic) SKAnimationTransitionStyle transitionStyle;
+...@property (nonatomic) CGFloat duration;
+...@property (nonatomic) BOOL shouldRestrict;
+...@property (nonatomic, copy) NSArray *pageTransitions;
+
+ (NSArray *)transitionFilterNames;
+ (NSArray *)transitionNames;
@@ -93,21 +99,6 @@
- (id)initWithView:(NSView *)aView;
-- (NSView *)view;
-- (void)setView:(NSView *)newView;
-
-- (SKAnimationTransitionStyle)transitionStyle;
-- (void)setTransitionStyle:(SKAnimationTransitionStyle)style;
-
-- (CGFloat)duration;
-- (void)setDuration:(CGFloat)newDuration;
-
-- (BOOL)shouldRestrict;
-- (void)setShouldRestrict:(BOOL)flag;
-
-- (NSArray *)pageTransitions;
-- (void)setPageTransitions:(NSArray *)newPageTransitions;
-
- (void)prepareAnimationForRect:(NSRect)rect from:(NSUInteger)fromIndex
to:(NSUInteger)toIndex;
- (void)animateForRect:(NSRect)rect;
Modified: trunk/SKTransitionController.m
===================================================================
--- trunk/SKTransitionController.m 2010-04-03 17:26:43 UTC (rev 6413)
+++ trunk/SKTransitionController.m 2010-04-04 15:15:08 UTC (rev 6414)
@@ -154,6 +154,8 @@
@implementation SKTransitionController
+...@synthesize view, transitionStyle, duration, shouldRestrict,
pageTransitions;
+
+ (NSArray *)transitionFilterNames {
static NSArray *transitionFilterNames = nil;
@@ -243,53 +245,6 @@
[super dealloc];
}
-- (NSView *)view {
- return view;
-}
-
-- (void)setView:(NSView *)newView {
- if (view != newView) {
- view = newView;
- }
-}
-
-- (SKAnimationTransitionStyle)transitionStyle {
- return transitionStyle;
-}
-
-- (void)setTransitionStyle:(SKAnimationTransitionStyle)style {
- if (transitionStyle != style) {
- transitionStyle = style;
- }
-}
-
-- (CGFloat)duration {
- return duration;
-}
-
-- (void)setDuration:(CGFloat)newDuration {
- duration = newDuration;
-}
-
-- (BOOL)shouldRestrict {
- return shouldRestrict;
-}
-
-- (void)setShouldRestrict:(BOOL)flag {
- shouldRestrict = flag;
-}
-
-- (NSArray *)pageTransitions {
- return pageTransitions;
-}
-
-- (void)setPageTransitions:(NSArray *)newPageTransitions {
- if (pageTransitions != newPageTransitions) {
- [pageTransitions release];
- pageTransitions = [newPageTransitions copy];
- }
-}
-
- (CIFilter *)filterWithName:(NSString *)name {
if (filters == nil)
filters = [[NSMutableDictionary alloc] init];
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