Added Icon supplied by Iiro Jäppinen

Added more KeePass Icon replacements

MacPass.xcodeproj/project.pbxproj

@@ -117,6 +117,10 @@
 		4C669BA016760ED100DD0774 /* Salsa20RandomStream.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7716760ED100DD0774 /* Salsa20RandomStream.m */; };
 		4C669BA216760ED100DD0774 /* UUID.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C669B7B16760ED100DD0774 /* UUID.m */; };
 		4C69A73A16D589DF00EC1B1A /* HNHGradientView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C69A73916D589DF00EC1B1A /* HNHGradientView.m */; };
+		4C6D1D25178579570014C5A5 /* 48_FolderTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C6D1D24178579570014C5A5 /* 48_FolderTemplate.pdf */; };
+		4C6D1D27178586CA0014C5A5 /* 99_AddFolderTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C6D1D26178586CA0014C5A5 /* 99_AddFolderTemplate.pdf */; };
+		4C6D1D2B17858A250014C5A5 /* MacPass.icns in Resources */ = {isa = PBXBuildFile; fileRef = 4C6D1D2A17858A250014C5A5 /* MacPass.icns */; };
+		4C701CBC178618A000581B88 /* 12_RemoteTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C701CBB178618A000581B88 /* 12_RemoteTemplate.pdf */; };
 		4C74DD07177BD1640034A9DB /* MPCustomFieldView.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C74DD06177BD1640034A9DB /* MPCustomFieldView.m */; };
 		4C76155C1764C04C0015A1A6 /* GeneralSettings.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C76155E1764C04C0015A1A6 /* GeneralSettings.xib */; };
 		4C7615631764C08C0015A1A6 /* PasswordEditView.xib in Resources */ = {isa = PBXBuildFile; fileRef = 4C7615651764C08C0015A1A6 /* PasswordEditView.xib */; };
@@ -407,6 +411,10 @@
 		4C669B7B16760ED100DD0774 /* UUID.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UUID.m; sourceTree = "<group>"; };
 		4C69A73816D589DF00EC1B1A /* HNHGradientView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHGradientView.h; sourceTree = "<group>"; };
 		4C69A73916D589DF00EC1B1A /* HNHGradientView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHGradientView.m; sourceTree = "<group>"; };
+		4C6D1D24178579570014C5A5 /* 48_FolderTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 48_FolderTemplate.pdf; sourceTree = "<group>"; };
+		4C6D1D26178586CA0014C5A5 /* 99_AddFolderTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 99_AddFolderTemplate.pdf; sourceTree = "<group>"; };
+		4C6D1D2A17858A250014C5A5 /* MacPass.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = MacPass.icns; path = "../Assets/App icon/MacPass.icns"; sourceTree = "<group>"; };
+		4C701CBB178618A000581B88 /* 12_RemoteTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 12_RemoteTemplate.pdf; sourceTree = "<group>"; };
 		4C74DD05177BD1640034A9DB /* MPCustomFieldView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPCustomFieldView.h; sourceTree = "<group>"; };
 		4C74DD06177BD1640034A9DB /* MPCustomFieldView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPCustomFieldView.m; sourceTree = "<group>"; };
 		4C76155F1764C0590015A1A6 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/GeneralSettings.xib; sourceTree = "<group>"; };
@@ -867,8 +875,11 @@
 				4CD78AB916D155FF00768A1D /* 09_IdentityTemplate.pdf */,
 				4CD78ABA16D155FF00768A1D /* 10_ContactTemplate.pdf */,
 				4CD78ABB16D155FF00768A1D /* 11_CameraTemplate.pdf */,
+				4C701CBB178618A000581B88 /* 12_RemoteTemplate.pdf */,
 				4C7714A9176C998F00549F2A /* 43_TrashTemplate.pdf */,
+				4C6D1D24178579570014C5A5 /* 48_FolderTemplate.pdf */,
 				4C7714AB176C9D4600549F2A /* 99_InfoTemplate.pdf */,
+				4C6D1D26178586CA0014C5A5 /* 99_AddFolderTemplate.pdf */,
 			);
 			path = Icons;
 			sourceTree = "<group>";
