Revision: 6415
          http://skim-app.svn.sourceforge.net/skim-app/?rev=6415&view=rev
Author:   hofman
Date:     2010-04-04 21:49:52 +0000 (Sun, 04 Apr 2010)

Log Message:
-----------
more declared properties

Modified Paths:
--------------
    trunk/SKApplicationController.h
    trunk/SKApplicationController.m
    trunk/SKMainDocument.h
    trunk/SKMainDocument.m
    trunk/SKMainWindowController.h
    trunk/SKMainWindowController.m
    trunk/SKNotesDocument.h
    trunk/SKNotesDocument.m

Modified: trunk/SKApplicationController.h
===================================================================
--- trunk/SKApplicationController.h     2010-04-04 15:15:08 UTC (rev 6414)
+++ trunk/SKApplicationController.h     2010-04-04 21:49:52 UTC (rev 6415)
@@ -58,29 +58,17 @@
 - (IBAction)editBookmarks:(id)sender;
 - (IBAction)openBookmarkAction:(id)sender;
 
-- (NSDictionary *)defaultPdfViewSettings;
-- (void)setDefaultPdfViewSettings:(NSDictionary *)settings;
-- (NSDictionary *)defaultFullScreenPdfViewSettings;
-- (void)setDefaultFullScreenPdfViewSettings:(NSDictionary *)settings;
-- (NSColor *)backgroundColor;
-- (void)setBackgroundColor:(NSColor *)color;
-- (NSColor *)fullScreenBackgroundColor;
-- (void)setFullScreenBackgroundColor:(NSColor *)color;
-- (NSColor *)pageBackgroundColor;
-- (void)setPageBackgroundColor:(NSColor *)color;
-- (NSDictionary *)defaultNoteColors;
-- (void)setDefaultNoteColors:(NSDictionary *)colorDict;
-- (NSDictionary *)defaultLineWidths;
-- (void)setDefaultLineWidths:(NSDictionary *)dict;
-- (NSDictionary *)defaultLineStyles;
-- (void)setDefaultLineStyles:(NSDictionary *)dict;
-- (NSDictionary *)defaultDashPatterns;
-- (void)setDefaultDashPatterns:(NSDictionary *)dict;
-- (FourCharCode)defaultStartLineStyle;
-- (void)setDefaultStartLineStyle:(FourCharCode)style;
-- (FourCharCode)defaultEndLineStyle;
-- (void)setDefaultEndLineStyle:(FourCharCode)style;
-- (FourCharCode)defaultIconType;
-- (void)setDefaultIconType:(FourCharCode)type;
+...@property (nonatomic, copy) NSDictionary *defaultPdfViewSettings;
+...@property (nonatomic, copy) NSDictionary *defaultFullScreenPdfViewSettings;
+...@property (nonatomic, copy) NSColor *backgroundColor;
+...@property (nonatomic, copy) NSColor *fullScreenBackgroundColor;
+...@property (nonatomic, copy) NSColor *pageBackgroundColor;
+...@property (nonatomic, copy) NSDictionary *defaultNoteColors;
+...@property (nonatomic, copy) NSDictionary *defaultLineWidths;
+...@property (nonatomic, copy) NSDictionary *defaultLineStyles;
+...@property (nonatomic, copy) NSDictionary *defaultDashPatterns;
+...@property (nonatomic) FourCharCode defaultStartLineStyle;
+...@property (nonatomic) FourCharCode defaultEndLineStyle;
+...@property (nonatomic) FourCharCode defaultIconType;
 
 @end

Modified: trunk/SKApplicationController.m
===================================================================
--- trunk/SKApplicationController.m     2010-04-04 15:15:08 UTC (rev 6414)
+++ trunk/SKApplicationController.m     2010-04-04 21:49:52 UTC (rev 6415)
@@ -106,6 +106,8 @@
 
 @implementation SKApplicationController
 
