Fixed memory leak in MPDatabaseDocument

Added more Icons

MacPass/MPDatabaseDocument.m

@@ -83,6 +83,14 @@ NSString *const MPDidLoadDataBaseNotification = @"DidLoadDataBaseNotification";
   return self;
 }
 
+- (void)dealloc
+{
+  self.tree = nil;
+  self.file = nil;
+  self.password = nil;
+  [super dealloc];
+}
+
 - (KdbGroup *)root {
   return [self.tree root];
 }

MacPass/MPIconHelper.h

@@ -14,7 +14,12 @@ typedef enum {
   MPIconWarning,
   MPIconServer,
   MPIconKlipper,
-  MPIconLanguages
+  MPIconLanguages,
+  MPIconNotepad,
+  MPIconSocket,
+  MPIconIdentity,
+  MPIconContact,
+  MPIconCamera
 } MPIconType;
 
 @interface MPIconHelper : NSObject

MacPass/MPIconHelper.m

@@ -23,8 +23,13 @@
                                 @(MPIconPackageNetwork): @"01_PackageNetworkTemplate",
                                 @(MPIconPassword): @"00_PasswordTemplate",
                                 @(MPIconServer): @"03_ServerTemplate",
-                                @(MPIconWarning): @"02_MessageBoxWarningTemplate" };
-  
+                                @(MPIconWarning): @"02_MessageBoxWarningTemplate",
+                                @(MPIconCamera): @"11_CameraTemplate",
+                                @(MPIconContact): @"10_ContactTemplate",
+                                @(MPIconIdentity): @"09_IdentityTemplate",
+                                @(MPIconNotepad): @"07_NotepadTemplate",
+                                @(MPIconSocket): @"08_SocketTemplate"
+                                };
   return imageNames;
 }
 

MacPass/MPMainWindowController.m

@@ -91,8 +91,8 @@ NSString *const kOutlineViewIdentifier = @"OutlineView";
   NSSize frameSize = [self.contentView frame].size;
   [self.passwordView setFrame:NSMakeRect(0,0, frameSize.width, frameSize.height)];
   [self.contentView setAutoresizesSubviews:YES];
-  [self.contentView addSubview:self.passwordView];
-  
+  [self.contentView replaceSubview:self.welcomeView with:self.passwordView];
+  [self.window makeFirstResponder:self.passwordView];
 }
 
 - (void)usePassword:(id)sender {

MacPass/PasswordView.xib

@@ -173,6 +173,7 @@
 						<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">
@@ -185,7 +186,7 @@
 							<int key="NSButtonFlags">-2038284288</int>
 							<int key="NSButtonFlags2">129</int>
 							<string key="NSAlternateContents"/>
-							<string key="NSKeyEquivalent"/>
+							<string type="base64-UTF8" key="NSKeyEquivalent">DQ</string>
 							<int key="NSPeriodicDelay">200</int>
 							<int key="NSPeriodicInterval">25</int>
 						</object>
@@ -706,6 +707,7 @@
 						<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">
@@ -728,6 +730,10 @@
 							<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>