Refactoring

MacPass.xcodeproj/project.pbxproj

@@ -18,6 +18,7 @@
 		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 */; };
+		4C65FAE916D16DDB006E0577 /* MPPasswordInputController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C65FAE716D16DDB006E0577 /* MPPasswordInputController.m */; };
 		4C669B7F16760ED100DD0774 /* AesInputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B3116760ED100DD0774 /* AesInputStream.m */; };
 		4C669B8016760ED100DD0774 /* AesOutputStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B3316760ED100DD0774 /* AesOutputStream.m */; };
 		4C669B8116760ED100DD0774 /* Arc4RandomStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B3516760ED100DD0774 /* Arc4RandomStream.m */; };
@@ -53,7 +54,7 @@
 		4C669BA016760ED100DD0774 /* Salsa20RandomStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7716760ED100DD0774 /* Salsa20RandomStream.m */; };
 		4C669BA116760ED100DD0774 /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7916760ED100DD0774 /* Utils.m */; };
 		4C669BA216760ED100DD0774 /* UUID.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7B16760ED100DD0774 /* UUID.m */; };
-		4C6B0E8C16C9B99B00A9ED23 /* PasswordView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C6B0E8B16C9B99B00A9ED23 /* PasswordView.xib */; };
+		4C6B0E8C16C9B99B00A9ED23 /* PasswordInputView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C6B0E8B16C9B99B00A9ED23 /* PasswordInputView.xib */; };
 		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 */; };
@@ -99,6 +100,9 @@
 		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>"; };
+		4C65FAE616D16DDB006E0577 /* MPPasswordInputController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPPasswordInputController.h; sourceTree = "<group>"; };
+		4C65FAE716D16DDB006E0577 /* MPPasswordInputController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPPasswordInputController.m; sourceTree = "<group>"; };
+		4C65FAEB16D16FB5006E0577 /* MPViewControllerProtocol.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = MPViewControllerProtocol.h; sourceTree = "<group>"; };
 		4C669B3016760ED100DD0774 /* AesInputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AesInputStream.h; sourceTree = "<group>"; };
 		4C669B3116760ED100DD0774 /* AesInputStream.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AesInputStream.m; sourceTree = "<group>"; };
 		4C669B3216760ED100DD0774 /* AesOutputStream.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AesOutputStream.h; sourceTree = "<group>"; };
@@ -172,7 +176,7 @@
 		4C669B7916760ED100DD0774 /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Utils.m; sourceTree = "<group>"; };
 		4C669B7A16760ED100DD0774 /* UUID.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UUID.h; sourceTree = "<group>"; };
 		4C669B7B16760ED100DD0774 /* UUID.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UUID.m; sourceTree = "<group>"; };
-		4C6B0E8B16C9B99B00A9ED23 /* PasswordView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PasswordView.xib; sourceTree = "<group>"; };
+		4C6B0E8B16C9B99B00A9ED23 /* PasswordInputView.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = PasswordInputView.xib; 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; };
@@ -246,7 +250,7 @@
 				4CA0B2EC15BCADAC00654E32 /* SettingsWindow.xib */,
 				4CA0B2EF15BCADC800654E32 /* GeneralSettings.xib */,
 				4CD884B615BD47080042BBF8 /* MainWindow.xib */,
-				4C6B0E8B16C9B99B00A9ED23 /* PasswordView.xib */,
+				4C6B0E8B16C9B99B00A9ED23 /* PasswordInputView.xib */,
 				4C25D58416CF0F8800F6806C /* WelcomeView.xib */,
 				4C25D58616CF0FAA00F6806C /* EntryView.xib */,
 			);
@@ -481,6 +485,8 @@
 				4C75CE3B16CB128700F61A4D /* MPDatabaseController.m */,
 				4C2E382416D1470200037A9D /* MPViewController.h */,
 				4C2E382516D1470200037A9D /* MPViewController.m */,
+				4C65FAE616D16DDB006E0577 /* MPPasswordInputController.h */,
+				4C65FAE716D16DDB006E0577 /* MPPasswordInputController.m */,
 			);
 			name = Controller;
 			sourceTree = "<group>";
@@ -489,6 +495,7 @@
 			isa = PBXGroup;
 			children = (
 				4CA0B30D15BCB6FD00654E32 /* MPSettingsTabProtocoll.h */,
+				4C65FAEB16D16FB5006E0577 /* MPViewControllerProtocol.h */,
 			);
 			name = Protocolls;
 			sourceTree = "<group>";