+...@dynamic defaultPdfViewSettings, defaultFullScreenPdfViewSettings, 
backgroundColor, fullScreenBackgroundColor, pageBackgroundColor, 
defaultNoteColors, defaultLineWidths, defaultLineStyles, defaultDashPatterns, 
defaultStartLineStyle, defaultEndLineStyle, defaultIconType;
+
 + (void)initialize{
     SKINITIALIZE;
     

Modified: trunk/SKMainDocument.h
===================================================================
--- trunk/SKMainDocument.h      2010-04-04 15:15:08 UTC (rev 6414)
+++ trunk/SKMainDocument.h      2010-04-04 21:49:52 UTC (rev 6415)
@@ -103,41 +103,37 @@
 - (IBAction)emailArchive:(id)sender;
 - (IBAction)emailDiskImage:(id)sender;
 
-- (SKMainWindowController *)mainWindowController;
-- (PDFDocument *)pdfDocument;
+...@property (nonatomic, readonly) SKMainWindowController 
*mainWindowController;
+...@property (nonatomic, readonly) PDFDocument *pdfDocument;
 
-- (SKPDFView *)pdfView;
+...@property (nonatomic, readonly) SKPDFView *pdfView;
 
-- (NSArray *)fileIDStrings;
+...@property (nonatomic, readonly) NSArray *fileIDStrings;
 
 - (void)savePasswordInKeychain:(NSString *)password;
 
 - (void)applySetup:(NSDictionary *)setup;
 
-- (SKPDFSynchronizer *)synchronizer;
+...@property (nonatomic, readonly) SKPDFSynchronizer *synchronizer;
 
-- (NSArray *)snapshots;
+...@property (nonatomic, readonly) NSArray *snapshots;
 
-- (NSArray *)tags;
-- (double)rating;
+...@property (nonatomic, readonly) NSArray *tags;
+...@property (nonatomic, readonly) double rating;
 
 - (NSArray *)notes;
 - (void)insertInNotes:(PDFAnnotation *)newNote;
 - (void)insertObject:(PDFAnnotation *)newNote 
inNotesAtIndex:(NSUInteger)anIndex;
 - (void)removeObjectFromNotesAtIndex:(NSUInteger)anIndex;
-- (PDFPage *)currentPage;
-- (void)setCurrentPage:(PDFPage *)page;
-- (id)activeNote;
-- (void)setActiveNote:(id)note;
-- (NSTextStorage *)richText;
-- (id)selectionSpecifier;
-- (void)setSelectionSpecifier:(id)specifier;
-- (NSData *)selectionQDRect;
-- (void)setSelectionQDRect:(NSData *)inQDBoundsAsData;
-- (id)selectionPage;
-- (void)setSelectionPage:(PDFPage *)page;
-- (NSDictionary *)pdfViewSettings;
-- (void)setPdfViewSettings:(NSDictionary *)pdfViewSettings;
+
+...@property (nonatomic, copy) PDFPage *currentPage;
+...@property (nonatomic, copy) id activeNote;
+...@property (nonatomic, readonly) NSTextStorage *richText;
+...@property (nonatomic, copy) id selectionSpecifier;
+...@property (nonatomic, copy) NSData *selectionQDRect;
+...@property (nonatomic, copy) PDFPage *selectionPage;
+...@property (nonatomic, copy) NSDictionary *pdfViewSettings;
+
 - (void)handleRevertScriptCommand:(NSScriptCommand *)command;
 - (void)handleGoToScriptCommand:(NSScriptCommand *)command;
 - (id)handleFindScriptCommand:(NSScriptCommand *)command;

Modified: trunk/SKMainDocument.m
===================================================================
--- trunk/SKMainDocument.m      2010-04-04 15:15:08 UTC (rev 6414)
+++ trunk/SKMainDocument.m      2010-04-04 21:49:52 UTC (rev 6415)
@@ -163,6 +163,10 @@
 
 @implementation SKMainDocument
 
+...@synthesize mainWindowController;
+...@dynamic pdfDocument, pdfView, fileIDStrings, synchronizer, snapshots, 
tags, rating, currentPage, activeNote, richText, selectionSpecifier, 
selectionQDRect,selectionPage, pdfViewSettings;
+
+
 - (void)dealloc {
     [[NSNotificationCenter defaultCenter] removeObserver:self];
     SKDESTROY(mainWindowController);
@@ -197,9 +201,9 @@
     if ([tmpData presentationOptions])
         [[self mainWindowController] setPresentationOptions:[tmpData 
presentationOptions]];
     
-    [[self mainWindowController] setOpenMetaTags:[tmpData openMetaTags]];
+    [[self mainWindowController] setTags:[tmpData openMetaTags]];
     
-    [[self mainWindowController] setOpenMetaRating:[tmpData openMetaRating]];
+    [[self mainWindowController] setRating:[tmpData openMetaRating]];
     
     [[self undoManager] enableUndoRegistration];
 }
@@ -1632,10 +1636,6 @@
 
 #pragma mark Accessors
 
-- (SKMainWindowController *)mainWindowController {
-    return mainWindowController;
-}
-
 - (PDFDocument *)pdfDocument{
     return [[self mainWindowController] pdfDocument];
 }
@@ -1739,7 +1739,7 @@
 }
 
 - (NSArray *)tags {
-    return [[self mainWindowController] tags];
+    return [[self mainWindowController] tags] ?: [NSArray array];
 }
 
 - (double)rating {

Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h      2010-04-04 15:15:08 UTC (rev 6414)
+++ trunk/SKMainWindowController.h      2010-04-04 21:49:52 UTC (rev 6415)
@@ -192,12 +192,11 @@
 - (void)showSnapshotsWithSetups:(NSArray *)setups;
 - (void)showNote:(PDFAnnotation *)annotation;
 
-- (SKPDFView *)pdfView;
+...@property (nonatomic, readonly) SKPDFView *pdfView;
 
-- (PDFDocument *)pdfDocument;
-- (void)setPdfDocument:(PDFDocument *)document;
+...@property (nonatomic, retain) PDFDocument *pdfDocument;
 
-- (SKProgressController *)progressController;
+...@property (nonatomic, readonly) SKProgressController *progressController;
 
 - (NSArray *)notes;
 - (NSUInteger)countOfNotes;
@@ -234,41 +233,32 @@
 - (void)insertObject:(SKGroupedSearchResult *)groupedSearchResult 
inGroupedSearchResultsAtIndex:(NSUInteger)theIndex;
 - (void)removeObjectFromGroupedSearchResultsAtIndex:(NSUInteger)theIndex;
 
-- (NSDictionary *)presentationOptions;
-- (void)setPresentationOptions:(NSDictionary *)dictionary;
+...@property (nonatomic, copy) NSDictionary *presentationOptions;
 
-- (SKMainDocument *)presentationNotesDocument;
-- (void)setPresentationNotesDocument:(SKMainDocument *)aDocument;
+...@property (nonatomic, retain) SKMainDocument *presentationNotesDocument;
 
-- (NSArray *)tags;
-- (double)rating;
+...@property (nonatomic, copy) NSArray *tags;
+...@property (nonatomic) double rating;
 
-- (NSArray *)selectedNotes;
+...@property (nonatomic, readonly) NSArray *selectedNotes;
 
-- (NSUInteger)pageNumber;
-- (void)setPageNumber:(NSUInteger)pageNumber;
-- (NSString *)pageLabel;
-- (void)setPageLabel:(NSString *)label;
+...@property (nonatomic) NSUInteger pageNumber;
+...@property (nonatomic, copy) NSString *pageLabel;
 
-- (BOOL)isFullScreen;
-- (BOOL)isPresentation;
+...@property (nonatomic, readonly) BOOL isFullScreen, isPresentation;
 
-- (BOOL)autoScales;
+...@property (nonatomic, readonly) BOOL autoScales;
 
-- (SKLeftSidePaneState)leftSidePaneState;
-- (void)setLeftSidePaneState:(SKLeftSidePaneState)newLeftSidePaneState;
-- (SKRightSidePaneState)rightSidePaneState;
-- (void)setRightSidePaneState:(SKRightSidePaneState)newRightSidePaneState;
-- (SKFindPaneState)findPaneState;
-- (void)setFindPaneState:(SKFindPaneState)newFindPaneState;
+...@property (nonatomic) SKLeftSidePaneState leftSidePaneState;
+...@property (nonatomic) SKRightSidePaneState rightSidePaneState;
+...@property (nonatomic) SKFindPaneState findPaneState;
 
 - (void)showLeftSideWindowOnScreen:(NSScreen *)screen;
 - (void)showRightSideWindowOnScreen:(NSScreen *)screen;
 - (void)hideLeftSideWindow;
 - (void)hideRightSideWindow;
 
-- (BOOL)leftSidePaneIsOpen;
-- (BOOL)rightSidePaneIsOpen;
+...@property (nonatomic, readonly) BOOL leftSidePaneIsOpen, 
rightSidePaneIsOpen;
 
 - (void)closeSideWindow:(SKSideWindow *)sideWindow;
 
@@ -303,9 +293,6 @@
 
 - (void)addAnnotationsFromDictionaries:(NSArray *)noteDicts 
replace:(BOOL)replace;
 
-- (void)setOpenMetaTags:(NSArray *)tags;
-- (void)setOpenMetaRating:(double)rating;
-
 - (void)applySetup:(NSDictionary *)setup;
 - (NSDictionary *)currentSetup;
 - (void)applyPDFSettings:(NSDictionary *)setup;

Modified: trunk/SKMainWindowController.m
===================================================================
--- trunk/SKMainWindowController.m      2010-04-04 15:15:08 UTC (rev 6414)
+++ trunk/SKMainWindowController.m      2010-04-04 21:49:52 UTC (rev 6415)
@@ -199,6 +199,9 @@
 
 @implementation SKMainWindowController
 
+...@synthesize pdfView, progressController, presentationNotesDocument, tags, 
rating, pageNumber, pageLabel;
+...@dynamic pdfDocument, presentationOptions, selectedNotes, isPresentation, 
isFullScreen, autoScales, leftSidePaneState, rightSidePaneState, findPaneState, 
leftSidePaneIsOpen, rightSidePaneIsOpen;
+
 + (void)initialize {
     SKINITIALIZE;
     
@@ -811,21 +814,6 @@
     [pdfView resetPDFToolTipRects];
 }
 
-- (void)setOpenMetaTags:(NSArray *)newTags {
-    if (tags != newTags) {
-        [tags release];
-        tags = [newTags retain] ?: [[NSArray alloc] init];
-    }
-}
-
-- (void)setOpenMetaRating:(double)newRating {
-    rating = newRating;
-}
-
-- (SKPDFView *)pdfView {
-    return pdfView;
-}
-
 - (void)updatePageNumber {
     NSUInteger number = [[pdfView currentPage] pageIndex] + 1;
     if (pageNumber != number) {
@@ -835,10 +823,6 @@
     }
 }
 
-- (NSUInteger)pageNumber {
-    return pageNumber;
-}
-
 - (void)setPageNumber:(NSUInteger)number {
     // Check that the page number exists
     NSUInteger pageCount = [[pdfView document] pageCount];
@@ -858,10 +842,6 @@
     }
 }
 
