[welly commit] r169 - in trunk: . Welly.xcodeproj zh_CN.lproj/MainMenu.nib
codesite...@google.com
Date: Mon Aug 18 00:07:33 2008
New Revision: 169
Modified:
trunk/KOEffectView.h
trunk/KOEffectView.m
trunk/Welly.xcodeproj/project.pbxproj
trunk/YLController.h
trunk/YLController.m
trunk/YLView.m
trunk/zh_CN.lproj/MainMenu.nib/designable.nib
trunk/zh_CN.lproj/MainMenu.nib/keyedobjects.nib
Log:
disable the effect view so the portal shall work functionally
Modified: trunk/KOEffectView.h
==============================================================================
--- trunk/KOEffectView.h (original)
+++ trunk/KOEffectView.h Mon Aug 18 00:07:33 2008
@@ -19,7 +19,6 @@
CALayer *boxLayer;
}
-- (IBAction)addNewLayer:(id)sender;
- (void)drawBox: (NSRect) rect;
- (void)clear;
@end
Modified: trunk/KOEffectView.m
==============================================================================
--- trunk/KOEffectView.m (original)
+++ trunk/KOEffectView.m Mon Aug 18 00:07:33 2008
@@ -18,11 +18,17 @@
self = [super initWithFrame:frame];
if (self) {
// Initialization code here.
- [self setWantsLayer: YES];
}
return self;
}
+- (void)dealloc {
+ [mainLayer release];
+ [boxLayer release];
+
+ [super dealloc];
+}
+
- (void)setupLayer {
NSRect contentFrame = [mainView frame];
[self setFrame: contentFrame];
@@ -37,9 +43,6 @@
// the real Dashbaord.
mainLayer.backgroundColor = CGColorCreateGenericRGB(0.0, 0.0, 0.0,
0.0);
[root insertSublayer:mainLayer above:[mainView layer]];
-
- // Add a new layer to the mainlayer.
- //[self addNewLayer:nil];
}
- (void)drawRect:(NSRect)rect {
@@ -50,63 +53,7 @@
- (void)awakeFromNib;
{
- //[self setWantsLayer:YES];
- //[window setFrame:[[NSScreen mainScreen] frame] display:NO
animate:NO];
- /*
- NSRect contentFrame = [mainView frame];
- CALayer *root = [mainView layer];
-
- // mainLayer is the layer that gets scaled. All of its sublayers
- // are automatically scaled with it.
- mainLayer = [CALayer layer];
- mainLayer.frame = NSRectToCGRect(contentFrame);
-
- // Make the background color to be a dark gray with a 50% alpha
similar to
- // the real Dashbaord.
- mainLayer.backgroundColor = CGColorCreateGenericRGB(0.10, 0.10, 0.10,
0.50);
- [root insertSublayer:mainLayer above:0];
-
- // Add a new layer to the mainlayer.
- [self addNewLayer:nil];
- */
[self setupLayer];
-}
-
-- (IBAction)addNewLayer:(id)sender;
-{
- NSLog(@"addNewLayer:");
- CALayer *layer = [CALayer layer];
-
- layer.backgroundColor = CGColorCreateGenericRGB(0.1, 0.1, 0.1, 1.0f);
- layer.borderColor = CGColorCreateGenericRGB(1.0, 1.0, 1.0, 1.0f);
- layer.borderWidth = 1.0;
-
- // Create a random rectangle with a size between 300 and 200 pixels.
- NSRect rect = NSZeroRect;
- rect.size = NSMakeSize(200.0, 50.0);
-
- // Calculate random origin point
- rect.origin = SSRandomPointForSizeWithinRect( rect.size, [mainView frame]
);
-
- // Set the layer frame to our random rectangle.
- layer.frame = NSRectToCGRect(rect);
- layer.cornerRadius = rect.size.height/5;
-
- // Create a text layer to add so we can see text scale too.
- CATextLayer *textLayer = [CATextLayer layer];
- textLayer.string = @"Hello World!";
- CGFontRef font = CGFontCreateWithFontName((CFStringRef)@"Helvetica");
- textLayer.font = font;
- textLayer.frame = CGRectMake(10.0, 100.0, 195.0, 35.0);
- CGFontRelease(font);
-
- // Use the same color for the text that we used for the border.
- textLayer.foregroundColor = layer.borderColor;
- // Add the text layer
- [layer addSublayer:textLayer];
-
- // Insert the layer into the root layer
- [mainLayer addSublayer:layer];
}
- (void) setBox {
Modified: trunk/Welly.xcodeproj/project.pbxproj
==============================================================================
--- trunk/Welly.xcodeproj/project.pbxproj (original)
+++ trunk/Welly.xcodeproj/project.pbxproj Mon Aug 18 00:07:33 2008
@@ -31,7 +31,7 @@
5A38820D0E1D44E60098FA04 /* AppKit.framework in Frameworks */ = {isa =
PBXBuildFile; fileRef = 29B97324FDCFA39411CA2CEA /* AppKit.framework */; };
5A39229E0E1E041300D9ABC1 /* Growl-WithInstaller.framework in Frameworks
*/ = {isa = PBXBuildFile; fileRef = 5A39229D0E1E041300D9ABC1 /*
Growl-WithInstaller.framework */; };
5A3922BA0E1E042400D9ABC1 /* Growl-WithInstaller.framework in CopyFiles
*/ = {isa = PBXBuildFile; fileRef = 5A39229D0E1E041300D9ABC1 /*
Growl-WithInstaller.framework */; };
- 5A4B02890E55941D00260486 /* KOEffectView.m in Sources */ = {isa =
PBXBuildFile; fileRef = 5A4B02880E55941D00260486 /* KOEffectView.m */; };
+ 5A4A50190E5956EE007E16E6 /* KOEffectView.m in Sources */ = {isa =
PBXBuildFile; fileRef = 5A4A50180E5956EE007E16E6 /* KOEffectView.m */; };
5A56C3820E342CFF00082312 /* KOPostDownloader.m in Sources */ = {isa =
PBXBuildFile; fileRef = 5A56C3810E342CFF00082312 /* KOPostDownloader.m */;
};
5A7B3F780E2297CD006C1466 /* Quartz.framework in Frameworks */ = {isa =
PBXBuildFile; fileRef = 5A7B3F770E2297CD006C1466 /* Quartz.framework */; };
5A7B419B0E229955006C1466 /* PDFKit.framework in Frameworks */ = {isa =
PBXBuildFile; fileRef = 5A7B419A0E229955006C1466 /* PDFKit.framework */; };
@@ -140,8 +140,8 @@
5A309A7B0D9A252B00970494 /* zh_CN */ = {isa = PBXFileReference;
lastKnownFileType = wrapper.nib; name = zh_CN; path =
zh_CN.lproj/MainMenu.nib; sourceTree = "<group>"; };
5A309A7C0D9A252B00970494 /* zh_CN */ = {isa = PBXFileReference;
lastKnownFileType = wrapper.nib; name = zh_CN; path =
zh_CN.lproj/Preferences.nib; sourceTree = "<group>"; };
5A39229D0E1E041300D9ABC1 /* Growl-WithInstaller.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; path
= "Growl-WithInstaller.framework"; sourceTree = "<group>"; };
+ 5A4A50180E5956EE007E16E6 /* KOEffectView.m */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path =
KOEffectView.m; sourceTree = "<group>"; };
5A4B02870E55941D00260486 /* KOEffectView.h */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path =
KOEffectView.h; sourceTree = "<group>"; };
- 5A4B02880E55941D00260486 /* KOEffectView.m */ = {isa = PBXFileReference;
fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path =
KOEffectView.m; sourceTree = "<group>"; };
5A56C3800E342CFF00082312 /* KOPostDownloader.h */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h;
path = KOPostDownloader.h; sourceTree = "<group>"; };
5A56C3810E342CFF00082312 /* KOPostDownloader.m */ = {isa =
PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc;
path = KOPostDownloader.m; sourceTree = "<group>"; };
5A7B3F770E2297CD006C1466 /* Quartz.framework */ = {isa =
PBXFileReference; lastKnownFileType = wrapper.framework; name =
Quartz.framework; path =
SDKs/MacOSX10.5.sdk/System/Library/Frameworks/Quartz.framework; sourceTree
= DEVELOPER_DIR; };
@@ -450,7 +450,7 @@
858A54E40CAE78C8000E1AA7 /* YLMarkedTextView.h */,
858A54E50CAE78C8000E1AA7 /* YLMarkedTextView.m */,
5A4B02870E55941D00260486 /* KOEffectView.h */,
- 5A4B02880E55941D00260486 /* KOEffectView.m */,
+ 5A4A50180E5956EE007E16E6 /* KOEffectView.m */,
8570AD5D0A3923A900838442 /* YLView.h */,
8570AD5E0A3923A900838442 /* YLView.m */,
166D62AB0E2E17A900514885 /* XIPortal.h */,
@@ -609,7 +609,7 @@
81F8ED1E0E500E9F0022FA65 /* LLFullScreenProcessor.m in Sources */,
819586620E5183E200AFBFCE /* LLTelnetProcessor.m in Sources */,
1600D7AF0E51C2B100496E3E /* KOTerminalFeeder.m in Sources */,
- 5A4B02890E55941D00260486 /* KOEffectView.m in Sources */,
+ 5A4A50190E5956EE007E16E6 /* KOEffectView.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: trunk/YLController.h
==============================================================================
--- trunk/YLController.h (original)
+++ trunk/YLController.h Mon Aug 18 00:07:33 2008
@@ -38,7 +38,7 @@
IBOutlet id _detectDoubleByteButton;
IBOutlet id _autoReplyButton;
- YLView *_telnetView;
+ IBOutlet YLView *_telnetView;
IBOutlet XITabBarControl *_tab;
IBOutlet NSMenuItem *_detectDoubleByteMenuItem;
IBOutlet NSMenuItem *_closeWindowMenuItem;
Modified: trunk/YLController.m
==============================================================================
--- trunk/YLController.m (original)
+++ trunk/YLController.m Mon Aug 18 00:07:33 2008
@@ -122,7 +122,7 @@
// open the portal
// the switch
- if ([[NSUserDefaults standardUserDefaults] boolForKey:@"Portal"]) {
+ if (YES || [[NSUserDefaults standardUserDefaults]
boolForKey:@"Portal"]) {
[_telnetView updatePortal];
[_telnetView setWantsLayer:YES];
}
Modified: trunk/YLView.m
==============================================================================
--- trunk/YLView.m (original)
+++ trunk/YLView.m Mon Aug 18 00:07:33 2008
@@ -208,6 +208,8 @@
- (void)dealloc {
[_backedImage release];
[_portal release];
+
+ [_ipTrackingRects release];
[super dealloc];
}
Modified: trunk/zh_CN.lproj/MainMenu.nib/designable.nib
==============================================================================
--- trunk/zh_CN.lproj/MainMenu.nib/designable.nib (original)
+++ trunk/zh_CN.lproj/MainMenu.nib/designable.nib Mon Aug 18 00:07:33 2008
@@ -642,7 +642,6 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{101, 434}, {163, 96}}</string>
<reference key="NSSuperview" ref="92983356"/>
- <bool key="NSViewIsLayerTreeHost">YES</bool>
<string key="NSClassName">KOEffectView</string>
</object>
</object>
@@ -4773,7 +4772,7 @@
<reference key="source" ref="92983356"/>
<reference key="destination" ref="571244695"/>
</object>
- <int key="connectionID">1167</int>
+ <int key="connectionID">1168</int>
</object>
</object>
<object class="IBMutableOrderedSet" key="objectRecords">
@@ -4831,8 +4830,8 @@
<reference key="object" ref="92983356"/>
<object class="NSMutableArray" key="children">
<bool key="EncodedWithXMLCoder">YES</bool>
- <reference ref="571244695"/>
<reference ref="388583076"/>
+ <reference ref="571244695"/>
</object>
<reference key="parent" ref="957750958"/>
</object>
@@ -6849,11 +6848,11 @@
<reference ref="9"/>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
- <string>{{259, 111}, {960, 598}}</string>
+ <string>{{49, 111}, {960, 598}}</string>
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
<reference ref="9"/>
- <integer value="0"/>
- <string>{{259, 111}, {960, 598}}</string>
+ <reference ref="8"/>
+ <string>{{49, 111}, {960, 598}}</string>
<reference ref="9"/>
<reference ref="9"/>
<string>{{197, 144}, {960, 598}}</string>
@@ -7104,7 +7103,7 @@
</object>
</object>
<nil key="sourceID"/>
- <int key="maxID">1167</int>
+ <int key="maxID">1168</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<object class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -7120,10 +7119,6 @@
<object class="IBPartialClassDescription">
<string key="className">KOEffectView</string>
<string key="superclassName">NSView</string>
- <object class="NSMutableDictionary" key="actions">
- <string key="NS.key.0">addNewLayer:</string>
- <string key="NS.object.0">id</string>
- </object>
<object class="NSMutableDictionary" key="outlets">
<string key="NS.key.0">mainView</string>
<string key="NS.object.0">YLView</string>
@@ -7360,6 +7355,7 @@
<string>_sitesWindow</string>
<string>_tab</string>
<string>_tableView</string>
+ <string>_telnetView</string>
<string>_unreadMessageTextView</string>
</object>
<object class="NSMutableArray" key="dict.values">
@@ -7390,6 +7386,7 @@
<string>NSPanel</string>
<string>XITabBarControl</string>
<string>NSTableView</string>
+ <string>YLView</string>
<string>NSTextView</string>
</object>
</object>
Modified: trunk/zh_CN.lproj/MainMenu.nib/keyedobjects.nib
==============================================================================
Binary files. No diff available.