nikdoof/MacPass
1
1
Fork 0
mirror of https://github.com/MacPass/MacPass.git synced 2025-12-13 21:42:32 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed nib name for DocumentWindowController

Browse Source
This commit is contained in:
michael starke
2013-05-29 02:07:01 +02:00
parent 18ad6f2f74
commit 4396dbe9f4
9 changed files with 534 additions and 424 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
MacPass.xcodeproj/project.pbxproj
View File

@@ -19,6 +19,7 @@
4C2E382616D1470200037A9D /* MPViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2E382516D1470200037A9D /* MPViewController.m */; }; 4C2E382616D1470200037A9D /* MPViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2E382516D1470200037A9D /* MPViewController.m */; };
4C37A84015B8B474005EF8EE /* MPOutlineDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C37A83F15B8B474005EF8EE /* MPOutlineDataSource.m */; }; 4C37A84015B8B474005EF8EE /* MPOutlineDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C37A83F15B8B474005EF8EE /* MPOutlineDataSource.m */; };
4C3BD51516D276F800389F1F /* MPToolbarDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3BD51416D276F800389F1F /* MPToolbarDelegate.m */; }; 4C3BD51516D276F800389F1F /* MPToolbarDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3BD51416D276F800389F1F /* MPToolbarDelegate.m */; };
4C3CD2A8175570C9005F911C /* DMSplitView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3CD2A7175570C9005F911C /* DMSplitView.m */; };
4C3FFD9E16DAF60600DF9186 /* FilterBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C3FFD9D16DAF60600DF9186 /* FilterBar.xib */; }; 4C3FFD9E16DAF60600DF9186 /* FilterBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C3FFD9D16DAF60600DF9186 /* FilterBar.xib */; };
4C40AC5C170782730073D1C3 /* MPAbstractSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C40AC5B170782730073D1C3 /* MPAbstractSettingsViewController.m */; }; 4C40AC5C170782730073D1C3 /* MPAbstractSettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C40AC5B170782730073D1C3 /* MPAbstractSettingsViewController.m */; };
4C431BCD16E2A82800700A81 /* MPPasteBoardController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C431BCC16E2A82700700A81 /* MPPasteBoardController.m */; }; 4C431BCD16E2A82800700A81 /* MPPasteBoardController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C431BCC16E2A82700700A81 /* MPPasteBoardController.m */; };
@@ -139,6 +140,8 @@
4C37A83F15B8B474005EF8EE /* MPOutlineDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPOutlineDataSource.m; sourceTree = "<group>"; }; 4C37A83F15B8B474005EF8EE /* MPOutlineDataSource.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPOutlineDataSource.m; sourceTree = "<group>"; };
4C3BD51316D276F800389F1F /* MPToolbarDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPToolbarDelegate.h; sourceTree = "<group>"; }; 4C3BD51316D276F800389F1F /* MPToolbarDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPToolbarDelegate.h; sourceTree = "<group>"; };
4C3BD51416D276F800389F1F /* MPToolbarDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPToolbarDelegate.m; sourceTree = "<group>"; }; 4C3BD51416D276F800389F1F /* MPToolbarDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPToolbarDelegate.m; sourceTree = "<group>"; };
4C3CD2A6175570C9005F911C /* DMSplitView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DMSplitView.h; sourceTree = "<group>"; };
4C3CD2A7175570C9005F911C /* DMSplitView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DMSplitView.m; sourceTree = "<group>"; };
4C3FFD9D16DAF60600DF9186 /* FilterBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FilterBar.xib; sourceTree = "<group>"; }; 4C3FFD9D16DAF60600DF9186 /* FilterBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FilterBar.xib; sourceTree = "<group>"; };
4C40AC581707819A0073D1C3 /* MPAbstractSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPAbstractSettingsViewController.h; sourceTree = "<group>"; }; 4C40AC581707819A0073D1C3 /* MPAbstractSettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPAbstractSettingsViewController.h; sourceTree = "<group>"; };
4C40AC5B170782730073D1C3 /* MPAbstractSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAbstractSettingsViewController.m; sourceTree = "<group>"; }; 4C40AC5B170782730073D1C3 /* MPAbstractSettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAbstractSettingsViewController.m; sourceTree = "<group>"; };
@@ -421,6 +424,16 @@
name = Model; name = Model;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
4C3CD2A5175570C9005F911C /* DMSplitView */ = {
isa = PBXGroup;
children = (
4C3CD2A6175570C9005F911C /* DMSplitView.h */,
4C3CD2A7175570C9005F911C /* DMSplitView.m */,
);
name = DMSplitView;
path = DMSplitView/DMSplitView;
sourceTree = "<group>";
};
4C46B8821706397A0046109A /* Security Additions */ = { 4C46B8821706397A0046109A /* Security Additions */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
@@ -551,8 +564,9 @@
4C77E35715B84A240093A587 = { 4C77E35715B84A240093A587 = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
4C3CD2A5175570C9005F911C /* DMSplitView */,
4C669B2D16760ED100DD0774 /* MiniKeePassLib */, 4C669B2D16760ED100DD0774 /* MiniKeePassLib */,
4CAD745115B887FD00104512 /* KissXML */, 4CAD745415B887FD00104512 /* KissXML */,
4C77E36C15B84A240093A587 /* MacPass */, 4C77E36C15B84A240093A587 /* MacPass */,
4C77E36515B84A240093A587 /* Frameworks */, 4C77E36515B84A240093A587 /* Frameworks */,
4C77E36315B84A240093A587 /* Products */, 4C77E36315B84A240093A587 /* Products */,
@@ -668,14 +682,6 @@
name = General; name = General;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
4CAD745115B887FD00104512 /* KissXML */ = {
isa = PBXGroup;
children = (
4CAD745415B887FD00104512 /* KissXML */,
);
path = KissXML;
sourceTree = "<group>";
};
4CAD745415B887FD00104512 /* KissXML */ = { 4CAD745415B887FD00104512 /* KissXML */ = {
isa = PBXGroup; isa = PBXGroup;
children = ( children = (
@@ -690,7 +696,8 @@
4CAD746115B887FD00104512 /* DDXMLNode.m */, 4CAD746115B887FD00104512 /* DDXMLNode.m */,
4CAD746215B887FD00104512 /* Private */, 4CAD746215B887FD00104512 /* Private */,
); );
path = KissXML; name = KissXML;
path = KissXML/KissXML;
sourceTree = "<group>"; sourceTree = "<group>";
}; };
4CAD745515B887FD00104512 /* Additions */ = { 4CAD745515B887FD00104512 /* Additions */ = {
@@ -950,6 +957,7 @@
4CE5B54B173AFBA700207B39 /* MPDocument.m in Sources */, 4CE5B54B173AFBA700207B39 /* MPDocument.m in Sources */,
4CCF9754173EFBA500460BD2 /* KdbEntry+Undo.m in Sources */, 4CCF9754173EFBA500460BD2 /* KdbEntry+Undo.m in Sources */,
4C22040D1746ED160054C916 /* KdbGroup+Undo.m in Sources */, 4C22040D1746ED160054C916 /* KdbGroup+Undo.m in Sources */,
4C3CD2A8175570C9005F911C /* DMSplitView.m in Sources */,
); );
runOnlyForDeploymentPostprocessing = 0; runOnlyForDeploymentPostprocessing = 0;
}; };

