diff --git a/MacPass.xcodeproj/project.pbxproj b/MacPass.xcodeproj/project.pbxproj index b0c1ce7a..53a0e0b4 100644 --- a/MacPass.xcodeproj/project.pbxproj +++ b/MacPass.xcodeproj/project.pbxproj @@ -172,7 +172,6 @@ 4C6C72C417C01E4200768849 /* NSMutableData+KeePassKit.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C6C72C317C01E4200768849 /* NSMutableData+KeePassKit.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 */; }; 4C6F228919A4A7F90012310C /* MPAutotypeClear.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C6F228819A4A7F90012310C /* MPAutotypeClear.m */; }; 4C6F228C19A4AA700012310C /* MPAutotypeDelay.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C6F228B19A4AA700012310C /* MPAutotypeDelay.m */; }; 4C6FDD2117BC4F4C004AEEC8 /* KPKTestPlaceholder.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C6FDD2017BC4F4C004AEEC8 /* KPKTestPlaceholder.m */; }; @@ -201,6 +200,7 @@ 4C7ABA4B17BAEC6700FF5799 /* 19_EmailTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C7ABA4617BAEC6700FF5799 /* 19_EmailTemplate.pdf */; }; 4C7ABA4C17BAEC6700FF5799 /* 20_MiscTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C7ABA4717BAEC6700FF5799 /* 20_MiscTemplate.pdf */; }; 4C7ABA4E17BAEC7000FF5799 /* addEntryTemplate.pdf in Resources */ = {isa = PBXBuildFile; fileRef = 4C7ABA4D17BAEC7000FF5799 /* addEntryTemplate.pdf */; }; + 4C7BD07619FE94C900C7AA5C /* MacPassImages.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 4C7BD07519FE94C900C7AA5C /* MacPassImages.xcassets */; }; 4C80BB6F176DE06F00E5E248 /* HNHScrollDocumentViewAdapter.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C80BB6E176DE06F00E5E248 /* HNHScrollDocumentViewAdapter.m */; }; 4C811C8316ECD06E00C4BAC6 /* MPKeyfilePathControlDelegate.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C811C8216ECD06E00C4BAC6 /* MPKeyfilePathControlDelegate.m */; }; 4C83814215BF4677001AE468 /* MPDocumentWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 4C83814115BF4677001AE468 /* MPDocumentWindowController.m */; }; @@ -681,7 +681,6 @@ 4C6C72C317C01E4200768849 /* NSMutableData+KeePassKit.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = "NSMutableData+KeePassKit.m"; sourceTree = ""; }; 4C6D1D24178579570014C5A5 /* 48_FolderTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 48_FolderTemplate.pdf; sourceTree = ""; }; 4C6D1D26178586CA0014C5A5 /* 99_AddFolderTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = 99_AddFolderTemplate.pdf; path = Icons/99_AddFolderTemplate.pdf; sourceTree = ""; }; - 4C6D1D2A17858A250014C5A5 /* MacPass.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = MacPass.icns; path = "../Assets/App icon/MacPass.icns"; sourceTree = ""; }; 4C6F228719A4A7F90012310C /* MPAutotypeClear.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPAutotypeClear.h; sourceTree = ""; }; 4C6F228819A4A7F90012310C /* MPAutotypeClear.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = MPAutotypeClear.m; sourceTree = ""; }; 4C6F228A19A4AA700012310C /* MPAutotypeDelay.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPAutotypeDelay.h; sourceTree = ""; }; @@ -731,6 +730,7 @@ 4C7ABA4617BAEC6700FF5799 /* 19_EmailTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 19_EmailTemplate.pdf; sourceTree = ""; }; 4C7ABA4717BAEC6700FF5799 /* 20_MiscTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; path = 20_MiscTemplate.pdf; sourceTree = ""; }; 4C7ABA4D17BAEC7000FF5799 /* addEntryTemplate.pdf */ = {isa = PBXFileReference; lastKnownFileType = image.pdf; name = addEntryTemplate.pdf; path = Icons/addEntryTemplate.pdf; sourceTree = ""; }; + 4C7BD07519FE94C900C7AA5C /* MacPassImages.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = MacPassImages.xcassets; sourceTree = ""; }; 4C80BB6D176DE06F00E5E248 /* HNHScrollDocumentViewAdapter.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HNHScrollDocumentViewAdapter.h; sourceTree = ""; }; 4C80BB6E176DE06F00E5E248 /* HNHScrollDocumentViewAdapter.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HNHScrollDocumentViewAdapter.m; sourceTree = ""; }; 4C811C8116ECD06E00C4BAC6 /* MPKeyfilePathControlDelegate.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MPKeyfilePathControlDelegate.h; sourceTree = ""; }; @@ -1593,6 +1593,7 @@ 4C37A84215B8B495005EF8EE /* Model */, 4C37A84115B8B47D005EF8EE /* Delegates */, 4C77E36D15B84A240093A587 /* Supporting Files */, + 4C7BD07519FE94C900C7AA5C /* MacPassImages.xcassets */, ); path = MacPass; sourceTree = ""; @@ -1601,7 +1602,6 @@ isa = PBXGroup; children = ( 4CA3531118A5577300839B0F /* dsa_sparkle_pub.pem */, - 4C6D1D2A17858A250014C5A5 /* MacPass.icns */, 4C888C8E16EB6C91003D34A1 /* Localizable.strings */, 4CB9339716D3A0DD00A13B5D /* Credits.rtf */, 4C77E36E15B84A240093A587 /* MacPass-Info.plist */, @@ -2215,11 +2215,11 @@ 6021FE9818E1650F00C3BC51 /* DatabaseSettingsWindow.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 */, 4C366643178748F500B249F1 /* 99_HarddiskTemplate.pdf in Resources */, 4C2C8B341787500E009649F3 /* UnprotectedWarningView.xib in Resources */, 4CF29BF417879D0000851B60 /* 26_FileSaveTemplate.pdf in Resources */, + 4C7BD07619FE94C900C7AA5C /* MacPassImages.xcassets in Resources */, 4C52A88E1788628B00868229 /* 06_BlockDeviceTemplate.pdf in Resources */, 4C52A88F1788628B00868229 /* 13_KeysTemplate.pdf in Resources */, 4C52A8901788628B00868229 /* 18_DisplayTemplate.pdf in Resources */, @@ -2855,6 +2855,7 @@ 4C77E38115B84A240093A587 /* Debug */ = { isa = XCBuildConfiguration; buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = MacPassAppIcon; CLANG_ENABLE_OBJC_ARC = YES; "CODE_SIGN_IDENTITY[sdk=macosx*]" = ""; COMBINE_HIDPI_IMAGES = YES; @@ -2876,6 +2877,7 @@ 4C77E38215B84A240093A587 /* Release */ = { isa = XCBuildConfiguration; buildSettings = { + ASSETCATALOG_COMPILER_APPICON_NAME = MacPassAppIcon; CLANG_ENABLE_OBJC_ARC = YES; "CODE_SIGN_IDENTITY[sdk=macosx*]" = ""; COMBINE_HIDPI_IMAGES = YES; diff --git a/MacPass/MacPass-Info.plist b/MacPass/MacPass-Info.plist index 7e9a7889..6d787ca9 100644 --- a/MacPass/MacPass-Info.plist +++ b/MacPass/MacPass-Info.plist @@ -41,8 +41,6 @@ CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleIconFile - MacPass CFBundleIdentifier com.hicknhacksoftware.${PRODUCT_NAME:rfc1034identifier} CFBundleInfoDictionaryVersion diff --git a/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/Contents.json b/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/Contents.json new file mode 100644 index 00000000..7cd4f8e1 --- /dev/null +++ b/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "icon_16x16.png", + "scale" : "1x" + }, + { + "size" : "16x16", + "idiom" : "mac", + "filename" : "icon_16x16@2x.png", + "scale" : "2x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "icon_32x32.png", + "scale" : "1x" + }, + { + "size" : "32x32", + "idiom" : "mac", + "filename" : "icon_32x32@2x.png", + "scale" : "2x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "icon_128x128.png", + "scale" : "1x" + }, + { + "size" : "128x128", + "idiom" : "mac", + "filename" : "icon_128x128@2x.png", + "scale" : "2x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "icon_256x256.png", + "scale" : "1x" + }, + { + "size" : "256x256", + "idiom" : "mac", + "filename" : "icon_256x256@2x.png", + "scale" : "2x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "icon_512x512.png", + "scale" : "1x" + }, + { + "size" : "512x512", + "idiom" : "mac", + "filename" : "icon_512x512@2x.png", + "scale" : "2x" + } + ], + "info" : { + "version" : 1, + "author" : "xcode" + } +} \ No newline at end of file diff --git a/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_128x128.png b/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_128x128.png new file mode 100644 index 00000000..677d7a43 Binary files /dev/null and b/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_128x128.png differ diff --git a/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_128x128@2x.png b/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_128x128@2x.png new file mode 100644 index 00000000..5173672d Binary files /dev/null and b/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_128x128@2x.png differ diff --git a/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_16x16.png b/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_16x16.png new file mode 100644 index 00000000..7ec3301f Binary files /dev/null and b/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_16x16.png differ diff --git a/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_16x16@2x.png b/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_16x16@2x.png new file mode 100644 index 00000000..e31ad283 Binary files /dev/null and b/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_16x16@2x.png differ diff --git a/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_256x256.png b/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_256x256.png new file mode 100644 index 00000000..5173672d Binary files /dev/null and b/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_256x256.png differ diff --git a/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_256x256@2x.png b/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_256x256@2x.png new file mode 100644 index 00000000..079f8930 Binary files /dev/null and b/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_256x256@2x.png differ diff --git a/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_32x32.png b/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_32x32.png new file mode 100644 index 00000000..e31ad283 Binary files /dev/null and b/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_32x32.png differ diff --git a/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_32x32@2x.png b/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_32x32@2x.png new file mode 100644 index 00000000..b296dd6d Binary files /dev/null and b/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_32x32@2x.png differ diff --git a/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_512x512.png b/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_512x512.png new file mode 100644 index 00000000..079f8930 Binary files /dev/null and b/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_512x512.png differ diff --git a/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_512x512@2x.png b/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_512x512@2x.png new file mode 100644 index 00000000..b52616be Binary files /dev/null and b/MacPass/MacPassImages.xcassets/MacPassAppIcon.appiconset/icon_512x512@2x.png differ