Revision: 6421
http://skim-app.svn.sourceforge.net/skim-app/?rev=6421&view=rev
Author: hofman
Date: 2010-04-05 22:15:53 +0000 (Mon, 05 Apr 2010)
Log Message:
-----------
more declared properties
Modified Paths:
--------------
trunk/SKAnimatedBorderlessWindow.h
trunk/SKAnimatedBorderlessWindow.m
trunk/SKApplicationController.h
trunk/SKFullScreenWindow.h
trunk/SKFullScreenWindow.m
trunk/SKGeneralPreferences.h
trunk/SKGeneralPreferences.m
trunk/SKLeftSideViewController.h
trunk/SKMainToolbarController.h
trunk/SKMainWindowController.h
trunk/SKNavigationWindow.h
trunk/SKNavigationWindow.m
trunk/SKPDFToolTipWindow.h
trunk/SKPDFToolTipWindow.m
trunk/SKRightSideViewController.h
trunk/SKSideViewController.h
trunk/SKSideWindow.h
trunk/SKSideWindow.m
trunk/SKSnapshotWindowController.h
trunk/SKStatusBar.h
trunk/SKVersionNumber.h
Modified: trunk/SKAnimatedBorderlessWindow.h
===================================================================
--- trunk/SKAnimatedBorderlessWindow.h 2010-04-05 17:32:39 UTC (rev 6420)
+++ trunk/SKAnimatedBorderlessWindow.h 2010-04-05 22:15:53 UTC (rev 6421)
@@ -46,12 +46,9 @@
- (void)willClose;
-- (CGFloat)defaultAlphaValue;
+...@property (nonatomic) CGFloat defaultAlphaValue;
+...@property (nonatomic) NSTimeInterval fadeInDuration, fadeOutDuration,
autoHideTimeInterval;
-- (NSTimeInterval)fadeInDuration;
-- (NSTimeInterval)fadeOutDuration;
-- (NSTimeInterval)autoHideTimeInterval;
-
- (void)fadeIn;
- (void)fadeOut;
Modified: trunk/SKAnimatedBorderlessWindow.m
===================================================================
--- trunk/SKAnimatedBorderlessWindow.m 2010-04-05 17:32:39 UTC (rev 6420)
+++ trunk/SKAnimatedBorderlessWindow.m 2010-04-05 22:15:53 UTC (rev 6421)
@@ -46,6 +46,8 @@
@implementation SKAnimatedBorderlessWindow
+...@dynamic defaultAlphaValue, fadeInDuration, fadeOutDuration,
autoHideTimeInterval;
+
- (id)initWithContentRect:(NSRect)contentRect screen:(NSScreen *)screen {
if (self = [super initWithContentRect:contentRect
styleMask:NSBorderlessWindowMask backing:NSBackingStoreBuffered defer:NO
screen:screen]) {
[self setBackgroundColor:[NSColor clearColor]];
Modified: trunk/SKApplicationController.h
===================================================================
--- trunk/SKApplicationController.h 2010-04-05 17:32:39 UTC (rev 6420)
+++ trunk/SKApplicationController.h 2010-04-05 22:15:53 UTC (rev 6421)
@@ -58,17 +58,9 @@
- (IBAction)editBookmarks:(id)sender;
- (IBAction)openBookmarkAction:(id)sender;
-...@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;
+...@property (nonatomic, copy) NSDictionary *defaultPdfViewSettings,
*defaultFullScreenPdfViewSettings;
+...@property (nonatomic, copy) NSColor *backgroundColor,
*fullScreenBackgroundColor, *pageBackgroundColor;
+...@property (nonatomic, copy) NSDictionary *defaultNoteColors,
*defaultLineWidths, *defaultLineStyles, *defaultDashPatterns;
+...@property (nonatomic) FourCharCode defaultStartLineStyle,
defaultEndLineStyle, defaultIconType;
@end
Modified: trunk/SKFullScreenWindow.h
===================================================================
--- trunk/SKFullScreenWindow.h 2010-04-05 17:32:39 UTC (rev 6420)
+++ trunk/SKFullScreenWindow.h 2010-04-05 22:15:53 UTC (rev 6421)
@@ -46,8 +46,7 @@
- (id)initWithScreen:(NSScreen *)screen;
-- (NSView *)mainView;
-- (void)setMainView:(NSView *)view;
+...@property (nonatomic, retain) NSView *mainView;
- (void)fadeOutBlocking;
- (void)fadeOut;
Modified: trunk/SKFullScreenWindow.m
===================================================================
--- trunk/SKFullScreenWindow.m 2010-04-05 17:32:39 UTC (rev 6420)
+++ trunk/SKFullScreenWindow.m 2010-04-05 22:15:53 UTC (rev 6421)
@@ -44,6 +44,8 @@
@implementation SKFullScreenWindow
+...@dynamic mainView;
+
- (id)initWithScreen:(NSScreen *)screen {
if (screen == nil)
screen = [NSScreen mainScreen];
Modified: trunk/SKGeneralPreferences.h
===================================================================
--- trunk/SKGeneralPreferences.h 2010-04-05 17:32:39 UTC (rev 6420)
+++ trunk/SKGeneralPreferences.h 2010-04-05 22:15:53 UTC (rev 6421)
@@ -50,8 +50,7 @@
NSInteger updateInterval;
}
-- (NSInteger)updateInterval;
-- (void)setUpdateInterval:(NSInteger)interval;
+...@property (nonatomic) NSInteger updateInterval;
- (IBAction)revertPDFViewSettings:(id)sender;
- (IBAction)revertFullScreenPDFViewSettings:(id)sender;
Modified: trunk/SKGeneralPreferences.m
===================================================================
--- trunk/SKGeneralPreferences.m 2010-04-05 17:32:39 UTC (rev 6420)
+++ trunk/SKGeneralPreferences.m 2010-04-05 22:15:53 UTC (rev 6421)
@@ -59,6 +59,8 @@
@implementation SKGeneralPreferences
+...@synthesize updateInterval;
+
- (void)dealloc {
@try {
[[NSUserDefaultsController sharedUserDefaultsController]
removeObserver:self forKeys:[NSArray
arrayWithObjects:SKDefaultPDFDisplaySettingsKey,
SKDefaultFullScreenPDFDisplaySettingsKey, nil]];
@@ -96,10 +98,6 @@
- (NSImage *)icon { return [NSImage imageNamed:@"GeneralPreferences"]; }
-- (NSInteger)updateInterval {
- return updateInterval;
-}
-
- (void)setUpdateInterval:(NSInteger)interval {
if (interval > 0)
[[SUUpdater sharedUpdater] setUpdateCheckInterval:interval];
Modified: trunk/SKLeftSideViewController.h
===================================================================
--- trunk/SKLeftSideViewController.h 2010-04-05 17:32:39 UTC (rev 6420)
+++ trunk/SKLeftSideViewController.h 2010-04-05 22:15:53 UTC (rev 6421)
@@ -54,15 +54,10 @@
NSTableView *groupedFindTableView;
}
+...@property (nonatomic, assign) IBOutlet NSArrayController
*thumbnailArrayController, *findArrayController, *groupedFindArrayController;
@property (nonatomic, assign) IBOutlet SKTocOutlineView *tocOutlineView;
-
-...@property (nonatomic, assign) IBOutlet NSArrayController
*thumbnailArrayController;
@property (nonatomic, assign) IBOutlet SKThumbnailTableView
*thumbnailTableView;
-
-...@property (nonatomic, assign) IBOutlet NSArrayController
*findArrayController;
@property (nonatomic, assign) IBOutlet NSTableView *findTableView;
-
-...@property (nonatomic, assign) IBOutlet NSArrayController
*groupedFindArrayController;
@property (nonatomic, assign) IBOutlet NSTableView *groupedFindTableView;
@end
Modified: trunk/SKMainToolbarController.h
===================================================================
--- trunk/SKMainToolbarController.h 2010-04-05 17:32:39 UTC (rev 6420)
+++ trunk/SKMainToolbarController.h 2010-04-05 22:15:53 UTC (rev 6421)
@@ -84,42 +84,8 @@
}
@property (nonatomic, assign) IBOutlet SKMainWindowController *mainController;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl
*backForwardButton;
-...@property (nonatomic, assign) IBOutlet NSTextField *pageNumberField;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl
*previousNextPageButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl
*previousPageButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl *nextPageButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl
*previousNextFirstLastPageButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl *zoomInOutButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl
*zoomInActualOutButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl *zoomActualButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl *zoomFitButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl
*zoomSelectionButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl *rotateLeftButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl
*rotateRightButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl
*rotateLeftRightButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl *cropButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl *fullScreenButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl
*presentationButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl *leftPaneButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl *rightPaneButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl *toolModeButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl *textNoteButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl *circleNoteButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl *markupNoteButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl *lineNoteButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl
*singleTwoUpButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl *continuousButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl
*displayModeButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl *displayBoxButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl *infoButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl *colorsButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl *fontsButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl *linesButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl *printButton;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl *customizeButton;
-...@property (nonatomic, assign) IBOutlet NSTextField *scaleField;
-...@property (nonatomic, assign) IBOutlet NSSegmentedControl *noteButton;
+...@property (nonatomic, assign) IBOutlet NSSegmentedControl
*backForwardButton, *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,
*noteButton;
+...@property (nonatomic, assign) IBOutlet NSTextField *pageNumberField,
*scaleField;
@property (nonatomic, assign) IBOutlet SKColorSwatch *colorSwatch;
- (void)setupToolbar;
Modified: trunk/SKMainWindowController.h
===================================================================
--- trunk/SKMainWindowController.h 2010-04-05 17:32:39 UTC (rev 6420)
+++ trunk/SKMainWindowController.h 2010-04-05 22:15:53 UTC (rev 6421)
@@ -245,10 +245,8 @@
@property (nonatomic) NSUInteger pageNumber;
@property (nonatomic, copy) NSString *pageLabel;
-...@property (nonatomic, readonly) BOOL isFullScreen, isPresentation;
+...@property (nonatomic, readonly) BOOL isFullScreen, isPresentation,
autoScales;
-...@property (nonatomic, readonly) BOOL autoScales;
-
@property (nonatomic) SKLeftSidePaneState leftSidePaneState;
@property (nonatomic) SKRightSidePaneState rightSidePaneState;
@property (nonatomic) SKFindPaneState findPaneState;
Modified: trunk/SKNavigationWindow.h
===================================================================
--- trunk/SKNavigationWindow.h 2010-04-05 17:32:39 UTC (rev 6420)
+++ trunk/SKNavigationWindow.h 2010-04-05 22:15:53 UTC (rev 6421)
@@ -64,30 +64,23 @@
}
+ (id)sharedToolTipWindow;
- (void)showToolTip:(NSString *)toolTip forView:(NSView *)aView;
-- (NSView *)view;
+...@property (nonatomic, readonly) NSView *view;
@end
@interface SKNavigationToolTipView : NSView {
NSString *stringValue;
}
-- (NSString *)stringValue;
-- (void)setStringValue:(NSString *)newStringValue;
-- (NSAttributedString *)attributedStringValue;
+...@property (nonatomic, retain) NSString *stringValue;
+...@property (nonatomic, readonly) NSAttributedString *attributedStringValue;
- (void)sizeToFit;
@end
@interface SKNavigationButton : NSButton
-- (NSBezierPath *)path;
-- (void)setPath:(NSBezierPath *)newPath;
+...@property (nonatomic, retain) NSBezierPath *path, *alternatePath;
+...@property (nonatomic, retain) NSString *toolTip, *alternateToolTip;
-- (NSBezierPath *)alternatePath;
-- (void)setAlternatePath:(NSBezierPath *)newAlternatePath;
-
-- (NSString *)alternateToolTip;
-- (void)setAlternateToolTip:(NSString *)string;
-
@end
@@ -98,18 +91,9 @@
NSBezierPath *alternatePath;
}
-- (NSString *)toolTip;
-- (void)setToolTip:(NSString *)string;
+...@property (nonatomic, retain) NSBezierPath *path, *alternatePath;
+...@property (nonatomic, retain) NSString *toolTip, *alternateToolTip;
-- (NSString *)alternateToolTip;
-- (void)setAlternateToolTip:(NSString *)string;
-
-- (NSBezierPath *)path;
-- (void)setPath:(NSBezierPath *)newPath;
-
-- (NSBezierPath *)alternatePath;
-- (void)setAlternatePath:(NSBezierPath *)newAlternatePath;
-
@end
@@ -118,8 +102,7 @@
NSString *toolTip;
}
-- (NSString *)toolTip;
-- (void)setToolTip:(NSString *)string;
+...@property (nonatomic, retain) NSString *toolTip;
@end
Modified: trunk/SKNavigationWindow.m
===================================================================
--- trunk/SKNavigationWindow.m 2010-04-05 17:32:39 UTC (rev 6420)
+++ trunk/SKNavigationWindow.m 2010-04-05 22:15:53 UTC (rev 6421)
@@ -204,6 +204,8 @@
@implementation SKNavigationToolTipWindow
+...@synthesize view;
+
+ (id)sharedToolTipWindow {
static SKNavigationToolTipWindow *sharedToolTipWindow = nil;
if (sharedToolTipWindow == nil)
@@ -252,10 +254,6 @@
SKDESTROY(view);
}
-- (NSView *)view {
- return view;
-}
-
- (BOOL)accessibilityIsIgnored {
return YES;
}
@@ -266,6 +264,9 @@
@implementation SKNavigationToolTipView
+...@synthesize stringValue;
+...@dynamic attributedStringValue;
+
- (id)initWithFrame:(NSRect)frameRect {
if (self = [super initWithFrame:frameRect]) {
stringValue = nil;
@@ -278,17 +279,6 @@
[super dealloc];
}
-- (NSString *)stringValue {
- return stringValue;
-}
-
-- (void)setStringValue:(NSString *)newStringValue {
- if (stringValue != newStringValue) {
- [stringValue release];
- stringValue = [newStringValue retain];
- }
-}
-
- (NSAttributedString *)attributedStringValue {
if (stringValue == nil)
return nil;
@@ -327,6 +317,8 @@
@implementation SKNavigationButton
+...@dynamic path, alternatePath, toolTip, alternateToolTip;
+
+ (Class)cellClass { return [SKNavigationButtonCell class]; }
- (NSBezierPath *)path {
@@ -369,6 +361,8 @@
@implementation SKNavigationButtonCell
+...@synthesize path, alternatePath, toolTip, alternateToolTip;
+
- (id)initTextCell:(NSString *)aString {
if (self = [super initTextCell:@""]) {
[self setBezelStyle:NSShadowlessSquareBezelStyle]; // this is
mainly to make it selectable
@@ -386,50 +380,6 @@
[super dealloc];
}
-- (NSString *)toolTip {
- return toolTip;
-}
-
-- (void)setToolTip:(NSString *)string {
- if (toolTip != string) {
- [toolTip release];
- toolTip = [string retain];
- }
-}
-
-- (NSString *)alternateToolTip {
- return alternateToolTip;
-}
-
-- (void)setAlternateToolTip:(NSString *)string {
- if (alternateToolTip != string) {
- [alternateToolTip release];
- alternateToolTip = [string retain];
- }
-}
-
-- (NSBezierPath *)path {
- return path;
-}
-
-- (void)setPath:(NSBezierPath *)newPath {
- if (path != newPath) {
- [path release];
- path = [newPath retain];
- }
-}
-
-- (NSBezierPath *)alternatePath {
- return alternatePath;
-}
-
-- (void)setAlternatePath:(NSBezierPath *)newAlternatePath {
- if (alternatePath != newAlternatePath) {
- [alternatePath release];
- alternatePath = [newAlternatePath retain];
- }
-}
-
- (void)drawWithFrame:(NSRect)cellFrame inView:(NSView *)controlView {
[[NSColor colorWithDeviceWhite:1.0 alpha:[self isEnabled] == NO ? 0.3 :
[self isHighlighted] ? 0.9 : 0.6] setFill];
[([self state] == NSOnState && [self alternatePath] ? [self alternatePath]
: [self path]) fill];
@@ -467,6 +417,8 @@
@implementation SKNavigationSlider
+...@synthesize toolTip;
+
+ (Class)cellClass { return [SKNavigationSliderCell class]; }
- (id)initWithFrame:(NSRect)frameRect {
@@ -484,17 +436,6 @@
[super dealloc];
}
-- (NSString *)toolTip {
- return toolTip;
-}
-
-- (void)setToolTip:(NSString *)string {
- if (toolTip != string) {
- [toolTip release];
- toolTip = [string retain];
- }
-}
-
- (void)mouseEntered:(NSEvent *)theEvent {
if ([[theEvent trackingArea] isEqual:trackingArea])
[[SKNavigationToolTipWindow sharedToolTipWindow] showToolTip:toolTip
forView:self];
Modified: trunk/SKPDFToolTipWindow.h
===================================================================
--- trunk/SKPDFToolTipWindow.h 2010-04-05 17:32:39 UTC (rev 6420)
+++ trunk/SKPDFToolTipWindow.h 2010-04-05 22:15:53 UTC (rev 6421)
@@ -51,6 +51,6 @@
// aContext can be a PDFAnnotation, PDFDestination, or PDFPage
- (void)showForPDFContext:(id<SKPDFToolTipContext>)aContext
atPoint:(NSPoint)aPoint;
-- (id<SKPDFToolTipContext>)currentPDFContext;
+...@property (nonatomic, readonly) id<SKPDFToolTipContext> currentPDFContext;
@end
Modified: trunk/SKPDFToolTipWindow.m
===================================================================
--- trunk/SKPDFToolTipWindow.m 2010-04-05 17:32:39 UTC (rev 6420)
+++ trunk/SKPDFToolTipWindow.m 2010-04-05 22:15:53 UTC (rev 6421)
@@ -54,6 +54,8 @@
@implementation SKPDFToolTipWindow
+...@synthesize currentPDFContext=context;
+
+ (id)sharedToolTipWindow {
static SKPDFToolTipWindow *sharedToolTipWindow = nil;
if (sharedToolTipWindow == nil)
@@ -142,10 +144,6 @@
}
}
-- (id<SKPDFToolTipContext>)currentPDFContext {
- return context;
-}
-
@end
Modified: trunk/SKRightSideViewController.h
===================================================================
--- trunk/SKRightSideViewController.h 2010-04-05 17:32:39 UTC (rev 6420)
+++ trunk/SKRightSideViewController.h 2010-04-05 22:15:53 UTC (rev 6421)
@@ -49,10 +49,8 @@
SKThumbnailTableView *snapshotTableView;
}
-...@property (nonatomic, assign) IBOutlet NSArrayController
*noteArrayController;
+...@property (nonatomic, assign) IBOutlet NSArrayController
*noteArrayController, *snapshotArrayController;
@property (nonatomic, assign) IBOutlet SKNoteOutlineView *noteOutlineView;
-
-...@property (nonatomic, assign) IBOutlet NSArrayController
*snapshotArrayController;
@property (nonatomic, assign) IBOutlet SKThumbnailTableView *snapshotTableView;
@end
Modified: trunk/SKSideViewController.h
===================================================================
--- trunk/SKSideViewController.h 2010-04-05 17:32:39 UTC (rev 6420)
+++ trunk/SKSideViewController.h 2010-04-05 22:15:53 UTC (rev 6421)
@@ -52,8 +52,7 @@
@property (nonatomic, assign) IBOutlet SKMainWindowController *mainController;
@property (nonatomic, assign) IBOutlet BDSKCollapsibleView *collapsibleView;
-...@property (nonatomic, retain) IBOutlet NSSegmentedControl *button;
-...@property (nonatomic, retain) IBOutlet NSSegmentedControl *alternateButton;
+...@property (nonatomic, retain) IBOutlet NSSegmentedControl *button,
*alternateButton;
@property (nonatomic, assign) IBOutlet NSSearchField *searchField;
@property (nonatomic, assign) IBOutlet NSView *currentView;
Modified: trunk/SKSideWindow.h
===================================================================
--- trunk/SKSideWindow.h 2010-04-05 17:32:39 UTC (rev 6420)
+++ trunk/SKSideWindow.h 2010-04-05 22:15:53 UTC (rev 6421)
@@ -56,20 +56,18 @@
+ (BOOL)isAutoHideEnabled;
+...@property (nonatomic, retain) NSView *mainView;
+...@property (nonatomic, readonly) NSRectEdge edge;
+...@property (nonatomic, readonly) NSDrawerState state;
+...@property (nonatomic, getter=isEnabled) BOOL enabled;
+...@property (nonatomic) BOOL acceptsMouseOver;
+
- (id)initWithMainController:(SKMainWindowController *)aController
edge:(NSRectEdge)anEdge;
- (void)attachToWindow:(NSWindow *)window onScreen:(NSScreen *)screen;
- (void)slideIn;
- (void)slideOut;
- (void)expand;
- (void)collapse;
-- (NSView *)mainView;
-- (void)setMainView:(NSView *)newContentView;
-- (NSRectEdge)edge;
-- (NSInteger)state;
-- (BOOL)isEnabled;
-- (void)setEnabled:(BOOL)flag;
-- (BOOL)acceptsMouseOver;
-- (void)setAcceptsMouseOver:(BOOL)flag;
- (void)resizeWithEvent:(NSEvent *)theEvent;
@end
Modified: trunk/SKSideWindow.m
===================================================================
--- trunk/SKSideWindow.m 2010-04-05 17:32:39 UTC (rev 6420)
+++ trunk/SKSideWindow.m 2010-04-05 22:15:53 UTC (rev 6421)
@@ -57,6 +57,9 @@
@implementation SKSideWindow
+...@synthesize edge, state, enabled, acceptsMouseOver;
+...@dynamic mainView;
+
static NSUInteger hideWhenClosed = SKClosedSidePanelCollapse;
+ (void)initialize {
@@ -190,14 +193,6 @@
[self recalculateKeyViewLoop];
}
-- (NSRectEdge)edge {
- return edge;
-}
-
-- (NSInteger)state {
- return state;
-}
-
- (void)expand {
[self setAcceptsMouseOver:NO];
[self slideIn];
@@ -208,16 +203,6 @@
[self setAcceptsMouseOver:YES];
}
-- (BOOL)isEnabled {
- return enabled;
-}
-
-- (void)setEnabled:(BOOL)flag {
- if (enabled != flag) {
- enabled = flag;
- }
-}
-
- (BOOL)acceptsMouseOver {
return acceptsMouseOver && hideWhenClosed != SKClosedSidePanelHide;
}
Modified: trunk/SKSnapshotWindowController.h
===================================================================
--- trunk/SKSnapshotWindowController.h 2010-04-05 17:32:39 UTC (rev 6420)
+++ trunk/SKSnapshotWindowController.h 2010-04-05 22:15:53 UTC (rev 6421)
@@ -75,12 +75,7 @@
@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;
+...@property (nonatomic, readonly) NSAttributedString *thumbnailAttachment,
*thumbnail512Attachment, *thumbnail256Attachment, *thumbnail128Attachment,
*thumbnail64Attachment, *thumbnail32Attachment;
- (void)setPdfDocument:(PDFDocument *)pdfDocument scaleFactor:(CGFloat)factor
goToPageNumber:(NSInteger)pageNum rect:(NSRect)rect autoFits:(BOOL)autoFits;
- (void)setPdfDocument:(PDFDocument *)pdfDocument setup:(NSDictionary *)setup;
Modified: trunk/SKStatusBar.h
===================================================================
--- trunk/SKStatusBar.h 2010-04-05 17:32:39 UTC (rev 6420)
+++ trunk/SKStatusBar.h 2010-04-05 22:15:53 UTC (rev 6421)
@@ -58,10 +58,8 @@
@property (nonatomic, readonly) BOOL isVisible;
@property (nonatomic, readonly, getter=isAnimating) BOOL animating;
-...@property (nonatomic, copy) NSString *leftStringValue;
-...@property (nonatomic, copy) NSAttributedString *leftAttributedStringValue;
-...@property (nonatomic, copy) NSString *rightStringValue;
-...@property (nonatomic, copy) NSAttributedString *rightAttributedStringValue;
+...@property (nonatomic, copy) NSString *leftStringValue, *rightStringValue;
+...@property (nonatomic, copy) NSAttributedString *leftAttributedStringValue,
*rightAttributedStringValue;
@property (nonatomic) SEL leftAction, rightAction;
@property (nonatomic, assign) id leftTarget, rightTarget;
@property (nonatomic) NSInteger leftState, rightState, state;
Modified: trunk/SKVersionNumber.h
===================================================================
--- trunk/SKVersionNumber.h 2010-04-05 17:32:39 UTC (rev 6420)
+++ trunk/SKVersionNumber.h 2010-04-05 22:15:53 UTC (rev 6421)
@@ -56,8 +56,7 @@
NSInteger releaseType;
}
-...@property (nonatomic, readonly) NSString *originalVersionString;
-...@property (nonatomic, readonly) NSString *cleanVersionString;
+...@property (nonatomic, readonly) NSString *originalVersionString,
*cleanVersionString;
@property (nonatomic, readonly) NSUInteger componentCount;
@property (nonatomic) NSInteger releaseType;
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