4
MacPass/DocumentWindow.xib
View File

@@ -55,7 +55,7 @@
<array class="NSMutableArray" key="NSSubviews"> <array class="NSMutableArray" key="NSSubviews">
<object class="NSCustomView" id="425088172"> <object class="NSCustomView" id="425088172">
<reference key="NSNextResponder" ref="947682332"/> <reference key="NSNextResponder" ref="947682332"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">12</int>
<array class="NSMutableArray" key="NSSubviews"/> <array class="NSMutableArray" key="NSSubviews"/>
<string key="NSFrameSize">{200, 449}</string> <string key="NSFrameSize">{200, 449}</string>
<reference key="NSSuperview" ref="947682332"/> <reference key="NSSuperview" ref="947682332"/>
@@ -110,7 +110,7 @@
<reference key="NSWindow"/> <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="947682332"/> <reference key="NSNextKeyView" ref="947682332"/>
</object> </object>
<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string> <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
<string key="NSMinSize">{400, 422}</string> <string key="NSMinSize">{400, 422}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string> <string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<bool key="NSWindowIsRestorable">YES</bool> <bool key="NSWindowIsRestorable">YES</bool>

26
MacPass/MPDocumentWindowController.m
View File

@@ -15,6 +15,7 @@
#import "MPOutlineViewController.h" #import "MPOutlineViewController.h"
#import "MPInspectorTabViewController.h" #import "MPInspectorTabViewController.h"
#import "MPAppDelegate.h" #import "MPAppDelegate.h"
#import "DMSplitView.h"
@interface MPDocumentWindowController () { @interface MPDocumentWindowController () {
@private @private
@@ -47,7 +48,7 @@
@implementation MPDocumentWindowController @implementation MPDocumentWindowController
-(id)init { -(id)init {
self = [super initWithWindowNibName:@"MainWindow" owner:self]; self = [super initWithWindowNibName:@"DocumentWindow" owner:self];
if( self ) { if( self ) {
_needsDecryption = NO; _needsDecryption = NO;
_toolbarDelegate = [[MPToolbarDelegate alloc] init]; _toolbarDelegate = [[MPToolbarDelegate alloc] init];
@@ -86,17 +87,16 @@
[self.splitView setTranslatesAutoresizingMaskIntoConstraints:NO]; [self.splitView setTranslatesAutoresizingMaskIntoConstraints:NO];
/* Add outlineview */ /* Add outlineview */
//const NSRect outlineFrame = [self.outlineView frame]; const NSRect outlineFrame = [self.outlineView frame];
//[self.outlineViewController.view setFrame:outlineFrame]; [self.outlineViewController.view setFrame:outlineFrame];
//[self.outlineViewController.view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable]; [self.outlineViewController.view setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
[self.splitView replaceSubview:self.outlineView with:[self.outlineViewController view]]; [self.splitView replaceSubview:self.outlineView with:[self.outlineViewController view]];
[self.outlineViewController updateResponderChain]; [self.outlineViewController updateResponderChain];
/* Add inspector view */ /* Add inspector view */
//const NSRect inspectorFrame = [self.inspectorView frame]; const NSRect inspectorFrame = [self.inspectorView frame];
//[self.inspectorTabViewController.view setFrame:inspectorFrame]; [self.inspectorTabViewController.view setFrame:inspectorFrame];
//[self.inspectorTabViewController.view setAutoresizesSubviews:NSViewWidthSizable | NSViewHeightSizable ]; //[self.splitView replaceSubview:self.inspectorView with:[self.inspectorTabViewController view]];
[self.splitView replaceSubview:self.inspectorView with:[self.inspectorTabViewController view]];
[self.inspectorTabViewController updateResponderChain]; [self.inspectorTabViewController updateResponderChain];
[self _setOutlineVisible:NO]; [self _setOutlineVisible:NO];
@@ -150,19 +150,17 @@
#pragma mark Actions #pragma mark Actions
- (void)toggleInspector:(id)sender { - (void)toggleInspector:(id)sender {
if(self.inspectorTabViewController) { //if(self.inspectorTabViewController) {
[self.inspectorTabViewController toggleVisible]; // [self.inspectorTabViewController toggleVisible];
} //}
} }
- (void)performFindPanelAction:(id)sender { - (void)performFindPanelAction:(id)sender {
[self.entryViewController showFilter:sender]; [self.entryViewController showFilter:sender];
} }
- (void)toggleOutlineView:(id)sender { - (void)toggleOutlineView:(id)sender {
[self _setOutlineVisible:!self.outlineViewController.isVisible];
} }
- (BOOL)validateMenuItem:(NSMenuItem *)menuItem { - (BOOL)validateMenuItem:(NSMenuItem *)menuItem {

35
MacPass/MPOutlineViewController.m
View File

@@ -20,8 +20,8 @@
@property (retain) MPOutlineDataSource *datasource; @property (retain) MPOutlineDataSource *datasource;
@property (retain) MPOutlineViewDelegate *outlineDelegate; @property (retain) MPOutlineViewDelegate *outlineDelegate;
@property (retain) NSMenu *menu; @property (retain) NSMenu *menu;
@property (retain) NSLayoutConstraint *showConstraint; @property (retain) NSArray *showConstraints;
@property (retain) NSLayoutConstraint *hideConstraint; @property (retain) NSArray *hideConstraints;
- (void)_didUpdateData:(NSNotification *)notification; - (void)_didUpdateData:(NSNotification *)notification;
@@ -74,22 +74,17 @@
[self.outlineView setMenu:[self _contextMenu]]; [self.outlineView setMenu:[self _contextMenu]];
[self.outlineView setAllowsEmptySelection:YES]; [self.outlineView setAllowsEmptySelection:YES];
self.showConstraint = [NSLayoutConstraint constraintWithItem:[self view] NSView *myView = [self view];
attribute:NSLayoutAttributeWidth self.showConstraints = [NSLayoutConstraint constraintsWithVisualFormat:@"H:[myView(>=100,<=250)]"
relatedBy:NSLayoutRelationGreaterThanOrEqual options:0
toItem:nil metrics:nil
attribute:NSLayoutAttributeNotAnAttribute views:NSDictionaryOfVariableBindings(myView)];
multiplier:1
constant:200]; self.hideConstraints = [NSLayoutConstraint constraintsWithVisualFormat:@"H:[myView(==0)]"
options:0
self.hideConstraint = [NSLayoutConstraint constraintWithItem:[self view] metrics:nil
attribute:NSLayoutAttributeWidth views:NSDictionaryOfVariableBindings(myView)];
relatedBy:NSLayoutRelationEqual [[self view] addConstraints:_showConstraints];
toItem:nil
attribute:NSLayoutAttributeNotAnAttribute
multiplier:1
constant:0];
[[self view] addConstraint:self.showConstraint];
} }
@@ -107,8 +102,8 @@
if(_isVisible == isVisible) { if(_isVisible == isVisible) {
return; // nichts zu tun return; // nichts zu tun
} }
[[self view] removeConstraint:(isVisible ? self.hideConstraint : self.showConstraint)]; [[self view] removeConstraints:(isVisible ? self.hideConstraints : self.showConstraints)];
[[self view] addConstraint:(isVisible ? self.showConstraint : self.hideConstraint)]; [[self view] addConstraints:(isVisible ? self.showConstraints : self.hideConstraints)];
_isVisible = isVisible; _isVisible = isVisible;
} }

2
MacPass/MacPass-Info.plist
View File

@@ -46,7 +46,7 @@
<key>CFBundleSignature</key> <key>CFBundleSignature</key>
<string>????</string> <string>????</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>6F7</string> <string>725</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string> <string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>NSHumanReadableCopyright</key> <key>NSHumanReadableCopyright</key>

846
MacPass/OutlineView.xib
View File

@@ -13,6 +13,7 @@
<array key="IBDocument.IntegratedClassDependencies"> <array key="IBDocument.IntegratedClassDependencies">
<string>IBNSLayoutConstraint</string> <string>IBNSLayoutConstraint</string>
<string>NSCustomObject</string> <string>NSCustomObject</string>
<string>NSCustomView</string>
<string>NSImageCell</string> <string>NSImageCell</string>
<string>NSImageView</string> <string>NSImageView</string>
<string>NSOutlineView</string> <string>NSOutlineView</string>
@@ -40,183 +41,194 @@
<object class="NSCustomObject" id="1004"> <object class="NSCustomObject" id="1004">
<string key="NSClassName">NSApplication</string> <string key="NSClassName">NSApplication</string>
</object> </object>
<object class="NSScrollView" id="946871415"> <object class="NSCustomView" id="595437442">
<reference key="NSNextResponder"/> <reference key="NSNextResponder"/>
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews"> <array class="NSMutableArray" key="NSSubviews">
<object class="NSClipView" id="414629995"> <object class="NSScrollView" id="946871415">
<reference key="NSNextResponder" ref="946871415"/> <reference key="NSNextResponder" ref="595437442"/>
<int key="NSvFlags">2304</int> <int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews"> <array class="NSMutableArray" key="NSSubviews">
<object class="NSOutlineView" id="659470045"> <object class="NSClipView" id="414629995">
<reference key="NSNextResponder" ref="414629995"/> <reference key="NSNextResponder" ref="946871415"/>
<int key="NSvFlags">256</int> <int key="NSvFlags">2304</int>
<array class="NSMutableArray" key="NSSubviews"/> <array class="NSMutableArray" key="NSSubviews">
<string key="NSFrameSize">{139, 231}</string> <object class="NSOutlineView" id="659470045">
<reference key="NSSuperview" ref="414629995"/> <reference key="NSNextResponder" ref="414629995"/>
<reference key="NSWindow"/> <int key="NSvFlags">256</int>
<reference key="NSNextKeyView" ref="352201595"/> <array class="NSMutableArray" key="NSSubviews"/>
<string key="NSReuseIdentifierKey">_NS:13</string> <string key="NSFrameSize">{191, 299}</string>
<bool key="NSEnabled">YES</bool> <reference key="NSSuperview" ref="414629995"/>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool> <reference key="NSWindow"/>
<bool key="NSControlAllowsExpansionToolTips">YES</bool> <reference key="NSNextKeyView" ref="352201595"/>
<object class="_NSCornerView" key="NSCornerView"> <string key="NSReuseIdentifierKey">_NS:13</string>
<nil key="NSNextResponder"/> <bool key="NSEnabled">YES</bool>
<int key="NSvFlags">-2147483392</int> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<string key="NSFrame">{{224, 0}, {16, 17}}</string> <bool key="NSControlAllowsExpansionToolTips">YES</bool>
<string key="NSReuseIdentifierKey">_NS:16</string> <object class="_NSCornerView" key="NSCornerView">
</object> <nil key="NSNextResponder"/>
<array class="NSMutableArray" key="NSTableColumns"> <int key="NSvFlags">-2147483392</int>
<object class="NSTableColumn" id="1002200481"> <string key="NSFrame">{{224, 0}, {16, 17}}</string>
<string key="NSIdentifier">AutomaticTableColumnIdentifier.0</string> <string key="NSReuseIdentifierKey">_NS:16</string>
<double key="NSWidth">136</double> </object>
<double key="NSMinWidth">16</double> <array class="NSMutableArray" key="NSTableColumns">
<double key="NSMaxWidth">1000</double> <object class="NSTableColumn" id="1002200481">
<object class="NSTableHeaderCell" key="NSHeaderCell"> <string key="NSIdentifier">AutomaticTableColumnIdentifier.0</string>
<int key="NSCellFlags">75497536</int> <double key="NSWidth">188</double>
<int key="NSCellFlags2">2048</int> <double key="NSMinWidth">16</double>
<string key="NSContents"/> <double key="NSMaxWidth">1000</double>
<object class="NSFont" key="NSSupport"> <object class="NSTableHeaderCell" key="NSHeaderCell">
<string key="NSName">LucidaGrande</string> <int key="NSCellFlags">75497536</int>
<double key="NSSize">11</double> <int key="NSCellFlags2">2048</int>
<int key="NSfFlags">3100</int> <string key="NSContents"/>
<object class="NSFont" key="NSSupport">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">11</double>
<int key="NSfFlags">3100</int>
</object>
<object class="NSColor" key="NSBackgroundColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes>
</object>
<object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">headerTextColor</string>
<object class="NSColor" key="NSColor" id="770885791">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MAA</bytes>
</object>
</object>
</object>
<object class="NSTextFieldCell" key="NSDataCell" id="967700972">
<int key="NSCellFlags">337641536</int>
<int key="NSCellFlags2">2048</int>
<string key="NSContents">Text Cell</string>
<object class="NSFont" key="NSSupport" id="132572834">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">13</double>
<int key="NSfFlags">1044</int>
</object>
<reference key="NSControlView" ref="659470045"/>
<object class="NSColor" key="NSBackgroundColor" id="501306061">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlBackgroundColor</string>
<object class="NSColor" key="NSColor" id="872638426">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor" id="586786915">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlTextColor</string>
<reference key="NSColor" ref="770885791"/>
</object>
</object>
<int key="NSResizingMask">3</int>
<bool key="NSIsResizeable">YES</bool>
<bool key="NSIsEditable">YES</bool>
<reference key="NSTableView" ref="659470045"/>
</object> </object>
<object class="NSColor" key="NSBackgroundColor"> </array>
<double key="NSIntercellSpacingWidth">3</double>
<double key="NSIntercellSpacingHeight">0.0</double>
<object class="NSColor" key="NSBackgroundColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">_sourceListBackgroundColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">alternateSelectedControlColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MCAwIDEAA</bytes>
</object>
</object>
</object>
<object class="NSColor" key="NSGridColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">gridColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int> <int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC4zMzMzMzI5ODU2AA</bytes> <bytes key="NSWhite">MC41AA</bytes>
</object>
<object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">headerTextColor</string>
<object class="NSColor" key="NSColor" id="770885791">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MAA</bytes>
</object>
</object> </object>
</object> </object>
<object class="NSTextFieldCell" key="NSDataCell" id="967700972"> <double key="NSRowHeight">24</double>
<int key="NSCellFlags">337641536</int> <int key="NSTvFlags">-767557632</int>
<int key="NSCellFlags2">2048</int> <reference key="NSDelegate"/>
<string key="NSContents">Text Cell</string> <reference key="NSDataSource"/>
<object class="NSFont" key="NSSupport" id="132572834"> <int key="NSColumnAutoresizingStyle">4</int>
<string key="NSName">LucidaGrande</string> <int key="NSDraggingSourceMaskForLocal">15</int>
<double key="NSSize">13</double> <int key="NSDraggingSourceMaskForNonLocal">0</int>
<int key="NSfFlags">1044</int> <bool key="NSAllowsTypeSelect">YES</bool>
</object> <int key="NSTableViewSelectionHighlightStyle">1</int>
<reference key="NSControlView" ref="659470045"/> <int key="NSTableViewDraggingDestinationStyle">1</int>
<object class="NSColor" key="NSBackgroundColor" id="501306061"> <int key="NSTableViewGroupRowStyle">1</int>
<int key="NSColorSpace">6</int> <int key="NSTableViewRowSizeStyle">-1</int>
<string key="NSCatalogName">System</string> <bool key="NSOutlineViewAutoresizesOutlineColumnKey">NO</bool>
<string key="NSColorName">controlBackgroundColor</string> <float key="NSOutlineViewIndentationPerLevelKey">14</float>
<object class="NSColor" key="NSColor" id="872638426">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor" id="586786915">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlTextColor</string>
<reference key="NSColor" ref="770885791"/>
</object>
</object>
<int key="NSResizingMask">3</int>
<bool key="NSIsResizeable">YES</bool>
<bool key="NSIsEditable">YES</bool>
<reference key="NSTableView" ref="659470045"/>
</object> </object>
</array> </array>
<double key="NSIntercellSpacingWidth">3</double> <string key="NSFrameSize">{191, 299}</string>
<double key="NSIntercellSpacingHeight">0.0</double> <reference key="NSSuperview" ref="946871415"/>
<object class="NSColor" key="NSBackgroundColor"> <reference key="NSWindow"/>
<int key="NSColorSpace">6</int> <reference key="NSNextKeyView" ref="659470045"/>
<string key="NSCatalogName">System</string> <string key="NSReuseIdentifierKey">_NS:11</string>
<string key="NSColorName">_sourceListBackgroundColor</string> <reference key="NSDocView" ref="659470045"/>
<object class="NSColor" key="NSColor"> <reference key="NSBGColor" ref="501306061"/>
<int key="NSColorSpace">6</int> <int key="NScvFlags">4</int>
<string key="NSCatalogName">System</string> </object>
<string key="NSColorName">alternateSelectedControlColor</string> <object class="NSScroller" id="227096261">
<object class="NSColor" key="NSColor"> <reference key="NSNextResponder" ref="946871415"/>
<int key="NSColorSpace">1</int> <int key="NSvFlags">-2147483392</int>
<bytes key="NSRGB">MCAwIDEAA</bytes> <string key="NSFrame">{{224, 17}, {15, 102}}</string>
</object> <reference key="NSSuperview" ref="946871415"/>
</object> <reference key="NSWindow"/>
</object> <reference key="NSNextKeyView" ref="793110422"/>
<object class="NSColor" key="NSGridColor"> <string key="NSReuseIdentifierKey">_NS:15</string>
<int key="NSColorSpace">6</int> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<string key="NSCatalogName">System</string> <reference key="NSTarget" ref="946871415"/>
<string key="NSColorName">gridColor</string> <string key="NSAction">_doScroller:</string>
<object class="NSColor" key="NSColor"> <double key="NSPercent">0.99749373433583954</double>
<int key="NSColorSpace">3</int> </object>
<bytes key="NSWhite">MC41AA</bytes> <object class="NSScroller" id="793110422">
</object> <reference key="NSNextResponder" ref="946871415"/>
</object> <int key="NSvFlags">-2147483392</int>
<double key="NSRowHeight">24</double> <string key="NSFrame">{{1, 119}, {238, 15}}</string>
<int key="NSTvFlags">-767557632</int> <reference key="NSSuperview" ref="946871415"/>
<reference key="NSDelegate"/> <reference key="NSWindow"/>
<reference key="NSDataSource"/> <string key="NSReuseIdentifierKey">_NS:60</string>
<int key="NSColumnAutoresizingStyle">4</int> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSDraggingSourceMaskForLocal">15</int> <int key="NSsFlags">1</int>
<int key="NSDraggingSourceMaskForNonLocal">0</int> <reference key="NSTarget" ref="946871415"/>
<bool key="NSAllowsTypeSelect">YES</bool> <string key="NSAction">_doScroller:</string>
<int key="NSTableViewSelectionHighlightStyle">1</int> <double key="NSPercent">0.99328859060402686</double>
<int key="NSTableViewDraggingDestinationStyle">1</int>
<int key="NSTableViewGroupRowStyle">1</int>
<int key="NSTableViewRowSizeStyle">-1</int>
<bool key="NSOutlineViewAutoresizesOutlineColumnKey">NO</bool>
<float key="NSOutlineViewIndentationPerLevelKey">14</float>
</object> </object>
</array> </array>
<string key="NSFrameSize">{139, 231}</string> <string key="NSFrameSize">{191, 299}</string>
<reference key="NSSuperview" ref="946871415"/> <reference key="NSSuperview" ref="595437442"/>
<reference key="NSWindow"/> <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="659470045"/> <reference key="NSNextKeyView" ref="414629995"/>
<string key="NSReuseIdentifierKey">_NS:11</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<reference key="NSDocView" ref="659470045"/> <int key="NSsFlags">133680</int>
<reference key="NSBGColor" ref="501306061"/> <reference key="NSVScroller" ref="227096261"/>
<int key="NScvFlags">4</int> <reference key="NSHScroller" ref="793110422"/>
</object> <reference key="NSContentView" ref="414629995"/>
<object class="NSScroller" id="227096261"> <bytes key="NSScrollAmts">QSAAAEEgAABBwAAAQcAAAA</bytes>
<reference key="NSNextResponder" ref="946871415"/> <double key="NSMinMagnification">0.25</double>
<int key="NSvFlags">-2147483392</int> <double key="NSMaxMagnification">4</double>
<string key="NSFrame">{{224, 17}, {15, 102}}</string> <double key="NSMagnification">1</double>
<reference key="NSSuperview" ref="946871415"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="793110422"/>
<string key="NSReuseIdentifierKey">_NS:15</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<reference key="NSTarget" ref="946871415"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">0.99749373433583954</double>
</object>
<object class="NSScroller" id="793110422">
<reference key="NSNextResponder" ref="946871415"/>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{1, 119}, {238, 15}}</string>
<reference key="NSSuperview" ref="946871415"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:60</string>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="946871415"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">0.99328859060402686</double>
</object> </object>
</array> </array>
<string key="NSFrameSize">{139, 231}</string> <string key="NSFrameSize">{191, 299}</string>
<reference key="NSSuperview"/> <reference key="NSSuperview"/>
<reference key="NSWindow"/> <reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="414629995"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<int key="NSsFlags">133680</int> <string key="NSClassName">NSView</string>
<reference key="NSVScroller" ref="227096261"/>
<reference key="NSHScroller" ref="793110422"/>
<reference key="NSContentView" ref="414629995"/>
<bytes key="NSScrollAmts">QSAAAEEgAABBwAAAQcAAAA</bytes>
<double key="NSMinMagnification">0.25</double>
<double key="NSMaxMagnification">4</double>
<double key="NSMagnification">1</double>
</object> </object>
</array> </array>
<object class="IBObjectContainer" key="IBDocument.Objects"> <object class="IBObjectContainer" key="IBDocument.Objects">
@@ -233,9 +245,9 @@
<object class="IBOutletConnection" key="connection"> <object class="IBOutletConnection" key="connection">
<string key="label">view</string> <string key="label">view</string>
<reference key="source" ref="1001"/> <reference key="source" ref="1001"/>
<reference key="destination" ref="946871415"/> <reference key="destination" ref="595437442"/>
</object> </object>
<int key="connectionID">181</int> <int key="connectionID">201</int>
</object> </object>
<object class="IBConnectionRecord"> <object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection"> <object class="IBOutletConnection" key="connection">
@@ -247,7 +259,7 @@
<object class="NSTextField" id="368330878"> <object class="NSTextField" id="368330878">
<reference key="NSNextResponder" ref="352201595"/> <reference key="NSNextResponder" ref="352201595"/>
<int key="NSvFlags">266</int> <int key="NSvFlags">266</int>
<string key="NSFrame">{{0, 1}, {136, 14}}</string> <string key="NSFrame">{{0, 1}, {188, 14}}</string>
<reference key="NSSuperview" ref="352201595"/> <reference key="NSSuperview" ref="352201595"/>
<reference key="NSNextKeyView" ref="980203382"/> <reference key="NSNextKeyView" ref="980203382"/>
<string key="NSReuseIdentifierKey">_NS:101</string> <string key="NSReuseIdentifierKey">_NS:101</string>
@@ -277,7 +289,7 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object> </object>
</array> </array>
<string key="NSFrame">{{1, 0}, {136, 17}}</string> <string key="NSFrame">{{1, 0}, {188, 17}}</string>
<reference key="NSNextKeyView" ref="368330878"/> <reference key="NSNextKeyView" ref="368330878"/>
<string key="NSReuseIdentifierKey">HeaderCell</string> <string key="NSReuseIdentifierKey">HeaderCell</string>
</object> </object>
@@ -327,7 +339,7 @@
<object class="NSTextField" id="427657401"> <object class="NSTextField" id="427657401">
<reference key="NSNextResponder" ref="980203382"/> <reference key="NSNextResponder" ref="980203382"/>
<int key="NSvFlags">266</int> <int key="NSvFlags">266</int>
<string key="NSFrame">{{25, 0}, {111, 17}}</string> <string key="NSFrame">{{25, 0}, {163, 17}}</string>
<reference key="NSSuperview" ref="980203382"/> <reference key="NSSuperview" ref="980203382"/>
<reference key="NSNextKeyView" ref="227096261"/> <reference key="NSNextKeyView" ref="227096261"/>
<string key="NSReuseIdentifierKey">_NS:80</string> <string key="NSReuseIdentifierKey">_NS:80</string>
@@ -345,7 +357,7 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool> <bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object> </object>
</array> </array>
<string key="NSFrame">{{1, 17}, {136, 17}}</string> <string key="NSFrame">{{1, 17}, {188, 17}}</string>
<reference key="NSNextKeyView" ref="273100869"/> <reference key="NSNextKeyView" ref="273100869"/>
<string key="NSReuseIdentifierKey">DataCell</string> <string key="NSReuseIdentifierKey">DataCell</string>
</object> </object>
@@ -388,15 +400,97 @@
<reference key="parent" ref="0"/> <reference key="parent" ref="0"/>
<string key="objectName">Application</string> <string key="objectName">Application</string>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">196</int>
<reference key="object" ref="595437442"/>
<array class="NSMutableArray" key="children">
<object class="IBNSLayoutConstraint" id="20875447">
<reference key="firstItem" ref="946871415"/>
<int key="firstAttribute">4</int>
<int key="relation">0</int>
<reference key="secondItem" ref="595437442"/>
<int key="secondAttribute">4</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="595437442"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="751516117">
<reference key="firstItem" ref="946871415"/>
<int key="firstAttribute">6</int>
<int key="relation">0</int>
<reference key="secondItem" ref="595437442"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="595437442"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="983652714">
<reference key="firstItem" ref="946871415"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="595437442"/>
<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>
<reference key="containingView" ref="595437442"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="530852363">
<reference key="firstItem" ref="946871415"/>
<int key="firstAttribute">3</int>
<int key="relation">0</int>
<reference key="secondItem" ref="595437442"/>
<int key="secondAttribute">3</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="595437442"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<reference ref="946871415"/>
</array>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">66</int> <int key="objectID">66</int>
<reference key="object" ref="946871415"/> <reference key="object" ref="946871415"/>
<array class="NSMutableArray" key="children"> <array class="NSMutableArray" key="children">
<reference ref="659470045"/>
<reference ref="793110422"/>
<reference ref="227096261"/> <reference ref="227096261"/>
<reference ref="793110422"/>
<reference ref="659470045"/>
</array> </array>
<reference key="parent" ref="0"/> <reference key="parent" ref="595437442"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">69</int>
<reference key="object" ref="227096261"/>
<reference key="parent" ref="946871415"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">68</int>
<reference key="object" ref="793110422"/>
<reference key="parent" ref="946871415"/>
</object> </object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">67</int> <int key="objectID">67</int>
@@ -406,147 +500,26 @@
</array> </array>
<reference key="parent" ref="946871415"/> <reference key="parent" ref="946871415"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">68</int>
<reference key="object" ref="793110422"/>
<reference key="parent" ref="946871415"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">69</int>
<reference key="object" ref="227096261"/>
<reference key="parent" ref="946871415"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">70</int> <int key="objectID">70</int>
<reference key="object" ref="1002200481"/> <reference key="object" ref="1002200481"/>
<array class="NSMutableArray" key="children"> <array class="NSMutableArray" key="children">
<reference ref="967700972"/>
<reference ref="352201595"/>
<reference ref="980203382"/> <reference ref="980203382"/>
<reference ref="352201595"/>
<reference ref="967700972"/>
</array> </array>
<reference key="parent" ref="659470045"/> <reference key="parent" ref="659470045"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">71</int>
<reference key="object" ref="967700972"/>
<reference key="parent" ref="1002200481"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">76</int>
<reference key="object" ref="352201595"/>
<array class="NSMutableArray" key="children">
<reference ref="368330878"/>
<object class="IBNSLayoutConstraint" id="172336901">
<reference key="firstItem" ref="368330878"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="352201595"/>
<int key="secondAttribute">5</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">3</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="352201595"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="504156154">
<reference key="firstItem" ref="368330878"/>
<int key="firstAttribute">10</int>
<int key="relation">0</int>
<reference key="secondItem" ref="352201595"/>
<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>
<reference key="containingView" ref="352201595"/>
<int key="scoringType">5</int>
<float key="scoringTypeFloat">22</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="793498958">
<reference key="firstItem" ref="352201595"/>
<int key="firstAttribute">6</int>
<int key="relation">0</int>
<reference key="secondItem" ref="368330878"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">3</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="352201595"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
</array>
<reference key="parent" ref="1002200481"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">79</int> <int key="objectID">79</int>
<reference key="object" ref="980203382"/> <reference key="object" ref="980203382"/>
<array class="NSMutableArray" key="children"> <array class="NSMutableArray" key="children">
<reference ref="273100869"/> <object class="IBNSLayoutConstraint" id="482207145">
<reference ref="427657401"/>
<object class="IBNSLayoutConstraint" id="233915819">
<reference key="firstItem" ref="427657401"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="273100869"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">8</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="980203382"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="36188620">
<reference key="firstItem" ref="427657401"/>
<int key="firstAttribute">10</int>
<int key="relation">0</int>
<reference key="secondItem" ref="980203382"/>
<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>
<reference key="containingView" ref="980203382"/>
<int key="scoringType">5</int>
<float key="scoringTypeFloat">22</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="982159175">
<reference key="firstItem" ref="980203382"/>
<int key="firstAttribute">6</int>
<int key="relation">0</int>
<reference key="secondItem" ref="427657401"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">3</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="980203382"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="7724728">
<reference key="firstItem" ref="273100869"/> <reference key="firstItem" ref="273100869"/>
<int key="firstAttribute">4</int> <int key="firstAttribute">3</int>
<int key="relation">0</int> <int key="relation">0</int>
<reference key="secondItem" ref="427657401"/> <reference key="secondItem" ref="427657401"/>
<int key="secondAttribute">4</int> <int key="secondAttribute">3</int>
<float key="multiplier">1</float> <float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant"> <object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double> <double key="value">0.0</double>
@@ -573,12 +546,12 @@
<float key="scoringTypeFloat">29</float> <float key="scoringTypeFloat">29</float>
<int key="contentType">3</int> <int key="contentType">3</int>
</object> </object>
<object class="IBNSLayoutConstraint" id="482207145"> <object class="IBNSLayoutConstraint" id="7724728">
<reference key="firstItem" ref="273100869"/> <reference key="firstItem" ref="273100869"/>
<int key="firstAttribute">3</int> <int key="firstAttribute">4</int>
<int key="relation">0</int> <int key="relation">0</int>
<reference key="secondItem" ref="427657401"/> <reference key="secondItem" ref="427657401"/>
<int key="secondAttribute">3</int> <int key="secondAttribute">4</int>
<float key="multiplier">1</float> <float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant"> <object class="IBLayoutConstant" key="constant">
<double key="value">0.0</double> <double key="value">0.0</double>
@@ -589,14 +562,190 @@
<float key="scoringTypeFloat">24</float> <float key="scoringTypeFloat">24</float>
<int key="contentType">2</int> <int key="contentType">2</int>
</object> </object>
<object class="IBNSLayoutConstraint" id="982159175">
<reference key="firstItem" ref="980203382"/>
<int key="firstAttribute">6</int>
<int key="relation">0</int>
<reference key="secondItem" ref="427657401"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">3</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="980203382"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="36188620">
<reference key="firstItem" ref="427657401"/>
<int key="firstAttribute">10</int>
<int key="relation">0</int>
<reference key="secondItem" ref="980203382"/>
<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>
<reference key="containingView" ref="980203382"/>
<int key="scoringType">5</int>
<float key="scoringTypeFloat">22</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="233915819">
<reference key="firstItem" ref="427657401"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="273100869"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
<double key="value">8</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="980203382"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">3</int>
</object>
<reference ref="427657401"/>
<reference ref="273100869"/>
</array> </array>
<reference key="parent" ref="1002200481"/> <reference key="parent" ref="1002200481"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">76</int>
<reference key="object" ref="352201595"/>
<array class="NSMutableArray" key="children">
<object class="IBNSLayoutConstraint" id="793498958">
<reference key="firstItem" ref="352201595"/>
<int key="firstAttribute">6</int>
<int key="relation">0</int>
<reference key="secondItem" ref="368330878"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">3</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="352201595"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="504156154">
<reference key="firstItem" ref="368330878"/>
<int key="firstAttribute">10</int>
<int key="relation">0</int>
<reference key="secondItem" ref="352201595"/>
<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>
<reference key="containingView" ref="352201595"/>
<int key="scoringType">5</int>
<float key="scoringTypeFloat">22</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="172336901">
<reference key="firstItem" ref="368330878"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="352201595"/>
<int key="secondAttribute">5</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">3</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="352201595"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<reference ref="368330878"/>
</array>
<reference key="parent" ref="1002200481"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">71</int>
<reference key="object" ref="967700972"/>
<reference key="parent" ref="1002200481"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">87</int>
<reference key="object" ref="793498958"/>
<reference key="parent" ref="352201595"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">88</int>
<reference key="object" ref="504156154"/>
<reference key="parent" ref="352201595"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">89</int>
<reference key="object" ref="172336901"/>
<reference key="parent" ref="352201595"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">77</int>
<reference key="object" ref="368330878"/>
<array class="NSMutableArray" key="children">
<reference ref="343601865"/>
</array>
<reference key="parent" ref="352201595"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">78</int>
<reference key="object" ref="343601865"/>
<reference key="parent" ref="368330878"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">92</int>
<reference key="object" ref="482207145"/>
<reference key="parent" ref="980203382"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">94</int>
<reference key="object" ref="1028977466"/>
<reference key="parent" ref="980203382"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">95</int>
<reference key="object" ref="7724728"/>
<reference key="parent" ref="980203382"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">90</int>
<reference key="object" ref="982159175"/>
<reference key="parent" ref="980203382"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">91</int>
<reference key="object" ref="36188620"/>
<reference key="parent" ref="980203382"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">93</int>
<reference key="object" ref="233915819"/>
<reference key="parent" ref="980203382"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">82</int>
<reference key="object" ref="427657401"/>
<array class="NSMutableArray" key="children">
<reference ref="337454761"/>
</array>
<reference key="parent" ref="980203382"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">80</int> <int key="objectID">80</int>
<reference key="object" ref="273100869"/> <reference key="object" ref="273100869"/>
<array class="NSMutableArray" key="children"> <array class="NSMutableArray" key="children">
<reference ref="285920844"/>
<object class="IBNSLayoutConstraint" id="107043411"> <object class="IBNSLayoutConstraint" id="107043411">
<reference key="firstItem" ref="273100869"/> <reference key="firstItem" ref="273100869"/>
<int key="firstAttribute">7</int> <int key="firstAttribute">7</int>
@@ -613,89 +762,44 @@
<float key="scoringTypeFloat">9</float> <float key="scoringTypeFloat">9</float>
<int key="contentType">1</int> <int key="contentType">1</int>
</object> </object>
<reference ref="285920844"/>
</array> </array>
<reference key="parent" ref="980203382"/> <reference key="parent" ref="980203382"/>
</object> </object>
<object class="IBObjectRecord">
<int key="objectID">82</int>
<reference key="object" ref="427657401"/>
<array class="NSMutableArray" key="children">
<reference ref="337454761"/>
</array>
<reference key="parent" ref="980203382"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">93</int>
<reference key="object" ref="233915819"/>
<reference key="parent" ref="980203382"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">91</int>
<reference key="object" ref="36188620"/>
<reference key="parent" ref="980203382"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">90</int>
<reference key="object" ref="982159175"/>
<reference key="parent" ref="980203382"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">95</int>
<reference key="object" ref="7724728"/>
<reference key="parent" ref="980203382"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">94</int>
<reference key="object" ref="1028977466"/>
<reference key="parent" ref="980203382"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">92</int>
<reference key="object" ref="482207145"/>
<reference key="parent" ref="980203382"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">83</int>
<reference key="object" ref="337454761"/>
<reference key="parent" ref="427657401"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">81</int>
<reference key="object" ref="285920844"/>
<reference key="parent" ref="273100869"/>
</object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">96</int> <int key="objectID">96</int>
<reference key="object" ref="107043411"/> <reference key="object" ref="107043411"/>
<reference key="parent" ref="273100869"/> <reference key="parent" ref="273100869"/>
</object> </object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">77</int> <int key="objectID">81</int>
<reference key="object" ref="368330878"/> <reference key="object" ref="285920844"/>
<array class="NSMutableArray" key="children"> <reference key="parent" ref="273100869"/>
<reference ref="343601865"/>
</array>
<reference key="parent" ref="352201595"/>
</object> </object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">89</int> <int key="objectID">83</int>
<reference key="object" ref="172336901"/> <reference key="object" ref="337454761"/>
<reference key="parent" ref="352201595"/> <reference key="parent" ref="427657401"/>
</object> </object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">88</int> <int key="objectID">219</int>
<reference key="object" ref="504156154"/> <reference key="object" ref="530852363"/>
<reference key="parent" ref="352201595"/> <reference key="parent" ref="595437442"/>
</object> </object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">87</int> <int key="objectID">220</int>
<reference key="object" ref="793498958"/> <reference key="object" ref="983652714"/>
<reference key="parent" ref="352201595"/> <reference key="parent" ref="595437442"/>
</object> </object>
<object class="IBObjectRecord"> <object class="IBObjectRecord">
<int key="objectID">78</int> <int key="objectID">222</int>
<reference key="object" ref="343601865"/> <reference key="object" ref="751516117"/>
<reference key="parent" ref="368330878"/> <reference key="parent" ref="595437442"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">223</int>
<reference key="object" ref="20875447"/>
<reference key="parent" ref="595437442"/>
</object> </object>
</array> </array>
</object> </object>
@@ -703,6 +807,18 @@
<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="-2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="-3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array class="NSMutableArray" key="196.IBNSViewMetadataConstraints">
<reference ref="530852363"/>
<reference ref="983652714"/>
<reference ref="751516117"/>
<reference ref="20875447"/>
</array>
<string key="196.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="219.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="220.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="222.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="223.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="66.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="66.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="66.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="67.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="67.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES" key="67.ibExternalAutomaticallyCalculatesRowSizeFromViewHeight"/> <boolean value="YES" key="67.ibExternalAutomaticallyCalculatesRowSizeFromViewHeight"/>
@@ -759,7 +875,7 @@
<nil key="activeLocalization"/> <nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/> <dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/> <nil key="sourceID"/>
<int key="maxID">195</int> <int key="maxID">223</int>
</object> </object>
<object class="IBClassDescriber" key="IBDocument.Classes"> <object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions"> <array class="NSMutableArray" key="referencedPartialClassDescriptions">

6
MacPass/OverlayWindow.xib
View File

@@ -2,10 +2,10 @@
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00"> <archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data> <data>
<int key="IBDocument.SystemTarget">1080</int> <int key="IBDocument.SystemTarget">1080</int>
<string key="IBDocument.SystemVersion">12C3103</string> <string key="IBDocument.SystemVersion">12D78</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string> <string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.34</string> <string key="IBDocument.AppKitVersion">1187.37</string>
<string key="IBDocument.HIToolboxVersion">625.00</string> <string key="IBDocument.HIToolboxVersion">626.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions"> <object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">3084</string> <string key="NS.object.0">3084</string>

10
MacPass/PasswordCreatorWindow.xib
View File

@@ -47,9 +47,8 @@
<string key="NSFrameSize">{300, 350}</string> <string key="NSFrameSize">{300, 350}</string>
<reference key="NSSuperview"/> <reference key="NSSuperview"/>
<reference key="NSWindow"/> <reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
</object> </object>
<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string> <string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string> <string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<bool key="NSWindowIsRestorable">YES</bool> <bool key="NSWindowIsRestorable">YES</bool>
</object> </object>
@@ -114,7 +113,7 @@
<boolean value="YES" key="1.IBNSWindowAutoPositionCentersVertical"/> <boolean value="YES" key="1.IBNSWindowAutoPositionCentersVertical"/>
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="1.IBWindowTemplateEditedContentRect">{{357, 418}, {480, 270}}</string> <string key="1.IBWindowTemplateEditedContentRect">{{357, 418}, {480, 270}}</string>
<integer value="1" key="1.NSWindowTemplate.visibleAtLaunch"/> <boolean value="NO" key="1.NSWindowTemplate.visibleAtLaunch"/>
<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string> <string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
</dictionary> </dictionary>
<dictionary class="NSMutableDictionary" key="unlocalizedProperties"/> <dictionary class="NSMutableDictionary" key="unlocalizedProperties"/>
@@ -129,15 +128,10 @@
<string key="className">MPAppDelegate</string> <string key="className">MPAppDelegate</string>
<string key="superclassName">NSObject</string> <string key="superclassName">NSObject</string>
<dictionary class="NSMutableDictionary" key="actions"> <dictionary class="NSMutableDictionary" key="actions">
<string key="showMainWindow:">id</string>
<string key="showPasswordCreator:">id</string> <string key="showPasswordCreator:">id</string>
<string key="showPreferences:">id</string> <string key="showPreferences:">id</string>
</dictionary> </dictionary>
<dictionary class="NSMutableDictionary" key="actionInfosByName"> <dictionary class="NSMutableDictionary" key="actionInfosByName">
<object class="IBActionInfo" key="showMainWindow:">
<string key="name">showMainWindow:</string>
<string key="candidateClassName">id</string>
</object>
<object class="IBActionInfo" key="showPasswordCreator:"> <object class="IBActionInfo" key="showPasswordCreator:">
<string key="name">showPasswordCreator:</string> <string key="name">showPasswordCreator:</string>
<string key="candidateClassName">id</string> <string key="candidateClassName">id</string>

1
MacPass/PasswordInputView.xib
View File

@@ -252,7 +252,6 @@
<int key="NSvFlags">268</int> <int key="NSvFlags">268</int>
<string key="NSFrame">{{209, 50}, {74, 32}}</string> <string key="NSFrame">{{209, 50}, {74, 32}}</string>
<reference key="NSSuperview" ref="1005"/> <reference key="NSSuperview" ref="1005"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string> <string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSHuggingPriority">{250, 250}</string> <string key="NSHuggingPriority">{250, 250}</string>
<bool key="NSEnabled">YES</bool> <bool key="NSEnabled">YES</bool>