@@ -611,7 +618,7 @@
 				4CA0B2ED15BCADAC00654E32 /* SettingsWindow.xib in Resources */,
 				4CA0B2F015BCADC800654E32 /* GeneralSettings.xib in Resources */,
 				4CD884B715BD47080042BBF8 /* MainWindow.xib in Resources */,
-				4C6B0E8C16C9B99B00A9ED23 /* PasswordView.xib in Resources */,
+				4C6B0E8C16C9B99B00A9ED23 /* PasswordInputView.xib in Resources */,
 				4C25D58516CF0F8800F6806C /* WelcomeView.xib in Resources */,
 				4C25D58716CF0FAA00F6806C /* EntryView.xib in Resources */,
 				4C586F9E16D07ABD00E7DB57 /* 00_PasswordTemplate.pdf in Resources */,
@@ -687,6 +694,7 @@
 				4C75CE3C16CB128700F61A4D /* MPDatabaseController.m in Sources */,
 				4C2E382316D1421B00037A9D /* MPIconHelper.m in Sources */,
 				4C2E382616D1470200037A9D /* MPViewController.m in Sources */,
+				4C65FAE916D16DDB006E0577 /* MPPasswordInputController.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

MacPass/MPMainWindowController.m

@@ -23,10 +23,7 @@ NSString *const kOutlineViewIdentifier = @"OutlineView";
 @interface MPMainWindowController ()
 
 @property (assign) IBOutlet NSOutlineView *outlineView;
-@property (retain) IBOutlet NSView *passwordView;
 
-@property (assign) IBOutlet NSTextField *passwordTextField;
-@property (assign) IBOutlet NSPathControl *keyPathControl;
 @property (assign) IBOutlet NSView *contentView;
 @property (retain) IBOutlet NSView *welcomeView;
 
@@ -35,7 +32,6 @@ NSString *const kOutlineViewIdentifier = @"OutlineView";
 @property (retain) MPOutlineViewDelegate *outlineDelegate;
 @property (retain) MPMainWindowDelegate *windowDelegate;
 
-- (IBAction)usePassword:(id)sender;
 - (void)updateData;
 
 @end
@@ -95,11 +91,4 @@ NSString *const kOutlineViewIdentifier = @"OutlineView";
   [self.window makeFirstResponder:self.passwordView];
 }
 
-- (void)usePassword:(id)sender {
-  NSString *password = [self.passwordTextField stringValue];
-  
-  [[MPDatabaseController defaultController] openDatabase:self.openFile password:password keyfile:nil];
-  [self updateData];
-}
-
 @end

MacPass/MPPasswordInputController.h

@@ -0,0 +1,14 @@
+//
+//  MPPasswordInputController.h
+//  MacPass
+//
+//  Created by Michael Starke on 17.02.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "MPViewController.h"
+#import "MPViewControllerProtocol.h"
+
+@interface MPPasswordInputController : MPViewController <MPViewControllerProtocol>
+
+@end

MacPass/MPPasswordInputController.m

@@ -0,0 +1,41 @@
+//
+//  MPPasswordInputController.m
+//  MacPass
+//
+//  Created by Michael Starke on 17.02.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import "MPPasswordInputController.h"
+#import "MPDatabaseController.h"
+
+@interface MPPasswordInputController ()
+
+@property (assign) IBOutlet NSSecureTextField *passwordTextField;
+
+- (IBAction)selectKeyFile:(id)sender;
+- (IBAction)open:(id)sender;
+
+@end
+
+@implementation MPPasswordInputController
+
+- (id)init {
+  return [[MPPasswordInputController alloc] initWithNibName:@"PasswordView" bundle:nil];
+}
+
+- (NSResponder *)reconmendetFirstResponder {
+  return nil;
+}
+
+
+- (IBAction)selectKeyFile:(id)sender {
+
+}
+
+- (IBAction)open:(id)sender {
+    NSString *password = [self.passwordTextField stringValue];
+    [[MPDatabaseController defaultController] openDatabase:self.openFile password:password keyfile:nil];
+  }
+}
+@end

MacPass/MPViewControllerProtocol.h

@@ -0,0 +1,16 @@
+//
+//  MPViewControllerProtocol.h
+//  MacPass
+//
+//  Created by Michael Starke on 17.02.13.
+//  Copyright (c) 2013 HicknHack Software GmbH. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@protocol MPViewControllerProtocol <NSObject>
+
+@required
+- (NSResponder *)reconmendetFirstResponder;
+
+@end

MacPass/PasswordInputView.xib

@@ -30,7 +30,7 @@
 		</object>
 		<array class="NSMutableArray" key="IBDocument.RootObjects" id="1000">
 			<object class="NSCustomObject" id="1001">
-				<string key="NSClassName">MPMainWindowController</string>
+				<string key="NSClassName">MPPasswordInputController</string>
 			</object>
 			<object class="NSCustomObject" id="1003">
 				<string key="NSClassName">FirstResponder</string>
@@ -173,7 +173,6 @@
 						<string key="NSFrame">{{209, 13}, {74, 32}}</string>
 						<reference key="NSSuperview" ref="1005"/>
 						<reference key="NSWindow"/>
-						<reference key="NSNextKeyView"/>
 						<string key="NSReuseIdentifierKey">_NS:9</string>
 						<bool key="NSEnabled">YES</bool>
 						<object class="NSButtonCell" key="NSCell" id="736946738">
@@ -202,29 +201,37 @@
 		</array>
 		<object class="IBObjectContainer" key="IBDocument.Objects">
 			<array class="NSMutableArray" key="connectionRecords">
+				<object class="IBConnectionRecord">
+					<object class="IBOutletConnection" key="connection">
+						<string key="label">view</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="1005"/>
+					</object>
+					<int key="connectionID">143</int>
+				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBOutletConnection" key="connection">
 						<string key="label">passwordTextField</string>
 						<reference key="source" ref="1001"/>
 						<reference key="destination" ref="83199440"/>
 					</object>
-					<int key="connectionID">99</int>
+					<int key="connectionID">151</int>
-				</object>
-				<object class="IBConnectionRecord">
-					<object class="IBOutletConnection" key="connection">
-						<string key="label">passwordView</string>
-						<reference key="source" ref="1001"/>
-						<reference key="destination" ref="1005"/>
-					</object>
-					<int key="connectionID">101</int>
 				</object>
 				<object class="IBConnectionRecord">
 					<object class="IBActionConnection" key="connection">
-						<string key="label">usePassword:</string>
+						<string key="label">selectKeyFile:</string>
+						<reference key="source" ref="1001"/>
+						<reference key="destination" ref="723622123"/>
+					</object>
+					<int key="connectionID">152</int>
+				</object>
+				<object class="IBConnectionRecord">
+					<object class="IBActionConnection" key="connection">
+						<string key="label">open:</string>
 						<reference key="source" ref="1001"/>
 						<reference key="destination" ref="769513826"/>
 					</object>
-					<int key="connectionID">102</int>
+					<int key="connectionID">154</int>
 				</object>
 			</array>
 			<object class="IBMutableOrderedSet" key="objectRecords">
@@ -541,11 +548,6 @@
 						<reference key="object" ref="108091909"/>
 						<reference key="parent" ref="662046682"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">45</int>
-						<reference key="object" ref="207368608"/>
-						<reference key="parent" ref="1005"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">104</int>
 						<reference key="object" ref="723622123"/>
@@ -574,34 +576,24 @@
 						<reference key="object" ref="1001566026"/>
 						<reference key="parent" ref="1005"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">123</int>
-						<reference key="object" ref="744080106"/>
-						<reference key="parent" ref="1005"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">124</int>
 						<reference key="object" ref="781301592"/>
 						<reference key="parent" ref="1005"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">119</int>
-						<reference key="object" ref="649511608"/>
-						<reference key="parent" ref="1005"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">131</int>
 						<reference key="object" ref="339307312"/>
 						<reference key="parent" ref="1005"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">134</int>
+						<int key="objectID">132</int>
-						<reference key="object" ref="151404172"/>
+						<reference key="object" ref="957344773"/>
 						<reference key="parent" ref="1005"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">112</int>
+						<int key="objectID">142</int>
-						<reference key="object" ref="862589174"/>
+						<reference key="object" ref="679367678"/>
 						<reference key="parent" ref="1005"/>
 					</object>
 					<object class="IBObjectRecord">
@@ -609,19 +601,34 @@
 						<reference key="object" ref="949733562"/>
 						<reference key="parent" ref="1005"/>
 					</object>
-					<object class="IBObjectRecord">
-						<int key="objectID">132</int>
-						<reference key="object" ref="957344773"/>
-						<reference key="parent" ref="1005"/>
-					</object>
 					<object class="IBObjectRecord">
 						<int key="objectID">107</int>
 						<reference key="object" ref="937587174"/>
 						<reference key="parent" ref="1005"/>
 					</object>
 					<object class="IBObjectRecord">
-						<int key="objectID">142</int>
+						<int key="objectID">45</int>
-						<reference key="object" ref="679367678"/>
+						<reference key="object" ref="207368608"/>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">123</int>
+						<reference key="object" ref="744080106"/>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">134</int>
+						<reference key="object" ref="151404172"/>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">119</int>
+						<reference key="object" ref="649511608"/>
+						<reference key="parent" ref="1005"/>
+					</object>
+					<object class="IBObjectRecord">
+						<int key="objectID">112</int>
+						<reference key="object" ref="862589174"/>
 						<reference key="parent" ref="1005"/>
 					</object>
 				</array>
@@ -683,61 +690,49 @@
 			<nil key="activeLocalization"/>
 			<dictionary class="NSMutableDictionary" key="localizations"/>
 			<nil key="sourceID"/>
-			<int key="maxID">142</int>
+			<int key="maxID">154</int>
 		</object>
 		<object class="IBClassDescriber" key="IBDocument.Classes">
 			<array class="NSMutableArray" key="referencedPartialClassDescriptions">
 				<object class="IBPartialClassDescription">
-					<string key="className">MPMainWindowController</string>
+					<string key="className">MPPasswordInputController</string>
-					<string key="superclassName">NSWindowController</string>
+					<string key="superclassName">MPViewController</string>
 					<object class="NSMutableDictionary" key="actions">
-						<string key="NS.key.0">usePassword:</string>
+						<string key="NS.key.0">selectKeyFile:</string>
 						<string key="NS.object.0">id</string>
 					</object>
 					<object class="NSMutableDictionary" key="actionInfosByName">
-						<string key="NS.key.0">usePassword:</string>
+						<string key="NS.key.0">selectKeyFile:</string>
 						<object class="IBActionInfo" key="NS.object.0">
-							<string key="name">usePassword:</string>
+							<string key="name">selectKeyFile:</string>
 							<string key="candidateClassName">id</string>
 						</object>
 					</object>
 					<dictionary class="NSMutableDictionary" key="outlets">
-						<string key="contentView">NSView</string>
+						<string key="openDocument">NSButton</string>
-						<string key="keyPathControl">NSPathControl</string>
+						<string key="passwordTextField">NSSecureTextField</string>
-						<string key="outlineView">NSOutlineView</string>
-						<string key="passwordTextField">NSTextField</string>
-						<string key="passwordView">NSView</string>
-						<string key="welcomeView">NSView</string>
 					</dictionary>
 					<dictionary class="NSMutableDictionary" key="toOneOutletInfosByName">
-						<object class="IBToOneOutletInfo" key="contentView">
+						<object class="IBToOneOutletInfo" key="openDocument">
-							<string key="name">contentView</string>
+							<string key="name">openDocument</string>
-							<string key="candidateClassName">NSView</string>
+							<string key="candidateClassName">NSButton</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="keyPathControl">
-							<string key="name">keyPathControl</string>
-							<string key="candidateClassName">NSPathControl</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="outlineView">
-							<string key="name">outlineView</string>
-							<string key="candidateClassName">NSOutlineView</string>
 						</object>
 						<object class="IBToOneOutletInfo" key="passwordTextField">
 							<string key="name">passwordTextField</string>
-							<string key="candidateClassName">NSTextField</string>
+							<string key="candidateClassName">NSSecureTextField</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="passwordView">
-							<string key="name">passwordView</string>
-							<string key="candidateClassName">NSView</string>
-						</object>
-						<object class="IBToOneOutletInfo" key="welcomeView">
-							<string key="name">welcomeView</string>
-							<string key="candidateClassName">NSView</string>
 						</object>
 					</dictionary>
 					<object class="IBClassDescriptionSource" key="sourceIdentifier">
 						<string key="majorKey">IBProjectSource</string>
-						<string key="minorKey">./Classes/MPMainWindowController.h</string>
+						<string key="minorKey">./Classes/MPPasswordInputController.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">