diff --git a/clients/osx/Perkeep.xcodeproj/project.pbxproj b/clients/osx/Perkeep.xcodeproj/project.pbxproj index 0ff6d5b21..34d418605 100644 --- a/clients/osx/Perkeep.xcodeproj/project.pbxproj +++ b/clients/osx/Perkeep.xcodeproj/project.pbxproj @@ -9,7 +9,6 @@ /* Begin PBXBuildFile section */ DA31F9381866744D002E3F33 /* TimeTravelWindowController.m in Sources */ = {isa = PBXBuildFile; fileRef = DA31F9361866744D002E3F33 /* TimeTravelWindowController.m */; }; DA31F9391866744D002E3F33 /* TimeTravelWindowController.xib in Resources */ = {isa = PBXBuildFile; fileRef = DA31F9371866744D002E3F33 /* TimeTravelWindowController.xib */; }; - DA71BCB718642A3A000A102C /* PerkeepIcon.icns in Resources */ = {isa = PBXBuildFile; fileRef = DA71BCB618642A3A000A102C /* PerkeepIcon.icns */; }; DAABA574186435DA000D62B6 /* perkeepd in Resources */ = {isa = PBXBuildFile; fileRef = DAABA572186435DA000D62B6 /* perkeepd */; }; DAABA575186435DA000D62B6 /* pk-mount in Resources */ = {isa = PBXBuildFile; fileRef = DAABA573186435DA000D62B6 /* pk-mount */; }; DAABA57718643710000D62B6 /* Credits.html in Resources */ = {isa = PBXBuildFile; fileRef = DAABA57618643710000D62B6 /* Credits.html */; }; @@ -53,7 +52,6 @@ DA31F9351866744D002E3F33 /* TimeTravelWindowController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = TimeTravelWindowController.h; sourceTree = ""; }; DA31F9361866744D002E3F33 /* TimeTravelWindowController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = TimeTravelWindowController.m; sourceTree = ""; }; DA31F9371866744D002E3F33 /* TimeTravelWindowController.xib */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.xib; path = TimeTravelWindowController.xib; sourceTree = ""; }; - DA71BCB618642A3A000A102C /* PerkeepIcon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = PerkeepIcon.icns; sourceTree = ""; }; DAABA572186435DA000D62B6 /* perkeepd */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = perkeepd; path = ../../bin/perkeepd; sourceTree = ""; }; DAABA573186435DA000D62B6 /* pk-mount */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.executable"; name = "pk-mount"; path = "../../bin/pk-mount"; sourceTree = ""; }; DAABA57618643710000D62B6 /* Credits.html */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.html; path = Credits.html; sourceTree = ""; }; @@ -172,7 +170,6 @@ isa = PBXGroup; children = ( DAABA57618643710000D62B6 /* Credits.html */, - DA71BCB618642A3A000A102C /* PerkeepIcon.icns */, DAF1097F1863F1F900F6A3F9 /* menuicon-selected.png */, DAF109801863F1F900F6A3F9 /* menuicon-selected@2x.png */, DAF109811863F1F900F6A3F9 /* menuicon.png */, @@ -305,7 +302,6 @@ DAF109531863EDAF00F6A3F9 /* InfoPlist.strings in Resources */, DAF109841863F1F900F6A3F9 /* menuicon-selected@2x.png in Resources */, DAF109861863F1F900F6A3F9 /* menuicon@2x.png in Resources */, - DA71BCB718642A3A000A102C /* PerkeepIcon.icns in Resources */, DAABA57718643710000D62B6 /* Credits.html in Resources */, DAF109611863EDAF00F6A3F9 /* Images.xcassets in Resources */, DAF109851863F1F900F6A3F9 /* menuicon.png in Resources */, diff --git a/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/Contents.json b/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/Contents.json index 2db2b1c7c..5517fa70d 100644 --- a/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/Contents.json +++ b/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/Contents.json @@ -1,48 +1,57 @@ { "images" : [ { - "idiom" : "mac", "size" : "16x16", + "idiom" : "mac", + "filename" : "keepy-16.png", "scale" : "1x" }, { - "idiom" : "mac", "size" : "16x16", + "idiom" : "mac", + "filename" : "keepy-16@2x.png", "scale" : "2x" }, { - "idiom" : "mac", "size" : "32x32", + "idiom" : "mac", + "filename" : "keepy-32.png", "scale" : "1x" }, { - "idiom" : "mac", "size" : "32x32", + "idiom" : "mac", + "filename" : "keepy-32@2x.png", "scale" : "2x" }, { - "idiom" : "mac", "size" : "128x128", + "idiom" : "mac", + "filename" : "keepy-128.png", "scale" : "1x" }, { - "idiom" : "mac", "size" : "128x128", + "idiom" : "mac", + "filename" : "keepy-128@2x.png", "scale" : "2x" }, { - "idiom" : "mac", "size" : "256x256", + "idiom" : "mac", + "filename" : "keepy-256.png", "scale" : "1x" }, { - "idiom" : "mac", "size" : "256x256", + "idiom" : "mac", + "filename" : "keepy-256@2x.png", "scale" : "2x" }, { - "idiom" : "mac", "size" : "512x512", + "idiom" : "mac", + "filename" : "keepy-512.png", "scale" : "1x" }, { diff --git a/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-128.png b/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-128.png new file mode 100644 index 000000000..a35c1468b Binary files /dev/null and b/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-128.png differ diff --git a/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-128@2x.png b/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-128@2x.png new file mode 100644 index 000000000..36c770d90 Binary files /dev/null and b/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-128@2x.png differ diff --git a/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-16.png b/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-16.png new file mode 100644 index 000000000..a1576ff83 Binary files /dev/null and b/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-16.png differ diff --git a/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-16@2x.png b/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-16@2x.png new file mode 100644 index 000000000..fa121b2fa Binary files /dev/null and b/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-16@2x.png differ diff --git a/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-256.png b/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-256.png new file mode 100644 index 000000000..36c770d90 Binary files /dev/null and b/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-256.png differ diff --git a/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-256@2x.png b/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-256@2x.png new file mode 100644 index 000000000..f33a2cbdd Binary files /dev/null and b/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-256@2x.png differ diff --git a/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-32.png b/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-32.png new file mode 100644 index 000000000..fa121b2fa Binary files /dev/null and b/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-32.png differ diff --git a/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-32@2x.png b/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-32@2x.png new file mode 100644 index 000000000..859dcf870 Binary files /dev/null and b/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-32@2x.png differ diff --git a/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-512.png b/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-512.png new file mode 100644 index 000000000..f33a2cbdd Binary files /dev/null and b/clients/osx/Perkeep/Images.xcassets/AppIcon.appiconset/keepy-512.png differ diff --git a/clients/osx/Perkeep/Perkeep-Info.plist b/clients/osx/Perkeep/Perkeep-Info.plist index 9f96e9b52..1eaec034e 100644 --- a/clients/osx/Perkeep/Perkeep-Info.plist +++ b/clients/osx/Perkeep/Perkeep-Info.plist @@ -6,8 +6,6 @@ en CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleIconFile - PerkeepIcon.icns CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion diff --git a/clients/osx/Perkeep/PerkeepIcon.icns b/clients/osx/Perkeep/PerkeepIcon.icns deleted file mode 100644 index 32017dcdd..000000000 Binary files a/clients/osx/Perkeep/PerkeepIcon.icns and /dev/null differ diff --git a/clients/osx/Perkeep/menuicon-selected.png b/clients/osx/Perkeep/menuicon-selected.png index ee3afbb41..d6d0f23d8 100644 Binary files a/clients/osx/Perkeep/menuicon-selected.png and b/clients/osx/Perkeep/menuicon-selected.png differ diff --git a/clients/osx/Perkeep/menuicon-selected@2x.png b/clients/osx/Perkeep/menuicon-selected@2x.png index 642096d2c..102387124 100644 Binary files a/clients/osx/Perkeep/menuicon-selected@2x.png and b/clients/osx/Perkeep/menuicon-selected@2x.png differ diff --git a/clients/osx/Perkeep/menuicon.png b/clients/osx/Perkeep/menuicon.png index cf5d6ea6b..d6d0f23d8 100644 Binary files a/clients/osx/Perkeep/menuicon.png and b/clients/osx/Perkeep/menuicon.png differ diff --git a/clients/osx/Perkeep/menuicon@2x.png b/clients/osx/Perkeep/menuicon@2x.png index 545a4a7f8..102387124 100644 Binary files a/clients/osx/Perkeep/menuicon@2x.png and b/clients/osx/Perkeep/menuicon@2x.png differ