-- (NSString *)pageLabel {
-    return pageLabel;
-}
-
 - (void)setPageLabel:(NSString *)label {
     NSUInteger idx = [pageLabels indexOfObject:label];
     if (idx != NSNotFound && [[pdfView currentPage] pageIndex] != idx)
@@ -1192,25 +1172,6 @@
     [transitions setPageTransitions:pageTransitions];
 }
 
-- (SKMainDocument *)presentationNotesDocument {
-    return presentationNotesDocument;
-}
-
-- (void)setPresentationNotesDocument:(SKMainDocument *)aDocument {
-    if (presentationNotesDocument != aDocument) {
-        [presentationNotesDocument release];
-        presentationNotesDocument = [aDocument retain];
-    }
-}
-
-- (NSArray *)tags {
-    return tags;
-}
-
-- (double)rating {
-    return rating;
-}
-
 #pragma mark Full Screen support
 
 - (void)showLeftSideWindowOnScreen:(NSScreen *)screen {

Modified: trunk/SKNotesDocument.h
===================================================================
--- trunk/SKNotesDocument.h     2010-04-04 15:15:08 UTC (rev 6414)
+++ trunk/SKNotesDocument.h     2010-04-04 21:49:52 UTC (rev 6415)
@@ -57,15 +57,14 @@
     BOOL caseInsensitiveSearch;
 }
 
