From e103fdf4fed43f76cc298c98869bf395c187b650 Mon Sep 17 00:00:00 2001
From: Ichi Kanaya <kanaya@users.sourceforge.jp>
Date: Mon, 24 Oct 2011 20:26:26 +0900
Subject: [PATCH] works far better

---
 Clash/ClashDocument.m            |  66 +++--
 Clash/ClashViewController.h      |   6 +-
 Clash/ClashViewController.m      | 110 +++++----
 Clash/en.lproj/ClashDocument.xib | 518 ++++++++++++++-------------------------
 4 files changed, 279 insertions(+), 421 deletions(-)

diff --git a/Clash/ClashDocument.m b/Clash/ClashDocument.m
index a7f86d0..fadb9c2 100644
--- a/Clash/ClashDocument.m
+++ b/Clash/ClashDocument.m
@@ -10,47 +10,61 @@
 
 @implementation ClashDocument
 
-- (id)init
-{
-    self = [super init];
-    if (self) {
+- (id)init {
+	self = [super init];
+	if (self) {
 		// Add your subclass-specific initialization here.
 		// If an error occurs here, return nil.
-    }
-    return self;
+	}
+	return self;
 }
 
-- (NSString *)windowNibName
-{
+- (NSString *)windowNibName {
 	// Override returning the nib file name of the document
-	// If you need to use a subclass of NSWindowController or if your document supports multiple NSWindowControllers, you should remove this method and override -makeWindowControllers instead.
+	// If you need to use a subclass of NSWindowController or if your document 
+	// supports multiple NSWindowControllers, you should remove this method and 
+	// override -makeWindowControllers instead.
 	return @"ClashDocument";
 }
 
-- (void)windowControllerDidLoadNib:(NSWindowController *)aController
-{
+- (void)windowControllerDidLoadNib: (NSWindowController *)aController {
 	[super windowControllerDidLoadNib:aController];
-	// Add any code here that needs to be executed once the windowController has loaded the document's window.
+	// Add any code here that needs to be executed once the windowController has 
+	// loaded the document's window.
 }
 
-- (NSData *)dataOfType:(NSString *)typeName error:(NSError **)outError
-{
-	/*
-	 Insert code here to write your document to data of the specified type. If outError != NULL, ensure that you create and set an appropriate error when returning nil.
-	You can also choose to override -fileWrapperOfType:error:, -writeToURL:ofType:error:, or -writeToURL:ofType:forSaveOperation:originalContentsURL:error: instead.
-	*/
-	NSException *exception = [NSException exceptionWithName:@"UnimplementedMethod" reason:[NSString stringWithFormat:@"%@ is unimplemented", NSStringFromSelector(_cmd)] userInfo:nil];
+- (NSData *)dataOfType: (NSString *)typeName 
+								 error: (NSError **)outError {
+	// Insert code here to write your document to data of the specified type. If 
+	// outError != NULL, ensure that you create and set an appropriate error when 
+	// returning nil.
+	// You can also choose to override -fileWrapperOfType:error:, 
+	// -writeToURL:ofType:error:, or -writeToURL:ofType: forSaveOperation:
+	// originalContentsURL: error: instead.
+	NSException *exception 
+		= [NSException exceptionWithName: @"UnimplementedMethod"
+															reason: [NSString stringWithFormat: 
+																				@"%@ is unimplemented", 
+																				NSStringFromSelector(_cmd)] 
+														userInfo: nil];
 	@throw exception;
 	return nil;
 }
 
-- (BOOL)readFromData:(NSData *)data ofType:(NSString *)typeName error:(NSError **)outError
-{
-	/*
-	Insert code here to read your document from the given data of the specified type. If outError != NULL, ensure that you create and set an appropriate error when returning NO.
-	You can also choose to override -readFromFileWrapper:ofType:error: or -readFromURL:ofType:error: instead.
-	*/
-	NSException *exception = [NSException exceptionWithName:@"UnimplementedMethod" reason:[NSString stringWithFormat:@"%@ is unimplemented", NSStringFromSelector(_cmd)] userInfo:nil];
+- (BOOL)readFromData:(NSData *)data 
+							ofType: (NSString *)typeName 
+							 error: (NSError **)outError {
+	// Insert code here to read your document from the given data of the 
+	// specified type. If outError != NULL, ensure that you create and set an 
+	// appropriate error when returning NO.
+	// You can also choose to override -readFromFileWrapper: ofType:error: or 
+	// -readFromURL: ofType:error: instead.
+	NSException *exception 
+		= [NSException exceptionWithName: @"UnimplementedMethod" 
+															reason: [NSString stringWithFormat: 
+																			 @"%@ is unimplemented", 
+																			 NSStringFromSelector(_cmd)] 
+														userInfo: nil];
 	@throw exception;
 	return YES;
 }
diff --git a/Clash/ClashViewController.h b/Clash/ClashViewController.h
index f1e21fa..5681a6d 100644
--- a/Clash/ClashViewController.h
+++ b/Clash/ClashViewController.h
@@ -12,14 +12,14 @@
 @interface ClashViewController: NSObject {
 	IBOutlet NSTextField *addressField;
 	IBOutlet NSView *view;
-	IBOutlet NSArrayController *frameArrayController;
 	IBOutlet NSButton *goButton;
+	IBOutlet NSButton *autoRunMode;
 	CALayer *backgroundLayer;
 	NSMutableDictionary *layers;
+	NSTimer *timer;
 }
 
-@property (assign) NSMutableArray *frames;
-
 - (IBAction)go: (id)sender;
+- (IBAction)autoRun: (id)sender;
 
 @end
diff --git a/Clash/ClashViewController.m b/Clash/ClashViewController.m
index 45f60a3..b328369 100644
--- a/Clash/ClashViewController.m
+++ b/Clash/ClashViewController.m
@@ -10,7 +10,27 @@
 
 @implementation ClashViewController
 
-@synthesize frames;
+#define defaultViewRatio 0.1
+#define defaultViewSizeX 1000.0
+#define defalutViewSizeY 250.0
+#define viewAspectRatio (defaultViewSizeX / defalutViewSizeY)
+
+
+- (CGFloat) mmToPix: (CGFloat)x {
+	NSRect currentViewFrame = [view frame];
+	CGFloat currentViewSizeX = currentViewFrame.size.width;
+	CGFloat currentViewSizeY = currentViewFrame.size.height;
+	CGFloat currentViewSizeYMultipliedByAspectRatio = currentViewSizeY * viewAspectRatio;
+	CGFloat viewRatio;
+	if (currentViewSizeX >= currentViewSizeYMultipliedByAspectRatio) {
+		viewRatio = defaultViewRatio * currentViewSizeY / defalutViewSizeY;
+	}
+	else {
+		viewRatio = defaultViewRatio * currentViewSizeX / defaultViewSizeX;
+	}
+	return x * viewRatio;
+}
+
 
 - (id)init {
 	self = [super init];
@@ -29,38 +49,10 @@
 - (void)awakeFromNib {	
 	[view setLayer: backgroundLayer];
 	[view setWantsLayer: YES];
-	[frameArrayController addObserver: self
-												 forKeyPath: @"arrangedObjects.status" 
-														options: NSKeyValueObservingOptionNew
-														context: nil];
-}
-
-
-
-- (void)observeValueForKeyPath: (NSString *)keyPath ofObject: (id)object change: (NSDictionary *)change context: (void *)context {
-	for (NSDictionary *frame in frameArrayController.content) {
-		NSString *idString = [frame objectForKey: @"id"];
-		NSNumber *status = [frame objectForKey: @"status"];
-		BOOL invisible = ![status boolValue];
-		CALayer *layer = [layers objectForKey: idString];
-		if (layer != nil) {
-			layer.hidden = invisible;
-		}
-	}
 }
 
 
 - (IBAction)go: (id)sender {
-	if (sender != goButton) {
-		return;  
-		// Just in case. If you connect URL text field to the Go button,
-		// changing the check box will call this method.
-	}
-	
-	// Disable KVO temporary
-	[frameArrayController removeObserver: self
-														forKeyPath: @"arrangedObjects.status"];
-	
 	if (layers) {
 		for (NSString *ident in layers) {
 			CALayer *layer = [layers objectForKey: ident];
@@ -74,7 +66,7 @@
 	// Verify given URL.
 	NSString *address = [addressField stringValue];
 	if ([address isEqualToString: @""]) {
-		address = @"http://localhost:8080/?time=all&event=none";
+		address = @"http://localhost:8080/?time=now";
 	}
 	NSURL *url = [NSURL URLWithString: address];
 	
@@ -86,56 +78,70 @@
 	if (error) {
 		NSLog(@"Error -> %@", [error localizedDescription]);
 	}
-	
+		
 	// Parse XML.
 	NSXMLElement *rootElement = [xmlDocument rootElement];
-	NSArray *imageElements = [rootElement elementsForName: @"image"];
+	NSArray *frameElements = [rootElement elementsForName: @"frame"];
+	NSXMLElement *frameElement = [frameElements objectAtIndex: 0];
+	NSArray *imageElements = [frameElement elementsForName: @"image"];
 	for (NSXMLElement *imageElement in imageElements) {
-		NSString *text = [imageElement stringValue];
-		NSLog(@"Loaded %@", text);
+		// NSString *text = [imageElement stringValue];
 		NSXMLNode *source = [imageElement attributeForName: @"source"];  // source must be a valid URL
 		NSXMLNode *ident = [imageElement attributeForName: @"id"];
 		NSXMLNode *position_x = [imageElement attributeForName: @"position_x"];
 		NSXMLNode *position_y = [imageElement attributeForName: @"position_y"];
 		NSXMLNode *size_x = [imageElement attributeForName: @"size_x"];
 		NSXMLNode *size_y = [imageElement attributeForName: @"size_y"];
+		NSXMLNode *alpha = [imageElement attributeForName: @"alpha"];
 		// Download the image
 		NSURL *bitmapImageURL = [NSURL URLWithString: [source stringValue]];
-		NSBitmapImageRep *bitmapImage = [NSBitmapImageRep imageRepWithContentsOfURL: bitmapImageURL];
-		CGFloat positionX = [[position_x stringValue] floatValue];
-		CGFloat positionY = [[position_y stringValue] floatValue];
-		CGFloat sizeX = [[size_x stringValue] floatValue];
-		CGFloat sizeY = [[size_y stringValue] floatValue]; 
+		NSBitmapImageRep *bitmapImage 
+			= [NSBitmapImageRep imageRepWithContentsOfURL: bitmapImageURL];
+		CGFloat positionX = [self mmToPix: [[position_x stringValue] floatValue]];
+		CGFloat positionY = [self mmToPix: [[position_y stringValue] floatValue]];
+		CGFloat sizeX = [self mmToPix: [[size_x stringValue] floatValue]];
+		CGFloat sizeY = [self mmToPix: [[size_y stringValue] floatValue]]; 
+		CGFloat alphaValue = [[alpha stringValue] floatValue];
 		if (bitmapImage) {
 			// Create a layer and set the image to the layer
 			CGImageRef image = [bitmapImage CGImage];
 			CALayer *layerToAdd = [CALayer layer];
 			layerToAdd.contents = (id)image;
 			layerToAdd.frame = CGRectMake(positionX, positionY, sizeX, sizeY);
+			layerToAdd.opacity = alphaValue;
 			// must set up geometry and transformation and color etc.
-			
-			
 			// Insert the layer to the view
 			layerToAdd.hidden = NO;
 			[backgroundLayer addSublayer: layerToAdd];
-			
 			// Register to the layer dictionary
 			NSString *idString = [ident stringValue];
 			[layers setObject: layerToAdd forKey: idString];
+		}		
+	}
+}
+
 
-			// Register to frameArray
-			NSMutableDictionary *dict = [NSMutableDictionary dictionaryWithObjectsAndKeys: idString, @"id", [NSNumber numberWithBool: YES], @"status", nil];
-			[frameArrayController addObject: dict];
+- (IBAction)autoRun:(id)sender {
+	if ([autoRunMode state] == NSOnState) {
+		if (timer) {
+			timer = nil;
+		}
+		timer = [NSTimer scheduledTimerWithTimeInterval: 1.0 / 6.0
+																						 target: self
+																					 selector: @selector(fire:)
+																					 userInfo: nil 
+																						repeats: YES];
+	}
+	else {
+		if (timer) {
+			[timer invalidate];
+			timer = nil;
 		}
 	}
-	
-	[frameArrayController addObserver: self
-												 forKeyPath: @"arrangedObjects.status" 
-														options: NSKeyValueObservingOptionNew
-														context: nil];
-
 }
 
-
+- (void)fire: (id)userInfo {
+	[self go: self];
+}
 
 @end
diff --git a/Clash/en.lproj/ClashDocument.xib b/Clash/en.lproj/ClashDocument.xib
index 6a0175b..9d3cc9a 100644
--- a/Clash/en.lproj/ClashDocument.xib
+++ b/Clash/en.lproj/ClashDocument.xib
@@ -11,20 +11,14 @@
 			<string key="NS.object.0">1934</string>
 		</object>
 		<array key="IBDocument.IntegratedClassDependencies">
-			<string>NSScroller</string>
-			<string>NSTableHeaderView</string>
-			<string>NSButton</string>
-			<string>NSArrayController</string>
+			<string>NSView</string>
+			<string>NSTextField</string>
+			<string>NSWindowTemplate</string>
 			<string>NSTextFieldCell</string>
-			<string>NSScrollView</string>
-			<string>NSButtonCell</string>
-			<string>NSTableView</string>
 			<string>NSCustomView</string>
+			<string>NSButtonCell</string>
+			<string>NSButton</string>
 			<string>NSCustomObject</string>
-			<string>NSView</string>
-			<string>NSWindowTemplate</string>
-			<string>NSTextField</string>
-			<string>NSTableColumn</string>
 		</array>
 		<array key="IBDocument.PluginDependencies">
 			<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -41,13 +35,14 @@
 				<string key="NSClassName">FirstResponder</string>
 			</object>
 			<object class="NSWindowTemplate" id="275939982">
-				<int key="NSWindowStyleMask">263</int>
+				<int key="NSWindowStyleMask">271</int>
 				<int key="NSWindowBacking">2</int>
-				<string key="NSWindowRect">{{133, 235}, {1426, 850}}</string>
+				<string key="NSWindowRect">{{0, 1000}, {1040, 322}}</string>
 				<int key="NSWTFlags">1886912512</int>
 				<string key="NSWindowTitle">Window</string>
 				<string key="NSWindowClass">NSWindow</string>
 				<string key="NSViewClass">View</string>
+				<string key="NSWindowContentMinSize">{1040, 322}</string>
 				<object class="NSView" key="NSWindowView" id="568628114">
 					<reference key="NSNextResponder"/>
 					<int key="NSvFlags">256</int>
@@ -55,16 +50,18 @@
 						<object class="NSCustomView" id="68685848">
 							<reference key="NSNextResponder" ref="568628114"/>
 							<int key="NSvFlags">274</int>
-							<string key="NSFrame">{{20, 20}, {1280, 800}}</string>
+							<string key="NSFrame">{{20, 42}, {1000, 250}}</string>
 							<reference key="NSSuperview" ref="568628114"/>
-							<reference key="NSNextKeyView" ref="575657041"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView" ref="380441470"/>
 							<string key="NSClassName">NSView</string>
 						</object>
 						<object class="NSButton" id="1044628336">
 							<reference key="NSNextResponder" ref="568628114"/>
 							<int key="NSvFlags">265</int>
-							<string key="NSFrame">{{1308, 826}, {98, 25}}</string>
+							<string key="NSFrame">{{922, 298}, {98, 25}}</string>
 							<reference key="NSSuperview" ref="568628114"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="68685848"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSButtonCell" key="NSCell" id="783963844">
@@ -88,8 +85,9 @@
 						<object class="NSTextField" id="741762929">
 							<reference key="NSNextResponder" ref="568628114"/>
 							<int key="NSvFlags">266</int>
-							<string key="NSFrame">{{20, 828}, {1280, 22}}</string>
+							<string key="NSFrame">{{20, 300}, {894, 22}}</string>
 							<reference key="NSSuperview" ref="568628114"/>
+							<reference key="NSWindow"/>
 							<reference key="NSNextKeyView" ref="1044628336"/>
 							<bool key="NSEnabled">YES</bool>
 							<object class="NSTextFieldCell" key="NSCell" id="378275208">
@@ -97,14 +95,14 @@
 								<int key="NSCellFlags2">272630784</int>
 								<string key="NSContents"/>
 								<reference key="NSSupport" ref="237865250"/>
-								<string key="NSPlaceholderString">http://localhost:8080/?time=all&amp;event=none (default)</string>
+								<string key="NSPlaceholderString">http://localhost:8080/?time=now (default)</string>
 								<reference key="NSControlView" ref="741762929"/>
 								<bool key="NSDrawsBackground">YES</bool>
 								<object class="NSColor" key="NSBackgroundColor">
 									<int key="NSColorSpace">6</int>
 									<string key="NSCatalogName">System</string>
 									<string key="NSColorName">textBackgroundColor</string>
-									<object class="NSColor" key="NSColor" id="192306890">
+									<object class="NSColor" key="NSColor">
 										<int key="NSColorSpace">3</int>
 										<bytes key="NSWhite">MQA</bytes>
 									</object>
@@ -113,234 +111,55 @@
 									<int key="NSColorSpace">6</int>
 									<string key="NSCatalogName">System</string>
 									<string key="NSColorName">textColor</string>
-									<object class="NSColor" key="NSColor" id="894232495">
+									<object class="NSColor" key="NSColor">
 										<int key="NSColorSpace">3</int>
 										<bytes key="NSWhite">MAA</bytes>
 									</object>
 								</object>
 							</object>
 						</object>
-						<object class="NSScrollView" id="575657041">
+						<object class="NSButton" id="380441470">
 							<reference key="NSNextResponder" ref="568628114"/>
 							<int key="NSvFlags">268</int>
-							<array class="NSMutableArray" key="NSSubviews">
-								<object class="NSClipView" id="43299267">
-									<reference key="NSNextResponder" ref="575657041"/>
-									<int key="NSvFlags">2304</int>
-									<array class="NSMutableArray" key="NSSubviews">
-										<object class="NSTableView" id="358973882">
-											<reference key="NSNextResponder" ref="43299267"/>
-											<int key="NSvFlags">256</int>
-											<string key="NSFrameSize">{96, 782}</string>
-											<reference key="NSSuperview" ref="43299267"/>
-											<reference key="NSNextKeyView" ref="192255988"/>
-											<bool key="NSEnabled">YES</bool>
-											<object class="NSTableHeaderView" key="NSHeaderView" id="25812331">
-												<reference key="NSNextResponder" ref="192255988"/>
-												<int key="NSvFlags">256</int>
-												<string key="NSFrameSize">{96, 17}</string>
-												<reference key="NSSuperview" ref="192255988"/>
-												<reference key="NSNextKeyView" ref="936427026"/>
-												<reference key="NSTableView" ref="358973882"/>
-											</object>
-											<object class="_NSCornerView" key="NSCornerView" id="936427026">
-												<reference key="NSNextResponder" ref="575657041"/>
-												<int key="NSvFlags">-2147483392</int>
-												<string key="NSFrame">{{224, 0}, {16, 17}}</string>
-												<reference key="NSSuperview" ref="575657041"/>
-												<reference key="NSNextKeyView" ref="43299267"/>
-											</object>
-											<array class="NSMutableArray" key="NSTableColumns">
-												<object class="NSTableColumn" id="162656274">
-													<double key="NSWidth">48.37109375</double>
-													<double key="NSMinWidth">40</double>
-													<double key="NSMaxWidth">1000</double>
-													<object class="NSTableHeaderCell" key="NSHeaderCell">
-														<int key="NSCellFlags">75628096</int>
-														<int key="NSCellFlags2">2048</int>
-														<string key="NSContents">Frame</string>
-														<object class="NSFont" key="NSSupport" id="26">
-															<string key="NSName">LucidaGrande</string>
-															<double key="NSSize">11</double>
-															<int key="NSfFlags">3100</int>
-														</object>
-														<object class="NSColor" key="NSBackgroundColor" id="863798246">
-															<int key="NSColorSpace">3</int>
-															<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
-														</object>
-														<object class="NSColor" key="NSTextColor" id="901060210">
-															<int key="NSColorSpace">6</int>
-															<string key="NSCatalogName">System</string>
-															<string key="NSColorName">headerTextColor</string>
-															<reference key="NSColor" ref="894232495"/>
-														</object>
-													</object>
-													<object class="NSTextFieldCell" key="NSDataCell" id="144650467">
-														<int key="NSCellFlags">337772096</int>
-														<int key="NSCellFlags2">2048</int>
-														<string key="NSContents">Text Cell</string>
-														<reference key="NSSupport" ref="237865250"/>
-														<reference key="NSControlView" ref="358973882"/>
-														<object class="NSColor" key="NSBackgroundColor" id="134904706">
-															<int key="NSColorSpace">6</int>
-															<string key="NSCatalogName">System</string>
-															<string key="NSColorName">controlBackgroundColor</string>
-															<object class="NSColor" key="NSColor">
-																<int key="NSColorSpace">3</int>
-																<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
-															</object>
-														</object>
-														<object class="NSColor" key="NSTextColor">
-															<int key="NSColorSpace">6</int>
-															<string key="NSCatalogName">System</string>
-															<string key="NSColorName">controlTextColor</string>
-															<reference key="NSColor" ref="894232495"/>
-														</object>
-													</object>
-													<int key="NSResizingMask">3</int>
-													<bool key="NSIsResizeable">YES</bool>
-													<bool key="NSIsEditable">YES</bool>
-													<reference key="NSTableView" ref="358973882"/>
-												</object>
-												<object class="NSTableColumn" id="90681345">
-													<double key="NSWidth">42</double>
-													<double key="NSMinWidth">40</double>
-													<double key="NSMaxWidth">1000</double>
-													<object class="NSTableHeaderCell" key="NSHeaderCell">
-														<int key="NSCellFlags">75628096</int>
-														<int key="NSCellFlags2">2048</int>
-														<string key="NSContents">On</string>
-														<reference key="NSSupport" ref="26"/>
-														<reference key="NSBackgroundColor" ref="863798246"/>
-														<reference key="NSTextColor" ref="901060210"/>
-													</object>
-													<object class="NSButtonCell" key="NSDataCell" id="931380035">
-														<int key="NSCellFlags">67239424</int>
-														<int key="NSCellFlags2">0</int>
-														<string key="NSContents"/>
-														<reference key="NSSupport" ref="237865250"/>
-														<reference key="NSControlView" ref="358973882"/>
-														<int key="NSButtonFlags">1211912703</int>
-														<int key="NSButtonFlags2">2</int>
-														<object class="NSCustomResource" key="NSNormalImage">
-															<string key="NSClassName">NSImage</string>
-															<string key="NSResourceName">NSSwitch</string>
-														</object>
-														<object class="NSButtonImageSource" key="NSAlternateImage">
-															<string key="NSImageName">NSSwitch</string>
-														</object>
-														<string key="NSAlternateContents"/>
-														<string key="NSKeyEquivalent"/>
-														<int key="NSPeriodicDelay">200</int>
-														<int key="NSPeriodicInterval">25</int>
-													</object>
-													<int key="NSResizingMask">3</int>
-													<bool key="NSIsResizeable">YES</bool>
-													<bool key="NSIsEditable">YES</bool>
-													<reference key="NSTableView" ref="358973882"/>
-												</object>
-											</array>
-											<double key="NSIntercellSpacingWidth">3</double>
-											<double key="NSIntercellSpacingHeight">2</double>
-											<reference key="NSBackgroundColor" ref="192306890"/>
-											<object class="NSColor" key="NSGridColor">
-												<int key="NSColorSpace">6</int>
-												<string key="NSCatalogName">System</string>
-												<string key="NSColorName">gridColor</string>
-												<object class="NSColor" key="NSColor">
-													<int key="NSColorSpace">3</int>
-													<bytes key="NSWhite">MC41AA</bytes>
-												</object>
-											</object>
-											<double key="NSRowHeight">17</double>
-											<int key="NSTvFlags">-700448768</int>
-											<reference key="NSDelegate"/>
-											<reference key="NSDataSource"/>
-											<int key="NSColumnAutoresizingStyle">4</int>
-											<int key="NSDraggingSourceMaskForLocal">15</int>
-											<int key="NSDraggingSourceMaskForNonLocal">0</int>
-											<bool key="NSAllowsTypeSelect">YES</bool>
-											<int key="NSTableViewDraggingDestinationStyle">0</int>
-										</object>
-									</array>
-									<string key="NSFrame">{{1, 17}, {96, 782}}</string>
-									<reference key="NSSuperview" ref="575657041"/>
-									<reference key="NSNextKeyView" ref="358973882"/>
-									<reference key="NSDocView" ref="358973882"/>
-									<reference key="NSBGColor" ref="134904706"/>
-									<int key="NScvFlags">4</int>
-								</object>
-								<object class="NSScroller" id="352344390">
-									<reference key="NSNextResponder" ref="575657041"/>
-									<int key="NSvFlags">-2147483392</int>
-									<string key="NSFrame">{{224, 17}, {15, 102}}</string>
-									<reference key="NSSuperview" ref="575657041"/>
-									<reference key="NSNextKeyView" ref="420156717"/>
-									<reference key="NSTarget" ref="575657041"/>
-									<string key="NSAction">_doScroller:</string>
-									<double key="NSPercent">0.98081841432225059</double>
-								</object>
-								<object class="NSScroller" id="420156717">
-									<reference key="NSNextResponder" ref="575657041"/>
-									<int key="NSvFlags">-2147483392</int>
-									<string key="NSFrame">{{1, 784}, {96, 15}}</string>
-									<reference key="NSSuperview" ref="575657041"/>
-									<int key="NSsFlags">1</int>
-									<reference key="NSTarget" ref="575657041"/>
-									<string key="NSAction">_doScroller:</string>
-									<double key="NSPercent">0.98969072164948457</double>
+							<string key="NSFrame">{{18, 18}, {52, 18}}</string>
+							<reference key="NSSuperview" ref="568628114"/>
+							<reference key="NSWindow"/>
+							<reference key="NSNextKeyView"/>
+							<bool key="NSEnabled">YES</bool>
+							<object class="NSButtonCell" key="NSCell" id="280127050">
+								<int key="NSCellFlags">67239424</int>
+								<int key="NSCellFlags2">0</int>
+								<string key="NSContents">Auto</string>
+								<reference key="NSSupport" ref="237865250"/>
+								<reference key="NSControlView" ref="380441470"/>
+								<int key="NSButtonFlags">1211912703</int>
+								<int key="NSButtonFlags2">2</int>
+								<object class="NSCustomResource" key="NSNormalImage">
+									<string key="NSClassName">NSImage</string>
+									<string key="NSResourceName">NSSwitch</string>
 								</object>
-								<object class="NSClipView" id="192255988">
-									<reference key="NSNextResponder" ref="575657041"/>
-									<int key="NSvFlags">2304</int>
-									<array class="NSMutableArray" key="NSSubviews">
-										<reference ref="25812331"/>
-									</array>
-									<string key="NSFrame">{{1, 0}, {96, 17}}</string>
-									<reference key="NSSuperview" ref="575657041"/>
-									<reference key="NSNextKeyView" ref="25812331"/>
-									<reference key="NSDocView" ref="25812331"/>
-									<reference key="NSBGColor" ref="134904706"/>
-									<int key="NScvFlags">4</int>
+								<object class="NSButtonImageSource" key="NSAlternateImage">
+									<string key="NSImageName">NSSwitch</string>
 								</object>
-								<reference ref="936427026"/>
-							</array>
-							<string key="NSFrame">{{1308, 20}, {98, 800}}</string>
-							<reference key="NSSuperview" ref="568628114"/>
-							<reference key="NSNextKeyView" ref="43299267"/>
-							<int key="NSsFlags">562</int>
-							<reference key="NSVScroller" ref="352344390"/>
-							<reference key="NSHScroller" ref="420156717"/>
-							<reference key="NSContentView" ref="43299267"/>
-							<reference key="NSHeaderClipView" ref="192255988"/>
-							<reference key="NSCornerView" ref="936427026"/>
-							<bytes key="NSScrollAmts">QSAAAEEgAABBmAAAQZgAAA</bytes>
+								<string key="NSAlternateContents"/>
+								<string key="NSKeyEquivalent"/>
+								<int key="NSPeriodicDelay">200</int>
+								<int key="NSPeriodicInterval">25</int>
+							</object>
 						</object>
 					</array>
-					<string key="NSFrameSize">{1426, 850}</string>
+					<string key="NSFrameSize">{1040, 322}</string>
 					<reference key="NSSuperview"/>
+					<reference key="NSWindow"/>
 					<reference key="NSNextKeyView" ref="741762929"/>
 				</object>
 				<string key="NSScreenRect">{{0, 0}, {2560, 1418}}</string>
+				<string key="NSMinSize">{1040, 344}</string>
 				<string key="NSMaxSize">{1e+13, 1e+13}</string>
 			</object>
 			<object class="NSCustomObject" id="429767794">
 				<string key="NSClassName">ClashViewController</string>
 			</object>
-			<object class="NSArrayController" id="923521518">
-				<array class="NSMutableArray" key="NSDeclaredKeys">
-					<string>frame</string>
-					<string>status</string>
-				</array>
-				<string key="NSObjectClassName">NSMutableArray</string>
-				<bool key="NSEditable">YES</bool>
-				<object class="_NSManagedProxy" key="_NSManagedProxy"/>
-				<bool key="NSAvoidsEmptySelection">YES</bool>
-				<bool key="NSPreservesSelection">YES</bool>
-				<bool key="NSSelectsInsertedObjects">YES</bool>
-				<bool key="NSFilterRestrictsInsertion">YES</bool>
-				<bool key="NSClearsFilterPredicateOnInsertion">YES</bool>
-			</object>
 			<object class="NSCustomObject" id="796877042">
 				<string key="NSClassName">NSApplication</string>
 			</object>
@@ -389,59 +208,35 @@
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">frameTable</string>
+						<string key="label">goButton</string>
 						<reference key="source" ref="429767794"/>
-						<reference key="destination" ref="358973882"/>
+						<reference key="destination" ref="1044628336"/>
 					</object>
-					<int key="connectionID">100047</int>
+					<int key="connectionID">100066</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">frameArrayController</string>
+					<object class="IBActionConnection" key="connection">
+						<string key="label">go:</string>
 						<reference key="source" ref="429767794"/>
-						<reference key="destination" ref="923521518"/>
+						<reference key="destination" ref="741762929"/>
 					</object>
-					<int key="connectionID">100065</int>
+					<int key="connectionID">100068</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
-						<string key="label">goButton</string>
+						<string key="label">autoRunMode</string>
 						<reference key="source" ref="429767794"/>
-						<reference key="destination" ref="1044628336"/>
+						<reference key="destination" ref="380441470"/>
 					</object>
-					<int key="connectionID">100066</int>
+					<int key="connectionID">100071</int>
 				</object>
 				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: arrangedObjects.frame</string>
-						<reference key="source" ref="162656274"/>
-						<reference key="destination" ref="923521518"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="162656274"/>
-							<reference key="NSDestination" ref="923521518"/>
-							<string key="NSLabel">value: arrangedObjects.frame</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">arrangedObjects.frame</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
-					</object>
-					<int key="connectionID">100062</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBBindingConnection" key="connection">
-						<string key="label">value: arrangedObjects.status</string>
-						<reference key="source" ref="90681345"/>
-						<reference key="destination" ref="923521518"/>
-						<object class="NSNibBindingConnector" key="connector">
-							<reference key="NSSource" ref="90681345"/>
-							<reference key="NSDestination" ref="923521518"/>
-							<string key="NSLabel">value: arrangedObjects.status</string>
-							<string key="NSBinding">value</string>
-							<string key="NSKeyPath">arrangedObjects.status</string>
-							<int key="NSNibBindingConnectorVersion">2</int>
-						</object>
+					<object class="IBActionConnection" key="connection">
+						<string key="label">autoRun:</string>
+						<reference key="source" ref="429767794"/>
+						<reference key="destination" ref="380441470"/>
 					</object>
-					<int key="connectionID">100064</int>
+					<int key="connectionID">100072</int>
 				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -477,10 +272,10 @@
 						<int key="objectID">6</int>
 						<reference key="object" ref="568628114"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="741762929"/>
-							<reference ref="68685848"/>
 							<reference ref="1044628336"/>
-							<reference ref="575657041"/>
+							<reference ref="68685848"/>
+							<reference ref="741762929"/>
+							<reference ref="380441470"/>
 						</array>
 						<reference key="parent" ref="275939982"/>
 					</object>
@@ -527,71 +322,17 @@
 						<reference key="parent" ref="0"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">100036</int>
-						<reference key="object" ref="575657041"/>
+						<int key="objectID">100069</int>
+						<reference key="object" ref="380441470"/>
 						<array class="NSMutableArray" key="children">
-							<reference ref="358973882"/>
-							<reference ref="420156717"/>
-							<reference ref="25812331"/>
-							<reference ref="352344390"/>
+							<reference ref="280127050"/>
 						</array>
 						<reference key="parent" ref="568628114"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">100037</int>
-						<reference key="object" ref="358973882"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="162656274"/>
-							<reference ref="90681345"/>
-						</array>
-						<reference key="parent" ref="575657041"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100038</int>
-						<reference key="object" ref="420156717"/>
-						<reference key="parent" ref="575657041"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100039</int>
-						<reference key="object" ref="25812331"/>
-						<reference key="parent" ref="575657041"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100040</int>
-						<reference key="object" ref="352344390"/>
-						<reference key="parent" ref="575657041"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100041</int>
-						<reference key="object" ref="162656274"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="144650467"/>
-						</array>
-						<reference key="parent" ref="358973882"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100042</int>
-						<reference key="object" ref="90681345"/>
-						<array class="NSMutableArray" key="children">
-							<reference ref="931380035"/>
-						</array>
-						<reference key="parent" ref="358973882"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100044</int>
-						<reference key="object" ref="144650467"/>
-						<reference key="parent" ref="162656274"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100045</int>
-						<reference key="object" ref="931380035"/>
-						<reference key="parent" ref="90681345"/>
-					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">100051</int>
-						<reference key="object" ref="923521518"/>
-						<reference key="parent" ref="0"/>
-						<string key="objectName">Frame Array Controller</string>
+						<int key="objectID">100070</int>
+						<reference key="object" ref="280127050"/>
+						<reference key="parent" ref="380441470"/>
 					</object>
 				</array>
 			</object>
@@ -605,16 +346,10 @@
 				<string key="100024.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="100025.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="100026.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="100036.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="100037.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="100038.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="100039.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="100040.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="100041.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="100042.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="100044.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="100045.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
-				<string key="100051.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100069.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<string key="100070.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+				<boolean value="YES" key="5.IBNSWindowAutoPositionCentersHorizontal"/>
+				<boolean value="YES" key="5.IBNSWindowAutoPositionCentersVertical"/>
 				<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
 				<string key="5.IBWindowTemplateEditedContentRect">{{133, 170}, {507, 413}}</string>
 				<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -623,9 +358,112 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">100067</int>
+			<int key="maxID">100072</int>
+		</object>
+		<object class="IBClassDescriber" key="IBDocument.Classes">
+			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
+				<object class="IBPartialClassDescription">
+					<string key="className">ClashDocument</string>
+					<string key="superclassName">NSDocument</string>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/ClashDocument.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">ClashViewController</string>
+					<string key="superclassName">NSObject</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="autoRun:">id</string>
+						<string key="go:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="autoRun:">
+							<string key="name">autoRun:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="go:">
+							<string key="name">go:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="outlets">
+						<string key="addressField">NSTextField</string>
+						<string key="autoRunMode">NSButton</string>
+						<string key="frameArrayController">NSArrayController</string>
+						<string key="goButton">NSButton</string>
+						<string key="view">NSView</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+						<object class="IBToOneOutletInfo" key="addressField">
+							<string key="name">addressField</string>
+							<string key="candidateClassName">NSTextField</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="autoRunMode">
+							<string key="name">autoRunMode</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="frameArrayController">
+							<string key="name">frameArrayController</string>
+							<string key="candidateClassName">NSArrayController</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="goButton">
+							<string key="name">goButton</string>
+							<string key="candidateClassName">NSButton</string>
+						</object>
+						<object class="IBToOneOutletInfo" key="view">
+							<string key="name">view</string>
+							<string key="candidateClassName">NSView</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/ClashViewController.h</string>
+					</object>
+				</object>
+				<object class="IBPartialClassDescription">
+					<string key="className">NSDocument</string>
+					<dictionary class="NSMutableDictionary" key="actions">
+						<string key="printDocument:">id</string>
+						<string key="revertDocumentToSaved:">id</string>
+						<string key="runPageLayout:">id</string>
+						<string key="saveDocument:">id</string>
+						<string key="saveDocumentAs:">id</string>
+						<string key="saveDocumentTo:">id</string>
+					</dictionary>
+					<dictionary class="NSMutableDictionary" key="actionInfosByName">
+						<object class="IBActionInfo" key="printDocument:">
+							<string key="name">printDocument:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="revertDocumentToSaved:">
+							<string key="name">revertDocumentToSaved:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="runPageLayout:">
+							<string key="name">runPageLayout:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="saveDocument:">
+							<string key="name">saveDocument:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="saveDocumentAs:">
+							<string key="name">saveDocumentAs:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+						<object class="IBActionInfo" key="saveDocumentTo:">
+							<string key="name">saveDocumentTo:</string>
+							<string key="candidateClassName">id</string>
+						</object>
+					</dictionary>
+					<object class="IBClassDescriptionSource" key="sourceIdentifier">
+						<string key="majorKey">IBProjectSource</string>
+						<string key="minorKey">./Classes/NSDocument.h</string>
+					</object>
+				</object>
+			</array>
 		</object>
-		<object class="IBClassDescriber" key="IBDocument.Classes"/>
 		<int key="IBDocument.localizationMode">0</int>
 		<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
 		<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
-- 
2.11.0