Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

First UI Iteration

  • Loading branch information...
commit fbeccbda2da863849890413856b00aa2e8546812 1 parent dced2a3
Oscar Del Ben oscardelben authored
7 README.md
View
@@ -40,10 +40,15 @@ Follow me on [Github](https://github.com/oscardelben) and [Twitter](http://twitt
Ruby is installed inside Documents/rails_one_click. That way if you ever
mess up with something you can just erase that folder.
+
+### Credits
+
+Development: Oscar Del Ben ([@oscardelben](http://twitter.com/oscardelben)])
+UI: ([@zachinglis](http://twitter.com/zachinglis)])
+
### Early Development screenshots
![Rails One Click](https://raw.github.com/oscardelben/RailsOneClick/master/screenshots/install.png)
![Rails One Click](https://raw.github.com/oscardelben/RailsOneClick/master/screenshots/installed.png)
-![Rails One Click](https://raw.github.com/oscardelben/RailsOneClick/master/screenshots/console.png)
52 RailsOneClick.xcodeproj/project.pbxproj
View
@@ -22,6 +22,17 @@
BFC858721539DD43005D0372 /* RubyInstalledViewController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BFC858701539DD43005D0372 /* RubyInstalledViewController.xib */; };
BFC85881153AB743005D0372 /* LogWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = BFC8587F153AB743005D0372 /* LogWindowController.m */; };
BFC85882153AB743005D0372 /* LogWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = BFC85880153AB743005D0372 /* LogWindowController.xib */; };
+ BFC858A5153EB1F0005D0372 /* installation_bg.png in Resources */ = {isa = PBXBuildFile; fileRef = BFC858A4153EB1F0005D0372 /* installation_bg.png */; };
+ BFC858AB153EB825005D0372 /* installation_bottom.png in Resources */ = {isa = PBXBuildFile; fileRef = BFC858AA153EB825005D0372 /* installation_bottom.png */; };
+ BFC858AD153EBA61005D0372 /* log.png in Resources */ = {isa = PBXBuildFile; fileRef = BFC858AC153EBA61005D0372 /* log.png */; };
+ BFC858AF153EBC35005D0372 /* button_gray.png in Resources */ = {isa = PBXBuildFile; fileRef = BFC858AE153EBC35005D0372 /* button_gray.png */; };
+ BFC858B1153EC45A005D0372 /* button_yellow.png in Resources */ = {isa = PBXBuildFile; fileRef = BFC858B0153EC45A005D0372 /* button_yellow.png */; };
+ BFC858B3153EC631005D0372 /* log_yellow.png in Resources */ = {isa = PBXBuildFile; fileRef = BFC858B2153EC631005D0372 /* log_yellow.png */; };
+ BFC858B5153ED18A005D0372 /* install_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = BFC858B4153ED18A005D0372 /* install_logo.png */; };
+ BFC858B7153ED3C3005D0372 /* manager_logo.png in Resources */ = {isa = PBXBuildFile; fileRef = BFC858B6153ED3C3005D0372 /* manager_logo.png */; };
+ BFC858B9153ED611005D0372 /* rails_tutorials.png in Resources */ = {isa = PBXBuildFile; fileRef = BFC858B8153ED611005D0372 /* rails_tutorials.png */; };
+ BFC858BC153ED6B7005D0372 /* rails_click_homepage.png in Resources */ = {isa = PBXBuildFile; fileRef = BFC858BA153ED6B7005D0372 /* rails_click_homepage.png */; };
+ BFC858BD153ED6B7005D0372 /* rails_documentation.png in Resources */ = {isa = PBXBuildFile; fileRef = BFC858BB153ED6B7005D0372 /* rails_documentation.png */; };
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
@@ -52,6 +63,17 @@
BFC8587F153AB743005D0372 /* LogWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LogWindowController.m; sourceTree = "<group>"; };
BFC85880153AB743005D0372 /* LogWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = LogWindowController.xib; sourceTree = "<group>"; };
BFC85890153AF29E005D0372 /* Settings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Settings.h; sourceTree = "<group>"; };
+ BFC858A4153EB1F0005D0372 /* installation_bg.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = installation_bg.png; sourceTree = "<group>"; };
+ BFC858AA153EB825005D0372 /* installation_bottom.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = installation_bottom.png; sourceTree = "<group>"; };
+ BFC858AC153EBA61005D0372 /* log.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = log.png; sourceTree = "<group>"; };
+ BFC858AE153EBC35005D0372 /* button_gray.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = button_gray.png; sourceTree = "<group>"; };
+ BFC858B0153EC45A005D0372 /* button_yellow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = button_yellow.png; sourceTree = "<group>"; };
+ BFC858B2153EC631005D0372 /* log_yellow.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = log_yellow.png; sourceTree = "<group>"; };
+ BFC858B4153ED18A005D0372 /* install_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = install_logo.png; sourceTree = "<group>"; };
+ BFC858B6153ED3C3005D0372 /* manager_logo.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = manager_logo.png; sourceTree = "<group>"; };
+ BFC858B8153ED611005D0372 /* rails_tutorials.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = rails_tutorials.png; sourceTree = "<group>"; };
+ BFC858BA153ED6B7005D0372 /* rails_click_homepage.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = rails_click_homepage.png; sourceTree = "<group>"; };
+ BFC858BB153ED6B7005D0372 /* rails_documentation.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; path = rails_documentation.png; sourceTree = "<group>"; };
/* End PBXFileReference section */
/* Begin PBXFrameworksBuildPhase section */
@@ -107,6 +129,7 @@
BFC858461539A3D0005D0372 /* RailsOneClick */ = {
isa = PBXGroup;
children = (
+ BFC858A3153EB1E0005D0372 /* Images */,
BFC85883153AB748005D0372 /* LogWindow */,
BFC8587D153AB233005D0372 /* ManageAppsScreen */,
BFC8587B153AB21E005D0372 /* InstallationScreen */,
@@ -171,6 +194,24 @@
name = LogWindow;
sourceTree = "<group>";
};
+ BFC858A3153EB1E0005D0372 /* Images */ = {
+ isa = PBXGroup;
+ children = (
+ BFC858B4153ED18A005D0372 /* install_logo.png */,
+ BFC858AC153EBA61005D0372 /* log.png */,
+ BFC858A4153EB1F0005D0372 /* installation_bg.png */,
+ BFC858AA153EB825005D0372 /* installation_bottom.png */,
+ BFC858AE153EBC35005D0372 /* button_gray.png */,
+ BFC858B0153EC45A005D0372 /* button_yellow.png */,
+ BFC858B2153EC631005D0372 /* log_yellow.png */,
+ BFC858B6153ED3C3005D0372 /* manager_logo.png */,
+ BFC858B8153ED611005D0372 /* rails_tutorials.png */,
+ BFC858BA153ED6B7005D0372 /* rails_click_homepage.png */,
+ BFC858BB153ED6B7005D0372 /* rails_documentation.png */,
+ );
+ name = Images;
+ sourceTree = "<group>";
+ };
/* End PBXGroup section */
/* Begin PBXNativeTarget section */
@@ -230,6 +271,17 @@
BFC858681539C6C9005D0372 /* InstallViewController.xib in Resources */,
BFC858721539DD43005D0372 /* RubyInstalledViewController.xib in Resources */,
BFC85882153AB743005D0372 /* LogWindowController.xib in Resources */,
+ BFC858A5153EB1F0005D0372 /* installation_bg.png in Resources */,
+ BFC858AB153EB825005D0372 /* installation_bottom.png in Resources */,
+ BFC858AD153EBA61005D0372 /* log.png in Resources */,
+ BFC858AF153EBC35005D0372 /* button_gray.png in Resources */,
+ BFC858B1153EC45A005D0372 /* button_yellow.png in Resources */,
+ BFC858B3153EC631005D0372 /* log_yellow.png in Resources */,
+ BFC858B5153ED18A005D0372 /* install_logo.png in Resources */,
+ BFC858B7153ED3C3005D0372 /* manager_logo.png in Resources */,
+ BFC858B9153ED611005D0372 /* rails_tutorials.png in Resources */,
+ BFC858BC153ED6B7005D0372 /* rails_click_homepage.png in Resources */,
+ BFC858BD153ED6B7005D0372 /* rails_documentation.png in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
2  RailsOneClick/AppController.m
View
@@ -22,8 +22,6 @@ - (BOOL)isRailsInstalled
return [[NSFileManager defaultManager] fileExistsAtPath:foofile];
}
-// TODO: remove duplication
-
- (void)awakeFromNib
{
if ([self isRailsInstalled]) {
5 RailsOneClick/InstallViewController.h
View
@@ -13,11 +13,12 @@
@interface InstallViewController : NSViewController <NSAlertDelegate>
-@property (retain) IBOutlet NSButton *installButton;
-@property (retain) IBOutlet NSProgressIndicator *progressIndicator;
@property (retain) IBOutlet NSTextField *statusLabel;
@property (retain) AppController *appController;
@property (retain) LogWindowController *logWindowController;
+@property (unsafe_unretained) IBOutlet NSButton *checkPrerequisitesButton;
+@property (unsafe_unretained) IBOutlet NSButton *installButton;
+@property (unsafe_unretained) IBOutlet NSButton *logButton;
- (IBAction)checkPrerequisites:(id)sender;
- (IBAction)installRuby:(id)sender;
32 RailsOneClick/InstallViewController.m
View
@@ -20,10 +20,27 @@ - (void)teardownInstallationUI;
@implementation InstallViewController
-@synthesize installButton, progressIndicator;
+@synthesize installButton;
+@synthesize logButton;
@synthesize appController;
@synthesize statusLabel;
@synthesize logWindowController;
+@synthesize checkPrerequisitesButton;
+
+- (void)changeButtonColor:(NSButton *)button color:(NSColor *)color
+{
+ NSMutableParagraphStyle *style = [[NSMutableParagraphStyle alloc] init];
+ [style setAlignment:NSCenterTextAlignment];
+ NSDictionary *attrsDictionary = [NSDictionary dictionaryWithObjectsAndKeys:
+ color, NSForegroundColorAttributeName,
+ style, NSParagraphStyleAttributeName,
+ [NSFont fontWithName:@"Lucida Grande" size:12], NSFontAttributeName,
+ [[NSShadow alloc] init], NSShadowAttributeName,
+ nil];
+ NSAttributedString *attrString = [[NSAttributedString alloc]
+ initWithString:[button title] attributes:attrsDictionary];
+ [button setAttributedTitle:attrString];
+}
- (void)awakeFromNib
{
@@ -31,6 +48,9 @@ - (void)awakeFromNib
[[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(dataReceived:) name:NSFileHandleDataAvailableNotification object:nil];
self.logWindowController = [[LogWindowController alloc] initWithWindowNibName:@"LogWindowController"];
+
+ [self changeButtonColor:checkPrerequisitesButton color:[NSColor whiteColor]];
+ [self changeButtonColor:installButton color:[NSColor whiteColor]];
}
- (void)showPrerequisitesInstallationDialog
@@ -171,7 +191,8 @@ - (void)dataReceived:(NSNotification *)notification
if ([newData rangeOfString:@"ROC_STATUS"].location == NSNotFound) {
[logWindowController performSelectorOnMainThread:@selector(appendString:) withObject:newData waitUntilDone:NO];
} else {
- [statusLabel setStringValue:[newData substringFromIndex:12]];
+ NSString *status = [NSString stringWithFormat:@"Status: %@", [newData substringFromIndex:12]];
+ [statusLabel setStringValue:status];
}
}
@@ -189,6 +210,9 @@ - (void)showErrorMessage
{
[self teardownInstallationUI];
+ [logButton setImage:[NSImage imageNamed:@"log_yellow.png"]];
+ [logButton setAlternateImage:[NSImage imageNamed:@"log_yellow.png"]];
+
NSAlert *alert = [NSAlert alertWithMessageText:INSTALLATION_ERROR_MESSAGE defaultButton:@"Ok" alternateButton:nil otherButton:nil informativeTextWithFormat:@""];
[alert runModal];
}
@@ -196,14 +220,14 @@ - (void)showErrorMessage
- (void)setupInstallationUI
{
[installButton setEnabled:NO];
- [progressIndicator startAnimation:nil];
[statusLabel setHidden:NO];
[statusLabel setStringValue:@"Beginning installation"];
+ [logButton setImage:[NSImage imageNamed:@"log.png"]];
+ [logButton setAlternateImage:[NSImage imageNamed:@"log.png"]];
}
- (void)teardownInstallationUI
{
- [progressIndicator stopAnimation:nil];
[installButton setEnabled:YES];
[statusLabel setHidden:YES];
}
1,442 RailsOneClick/InstallViewController.xib
View
@@ -12,13 +12,14 @@
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSTextField</string>
- <string>NSProgressIndicator</string>
- <string>NSTextFieldCell</string>
+ <string>NSCustomObject</string>
+ <string>IBNSLayoutConstraint</string>
<string>NSCustomView</string>
<string>NSButtonCell</string>
- <string>IBNSLayoutConstraint</string>
+ <string>NSImageCell</string>
<string>NSButton</string>
- <string>NSCustomObject</string>
+ <string>NSImageView</string>
+ <string>NSTextFieldCell</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -41,281 +42,329 @@
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews">
- <object class="NSButton" id="991233177">
+ <object class="NSImageView" id="714968020">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{243, 230}, {164, 32}}</string>
+ <set class="NSMutableSet" key="NSDragTypes">
+ <string>Apple PDF pasteboard type</string>
+ <string>Apple PICT pasteboard type</string>
+ <string>Apple PNG pasteboard type</string>
+ <string>NSFilenamesPboardType</string>
+ <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
+ <string>NeXT TIFF v4.0 pasteboard type</string>
+ </set>
+ <string key="NSFrame">{{30, 275}, {98, 77}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="1002148036"/>
+ <reference key="NSNextKeyView" ref="501066484"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="565593085">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">134217728</int>
- <string key="NSContents">Check Prerequisites</string>
- <object class="NSFont" key="NSSupport" id="594690453">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">13</double>
- <int key="NSfFlags">1044</int>
+ <object class="NSImageCell" key="NSCell" id="161901559">
+ <int key="NSCellFlags">130560</int>
+ <int key="NSCellFlags2">33554432</int>
+ <object class="NSCustomResource" key="NSContents">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">install_logo</string>
</object>
<string key="NSCellIdentifier">_NS:9</string>
- <reference key="NSControlView" ref="991233177"/>
- <int key="NSButtonFlags">-2038284033</int>
- <int key="NSButtonFlags2">129</int>
- <string key="NSAlternateContents"/>
- <string key="NSKeyEquivalent"/>
- <int key="NSPeriodicDelay">200</int>
- <int key="NSPeriodicInterval">25</int>
+ <int key="NSAlign">0</int>
+ <int key="NSScale">0</int>
+ <int key="NSStyle">0</int>
+ <bool key="NSAnimates">NO</bool>
</object>
+ <bool key="NSEditable">YES</bool>
</object>
- <object class="NSTextField" id="791604174">
+ <object class="NSButton" id="741299853">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{29, 272}, {604, 34}}</string>
+ <string key="NSFrame">{{177, 7}, {215, 37}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="991233177"/>
+ <reference key="NSNextKeyView" ref="977790306"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
- <string key="NSAntiCompressionPriority">{250, 750}</string>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="232554007">
+ <object class="NSButtonCell" key="NSCell" id="713074710">
<int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">138674176</int>
- <string key="NSContents">Click check prerequisites to ensure your computer has everything you need to start the installation.</string>
- <object class="NSFont" key="NSSupport" id="932608754">
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents">Check Prerequisites</string>
+ <object class="NSFont" key="NSSupport" id="594690453">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
- <int key="NSfFlags">16</int>
+ <int key="NSfFlags">1044</int>
</object>
<string key="NSCellIdentifier">_NS:9</string>
- <reference key="NSControlView" ref="791604174"/>
- <object class="NSColor" key="NSBackgroundColor" id="830035484">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlColor</string>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
- </object>
- </object>
- <object class="NSColor" key="NSTextColor" id="479329075">
- <int key="NSColorSpace">6</int>
- <string key="NSCatalogName">System</string>
- <string key="NSColorName">controlTextColor</string>
- <object class="NSColor" key="NSColor">
- <int key="NSColorSpace">3</int>
- <bytes key="NSWhite">MAA</bytes>
- </object>
+ <reference key="NSControlView" ref="741299853"/>
+ <int key="NSButtonFlags">139215103</int>
+ <int key="NSButtonFlags2">134</int>
+ <object class="NSCustomResource" key="NSNormalImage" id="956838509">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">button_gray</string>
</object>
+ <reference key="NSAlternateImage" ref="956838509"/>
+ <string key="NSAlternateContents"/>
+ <string key="NSKeyEquivalent"/>
+ <int key="NSPeriodicDelay">200</int>
+ <int key="NSPeriodicInterval">25</int>
</object>
</object>
- <object class="NSButton" id="888451605">
+ <object class="NSButton" id="729276260">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{250, 18}, {150, 16}}</string>
+ <string key="NSFrame">{{22, 14}, {24, 24}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView"/>
+ <reference key="NSNextKeyView" ref="741299853"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
- <object class="NSButtonCell" key="NSCell" id="790703186">
- <int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">134479872</int>
- <string key="NSContents">Open log window</string>
- <object class="NSFont" key="NSSupport">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">9</double>
- <int key="NSfFlags">3614</int>
- </object>
+ <object class="NSButtonCell" key="NSCell" id="17208178">
+ <int key="NSCellFlags">-2080244224</int>
+ <int key="NSCellFlags2">134217728</int>
+ <string key="NSContents"/>
+ <reference key="NSSupport" ref="594690453"/>
<string key="NSCellIdentifier">_NS:9</string>
- <reference key="NSControlView" ref="888451605"/>
- <int key="NSButtonFlags">-2038284033</int>
- <int key="NSButtonFlags2">129</int>
+ <reference key="NSControlView" ref="729276260"/>
+ <int key="NSButtonFlags">138690815</int>
+ <int key="NSButtonFlags2">134</int>
+ <object class="NSCustomResource" key="NSNormalImage" id="985635232">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">log</string>
+ </object>
+ <reference key="NSAlternateImage" ref="985635232"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
- <object class="NSTextField" id="816444108">
+ <object class="NSTextField" id="967220942">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{326, 56}, {307, 17}}</string>
+ <string key="NSFrame">{{174, 73}, {446, 18}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="888451605"/>
+ <reference key="NSNextKeyView" ref="968667057"/>
<string key="NSReuseIdentifierKey">_NS:1505</string>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="754860131">
+ <object class="NSTextFieldCell" key="NSCell" id="336684808">
<int key="NSCellFlags">68288064</int>
<int key="NSCellFlags2">4195328</int>
<string key="NSContents">status</string>
- <reference key="NSSupport" ref="594690453"/>
- <string key="NSCellIdentifier">_NS:1505</string>
- <reference key="NSControlView" ref="816444108"/>
- <reference key="NSBackgroundColor" ref="830035484"/>
- <reference key="NSTextColor" ref="479329075"/>
- </object>
- </object>
- <object class="NSTextField" id="495159213">
- <reference key="NSNextResponder" ref="1005"/>
- <int key="NSvFlags">268</int>
- <string key="NSFrame">{{428, 96}, {186, 14}}</string>
- <reference key="NSSuperview" ref="1005"/>
- <reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="299177505"/>
- <string key="NSReuseIdentifierKey">_NS:1505</string>
- <bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="169900253">
- <int key="NSCellFlags">68288064</int>
- <int key="NSCellFlags2">272761856</int>
- <string key="NSContents">May take several minutes</string>
- <object class="NSFont" key="NSSupport">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">11</double>
- <int key="NSfFlags">3100</int>
+ <object class="NSFont" key="NSSupport" id="132502285">
+ <string key="NSName">Helvetica</string>
+ <double key="NSSize">14</double>
+ <int key="NSfFlags">16</int>
</object>
<string key="NSCellIdentifier">_NS:1505</string>
- <reference key="NSControlView" ref="495159213"/>
- <reference key="NSBackgroundColor" ref="830035484"/>
- <reference key="NSTextColor" ref="479329075"/>
+ <reference key="NSControlView" ref="967220942"/>
+ <object class="NSColor" key="NSBackgroundColor">
+ <int key="NSColorSpace">2</int>
+ <bytes key="NSRGB">MC42NjY2NjY2ODY1IDAuMDk0MTE3NjU2MzUgMC4xNjA3ODQzMTkAA</bytes>
+ </object>
+ <object class="NSColor" key="NSTextColor" id="147168148">
+ <int key="NSColorSpace">3</int>
+ <bytes key="NSWhite">MQA</bytes>
+ </object>
</object>
</object>
- <object class="NSTextField" id="1002148036">
+ <object class="NSTextField" id="501066484">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 160}, {616, 34}}</string>
+ <string key="NSFrame">{{174, 321}, {276, 31}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="757117439"/>
+ <reference key="NSNextKeyView" ref="542813099"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSAntiCompressionPriority">{250, 750}</string>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="812524916">
+ <object class="NSTextFieldCell" key="NSCell" id="601988269">
<int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">138412032</int>
- <string key="NSContents">Step 2:</string>
- <object class="NSFont" key="NSSupport" id="894615948">
- <string key="NSName">LucidaGrande-Bold</string>
- <double key="NSSize">13</double>
- <int key="NSfFlags">2072</int>
+ <int key="NSCellFlags2">4194304</int>
+ <string key="NSContents">Step 1</string>
+ <object class="NSFont" key="NSSupport" id="305413297">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">23</double>
+ <int key="NSfFlags">16</int>
</object>
<string key="NSCellIdentifier">_NS:9</string>
- <reference key="NSControlView" ref="1002148036"/>
- <reference key="NSBackgroundColor" ref="830035484"/>
- <reference key="NSTextColor" ref="479329075"/>
+ <reference key="NSControlView" ref="501066484"/>
+ <object class="NSColor" key="NSBackgroundColor">
+ <int key="NSColorSpace">2</int>
+ <bytes key="NSRGB">MC42NjY2NjY2ODY1IDAuMDk0MTE3NjU2MzUgMC4xNjA3ODQzMTkAA</bytes>
+ </object>
+ <reference key="NSTextColor" ref="147168148"/>
</object>
</object>
- <object class="NSTextField" id="708794651">
+ <object class="NSTextField" id="542813099">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 295}, {616, 34}}</string>
+ <string key="NSFrame">{{174, 272}, {459, 41}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="791604174"/>
+ <reference key="NSNextKeyView" ref="24328627"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSAntiCompressionPriority">{250, 750}</string>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="924130296">
+ <object class="NSTextFieldCell" key="NSCell" id="989286307">
<int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">138412032</int>
- <string key="NSContents">Step 1:</string>
- <reference key="NSSupport" ref="894615948"/>
+ <int key="NSCellFlags2">4194304</int>
+ <string key="NSContents">Click 'Check Prerequisites' to ensure your computer has everything you need to start the installation.</string>
+ <object class="NSFont" key="NSSupport" id="206248329">
+ <string key="NSName">LucidaGrande</string>
+ <double key="NSSize">14</double>
+ <int key="NSfFlags">16</int>
+ </object>
<string key="NSCellIdentifier">_NS:9</string>
- <reference key="NSControlView" ref="708794651"/>
- <reference key="NSBackgroundColor" ref="830035484"/>
- <reference key="NSTextColor" ref="479329075"/>
+ <reference key="NSControlView" ref="542813099"/>
+ <object class="NSColor" key="NSBackgroundColor">
+ <int key="NSColorSpace">2</int>
+ <bytes key="NSRGB">MC42NjY2NjY2ODY1IDAuMDk0MTE3NjU2MzUgMC4xNjA3ODQzMTkAA</bytes>
+ </object>
+ <reference key="NSTextColor" ref="147168148"/>
</object>
</object>
- <object class="NSTextField" id="757117439">
+ <object class="NSTextField" id="24328627">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{17, 122}, {616, 51}}</string>
+ <string key="NSFrame">{{174, 203}, {276, 31}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="977790306"/>
+ <reference key="NSNextKeyView" ref="750407211"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSAntiCompressionPriority">{250, 750}</string>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="1061606221">
+ <object class="NSTextFieldCell" key="NSCell" id="681538293">
<int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">138412032</int>
- <string key="NSContents">We will install a working copy of Ruby and Ruby on Rails in your system inside ~/Documents/rails_one_click.</string>
- <reference key="NSSupport" ref="932608754"/>
+ <int key="NSCellFlags2">4194304</int>
+ <string key="NSContents">Step 2</string>
+ <reference key="NSSupport" ref="305413297"/>
<string key="NSCellIdentifier">_NS:9</string>
- <reference key="NSControlView" ref="757117439"/>
- <reference key="NSBackgroundColor" ref="830035484"/>
- <reference key="NSTextColor" ref="479329075"/>
+ <reference key="NSControlView" ref="24328627"/>
+ <object class="NSColor" key="NSBackgroundColor">
+ <int key="NSColorSpace">2</int>
+ <bytes key="NSRGB">MC42NjY2NjY2ODY1IDAuMDk0MTE3NjU2MzUgMC4xNjA3ODQzMTkAA</bytes>
+ </object>
+ <reference key="NSTextColor" ref="147168148"/>
</object>
</object>
- <object class="NSTextField" id="182169060">
+ <object class="NSTextField" id="750407211">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{29, 344}, {604, 34}}</string>
+ <string key="NSFrame">{{174, 154}, {424, 41}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="708794651"/>
+ <reference key="NSNextKeyView" ref="967220942"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSAntiCompressionPriority">{250, 750}</string>
<bool key="NSEnabled">YES</bool>
- <object class="NSTextFieldCell" key="NSCell" id="1051423350">
+ <object class="NSTextFieldCell" key="NSCell" id="172979854">
<int key="NSCellFlags">67239424</int>
- <int key="NSCellFlags2">138412032</int>
- <string key="NSContents">Welcome to Rails One Click</string>
- <object class="NSFont" key="NSSupport">
- <string key="NSName">LucidaGrande</string>
- <double key="NSSize">23</double>
- <int key="NSfFlags">16</int>
- </object>
+ <int key="NSCellFlags2">4194304</int>
+ <string key="NSContents">We will install a working copy of Ruby and Ruby on Rails into the ~/Documents/rails_one_click folder.</string>
+ <reference key="NSSupport" ref="206248329"/>
<string key="NSCellIdentifier">_NS:9</string>
- <reference key="NSControlView" ref="182169060"/>
- <reference key="NSBackgroundColor" ref="830035484"/>
- <reference key="NSTextColor" ref="479329075"/>
+ <reference key="NSControlView" ref="750407211"/>
+ <object class="NSColor" key="NSBackgroundColor">
+ <int key="NSColorSpace">2</int>
+ <bytes key="NSRGB">MC42NjY2NjY2ODY1IDAuMDk0MTE3NjU2MzUgMC4xNjA3ODQzMTkAA</bytes>
+ </object>
+ <reference key="NSTextColor" ref="147168148"/>
</object>
</object>
<object class="NSButton" id="977790306">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{221, 85}, {208, 32}}</string>
+ <string key="NSFrame">{{415, 7}, {215, 37}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="495159213"/>
+ <reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="438571160">
<int key="NSCellFlags">67239424</int>
<int key="NSCellFlags2">134217728</int>
<string key="NSContents">Begin Installation</string>
- <reference key="NSSupport" ref="594690453"/>
+ <reference key="NSSupport" ref="132502285"/>
<string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="977790306"/>
- <int key="NSButtonFlags">-2038284033</int>
- <int key="NSButtonFlags2">129</int>
- <reference key="NSAlternateImage" ref="932608754"/>
+ <int key="NSButtonFlags">139215103</int>
+ <int key="NSButtonFlags2">134</int>
+ <reference key="NSNormalImage" ref="956838509"/>
+ <reference key="NSAlternateImage" ref="956838509"/>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">200</int>
<int key="NSPeriodicInterval">25</int>
</object>
</object>
- <object class="NSProgressIndicator" id="299177505">
+ <object class="NSImageView" id="968667057">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
- <string key="NSFrame">{{225, 53}, {79, 20}}</string>
+ <set class="NSMutableSet" key="NSDragTypes">
+ <string>Apple PDF pasteboard type</string>
+ <string>Apple PICT pasteboard type</string>
+ <string>Apple PNG pasteboard type</string>
+ <string>NSFilenamesPboardType</string>
+ <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
+ <string>NeXT TIFF v4.0 pasteboard type</string>
+ </set>
+ <string key="NSFrameSize">{650, 50}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="816444108"/>
+ <reference key="NSNextKeyView" ref="729276260"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
- <string key="NSHuggingPriority">{250, 250}</string>
- <int key="NSpiFlags">24591</int>
- <double key="NSMaxValue">100</double>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSImageCell" key="NSCell" id="916118827">
+ <int key="NSCellFlags">130560</int>
+ <int key="NSCellFlags2">33554432</int>
+ <object class="NSCustomResource" key="NSContents">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">installation_bottom</string>
+ </object>
+ <string key="NSCellIdentifier">_NS:9</string>
+ <int key="NSAlign">0</int>
+ <int key="NSScale">2</int>
+ <int key="NSStyle">0</int>
+ <bool key="NSAnimates">NO</bool>
+ </object>
+ <bool key="NSEditable">YES</bool>
+ </object>
+ <object class="NSImageView" id="888200075">
+ <reference key="NSNextResponder" ref="1005"/>
+ <int key="NSvFlags">268</int>
+ <set class="NSMutableSet" key="NSDragTypes">
+ <string>Apple PDF pasteboard type</string>
+ <string>Apple PICT pasteboard type</string>
+ <string>Apple PNG pasteboard type</string>
+ <string>NSFilenamesPboardType</string>
+ <string>NeXT Encapsulated PostScript v1.2 pasteboard type</string>
+ <string>NeXT TIFF v4.0 pasteboard type</string>
+ </set>
+ <string key="NSFrame">{{0, 47}, {650, 353}}</string>
+ <reference key="NSSuperview" ref="1005"/>
+ <reference key="NSWindow"/>
+ <reference key="NSNextKeyView" ref="714968020"/>
+ <string key="NSReuseIdentifierKey">_NS:9</string>
+ <bool key="NSEnabled">YES</bool>
+ <object class="NSImageCell" key="NSCell" id="699654998">
+ <int key="NSCellFlags">130560</int>
+ <int key="NSCellFlags2">33554432</int>
+ <object class="NSCustomResource" key="NSContents">
+ <string key="NSClassName">NSImage</string>
+ <string key="NSResourceName">installation_bg</string>
+ </object>
+ <string key="NSCellIdentifier">_NS:9</string>
+ <int key="NSAlign">0</int>
+ <int key="NSScale">0</int>
+ <int key="NSStyle">0</int>
+ <bool key="NSAnimates">NO</bool>
+ </object>
+ <bool key="NSEditable">YES</bool>
</object>
</array>
<string key="NSFrameSize">{650, 400}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
- <reference key="NSNextKeyView" ref="182169060"/>
+ <reference key="NSNextKeyView" ref="888200075"/>
<string key="NSClassName">NSView</string>
</object>
</array>
@@ -330,22 +379,6 @@
<int key="connectionID">2</int>
</object>
<object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">installButton</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="977790306"/>
- </object>
- <int key="connectionID">99</int>
- </object>
- <object class="IBConnectionRecord">
- <object class="IBOutletConnection" key="connection">
- <string key="label">progressIndicator</string>
- <reference key="source" ref="1001"/>
- <reference key="destination" ref="299177505"/>
- </object>
- <int key="connectionID">100</int>
- </object>
- <object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">installRuby:</string>
<reference key="source" ref="1001"/>
@@ -357,7 +390,7 @@
<object class="IBOutletConnection" key="connection">
<string key="label">statusLabel</string>
<reference key="source" ref="1001"/>
- <reference key="destination" ref="816444108"/>
+ <reference key="destination" ref="967220942"/>
</object>
<int key="connectionID">373</int>
</object>
@@ -365,7 +398,7 @@
<object class="IBActionConnection" key="connection">
<string key="label">openLogWindow:</string>
<reference key="source" ref="1001"/>
- <reference key="destination" ref="888451605"/>
+ <reference key="destination" ref="729276260"/>
</object>
<int key="connectionID">468</int>
</object>
@@ -373,10 +406,66 @@
<object class="IBActionConnection" key="connection">
<string key="label">checkPrerequisites:</string>
<reference key="source" ref="1001"/>
- <reference key="destination" ref="991233177"/>
+ <reference key="destination" ref="741299853"/>
</object>
<int key="connectionID">834</int>
</object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">step1Label</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="501066484"/>
+ </object>
+ <int key="connectionID">2189</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">step2Label</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="24328627"/>
+ </object>
+ <int key="connectionID">2190</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">step1Instructions</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="542813099"/>
+ </object>
+ <int key="connectionID">2191</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">step2Instructions</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="750407211"/>
+ </object>
+ <int key="connectionID">2192</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">installButton</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="977790306"/>
+ </object>
+ <int key="connectionID">2194</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">logButton</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="729276260"/>
+ </object>
+ <int key="connectionID">2195</int>
+ </object>
+ <object class="IBConnectionRecord">
+ <object class="IBOutletConnection" key="connection">
+ <string key="label">checkPrerequisitesButton</string>
+ <reference key="source" ref="1001"/>
+ <reference key="destination" ref="741299853"/>
+ </object>
+ <int key="connectionID">2196</int>
+ </object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
@@ -408,38 +497,35 @@
<int key="objectID">1</int>
<reference key="object" ref="1005"/>
<array class="NSMutableArray" key="children">
- <reference ref="182169060"/>
- <reference ref="757117439"/>
- <reference ref="708794651"/>
+ <reference ref="888200075"/>
+ <reference ref="24328627"/>
<reference ref="977790306"/>
- <reference ref="495159213"/>
- <object class="IBNSLayoutConstraint" id="945152028">
- <reference key="firstItem" ref="495159213"/>
- <int key="firstAttribute">11</int>
+ <reference ref="729276260"/>
+ <reference ref="968667057"/>
+ <reference ref="750407211"/>
+ <reference ref="542813099"/>
+ <reference ref="501066484"/>
+ <object class="IBNSLayoutConstraint" id="625391417">
+ <reference key="firstItem" ref="729276260"/>
+ <int key="firstAttribute">10</int>
<int key="relation">0</int>
- <reference key="secondItem" ref="977790306"/>
- <int key="secondAttribute">11</int>
+ <reference key="secondItem" ref="741299853"/>
+ <int key="secondAttribute">10</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
</object>
<float key="priority">1000</float>
- <int key="scoringType">6</int>
- <float key="scoringTypeFloat">24</float>
+ <int key="scoringType">9</int>
+ <float key="scoringTypeFloat">40</float>
<int key="contentType">2</int>
<reference key="containingView" ref="1005"/>
</object>
- <reference ref="888451605"/>
- <reference ref="1002148036"/>
- <reference ref="791604174"/>
- <reference ref="991233177"/>
- <reference ref="816444108"/>
- <reference ref="299177505"/>
- <object class="IBNSLayoutConstraint" id="1032373264">
+ <object class="IBNSLayoutConstraint" id="398207763">
<reference key="firstItem" ref="1005"/>
<int key="firstAttribute">6</int>
<int key="relation">0</int>
- <reference key="secondItem" ref="816444108"/>
+ <reference key="secondItem" ref="977790306"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
@@ -451,28 +537,29 @@
<int key="contentType">3</int>
<reference key="containingView" ref="1005"/>
</object>
- <object class="IBNSLayoutConstraint" id="249623812">
- <reference key="firstItem" ref="495159213"/>
- <int key="firstAttribute">5</int>
+ <object class="IBNSLayoutConstraint" id="301671423">
+ <reference key="firstItem" ref="501066484"/>
+ <int key="firstAttribute">6</int>
<int key="relation">0</int>
- <reference key="secondItem" ref="977790306"/>
+ <reference key="secondItem" ref="24328627"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
- <object class="IBNSLayoutSymbolicConstant" key="constant">
- <double key="value">8</double>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
- <int key="contentType">3</int>
+ <int key="contentType">2</int>
<reference key="containingView" ref="1005"/>
</object>
- <object class="IBNSLayoutConstraint" id="411522919">
- <reference key="firstItem" ref="791604174"/>
- <int key="firstAttribute">5</int>
+ <reference ref="741299853"/>
+ <object class="IBNSLayoutConstraint" id="672716585">
+ <reference key="firstItem" ref="977790306"/>
+ <int key="firstAttribute">3</int>
<int key="relation">0</int>
- <reference key="secondItem" ref="182169060"/>
- <int key="secondAttribute">5</int>
+ <reference key="secondItem" ref="741299853"/>
+ <int key="secondAttribute">3</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
@@ -483,27 +570,28 @@
<int key="contentType">2</int>
<reference key="containingView" ref="1005"/>
</object>
- <object class="IBNSLayoutConstraint" id="1073618590">
- <reference key="firstItem" ref="757117439"/>
- <int key="firstAttribute">9</int>
+ <reference ref="967220942"/>
+ <object class="IBNSLayoutConstraint" id="223492849">
+ <reference key="firstItem" ref="888200075"/>
+ <int key="firstAttribute">5</int>
<int key="relation">0</int>
- <reference key="secondItem" ref="977790306"/>
- <int key="secondAttribute">9</int>
+ <reference key="secondItem" ref="1005"/>
+ <int key="secondAttribute">5</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
</object>
<float key="priority">1000</float>
- <int key="scoringType">6</int>
- <float key="scoringTypeFloat">24</float>
- <int key="contentType">2</int>
+ <int key="scoringType">8</int>
+ <float key="scoringTypeFloat">29</float>
+ <int key="contentType">3</int>
<reference key="containingView" ref="1005"/>
</object>
- <object class="IBNSLayoutConstraint" id="583789550">
+ <object class="IBNSLayoutConstraint" id="1027415322">
<reference key="firstItem" ref="1005"/>
<int key="firstAttribute">6</int>
<int key="relation">0</int>
- <reference key="secondItem" ref="757117439"/>
+ <reference key="secondItem" ref="542813099"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
@@ -515,12 +603,12 @@
<int key="contentType">3</int>
<reference key="containingView" ref="1005"/>
</object>
- <object class="IBNSLayoutConstraint" id="274766410">
- <reference key="firstItem" ref="888451605"/>
- <int key="firstAttribute">9</int>
+ <object class="IBNSLayoutConstraint" id="411522919">
+ <reference key="firstItem" ref="967220942"/>
+ <int key="firstAttribute">5</int>
<int key="relation">0</int>
- <reference key="secondItem" ref="977790306"/>
- <int key="secondAttribute">9</int>
+ <reference key="secondItem" ref="750407211"/>
+ <int key="secondAttribute">5</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
@@ -531,12 +619,12 @@
<int key="contentType">2</int>
<reference key="containingView" ref="1005"/>
</object>
- <object class="IBNSLayoutConstraint" id="546268660">
- <reference key="firstItem" ref="816444108"/>
- <int key="firstAttribute">3</int>
+ <object class="IBNSLayoutConstraint" id="766304949">
+ <reference key="firstItem" ref="542813099"/>
+ <int key="firstAttribute">5</int>
<int key="relation">0</int>
- <reference key="secondItem" ref="299177505"/>
- <int key="secondAttribute">3</int>
+ <reference key="secondItem" ref="24328627"/>
+ <int key="secondAttribute">5</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
@@ -547,79 +635,63 @@
<int key="contentType">2</int>
<reference key="containingView" ref="1005"/>
</object>
- <object class="IBNSLayoutConstraint" id="192255764">
- <reference key="firstItem" ref="299177505"/>
- <int key="firstAttribute">3</int>
+ <object class="IBNSLayoutConstraint" id="100841645">
+ <reference key="firstItem" ref="968667057"/>
+ <int key="firstAttribute">10</int>
<int key="relation">0</int>
- <reference key="secondItem" ref="977790306"/>
- <int key="secondAttribute">4</int>
+ <reference key="secondItem" ref="741299853"/>
+ <int key="secondAttribute">10</int>
<float key="multiplier">1</float>
- <object class="IBNSLayoutSymbolicConstant" key="constant">
- <double key="value">20</double>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
- <int key="contentType">3</int>
- <reference key="containingView" ref="1005"/>
- </object>
- <object class="IBNSLayoutConstraint" id="755050576">
- <reference key="firstItem" ref="1005"/>
- <int key="firstAttribute">4</int>
- <int key="relation">0</int>
- <reference key="secondItem" ref="888451605"/>
- <int key="secondAttribute">4</int>
- <float key="multiplier">1</float>
- <object class="IBNSLayoutSymbolicConstant" key="constant">
- <double key="value">20</double>
- </object>
- <float key="priority">1000</float>
- <int key="scoringType">8</int>
- <float key="scoringTypeFloat">29</float>
- <int key="contentType">3</int>
+ <int key="contentType">2</int>
<reference key="containingView" ref="1005"/>
</object>
- <object class="IBNSLayoutConstraint" id="629796101">
- <reference key="firstItem" ref="299177505"/>
+ <object class="IBNSLayoutConstraint" id="246055767">
+ <reference key="firstItem" ref="729276260"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
- <reference key="secondItem" ref="977790306"/>
+ <reference key="secondItem" ref="1005"/>
<int key="secondAttribute">5</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
- <double key="value">0.0</double>
+ <double key="value">22</double>
</object>
<float key="priority">1000</float>
- <int key="scoringType">6</int>
- <float key="scoringTypeFloat">24</float>
- <int key="contentType">2</int>
+ <int key="scoringType">3</int>
+ <float key="scoringTypeFloat">9</float>
+ <int key="contentType">3</int>
<reference key="containingView" ref="1005"/>
</object>
- <object class="IBNSLayoutConstraint" id="129587022">
- <reference key="firstItem" ref="1005"/>
- <int key="firstAttribute">4</int>
+ <object class="IBNSLayoutConstraint" id="442968337">
+ <reference key="firstItem" ref="542813099"/>
+ <int key="firstAttribute">3</int>
<int key="relation">0</int>
- <reference key="secondItem" ref="816444108"/>
+ <reference key="secondItem" ref="501066484"/>
<int key="secondAttribute">4</int>
<float key="multiplier">1</float>
- <object class="IBLayoutConstant" key="constant">
- <double key="value">56</double>
+ <object class="IBNSLayoutSymbolicConstant" key="constant">
+ <double key="value">8</double>
</object>
<float key="priority">1000</float>
- <int key="scoringType">3</int>
- <float key="scoringTypeFloat">9</float>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
<int key="contentType">3</int>
<reference key="containingView" ref="1005"/>
</object>
- <object class="IBNSLayoutConstraint" id="51211491">
- <reference key="firstItem" ref="1002148036"/>
- <int key="firstAttribute">5</int>
+ <object class="IBNSLayoutConstraint" id="406251944">
+ <reference key="firstItem" ref="968667057"/>
+ <int key="firstAttribute">4</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1005"/>
- <int key="secondAttribute">5</int>
+ <int key="secondAttribute">4</int>
<float key="multiplier">1</float>
- <object class="IBNSLayoutSymbolicConstant" key="constant">
- <double key="value">20</double>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<int key="scoringType">8</int>
@@ -627,31 +699,31 @@
<int key="contentType">3</int>
<reference key="containingView" ref="1005"/>
</object>
- <object class="IBNSLayoutConstraint" id="318624984">
- <reference key="firstItem" ref="1005"/>
- <int key="firstAttribute">6</int>
+ <object class="IBNSLayoutConstraint" id="452301098">
+ <reference key="firstItem" ref="542813099"/>
+ <int key="firstAttribute">5</int>
<int key="relation">0</int>
- <reference key="secondItem" ref="1002148036"/>
- <int key="secondAttribute">6</int>
+ <reference key="secondItem" ref="501066484"/>
+ <int key="secondAttribute">5</int>
<float key="multiplier">1</float>
- <object class="IBNSLayoutSymbolicConstant" key="constant">
- <double key="value">20</double>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
</object>
<float key="priority">1000</float>
- <int key="scoringType">8</int>
- <float key="scoringTypeFloat">29</float>
- <int key="contentType">3</int>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">2</int>
<reference key="containingView" ref="1005"/>
</object>
- <object class="IBNSLayoutConstraint" id="760005143">
+ <object class="IBNSLayoutConstraint" id="456044292">
<reference key="firstItem" ref="1005"/>
<int key="firstAttribute">4</int>
<int key="relation">0</int>
- <reference key="secondItem" ref="1002148036"/>
+ <reference key="secondItem" ref="967220942"/>
<int key="secondAttribute">4</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
- <double key="value">160</double>
+ <double key="value">73</double>
</object>
<float key="priority">1000</float>
<int key="scoringType">3</int>
@@ -659,31 +731,31 @@
<int key="contentType">3</int>
<reference key="containingView" ref="1005"/>
</object>
- <object class="IBNSLayoutConstraint" id="946246049">
- <reference key="firstItem" ref="757117439"/>
+ <object class="IBNSLayoutConstraint" id="538753229">
+ <reference key="firstItem" ref="967220942"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
- <reference key="secondItem" ref="1005"/>
+ <reference key="secondItem" ref="741299853"/>
<int key="secondAttribute">5</int>
<float key="multiplier">1</float>
- <object class="IBNSLayoutSymbolicConstant" key="constant">
- <double key="value">20</double>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
</object>
<float key="priority">1000</float>
- <int key="scoringType">8</int>
- <float key="scoringTypeFloat">29</float>
- <int key="contentType">3</int>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">2</int>
<reference key="containingView" ref="1005"/>
</object>
- <object class="IBNSLayoutConstraint" id="296304511">
- <reference key="firstItem" ref="1005"/>
- <int key="firstAttribute">4</int>
+ <object class="IBNSLayoutConstraint" id="93525295">
+ <reference key="firstItem" ref="24328627"/>
+ <int key="firstAttribute">3</int>
<int key="relation">0</int>
- <reference key="secondItem" ref="757117439"/>
- <int key="secondAttribute">4</int>
+ <reference key="secondItem" ref="1005"/>
+ <int key="secondAttribute">3</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
- <double key="value">122</double>
+ <double key="value">166</double>
</object>
<float key="priority">1000</float>
<int key="scoringType">3</int>
@@ -691,31 +763,31 @@
<int key="contentType">3</int>
<reference key="containingView" ref="1005"/>
</object>
- <object class="IBNSLayoutConstraint" id="796632522">
- <reference key="firstItem" ref="182169060"/>
+ <object class="IBNSLayoutConstraint" id="270500545">
+ <reference key="firstItem" ref="888200075"/>
<int key="firstAttribute">3</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1005"/>
<int key="secondAttribute">3</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
- <double key="value">22</double>
+ <double key="value">0.0</double>
</object>
<float key="priority">1000</float>
- <int key="scoringType">3</int>
- <float key="scoringTypeFloat">9</float>
+ <int key="scoringType">8</int>
+ <float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
<reference key="containingView" ref="1005"/>
</object>
- <object class="IBNSLayoutConstraint" id="466201766">
- <reference key="firstItem" ref="1005"/>
- <int key="firstAttribute">6</int>
+ <object class="IBNSLayoutConstraint" id="711732084">
+ <reference key="firstItem" ref="968667057"/>
+ <int key="firstAttribute">5</int>
<int key="relation">0</int>
- <reference key="secondItem" ref="182169060"/>
- <int key="secondAttribute">6</int>
+ <reference key="secondItem" ref="1005"/>
+ <int key="secondAttribute">5</int>
<float key="multiplier">1</float>
- <object class="IBNSLayoutSymbolicConstant" key="constant">
- <double key="value">20</double>
+ <object class="IBLayoutConstant" key="constant">
+ <double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<int key="scoringType">8</int>
@@ -723,28 +795,28 @@
<int key="contentType">3</int>
<reference key="containingView" ref="1005"/>
</object>
- <object class="IBNSLayoutConstraint" id="358056840">
- <reference key="firstItem" ref="1005"/>
- <int key="firstAttribute">6</int>
+ <object class="IBNSLayoutConstraint" id="430209104">
+ <reference key="firstItem" ref="750407211"/>
+ <int key="firstAttribute">3</int>
<int key="relation">0</int>
- <reference key="secondItem" ref="791604174"/>
- <int key="secondAttribute">6</int>
+ <reference key="secondItem" ref="24328627"/>
+ <int key="secondAttribute">4</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
- <double key="value">20</double>
+ <double key="value">8</double>
</object>
<float key="priority">1000</float>
- <int key="scoringType">8</int>
- <float key="scoringTypeFloat">29</float>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
<int key="contentType">3</int>
<reference key="containingView" ref="1005"/>
</object>
- <object class="IBNSLayoutConstraint" id="710301838">
- <reference key="firstItem" ref="708794651"/>
- <int key="firstAttribute">9</int>
+ <object class="IBNSLayoutConstraint" id="287707723">
+ <reference key="firstItem" ref="750407211"/>
+ <int key="firstAttribute">5</int>
<int key="relation">0</int>
- <reference key="secondItem" ref="991233177"/>
- <int key="secondAttribute">9</int>
+ <reference key="secondItem" ref="24328627"/>
+ <int key="secondAttribute">5</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
@@ -755,63 +827,32 @@
<int key="contentType">2</int>
<reference key="containingView" ref="1005"/>
</object>
- <object class="IBNSLayoutConstraint" id="748753214">
- <reference key="firstItem" ref="791604174"/>
+ <reference ref="714968020"/>
+ <object class="IBNSLayoutConstraint" id="1058823301">
+ <reference key="firstItem" ref="714968020"/>
<int key="firstAttribute">3</int>
<int key="relation">0</int>
- <reference key="secondItem" ref="1005"/>
+ <reference key="secondItem" ref="501066484"/>
<int key="secondAttribute">3</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
- <double key="value">94</double>
- </object>
- <float key="priority">1000</float>
- <int key="scoringType">3</int>
- <float key="scoringTypeFloat">9</float>
- <int key="contentType">3</int>
- <reference key="containingView" ref="1005"/>
- </object>
- <object class="IBNSLayoutConstraint" id="829196333">
- <reference key="firstItem" ref="1005"/>
- <int key="firstAttribute">6</int>
- <int key="relation">0</int>
- <reference key="secondItem" ref="708794651"/>
- <int key="secondAttribute">6</int>
- <float key="multiplier">1</float>
- <object class="IBNSLayoutSymbolicConstant" key="constant">
- <double key="value">20</double>
- </object>
- <float key="priority">1000</float>
- <int key="scoringType">8</int>
- <float key="scoringTypeFloat">29</float>
- <int key="contentType">3</int>
- <reference key="containingView" ref="1005"/>
- </object>
- <object class="IBNSLayoutConstraint" id="668931280">
- <reference key="firstItem" ref="708794651"/>
- <int key="firstAttribute">5</int>
- <int key="relation">0</int>
- <reference key="secondItem" ref="1005"/>
- <int key="secondAttribute">5</int>
- <float key="multiplier">1</float>
- <object class="IBNSLayoutSymbolicConstant" key="constant">
- <double key="value">20</double>
+ <double key="value">0.0</double>
</object>
<float key="priority">1000</float>
- <int key="scoringType">8</int>
- <float key="scoringTypeFloat">29</float>
- <int key="contentType">3</int>
+ <int key="scoringType">6</int>
+ <float key="scoringTypeFloat">24</float>
+ <int key="contentType">2</int>
<reference key="containingView" ref="1005"/>
</object>
- <object class="IBNSLayoutConstraint" id="998376027">
- <reference key="firstItem" ref="708794651"/>
+ <object class="IBNSLayoutConstraint" id="515606168">
+ <reference key="firstItem" ref="714968020"/>
<int key="firstAttribute">3</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1005"/>
<int key="secondAttribute">3</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
- <double key="value">71</double>
+ <double key="value">48</double>
</object>
<float key="priority">1000</float>
<int key="scoringType">3</int>
@@ -819,15 +860,15 @@
<int key="contentType">3</int>
<reference key="containingView" ref="1005"/>
</object>
- <object class="IBNSLayoutConstraint" id="987547713">
- <reference key="firstItem" ref="991233177"/>
- <int key="firstAttribute">3</int>
+ <object class="IBNSLayoutConstraint" id="787291976">
+ <reference key="firstItem" ref="714968020"/>
+ <int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1005"/>
- <int key="secondAttribute">3</int>
+ <int key="secondAttribute">5</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
- <double key="value">142</double>
+ <double key="value">30</double>
</object>
<float key="priority">1000</float>
<int key="scoringType">3</int>
@@ -839,49 +880,10 @@
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">3</int>
- <reference key="object" ref="299177505"/>
- <array class="NSMutableArray" key="children">
- <object class="IBNSLayoutConstraint" id="158352380">
- <reference key="firstItem" ref="299177505"/>
- <int key="firstAttribute">7</int>
- <int key="relation">0</int>
- <nil key="secondItem"/>
- <int key="secondAttribute">0</int>
- <float key="multiplier">1</float>
- <object class="IBLayoutConstant" key="constant">
- <double key="value">75</double>
- </object>
- <float key="priority">1000</float>
- <int key="scoringType">3</int>
- <float key="scoringTypeFloat">9</float>
- <int key="contentType">1</int>
- <reference key="containingView" ref="299177505"/>
- </object>
- </array>
- <reference key="parent" ref="1005"/>
- </object>
- <object class="IBObjectRecord">
<int key="objectID">5</int>
<reference key="object" ref="977790306"/>
<array class="NSMutableArray" key="children">
<reference ref="438571160"/>
- <object class="IBNSLayoutConstraint" id="355049318">
- <reference key="firstItem" ref="977790306"/>
- <int key="firstAttribute">7</int>
- <int key="relation">0</int>
- <nil key="secondItem"/>
- <int key="secondAttribute">0</int>
- <float key="multiplier">1</float>
- <object class="IBLayoutConstant" key="constant">
- <double key="value">196</double>
- </object>
- <float key="priority">1000</float>
- <int key="scoringType">3</int>
- <float key="scoringTypeFloat">9</float>
- <int key="contentType">1</int>
- <reference key="containingView" ref="977790306"/>
- </object>
</array>
<reference key="parent" ref="1005"/>
</object>
@@ -891,451 +893,418 @@
<reference key="parent" ref="977790306"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">153</int>
- <reference key="object" ref="182169060"/>
+ <int key="objectID">178</int>
+ <reference key="object" ref="750407211"/>
<array class="NSMutableArray" key="children">
- <reference ref="1051423350"/>
- <object class="IBNSLayoutConstraint" id="619275747">
- <reference key="firstItem" ref="182169060"/>
- <int key="firstAttribute">8</int>
+ <reference ref="172979854"/>
+ <object class="IBNSLayoutConstraint" id="58749264">
+ <reference key="firstItem" ref="750407211"/>
+ <int key="firstAttribute">7</int>
<int key="relation">0</int>
<nil key="secondItem"/>
<int key="secondAttribute">0</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
- <double key="value">34</double>
+ <double key="value">418</double>
</object>
<float key="priority">1000</float>
<int key="scoringType">3</int>
<float key="scoringTypeFloat">9</float>
<int key="contentType">1</int>
- <reference key="containingView" ref="182169060"/>
+ <reference key="containingView" ref="750407211"/>
</object>
- <object class="IBNSLayoutConstraint" id="477750829">
- <reference key="firstItem" ref="182169060"/>
- <int key="firstAttribute">7</int>
+ <object class="IBNSLayoutConstraint" id="328251020">
+ <reference key="firstItem" ref="750407211"/>
+ <int key="firstAttribute">8</int>
<int key="relation">0</int>
<nil key="secondItem"/>
<int key="secondAttribute">0</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
- <double key="value">598</double>
+ <double key="value">41</double>
</object>
<float key="priority">1000</float>
<int key="scoringType">3</int>
<float key="scoringTypeFloat">9</float>
<int key="contentType">1</int>
- <reference key="containingView" ref="182169060"/>
+ <reference key="containingView" ref="750407211"/>
</object>
</array>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">154</int>
- <reference key="object" ref="1051423350"/>
- <reference key="parent" ref="182169060"/>
+ <int key="objectID">179</int>
+ <reference key="object" ref="172979854"/>
+ <reference key="parent" ref="750407211"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">178</int>
- <reference key="object" ref="757117439"/>
+ <int key="objectID">338</int>
+ <reference key="object" ref="967220942"/>
<array class="NSMutableArray" key="children">
- <reference ref="1061606221"/>
- <object class="IBNSLayoutConstraint" id="574377821">
- <reference key="firstItem" ref="757117439"/>
- <int key="firstAttribute">8</int>
+ <reference ref="336684808"/>
+ <object class="IBNSLayoutConstraint" id="987361721">
+ <reference key="firstItem" ref="967220942"/>
+ <int key="firstAttribute">7</int>
<int key="relation">0</int>
<nil key="secondItem"/>
<int key="secondAttribute">0</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
- <double key="value">51</double>
+ <double key="value">440</double>
</object>
<float key="priority">1000</float>
<int key="scoringType">3</int>
<float key="scoringTypeFloat">9</float>
<int key="contentType">1</int>
- <reference key="containingView" ref="757117439"/>
+ <reference key="containingView" ref="967220942"/>
</object>
</array>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">179</int>
- <reference key="object" ref="1061606221"/>
- <reference key="parent" ref="757117439"/>
+ <int key="objectID">339</int>
+ <reference key="object" ref="336684808"/>
+ <reference key="parent" ref="967220942"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">214</int>
- <reference key="object" ref="708794651"/>
+ <int key="objectID">382</int>
+ <reference key="object" ref="729276260"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="17208178"/>
+ </array>
+ <reference key="parent" ref="1005"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">383</int>
+ <reference key="object" ref="17208178"/>
+ <reference key="parent" ref="729276260"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">469</int>
+ <reference key="object" ref="24328627"/>
<array class="NSMutableArray" key="children">
- <reference ref="924130296"/>
- <object class="IBNSLayoutConstraint" id="183163127">
- <reference key="firstItem" ref="708794651"/>
+ <reference ref="681538293"/>
+ <object class="IBNSLayoutConstraint" id="175654578">
+ <reference key="firstItem" ref="24328627"/>
<int key="firstAttribute">8</int>
<int key="relation">0</int>
<nil key="secondItem"/>
<int key="secondAttribute">0</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
- <double key="value">34</double>
+ <double key="value">31</double>
</object>
<float key="priority">1000</float>
<int key="scoringType">3</int>
<float key="scoringTypeFloat">9</float>
<int key="contentType">1</int>
- <reference key="containingView" ref="708794651"/>
+ <reference key="containingView" ref="24328627"/>
</object>
</array>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">215</int>
- <reference key="object" ref="924130296"/>
- <reference key="parent" ref="708794651"/>
+ <int key="objectID">471</int>
+ <reference key="object" ref="681538293"/>
+ <reference key="parent" ref="24328627"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">310</int>
- <reference key="object" ref="495159213"/>
+ <int key="objectID">598</int>
+ <reference key="object" ref="741299853"/>
<array class="NSMutableArray" key="children">
- <reference ref="169900253"/>
- <object class="IBNSLayoutConstraint" id="471140493">
- <reference key="firstItem" ref="495159213"/>
- <int key="firstAttribute">7</int>
- <int key="relation">0</int>
- <nil key="secondItem"/>
- <int key="secondAttribute">0</int>
- <float key="multiplier">1</float>
- <object class="IBLayoutConstant" key="constant">
- <double key="value">180</double>
- </object>
- <float key="priority">1000</float>
- <int key="scoringType">3</int>
- <float key="scoringTypeFloat">9</float>
- <int key="contentType">1</int>
- <reference key="containingView" ref="495159213"/>
- </object>
+ <reference ref="713074710"/>
</array>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">311</int>
- <reference key="object" ref="169900253"/>
- <reference key="parent" ref="495159213"/>
+ <int key="objectID">599</int>
+ <reference key="object" ref="713074710"/>
+ <reference key="parent" ref="741299853"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">320</int>
- <reference key="object" ref="945152028"/>
+ <int key="objectID">875</int>
+ <reference key="object" ref="888200075"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="699654998"/>
+ </array>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">338</int>
- <reference key="object" ref="816444108"/>
+ <int key="objectID">876</int>
+ <reference key="object" ref="699654998"/>
+ <reference key="parent" ref="888200075"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">1726</int>
+ <reference key="object" ref="968667057"/>
<array class="NSMutableArray" key="children">
- <reference ref="754860131"/>
- <object class="IBNSLayoutConstraint" id="497752859">
- <reference key="firstItem" ref="816444108"/>
- <int key="firstAttribute">7</int>
+ <reference ref="916118827"/>
+ </array>
+ <reference key="parent" ref="1005"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">1727</int>
+ <reference key="object" ref="916118827"/>
+ <reference key="parent" ref="968667057"/>
+ </object>
+ <object class="IBObjectRecord">
+ <int key="objectID">1860</int>
+ <reference key="object" ref="542813099"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="989286307"/>
+ <object class="IBNSLayoutConstraint" id="319526554">
+ <reference key="firstItem" ref="542813099"/>
+ <int key="firstAttribute">8</int>
<int key="relation">0</int>
<nil key="secondItem"/>
<int key="secondAttribute">0</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
- <double key="value">301</double>
+ <double key="value">41</double>
</object>
<float key="priority">1000</float>
<int key="scoringType">3</int>
<float key="scoringTypeFloat">9</float>
<int key="contentType">1</int>
- <reference key="containingView" ref="816444108"/>
+ <reference key="containingView" ref="542813099"/>
</object>
- </array>
- <reference key="parent" ref="1005"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">339</int>
- <reference key="object" ref="754860131"/>
- <reference key="parent" ref="816444108"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">382</int>
- <reference key="object" ref="888451605"/>
- <array class="NSMutableArray" key="children">
- <reference ref="790703186"/>
- <object class="IBNSLayoutConstraint" id="1037190225">
- <reference key="firstItem" ref="888451605"/>
+ <object class="IBNSLayoutConstraint" id="69539991">
+ <reference key="firstItem" ref="542813099"/>
<int key="firstAttribute">7</int>
<int key="relation">0</int>
<nil key="secondItem"/>
<int key="secondAttribute">0</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
- <double key="value">148</double>
+ <double key="value">453</double>
</object>
<float key="priority">1000</float>
<int key="scoringType">3</int>
<float key="scoringTypeFloat">9</float>
<int key="contentType">1</int>
- <reference key="containingView" ref="888451605"/>
+ <reference key="containingView" ref="542813099"/>
</object>
</array>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">383</int>
- <reference key="object" ref="790703186"/>
- <reference key="parent" ref="888451605"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">469</int>
- <reference key="object" ref="1002148036"/>
+ <int key="objectID">1861</int>
+ <reference key="object" ref="501066484"/>
<array class="NSMutableArray" key="children">
- <reference ref="812524916"/>
- <object class="IBNSLayoutConstraint" id="747867541">
- <reference key="firstItem" ref="1002148036"/>
- <int key="firstAttribute">8</int>
+ <reference ref="601988269"/>
+ <object class="IBNSLayoutConstraint" id="171653098">
+ <reference key="firstItem" ref="501066484"/>
+ <int key="firstAttribute">7</int>
<int key="relation">0</int>
<nil key="secondItem"/>
<int key="secondAttribute">0</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
- <double key="value">34</double>
+ <double key="value">270</double>
</object>
<float key="priority">1000</float>
<int key="scoringType">3</int>
<float key="scoringTypeFloat">9</float>
<int key="contentType">1</int>
- <reference key="containingView" ref="1002148036"/>
+ <reference key="containingView" ref="501066484"/>
</object>
- </array>
- <reference key="parent" ref="1005"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">471</int>
- <reference key="object" ref="812524916"/>
- <reference key="parent" ref="1002148036"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">552</int>
- <reference key="object" ref="791604174"/>
- <array class="NSMutableArray" key="children">
- <reference ref="232554007"/>
- <object class="IBNSLayoutConstraint" id="171539815">
- <reference key="firstItem" ref="791604174"/>
+ <object class="IBNSLayoutConstraint" id="311599442">
+ <reference key="firstItem" ref="501066484"/>
<int key="firstAttribute">8</int>
<int key="relation">0</int>
<nil key="secondItem"/>
<int key="secondAttribute">0</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
- <double key="value">34</double>
+ <double key="value">31</double>
</object>
<float key="priority">1000</float>
<int key="scoringType">3</int>
<float key="scoringTypeFloat">9</float>
<int key="contentType">1</int>
- <reference key="containingView" ref="791604174"/>
+ <reference key="containingView" ref="501066484"/>
</object>
</array>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">553</int>
- <reference key="object" ref="232554007"/>
- <reference key="parent" ref="791604174"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">598</int>
- <reference key="object" ref="991233177"/>
- <array class="NSMutableArray" key="children">
- <reference ref="565593085"/>
- </array>
- <reference key="parent" ref="1005"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">599</int>
- <reference key="object" ref="565593085"/>
- <reference key="parent" ref="991233177"/>
+ <int key="objectID">1864</int>
+ <reference key="object" ref="601988269"/>
+ <reference key="parent" ref="501066484"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">776</int>
- <reference key="object" ref="471140493"/>
- <reference key="parent" ref="495159213"/>
+ <int key="objectID">1867</int>
+ <reference key="object" ref="989286307"/>
+ <reference key="parent" ref="542813099"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">780</int>
- <reference key="object" ref="1032373264"/>
+ <int key="objectID">2097</int>
+ <reference key="object" ref="625391417"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">790</int>
- <reference key="object" ref="249623812"/>
+ <int key="objectID">2156</int>
+ <reference key="object" ref="398207763"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">802</int>
- <reference key="object" ref="158352380"/>
- <reference key="parent" ref="299177505"/>
+ <int key="objectID">2164</int>
+ <reference key="object" ref="171653098"/>
+ <reference key="parent" ref="501066484"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">805</int>
- <reference key="object" ref="411522919"/>
+ <int key="objectID">2170</int>
+ <reference key="object" ref="301671423"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">814</int>
- <reference key="object" ref="1073618590"/>
- <reference key="parent" ref="1005"/>
+ <int key="objectID">2181</int>
+ <reference key="object" ref="175654578"/>
+ <reference key="parent" ref="24328627"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">815</int>
- <reference key="object" ref="583789550"/>
+ <int key="objectID">2198</int>
+ <reference key="object" ref="672716585"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">818</int>
- <reference key="object" ref="355049318"/>
- <reference key="parent" ref="977790306"/>
+ <int key="objectID">2204</int>
+ <reference key="object" ref="311599442"/>
+ <reference key="parent" ref="501066484"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">825</int>
- <reference key="object" ref="274766410"/>
- <reference key="parent" ref="1005"/>
+ <int key="objectID">2205</int>
+ <reference key="object" ref="58749264"/>
+ <reference key="parent" ref="750407211"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">826</int>
- <reference key="object" ref="1037190225"/>
- <reference key="parent" ref="888451605"/>
+ <int key="objectID">2206</int>
+ <reference key="object" ref="328251020"/>
+ <reference key="parent" ref="750407211"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">828</int>
- <reference key="object" ref="546268660"/>
+ <int key="objectID">2207</int>
+ <reference key="object" ref="223492849"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">829</int>
- <reference key="object" ref="192255764"/>
+ <int key="objectID">2208</int>
+ <reference key="object" ref="1027415322"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">830</int>
- <reference key="object" ref="755050576"/>
+ <int key="objectID">2209</int>
+ <reference key="object" ref="411522919"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">831</int>
- <reference key="object" ref="629796101"/>
+ <int key="objectID">2210</int>
+ <reference key="object" ref="766304949"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">832</int>
- <reference key="object" ref="129587022"/>
+ <int key="objectID">2211</int>
+ <reference key="object" ref="100841645"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">833</int>
- <reference key="object" ref="497752859"/>
- <reference key="parent" ref="816444108"/>
- </object>
- <object class="IBObjectRecord">
- <int key="objectID">840</int>
- <reference key="object" ref="51211491"/>
+ <int key="objectID">2212</int>
+ <reference key="object" ref="246055767"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">849</int>
- <reference key="object" ref="574377821"/>
- <reference key="parent" ref="757117439"/>
+ <int key="objectID">2213</int>
+ <reference key="object" ref="442968337"/>
+ <reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">850</int>
- <reference key="object" ref="318624984"/>
+ <int key="objectID">2214</int>
+ <reference key="object" ref="406251944"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">851</int>
- <reference key="object" ref="760005143"/>
+ <int key="objectID">2215</int>
+ <reference key="object" ref="452301098"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">852</int>
- <reference key="object" ref="946246049"/>
+ <int key="objectID">2216</int>
+ <reference key="object" ref="456044292"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">853</int>
- <reference key="object" ref="296304511"/>
+ <int key="objectID">2217</int>
+ <reference key="object" ref="538753229"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">854</int>
- <reference key="object" ref="747867541"/>
- <reference key="parent" ref="1002148036"/>
+ <int key="objectID">2218</int>
+ <reference key="object" ref="93525295"/>
+ <reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">855</int>
- <reference key="object" ref="796632522"/>
+ <int key="objectID">2219</int>
+ <reference key="object" ref="270500545"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">856</int>
- <reference key="object" ref="466201766"/>
+ <int key="objectID">2220</int>
+ <reference key="object" ref="711732084"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">864</int>
- <reference key="object" ref="619275747"/>
- <reference key="parent" ref="182169060"/>
+ <int key="objectID">2221</int>
+ <reference key="object" ref="430209104"/>
+ <reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">865</int>
- <reference key="object" ref="477750829"/>
- <reference key="parent" ref="182169060"/>
+ <int key="objectID">2222</int>
+ <reference key="object" ref="287707723"/>
+ <reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">866</int>
- <reference key="object" ref="183163127"/>
- <reference key="parent" ref="708794651"/>
+ <int key="objectID">2223</int>
+ <reference key="object" ref="319526554"/>
+ <reference key="parent" ref="542813099"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">867</int>
- <reference key="object" ref="358056840"/>
- <reference key="parent" ref="1005"/>
+ <int key="objectID">2224</int>
+ <reference key="object" ref="69539991"/>
+ <reference key="parent" ref="542813099"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">868</int>
- <reference key="object" ref="710301838"/>
- <reference key="parent" ref="1005"/>
+ <int key="objectID">2225</int>
+ <reference key="object" ref="987361721"/>
+ <reference key="parent" ref="967220942"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">869</int>
- <reference key="object" ref="748753214"/>
+ <int key="objectID">2226</int>
+ <reference key="object" ref="714968020"/>
+ <array class="NSMutableArray" key="children">
+ <reference ref="161901559"/>
+ </array>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">870</int>
- <reference key="object" ref="829196333"/>
- <reference key="parent" ref="1005"/>
+ <int key="objectID">2227</int>
+ <reference key="object" ref="161901559"/>
+ <reference key="parent" ref="714968020"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">871</int>
- <reference key="object" ref="668931280"/>
+ <int key="objectID">2243</int>
+ <reference key="object" ref="1058823301"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">872</int>
- <reference key="object" ref="998376027"/>
+ <int key="objectID">2245</int>
+ <reference key="object" ref="515606168"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
- <int key="objectID">873</int>
- <reference key="object" ref="987547713"/>
+ <int key="objectID">2246</int>
+ <reference key="object" ref="787291976"/>
<reference key="parent" ref="1005"/>
</object>
- <object class="IBObjectRecord">
- <int key="objectID">874</int>
- <reference key="object" ref="171539815"/>
- <reference key="parent" ref="791604174"/>
- </object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -1343,140 +1312,119 @@
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array class="NSMutableArray" key="1.IBNSViewMetadataConstraints">
- <reference ref="945152028"/>
- <reference ref="1032373264"/>
- <reference ref="249623812"/>
+ <reference ref="625391417"/>
+ <reference ref="398207763"/>
+ <reference ref="301671423"/>
+ <reference ref="672716585"/>
+ <reference ref="223492849"/>
+ <reference ref="1027415322"/>
<reference ref="411522919"/>
- <reference ref="1073618590"/>
- <reference ref="583789550"/>
- <reference ref="274766410"/>
- <reference ref="546268660"/>
- <reference ref="192255764"/>
- <reference ref="755050576"/>
- <reference ref="629796101"/>
- <reference ref="129587022"/>
- <reference ref="51211491"/>
- <reference ref="318624984"/>
- <reference ref="760005143"/>
- <reference ref="946246049"/>
- <reference ref="296304511"/>
- <reference ref="796632522"/>
- <reference ref="466201766"/>
- <reference ref="358056840"/>
- <reference ref="710301838"/>
- <reference ref="748753214"/>
- <reference ref="829196333"/>
- <reference ref="668931280"/>
- <reference ref="998376027"/>
- <reference ref="987547713"/>
+ <reference ref="766304949"/>
+ <reference ref="100841645"/>
+ <reference ref="246055767"/>
+ <reference ref="442968337"/>
+ <reference ref="406251944"/>
+ <reference ref="452301098"/>
+ <reference ref="456044292"/>
+ <reference ref="538753229"/>
+ <reference ref="93525295"/>
+ <reference ref="270500545"/>
+ <reference ref="711732084"/>
+ <reference ref="430209104"/>
+ <reference ref="287707723"/>
+ <reference ref="1058823301"/>
+ <reference ref="515606168"/>
+ <reference ref="787291976"/>
</array>
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <array class="NSMutableArray" key="153.IBNSViewMetadataConstraints">
- <reference ref="619275747"/>
- <reference ref="477750829"/>
- </array>
- <boolean value="NO" key="153.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
- <string key="153.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="154.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="NO" key="1726.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+ <string key="1726.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="1727.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array class="NSMutableArray" key="178.IBNSViewMetadataConstraints">
- <reference ref="574377821"/>
+ <reference ref="58749264"/>
+ <reference ref="328251020"/>
</array>
<boolean value="NO" key="178.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="178.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="179.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <array class="NSMutableArray" key="214.IBNSViewMetadataConstraints">
- <reference ref="183163127"/>
- </array>
- <boolean value="NO" key="214.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
- <string key="214.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="215.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <array class="NSMutableArray" key="3.IBNSViewMetadataConstraints">
- <reference ref="158352380"/>
+ <array class="NSMutableArray" key="1860.IBNSViewMetadataConstraints">
+ <reference ref="319526554"/>
+ <reference ref="69539991"/>
</array>
- <boolean value="NO" key="3.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
- <string key="3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <array class="NSMutableArray" key="310.IBNSViewMetadataConstraints">
- <reference ref="471140493"/>
+ <boolean value="NO" key="1860.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+ <string key="1860.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <array class="NSMutableArray" key="1861.IBNSViewMetadataConstraints">
+ <reference ref="171653098"/>
+ <reference ref="311599442"/>
</array>
- <boolean value="NO" key="310.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
- <string key="310.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="311.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="320.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="NO" key="1861.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+ <string key="1861.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="1864.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="1867.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2097.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2156.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2164.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2170.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2181.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2198.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2204.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2205.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2206.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2207.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2208.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2209.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2210.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2211.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2212.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2213.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2214.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2215.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2216.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2217.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2218.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2219.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2220.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2221.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2222.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2223.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2224.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2225.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="NO" key="2226.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+ <string key="2226.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2227.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2243.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2245.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="2246.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array class="NSMutableArray" key="338.IBNSViewMetadataConstraints">
- <reference ref="497752859"/>
+ <reference ref="987361721"/>
</array>
<boolean value="NO" key="338.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="338.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="339.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <array class="NSMutableArray" key="382.IBNSViewMetadataConstraints">
- <reference ref="1037190225"/>
- </array>
<boolean value="NO" key="382.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="382.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="383.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array class="NSMutableArray" key="469.IBNSViewMetadataConstraints">
- <reference ref="747867541"/>
+ <reference ref="175654578"/>
</array>
<boolean value="NO" key="469.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="469.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="471.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <array class="NSMutableArray" key="5.IBNSViewMetadataConstraints">
- <reference ref="355049318"/>
- </array>
<boolean value="NO" key="5.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <array class="NSMutableArray" key="552.IBNSViewMetadataConstraints">
- <reference ref="171539815"/>
- </array>
- <boolean value="NO" key="552.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
- <string key="552.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="553.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="598.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="598.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="599.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="776.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="780.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="790.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="802.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="805.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="814.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="815.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="818.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="825.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="826.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="828.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="829.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="830.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="831.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="832.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="833.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="840.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="849.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="850.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="851.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="852.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="853.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="854.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="855.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="856.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="864.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="865.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="866.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="867.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="868.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="869.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="870.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="871.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="872.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="873.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
- <string key="874.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <boolean value="NO" key="875.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
+ <string key="875.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
+ <string key="876.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
- <int key="maxID">874</int>
+ <int key="maxID">2246</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -1503,23 +1451,38 @@
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
+ <string key="checkPrerequisitesButton">NSButton</string>
<string key="installButton">NSButton</string>
- <string key="progressIndicator">NSProgressIndicator</string>
+ <string key="logButton">NSButton</string>
<string key="statusLabel">NSTextField</string>
+ <string key="step1Label">NSTextField</string>
+ <string key="step2Label">NSTextField</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
+ <object class="IBToOneOutletInfo" key="checkPrerequisitesButton">
+ <string key="name">checkPrerequisitesButton</string>
+ <string key="candidateClassName">NSButton</string>
+ </object>
<object class="IBToOneOutletInfo" key="installButton">
<string key="name">installButton</string>
<string key="candidateClassName">NSButton</string>
</object>
- <object class="IBToOneOutletInfo" key="progressIndicator">
- <string key="name">progressIndicator</string>
- <string key="candidateClassName">NSProgressIndicator</string>
+ <object class="IBToOneOutletInfo" key="logButton">
+ <string key="name">logButton</string>
+ <string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo" key="statusLabel">
<string key="name">statusLabel</string>
<string key="candidateClassName">NSTextField</string>
</object>
+ <object class="IBToOneOutletInfo" key="step1Label">
+ <string key="name">step1Label</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
+ <object class="IBToOneOutletInfo" key="step2Label">
+ <string key="name">step2Label</string>
+ <string key="candidateClassName">NSTextField</string>
+ </object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
@@ -1544,6 +1507,13 @@
</object>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
+ <dictionary class="NSMutableDictionary" key="IBDocument.LastKnownImageSizes">
+ <string key="button_gray">{215, 37}</string>
+ <string key="install_logo">{98, 77}</string>
+ <string key="installation_bg">{650, 353}</string>
+ <string key="installation_bottom">{650, 50}</string>
+ <string key="log">{24, 24}</string>
+ </dictionary>
<bool key="IBDocument.UseAutolayout">YES</bool>
</data>
</archive>
3  RailsOneClick/RubyInstalledViewController.h
View
@@ -10,6 +10,9 @@
@interface RubyInstalledViewController : NSViewController
+@property (unsafe_unretained) IBOutlet NSButton *finderButton;
+@property (unsafe_unretained) IBOutlet NSButton *terminalButton;
+
- (IBAction)openTerminalWindow:(id)sender;
- (IBAction)openFinder:(id)sender;
29 RailsOneClick/RubyInstalledViewController.m
View
@@ -13,15 +13,28 @@ @interface RubyInstalledViewController ()
@end
@implementation RubyInstalledViewController
+@synthesize finderButton;
+@synthesize terminalButton;
-- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
+- (void)changeButtonColor:(NSButton *)button color:(NSColor *)color
{
- self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
- if (self) {
- // Initialization code here.
- }
-
- return self;
+ NSMutableParagraphStyle *style = [[NSMutableParagraphStyle alloc] init];
+ [style setAlignment:NSCenterTextAlignment];
+ NSDictionary *attrsDictionary = [NSDictionary dictionaryWithObjectsAndKeys:
+ color, NSForegroundColorAttributeName,
+ style, NSParagraphStyleAttributeName,
+ [NSFont fontWithName:@"Lucida Grande" size:12], NSFontAttributeName,
+ [[NSShadow alloc] init], NSShadowAttributeName,
+ nil];
+ NSAttributedString *attrString = [[NSAttributedString alloc]
+ initWithString:[button title] attributes:attrsDictionary];
+ [button setAttributedTitle:attrString];
+}
+
+- (void)awakeFromNib
+{
+ [self changeButtonColor:finderButton color:[NSColor whiteColor]];
+ [self changeButtonColor:terminalButton color:[NSColor whiteColor]];
}
// TODO: this doesn't work if you open new windows!
@@ -64,7 +77,7 @@ - (IBAction)openRailsDocs:(id)sender
- (IBAction)openRailsOneClick:(id)sender
{
- [self openURL:@"https://github.com/oscardelben/RailsOneClick"];
+ [self openURL:@"http://railsoneclick.com/"];
}
@end
1,310 RailsOneClick/RubyInstalledViewController.xib
View
@@ -13,10 +13,12 @@
<array key="IBDocument.IntegratedClassDependencies">
<string>NSTextField</string>
<string>NSCustomObject</string>
+ <string>IBNSLayoutConstraint</string>
<string>NSCustomView</string>
<string>NSButtonCell</string>