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

Removed Search form toolbar and added field to search bar. Searching is broken for now.

Browse Source 
Added rudimentary add group/entry functionality
This commit is contained in:
michael starke
2013-03-10 03:12:34 +01:00
parent 816fb9f29e
commit ff7e8aaadd
15 changed files with 289 additions and 379 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
MacPass.xcodeproj/project.pbxproj
View File

@@ -20,7 +20,6 @@
4C3FFD9E16DAF60600DF9186 /* FilterBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C3FFD9D16DAF60600DF9186 /* FilterBar.xib */; };
4C431BCD16E2A82800700A81 /* MPPasteBoardController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C431BCC16E2A82700700A81 /* MPPasteBoardController.m */; };
4C431BCF16E2BAB000700A81 /* OverlayWindow.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C431BCE16E2BAB000700A81 /* OverlayWindow.xib */; };
4C4E1DC716DC6536007B9B47 /* PathBar.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C4E1DC616DC6536007B9B47 /* PathBar.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 */; };
@@ -127,7 +126,6 @@
4C431BCB16E2A82700700A81 /* MPPasteBoardController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPasteBoardController.h; sourceTree = "<group>"; };
4C431BCC16E2A82700700A81 /* MPPasteBoardController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPasteBoardController.m; sourceTree = "<group>"; };
4C431BCE16E2BAB000700A81 /* OverlayWindow.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = OverlayWindow.xib; sourceTree = "<group>"; };
4C4E1DC616DC6536007B9B47 /* PathBar.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PathBar.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>"; };
@@ -313,7 +311,6 @@
4C6B0E8B16C9B99B00A9ED23 /* PasswordInputView.xib */,
4C25D58416CF0F8800F6806C /* WelcomeView.xib */,
4C3FFD9D16DAF60600DF9186 /* FilterBar.xib */,
4C4E1DC616DC6536007B9B47 /* PathBar.xib */,
4C77547616E55FFC00970E02 /* InspectorTabView.xib */,
4C69A73816D589DF00EC1B1A /* MPGradientView.h */,
4C69A73916D589DF00EC1B1A /* MPGradientView.m */,
@@ -770,7 +767,6 @@
4C61EA0516D2FFE200AC519E /* OutlineView.xib in Resources */,
4CB9339916D3A0DD00A13B5D /* Credits.rtf in Resources */,
4C3FFD9E16DAF60600DF9186 /* FilterBar.xib in Resources */,
4C4E1DC716DC6536007B9B47 /* PathBar.xib in Resources */,
4C431BCF16E2BAB000700A81 /* OverlayWindow.xib in Resources */,
4C77547716E55FFC00970E02 /* InspectorTabView.xib in Resources */,
4C888C9016EB6C91003D34A1 /* Localizable.strings in Resources */,

219
MacPass/FilterBar.xib
View File