+...@property (nonatomic, readonly) NSArray *notes;
+...@property (nonatomic, readonly) PDFDocument *pdfDocument;
+
 - (IBAction)openPDF:(id)sender;
 - (IBAction)searchNotes:(id)sender;
 - (IBAction)toggleStatusBar:(id)sender;
 - (IBAction)toggleCaseInsensitiveSearch:(id)sender;
  
-- (NSArray *)notes;
-
-- (PDFDocument *)pdfDocument;
-
 - (void)setupToolbar:(NSWindowController *)aController;
 
 @end

Modified: trunk/SKNotesDocument.m
===================================================================
--- trunk/SKNotesDocument.m     2010-04-04 15:15:08 UTC (rev 6414)
+++ trunk/SKNotesDocument.m     2010-04-04 21:49:52 UTC (rev 6415)
@@ -82,6 +82,8 @@
 
 @implementation SKNotesDocument
 
+...@synthesize notes, pdfDocument;
+
 - (id)init {
     if (self = [super init]) {
         notes = [[NSArray alloc] init];
@@ -443,16 +445,6 @@
     return YES;
 }
 
-#pragma mark Accessors
-
-- (NSArray *)notes {
-    return notes;
-}
-
-- (PDFDocument *)pdfDocument {
-    return pdfDocument;
-}
-
 #pragma mark NSOutlineView datasource and delegate methods
 
 - (NSInteger)outlineView:(NSOutlineView *)ov numberOfChildrenOfItem:(id)item {


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

Reply via email to