Enabled full Icon set by Joanna Olsen. Still needs minor cleanup

MacPass/MPIconHelper.h

@@ -34,12 +34,54 @@ typedef NS_ENUM(NSUInteger, MPIconType) {
   MPIconDisplay,
   MPIconEmail,
   MPIconMisc,
-  MPIconFileSave = 26,
-  MPIconTerminal = 30,
-  MPIconPrint = 31,
-  MPIconTrash = 43,
-  MPIconFolder = 48,
-  MPIconPhone = 68,
+  MPIconOrganizer,
+  MPIconASCII,
+  MPIconIcons,
+  MPIconEstablishedConnection,
+  MPIconMailFolder,
+  MPIconFileSave,
+  MPIconNFSUnmount,
+  MPIconQuickTime,
+  MPIconSecureTerminal,
+  MPIconTerminal,
+  MPIconPrint,
+  MPIconFileSystemView,
+  MPIconRun,
+  MPIconConfigure,
+  MPIconBrowserWindow,
+  MPIconArchive,
+  MPIconPercentage,
+  MPIconSambaUnmount,
+  MPIconHistory,
+  MPIconFindMail,
+  MPIconVector,
+  MPIconMemory,
+  MPIconTrash,
+  MPIconNotes,
+  MPIconCancel,
+  MPIconHelp,
+  MPIconPackage,
+  MPIconFolder,
+  MPIconFolderOpen,
+  MPIconFolderTar,
+  MPIconDecrypted,
+  MPIconEncrypted,
+  MPIconApply,
+  MPIconSignature,
+  MPIconThumbnail,
+  MPIconAddressBook,
+  MPIconTextView,
+  MPIconSecureAccount,
+  MPIconDevelopment,
+  MPIconHome,
+  MPIconServices,
+  MPIconTux,
+  MPIconFeather,
+  MPIconApple,
+  MPIconWiki,
+  MPIconMoney,
+  MPIconCertificat,
+  MPIconPhone,
   /* Custom Icons not used in Database */
   MPCustomIconTypeBegin = 1000,
   MPIconInfo,

MacPass/MPIconHelper.m

@@ -29,11 +29,11 @@
   dispatch_once(&onceToken, ^{
     NSDictionary *imageNames = [MPIconHelper availableIconNames];
     NSMutableArray *mutableIcons = [[NSMutableArray alloc] initWithCapacity:[imageNames count]];
-      
+    
     NSArray *sortedImageNames = [[imageNames allKeys] sortedArrayUsingComparator:^NSComparisonResult(id obj1, id obj2) {
-          return [[imageNames objectForKey:obj1] compare:[imageNames objectForKey:obj2]];
+      return [[imageNames objectForKey:obj1] compare:[imageNames objectForKey:obj2]];
     }];
-      
+    
     for(NSNumber *iconNumber in sortedImageNames) {
       if([iconNumber integerValue] > MPCustomIconTypeBegin) {
         continue; // Skip all non-db Keys
@@ -48,25 +48,25 @@
 
 
 + (NSArray *)databaseIconTypes {
-    static NSArray *iconTypes;
-    static dispatch_once_t onceToken;
-    dispatch_once(&onceToken, ^{
-        NSDictionary *imageNames = [MPIconHelper availableIconNames];
-        NSMutableArray *mutableIcons = [[NSMutableArray alloc] initWithCapacity:[imageNames count]];
-        
-        NSArray *sortedImageNames = [[imageNames allKeys] sortedArrayUsingComparator:^NSComparisonResult(id obj1, id obj2) {
-            return [[imageNames objectForKey:obj1] compare:[imageNames objectForKey:obj2]];
-        }];
-        
-        for(NSNumber *iconNumber in sortedImageNames) {
-            if([iconNumber integerValue] > MPCustomIconTypeBegin) {
-                continue; // Skip all non-db Keys
-            }
-            [mutableIcons addObject:iconNumber];
-        }
-        iconTypes = [mutableIcons copy];
-    });
-    return iconTypes;
+  static NSArray *iconTypes;
+  static dispatch_once_t onceToken;
+  dispatch_once(&onceToken, ^{
+    NSDictionary *imageNames = [MPIconHelper availableIconNames];
+    NSMutableArray *mutableIcons = [[NSMutableArray alloc] initWithCapacity:[imageNames count]];
+    
+    NSArray *sortedImageNames = [[imageNames allKeys] sortedArrayUsingComparator:^NSComparisonResult(id obj1, id obj2) {
+      return [[imageNames objectForKey:obj1] compare:[imageNames objectForKey:obj2]];
+    }];
+    
+    for(NSNumber *iconNumber in sortedImageNames) {
+      if([iconNumber integerValue] > MPCustomIconTypeBegin) {
+        continue; // Skip all non-db Keys
+      }
+      [mutableIcons addObject:iconNumber];
+    }
+    iconTypes = [mutableIcons copy];
+  });
+  return iconTypes;
 }
 
 
@@ -96,28 +96,71 @@
                    @(MPIconDisplay): @"18_DisplayTemplate",
                    @(MPIconEmail): @"19_EmailTemplate",
                    @(MPIconMisc): @"20_MiscTemplate",
-                   
+                   @(MPIconOrganizer): @"21_OrganizerTemplate",
+                   @(MPIconASCII): @"22_ASCIITemplate",
+                   @(MPIconIcons): @"23_IconsTemplate",
+                   @(MPIconEstablishedConnection): @"24_EstablishedConnectionTemplate",
+                   @(MPIconMailFolder): @"25_MailFolderTemplate",
                    @(MPIconFileSave): @"26_FileSaveTemplate",
-                   
+                   @(MPIconNFSUnmount) :@"27_NFSUnmountTemplate",
+                   @(MPIconQuickTime) : @"28_QuickTimeTemplate",
+                   @(MPIconSecureTerminal) : @"29_SecureTerminalTemplate",
                    @(MPIconTerminal) : @"30_TerminalTemplate",
                    @(MPIconPrint) : @"31_PrintTemplate",
-                   
+                   @(MPIconFileSystemView) : @"32_FileSystemViewTemplate",
+                   @(MPIconRun) : @"33_RunTemplate",
+                   @(MPIconConfigure) : @"34_ConfigureTemplate",
+                   @(MPIconBrowserWindow) : @"35_BrowserWindowTemplate",
+                   @(MPIconArchive) : @"36_ArchiveTemplate",
+                   @(MPIconPercentage) : @"37_PercentageTemplate",
+                   @(MPIconSambaUnmount) : @"38_SambaUnmountTemplate",
+                   @(MPIconHistory) : @"39_HistoryTemplate",
+                   @(MPIconFindMail) : @"40_FindMailTemplate",
+                   @(MPIconVector) : @"41_VectorTemplate",
+                   @(MPIconMemory) : @"42_MemoryTemplate",
                    @(MPIconTrash): @"43_TrashTemplate",
-                   
+                   @(MPIconNotes) : @"44_NotesTemplate",
+                   @(MPIconCancel) : @"45_CancelTemplate",
+                   @(MPIconHelp) : @"46_HelpTemplate",
+                   @(MPIconPackage) : @"47_PackageTemplate",
                    @(MPIconFolder): @"48_FolderTemplate",
-                   
+                   @(MPIconFolderOpen) : @"49_FolderOpenTemplate",
+                   @(MPIconFolderTar) : @"50_FolderTarTemplate",
+                   @(MPIconDecrypted) : @"51_DecryptedTemplate",
+                   @(MPIconEncrypted) : @"52_EncryptedTemplate",
+                   @(MPIconApply) : @"53_ApplyTemplate",
+                   @(MPIconSignature) : @"54_SignatureTemplate",
+                   @(MPIconThumbnail) : @"55_ThumbnailTemplate",
+                   @(MPIconAddressBook) : @"56_AddressBookTemplate",
+                   @(MPIconTextView) : @"57_TextViewTemplate",
+                   @(MPIconSecureAccount) : @"58_SecureAccountTemplate",
+                   @(MPIconDevelopment) : @"59_DevelopmentTemplate",
+                   @(MPIconHome) : @"60_HomeTemplate",
+                   @(MPIconServices) : @"61_ServicesTemplate",
+                   @(MPIconTux) : @"62_TuxTemplate",
+                   @(MPIconFeather) : @"63_FeatherTemplate",
+                   @(MPIconApple) : @"64_AppleTemplate",
+                   @(MPIconWiki) : @"65_WikiTemplate",
+                   @(MPIconMoney) : @"66_MoneyTemplate",
+                   @(MPIconCertificat) : @"67_CertificatTemplate",
                    @(MPIconPhone): @"68_PhoneTemplate",
-                   
-                   @(MPIconInfo): @"99_InfoTemplate",
-                   @(MPIconAddFolder): @"99_AddFolderTemplate",
-                   @(MPIconHardDisk): @"99_HarddiskTemplate",
-                   @(MPIconCreated): @"99_CreatedTemplate",
+                   /* Custom */
+                   @(MPIconInfo): @"infoTemplate",
+                   @(MPIconAddFolder): @"addFolderTemplate",
+                   @(MPIconHardDisk): @"harddiskTemplate",
+                   @(MPIconCreated): @"createdTemplate",
                    @(MPIconAddEntry): @"addEntryTemplate",
                    @(MPIconContextTriangle): @"contextTriangleTemplate",
                    
                    @(MPIconExpiredEntry): NSImageNameCaution,
                    @(MPIconExpiredGroup): NSImageNameCaution
                    };
+
+    
+
+    
+
+    
   });
   return imageNames;
 }

MacPass/MacPass-Info.plist

@@ -62,7 +62,7 @@
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>2557</string>
+	<string>2558</string>
 	<key>LSMinimumSystemVersion</key>
 	<string>${MACOSX_DEPLOYMENT_TARGET}</string>
 	<key>NSHumanReadableCopyright</key>