@@ -2,7 +2,7 @@
<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.SystemVersion">12C3103</string>
<string key="IBDocument.InterfaceBuilderVersion">3084</string>
<string key="IBDocument.AppKitVersion">1187.34</string>
<string key="IBDocument.HIToolboxVersion">625.00</string>
@@ -16,6 +16,8 @@
<string>NSButtonCell</string>
<string>NSCustomObject</string>
<string>NSCustomView</string>
<string>NSSearchField</string>
<string>NSSearchFieldCell</string>
<string>NSTextField</string>
<string>NSTextFieldCell</string>
</array>
@@ -37,25 +39,97 @@
<string key="NSClassName">NSApplication</string>
</object>
<object class="NSCustomView" id="1005">
<nil key="NSNextResponder"/>
<reference key="NSNextResponder"/>
<int key="NSvFlags">268</int>
<array class="NSMutableArray" key="NSSubviews">
<object class="NSSearchField" id="498286707">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{369, 5}, {136, 19}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
<object class="NSSearchFieldCell" key="NSCell" id="456364439">
<int key="NSCellFlags">342884416</int>
<int key="NSCellFlags2">268567616</int>
<string key="NSContents"/>
<object class="NSFont" key="NSSupport" id="26">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">11</double>
<int key="NSfFlags">3100</int>
</object>
<string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="498286707"/>
<bool key="NSDrawsBackground">YES</bool>
<int key="NSTextBezelStyle">1</int>
<object class="NSColor" key="NSBackgroundColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">textBackgroundColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MQA</bytes>
</object>
</object>
<object class="NSColor" key="NSTextColor">
<int key="NSColorSpace">6</int>
<string key="NSCatalogName">System</string>
<string key="NSColorName">controlTextColor</string>
<object class="NSColor" key="NSColor">
<int key="NSColorSpace">3</int>
<bytes key="NSWhite">MAA</bytes>
</object>
</object>
<object class="NSButtonCell" key="NSSearchButtonCell">
<int key="NSCellFlags">0</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">search</string>
<reference key="NSControlView" ref="498286707"/>
<string key="NSAction">_searchFieldSearch:</string>
<reference key="NSTarget" ref="456364439"/>
<int key="NSButtonFlags">138690560</int>
<int key="NSButtonFlags2">0</int>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
</object>
<object class="NSButtonCell" key="NSCancelButtonCell">
<int key="NSCellFlags">0</int>
<int key="NSCellFlags2">0</int>
<string key="NSContents">clear</string>
<array class="NSMutableArray" key="NSAccessibilityOverriddenAttributes">
<dictionary class="NSMutableDictionary">
<string key="AXDescription">cancel</string>
<integer value="1" key="NSAccessibilityEncodedAttributesValueType"/>
</dictionary>
</array>
<reference key="NSControlView" ref="498286707"/>
<string key="NSAction">_searchFieldCancel:</string>
<reference key="NSTarget" ref="456364439"/>
<int key="NSButtonFlags">138690560</int>
<int key="NSButtonFlags2">0</int>
<string key="NSKeyEquivalent"/>
<int key="NSPeriodicDelay">400</int>
<int key="NSPeriodicInterval">75</int>
</object>
<int key="NSMaximumRecents">255</int>
</object>
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
<object class="NSButton" id="113591000">
<reference key="NSNextResponder" ref="1005"/>
<int key="NSvFlags">268</int>
<string key="NSFrame">{{496, 5}, {42, 17}}</string>
<string key="NSFrame">{{513, 5}, {42, 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="791616402">
<int key="NSCellFlags">-2080374784</int>
<int key="NSCellFlags2">134348800</int>
<string key="NSContents">Done</string>
<object class="NSFont" key="NSSupport">
<string key="NSName">LucidaGrande</string>
<double key="NSSize">11</double>
<int key="NSfFlags">3100</int>
</object>
<reference key="NSSupport" ref="26"/>
<string key="NSCellIdentifier">_NS:9</string>
<reference key="NSControlView" ref="113591000"/>
<int key="NSButtonFlags">-2038153216</int>
@@ -72,6 +146,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{188, 5}, {38, 17}}</string>
<reference key="NSSuperview" ref="1005"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="113591000"/>
<string key="NSReuseIdentifierKey">_NS:9</string>
<bool key="NSEnabled">YES</bool>
@@ -100,6 +175,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{104, 5}, {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>
@@ -124,6 +200,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{5, 6}, {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>
@@ -164,6 +241,7 @@
<int key="NSvFlags">268</int>
<string key="NSFrame">{{54, 4}, {42, 19}}</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>
@@ -184,7 +262,9 @@
<bool key="NSAllowsLogicalLayoutDirection">NO</bool>
</object>
</array>
<string key="NSFrameSize">{546, 28}</string>
<string key="NSFrameSize">{563, 28}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView" ref="906526407"/>
<string key="NSClassName">MPGradientView</string>
</object>
@@ -302,11 +382,11 @@
<int key="objectID">1</int>
<reference key="object" ref="1005"/>
<array class="NSMutableArray" key="children">
<object class="IBNSLayoutConstraint" id="312382951">
<object class="IBNSLayoutConstraint" id="548170831">
<reference key="firstItem" ref="113591000"/>
<int key="firstAttribute">5</int>
<int key="relation">1</int>
<reference key="secondItem" ref="340435610"/>
<int key="relation">0</int>
<reference key="secondItem" ref="498286707"/>
<int key="secondAttribute">6</int>
<float key="multiplier">1</float>
<object class="IBNSLayoutSymbolicConstant" key="constant">
@@ -350,6 +430,38 @@
<float key="scoringTypeFloat">40</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="312382951">
<reference key="firstItem" ref="498286707"/>
<int key="firstAttribute">5</int>
<int key="relation">1</int>
<reference key="secondItem" ref="340435610"/>
<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">9</int>
<float key="scoringTypeFloat">40</float>
<int key="contentType">3</int>
</object>
<object class="IBNSLayoutConstraint" id="120785100">
<reference key="firstItem" ref="1005"/>
<int key="firstAttribute">10</int>
<int key="relation">0</int>
<reference key="secondItem" ref="498286707"/>
<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">9</int>
<float key="scoringTypeFloat">40</float>
<int key="contentType">2</int>
</object>
<object class="IBNSLayoutConstraint" id="959342076">
<reference key="firstItem" ref="1005"/>
<int key="firstAttribute">10</int>
@@ -515,6 +627,7 @@
<reference ref="902262560"/>
<reference ref="340435610"/>
<reference ref="113591000"/>
<reference ref="498286707"/>
</array>
<reference key="parent" ref="0"/>
</object>
@@ -639,13 +752,57 @@
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">72</int>
<reference key="object" ref="312382951"/>
<int key="objectID">73</int>
<reference key="object" ref="160109106"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">73</int>
<reference key="object" ref="160109106"/>
<int key="objectID">80</int>
<reference key="object" ref="498286707"/>
<array class="NSMutableArray" key="children">
<reference ref="456364439"/>
<object class="IBNSLayoutConstraint" id="880645438">
<reference key="firstItem" ref="498286707"/>
<int key="firstAttribute">7</int>
<int key="relation">0</int>
<nil key="secondItem"/>
<int key="secondAttribute">0</int>
<float key="multiplier">1</float>
<object class="IBLayoutConstant" key="constant">
<double key="value">136</double>
</object>
<float key="priority">1000</float>
<reference key="containingView" ref="498286707"/>
<int key="scoringType">9</int>
<float key="scoringTypeFloat">40</float>
<int key="contentType">1</int>
</object>
</array>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">81</int>
<reference key="object" ref="456364439"/>
<reference key="parent" ref="498286707"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">83</int>
<reference key="object" ref="548170831"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">85</int>
<reference key="object" ref="880645438"/>
<reference key="parent" ref="498286707"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">86</int>
<reference key="object" ref="120785100"/>
<reference key="parent" ref="1005"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">87</int>
<reference key="object" ref="312382951"/>
<reference key="parent" ref="1005"/>
</object>
</array>
@@ -654,7 +811,7 @@
<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">
<array key="1.IBNSViewMetadataConstraints">
<reference ref="777287174"/>
<reference ref="201173489"/>
<reference ref="274700398"/>
@@ -665,9 +822,11 @@
<reference ref="160109106"/>
<reference ref="112675040"/>
<reference ref="959342076"/>
<reference ref="120785100"/>
<reference ref="312382951"/>
<reference ref="207946731"/>
<reference ref="533969344"/>
<reference ref="312382951"/>
<reference ref="548170831"/>
</array>
<string key="1.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<boolean value="NO" key="2.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
@@ -696,14 +855,23 @@
<string key="66.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="69.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="7.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="72.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="73.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<array class="NSMutableArray" key="80.IBNSViewMetadataConstraints">
<reference ref="880645438"/>
</array>
<boolean value="NO" key="80.IBNSViewMetadataTranslatesAutoresizingMaskIntoConstraints"/>
<string key="80.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="81.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="83.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="85.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="86.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="87.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">79</int>
<int key="maxID">87</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
@@ -711,13 +879,13 @@
<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.key.0">_toggleFilterSpace:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">toggleFilterSpace:</string>
<string key="NS.key.0">_toggleFilterSpace:</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">toggleFilterSpace:</string>
<string key="name">_toggleFilterSpace:</string>
<string key="candidateClassName">id</string>
</object>
</object>
@@ -729,6 +897,7 @@
<string key="filterTitleButton">NSButton</string>
<string key="filterURLButton">NSButton</string>
<string key="filterUsernameButton">NSButton</string>
<string key="pathBar">NSView</string>
<string key="tableToBottom">NSLayoutConstraint</string>
<string key="tableToTop">NSLayoutConstraint</string>
</dictionary>
@@ -761,6 +930,10 @@
<string key="name">filterUsernameButton</string>
<string key="candidateClassName">NSButton</string>
</object>
<object class="IBToOneOutletInfo" key="pathBar">
<string key="name">pathBar</string>
<string key="candidateClassName">NSView</string>
</object>
<object class="IBToOneOutletInfo" key="tableToBottom">
<string key="name">tableToBottom</string>
<string key="candidateClassName">NSLayoutConstraint</string>

12
MacPass/MPAppDelegate.m
View File

@@ -17,10 +17,6 @@
@property (retain) MPSettingsController *settingsController;
@property (retain) MPMainWindowController *mainWindowController;
@property (assign) IBOutlet NSMenuItem *toggleOutlineViewMenuItem;
@property (assign) IBOutlet NSMenuItem *toggleInspectorViewMenuItem;
- (void)_setupMenues;
- (IBAction)showPreferences:(id)sender;
@end
@@ -30,7 +26,6 @@
- (void)applicationDidFinishLaunching:(NSNotification *)aNotification {
self.mainWindowController = [[[MPMainWindowController alloc] init] autorelease];
[self.mainWindowController showWindow:[self.mainWindowController window]];
[self _setupMenues];
}
@@ -44,13 +39,6 @@
return [[NSBundle mainBundle] infoDictionary][@"CFBundleName"];
}
#pragma mark Setup
- (void)_setupMenues {
[self.toggleInspectorViewMenuItem setAction:@selector(toggleInspector:)];
[self.toggleOutlineViewMenuItem setAction:@selector(toggleOutlineView:)];
}
#pragma mark Menu Actions
- (void)showMainWindow:(id)sender {

5
MacPass/MPDatabaseDocument.h
View File

@@ -18,6 +18,7 @@ typedef enum {
@class KdbPassword;
@class KdbGroup;
@class KdbEntry;
@interface MPDatabaseDocument : NSObject
@@ -40,4 +41,8 @@ typedef enum {
- (BOOL)save;
- (BOOL)saveAsFile:(NSURL *)file withPassword:(NSString *)password keyfile:(NSURL *)key;
- (KdbGroup *)createGroup:(KdbGroup *)parent;
- (KdbEntry *)createEntry:(KdbGroup *)parent;
@end

14
MacPass/MPDatabaseDocument.m
View File

@@ -129,4 +129,18 @@ NSString *const MPDidLoadDatabaseNotification = @"DidLoadDataBaseNotification";
return [[[KdbPassword alloc] initWithPassword:self.password passwordEncoding:NSUTF8StringEncoding keyFile:[self.key path]] autorelease];
}
- (KdbEntry *)createEntry:(KdbGroup *)parent {
KdbEntry *newEntry = [self.tree createEntry:parent];
newEntry.title = NSLocalizedString(@"DEFAULT_ENTRY_TITLE", @"Title for a newly created entry");
[parent addEntry:newEntry];
return newEntry;
}
- (KdbGroup *)createGroup:(KdbGroup *)parent {
KdbGroup *newGroup = [self.tree createGroup:parent];
newGroup.name = NSLocalizedString(@"DEFAULT_GROUP_NAME", @"Title for a newly created group");
[parent addGroup:newGroup];
return newGroup;
}
@end

6
MacPass/MPEntryViewController.h
View File

@@ -39,12 +39,16 @@ typedef enum {
/* Clear the Search filter*/
- (void)clearFilter;
- (void)showFilter:(id)sender;
- (void)clearFilter:(id)sender;
/* Copy/Paste */
- (void)copyUsername:(id)sender;
- (void)copyPassword:(id)sender;
- (void)copyURL:(id)sender;
- (void)openURL:(id)sender;
/* Entry Handling*/
- (void)deleteEntry:(id)sender;
@end

21
MacPass/MPEntryViewController.m
View File

@@ -53,7 +53,6 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
@property (retain) NSArrayController *entryArrayController;
@property (retain) NSArray *filteredEntries;
@property (retain) IBOutlet NSView *filterBar;
@property (retain) IBOutlet NSView *pathBar;
@property (assign) IBOutlet NSTableView *entryTable;
@property (assign) BOOL isStatusBarVisible;
@property (assign) IBOutlet NSLayoutConstraint *tableToTop;
@@ -64,6 +63,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
@property (assign) IBOutlet NSButton *filterUsernameButton;
@property (assign) IBOutlet NSButton *filterURLButton;
@property (assign) IBOutlet NSTextField *filterLabelTextField;
@property (assign) IBOutlet NSSearchField *filterSearchField;
@property (assign) KdbEntry *selectedEntry;
@@ -80,7 +80,6 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
- (BOOL)hasFilter;
- (void)updateFilter;
- (void)setupFilterBar;
- (void)setupPathBar;
- (void)_setupEntryMenu;
/* Notification handling */
- (void)_didChangeGroupSelectionInOutlineView:(NSNotification *)notification;
@@ -213,7 +212,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
#pragma mark Notifications
- (void)_didChangeGroupSelectionInOutlineView:(NSNotification *)notification {
if([self hasFilter]) {
[(MPMainWindowController *)[[self.view window] windowController] clearFilter:nil];
[self.filterSearchField setStringValue:@""];
}
MPOutlineViewDelegate *delegate = [notification object];
KdbGroup *group = delegate.selectedGroup;
@@ -230,6 +229,10 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
#pragma mark Filtering
- (void)showFilter:(id)sender {
[self _showFilterBarAnimated:NO];
}
- (BOOL)hasFilter {
return ([self.filter length] > 0);
}
@@ -246,7 +249,7 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
[self.entryTable deselectAll:nil];
}
- (void)clearFilter {
- (void)clearFilter:(id)sender {
self.filter = nil;
[[self.entryTable tableColumnWithIdentifier:MPEntryTableParentColumnIdentifier] setHidden:YES];
[self _hideStatusBarAnimated:YES];
@@ -295,14 +298,10 @@ NSString *const _toggleFilterUsernameButton = @"SearchUsername";
[[self.filterLabelTextField cell] setBackgroundStyle:NSBackgroundStyleRaised];
[self.filterDoneButton setAction:@selector(clearFilter:)];
[self.filterDoneButton setTarget:nil];
}
}
- (void)setupPathBar {
if(!self.pathBar) {
[[NSBundle mainBundle] loadNibNamed:@"PathBar" owner:self topLevelObjects:nil];
[self.pathBar setAutoresizingMask:NSViewWidthSizable|NSViewMaxYMargin];
[self.filterSearchField setAction:@selector(updateFilter:)];
[[self.filterSearchField cell] setSendsSearchStringImmediately:NO];
}
}

1
MacPass/MPMainWindowController.h
View File

@@ -29,7 +29,6 @@
/*
Clears the Search filter
*/
- (void)clearFilter:(id)sender;
- (void)toggleInspector:(id)sender;
- (void)toggleOutlineView:(id)sender;

50
MacPass/MPMainWindowController.m
View File

@@ -19,8 +19,6 @@
#define MIN_WINDOW_WIDTH MPMainWindowSplitViewDelegateMinimumContentWidth + MPMainWindowSplitViewDelegateMinimumOutlineWidth + [self.splitView dividerThickness]
static CGFloat _outlineSplitterPosition;
@interface MPMainWindowController ()
@property (assign) IBOutlet NSView *outlineView;
@@ -40,10 +38,6 @@ static CGFloat _outlineSplitterPosition;
@property (retain) MPToolbarDelegate *toolbarDelegate;
@property (retain) MPMainWindowSplitViewDelegate *splitViewDelegate;
/* View show/hide */
- (void)_collapseOutlineView;
- (void)_expandOutlineView;
- (void)_setContentViewController:(MPViewController *)viewController;
- (void)_updateWindowTitle;
@@ -123,9 +117,9 @@ static CGFloat _outlineSplitterPosition;
[self.inspectorTabViewController updateResponderChain];
[self.splitView adjustSubviews];
[self toggleInspector:nil];
[self _setContentViewController:nil];
[self _collapseOutlineView];
}
- (void)_setContentViewController:(MPViewController *)viewController {
@@ -162,22 +156,6 @@ static CGFloat _outlineSplitterPosition;
[self.window makeFirstResponder:[viewController reconmendedFirstResponder]];
}
- (void)_collapseOutlineView {
NSView *outlineView = [self.splitView subviews][MPSplitViewOutlineViewIndex];
if([outlineView isHidden]) {
_outlineSplitterPosition = [outlineView frame].size.width;
[self.splitView setPosition:0 ofDividerAtIndex:MPSplitViewOutlineViewIndex];
}
}
- (void)_expandOutlineView {
NSView *outlineView = [self.splitView subviews][MPSplitViewOutlineViewIndex];
if(![outlineView isHidden]) {
CGFloat splitterPosition = MAX( MPMainWindowSplitViewDelegateMinimumOutlineWidth, _outlineSplitterPosition );
[self.splitView setPosition:splitterPosition ofDividerAtIndex:MPSplitViewOutlineViewIndex];
}
}
- (void)_updateWindowTitle {
if([MPDatabaseController defaultController].database) {
NSString *appName = [(MPAppDelegate *)[NSApp delegate] applicationName];
@@ -208,6 +186,10 @@ static CGFloat _outlineSplitterPosition;
[inspectorView setHidden:!collapsed];
}
- (void)performFindPanelAction:(id)sender {
[self.entryViewController showFilter:sender];
}
- (void)toggleOutlineView:(id)sender {
}
@@ -237,10 +219,6 @@ static CGFloat _outlineSplitterPosition;
return [self.toolbarDelegate validateToolbarItem:theItem];
}
- (void)performFindPanelAction:(id)sender {
[self.window makeFirstResponder:[self.toolbarDelegate.searchItem view]];
}
- (void)showMainWindow:(id)sender {
[self showWindow:self.window];
}
@@ -261,27 +239,10 @@ static CGFloat _outlineSplitterPosition;
if(result == NSFileHandlingPanelOKButton) {
NSURL *file = [[openPanel URLs] lastObject];
self.passwordInputController.fileURL = file;
[self _collapseOutlineView];
[self _setContentViewController:self.passwordInputController];
}
}];
}
- (void)updateFilter:(id)sender {
NSSearchField *searchField = sender;
self.entryViewController.filter = [searchField stringValue];
[((NSOutlineView *)self.outlineViewController.view) deselectAll:self];
}
- (void)clearFilter:(id)sender {
NSSearchField *searchField = sender;
if(![sender isKindOfClass:[NSSearchField class]]) {
searchField = [self locateToolbarSearchField];
}
[searchField setStringValue:@""];
[self.entryViewController clearFilter];
}
- (void)clearOutlineSelection:(id)sender {
[self.outlineViewController clearSelection];
}
@@ -328,7 +289,6 @@ static CGFloat _outlineSplitterPosition;
}
- (void)showEntries {
[self _expandOutlineView];
if(!self.entryViewController) {
_entryViewController = [[MPEntryViewController alloc] init];
}

1
MacPass/MPOutlineViewController.h
View File

@@ -13,5 +13,6 @@
- (void)clearSelection;
- (void)createGroup:(id)sender;
- (void)createEntry:(id)sender;
- (void)deleteEntry:(id)sender;
@end

36
MacPass/MPOutlineViewController.m
View File

@@ -12,6 +12,7 @@
#import "MPDatabaseController.h"
#import "MPDatabaseDocument.h"
#import "MPAppDelegate.h"
#import "KdbLib.h"
@interface MPOutlineViewController ()
@@ -24,6 +25,7 @@
- (void)_didOpenDocument:(NSNotification *)notification;
- (NSMenu *)_contextMenu;
- (KdbGroup *)_clickedOrSelectedGroup;
@end
@@ -64,12 +66,6 @@
[self.outlineView setAllowsEmptySelection:YES];
}
- (void)mouseUp:(NSEvent *)theEvent {
NSLog(@"Mouse Up!");
[super mouseUp:theEvent];
}
- (void)_didOpenDocument:(NSNotification *)notification {
[self.outlineView deselectAll:nil];
[self.outlineView reloadData];
@@ -93,13 +89,35 @@
}
- (void)createGroup:(id)sender {
NSLog(@"%@: Create Group", [self class]);
KdbGroup *group = [self _clickedOrSelectedGroup];
if(group) {
[[MPDatabaseController defaultController].database createGroup:group];
[self.outlineView reloadData];
}
}
- (void)createEntry:(id)sender {
KdbGroup *group = [self _clickedOrSelectedGroup];
if(group) {
[[MPDatabaseController defaultController].database createEntry:group];
}
}
- (void)deleteEntry:(id)sender {
NSLog(@"%@: Delete Entry", [self class]);
KdbGroup *group = [self _clickedOrSelectedGroup];
if(group) {
[group.parent removeGroup:group];
[self.outlineView reloadData];
}
}
- (KdbGroup *)_clickedOrSelectedGroup {
NSInteger row = [self.outlineView clickedRow];
if( row < 0 ) {
row = [self.outlineView selectedRow];
}
return [self.outlineView itemAtRow:row];
}
@end

