Fixed deallocation cleanup

Minor view changes

Sketching path bar to use for search as hint to where the entries are
Some experiments with the filter bar (extracted the view to a separate nib)
This commit is contained in:
michael starke
2013-02-25 03:31:55 +01:00
parent 1b878c4d0b
commit 841647a3ed
25 changed files with 1151 additions and 852 deletions

View File

@@ -7,6 +7,7 @@
objects = {
/* Begin PBXBuildFile section */
4C16854416D704980027ECBC /* MPPathBar.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C16854316D704980027ECBC /* MPPathBar.m */; };
4C25D58516CF0F8800F6806C /* WelcomeView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C25D58416CF0F8800F6806C /* WelcomeView.xib */; };
4C25D58716CF0FAA00F6806C /* EntryView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C25D58616CF0FAA00F6806C /* EntryView.xib */; };
4C2C4C2C16D3BE3700D49295 /* KdbGroup+MPAdditions.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2C4C2B16D3BE3700D49295 /* KdbGroup+MPAdditions.m */; };
@@ -17,6 +18,7 @@
4C2E382616D1470200037A9D /* MPViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C2E382516D1470200037A9D /* MPViewController.m */; };
4C37A84015B8B474005EF8EE /* MPOutlineDataSource.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C37A83F15B8B474005EF8EE /* MPOutlineDataSource.m */; };
4C3BD51516D276F800389F1F /* MPToolbarDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C3BD51416D276F800389F1F /* MPToolbarDelegate.m */; };
4C3FFD9E16DAF60600DF9186 /* FilterBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C3FFD9D16DAF60600DF9186 /* FilterBar.xib */; };
4C586F9E16D07ABD00E7DB57 /* 00_PasswordTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C586F9D16D07ABD00E7DB57 /* 00_PasswordTemplate.pdf */; };
4C586FA016D07D7200E7DB57 /* 01_PackageNetworkTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C586F9F16D07D7200E7DB57 /* 01_PackageNetworkTemplate.pdf */; };
4C586FA216D07F6A00E7DB57 /* 02_MessageBoxWarningTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C586FA116D07F6A00E7DB57 /* 02_MessageBoxWarningTemplate.pdf */; };
@@ -60,6 +62,7 @@
4C669BA216760ED100DD0774 /* UUID.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7B16760ED100DD0774 /* UUID.m */; };
4C69A73A16D589DF00EC1B1A /* MPGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C69A73916D589DF00EC1B1A /* MPGradientView.m */; };
4C6B0E8C16C9B99B00A9ED23 /* PasswordInputView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C6B0E8B16C9B99B00A9ED23 /* PasswordInputView.xib */; };
4C6DA0F916D81B8A0011224B /* MPPathBarItemView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C6DA0F816D81B8A0011224B /* MPPathBarItemView.m */; };
4C75CE3C16CB128700F61A4D /* MPDatabaseController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C75CE3B16CB128700F61A4D /* MPDatabaseController.m */; };
4C77E36715B84A240093A587 /* Cocoa.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4C77E36615B84A240093A587 /* Cocoa.framework */; };
4C77E37115B84A240093A587 /* InfoPlist.strings in Resources */ = {isa = PBXBuildFile; fileRef = 4C77E36F15B84A240093A587 /* InfoPlist.strings */; };
@@ -96,6 +99,8 @@
/* End PBXBuildFile section */
/* Begin PBXFileReference section */
4C16854216D704980027ECBC /* MPPathBar.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPathBar.h; sourceTree = "<group>"; };
4C16854316D704980027ECBC /* MPPathBar.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPathBar.m; sourceTree = "<group>"; };
4C25D58416CF0F8800F6806C /* WelcomeView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = WelcomeView.xib; sourceTree = "<group>"; };
4C25D58616CF0FAA00F6806C /* EntryView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = EntryView.xib; sourceTree = "<group>"; };
4C2C4C2A16D3BE3700D49295 /* KdbGroup+MPAdditions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = "KdbGroup+MPAdditions.h"; sourceTree = "<group>"; };
@@ -111,6 +116,7 @@
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>"; };
4C3BD51416D276F800389F1F /* MPToolbarDelegate.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPToolbarDelegate.m; sourceTree = "<group>"; };
4C3FFD9D16DAF60600DF9186 /* FilterBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = FilterBar.xib; sourceTree = "<group>"; };
4C586F9D16D07ABD00E7DB57 /* 00_PasswordTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 00_PasswordTemplate.pdf; sourceTree = "<group>"; };
4C586F9F16D07D7200E7DB57 /* 01_PackageNetworkTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 01_PackageNetworkTemplate.pdf; sourceTree = "<group>"; };
4C586FA116D07F6A00E7DB57 /* 02_MessageBoxWarningTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 02_MessageBoxWarningTemplate.pdf; sourceTree = "<group>"; };
@@ -195,6 +201,8 @@
4C69A73816D589DF00EC1B1A /* MPGradientView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPGradientView.h; sourceTree = "<group>"; };
4C69A73916D589DF00EC1B1A /* MPGradientView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPGradientView.m; sourceTree = "<group>"; };
4C6B0E8B16C9B99B00A9ED23 /* PasswordInputView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PasswordInputView.xib; sourceTree = "<group>"; };
4C6DA0F716D81B8A0011224B /* MPPathBarItemView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPathBarItemView.h; sourceTree = "<group>"; };
4C6DA0F816D81B8A0011224B /* MPPathBarItemView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPathBarItemView.m; sourceTree = "<group>"; };
4C75CE3A16CB128700F61A4D /* MPDatabaseController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPDatabaseController.h; sourceTree = "<group>"; };
4C75CE3B16CB128700F61A4D /* MPDatabaseController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPDatabaseController.m; sourceTree = "<group>"; };
4C77E36215B84A240093A587 /* MacPass.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = MacPass.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -282,8 +290,13 @@
4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */,
4C6B0E8B16C9B99B00A9ED23 /* PasswordInputView.xib */,
4C25D58416CF0F8800F6806C /* WelcomeView.xib */,
4C3FFD9D16DAF60600DF9186 /* FilterBar.xib */,
4C69A73816D589DF00EC1B1A /* MPGradientView.h */,
4C69A73916D589DF00EC1B1A /* MPGradientView.m */,
4C16854216D704980027ECBC /* MPPathBar.h */,
4C16854316D704980027ECBC /* MPPathBar.m */,
4C6DA0F716D81B8A0011224B /* MPPathBarItemView.h */,
4C6DA0F816D81B8A0011224B /* MPPathBarItemView.m */,
);
name = Views;
sourceTree = "<group>";
@@ -686,6 +699,7 @@
4C61EA0516D2FFE200AC519E /* OutlineView.xib in Resources */,
4CB9339916D3A0DD00A13B5D /* Credits.rtf in Resources */,
4CF5D49716D5B6E900CB78BD /* EntryEditView.xib in Resources */,
4C3FFD9E16DAF60600DF9186 /* FilterBar.xib in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
@@ -772,6 +786,8 @@
4CC1AEBE16D4467C006D2AAB /* KdbTree+MPAdditions.m in Sources */,
4C69A73A16D589DF00EC1B1A /* MPGradientView.m in Sources */,
4CF5D49616D5B6E900CB78BD /* MPEntryEditController.m in Sources */,
4C16854416D704980027ECBC /* MPPathBar.m in Sources */,
4C6DA0F916D81B8A0011224B /* MPPathBarItemView.m in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};

View File

@@ -12,13 +12,10 @@
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBNSLayoutConstraint</string>
<string>NSButton</string>
<string>NSButtonCell</string>
<string>NSCustomObject</string>
<string>NSCustomView</string>
<string>NSImageCell</string>
<string>NSImageView</string>
<string>NSProgressIndicator</string>
<string>NSScrollView</string>
<string>NSScroller</string>
<string>NSTableCellView</string>
@@ -49,149 +46,6 @@
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSCustomView" id="488931024">
<reference key="NSNextResponder" ref="997686550"/>
<int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSProgressIndicator" id="545113708">
<reference key="NSNextResponder" ref="488931024"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{593, 6}, {16, 16}}</string>
<reference key="NSSuperview" ref="488931024"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:945</string>
<int key="NSpiFlags">28938</int>
<double key="NSMaxValue">100</double>
</object>
<object class="NSButton" id="843279765">
<reference key="NSNextResponder" ref="488931024"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{198, 5}, {38, 17}}</string>
<reference key="NSSuperview" ref="488931024"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="613995671"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="636015412">
<int key="NSCellFlags">-2080374784</int>
<int key="NSCellFlags2">134348800</int>
<string key="NSContents">URL</string>
<object class="NSFont" key="NSSupport" id="29">
<string key="NSName">LucidaGrande-Bold</string>
<double key="NSSize">12</double>
<int key="NSfFlags">16</int>
</object>
<string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="843279765"/>
<int key="NSButtonFlags">-1232846848</int>
<int key="NSButtonFlags2">173</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="128247646">
<reference key="NSNextResponder" ref="488931024"/>
<int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews"/>
<string key="NSFrame">{{114, 5}, {76, 17}}</string>
<reference key="NSSuperview" ref="488931024"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="843279765"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="822877443">
<int key="NSCellFlags">-2080374784</int>
<int key="NSCellFlags2">134348800</int>
<string key="NSContents">Username</string>
<reference key="NSSupport" ref="29"/>
<string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="128247646"/>
<int key="NSButtonFlags">-1232846848</int>
<int key="NSButtonFlags2">173</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="486078330">
<reference key="NSNextResponder" ref="488931024"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{64, 5}, {42, 17}}</string>
<reference key="NSSuperview" ref="488931024"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="128247646"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="917963484">
<int key="NSCellFlags">-2080374784</int>
<int key="NSCellFlags2">142737408</int>
<string key="NSContents">Title</string>
<reference key="NSSupport" ref="29"/>
<string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="486078330"/>
<int key="NSButtonFlags">-1232846848</int>
<int key="NSButtonFlags2">173</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="238723868">
<reference key="NSNextResponder" ref="488931024"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{7, 7}, {52, 17}}</string>
<reference key="NSSuperview" ref="488931024"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="486078330"/>
<string key="NSReuseIdentifierKey">_NS:1535</string>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="9066510">
<int key="NSCellFlags">68157504</int>
<int key="NSCellFlags2">272630784</int>
<string key="NSContents">Search:</string>
<object class="NSFont" key="NSSupport">
<string key="NSName">LucidaGrande-Bold</string>
<double key="NSSize">13</double>
<int key="NSfFlags">2072</int>
</object>
<string key="NSCellIdentifier">_NS:1535</string>
<reference key="NSControlView" ref="238723868"/>
<object class="NSColor" key="NSBackgroundColor" id="10074991">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlColor</string>
<object class="NSColor" key="NSColor" id="1055557409">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">disabledControlTextColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC4zMzMzMzMzMzMzAA</bytes>
</object>
</object>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</array>
<string key="NSFrame">{{0, 450}, {615, 30}}</string>
<reference key="NSSuperview" ref="997686550"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="238723868"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSClassName">MPGradientView</string>
</object>
<object class="NSScrollView" id="613995671">
<reference key="NSNextResponder" ref="997686550"/>
<int key="NSvFlags">4364</int>
@@ -204,10 +58,10 @@
<reference key="NSNextResponder" ref="262664416"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews"/>
<string key="NSFrameSize">{615, 433}</string>
<string key="NSFrameSize">{624, 346}</string>
<reference key="NSSuperview" ref="262664416"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="788738248"/>
<reference key="NSNextKeyView" ref="737075944"/>
<string key="NSReuseIdentifierKey">_NS:13</string>
<bool key="NSEnabled">YES</bool>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -215,7 +69,7 @@
<object class="NSTableHeaderView" key="NSHeaderView" id="778100560">
<reference key="NSNextResponder" ref="737075944"/>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{615, 17}</string>
<string key="NSFrameSize">{624, 17}</string>
<reference key="NSSuperview" ref="737075944"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="262664416"/>
@@ -277,7 +131,10 @@
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlBackgroundColor</string>
<reference key="NSColor" ref="1055557409"/>
<object class="NSColor" key="NSColor" id="1055557409">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC42NjY2NjY2NjY3AA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor" id="847395763">
<int key="NSColorSpace">6</int>
@@ -373,7 +230,7 @@
<reference key="NSTableView" ref="528076956"/>
</object>
<object class="NSTableColumn" id="683421605">
<double key="NSWidth">128</double>
<double key="NSWidth">137</double>
<double key="NSMinWidth">10</double>
<double key="NSMaxWidth">3.4028234663852886e+38</double>
<object class="NSTableHeaderCell" key="NSHeaderCell">
@@ -423,7 +280,7 @@
<int key="NSTableViewGroupRowStyle">1</int>
</object>
</array>
<string key="NSFrame">{{0, 17}, {615, 433}}</string>
<string key="NSFrame">{{0, 17}, {624, 346}}</string>
<reference key="NSSuperview" ref="613995671"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="528076956"/>
@@ -449,7 +306,7 @@
<object class="NSScroller" id="802411427">
<reference key="NSNextResponder" ref="613995671"/>
<int key="NSvFlags">-2147483392</int>
<string key="NSFrame">{{0, 434}, {619, 16}}</string>
<string key="NSFrame">{{0, 509}, {490, 16}}</string>
<reference key="NSSuperview" ref="613995671"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:60</string>
@@ -457,7 +314,7 @@
<int key="NSsFlags">1</int>
<reference key="NSTarget" ref="613995671"/>
<string key="NSAction">_doScroller:</string>
<double key="NSPercent">0.9935794542536116</double>
<double key="NSPercent">0.9859154929577465</double>
</object>
<object class="NSClipView" id="737075944">
<reference key="NSNextResponder" ref="613995671"/>
@@ -465,7 +322,7 @@
<array class="NSMutableArray" key="NSSubviews">
<reference ref="778100560"/>
</array>
<string key="NSFrameSize">{615, 17}</string>
<string key="NSFrameSize">{624, 17}</string>
<reference key="NSSuperview" ref="613995671"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="778100560"/>
@@ -475,10 +332,10 @@
<int key="NScvFlags">4</int>
</object>
</array>
<string key="NSFrameSize">{615, 450}</string>
<string key="NSFrameSize">{624, 363}</string>
<reference key="NSSuperview" ref="997686550"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="737075944"/>
<reference key="NSNextKeyView" ref="262664416"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<int key="NSsFlags">133680</int>
<reference key="NSVScroller" ref="1037276411"/>
@@ -491,10 +348,10 @@
<double key="NSMagnification">1</double>
</object>
</array>
<string key="NSFrameSize">{615, 480}</string>
<string key="NSFrameSize">{624, 363}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="488931024"/>
<reference key="NSNextKeyView"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSClassName">NSView</string>
</object>
@@ -517,22 +374,6 @@
</object>
<int key="connectionID">395</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">searchLabelTextField</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="238723868"/>
</object>
<int key="connectionID">437</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">statusBar</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="488931024"/>
</object>
<int key="connectionID">520</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">entryTableScrollView</string>
@@ -543,10 +384,10 @@
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">statusBarToTop</string>
<string key="label">tableToTop</string>
<reference key="source" ref="1001"/>
<object class="IBNSLayoutConstraint" key="destination" id="805657812">
<reference key="firstItem" ref="488931024"/>
<object class="IBNSLayoutConstraint" key="destination" id="858505477">
<reference key="firstItem" ref="613995671"/>
<int key="firstAttribute">3</int>
<int key="relation">0</int>
<reference key="secondItem" ref="997686550"/>
@@ -562,86 +403,7 @@
<int key="contentType">3</int>
</object>
</object>
<int key="connectionID">575</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">tableToTop</string>
<reference key="source" ref="1001"/>
<object class="IBNSLayoutConstraint" key="destination" id="317572742">
<reference key="firstItem" ref="613995671"/>
<int key="firstAttribute">3</int>
<int key="relation">0</int>
<reference key="secondItem" ref="997686550"/>
<int key="secondAttribute">3</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">30</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="997686550"/>
<int key="scoringType">9</int>
<float key="scoringTypeFloat">40</float>
<int key="contentType">3</int>
</object>
</object>
<int key="connectionID">577</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">searchTitleButton</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="486078330"/>
</object>
<int key="connectionID">605</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">searchURLButton</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="843279765"/>
</object>
<int key="connectionID">609</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">searchUsernameButton</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="128247646"/>
</object>
<int key="connectionID">610</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">toggleFilterSpace:</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="486078330"/>
</object>
<int key="connectionID">611</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">toggleFilterSpace:</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="128247646"/>
</object>
<int key="connectionID">612</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">toggleFilterSpace:</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="843279765"/>
</object>
<int key="connectionID">613</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">progressIndicator</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="545113708"/>
</object>
<int key="connectionID">626</int>
<int key="connectionID">671</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
@@ -664,7 +426,12 @@
<string key="NSContents">Table View Cell</string>
<reference key="NSSupport" ref="454123306"/>
<reference key="NSControlView" ref="306813103"/>
<reference key="NSBackgroundColor" ref="10074991"/>
<object class="NSColor" key="NSBackgroundColor" id="10074991">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlColor</string>
<reference key="NSColor" ref="1055557409"/>
</object>
<reference key="NSTextColor" ref="847395763"/>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
@@ -833,7 +600,7 @@
<object class="NSTextField" id="488604658">
<reference key="NSNextResponder" ref="954630866"/>
<int key="NSvFlags">266</int>
<string key="NSFrameSize">{128, 17}</string>
<string key="NSFrameSize">{137, 17}</string>
<reference key="NSSuperview" ref="954630866"/>
<reference key="NSNextKeyView" ref="1037276411"/>
<string key="NSAntiCompressionPriority">{250, 750}</string>
@@ -850,7 +617,7 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</array>
<string key="NSFrame">{{485, 1}, {128, 17}}</string>
<string key="NSFrame">{{485, 1}, {137, 17}}</string>
<reference key="NSNextKeyView" ref="488604658"/>
</object>
<reference key="destination" ref="488604658"/>
@@ -888,7 +655,23 @@
<int key="objectID">336</int>
<reference key="object" ref="997686550"/>
<array class="NSMutableArray" key="children">
<reference ref="317572742"/>
<reference ref="858505477"/>
<object class="IBNSLayoutConstraint" id="986749424">
<reference key="firstItem" ref="613995671"/>
<int key="firstAttribute">4</int>
<int key="relation">0</int>
<reference key="secondItem" ref="997686550"/>
<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="997686550"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="945226060">
<reference key="firstItem" ref="613995671"/>
<int key="firstAttribute">6</int>
@@ -921,266 +704,10 @@
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="67428983">
<reference key="firstItem" ref="613995671"/>
<int key="firstAttribute">4</int>
<int key="relation">0</int>
<reference key="secondItem" ref="997686550"/>
<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="997686550"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="573866726">
<reference key="firstItem" ref="488931024"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="997686550"/>
<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="997686550"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<reference ref="805657812"/>
<object class="IBNSLayoutConstraint" id="292531214">
<reference key="firstItem" ref="488931024"/>
<int key="firstAttribute">6</int>
<int key="relation">0</int>
<reference key="secondItem" ref="997686550"/>
<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="997686550"/>
<int key="scoringType">8</int>
<float key="scoringTypeFloat">29</float>
<int key="contentType">3</int>
</object>
<reference ref="613995671"/>
<reference ref="488931024"/>
</array>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">349</int>
<reference key="object" ref="488931024"/>
<array class="NSMutableArray" key="children">
<object class="IBNSLayoutConstraint" id="525834995">
<reference key="firstItem" ref="545113708"/>
<int key="firstAttribute">3</int>
<int key="relation">0</int>
<reference key="secondItem" ref="843279765"/>
<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="488931024"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="573562865">
<reference key="firstItem" ref="488931024"/>
<int key="firstAttribute">6</int>
<int key="relation">0</int>
<reference key="secondItem" ref="545113708"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">6</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="488931024"/>
<int key="scoringType">3</int>
<float key="scoringTypeFloat">9</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="568004410">
<reference key="firstItem" ref="843279765"/>
<int key="firstAttribute">11</int>
<int key="relation">0</int>
<reference key="secondItem" ref="128247646"/>
<int key="secondAttribute">11</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="488931024"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="381879542">
<reference key="firstItem" ref="843279765"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="128247646"/>
<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="488931024"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="616715528">
<reference key="firstItem" ref="128247646"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="486078330"/>
<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="488931024"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="582205783">
<reference key="firstItem" ref="128247646"/>
<int key="firstAttribute">11</int>
<int key="relation">0</int>
<reference key="secondItem" ref="486078330"/>
<int key="secondAttribute">11</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="488931024"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="785089475">
<reference key="firstItem" ref="486078330"/>
<int key="firstAttribute">11</int>
<int key="relation">0</int>
<reference key="secondItem" ref="238723868"/>
<int key="secondAttribute">11</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="488931024"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="597009469">
<reference key="firstItem" ref="486078330"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="238723868"/>
<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="488931024"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="354263880">
<reference key="firstItem" ref="238723868"/>
<int key="firstAttribute">10</int>
<int key="relation">0</int>
<reference key="secondItem" ref="488931024"/>
<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="488931024"/>
<int key="scoringType">5</int>
<float key="scoringTypeFloat">22</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="906997605">
<reference key="firstItem" ref="238723868"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="488931024"/>
<int key="secondAttribute">5</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">10</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="488931024"/>
<int key="scoringType">9</int>
<float key="scoringTypeFloat">40</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="471309934">
<reference key="firstItem" ref="488931024"/>
<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">30</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="488931024"/>
<int key="scoringType">9</int>
<float key="scoringTypeFloat">40</float>
<int key="contentType">1</int>
</object>
<reference ref="238723868"/>
<reference ref="486078330"/>
<reference ref="128247646"/>
<reference ref="843279765"/>
<reference ref="545113708"/>
</array>
<reference key="parent" ref="997686550"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">357</int>
<reference key="object" ref="292531214"/>
<reference key="parent" ref="997686550"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">370</int>
<reference key="object" ref="238723868"/>
<array class="NSMutableArray" key="children">
<reference ref="9066510"/>
</array>
<reference key="parent" ref="488931024"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">371</int>
<reference key="object" ref="9066510"/>
<reference key="parent" ref="238723868"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">54</int>
<reference key="object" ref="613995671"/>
@@ -1558,11 +1085,6 @@
<reference key="object" ref="1037276411"/>
<reference key="parent" ref="613995671"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">418</int>
<reference key="object" ref="471309934"/>
<reference key="parent" ref="488931024"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">419</int>
<reference key="object" ref="956759754"/>
@@ -1745,105 +1267,6 @@
<reference key="object" ref="536648739"/>
<reference key="parent" ref="878614701"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">442</int>
<reference key="object" ref="486078330"/>
<array class="NSMutableArray" key="children">
<reference ref="917963484"/>
</array>
<reference key="parent" ref="488931024"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">443</int>
<reference key="object" ref="917963484"/>
<reference key="parent" ref="486078330"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">478</int>
<reference key="object" ref="906997605"/>
<reference key="parent" ref="488931024"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">484</int>
<reference key="object" ref="597009469"/>
<reference key="parent" ref="488931024"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">344</int>
<reference key="object" ref="67428983"/>
<reference key="parent" ref="997686550"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">576</int>
<reference key="object" ref="573866726"/>
<reference key="parent" ref="997686550"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">572</int>
<reference key="object" ref="317572742"/>
<reference key="parent" ref="997686550"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">561</int>
<reference key="object" ref="805657812"/>
<reference key="parent" ref="997686550"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">581</int>
<reference key="object" ref="354263880"/>
<reference key="parent" ref="488931024"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">582</int>
<reference key="object" ref="785089475"/>
<reference key="parent" ref="488931024"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">594</int>
<reference key="object" ref="128247646"/>
<array class="NSMutableArray" key="children">
<reference ref="822877443"/>
</array>
<reference key="parent" ref="488931024"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">595</int>
<reference key="object" ref="822877443"/>
<reference key="parent" ref="128247646"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">597</int>
<reference key="object" ref="582205783"/>
<reference key="parent" ref="488931024"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">598</int>
<reference key="object" ref="616715528"/>
<reference key="parent" ref="488931024"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">599</int>
<reference key="object" ref="843279765"/>
<array class="NSMutableArray" key="children">
<reference ref="636015412"/>
</array>
<reference key="parent" ref="488931024"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">600</int>
<reference key="object" ref="636015412"/>
<reference key="parent" ref="843279765"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">601</int>
<reference key="object" ref="381879542"/>
<reference key="parent" ref="488931024"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">602</int>
<reference key="object" ref="568004410"/>
<reference key="parent" ref="488931024"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">614</int>
<reference key="object" ref="683421605"/>
@@ -1943,19 +1366,14 @@
<reference key="parent" ref="954630866"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">623</int>
<reference key="object" ref="545113708"/>
<reference key="parent" ref="488931024"/>
<int key="objectID">666</int>
<reference key="object" ref="986749424"/>
<reference key="parent" ref="997686550"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">624</int>
<reference key="object" ref="573562865"/>
<reference key="parent" ref="488931024"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">625</int>
<reference key="object" ref="525834995"/>
<reference key="parent" ref="488931024"/>
<int key="objectID">670</int>
<reference key="object" ref="858505477"/>
<reference key="parent" ref="997686550"/>
</object>
</array>
</object>
@@ -2022,47 +1440,16 @@
<string key="328.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="329.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="330.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array key="336.IBNSViewMetadataConstraints">
<reference ref="292531214"/>
<reference ref="805657812"/>
<reference ref="573866726"/>
<reference ref="67428983"/>
<array class="NSMutableArray" key="336.IBNSViewMetadataConstraints">
<reference ref="647884172"/>
<reference ref="945226060"/>
<reference ref="317572742"/>
<reference ref="986749424"/>
<reference ref="858505477"/>
</array>
<boolean value="YES" key="336.IBNSViewMetadataLastInspectedTranslatesAutoresizingMaskIntoConstraints"/>
<string key="336.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="344.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="346.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="348.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array key="349.IBNSViewMetadataConstraints">
<reference ref="471309934"/>
<reference ref="906997605"/>
<reference ref="354263880"/>
<reference ref="597009469"/>
<reference ref="785089475"/>
<reference ref="582205783"/>
<reference ref="616715528"/>
<reference ref="381879542"/>
<reference ref="568004410"/>
<reference ref="573562865"/>
<reference ref="525834995"/>
</array>
<boolean value="NO" key="349.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="349.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="357.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="370.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="370.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<real value="0.0" key="370.IBViewIntegration.shadowBlurRadius"/>
<object class="NSColor" key="370.IBViewIntegration.shadowColor">
<int key="NSColorSpace">1</int>
<bytes key="NSRGB">MSAxIDEAA</bytes>
</object>
<real value="1" key="370.IBViewIntegration.shadowOffsetHeight"/>
<real value="0.0" key="370.IBViewIntegration.shadowOffsetWidth"/>
<string key="371.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="418.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="419.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES" key="419.isInViewBasedMode"/>
<array key="419.prototypeCellViews">
@@ -2095,33 +1482,13 @@
<string key="432.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="433.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="434.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="442.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="442.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="443.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="478.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="484.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="54.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="54.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="55.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES" key="55.ibExternalAutomaticallyCalculatesRowSizeFromViewHeight"/>
<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="561.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="572.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="576.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="581.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="582.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="594.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="594.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="595.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="597.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="598.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="599.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="599.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="600.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="601.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="602.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="614.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="YES" key="614.isInViewBasedMode"/>
<array key="614.prototypeCellViews">
@@ -2140,16 +1507,14 @@
<string key="620.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="621.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="622.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="623.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="623.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="624.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="625.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="666.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="670.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">626</int>
<int key="maxID">671</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -2169,13 +1534,11 @@
</object>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="entryTable">NSTableView</string>
<string key="progressIndicator">NSProgressIndicator</string>
<string key="filterBar">NSView</string>
<string key="searchLabelTextField">NSTextField</string>
<string key="searchTitleButton">NSButton</string>
<string key="searchURLButton">NSButton</string>
<string key="searchUsernameButton">NSButton</string>
<string key="statusBar">NSView</string>
<string key="statusBarToTop">NSLayoutConstraint</string>
<string key="tableToTop">NSLayoutConstraint</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
@@ -2183,9 +1546,9 @@
<string key="name">entryTable</string>
<string key="candidateClassName">NSTableView</string>
</object>
<object class="IBToOneOutletInfo" key="progressIndicator">
<string key="name">progressIndicator</string>
<string key="candidateClassName">NSProgressIndicator</string>
<object class="IBToOneOutletInfo" key="filterBar">
<string key="name">filterBar</string>
<string key="candidateClassName">NSView</string>
</object>
<object class="IBToOneOutletInfo" key="searchLabelTextField">
<string key="name">searchLabelTextField</string>
@@ -2203,14 +1566,6 @@
<string key="name">searchUsernameButton</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo" key="statusBar">
<string key="name">statusBar</string>
<string key="candidateClassName">NSView</string>
</object>
<object class="IBToOneOutletInfo" key="statusBarToTop">
<string key="name">statusBarToTop</string>
<string key="candidateClassName">NSLayoutConstraint</string>
</object>
<object class="IBToOneOutletInfo" key="tableToTop">
<string key="name">tableToTop</string>
<string key="candidateClassName">NSLayoutConstraint</string>
@@ -2221,14 +1576,6 @@
<string key="minorKey">./Classes/MPEntryViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">MPGradientView</string>
<string key="superclassName">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/MPGradientView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">MPViewController</string>
<string key="superclassName">NSViewController</string>

622
MacPass/FilterBar.xib Normal file
View File

@@ -0,0 +1,622 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1080</int>
<string key="IBDocument.SystemVersion">12C60</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.34</string>
<string key="IBDocument.HIToolboxVersion">625.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">3084</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>IBNSLayoutConstraint</string>
<string>NSButton</string>
<string>NSButtonCell</string>
<string>NSCustomObject</string>
<string>NSCustomView</string>
<string>NSTextField</string>
<string>NSTextFieldCell</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
</array>
<object class="NSMutableDictionary" key="IBDocument.Metadata">
<string key="NS.key.0">PluginDependencyRecalculationVersion</string>
<integer value="1" key="NS.object.0"/>
</object>
<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
<object class="NSCustomObject" id="1001">
<string key="NSClassName">MPEntryViewController</string>
</object>
<object class="NSCustomObject" id="1003">
<string key="NSClassName">FirstResponder</string>
</object>
<object class="NSCustomObject" id="1004">
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSCustomView" id="1005">
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSButton" id="340435610">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{188, 6}, {38, 17}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="149174717">
<int key="NSCellFlags">-2080374784</int>
<int key="NSCellFlags2">134348800</int>
<string key="NSContents">URL</string>
<object class="NSFont" key="NSSupport" id="29">
<string key="NSName">LucidaGrande-Bold</string>
<double key="NSSize">12</double>
<int key="NSfFlags">16</int>
</object>
<string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="340435610"/>
<int key="NSButtonFlags">-1232846848</int>
<int key="NSButtonFlags2">173</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="902262560">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{104, 6}, {76, 17}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="340435610"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="397857591">
<int key="NSCellFlags">-2080374784</int>
<int key="NSCellFlags2">134348800</int>
<string key="NSContents">Username</string>
<reference key="NSSupport" ref="29"/>
<string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="902262560"/>
<int key="NSButtonFlags">-1232846848</int>
<int key="NSButtonFlags2">173</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSTextField" id="906526407">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{5, 7}, {44, 14}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="7073340"/>
<string key="NSReuseIdentifierKey">_NS:1535</string>
<bool key="NSEnabled">YES</bool>
<object class="NSTextFieldCell" key="NSCell" id="169652421">
<int key="NSCellFlags">68157504</int>
<int key="NSCellFlags2">272761856</int>
<string key="NSContents">Search:</string>
<object class="NSFont" key="NSSupport">
<string key="NSName">LucidaGrande-Bold</string>
<double key="NSSize">11</double>
<int key="NSfFlags">3357</int>
</object>
<string key="NSCellIdentifier">_NS:1535</string>
<reference key="NSControlView" ref="906526407"/>
<object class="NSColor" key="NSBackgroundColor">
<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">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">disabledControlTextColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MC4zMzMzMzMzMzMzAA</bytes>
</object>
</object>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="7073340">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{54, 5}, {42, 17}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="902262560"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSButtonCell" key="NSCell" id="819315342">
<int key="NSCellFlags">-2080374784</int>
<int key="NSCellFlags2">134348800</int>
<string key="NSContents">Title</string>
<reference key="NSSupport" ref="29"/>
<string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="7073340"/>
<int key="NSButtonFlags">-1232846848</int>
<int key="NSButtonFlags2">173</int>
<string key="NSAlternateContents"/>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</array>
<string key="NSFrameSize">{483, 28}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="906526407"/>
<string key="NSClassName">MPGradientView</string>
</object>
</array>
<object class="IBObjectContainer" key="IBDocument.Objects">
<array class="NSMutableArray" key="connectionRecords">
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">searchTitleButton</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="7073340"/>
</object>
<int key="connectionID">45</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">searchUsernameButton</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="902262560"/>
</object>
<int key="connectionID">46</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">searchURLButton</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="340435610"/>
</object>
<int key="connectionID">47</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">filterBar</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="1005"/>
</object>
<int key="connectionID">48</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">toggleFilterSpace:</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="7073340"/>
</object>
<int key="connectionID">49</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">toggleFilterSpace:</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="902262560"/>
</object>
<int key="connectionID">50</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">toggleFilterSpace:</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="340435610"/>
</object>
<int key="connectionID">51</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
<object class="IBObjectRecord">
<int key="objectID">0</int>
<array key="object" id="0"/>
<reference key="children" ref="1000"/>
<nil key="parent"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">-2</int>
<reference key="object" ref="1001"/>
<reference key="parent" ref="0"/>
<string key="objectName">File's Owner</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-1</int>
<reference key="object" ref="1003"/>
<reference key="parent" ref="0"/>
<string key="objectName">First Responder</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">-3</int>
<reference key="object" ref="1004"/>
<reference key="parent" ref="0"/>
<string key="objectName">Application</string>
</object>
<object class="IBObjectRecord">
<int key="objectID">1</int>
<reference key="object" ref="1005"/>
<array class="NSMutableArray" key="children">
<object class="IBNSLayoutConstraint" id="112675040">
<reference key="firstItem" ref="340435610"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="902262560"/>
<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="1005"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="571622266">
<reference key="firstItem" ref="340435610"/>
<int key="firstAttribute">11</int>
<int key="relation">0</int>
<reference key="secondItem" ref="902262560"/>
<int key="secondAttribute">11</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="1005"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="588405863">
<reference key="firstItem" ref="902262560"/>
<int key="firstAttribute">4</int>
<int key="relation">0</int>
<reference key="secondItem" ref="906526407"/>
<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="1005"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="1039511012">
<reference key="firstItem" ref="902262560"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="7073340"/>
<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="1005"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="181006535">
<reference key="firstItem" ref="7073340"/>
<int key="firstAttribute">5</int>
<int key="relation">0</int>
<reference key="secondItem" ref="906526407"/>
<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="1005"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="674050366">
<reference key="firstItem" ref="906526407"/>
<int key="firstAttribute">10</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1005"/>
<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="1005"/>
<int key="scoringType">5</int>
<float key="scoringTypeFloat">22</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="201173489">
<reference key="firstItem" ref="906526407"/>
<int key="firstAttribute">11</int>
<int key="relation">0</int>
<reference key="secondItem" ref="7073340"/>
<int key="secondAttribute">11</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="1005"/>
<int key="scoringType">6</int>
<float key="scoringTypeFloat">24</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="777287174">
<reference key="firstItem" ref="906526407"/>
<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="IBLayoutConstant" key="constant">
<double key="value">8</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="1005"/>
<int key="scoringType">3</int>
<float key="scoringTypeFloat">9</float>
<int key="contentType">3</int>
</object>
<reference ref="7073340"/>
<reference ref="906526407"/>
<reference ref="902262560"/>
<reference ref="340435610"/>
</array>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">2</int>
<reference key="object" ref="7073340"/>
<array class="NSMutableArray" key="children">
<reference ref="819315342"/>
</array>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">3</int>
<reference key="object" ref="819315342"/>
<reference key="parent" ref="7073340"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">6</int>
<reference key="object" ref="906526407"/>
<array class="NSMutableArray" key="children">
<reference ref="169652421"/>
</array>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">7</int>
<reference key="object" ref="169652421"/>
<reference key="parent" ref="906526407"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">30</int>
<reference key="object" ref="777287174"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">32</int>
<reference key="object" ref="181006535"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">34</int>
<reference key="object" ref="201173489"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">35</int>
<reference key="object" ref="902262560"/>
<array class="NSMutableArray" key="children">
<reference ref="397857591"/>
</array>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">36</int>
<reference key="object" ref="397857591"/>
<reference key="parent" ref="902262560"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">38</int>
<reference key="object" ref="1039511012"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">39</int>
<reference key="object" ref="588405863"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">40</int>
<reference key="object" ref="340435610"/>
<array class="NSMutableArray" key="children">
<reference ref="149174717"/>
</array>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">41</int>
<reference key="object" ref="149174717"/>
<reference key="parent" ref="340435610"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">42</int>
<reference key="object" ref="571622266"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">43</int>
<reference key="object" ref="112675040"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">44</int>
<reference key="object" ref="674050366"/>
<reference key="parent" ref="1005"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
<string key="-1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<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="777287174"/>
<reference ref="201173489"/>
<reference ref="674050366"/>
<reference ref="181006535"/>
<reference ref="1039511012"/>
<reference ref="588405863"/>
<reference ref="571622266"/>
<reference ref="112675040"/>
</array>
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="2.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="2.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="3.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="30.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="32.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="34.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="35.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="35.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="36.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="38.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="39.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="40.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="40.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="41.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="42.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="43.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="44.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="6.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="6.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="7.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">51</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">MPEntryViewController</string>
<string key="superclassName">MPViewController</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">toggleFilterSpace:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">toggleFilterSpace:</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">toggleFilterSpace:</string>
<string key="candidateClassName">id</string>
</object>
</object>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="entryTable">NSTableView</string>
<string key="filterBar">NSView</string>
<string key="searchLabelTextField">NSTextField</string>
<string key="searchTitleButton">NSButton</string>
<string key="searchURLButton">NSButton</string>
<string key="searchUsernameButton">NSButton</string>
<string key="tableToTop">NSLayoutConstraint</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="entryTable">
<string key="name">entryTable</string>
<string key="candidateClassName">NSTableView</string>
</object>
<object class="IBToOneOutletInfo" key="filterBar">
<string key="name">filterBar</string>
<string key="candidateClassName">NSView</string>
</object>
<object class="IBToOneOutletInfo" key="searchLabelTextField">
<string key="name">searchLabelTextField</string>
<string key="candidateClassName">NSTextField</string>
</object>
<object class="IBToOneOutletInfo" key="searchTitleButton">
<string key="name">searchTitleButton</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo" key="searchURLButton">
<string key="name">searchURLButton</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo" key="searchUsernameButton">
<string key="name">searchUsernameButton</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo" key="tableToTop">
<string key="name">tableToTop</string>
<string key="candidateClassName">NSLayoutConstraint</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/MPEntryViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">MPGradientView</string>
<string key="superclassName">NSView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/MPGradientView.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">MPViewController</string>
<string key="superclassName">NSViewController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/MPViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSLayoutConstraint</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
</object>
</object>
</array>
</object>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>
<int key="IBDocument.defaultPropertyAccessControl">3</int>
<bool key="IBDocument.UseAutolayout">YES</bool>
</data>
</archive>

View File

@@ -18,7 +18,6 @@
<string>NSMenuItem</string>
<string>NSPopUpButton</string>
<string>NSPopUpButtonCell</string>
<string>NSProgressIndicator</string>
<string>NSTextField</string>
<string>NSTextFieldCell</string>
</array>
@@ -43,21 +42,12 @@
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSProgressIndicator" id="50535275">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{129, 93}, {32, 32}}</string>
<reference key="NSSuperview" ref="1005"/>
<string key="NSReuseIdentifierKey">_NS:945</string>
<int key="NSpiFlags">20490</int>
<double key="NSMaxValue">100</double>
</object>
<object class="NSPopUpButton" id="421904700">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{146, 174}, {127, 26}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSNextKeyView"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<string key="NSAntiCompressionPriority">{750, 751}</string>
<bool key="NSEnabled">YES</bool>
@@ -137,6 +127,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{17, 180}, {127, 17}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="421904700"/>
<string key="NSReuseIdentifierKey">_NS:1505</string>
<bool key="NSEnabled">YES</bool>
@@ -171,6 +162,7 @@
</array>
<string key="NSFrameSize">{290, 218}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="637214120"/>
<string key="NSClassName">NSView</string>
</object>
@@ -193,14 +185,6 @@
</object>
<int key="connectionID">83</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">spinner</string>
<reference key="source" ref="1001"/>
<reference key="destination" ref="50535275"/>
</object>
<int key="connectionID">174</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
@@ -234,38 +218,6 @@
<array class="NSMutableArray" key="children">
<reference ref="421904700"/>
<reference ref="637214120"/>
<object class="IBNSLayoutConstraint" id="946623256">
<reference key="firstItem" ref="50535275"/>
<int key="firstAttribute">10</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1005"/>
<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="1005"/>
<int key="scoringType">5</int>
<float key="scoringTypeFloat">22</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="113642326">
<reference key="firstItem" ref="50535275"/>
<int key="firstAttribute">9</int>
<int key="relation">0</int>
<reference key="secondItem" ref="1005"/>
<int key="secondAttribute">9</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="1005"/>
<int key="scoringType">5</int>
<float key="scoringTypeFloat">22</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="835508122">
<reference key="firstItem" ref="421904700"/>
<int key="firstAttribute">11</int>
@@ -394,7 +346,6 @@
<float key="scoringTypeFloat">40</float>
<int key="contentType">3</int>
</object>
<reference ref="50535275"/>
</array>
<reference key="parent" ref="0"/>
</object>
@@ -492,21 +443,6 @@
<reference key="object" ref="835508122"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">155</int>
<reference key="object" ref="50535275"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">168</int>
<reference key="object" ref="946623256"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">167</int>
<reference key="object" ref="113642326"/>
<reference key="parent" ref="1005"/>
</object>
</array>
</object>
<dictionary class="NSMutableDictionary" key="flattenedProperties">
@@ -522,8 +458,6 @@
<reference ref="850330857"/>
<reference ref="215335887"/>
<reference ref="835508122"/>
<reference ref="113642326"/>
<reference ref="946623256"/>
</array>
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="124.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -533,11 +467,7 @@
<boolean value="NO" key="14.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="14.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="15.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="155.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="155.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="16.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="167.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="168.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="17.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="18.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="19.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -553,9 +483,50 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">174</int>
<int key="maxID">338</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">MPGeneralSettingsController</string>
<string key="superclassName">MPViewController</string>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="encodingPopup">NSPopUpButton</string>
<string key="imageView">NSImageView</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="encodingPopup">
<string key="name">encodingPopup</string>
<string key="candidateClassName">NSPopUpButton</string>
</object>
<object class="IBToOneOutletInfo" key="imageView">
<string key="name">imageView</string>
<string key="candidateClassName">NSImageView</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/MPGeneralSettingsController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">MPViewController</string>
<string key="superclassName">NSViewController</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/MPViewController.h</string>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">NSLayoutConstraint</string>
<string key="superclassName">NSObject</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/NSLayoutConstraint.h</string>
</object>
</object>
</array>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes"/>
<int key="IBDocument.localizationMode">0</int>
<string key="IBDocument.TargetRuntimeIdentifier">IBCocoaFramework</string>
<bool key="IBDocument.PluginDeclaredDependenciesTrackSystemTargetVersion">YES</bool>

View File

@@ -28,6 +28,11 @@
[self.mainWindowController showWindow:[self.mainWindowController window]];
}
- (void)dealloc {
self.settingsController = nil;
self.mainWindowController = nil;
}
#pragma mark Menu Actions
- (void)showMainWindow:(id)sender {

View File

@@ -40,6 +40,11 @@ NSString *const MPDatabaseControllerDatabaseKey = @"MPDatabaseControllerDatabase
return self;
}
- (void)dealloc {
self.database = nil;
[super dealloc];
}
- (MPDatabaseDocument *)createDatabase:(MPDatabaseVersion)version password:(NSString *)password keyfile:(NSURL *)key {
return self.database;
}

View File

@@ -21,7 +21,7 @@ typedef enum {
@interface MPDatabaseDocument : NSObject
@property (retain, readonly) KdbGroup *root;
@property (assign, readonly) KdbGroup *root;
@property (retain, readonly) NSURL *file;
@property (nonatomic,retain) NSString *password;
@property (nonatomic, retain) NSURL *key;

View File

@@ -91,6 +91,7 @@ NSString *const MPDidLoadDataBaseNotification = @"DidLoadDataBaseNotification";
self.tree = nil;
self.file = nil;
self.password = nil;
self.key = nil;
[super dealloc];
}

View File

@@ -24,4 +24,7 @@ APPKIT_EXTERN NSString *const MPEntryTableURLColumnIdentifier;
@property (readonly, retain) NSArrayController *entryArrayController;
@property (nonatomic, retain) NSString *filter;
/* Clear the Search filter*/
- (void)clearFilter;
@end