@@ -1031,6 +1042,7 @@
 		4C77E36D15B84A240093A587 /* Supporting Files */ = {
 			isa = PBXGroup;
 			children = (
+				4C6D1D2A17858A250014C5A5 /* MacPass.icns */,
 				4C888C8E16EB6C91003D34A1 /* Localizable.strings */,
 				4CB9339716D3A0DD00A13B5D /* Credits.rtf */,
 				4C77E36E15B84A240093A587 /* MacPass-Info.plist */,
@@ -1327,6 +1339,10 @@
 				4CF7805F176E75110032EE71 /* ServerSettings.xib in Resources */,
 				4C7F35681779DFFB00C57890 /* Errors.strings in Resources */,
 				4CD5D702177A5EE400100649 /* DocumentSettingsWindow.xib in Resources */,
+				4C6D1D25178579570014C5A5 /* 48_FolderTemplate.pdf in Resources */,
+				4C6D1D27178586CA0014C5A5 /* 99_AddFolderTemplate.pdf in Resources */,
+				4C6D1D2B17858A250014C5A5 /* MacPass.icns in Resources */,
+				4C701CBC178618A000581B88 /* 12_RemoteTemplate.pdf in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};

MacPass/Kdb4Tree+NewTree.h

@@ -11,5 +11,6 @@
 @interface Kdb4Tree (NewTree)
 
 +(Kdb4Tree *)templateTree;
++(Kdb4Tree *)demoTree;
 
 @end

MacPass/Kdb4Tree+NewTree.m

@@ -74,4 +74,50 @@
   return tree;
 }
 
++ (Kdb4Tree *)demoTree {
+  NSDate *currentTime = [NSDate date];
+  
+  Kdb4Tree *tree = [[Kdb4Tree alloc] init];
+  tree.generator = @"MacPass";
+  tree.databaseName = @"Icon Demonstation";
+  tree.databaseNameChanged = currentTime;
+  tree.databaseDescription = @"This database just has all default icons as groups in the tree";
+  tree.databaseDescriptionChanged = currentTime;
+  tree.defaultUserName = @"";
+  tree.defaultUserNameChanged = currentTime;
+  tree.maintenanceHistoryDays = 365;
+  tree.color = @"";
+  tree.masterKeyChanged = currentTime;
+  tree.masterKeyChangeRec = -1;
+  tree.masterKeyChangeForce = -1;
+  tree.protectTitle = NO;
+  tree.protectUserName = NO;
+  tree.protectPassword = YES;
+  tree.protectUrl = NO;
+  tree.protectNotes = NO;
+  tree.recycleBinEnabled = YES;
+  tree.recycleBinUuid = [UUID nullUuid];
+  tree.recycleBinChanged = currentTime;
+  tree.entryTemplatesGroup = [UUID nullUuid];
+  tree.entryTemplatesGroupChanged = currentTime;
+  tree.historyMaxItems = 10;
+  tree.historyMaxSize = 6 * 1024 * 1024; // 6 MB
+  tree.lastSelectedGroup = [UUID nullUuid];
+  tree.lastTopVisibleGroup = [UUID nullUuid];
+  
+  KdbGroup *parentGroup = [tree createGroup:nil];
+  parentGroup.name = @"General";
+  parentGroup.image = 48;
+  tree.root = parentGroup;
+  
+  for(NSUInteger iImageIndex = 0; iImageIndex < 69; iImageIndex++) {
+    KdbGroup *group = [tree createGroup:parentGroup];
+    group.name = [NSString stringWithFormat:@"Group %ld", iImageIndex];
+    group.image = iImageIndex;
+    [parentGroup addGroup:group];
+  }
+  
+  return tree;
+}
+
 @end

MacPass/MPDocument.m

@@ -83,6 +83,7 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
         break;
       case MPDatabaseVersion4:
         self.tree = [Kdb4Tree templateTree];
+        //self.tree = [Kdb4Tree demoTree];
         break;
       default:
         self = nil;
@@ -117,6 +118,7 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
 }
 
 - (BOOL)readFromURL:(NSURL *)url ofType:(NSString *)typeName error:(NSError **)outError {
+  /* FIXME: Logfile handling
   self.lockFileURL = [url URLByAppendingPathExtension:@"lock"];
   if([[NSFileManager defaultManager] fileExistsAtPath:[_lockFileURL path]]) {
     self.readOnly = YES;
@@ -126,6 +128,7 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
     _didLockFile = YES;
     self.readOnly = NO;
   }
+   */
   self.decrypted = NO;
   return YES;
 }
@@ -301,6 +304,7 @@ NSString *const MPDocumentGroupKey                    = @"MPDocumentGroupKey";
   }
   KdbGroup *newGroup = [self.tree createGroup:parent];
   newGroup.name = NSLocalizedString(@"DEFAULT_GROUP_NAME", @"Title for a newly created group");
