diff --git a/AboutBox.xib b/AboutBox.xib index 7b52742..e063ab2 100644 --- a/AboutBox.xib +++ b/AboutBox.xib @@ -55,9 +55,9 @@ All rights reserved. - + - + @@ -167,6 +167,6 @@ All rights reserved. - + diff --git a/Assets.xcassets/AboutIcon.imageset/Contents.json b/Assets.xcassets/AboutIcon.imageset/Contents.json new file mode 100644 index 0000000..eceaebf --- /dev/null +++ b/Assets.xcassets/AboutIcon.imageset/Contents.json @@ -0,0 +1,18 @@ +{ + "images" : [ + { + "filename" : "icon_128x128.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "icon_128x128@2x.png", + "idiom" : "universal", + "scale" : "2x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Assets.xcassets/AboutIcon.imageset/icon_128x128.png b/Assets.xcassets/AboutIcon.imageset/icon_128x128.png new file mode 100644 index 0000000..234eca5 Binary files /dev/null and b/Assets.xcassets/AboutIcon.imageset/icon_128x128.png differ diff --git a/Assets.xcassets/AboutIcon.imageset/icon_128x128@2x.png b/Assets.xcassets/AboutIcon.imageset/icon_128x128@2x.png new file mode 100644 index 0000000..3f3eacc Binary files /dev/null and b/Assets.xcassets/AboutIcon.imageset/icon_128x128@2x.png differ diff --git a/Assets.xcassets/AppIcon.appiconset/Contents.json b/Assets.xcassets/AppIcon.appiconset/Contents.json new file mode 100644 index 0000000..64dc11e --- /dev/null +++ b/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -0,0 +1,68 @@ +{ + "images" : [ + { + "filename" : "icon_16x16.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "16x16" + }, + { + "filename" : "icon_16x16@2x.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "16x16" + }, + { + "filename" : "icon_32x32.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "32x32" + }, + { + "filename" : "icon_32x32@2x.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "32x32" + }, + { + "filename" : "icon_128x128.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "128x128" + }, + { + "filename" : "icon_128x128@2x.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "128x128" + }, + { + "filename" : "icon_256x256.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "256x256" + }, + { + "filename" : "icon_256x256@2x.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "256x256" + }, + { + "filename" : "icon_512x512.png", + "idiom" : "mac", + "scale" : "1x", + "size" : "512x512" + }, + { + "filename" : "icon_512x512@2x.png", + "idiom" : "mac", + "scale" : "2x", + "size" : "512x512" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + } +} diff --git a/Assets.xcassets/AppIcon.appiconset/icon_128x128.png b/Assets.xcassets/AppIcon.appiconset/icon_128x128.png new file mode 100644 index 0000000..234eca5 Binary files /dev/null and b/Assets.xcassets/AppIcon.appiconset/icon_128x128.png differ diff --git a/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png b/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png new file mode 100644 index 0000000..3f3eacc Binary files /dev/null and b/Assets.xcassets/AppIcon.appiconset/icon_128x128@2x.png differ diff --git a/Assets.xcassets/AppIcon.appiconset/icon_16x16.png b/Assets.xcassets/AppIcon.appiconset/icon_16x16.png new file mode 100644 index 0000000..a8285ef Binary files /dev/null and b/Assets.xcassets/AppIcon.appiconset/icon_16x16.png differ diff --git a/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png b/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png new file mode 100644 index 0000000..b3f1f67 Binary files /dev/null and b/Assets.xcassets/AppIcon.appiconset/icon_16x16@2x.png differ diff --git a/Assets.xcassets/AppIcon.appiconset/icon_256x256.png b/Assets.xcassets/AppIcon.appiconset/icon_256x256.png new file mode 100644 index 0000000..3f3eacc Binary files /dev/null and b/Assets.xcassets/AppIcon.appiconset/icon_256x256.png differ diff --git a/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png b/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png new file mode 100644 index 0000000..17ecdd1 Binary files /dev/null and b/Assets.xcassets/AppIcon.appiconset/icon_256x256@2x.png differ diff --git a/Assets.xcassets/AppIcon.appiconset/icon_32x32.png b/Assets.xcassets/AppIcon.appiconset/icon_32x32.png new file mode 100644 index 0000000..b3f1f67 Binary files /dev/null and b/Assets.xcassets/AppIcon.appiconset/icon_32x32.png differ diff --git a/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png b/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png new file mode 100644 index 0000000..c452b0b Binary files /dev/null and b/Assets.xcassets/AppIcon.appiconset/icon_32x32@2x.png differ diff --git a/Assets.xcassets/AppIcon.appiconset/icon_512x512.png b/Assets.xcassets/AppIcon.appiconset/icon_512x512.png new file mode 100644 index 0000000..17ecdd1 Binary files /dev/null and b/Assets.xcassets/AppIcon.appiconset/icon_512x512.png differ diff --git a/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png b/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png new file mode 100644 index 0000000..08ce001 Binary files /dev/null and b/Assets.xcassets/AppIcon.appiconset/icon_512x512@2x.png differ diff --git a/Assets.xcassets/menuIcon.imageset/Contents.json b/Assets.xcassets/menuIcon.imageset/Contents.json new file mode 100644 index 0000000..91b7b4b --- /dev/null +++ b/Assets.xcassets/menuIcon.imageset/Contents.json @@ -0,0 +1,21 @@ +{ + "images" : [ + { + "filename" : "menuIcon.png", + "idiom" : "universal", + "scale" : "1x" + }, + { + "filename" : "menuIcon@2x.png", + "idiom" : "universal", + "scale" : "2x" + } + ], + "info" : { + "author" : "xcode", + "version" : 1 + }, + "properties" : { + "template-rendering-intent" : "template" + } +} diff --git a/Assets.xcassets/menuIcon.imageset/menuIcon.png b/Assets.xcassets/menuIcon.imageset/menuIcon.png new file mode 100644 index 0000000..41de990 Binary files /dev/null and b/Assets.xcassets/menuIcon.imageset/menuIcon.png differ diff --git a/Assets.xcassets/menuIcon.imageset/menuIcon@2x.png b/Assets.xcassets/menuIcon.imageset/menuIcon@2x.png new file mode 100644 index 0000000..21b0a66 Binary files /dev/null and b/Assets.xcassets/menuIcon.imageset/menuIcon@2x.png differ diff --git a/Gas Mask.xcodeproj/project.pbxproj b/Gas Mask.xcodeproj/project.pbxproj index c7152da..5bfba76 100644 --- a/Gas Mask.xcodeproj/project.pbxproj +++ b/Gas Mask.xcodeproj/project.pbxproj @@ -19,7 +19,6 @@ 351167C010D6346000A5FAA1 /* HostsGroup.m in Sources */ = {isa = PBXBuildFile; fileRef = 351167BF10D6346000A5FAA1 /* HostsGroup.m */; }; 3511697810D68B1000A5FAA1 /* FilesCountTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3511697710D68B1000A5FAA1 /* FilesCountTransformer.m */; }; 35116A7010D6AAD200A5FAA1 /* Menulet.m in Sources */ = {isa = PBXBuildFile; fileRef = 35116A6F10D6AAD200A5FAA1 /* Menulet.m */; }; - 35116A8510D6ABA000A5FAA1 /* menuIcon.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 35116A8410D6ABA000A5FAA1 /* menuIcon.tiff */; }; 35116AA010D6ADF000A5FAA1 /* Preferences.xib in Resources */ = {isa = PBXBuildFile; fileRef = 35116A9F10D6ADF000A5FAA1 /* Preferences.xib */; }; 35116AAD10D6AE5600A5FAA1 /* PreferenceController.m in Sources */ = {isa = PBXBuildFile; fileRef = 35116AAC10D6AE5600A5FAA1 /* PreferenceController.m */; }; 35116AC010D6AF0500A5FAA1 /* LoginItem.m in Sources */ = {isa = PBXBuildFile; fileRef = 35116ABF10D6AF0500A5FAA1 /* LoginItem.m */; }; @@ -58,7 +57,6 @@ 353A80BB10B01C050005CAD1 /* Preferences.m in Sources */ = {isa = PBXBuildFile; fileRef = 353A80BA10B01C050005CAD1 /* Preferences.m */; }; 353A80CA10B01F320005CAD1 /* ExtendedNSString.m in Sources */ = {isa = PBXBuildFile; fileRef = 353A80C910B01F320005CAD1 /* ExtendedNSString.m */; }; 353A80FC10B020B10005CAD1 /* UserDefaults.plist in Resources */ = {isa = PBXBuildFile; fileRef = 353A80FB10B020B10005CAD1 /* UserDefaults.plist */; }; - 353D18BC1114C0C1005C4E54 /* applicationIcon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 354E80A010AF33C100FC4757 /* applicationIcon.icns */; }; 3541CE0510E4AF9B00FA00CB /* SyncingArrowsBadge.m in Sources */ = {isa = PBXBuildFile; fileRef = 3541CE0410E4AF9B00FA00CB /* SyncingArrowsBadge.m */; }; 3544E2D310E4CCB1009AC525 /* Map.m in Sources */ = {isa = PBXBuildFile; fileRef = 3544E2D210E4CCB1009AC525 /* Map.m */; }; 3545DC7310E38DDE00EBA66D /* Offline.png in Resources */ = {isa = PBXBuildFile; fileRef = 3545DC7210E38DDE00EBA66D /* Offline.png */; }; @@ -74,7 +72,6 @@ 354E7EB110AEEF3D00FC4757 /* StructureConverter.m in Sources */ = {isa = PBXBuildFile; fileRef = 354E7EB010AEEF3D00FC4757 /* StructureConverter.m */; }; 354E7F5E10AEFA9D00FC4757 /* PrivilegedActions.m in Sources */ = {isa = PBXBuildFile; fileRef = 354E7F5D10AEFA9D00FC4757 /* PrivilegedActions.m */; }; 354E7F8110AEFBC500FC4757 /* Security.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 354E7F8010AEFBC500FC4757 /* Security.framework */; }; - 354E80A110AF33C100FC4757 /* applicationIcon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 354E80A010AF33C100FC4757 /* applicationIcon.icns */; }; 354E80B510AF383C00FC4757 /* FileUtil.m in Sources */ = {isa = PBXBuildFile; fileRef = 354E80B410AF383C00FC4757 /* FileUtil.m */; }; 3556CEF910D6B70100C7301E /* UpdateDateTransformer.m in Sources */ = {isa = PBXBuildFile; fileRef = 3556CEF810D6B70100C7301E /* UpdateDateTransformer.m */; }; 355F5C5B12244B67006C2884 /* LocalHostsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 355F5C5A12244B67006C2884 /* LocalHostsController.m */; }; @@ -105,7 +102,6 @@ 359289AB1659222E00492494 /* CHANGELOG.txt in Resources */ = {isa = PBXBuildFile; fileRef = 359289AA1659222E00492494 /* CHANGELOG.txt */; }; 3597135D110DED0F00C7ECAF /* HostsMenu.m in Sources */ = {isa = PBXBuildFile; fileRef = 3597135C110DED0F00C7ECAF /* HostsMenu.m */; }; 359967541656B52500BCF16D /* NotificationHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 359967531656B52500BCF16D /* NotificationHelper.m */; }; - 35A183A81A0ACF37002D6289 /* menuIcon@2x.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 35A183A71A0ACF37002D6289 /* menuIcon@2x.tiff */; }; 35A4CD301534927F005176BD /* Combined Hosts Hint.png in Resources */ = {isa = PBXBuildFile; fileRef = 35A4CD2F1534927F005176BD /* Combined Hosts Hint.png */; }; 35B049921A46234100EB89CA /* Editor.png in Resources */ = {isa = PBXBuildFile; fileRef = 35B0498E1A46234100EB89CA /* Editor.png */; }; 35B049931A46234100EB89CA /* Hotkeys.png in Resources */ = {isa = PBXBuildFile; fileRef = 35B0498F1A46234100EB89CA /* Hotkeys.png */; }; @@ -121,7 +117,6 @@ 35D3328E152F5A87001DA824 /* CombinedHosts.m in Sources */ = {isa = PBXBuildFile; fileRef = 35D3328D152F5A87001DA824 /* CombinedHosts.m */; }; 35D33291152F5B7B001DA824 /* CombinedHostsController.m in Sources */ = {isa = PBXBuildFile; fileRef = 35D33290152F5B7B001DA824 /* CombinedHostsController.m */; }; 35D4CACB10E64DDD00B9F63A /* ExtendedNSApplication.m in Sources */ = {isa = PBXBuildFile; fileRef = 35D4CACA10E64DDD00B9F63A /* ExtendedNSApplication.m */; }; - 35D4CB0D10E651CD00B9F63A /* About Box Image.png in Resources */ = {isa = PBXBuildFile; fileRef = 35D4CB0C10E651CD00B9F63A /* About Box Image.png */; }; 35D4CBFB10E6934700B9F63A /* ExtendedNSTextView.m in Sources */ = {isa = PBXBuildFile; fileRef = 35D4CBFA10E6934700B9F63A /* ExtendedNSTextView.m */; }; 35D83BEF20DD97CF00169358 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 35D83BEE20DD97CF00169358 /* Assets.xcassets */; }; 35DA4DF6123BF4F30043CA87 /* sparkle_dsa_pub.pem in Resources */ = {isa = PBXBuildFile; fileRef = 35DA4DF5123BF4F30043CA87 /* sparkle_dsa_pub.pem */; }; @@ -208,7 +203,6 @@ 3511697710D68B1000A5FAA1 /* FilesCountTransformer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FilesCountTransformer.m; path = Source/FilesCountTransformer.m; sourceTree = ""; }; 35116A6E10D6AAD200A5FAA1 /* Menulet.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Menulet.h; path = Source/Menulet.h; sourceTree = ""; }; 35116A6F10D6AAD200A5FAA1 /* Menulet.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Menulet.m; path = Source/Menulet.m; sourceTree = ""; }; - 35116A8410D6ABA000A5FAA1 /* menuIcon.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = menuIcon.tiff; path = Resources/Images/menuIcon.tiff; sourceTree = ""; }; 35116A9F10D6ADF000A5FAA1 /* Preferences.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = Preferences.xib; sourceTree = ""; }; 35116AAB10D6AE5600A5FAA1 /* PreferenceController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PreferenceController.h; path = Source/PreferenceController.h; sourceTree = ""; }; 35116AAC10D6AE5600A5FAA1 /* PreferenceController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PreferenceController.m; path = Source/PreferenceController.m; sourceTree = ""; }; @@ -287,7 +281,6 @@ 354E7F5C10AEFA9D00FC4757 /* PrivilegedActions.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = PrivilegedActions.h; path = Source/PrivilegedActions.h; sourceTree = ""; }; 354E7F5D10AEFA9D00FC4757 /* PrivilegedActions.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = PrivilegedActions.m; path = Source/PrivilegedActions.m; sourceTree = ""; }; 354E7F8010AEFBC500FC4757 /* Security.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Security.framework; path = /System/Library/Frameworks/Security.framework; sourceTree = ""; }; - 354E80A010AF33C100FC4757 /* applicationIcon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; name = applicationIcon.icns; path = Resources/applicationIcon.icns; sourceTree = ""; }; 354E80B310AF383C00FC4757 /* FileUtil.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = FileUtil.h; path = Source/FileUtil.h; sourceTree = ""; }; 354E80B410AF383C00FC4757 /* FileUtil.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = FileUtil.m; path = Source/FileUtil.m; sourceTree = ""; }; 3556CEF710D6B70100C7301E /* UpdateDateTransformer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = UpdateDateTransformer.h; path = Source/UpdateDateTransformer.h; sourceTree = ""; }; @@ -340,7 +333,6 @@ AA00000B000000000000AAAA /* URLValidatorTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLValidatorTests.swift; sourceTree = ""; }; AA00000D000000000000AAAA /* URLSheetPresenterTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLSheetPresenterTests.swift; sourceTree = ""; }; AA00000F000000000000AAAA /* URLSheetViewTests.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = URLSheetViewTests.swift; sourceTree = ""; }; - 35A183A71A0ACF37002D6289 /* menuIcon@2x.tiff */ = {isa = PBXFileReference; lastKnownFileType = image.tiff; name = "menuIcon@2x.tiff"; path = "Resources/Images/menuIcon@2x.tiff"; sourceTree = ""; }; 35A4CD2F1534927F005176BD /* Combined Hosts Hint.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "Combined Hosts Hint.png"; path = "Resources/Images/Combined Hosts Hint.png"; sourceTree = ""; }; 35B0498E1A46234100EB89CA /* Editor.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Editor.png; path = Resources/Images/Preferences/Editor.png; sourceTree = ""; }; 35B0498F1A46234100EB89CA /* Hotkeys.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = Hotkeys.png; path = Resources/Images/Preferences/Hotkeys.png; sourceTree = ""; }; @@ -362,7 +354,6 @@ 35D33290152F5B7B001DA824 /* CombinedHostsController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = CombinedHostsController.m; path = Source/CombinedHostsController.m; sourceTree = ""; }; 35D4CAC910E64DDD00B9F63A /* ExtendedNSApplication.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExtendedNSApplication.h; path = Source/ExtendedNSApplication.h; sourceTree = ""; }; 35D4CACA10E64DDD00B9F63A /* ExtendedNSApplication.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ExtendedNSApplication.m; path = Source/ExtendedNSApplication.m; sourceTree = ""; }; - 35D4CB0C10E651CD00B9F63A /* About Box Image.png */ = {isa = PBXFileReference; lastKnownFileType = image.png; name = "About Box Image.png"; path = "Resources/Images/About Box Image.png"; sourceTree = ""; }; 35D4CBF910E6934700B9F63A /* ExtendedNSTextView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = ExtendedNSTextView.h; path = Source/ExtendedNSTextView.h; sourceTree = ""; }; 35D4CBFA10E6934700B9F63A /* ExtendedNSTextView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = ExtendedNSTextView.m; path = Source/ExtendedNSTextView.m; sourceTree = ""; }; 35D83BEE20DD97CF00169358 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; @@ -709,9 +700,6 @@ 352E04F9106281940071E25B /* Create.png */, 350C7F381A3C55B000B46B09 /* Create@2x.png */, 352E04FB106281940071E25B /* Save.png */, - 354E80A010AF33C100FC4757 /* applicationIcon.icns */, - 35116A8410D6ABA000A5FAA1 /* menuIcon.tiff */, - 35A183A71A0ACF37002D6289 /* menuIcon@2x.tiff */, ); name = Images; sourceTree = ""; @@ -743,7 +731,6 @@ isa = PBXGroup; children = ( 3562197810E52E8E00772473 /* AboutBox.xib */, - 35D4CB0C10E651CD00B9F63A /* About Box Image.png */, 35621A2F10E52F6C00772473 /* AboutBoxController.h */, 35621A3010E52F6C00772473 /* AboutBoxController.m */, ); @@ -996,7 +983,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 353D18BC1114C0C1005C4E54 /* applicationIcon.icns in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; @@ -1019,10 +1005,8 @@ 352E05B710628D790071E25B /* Blue Dot.png in Resources */, 352E05DA10628E400071E25B /* Local File.png in Resources */, 350C7F391A3C55B000B46B09 /* Create@2x.png in Resources */, - 354E80A110AF33C100FC4757 /* applicationIcon.icns in Resources */, 353A80FC10B020B10005CAD1 /* UserDefaults.plist in Resources */, 358E0A881A3A1E1A004521D1 /* Remote yosemite.tiff in Resources */, - 35116A8510D6ABA000A5FAA1 /* menuIcon.tiff in Resources */, 35116AA010D6ADF000A5FAA1 /* Preferences.xib in Resources */, 35D83BEF20DD97CF00169358 /* Assets.xcassets in Resources */, 352F48D210DA90FE000003BE /* default.hst in Resources */, @@ -1036,11 +1020,9 @@ 3528ECEC10E3F87E003C8CB9 /* Syncing_arrows4.png in Resources */, 3528ECED10E3F87E003C8CB9 /* Syncing_arrows5.png in Resources */, 3528ECEE10E3F87E003C8CB9 /* Syncing_arrows6.png in Resources */, - 35A183A81A0ACF37002D6289 /* menuIcon@2x.tiff in Resources */, 35B0499B1A462AE900EB89CA /* Activated@2x.png in Resources */, 356218B510E52CD600772473 /* Growl Registration Ticket.growlRegDict in Resources */, 3562197910E52E8E00772473 /* AboutBox.xib in Resources */, - 35D4CB0D10E651CD00B9F63A /* About Box Image.png in Resources */, 358C36E51A0D6F2E00161C98 /* Combined_File_yosemite.tiff in Resources */, 351D904510E76F7100CA6B5E /* Help in Resources */, 354C0BC510E782A5005B9A33 /* hosts.icns in Resources */, @@ -1284,6 +1266,7 @@ CODE_SIGN_IDENTITY = ""; CODE_SIGNING_ALLOWED = NO; CODE_SIGNING_REQUIRED = NO; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COMBINE_HIDPI_IMAGES = YES; COPY_PHASE_STRIP = NO; FRAMEWORK_SEARCH_PATHS = ( @@ -1319,6 +1302,7 @@ CODE_SIGN_IDENTITY = ""; CODE_SIGNING_ALLOWED = NO; CODE_SIGNING_REQUIRED = NO; + ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon; COMBINE_HIDPI_IMAGES = YES; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; FRAMEWORK_SEARCH_PATHS = ( diff --git a/Help/images/gasmaskicon.png b/Help/images/gasmaskicon.png index 7636d1e..234eca5 100644 Binary files a/Help/images/gasmaskicon.png and b/Help/images/gasmaskicon.png differ diff --git a/Info.plist b/Info.plist index 50c89f2..bee1ca8 100644 --- a/Info.plist +++ b/Info.plist @@ -32,7 +32,7 @@ CFBundleHelpBookName Gas Mask Help CFBundleIconFile - applicationIcon + AppIcon CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion diff --git a/Launcher-Info.plist b/Launcher-Info.plist index 6b35968..0b3ba8e 100644 --- a/Launcher-Info.plist +++ b/Launcher-Info.plist @@ -6,8 +6,6 @@ English CFBundleExecutable ${EXECUTABLE_NAME} - CFBundleIconFile - applicationIcon CFBundleIdentifier $(PRODUCT_BUNDLE_IDENTIFIER) CFBundleInfoDictionaryVersion diff --git a/Resources/Images/About Box Image.png b/Resources/Images/About Box Image.png deleted file mode 100644 index bafe230..0000000 Binary files a/Resources/Images/About Box Image.png and /dev/null differ diff --git a/Resources/Images/menuIcon.tiff b/Resources/Images/menuIcon.tiff deleted file mode 100644 index d64a918..0000000 Binary files a/Resources/Images/menuIcon.tiff and /dev/null differ diff --git a/Resources/Images/menuIcon@2x.tiff b/Resources/Images/menuIcon@2x.tiff deleted file mode 100644 index fde7fb6..0000000 Binary files a/Resources/Images/menuIcon@2x.tiff and /dev/null differ diff --git a/Resources/applicationIcon.icns b/Resources/applicationIcon.icns deleted file mode 100644 index a4ce6de..0000000 Binary files a/Resources/applicationIcon.icns and /dev/null differ diff --git a/Resources/hosts.icns b/Resources/hosts.icns index fcdf938..86564bc 100644 Binary files a/Resources/hosts.icns and b/Resources/hosts.icns differ diff --git a/Source/Menulet.m b/Source/Menulet.m index 6717fe2..9a12f9f 100644 --- a/Source/Menulet.m +++ b/Source/Menulet.m @@ -23,54 +23,12 @@ #import "HostsMainController.h" #import "HostsMenu.h" #import "Preferences.h" -#import "Util.h" @implementation Menulet - (void)awakeFromNib { - if ([Util isPre10_10]) { - logDebug(@"Initializing Status Bar with pre-Yosemite options"); - [self awakeFromNibPre10_10]; - } else { - logDebug(@"Initializing Status Bar with Yosemite and later options"); - [self awakeFromNib10_10AndAfter]; - } -} -/** - * OS X 10.10 and later support the NSStatusItemBar button which is what the - * "Show Host File Name in Status Bar" feature is built upon. So if we're - * not 10.10 or above, then we need to build the status bar button in the - * legacy (pre 10.10) way adn not support the file name in the bar. - */ -- (void)awakeFromNibPre10_10 -{ - statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSVariableStatusItemLength]; - [statusItem setHighlightMode:YES]; - [statusItem setEnabled:YES]; - [statusItem setToolTip:@"Gas Mask"]; - [statusItem setTitle:@""]; - [statusItem setAction:@selector(showMenu:)]; - [statusItem setTarget:self]; - NSBundle *bundle = [NSBundle bundleForClass:[self class]]; - NSString *path = [bundle pathForResource:@"menuIcon" ofType:@"tiff"]; - NSImage *icon = [[NSImage alloc] initWithContentsOfFile:path]; - [icon setTemplate:YES]; - [statusItem setImage:icon]; -} -/** - * Build the status bar using 10.10+ compatible NSStatusBar's button - * member. We also need to add some observers to the preferences so that - * we can tear down or re initialize the button if someone changes their - * preferences. - */ -- (void)awakeFromNib10_10AndAfter -{ - - NSBundle *bundle = [NSBundle bundleForClass:[self class]]; - NSString *path = [bundle pathForResource:@"menuIcon" ofType:@"tiff"]; - NSImage *icon = [[NSImage alloc] initWithContentsOfFile:path]; - [icon setTemplate:YES]; + NSImage *icon = [NSImage imageNamed:@"menuIcon"]; statusItem = [[NSStatusBar systemStatusBar] statusItemWithLength:NSSquareStatusItemLength]; [[statusItem button] setEnabled:true]; @@ -85,26 +43,24 @@ - (void)awakeFromNib10_10AndAfter forKeyPath:ShowNameInStatusBarKey options:NSKeyValueObservingOptionNew context:NULL]; - + [defaults addObserver:self forKeyPath:ActiveHostsFilePrefKey options:NSKeyValueObservingOptionNew context:NULL]; - + [[NSNotificationCenter defaultCenter] addObserver:self selector:@selector(updateName) name:ActivateFileNotification object:NULL]; - + if ([Preferences showNameInStatusBar]) { [self initTitleInBar]; } } -// Only used in 10.10 and above -(void) initTitleInBar { [statusItem setLength:NSVariableStatusItemLength]; [[statusItem button] setImagePosition:NSImageLeft]; } -// Only used in 10.10 and above -(void)updateName { if (![Preferences showNameInStatusBar]) { return; @@ -113,14 +69,12 @@ -(void)updateName { [[statusItem button] setTitle:name]; } -// Only used in 10.10 and above -(void) removeTitleFromBar { [statusItem setLength:NSSquareStatusItemLength]; [[statusItem button] setImagePosition:NSImageOnly]; [[statusItem button] setTitle:@""]; } -// Only used in 10.10 and above -(void)observeValueForKeyPath:(NSString *)keyPath ofObject:(id)object change:(NSDictionary *)change @@ -139,12 +93,9 @@ -(void)observeValueForKeyPath:(NSString *)keyPath } -(void)dealloc { - // we only need clean up if we're 10.10 and above. - if (![Util isPre10_10]) { - NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; - [defaults removeObserver:self forKeyPath:ActiveHostsFilePrefKey]; - [defaults removeObserver:self forKeyPath:ShowNameInStatusBarKey]; - } + NSUserDefaults *defaults = [NSUserDefaults standardUserDefaults]; + [defaults removeObserver:self forKeyPath:ActiveHostsFilePrefKey]; + [defaults removeObserver:self forKeyPath:ShowNameInStatusBarKey]; } -(IBAction)showMenu:(id)sender