Revision: 6470
http://skim-app.svn.sourceforge.net/skim-app/?rev=6470&view=rev
Author: hofman
Date: 2010-04-18 16:34:42 +0000 (Sun, 18 Apr 2010)
Log Message:
-----------
implement nscoding for window subclasses
Modified Paths:
--------------
trunk/SKNavigationWindow.m
trunk/SKSideWindow.m
Modified: trunk/SKNavigationWindow.m
===================================================================
--- trunk/SKNavigationWindow.m 2010-04-18 11:57:29 UTC (rev 6469)
+++ trunk/SKNavigationWindow.m 2010-04-18 16:34:42 UTC (rev 6470)
@@ -148,6 +148,26 @@
return self;
}
+- (id)initWithCoder:(NSCoder *)decoder {
+ if (self = [super initWithCoder:decoder]) {
+ previousButton = [[decoder decodeObjectForKey:@"previousButton"]
retain];
+ nextButton = [[decoder decodeObjectForKey:@"nextButton"] retain];
+ zoomButton = [[decoder decodeObjectForKey:@"zoomButton"] retain];
+ zoomSlider = [[decoder decodeObjectForKey:@"zoomSlider"] retain];
+ closeButton = [[decoder decodeObjectForKey:@"closeButton"] retain];
+ }
+ return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+ [super encodeWithCoder:coder];
+ [coder encodeConditionalObject:previousButton forKey:@"previousButton"];
+ [coder encodeConditionalObject:nextButton forKey:@"nextButton"];
+ [coder encodeConditionalObject:zoomButton forKey:@"zoomButton"];
+ [coder encodeConditionalObject:zoomSlider forKey:@"zoomSlider"];
+ [coder encodeConditionalObject:closeButton forKey:@"closeButton"];
+}
+
- (void)dealloc {
[[NSNotificationCenter defaultCenter] removeObserver:self];
SKDESTROY(previousButton);
@@ -226,6 +246,18 @@
return self;
}
+- (id)initWithCoder:(NSCoder *)decoder {
+ if (self = [super initWithCoder:decoder]) {
+ toolTipView = [decoder decodeObjectForKey:@"toolTipView"];
+ }
+ return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+ [super encodeWithCoder:coder];
+ [coder encodeConditionalObject:toolTipView forKey:@"toolTipView"];
+}
+
- (BOOL)canBecomeKeyWindow { return NO; }
- (BOOL)canBecomeMainWindow { return NO; }
@@ -274,6 +306,18 @@
return self;
}
+- (id)initWithCoder:(NSCoder *)decoder {
+ if (self = [super initWithCoder:decoder]) {
+ stringValue = [[decoder decodeObjectForKey:@"stringValue"] retain];
+ }
+ return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+ [super encodeWithCoder:coder];
+ [coder encodeObject:stringValue forKey:@"stringValue"];
+}
+
- (void)dealloc {
SKDESTROY(stringValue);
[super dealloc];
@@ -372,6 +416,24 @@
return self;
}
+- (id)initWithCoder:(NSCoder *)decoder {
+ if (self = [super initWithCoder:decoder]) {
+ toolTip = [[decoder decodeObjectForKey:@"toolTip"] retain];
+ alternateToolTip = [[decoder decodeObjectForKey:@"alternateToolTip"]
retain];
+ path = [[decoder decodeObjectForKey:@"path"] retain];
+ alternatePath = [[decoder decodeObjectForKey:@"alternatePath"] retain];
+ }
+ return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+ [super encodeWithCoder:coder];
+ [coder encodeObject:toolTip forKey:@"toolTip"];
+ [coder encodeObject:alternateToolTip forKey:@"alternateToolTip"];
+ [coder encodeObject:path forKey:@"path"];
+ [coder encodeObject:alternatePath forKey:@"alternatePath"];
+}
+
- (void)dealloc {
SKDESTROY(toolTip);
SKDESTROY(alternateToolTip);
@@ -430,6 +492,20 @@
return self;
}
+- (id)initWithCoder:(NSCoder *)decoder {
+ if (self = [super initWithCoder:decoder]) {
+ toolTip = [[decoder decodeObjectForKey:@"toolTip"] retain];
+ trackingArea = [[NSTrackingArea alloc] initWithRect:[self bounds]
options:NSTrackingMouseEnteredAndExited | NSTrackingInVisibleRect |
NSTrackingActiveAlways owner:self userInfo:nil];
+ [self addTrackingArea:trackingArea];
+ }
+ return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+ [super encodeWithCoder:coder];
+ [coder encodeObject:toolTip forKey:@"toolTip"];
+}
+
- (void)dealloc {
SKDESTROY(trackingArea);
SKDESTROY(toolTip);
Modified: trunk/SKSideWindow.m
===================================================================
--- trunk/SKSideWindow.m 2010-04-18 11:57:29 UTC (rev 6469)
+++ trunk/SKSideWindow.m 2010-04-18 16:34:42 UTC (rev 6470)
@@ -93,6 +93,8 @@
edge = anEdge;
enabled = YES;
+ timer = nil;
+
NSView *contentView = [[[SKSideWindowContentView alloc]
initWithFrame:NSZeroRect edge:edge] autorelease];
[self setContentView:contentView];
@@ -109,6 +111,36 @@
return self;
}
+- (id)initWithCoder:(NSCoder *)decoder {
+ if (self = [super initWithCoder:decoder]) {
+ controller = [decoder decodeObjectForKey:@"controller"];
+ state = [decoder decodeIntegerForKey:@"state"];
+ edge = [decoder decodeIntegerForKey:@"edge"];
+ mainContentView = [decoder decodeObjectForKey:@"mainContentView"];
+ enabled = [decoder decodeBoolForKey:@"enabled"];
+ resizing = [decoder decodeBoolForKey:@"resizing"];
+ acceptsMouseOver = [decoder decodeBoolForKey:@"acceptsMouseOver"];
+ timer = nil;
+
+ if (hideWhenClosed != SKClosedSidePanelHide) {
+ trackingArea = [[NSTrackingArea alloc] initWithRect:[[self
contentView] bounds] options:NSTrackingMouseEnteredAndExited |
NSTrackingInVisibleRect | NSTrackingActiveInActiveApp owner:self userInfo:nil];
+ [[self contentView] addTrackingArea:trackingArea];
+ }
+ }
+ return self;
+}
+
+- (void)encodeWithCoder:(NSCoder *)coder {
+ [super encodeWithCoder:coder];
+ [coder encodeConditionalObject:controller forKey:@"controller"];
+ [coder encodeInteger:state forKey:@"state"];
+ [coder encodeInteger:edge forKey:@"edge"];
+ [coder encodeConditionalObject:mainContentView forKey:@"mainContentView"];
+ [coder encodeBool:enabled forKey:@"enabled"];
+ [coder encodeBool:resizing forKey:@"resizing"];
+ [coder encodeBool:acceptsMouseOver forKey:@"acceptsMouseOver"];
+}
+
- (void)dealloc {
[timer invalidate];
SKDESTROY(timer);
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