+  newGroup.image = MPIconFolder;
   [self group:parent addGroup:newGroup atIndex:[parent.groups count]];
   NSDictionary *userInfo = @{ MPDocumentGroupKey : newGroup };
   [[NSNotificationCenter defaultCenter] postNotificationName:MPDocumentDidAddGroupNotification object:self userInfo:userInfo];

MacPass/MPIconHelper.h

@@ -20,8 +20,12 @@ typedef NS_ENUM(NSUInteger, MPIconType) {
   MPIconIdentity,
   MPIconContact,
   MPIconCamera,
-  MPIconTrash,
-  MPIconInfo
+  MPIconRemote,
+  MPIconTrash = 43,
+  MPIconFolder = 48,
+  /* Custom Icons not used in Database */
+  MPIconInfo = 1000,
+  MPIconAddFolder
 };
 
 @interface MPIconHelper : NSObject

MacPass/MPIconHelper.m

@@ -10,13 +10,17 @@
 
 @implementation MPIconHelper
 
+static NSDictionary *icons;
+
 + (NSImage *)icon:(MPIconType)type {
-  NSDictionary *icons = [MPIconHelper availableIconNames];
-  if(type >= [icons count]) {
-    return [NSImage imageNamed:NSImageNameActionTemplate];
+  if(!icons) {
+    icons =   [MPIconHelper availableIconNames];
   }
-  NSString *imageName = icons[@(type)];
-  return [[NSBundle mainBundle] imageForResource:imageName];
+  if([[icons allKeys] containsObject:@(type)]) {
+    NSString *imageName = icons[@(type)];
+    return [[NSBundle mainBundle] imageForResource:imageName];
+  }
+  return [NSImage imageNamed:NSImageNameActionTemplate];
 }
 
 + (NSArray *)availableIcons {
@@ -30,20 +34,26 @@
 }
 
 + (NSDictionary *)availableIconNames {
-  NSDictionary *imageNames = @{ @(MPIconKlipper): @"04_KlipperTemplate",
-                                @(MPIconLanguages): @"05_LanguagesTemplate",
-                                @(MPIconPackageNetwork): @"01_PackageNetworkTemplate",
-                                @(MPIconPassword): @"00_PasswordTemplate",
-                                @(MPIconServer): @"03_ServerTemplate",
-                                @(MPIconWarning): @"02_MessageBoxWarningTemplate",
-                                @(MPIconCamera): @"11_CameraTemplate",
-                                @(MPIconContact): @"10_ContactTemplate",
-                                @(MPIconIdentity): @"09_IdentityTemplate",
-                                @(MPIconNotepad): @"07_NotepadTemplate",
-                                @(MPIconSocket): @"08_SocketTemplate",
-                                @(MPIconTrash): @"43_TrashTemplate",
-                                @(MPIconInfo): @"99_InfoTemplate"
-                                };
+  NSDictionary *imageNames = @{
+                               @(MPIconPassword): @"00_PasswordTemplate",
+                               @(MPIconPackageNetwork): @"01_PackageNetworkTemplate",
+                               @(MPIconWarning): @"02_MessageBoxWarningTemplate",
+                               @(MPIconServer): @"03_ServerTemplate",
+                               @(MPIconKlipper): @"04_KlipperTemplate",
+                               @(MPIconLanguages): @"05_LanguagesTemplate",
+                               
+                               @(MPIconNotepad): @"07_NotepadTemplate",
+                               @(MPIconSocket): @"08_SocketTemplate",
+                               @(MPIconIdentity): @"09_IdentityTemplate",
+                               @(MPIconContact): @"10_ContactTemplate",
+                               @(MPIconCamera): @"11_CameraTemplate",
+                               @(MPIconRemote): @"12_RemoteTemplate",
+
+                               @(MPIconTrash): @"43_TrashTemplate",
+                               @(MPIconFolder): @"48_FolderTemplate",
+                               @(MPIconInfo): @"99_InfoTemplate",
+                               @(MPIconAddFolder): @"99_AddFolderTemplate"
+                               };
   return imageNames;
 }
 

MacPass/MPToolbarDelegate.m

@@ -121,7 +121,7 @@ NSString *const MPToolbarItemInspector = @"TOOLBAR_INSPECTOR";
 - (NSDictionary *)createToolbarImages{
   NSDictionary *imageDict = @{ MPToolbarItemLock: [NSImage imageNamed:NSImageNameLockUnlockedTemplate],
                                MPToolbarItemAddEntry: [MPIconHelper icon:MPIconPassword],
-                               MPToolbarItemAddGroup: [MPIconHelper icon:MPIconPassword],
+                               MPToolbarItemAddGroup: [MPIconHelper icon:MPIconAddFolder],
                                MPToolbarItemDelete: [MPIconHelper icon:MPIconTrash],
                                MPToolbarItemAction: [NSImage imageNamed:NSImageNameActionTemplate],
                                MPToolbarItemInspector: [MPIconHelper icon:MPIconInfo],

MacPass/MacPass-Info.plist

@@ -34,7 +34,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIconFile</key>
-	<string></string>
+	<string>MacPass</string>
 	<key>CFBundleIdentifier</key>
 	<string>com.hicknhacksoftware.${PRODUCT_NAME:rfc1034identifier}</string>
 	<key>CFBundleInfoDictionaryVersion</key>
@@ -44,11 +44,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2</string>
+	<string>0.2.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>1883</string>
+	<string>1906</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>

MacPass/OutlineView.xib

@@ -57,6 +57,7 @@
 								<string key="NSFrame">{{7, 5}, {32, 19}}</string>
 								<reference key="NSSuperview" ref="789399035"/>
 								<reference key="NSWindow"/>
+								<reference key="NSNextKeyView"/>
 								<string key="NSReuseIdentifierKey">_NS:9</string>
 								<bool key="NSEnabled">YES</bool>
 								<object class="NSButtonCell" key="NSCell" id="573415016">
@@ -156,7 +157,7 @@
 														<int key="NSfFlags">1044</int>
 													</object>
 													<reference key="NSControlView" ref="920491699"/>
-													<object class="NSColor" key="NSBackgroundColor" id="501306061">
+													<object class="NSColor" key="NSBackgroundColor">
 														<int key="NSColorSpace">6</int>
 														<string key="NSCatalogName">System</string>
 														<string key="NSColorName">controlBackgroundColor</string>
@@ -224,7 +225,6 @@
 								<reference key="NSNextKeyView" ref="920491699"/>
 								<string key="NSReuseIdentifierKey">_NS:11</string>
 								<reference key="NSDocView" ref="920491699"/>
-								<reference key="NSBGColor" ref="501306061"/>
 								<int key="NScvFlags">4</int>
 							</object>
 							<object class="NSScroller" id="1009004098">
@@ -370,6 +370,7 @@
 								<object class="NSImageView" id="273100869">
 									<reference key="NSNextResponder" ref="980203382"/>
 									<int key="NSvFlags">268</int>
+									<array class="NSMutableArray" key="NSSubviews"/>
 									<set class="NSMutableSet" key="NSDragTypes">
 										<string>Apple PDF pasteboard type</string>
 										<string>Apple PICT pasteboard type</string>
@@ -392,7 +393,7 @@
 										</object>
 										<string key="NSCellIdentifier">_NS:71</string>
 										<int key="NSAlign">0</int>
-										<int key="NSScale">0</int>
+										<int key="NSScale">2</int>
 										<int key="NSStyle">0</int>
 										<bool key="NSAnimates">NO</bool>
 									</object>

MacPass/de.lproj/Credits.rtf

@@ -26,6 +26,11 @@ You should have received a copy of the GNU General Public License along with thi
 \
 
 \b Credits:\
+\
+
+\b0 MacPass Icon von {\field{\*\fldinst{HYPERLINK "http://iiro.jappinen.me"}}{\fldrslt Iiro J\'e4ppinen}}
+\b \
+\
 {\field{\*\fldinst{HYPERLINK "https://github.com/robbiehanson/KissXML"}}{\fldrslt 
 \b0 \cf2 KissXML}}
 \b0 \cf3 \
@@ -44,4 +49,4 @@ Copyright \'a9 2011, Alex Rozanski. Alle Rechte vorbehalten.\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 {\field{\*\fldinst{HYPERLINK "http://stackoverflow.com/questions/11386876/how-to-encode-and-decode-files-as-base64-in-cocoa-objective-c"}}{\fldrslt \cf3 Base64 Encoding Category}}\
-Copyright @2013, {\field{\*\fldinst{HYPERLINK "http://stackoverflow.com/users/200321/denis2342"}}{\fldrslt \cf3 denis2342}}}
+Copyright @2013, {\field{\*\fldinst{HYPERLINK "http://stackoverflow.com/users/200321/denis2342"}}{\fldrslt denis2342}}}

MacPass/en.lproj/Credits.rtf

@@ -1,7 +1,7 @@
 {\rtf1\ansi\ansicpg1252\cocoartf1187\cocoasubrtf390
 {\fonttbl\f0\fswiss\fcharset0 Helvetica;}
 {\colortbl;\red255\green255\blue255;\red52\green110\blue183;\red38\green38\blue38;}
-\paperw11900\paperh16840\vieww27740\viewh14060\viewkind0
+\paperw11900\paperh16840\vieww25780\viewh19380\viewkind0
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
 \f0\b\fs24 \cf0 Project Website:\
@@ -23,14 +23,22 @@ This program is distributed in the hope that it will be useful, but WITHOUT ANY
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for more details.\
 \
 You should have received a copy of the GNU General Public License along with this program.  If not, see {\field{\*\fldinst{HYPERLINK "http://www.gnu.org/licenses/"}}{\fldrslt http://www.gnu.org/licenses/}}.\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
+\cf0 \kerning1\expnd0\expndtw3
 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 
-\b Credits:\
-{\field{\*\fldinst{HYPERLINK "https://github.com/robbiehanson/KissXML"}}{\fldrslt 
-\b0 \cf2 KissXML}}
-\b0 \cf3 \
+\b \cf0 \kerning1\expnd0\expndtw0 Credits:\
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
+
+\b0 \cf2 \
+\pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
+\cf0 MacPass\kerning1\expnd0\expndtw3
+ \kerning1\expnd0\expndtw0 Icon by {\field{\*\fldinst{HYPERLINK "http://iiro.jappinen.me"}}{\fldrslt Iiro J\'e4ppinen}}\cf2 \
+\
+{\field{\*\fldinst{HYPERLINK "https://github.com/robbiehanson/KissXML"}}{\fldrslt \cf2 KissXML}}\cf3 \
 Copyright \'a9 2012 Robbie Hanson. All rights reserved.\
-	\
+\
 {\field{\*\fldinst{HYPERLINK "https://github.com/MiniKeePass/MiniKeePass"}}{\fldrslt \cf2 MiniKeePass}}\
 Copyright \'a9 2011 Jason Rush and John Flanagan. All rights reserved.\
 	\
@@ -44,4 +52,4 @@ Copyright \'a9 2011, Alex Rozanski. All rights reserved.\
 \
 \pard\tx560\tx1120\tx1680\tx2240\tx2800\tx3360\tx3920\tx4480\tx5040\tx5600\tx6160\tx6720
 {\field{\*\fldinst{HYPERLINK "http://stackoverflow.com/questions/11386876/how-to-encode-and-decode-files-as-base64-in-cocoa-objective-c"}}{\fldrslt \cf3 Base64 Encoding Category}}\
-Copyright @2013, {\field{\*\fldinst{HYPERLINK "http://stackoverflow.com/users/200321/denis2342"}}{\fldrslt \cf3 denis2342}}}
+Copyright @2013, {\field{\*\fldinst{HYPERLINK "http://stackoverflow.com/users/200321/denis2342"}}{\fldrslt denis2342}}}