18
MacPass/MPToolbarDelegate.m
View File

@@ -18,7 +18,6 @@ NSString *const MPToolbarItemAddEntry = @"TOOLBAR_ADD_ENTRY";
NSString *const MPToolbarItemEdit = @"TOOLBAR_EDIT";
NSString *const MPToolbarItemDelete =@"TOOLBAR_DELETE";
NSString *const MPToolbarItemAction = @"TOOLBAR_ACTION";
NSString *const MPToolbarItemSearch = @"TOOLBAR_SEARCH";
NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR";
@interface MPToolbarDelegate()
@@ -38,7 +37,7 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR";
- (id)init {
self = [super init];
if (self) {
_toolbarIdentifiers = [@[ MPToolbarItemAddEntry, MPToolbarItemDelete, MPToolbarItemAddGroup, MPToolbarItemAction, NSToolbarFlexibleSpaceItemIdentifier, NSToolbarSpaceItemIdentifier, MPToolbarItemInspector, MPToolbarItemSearch ] retain];
_toolbarIdentifiers = [@[ MPToolbarItemAddEntry, MPToolbarItemDelete, MPToolbarItemAddGroup, MPToolbarItemAction, NSToolbarFlexibleSpaceItemIdentifier, NSToolbarSpaceItemIdentifier, MPToolbarItemInspector ] retain];
_toolbarImages = [[self createToolbarImages] retain];
_toolbarItems = [[NSMutableDictionary alloc] initWithCapacity:[self.toolbarIdentifiers count]];
}
@@ -60,17 +59,7 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR";
NSString *label = [self _localizedLabelForToolbarItemIdentifier:itemIdentifier];
[item setLabel:label];
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] cancelButtonCell] setTarget:nil];
[[[searchfield cell] cancelButtonCell] setAction:@selector(clearFilter:)];
[searchfield release];
self.searchItem = item;
}
else if([itemIdentifier isEqualToString:MPToolbarItemAction]) {
if([itemIdentifier isEqualToString:MPToolbarItemAction]) {
NSPopUpButton *popupButton = [[NSPopUpButton alloc] initWithFrame:NSMakeRect(0, 0, 50, 32) pullsDown:YES];
[[popupButton cell] setBezelStyle:NSTexturedRoundedBezelStyle];
[[popupButton cell] setImageScaling:NSImageScaleProportionallyDown];
@@ -149,8 +138,7 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR";
MPToolbarItemAddGroup: NSLocalizedString(@"ADD_GROUP", @""),
MPToolbarItemDelete: NSLocalizedString(@"DELETE", @""),
MPToolbarItemEdit: NSLocalizedString(@"EDIT", @""),
MPToolbarItemInspector: NSLocalizedString(@"TOGGLE_INSPECTOR", @""),
MPToolbarItemSearch: NSLocalizedString(@"SEARCH", @"")
MPToolbarItemInspector: NSLocalizedString(@"TOGGLE_INSPECTOR", @"")
};
return labelDict[identifier];
}