View File

@@ -42,13 +42,11 @@ NSString *const _toggleSearchUsernameButton = @"SearchUsername";
@property (retain) NSArrayController *entryArrayController;
@property (retain) NSArray *filteredEntries;
@property (retain) IBOutlet NSView *filterBar;
@property (assign) IBOutlet NSTableView *entryTable;
@property (assign) IBOutlet NSView *statusBar;
@property (assign) IBOutlet NSTextField *searchLabelTextField;
@property (assign) BOOL isStatusBarVisible;
@property (retain) IBOutlet NSLayoutConstraint *statusBarToTop;
@property (retain) IBOutlet NSLayoutConstraint *tableToTop;
@property (assign) IBOutlet NSProgressIndicator *progressIndicator;
@property (assign) IBOutlet NSButton *searchTitleButton;
@property (assign) IBOutlet NSButton *searchUsernameButton;
@@ -65,8 +63,9 @@ NSString *const _toggleSearchUsernameButton = @"SearchUsername";
- (BOOL)hasFilter;
- (void)updateFilter;
- (void)setupFilterBar;
- (void)didChangeGroupSelectionInOutlineView:(NSNotification *)notification;
- (void)showStatusBarAnimated:(BOOL)animate;
- (void)showFilterBarAnimated:(BOOL)animate;
- (void)hideStatusBarAnimated:(BOOL)animate;
@end
@@ -96,15 +95,20 @@ NSString *const _toggleSearchUsernameButton = @"SearchUsername";
return self;
}
- (void)dealloc {
self.entryArrayController = nil;
self.filteredEntries = nil;
self.filterBar = nil;
self.tableToTop = nil;
self.filterButtonToMode = nil;
[super dealloc];
}
- (void)didLoadView {
[self.view setWantsLayer:YES];
[self hideStatusBarAnimated:NO];
[[self.searchLabelTextField cell] setBackgroundStyle:NSBackgroundStyleRaised];
[self.searchURLButton setIdentifier:_toggleSearchURLButton];
[self.searchUsernameButton setIdentifier:_toggleSearchUsernameButton];
[self.searchTitleButton setIdentifier:_toggleSearchTitleButton];
[self.entryTable setDelegate:self];
NSTableColumn *parentColumn = [self.entryTable tableColumns][0];
@@ -172,8 +176,10 @@ NSString *const _toggleSearchUsernameButton = @"SearchUsername";
#pragma mark Notifications
- (void)didChangeGroupSelectionInOutlineView:(NSNotification *)notification {
self.filter = @""; // will update the reast automatically
if([self hasFilter]) {
return;
}
[self clearFilter];
MPOutlineViewDelegate *delegate = [notification object];
KdbGroup *group = delegate.selectedGroup;
if(group) {
@@ -198,11 +204,16 @@ NSString *const _toggleSearchUsernameButton = @"SearchUsername";
}
}
- (void)clearFilter {
self.filter = nil;
[[self.entryTable tableColumnWithIdentifier:MPEntryTableParentColumnIdentifier] setHidden:YES];
[self hideStatusBarAnimated:YES];
}
- (void)updateFilter {
MPDatabaseDocument *openDatabase = [MPDatabaseController defaultController].database;
if(openDatabase && [self hasFilter]) {
[self showStatusBarAnimated:YES];
if(openDatabase) {
[self showFilterBarAnimated:YES];
dispatch_queue_t backgroundQueue = dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0);
dispatch_async(backgroundQueue, ^{
@@ -229,26 +240,47 @@ NSString *const _toggleSearchUsernameButton = @"SearchUsername";
else {
[self.entryArrayController setContent:nil];
self.filteredEntries = nil;
[[self.entryTable tableColumnWithIdentifier:MPEntryTableParentColumnIdentifier] setHidden:YES];
[self hideStatusBarAnimated:YES];
}
}
- (void)setupFilterBar {
if(!self.filterBar) {
[[NSBundle mainBundle] loadNibNamed:@"FilterBar" owner:self topLevelObjects:nil];
[self.filterBar setAutoresizingMask:NSViewWidthSizable|NSViewMinYMargin];
[self.searchURLButton setIdentifier:_toggleSearchURLButton];
[self.searchUsernameButton setIdentifier:_toggleSearchUsernameButton];
[self.searchTitleButton setIdentifier:_toggleSearchTitleButton];
}
}
#pragma mark Animation
- (void)showStatusBarAnimated:(BOOL)animate {
- (void)showFilterBarAnimated:(BOOL)animate {
animate = NO;
if(!self.filterBar) {
[self setupFilterBar];
}
/*
Make sure the buttons are set correctyl every time
*/
[self.searchTitleButton setState:[self shouldFilterTitles] ? NSOnState : NSOffState];
[self.searchURLButton setState:[self shouldFilterURLs] ? NSOnState : NSOffState ];
[self.searchUsernameButton setState:[self shouldFilterUsernames] ? NSOnState : NSOffState];
if(self.isStatusBarVisible) {
return; // nothign to to
}
[self.searchTitleButton setState:[self shouldFilterTitles] ? NSOnState : NSOffState];
[self.searchURLButton setState:[self shouldFilterURLs] ? NSOnState : NSOffState ];
[self.searchUsernameButton setState:[self shouldFilterUsernames] ? NSOnState : NSOffState];
self.isStatusBarVisible = YES;
self.statusBarToTop.constant = 0;
self.tableToTop.constant = [self.statusBar frame].size.height;
self.tableToTop.constant = [self.filterBar frame].size.height;
[self.view addSubview:self.filterBar];
NSRect filterFrame = [self.filterBar frame];
filterFrame.origin.y = [self.view frame].size.height - filterFrame.size.height;
filterFrame.size.width = [self.view frame].size.width;
[self.filterBar setFrame:filterFrame];
if(animate) {
[NSAnimationContext runAnimationGroup:^(NSAnimationContext* context) {
@@ -264,13 +296,15 @@ NSString *const _toggleSearchUsernameButton = @"SearchUsername";
- (void)hideStatusBarAnimated:(BOOL)animate {
animate = NO;
if(!self.isStatusBarVisible) {
return; // nothing to do;
}
self.isStatusBarVisible = NO;
self.statusBarToTop.constant = -[self.statusBar frame].size.height;
self.tableToTop.constant = -1;
[self.filterBar removeFromSuperview];
if(animate) {
[NSAnimationContext runAnimationGroup:^(NSAnimationContext* context) {
@@ -302,10 +336,14 @@ NSString *const _toggleSearchUsernameButton = @"SearchUsername";
default:
break;
}
}
- (void)setFilterMode:(MPFilterModeType)newFilterMode {
if(_filterMode != newFilterMode) {
if(newFilterMode == MPFilterNone) {
newFilterMode = MPFilterTitles;
}
_filterMode = newFilterMode;
[self updateFilter];
}

View File

@@ -11,6 +11,6 @@
#import "MPViewController.h"
@interface MPGeneralSettingsController : MPViewController <MPSettingsTabProtocoll>
@property (assign) IBOutlet NSProgressIndicator *spinner;
@property (assign) IBOutlet NSImageView *imageView;
@end

View File

@@ -29,8 +29,7 @@ NSString *const MPGeneralSetingsIdentifier = @"GeneralSettingsTab";
return [self initWithNibName:@"GeneralSettings" bundle:[NSBundle mainBundle]];
}
- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil
{
- (id)initWithNibName:(NSString *)nibNameOrNil bundle:(NSBundle *)nibBundleOrNil {
self = [super initWithNibName:nibNameOrNil bundle:nibBundleOrNil];
return self;
}
@@ -39,7 +38,7 @@ NSString *const MPGeneralSetingsIdentifier = @"GeneralSettingsTab";
// setup connections
NSMenu *encodingMenu = [[NSMenu allocWithZone:[NSMenu menuZone]] init];
NSMenuItem *item;
item = [[NSMenuItem allocWithZone:[NSMenu menuZone]] initWithTitle:@"UTF8 Encoding" action:NULL keyEquivalent:@""];
[item setRepresentedObject:[NSNumber numberWithInt:NSUTF8StringEncoding]];
[encodingMenu addItem:item];

View File

@@ -39,6 +39,12 @@
return self;
}
- (void)dealloc {
self.activeGradient = nil;
self.inactiveGradient = nil;
[super dealloc];
}
#pragma mark Drawing
- (void)drawRect:(NSRect)dirtyRect {
@@ -49,6 +55,10 @@
[gradient drawInRect:self.bounds angle:90];
}
- (BOOL)isOpaque {
return YES;
}
#pragma mark State Refresh
- (void)_registerWindow:(NSWindow *)newWindow {
if([self window]) {

View File

@@ -58,6 +58,16 @@
- (void)dealloc {
[[NSNotificationCenter defaultCenter] removeObserver:self];
self.welcomeView = nil;
self.welcomeText = nil;
self.toolbar = nil;
self.passwordInputController = nil;
self.entryViewController = nil;
self.outlineViewController = nil;
self.toolbarDelegate = nil;
self.splitViewDelegate = nil;
[super dealloc];
}
@@ -172,8 +182,10 @@
self.entryViewController.filter = [searchField stringValue];
}
- (void)cancelFilter:(id)sender {
NSLog(@"Whooo");
- (void)clearFilter:(id)sender {
NSSearchField *searchField = sender;
[searchField setStringValue:@""];
[self.entryViewController clearFilter];
}
#pragma mark Notifications

View File

@@ -52,6 +52,9 @@
- (void)dealloc
{
[[NSNotificationCenter defaultCenter] removeObserver:self];
self.datasource = nil;
self.outlineDelegate = nil;
self.menu = nil;
[super dealloc];
}

View File

@@ -25,6 +25,11 @@
return [[MPPasswordInputController alloc] initWithNibName:@"PasswordInputView" bundle:nil];
}
- (void)dealloc {
self.fileURL = nil;
[super dealloc];
}
- (NSResponder *)reconmendedFirstResponder {
return self.passwordTextField;
}

32
MacPass/MPPathBar.h Normal file
View File

@@ -0,0 +1,32 @@
//
// MPPathBar.h
// MacPass
//
// Created by michael starke on 22.02.13.
// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
//
#import "MPGradientView.h"
@class MPPathBar;
/*
Delegate protocoll
*/
@protocol MPPathBarDelegateProtocoll <NSObject>
@required
- (NSUInteger)numberOfItemsInPathBar:(MPPathBar *)pathBar;
- (NSString *)pathbar:(MPPathBar *)pathbar stringAtIndex:(NSUInteger)index;
@optional
- (NSImage *)pathbar:(MPPathBar *)pathbar imageAtIndex:(NSUInteger)index;
@end
@interface MPPathBar : MPGradientView
@property (assign, nonatomic) id<MPPathBarDelegateProtocoll> delegate;
@end

92
MacPass/MPPathBar.m Normal file
View File

@@ -0,0 +1,92 @@
//
// MPPathBar.m
// MacPass
//
// Created by michael starke on 22.02.13.
// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
//
#import "MPPathBar.h"
#import "MPPathBarItemView.h"
#define INTER_BUTTON_SPACING 5.0
@interface MPPathBar ()
@property (retain) NSMutableArray *itemViews;
@property (assign) BOOL delegateSupportsImage;
- (void)update;
- (void)createViews;
- (MPPathBarItemView *)viewForIndex:(NSUInteger)index;
@end
@implementation MPPathBar
- (id)initWithFrame:(NSRect)frame activeGradient:(NSGradient *)activeGradient inactiveGradient:(NSGradient *)inactiveGradient {
self = [super initWithFrame:frame activeGradient:activeGradient inactiveGradient:inactiveGradient];
if(self) {
_itemViews = [[NSMutableArray alloc] initWithCapacity:5];
_delegateSupportsImage = NO;
[self createViews];
}
return self;
}
- (void)dealloc {
self.itemViews = nil;
[super dealloc];
}
- (void)drawRect:(NSRect)dirtyRect {
[super drawRect:dirtyRect];
[self update];
}
- (void)createViews {
NSUInteger items = 5;//[self.delegate numberOfItemsInPathBar:self];
CGFloat startPosition = 0;
for (NSUInteger iIndex = 0; iIndex < items; iIndex++) {
MPPathBarItemView *textField = [self viewForIndex:iIndex];
[textField setFrame:NSMakeRect(startPosition, 0, 20, 20)];
[self addSubview:textField];
}
[self update];
}
- (void)update {
CGFloat startPosition = 0;
for(MPPathBarItemView *view in self.itemViews) {
[view sizeToFit];
NSRect newFrame = [view frame];
newFrame.origin.x = startPosition;
[view setFrame:newFrame];
startPosition += newFrame.size.width + INTER_BUTTON_SPACING;
}
}
- (void)setDelegate:(id<MPPathBarDelegateProtocoll>)delegate {
if(_delegate != delegate) {
_delegate = delegate;
self.delegateSupportsImage = [_delegate respondsToSelector:@selector(pathbar:imageAtIndex:)];
[self update];
}
}
- (MPPathBarItemView *)viewForIndex:(NSUInteger)index {
MPPathBarItemView *itemView = nil;
if([self.itemViews count] > index) {
itemView = self.itemViews[index];
}
if(!itemView) {
itemView = [[MPPathBarItemView alloc] initWithFrame:NSMakeRect(0, 0, 50, 24)];
}
itemView.text = [NSString stringWithFormat:@"Button %ld", (unsigned long)index ];
itemView.image = [NSImage imageNamed:NSImageNameActionTemplate];
//[itemView setStringValue:[self.delegate pathbar:self stringAtIndex:index]];
[self.itemViews addObject:itemView];
return itemView;
}
@end

View File

@@ -0,0 +1,18 @@
//
// MPPathBarItemView.h
// MacPass
//
// Created by michael starke on 22.02.13.
// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
//
#import <Cocoa/Cocoa.h>
@interface MPPathBarItemView : NSView
@property (retain, nonatomic) NSImage *image;
@property (retain, nonatomic) NSString *text;
- (void)sizeToFit;
@end

100
MacPass/MPPathBarItemView.m Normal file
View File

@@ -0,0 +1,100 @@
//
// MPPathBarItemView.m
// MacPass
//
// Created by michael starke on 22.02.13.
// Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
//
#import "MPPathBarItemView.h"
@interface MPPathBarItemView ()
@property (retain) NSImageView *imageView;
@property (retain) NSTextField *textField;
@end
@implementation MPPathBarItemView
- (id)initWithFrame:(NSRect)frameRect {
self = [super initWithFrame:frameRect];
if(self) {
_imageView = [[NSImageView alloc] initWithFrame:NSMakeRect(0, 0, 20, 24)];
[[_imageView cell] setImageAlignment:NSImageAlignCenter];
[[_imageView cell] setBackgroundStyle:NSBackgroundStyleRaised];
[[_imageView cell] setBordered:NO];
[[_imageView cell] setDrawsBackground:NO];
[_imageView setImage:[NSImage imageNamed:NSImageNameActionTemplate ]];
_textField = [[NSTextField alloc] initWithFrame:NSMakeRect([_imageView frame].size.width + 5, 0, 20, 24)];
[_textField setBordered:NO];
[_textField setFont:[NSFont systemFontOfSize:13]];
[_textField setDrawsBackground:NO];
[_textField setEditable:NO];
[_textField setSelectable:NO];
[[_textField cell] setBackgroundStyle:NSBackgroundStyleRaised];
[_textField setStringValue:@"Boo"];
[_textField sizeToFit];
[self addSubview:_textField];
[self addSubview:_imageView];
// NSDictionary *viewDictionary = NSDictionaryOfVariableBindings(_imageView, _textField);
// [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"H:|-[_imageView(24)]-|"
// options:0
// metrics:nil
// views:viewDictionary]];
// [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-[_imageView(24)]-|"
// options:0
// metrics:nil
// views:viewDictionary]];
// [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-[_imageView]-|"
// options:0
// metrics:nil
// views:viewDictionary]];
//
// [self addConstraints:[NSLayoutConstraint constraintsWithVisualFormat:@"V:|-[_textField]-|"
// options:0
// metrics:nil
// views:viewDictionary]];
[self needsLayout];
}
return self;
}
- (void)setText:(NSString *)text {
if(_text != text) {
[_text release];
_text = [text retain];
[self.textField setStringValue:text];
[self sizeToFit];
}
}
- (void)setImage:(NSImage *)image {
if(_image != image) {
[_image release];
_image = [image retain];
[_imageView setImage:image];
[self sizeToFit];
}
}
- (void)sizeToFit {
[self.textField sizeToFit];
[self.imageView sizeToFit];
NSRect textFrame = [self.textField frame];
NSRect imageFrame = [self.imageView frame];
// nudge the textframe
textFrame.origin.x = imageFrame.size.width;
[self.textField setFrame:textFrame];
NSRect frame = NSMakeRect(0, 0,textFrame.size.width + imageFrame.size.width, textFrame.size.height);
[self setFrame:frame];
}
@end

View File

@@ -22,6 +22,11 @@ NSString const* kMPPasswordEnvodingSettingsKey = @"PasswordEncoding";
return self;
}
- (void)dealloc {
self.generalController = nil;
[super dealloc];
}
- (void)windowDidLoad {
_generalController = [[MPGeneralSettingsController alloc] init];
[_generalController loadView];

View File

@@ -39,6 +39,14 @@ NSString *const MPToolbarItemSearch = @"Search";
return self;
}
- (void)dealloc
{
self.toolbarItems = nil;
self.toolbarIdentifiers = nil;
self.toolbarImages = nil;
[super dealloc];
}
- (NSToolbarItem *)toolbar:(NSToolbar *)toolbar itemForItemIdentifier:(NSString *)itemIdentifier willBeInsertedIntoToolbar:(BOOL)flag {
NSToolbarItem *item = self.toolbarItems[ itemIdentifier ];
if( !item ) {
@@ -49,20 +57,25 @@ NSString *const MPToolbarItemSearch = @"Search";
NSString *label = NSLocalizedString(itemIdentifier, @"");
[item setLabel:label];
[item release];
if([itemIdentifier isEqualToString:MPToolbarItemSearch]) {
NSSearchField *searchfield = [[NSSearchField alloc] initWithFrame:NSMakeRect(0, 0, 70, 32)];
[item setView:searchfield];
[searchfield setAction:@selector(updateFilter:)];
[[searchfield cell] setSendsSearchStringImmediately:NO];
[[searchfield cell] addObserver:self forKeyPath:@"controlSize" options:0 context:NULL];
[[[searchfield cell] cancelButtonCell] setTarget:nil];
[[[searchfield cell] cancelButtonCell] setAction:@selector(clearFilter:)];
[searchfield release];
self.searchItem = item;
}
else if([itemIdentifier isEqualToString:MPToolbarItemAction]) {
NSPopUpButton *popupButton = [[NSPopUpButton alloc] initWithFrame:NSMakeRect(0, 0, 50, 32) pullsDown:YES];
[[popupButton cell] addObserver:self forKeyPath:@"controlSize" options:0 context:NULL];
[[popupButton cell] setBezelStyle:NSTexturedRoundedBezelStyle];
[[popupButton cell] setImageScaling:NSImageScaleProportionallyDown];
[popupButton setTitle:@""];
[popupButton sizeToFit];
/*
Built menu
*/
@@ -72,14 +85,17 @@ NSString *const MPToolbarItemSearch = @"Search";
[menu addItem:menuItem];
[menu addItemWithTitle:@"Foo" action:NULL keyEquivalent:@""];
[menu addItemWithTitle:@"Bar" action:NULL keyEquivalent:@""];
[popupButton setMenu:menu];
NSRect newFrame = [popupButton frame];
newFrame.size.width += 20;
[popupButton setFrame:newFrame];
[popupButton setMenu:menu];
/*
Cleanup
*/
[menuItem release];
[menu release];
[popupButton sizeToFit];
[item setView:popupButton];
[popupButton release];
@@ -88,13 +104,16 @@ NSString *const MPToolbarItemSearch = @"Search";
NSButton *button = [[NSButton alloc] initWithFrame:NSMakeRect(0, 0, 32, 32)];
[[button cell] setBezelStyle:NSTexturedRoundedBezelStyle];
[[button cell] setImageScaling:NSImageScaleProportionallyDown];
[button setTitle:@""];
[button setTitle:itemIdentifier];
[button setButtonType:NSMomentaryPushInButton];
NSImage *image = self.toolbarImages[itemIdentifier];
[button setImage:image];
[button setImagePosition:NSImageOnly];
[button sizeToFit];
NSRect fittingRect = [button frame];
fittingRect.size.width = MAX( (CGFloat)32.0,fittingRect.size.width);
[button setFrame:fittingRect];
[item setView:button];
[button release];
}
@@ -123,5 +142,9 @@ NSString *const MPToolbarItemSearch = @"Search";
return imageDict;
}
- (void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change context:(void *)context {
NSLog(@"Path:%@: Objecte:%@", keyPath, object);
}
@end

View File

@@ -21,7 +21,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>201</string>
<string>2BF</string>
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>NSHumanReadableCopyright</key>

View File

@@ -37,7 +37,7 @@
<object class="NSWindowTemplate" id="1005">
<int key="NSWindowStyleMask">15</int>
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{196, 240}, {727, 630}}</string>
<string key="NSWindowRect">{{196, 240}, {727, 449}}</string>
<int key="NSWTFlags">544735232</int>
<string key="NSWindowTitle">Window</string>
<string key="NSWindowClass">NSWindow</string>
@@ -56,7 +56,7 @@
<reference key="NSNextResponder" ref="947682332"/>
<int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews"/>
<string key="NSFrameSize">{256, 630}</string>
<string key="NSFrameSize">{256, 449}</string>
<reference key="NSSuperview" ref="947682332"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="938782220"/>
@@ -67,24 +67,14 @@
<reference key="NSNextResponder" ref="947682332"/>
<int key="NSvFlags">256</int>
<array class="NSMutableArray" key="NSSubviews"/>
<string key="NSFrame">{{257, 0}, {470, 630}}</string>
<string key="NSFrame">{{257, 0}, {470, 449}}</string>
<reference key="NSSuperview" ref="947682332"/>
<reference key="NSWindow"/>
<bool key="NSViewIsLayerTreeHost">YES</bool>
<object class="NSDictionary" key="NSViewAnimations">
<string key="NS.key.0">subviews</string>
<object class="CATransition" key="NS.object.0">
<string key="type">fade</string>
<array key="__CACodingContents">
<string>type</string>
</array>
</object>
</object>
<string key="NSReuseIdentifierKey">_NS:13</string>
<string key="NSClassName">NSView</string>
</object>
</array>
<string key="NSFrameSize">{727, 630}</string>
<string key="NSFrameSize">{727, 449}</string>
<reference key="NSSuperview" ref="1006"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="425088172"/>
@@ -93,12 +83,12 @@
<int key="NSDividerStyle">2</int>
</object>
</array>
<string key="NSFrameSize">{727, 630}</string>
<string key="NSFrameSize">{727, 449}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="947682332"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1028}}</string>
<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
<string key="NSMinSize">{400, 422}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<bool key="NSWindowIsRestorable">YES</bool>

View File

@@ -1,19 +1,19 @@
<?xml version="1.0" encoding="UTF-8"?>
<archive type="com.apple.InterfaceBuilder3.Cocoa.XIB" version="8.00">
<data>
<int key="IBDocument.SystemTarget">1070</int>
<string key="IBDocument.SystemVersion">11E53</string>
<string key="IBDocument.InterfaceBuilderVersion">2182</string>
<string key="IBDocument.AppKitVersion">1138.47</string>
<string key="IBDocument.HIToolboxVersion">569.00</string>
<int key="IBDocument.SystemTarget">1080</int>
<string key="IBDocument.SystemVersion">12C60</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.34</string>
<string key="IBDocument.HIToolboxVersion">625.00</string>
<object class="NSMutableDictionary" key="IBDocument.PluginVersions">
<string key="NS.key.0">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="NS.object.0">2182</string>
<string key="NS.object.0">3084</string>
</object>
<array key="IBDocument.IntegratedClassDependencies">
<string>NSWindowTemplate</string>
<string>NSView</string>
<string>NSCustomObject</string>
<string>NSView</string>
<string>NSWindowTemplate</string>
</array>
<array key="IBDocument.PluginDependencies">
<string>com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -35,7 +35,7 @@
<object class="NSWindowTemplate" id="1005">
<int key="NSWindowStyleMask">15</int>
<int key="NSWindowBacking">2</int>
<string key="NSWindowRect">{{196, 240}, {473, 232}}</string>
<string key="NSWindowRect">{{196, 240}, {473, 263}}</string>
<int key="NSWTFlags">544735232</int>
<string key="NSWindowTitle">Window</string>
<string key="NSWindowClass">NSWindow</string>
@@ -44,11 +44,12 @@
<object class="NSView" key="NSWindowView" id="1006">
<reference key="NSNextResponder"/>
<int key="NSvFlags">256</int>
<string key="NSFrameSize">{473, 232}</string>
<array class="NSMutableArray" key="NSSubviews"/>
<string key="NSFrameSize">{473, 263}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
</object>
<string key="NSScreenRect">{{0, 0}, {1680, 1050}}</string>
<string key="NSScreenRect">{{0, 0}, {1920, 1058}}</string>
<string key="NSMaxSize">{10000000000000, 10000000000000}</string>
<bool key="NSWindowIsRestorable">YES</bool>
</object>
@@ -101,6 +102,7 @@
<object class="IBObjectRecord">
<int key="objectID">2</int>
<reference key="object" ref="1006"/>
<array class="NSMutableArray" key="children"/>
<reference key="parent" ref="1005"/>
</object>
</array>
@@ -118,7 +120,7 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">3</int>
<int key="maxID">80</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">