2
MacPass/MacPass-Info.plist
View File

@@ -21,7 +21,7 @@
<key>CFBundleSignature</key>
<string>????</string>
<key>CFBundleVersion</key>
<string>4B8</string>
<string>4DD</string>
<key>LSMinimumSystemVersion</key>
<string>${MACOSX_DEPLOYMENT_TARGET}</string>
<key>NSHumanReadableCopyright</key>

117
MacPass/PathBar.xib
View File

@@ -1,117 +0,0 @@
<?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>NSCustomObject</string>
<string>NSCustomView</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">NSObject</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>
<string key="NSFrameSize">{480, 24}</string>
<reference key="NSSuperview"/>
<reference key="NSWindow"/>
<reference key="NSNextKeyView"/>
<string key="NSClassName">MPPathBar</string>
</object>
</array>
<object class="IBObjectContainer" key="IBDocument.Objects">
<array class="NSMutableArray" key="connectionRecords"/>
<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"/>
<reference key="parent" ref="0"/>
</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>
<string key="1.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">1</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<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">MPPathBar</string>
<string key="superclassName">MPGradientView</string>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/MPPathBar.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>

162
MacPass/en.lproj/MainMenu.xib
View File

@@ -362,15 +362,6 @@
<reference key="NSOnImage" ref="35465992"/>
<reference key="NSMixedImage" ref="502551668"/>
</object>
<object class="NSMenuItem" id="82994268">
<reference key="NSMenu" ref="789758025"/>
<string key="NSTitle">Paste and Match Style</string>
<string key="NSKeyEquiv">V</string>
<int key="NSKeyEquivModMask">1572864</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="35465992"/>
<reference key="NSMixedImage" ref="502551668"/>
</object>
<object class="NSMenuItem" id="437104165">
<reference key="NSMenu" ref="789758025"/>
<string key="NSTitle">Delete</string>
@@ -422,36 +413,6 @@
<reference key="NSMixedImage" ref="502551668"/>
<int key="NSTag">1</int>
</object>
<object class="NSMenuItem" id="738670835">
<reference key="NSMenu" ref="963351320"/>
<string key="NSTitle">Find and Replace…</string>
<string key="NSKeyEquiv">f</string>
<int key="NSKeyEquivModMask">1572864</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="35465992"/>
<reference key="NSMixedImage" ref="502551668"/>
<int key="NSTag">12</int>
</object>
<object class="NSMenuItem" id="326711663">
<reference key="NSMenu" ref="963351320"/>
<string key="NSTitle">Find Next</string>
<string key="NSKeyEquiv">g</string>
<int key="NSKeyEquivModMask">1048576</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="35465992"/>
<reference key="NSMixedImage" ref="502551668"/>
<int key="NSTag">2</int>
</object>
<object class="NSMenuItem" id="270902937">
<reference key="NSMenu" ref="963351320"/>
<string key="NSTitle">Find Previous</string>
<string key="NSKeyEquiv">G</string>
<int key="NSKeyEquivModMask">1179648</int>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="35465992"/>
<reference key="NSMixedImage" ref="502551668"/>
<int key="NSTag">3</int>
</object>
<object class="NSMenuItem" id="159080638">
<reference key="NSMenu" ref="963351320"/>
<string key="NSTitle">Use Selection for Find</string>
@@ -708,14 +669,6 @@
<object class="NSMenu" key="NSSubmenu" id="466310130">
<string key="NSTitle">View</string>
<array class="NSMutableArray" key="NSMenuItems">
<object class="NSMenuItem" id="650817293">
<reference key="NSMenu" ref="466310130"/>
<string key="NSTitle">Toggle Outline View</string>
<string key="NSKeyEquiv"/>
<int key="NSMnemonicLoc">2147483647</int>
<reference key="NSOnImage" ref="35465992"/>
<reference key="NSMixedImage" ref="502551668"/>
</object>
<object class="NSMenuItem" id="366402813">
<reference key="NSMenu" ref="466310130"/>
<string key="NSTitle">Toggle Inspector</string>
@@ -1217,30 +1170,6 @@
</object>
<int key="connectionID">468</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">pasteAsPlainText:</string>
<reference key="source" ref="1014"/>
<reference key="destination" ref="82994268"/>
</object>
<int key="connectionID">486</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">performFindPanelAction:</string>
<reference key="source" ref="1014"/>
<reference key="destination" ref="326711663"/>
</object>
<int key="connectionID">487</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">performFindPanelAction:</string>
<reference key="source" ref="1014"/>
<reference key="destination" ref="270902937"/>
</object>
<int key="connectionID">488</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">performFindPanelAction:</string>
@@ -1259,11 +1188,11 @@
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
<string key="label">performFindPanelAction:</string>
<string key="label">toggleInspector:</string>
<reference key="source" ref="1014"/>
<reference key="destination" ref="738670835"/>
<reference key="destination" ref="366402813"/>
</object>
<int key="connectionID">535</int>
<int key="connectionID">1199</int>
</object>
<object class="IBConnectionRecord">
<object class="IBActionConnection" key="connection">
@@ -1281,22 +1210,6 @@
</object>
<int key="connectionID">1178</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">toggleOutlineViewMenuItem</string>
<reference key="source" ref="976324537"/>
<reference key="destination" ref="650817293"/>
</object>
<int key="connectionID">1182</int>
</object>
<object class="IBConnectionRecord">
<object class="IBOutletConnection" key="connection">
<string key="label">toggleInspectorViewMenuItem</string>
<reference key="source" ref="976324537"/>
<reference key="destination" ref="366402813"/>
</object>
<int key="connectionID">1183</int>
</object>
</array>
<object class="IBMutableOrderedSet" key="objectRecords">
<array key="orderedObjects">
@@ -1470,7 +1383,6 @@
<reference ref="676164635"/>
<reference ref="507821607"/>
<reference ref="288088188"/>
<reference ref="82994268"/>
</array>
<reference key="parent" ref="952259628"/>
</object>
@@ -1567,20 +1479,12 @@
<int key="objectID">220</int>
<reference key="object" ref="963351320"/>
<array class="NSMutableArray" key="children">
<reference ref="270902937"/>
<reference ref="88285865"/>
<reference ref="159080638"/>
<reference ref="326711663"/>
<reference ref="447796847"/>
<reference ref="738670835"/>
</array>
<reference key="parent" ref="892235320"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">213</int>
<reference key="object" ref="270902937"/>
<reference key="parent" ref="963351320"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">210</int>
<reference key="object" ref="88285865"/>
@@ -1591,11 +1495,6 @@
<reference key="object" ref="159080638"/>
<reference key="parent" ref="963351320"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">208</int>
<reference key="object" ref="326711663"/>
<reference key="parent" ref="963351320"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">209</int>
<reference key="object" ref="447796847"/>
@@ -1730,7 +1629,6 @@
<reference ref="102151532"/>
<reference ref="237841660"/>
<reference ref="43915532"/>
<reference ref="650817293"/>
<reference ref="366402813"/>
</array>
<reference key="parent" ref="586577488"/>
@@ -1882,11 +1780,6 @@
<reference key="object" ref="56570060"/>
<reference key="parent" ref="579392910"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">485</int>
<reference key="object" ref="82994268"/>
<reference key="parent" ref="789758025"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">490</int>
<reference key="object" ref="448692316"/>
@@ -1913,11 +1806,6 @@
<reference key="object" ref="976324537"/>
<reference key="parent" ref="0"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">534</int>
<reference key="object" ref="738670835"/>
<reference key="parent" ref="963351320"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1176</int>
<reference key="object" ref="964160035"/>
@@ -1933,11 +1821,6 @@
<reference key="object" ref="43915532"/>
<reference key="parent" ref="466310130"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1180</int>
<reference key="object" ref="650817293"/>
<reference key="parent" ref="466310130"/>
</object>
<object class="IBObjectRecord">
<int key="objectID">1181</int>
<reference key="object" ref="366402813"/>
@@ -1953,7 +1836,6 @@
<string key="1176.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="1177.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="1179.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="1180.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="1181.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="124.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="125.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -1982,12 +1864,10 @@
<string key="205.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="206.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="207.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="208.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="209.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="210.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="211.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="212.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="213.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="214.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="215.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="216.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2023,13 +1903,11 @@
<string key="462.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="465.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="466.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="485.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="490.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="491.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="492.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="494.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="5.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="534.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="56.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="57.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
<string key="58.IBPluginDependency">com.apple.InterfaceBuilder.CocoaPlugin</string>
@@ -2049,10 +1927,28 @@
<nil key="activeLocalization"/>
<dictionary class="NSMutableDictionary" key="localizations"/>
<nil key="sourceID"/>
<int key="maxID">1183</int>
<int key="maxID">1199</int>
</object>
<object class="IBClassDescriber" key="IBDocument.Classes">
<array class="NSMutableArray" key="referencedPartialClassDescriptions">
<object class="IBPartialClassDescription">
<string key="className">FirstResponder</string>
<object class="NSMutableDictionary" key="actions">
<string key="NS.key.0">toggleInspector:</string>
<string key="NS.object.0">id</string>
</object>
<object class="NSMutableDictionary" key="actionInfosByName">
<string key="NS.key.0">toggleInspector:</string>
<object class="IBActionInfo" key="NS.object.0">
<string key="name">toggleInspector:</string>
<string key="candidateClassName">id</string>
</object>
</object>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBUserSource</string>
<string key="minorKey"/>
</object>
</object>
<object class="IBPartialClassDescription">
<string key="className">MPAppDelegate</string>
<string key="superclassName">NSObject</string>
@@ -2070,20 +1966,6 @@
<string key="candidateClassName">id</string>
</object>
</dictionary>
<dictionary class="NSMutableDictionary" key="outlets">
<string key="toggleInspectorViewMenuItem">NSMenuItem</string>
<string key="toggleOutlineViewMenuItem">NSMenuItem</string>
</dictionary>
<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
<object class="IBToOneOutletInfo" key="toggleInspectorViewMenuItem">
<string key="name">toggleInspectorViewMenuItem</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
<object class="IBToOneOutletInfo" key="toggleOutlineViewMenuItem">
<string key="name">toggleOutlineViewMenuItem</string>
<string key="candidateClassName">NSMenuItem</string>
</object>
</dictionary>
<object class="IBClassDescriptionSource" key="sourceIdentifier">
<string key="majorKey">IBProjectSource</string>
<string key="minorKey">./Classes/MPAppDelegate.h</string>