diff --git a/README.md b/README.md index 31da3c7..b4d1420 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ These instruction will get you a copy of the project up and running on your loca ### Prerequisites -- from macOS High Sierra (10.13) +- from macOS Mojave (10.14) - Git - Xcode with the latest Swift version (5) - Carthage @@ -25,7 +25,7 @@ open Tonnerre.xcodeproj After open in Xcode, you can add a new scheme `Tonnerre` and it will build the `Tonnerre.app` -Or you can download a built version here: [Tonnerre.dmg](https://github.com/YaxinCheng/Tonnerre/releases/download/1.0.6/Tonnerre.dmg) +Or you can download a built version here: [Tonnerre.dmg](https://github.com/YaxinCheng/Tonnerre/releases/download/1.1.0/Tonnerre.dmg) ### Built With @@ -106,10 +106,6 @@ Preview is supported of course ![eject](https://user-images.githubusercontent.com/13768613/49771646-10bffe00-fcb8-11e8-87ea-a88af5d2258c.png) -#### Calculate the currency changes - -![currency](https://user-images.githubusercontent.com/13768613/49771817-df93fd80-fcb8-11e8-995b-c4041a774c1b.png) - #### Some other functions... Besides all these, Tonnerre also support *quick launch Browser bookmarks (Safari and Chrome supported)*, *quick launch URLs*, *calculator*, *look up dictionary*, and etc.. There are more functionalities waiting for you to explore diff --git a/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_128x128.png b/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_128x128.png index 69c9d45..9615fe9 100644 Binary files a/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_128x128.png and b/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_128x128.png differ diff --git a/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_128x128@2x.png b/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_128x128@2x.png index 6a2a92c..b45a241 100644 Binary files a/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_128x128@2x.png and b/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_128x128@2x.png differ diff --git a/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_16x16.png b/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_16x16.png index 014ce13..bbfff63 100644 Binary files a/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_16x16.png and b/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_16x16.png differ diff --git a/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_16x16@2x.png b/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_16x16@2x.png index 482e368..f897297 100644 Binary files a/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_16x16@2x.png and b/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_16x16@2x.png differ diff --git a/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_256x256.png b/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_256x256.png index 7697bb8..0532920 100644 Binary files a/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_256x256.png and b/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_256x256.png differ diff --git a/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_256x256@2x.png b/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_256x256@2x.png index ed4c9fe..cc4986c 100644 Binary files a/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_256x256@2x.png and b/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_256x256@2x.png differ diff --git a/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_32x32.png b/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_32x32.png index b1755e8..722bacb 100644 Binary files a/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_32x32.png and b/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_32x32.png differ diff --git a/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_32x32@2x.png b/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_32x32@2x.png index 480e310..d21f743 100644 Binary files a/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_32x32@2x.png and b/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_32x32@2x.png differ diff --git a/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_512x512.png b/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_512x512.png index fe7a27d..283e9c9 100644 Binary files a/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_512x512.png and b/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_512x512.png differ diff --git a/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_512x512@2x.png b/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_512x512@2x.png index 6e91cf0..f0c6c51 100644 Binary files a/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_512x512@2x.png and b/SettingPanel/Assets.xcassets/AppIcon.appiconset/Icon_512x512@2x.png differ diff --git a/SettingPanel/Assets.xcassets/settings.imageset/Contents.json b/SettingPanel/Assets.xcassets/settings.imageset/Contents.json index 4f16cb0..22d8b48 100644 --- a/SettingPanel/Assets.xcassets/settings.imageset/Contents.json +++ b/SettingPanel/Assets.xcassets/settings.imageset/Contents.json @@ -6,7 +6,7 @@ }, { "idiom" : "universal", - "filename" : "setting@3x-1.png", + "filename" : "setting@2x.png", "scale" : "2x" }, { diff --git a/SettingPanel/Assets.xcassets/settings.imageset/setting@2x.png b/SettingPanel/Assets.xcassets/settings.imageset/setting@2x.png new file mode 100644 index 0000000..9e2e936 Binary files /dev/null and b/SettingPanel/Assets.xcassets/settings.imageset/setting@2x.png differ diff --git a/SettingPanel/Assets.xcassets/settings.imageset/setting@3x-1.png b/SettingPanel/Assets.xcassets/settings.imageset/setting@3x-1.png deleted file mode 100644 index 70de800..0000000 Binary files a/SettingPanel/Assets.xcassets/settings.imageset/setting@3x-1.png and /dev/null differ diff --git a/SettingPanel/Assets.xcassets/settings.imageset/setting@3x.png b/SettingPanel/Assets.xcassets/settings.imageset/setting@3x.png index 1539da3..c985bf6 100644 Binary files a/SettingPanel/Assets.xcassets/settings.imageset/setting@3x.png and b/SettingPanel/Assets.xcassets/settings.imageset/setting@3x.png differ diff --git a/SettingPanel/Assets.xcassets/tonnerre.imageset/tonnerre@2x.png b/SettingPanel/Assets.xcassets/tonnerre.imageset/tonnerre@2x.png index 2189d4d..00dd15e 100644 Binary files a/SettingPanel/Assets.xcassets/tonnerre.imageset/tonnerre@2x.png and b/SettingPanel/Assets.xcassets/tonnerre.imageset/tonnerre@2x.png differ diff --git a/SettingPanel/Assets.xcassets/tonnerre.imageset/tonnerre@3x.png b/SettingPanel/Assets.xcassets/tonnerre.imageset/tonnerre@3x.png index 9e1a3e2..fe5e637 100644 Binary files a/SettingPanel/Assets.xcassets/tonnerre.imageset/tonnerre@3x.png and b/SettingPanel/Assets.xcassets/tonnerre.imageset/tonnerre@3x.png differ diff --git a/SettingPanel/Base.lproj/Main.storyboard b/SettingPanel/Base.lproj/Main.storyboard index e3ab115..432ce6c 100644 --- a/SettingPanel/Base.lproj/Main.storyboard +++ b/SettingPanel/Base.lproj/Main.storyboard @@ -1,8 +1,7 @@ - + - - + @@ -621,7 +620,7 @@ - + diff --git a/SettingPanel/Content/Cells/BoolCell.xib b/SettingPanel/Content/Cells/BoolCell.xib index c609cbe..7bfb6b9 100644 --- a/SettingPanel/Content/Cells/BoolCell.xib +++ b/SettingPanel/Content/Cells/BoolCell.xib @@ -1,16 +1,11 @@ - + - - + - - - - - + diff --git a/SettingPanel/Content/Cells/Components/Switch.swift b/SettingPanel/Content/Cells/Components/Switch.swift index 939e4b5..f65c37e 100644 --- a/SettingPanel/Content/Cells/Components/Switch.swift +++ b/SettingPanel/Content/Cells/Components/Switch.swift @@ -35,11 +35,7 @@ final class Switch: NSControl { private var handleViewLeadingConstraint: NSLayoutConstraint! required init?(coder decoder: NSCoder) { - if #available(OSX 10.14, *) { - highlightColour = .controlAccentColor - } else { - highlightColour = .blue - } + highlightColour = .controlAccentColor handleView = NSView() super.init(coder: decoder) diff --git a/SettingPanel/Content/Cells/GeneralCell.xib b/SettingPanel/Content/Cells/GeneralCell.xib index 8b8caff..4b4ff59 100644 --- a/SettingPanel/Content/Cells/GeneralCell.xib +++ b/SettingPanel/Content/Cells/GeneralCell.xib @@ -1,8 +1,7 @@ - + - - + diff --git a/SettingPanel/Menu/MenuOption.xib b/SettingPanel/Menu/MenuOption.xib index af77694..0c9cb1d 100644 --- a/SettingPanel/Menu/MenuOption.xib +++ b/SettingPanel/Menu/MenuOption.xib @@ -1,8 +1,7 @@ - + - - + @@ -13,7 +12,7 @@ - + diff --git a/SettingPanel/Menu/TintedImageView.swift b/SettingPanel/Menu/TintedImageView.swift deleted file mode 100644 index 85686f6..0000000 --- a/SettingPanel/Menu/TintedImageView.swift +++ /dev/null @@ -1,16 +0,0 @@ -// -// TintedImageView.swift -// SettingPanel -// -// Created by Yaxin Cheng on 2018-12-09. -// Copyright © 2018 Yaxin Cheng. All rights reserved. -// - -import Cocoa - -class TintedImageView: NSImageView { - override func draw(_ dirtyRect: NSRect) { - image = image?.tintedImage(with: .labelColor) - super.draw(dirtyRect) - } -} diff --git a/Tonnerre.xcodeproj/project.pbxproj b/Tonnerre.xcodeproj/project.pbxproj index ff6eaa2..e1bd4ef 100644 --- a/Tonnerre.xcodeproj/project.pbxproj +++ b/Tonnerre.xcodeproj/project.pbxproj @@ -3,7 +3,7 @@ archiveVersion = 1; classes = { }; - objectVersion = 50; + objectVersion = 51; objects = { /* Begin PBXBuildFile section */ @@ -76,7 +76,6 @@ 146AAE7020BE2DEE009AC9C6 /* BaseWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 146AAE6F20BE2DEE009AC9C6 /* BaseWindow.swift */; }; 146AAE7120BE362A009AC9C6 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 1470514A20B1BEFB00F6FBE8 /* Assets.xcassets */; }; 146AD8C720C9C09300D9E591 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 146AD8C620C9C09300D9E591 /* AppDelegate.swift */; }; - 146AD8CC20C9C09400D9E591 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 146AD8CB20C9C09400D9E591 /* Assets.xcassets */; }; 146AD8CF20C9C09400D9E591 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 146AD8CD20C9C09400D9E591 /* MainMenu.xib */; }; 146AD8D520C9C0B200D9E591 /* CoreIndexing.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1470518920B1EF7000F6FBE8 /* CoreIndexing.swift */; }; 146AD8D620C9C0B700D9E591 /* FileTypeControl.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14AEB30420C1F74E00D10D44 /* FileTypeControl.swift */; }; @@ -144,7 +143,6 @@ 14AFE6A42112A4F4002BBBB2 /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 14AFE6A22112A4F4002BBBB2 /* Main.storyboard */; }; 14AFE6AF2118E1CB002BBBB2 /* TabViewSegue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14AFE6AE2118E1CB002BBBB2 /* TabViewSegue.swift */; }; 14AFE6B12118E31F002BBBB2 /* TabViewAnimator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14AFE6B02118E31F002BBBB2 /* TabViewAnimator.swift */; }; - 14AFE6B72118FD99002BBBB2 /* tne_icon.icns in Resources */ = {isa = PBXBuildFile; fileRef = 14AFE6B62118FD99002BBBB2 /* tne_icon.icns */; }; 14AFE6BF211A00FE002BBBB2 /* NSNib+Extension.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14AFE6BE211A00FE002BBBB2 /* NSNib+Extension.swift */; }; 14AFE6C5211A7093002BBBB2 /* VolumeService.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14AFE6C4211A7093002BBBB2 /* VolumeService.swift */; }; 14C4102C21826CCB00CEA1E9 /* MenuViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14C4102B21826CCB00CEA1E9 /* MenuViewController.swift */; }; @@ -168,10 +166,10 @@ 14D57CD1224EB6B400D52CF9 /* webServices.plist in Resources */ = {isa = PBXBuildFile; fileRef = 14D57CD0224EB6B400D52CF9 /* webServices.plist */; }; 14D57CD3224EB97B00D52CF9 /* WebServiceList.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14D57CD2224EB97B00D52CF9 /* WebServiceList.swift */; }; 14D57CD5224EBE9100D52CF9 /* WebServiceListTTest.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14D57CD4224EBE9100D52CF9 /* WebServiceListTTest.swift */; }; + 14D57CD72250351700D52CF9 /* tonnerrePlus.icns in Resources */ = {isa = PBXBuildFile; fileRef = 14D57CD62250351700D52CF9 /* tonnerrePlus.icns */; }; 14DAE54421FE9F1C001009CA /* MultiClickDetector.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14DAE54321FE9F1C001009CA /* MultiClickDetector.swift */; }; 14DAE5C82208E4E2001009CA /* SettingValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14DAE5C72208E4E2001009CA /* SettingValue.swift */; }; 14DAE5C92208FF21001009CA /* SettingValue.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14DAE5C72208E4E2001009CA /* SettingValue.swift */; }; - 14DB560921BDCE88006C26C0 /* TintedImageView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14DB560821BDCE88006C26C0 /* TintedImageView.swift */; }; 14E49CDE21B87A8C0018527A /* SettingFetcher.swift in Sources */ = {isa = PBXBuildFile; fileRef = 14E49CDD21B87A8C0018527A /* SettingFetcher.swift */; }; 14E70E0521753D3300413C13 /* DynamicServiceExec.py in Scripts copy */ = {isa = PBXBuildFile; fileRef = 1421F284210257D90020480A /* DynamicServiceExec.py */; }; 14E72EAB2176A01600FA41F8 /* TonnerreSearch.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 14E72EAA2176A01500FA41F8 /* TonnerreSearch.framework */; }; @@ -355,7 +353,6 @@ 146AD8C420C9C09300D9E591 /* TonnerreIndexHelper.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = TonnerreIndexHelper.app; sourceTree = BUILT_PRODUCTS_DIR; }; 146AD8C620C9C09300D9E591 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = ""; }; 146AD8C920C9C09300D9E591 /* TonnerreIndexHelper.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = TonnerreIndexHelper.xcdatamodel; sourceTree = ""; }; - 146AD8CB20C9C09400D9E591 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = ""; }; 146AD8CE20C9C09400D9E591 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = ""; }; 146AD8D020C9C09400D9E591 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = ""; }; 146AD8D120C9C09400D9E591 /* TonnerreIndexHelper.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = TonnerreIndexHelper.entitlements; sourceTree = ""; }; @@ -423,7 +420,6 @@ 14AFE6A62112A4F4002BBBB2 /* SettingPanel.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = SettingPanel.entitlements; sourceTree = ""; }; 14AFE6AE2118E1CB002BBBB2 /* TabViewSegue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabViewSegue.swift; sourceTree = ""; }; 14AFE6B02118E31F002BBBB2 /* TabViewAnimator.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TabViewAnimator.swift; sourceTree = ""; }; - 14AFE6B62118FD99002BBBB2 /* tne_icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = tne_icon.icns; sourceTree = ""; }; 14AFE6BE211A00FE002BBBB2 /* NSNib+Extension.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = "NSNib+Extension.swift"; sourceTree = ""; }; 14AFE6C4211A7093002BBBB2 /* VolumeService.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = VolumeService.swift; sourceTree = ""; }; 14AFE6E2211E3085002BBBB2 /* TonnerreSettings.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TonnerreSettings.swift; sourceTree = ""; }; @@ -445,9 +441,9 @@ 14D57CD0224EB6B400D52CF9 /* webServices.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = webServices.plist; sourceTree = ""; }; 14D57CD2224EB97B00D52CF9 /* WebServiceList.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebServiceList.swift; sourceTree = ""; }; 14D57CD4224EBE9100D52CF9 /* WebServiceListTTest.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WebServiceListTTest.swift; sourceTree = ""; }; + 14D57CD62250351700D52CF9 /* tonnerrePlus.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = tonnerrePlus.icns; sourceTree = ""; }; 14DAE54321FE9F1C001009CA /* MultiClickDetector.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = MultiClickDetector.swift; sourceTree = ""; }; 14DAE5C72208E4E2001009CA /* SettingValue.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingValue.swift; sourceTree = ""; }; - 14DB560821BDCE88006C26C0 /* TintedImageView.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = TintedImageView.swift; sourceTree = ""; }; 14E49CDD21B87A8C0018527A /* SettingFetcher.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = SettingFetcher.swift; sourceTree = ""; }; 14E72EAA2176A01500FA41F8 /* TonnerreSearch.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = TonnerreSearch.framework; path = Carthage/Build/Mac/TonnerreSearch.framework; sourceTree = ""; }; 14E9AD4A20CC8CE100F3EEC8 /* langueToEmoji.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = langueToEmoji.plist; sourceTree = ""; }; @@ -652,7 +648,6 @@ 146AD8DD20C9C12A00D9E591 /* Common.swift */, 1452251F20B4A794001E0D52 /* URL+Extension.swift */, 1440331321DD6FCD0026E822 /* PathIterator.swift */, - 146AD8CB20C9C09400D9E591 /* Assets.xcassets */, 146AD8CD20C9C09400D9E591 /* MainMenu.xib */, 146AD8D020C9C09400D9E591 /* Info.plist */, 140F8C6E20B3668C00C69C25 /* exclusionList.plist */, @@ -742,7 +737,7 @@ 1470515020B1BEFB00F6FBE8 /* Tonnerre.entitlements */, 1470514720B1BEF900F6FBE8 /* Tonnerre.xcdatamodeld */, 1421F284210257D90020480A /* DynamicServiceExec.py */, - 14AFE6B62118FD99002BBBB2 /* tne_icon.icns */, + 14D57CD62250351700D52CF9 /* tonnerrePlus.icns */, 1404E6BD222DCFF800F27F7C /* browsers.plist */, 14D57CD0224EB6B400D52CF9 /* webServices.plist */, ); @@ -1028,7 +1023,6 @@ 146C053B21BDB20F0028B076 /* NonScrollView.swift */, 146C052C21BC6AAC0028B076 /* MenuOptionId.swift */, 14F5702121ACA8B500AE269B /* MenuOption.swift */, - 14DB560821BDCE88006C26C0 /* TintedImageView.swift */, 14F5702221ACA8B500AE269B /* MenuOption.xib */, ); path = Menu; @@ -1212,7 +1206,7 @@ }; }; buildConfigurationList = 1470513B20B1BEF900F6FBE8 /* Build configuration list for PBXProject "Tonnerre" */; - compatibilityVersion = "Xcode 9.3"; + compatibilityVersion = "Xcode 10.0"; developmentRegion = en; hasScannedForEncodings = 0; knownRegions = ( @@ -1246,7 +1240,6 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( - 146AD8CC20C9C09400D9E591 /* Assets.xcassets in Resources */, 146AD8E820C9CC8C00D9E591 /* exclusionList.plist in Resources */, 146AD8CF20C9C09400D9E591 /* MainMenu.xib in Resources */, 146AD8E920C9CC8F00D9E591 /* alias.plist in Resources */, @@ -1260,9 +1253,9 @@ files = ( 14AEB2DC20BEFDA900D10D44 /* ServiceCell.xib in Resources */, 1470514E20B1BEFB00F6FBE8 /* Main.storyboard in Resources */, - 14AFE6B72118FD99002BBBB2 /* tne_icon.icns in Resources */, 146AD8EE20CA12C200D9E591 /* alias.plist in Resources */, 146AAE7120BE362A009AC9C6 /* Assets.xcassets in Resources */, + 14D57CD72250351700D52CF9 /* tonnerrePlus.icns in Resources */, 14D57CD1224EB6B400D52CF9 /* webServices.plist in Resources */, 1404E6BE222DCFF900F27F7C /* browsers.plist in Resources */, 14FA57E220CC68CA00E53D63 /* langueCodes.plist in Resources */, @@ -1317,7 +1310,7 @@ ); runOnlyForDeploymentPostprocessing = 0; shellPath = /bin/sh; - shellScript = "#rm ${CONFIGURATION_BUILD_DIR}/Tonnerre.dmg\n# create-dmg --volname Tonnerre --volicon /Users/cheng/Developer/ScriptTools/CreateDMG/installer.icns --background /Users/cheng/Developer/ScriptTools/CreateDMG/background.png --app-drop-link 450 170 --window-size 550 330 --icon Tonnerre 100 170 ${CONFIGURATION_BUILD_DIR}/Tonnerre.dmg ${CONFIGURATION_BUILD_DIR}/Tonnerre.app\n"; + shellScript = "rm ${CONFIGURATION_BUILD_DIR}/Tonnerre.dmg\ncreate-dmg --volname Tonnerre --volicon /Users/cheng/Developer/ScriptTools/CreateDMG/installer.icns --background /Users/cheng/Developer/ScriptTools/CreateDMG/background.png --app-drop-link 450 170 --window-size 550 330 --icon Tonnerre 100 170 ${CONFIGURATION_BUILD_DIR}/Tonnerre.dmg ${CONFIGURATION_BUILD_DIR}/Tonnerre.app\n"; }; /* End PBXShellScriptBuildPhase section */ @@ -1490,7 +1483,6 @@ 14DAE5C82208E4E2001009CA /* SettingValue.swift in Sources */, 14F5702621ACAAA800AE269B /* NSUserInterfaceItemIdentifier+Extension.swift in Sources */, 146C053821BDAEB50028B076 /* ContentViewDelegate.swift in Sources */, - 14DB560921BDCE88006C26C0 /* TintedImageView.swift in Sources */, 146C052D21BC6AAC0028B076 /* MenuOptionId.swift in Sources */, 14D5185521B4875B00C93E7C /* GeneralCell.swift in Sources */, 1449E5892133522600500BF4 /* NSImage+Tint.swift in Sources */, diff --git a/Tonnerre/AppDelegate.swift b/Tonnerre/AppDelegate.swift index bba820a..ac54892 100644 --- a/Tonnerre/AppDelegate.swift +++ b/Tonnerre/AppDelegate.swift @@ -20,21 +20,16 @@ class AppDelegate: NSObject, NSApplicationDelegate { func applicationDidFinishLaunching(_ aNotification: Notification) { // Insert code here to initialize your application - if #available(OSX 10.14, *) { - let centre = UNUserNotificationCenter.current() - centre.requestAuthorization(options: [.alert, .sound, .badge]) { (granted, error) in - #if DEBUG - print("Notification permission granted:", granted) - if let errorInfo = error { - print("error:", errorInfo) - } - #endif + let centre = UNUserNotificationCenter.current() + centre.requestAuthorization(options: [.alert, .sound, .badge]) { (granted, error) in + #if DEBUG + print("Notification permission granted:", granted) + if let errorInfo = error { + print("error:", errorInfo) } - centre.delegate = self - } else { - // Fallback on earlier versions - NSUserNotificationCenter.default.delegate = self + #endif } + centre.delegate = self } func application(_ application: NSApplication, open urls: [URL]) { @@ -161,14 +156,6 @@ class AppDelegate: NSObject, NSApplicationDelegate { } -@available(OSX, obsoleted: 10.14) -extension AppDelegate: NSUserNotificationCenterDelegate { - func userNotificationCenter(_ center: NSUserNotificationCenter, shouldPresent notification: NSUserNotification) -> Bool { - return true - } -} - -@available(OSX, introduced: 10.14) extension AppDelegate: UNUserNotificationCenterDelegate { func userNotificationCenter(_ center: UNUserNotificationCenter, willPresent notification: UNNotification, withCompletionHandler completionHandler: @escaping (UNNotificationPresentationOptions) -> Void) { completionHandler([.badge, .sound, .alert]) diff --git a/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_128x128.png b/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_128x128.png index 5304ceb..3b4383b 100644 Binary files a/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_128x128.png and b/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_128x128.png differ diff --git a/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_128x128@2x.png b/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_128x128@2x.png index f5c7890..d41d7d3 100644 Binary files a/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_128x128@2x.png and b/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_128x128@2x.png differ diff --git a/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_16x16.png b/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_16x16.png index a3b749a..7bb2db9 100644 Binary files a/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_16x16.png and b/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_16x16.png differ diff --git a/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_16x16@2x.png b/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_16x16@2x.png index df1a4e9..c1845d5 100644 Binary files a/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_16x16@2x.png and b/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_16x16@2x.png differ diff --git a/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_256x256.png b/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_256x256.png index 92204c4..f5e75b8 100644 Binary files a/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_256x256.png and b/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_256x256.png differ diff --git a/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_256x256@2x.png b/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_256x256@2x.png index d995e13..0c8c915 100644 Binary files a/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_256x256@2x.png and b/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_256x256@2x.png differ diff --git a/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_32x32.png b/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_32x32.png index e7a9596..4d0c690 100644 Binary files a/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_32x32.png and b/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_32x32.png differ diff --git a/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_32x32@2x.png b/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_32x32@2x.png index afb4883..f47175d 100644 Binary files a/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_32x32@2x.png and b/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_32x32@2x.png differ diff --git a/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_512x512.png b/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_512x512.png index 4ad5b3d..74d3efb 100644 Binary files a/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_512x512.png and b/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_512x512.png differ diff --git a/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_512x512@2x.png b/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_512x512@2x.png index a3fa142..7326c64 100644 Binary files a/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_512x512@2x.png and b/Tonnerre/Assets.xcassets/AppIcon.appiconset/Icon_512x512@2x.png differ diff --git a/Tonnerre/Assets.xcassets/clipboard.imageset/clipboard@2x.png b/Tonnerre/Assets.xcassets/clipboard.imageset/clipboard@2x.png index 6348440..f38db6b 100644 Binary files a/Tonnerre/Assets.xcassets/clipboard.imageset/clipboard@2x.png and b/Tonnerre/Assets.xcassets/clipboard.imageset/clipboard@2x.png differ diff --git a/Tonnerre/Assets.xcassets/clipboard.imageset/clipboard@3x.png b/Tonnerre/Assets.xcassets/clipboard.imageset/clipboard@3x.png index f2081fd..dd91270 100644 Binary files a/Tonnerre/Assets.xcassets/clipboard.imageset/clipboard@3x.png and b/Tonnerre/Assets.xcassets/clipboard.imageset/clipboard@3x.png differ diff --git a/Tonnerre/Assets.xcassets/close.imageset/quit-1.png b/Tonnerre/Assets.xcassets/close.imageset/quit-1.png index ceb9780..1dac579 100644 Binary files a/Tonnerre/Assets.xcassets/close.imageset/quit-1.png and b/Tonnerre/Assets.xcassets/close.imageset/quit-1.png differ diff --git a/Tonnerre/Assets.xcassets/close.imageset/quit.png b/Tonnerre/Assets.xcassets/close.imageset/quit.png index 3c75d16..e49c292 100644 Binary files a/Tonnerre/Assets.xcassets/close.imageset/quit.png and b/Tonnerre/Assets.xcassets/close.imageset/quit.png differ diff --git a/Tonnerre/Assets.xcassets/eject.imageset/eject 2.png b/Tonnerre/Assets.xcassets/eject.imageset/eject 2.png index c01bbe1..82e42bd 100644 Binary files a/Tonnerre/Assets.xcassets/eject.imageset/eject 2.png and b/Tonnerre/Assets.xcassets/eject.imageset/eject 2.png differ diff --git a/Tonnerre/Assets.xcassets/eject.imageset/eject-1.png b/Tonnerre/Assets.xcassets/eject.imageset/eject-1.png index d3337e2..6901d28 100644 Binary files a/Tonnerre/Assets.xcassets/eject.imageset/eject-1.png and b/Tonnerre/Assets.xcassets/eject.imageset/eject-1.png differ diff --git a/Tonnerre/Assets.xcassets/image.imageset/image@2x.png b/Tonnerre/Assets.xcassets/image.imageset/image@2x.png index 441887f..14501d4 100644 Binary files a/Tonnerre/Assets.xcassets/image.imageset/image@2x.png and b/Tonnerre/Assets.xcassets/image.imageset/image@2x.png differ diff --git a/Tonnerre/Assets.xcassets/image.imageset/image@3x.png b/Tonnerre/Assets.xcassets/image.imageset/image@3x.png index cfba51e..14dfd8b 100644 Binary files a/Tonnerre/Assets.xcassets/image.imageset/image@3x.png and b/Tonnerre/Assets.xcassets/image.imageset/image@3x.png differ diff --git a/Tonnerre/Assets.xcassets/notFound.imageset/notFound@2x.png b/Tonnerre/Assets.xcassets/notFound.imageset/notFound@2x.png index 6e54ba1..3307931 100644 Binary files a/Tonnerre/Assets.xcassets/notFound.imageset/notFound@2x.png and b/Tonnerre/Assets.xcassets/notFound.imageset/notFound@2x.png differ diff --git a/Tonnerre/Assets.xcassets/notFound.imageset/notFound@3x.png b/Tonnerre/Assets.xcassets/notFound.imageset/notFound@3x.png index f990079..ff74e75 100644 Binary files a/Tonnerre/Assets.xcassets/notFound.imageset/notFound@3x.png and b/Tonnerre/Assets.xcassets/notFound.imageset/notFound@3x.png differ diff --git a/Tonnerre/Assets.xcassets/settings.imageset/Contents.json b/Tonnerre/Assets.xcassets/settings.imageset/Contents.json index 4f16cb0..22d8b48 100644 --- a/Tonnerre/Assets.xcassets/settings.imageset/Contents.json +++ b/Tonnerre/Assets.xcassets/settings.imageset/Contents.json @@ -6,7 +6,7 @@ }, { "idiom" : "universal", - "filename" : "setting@3x-1.png", + "filename" : "setting@2x.png", "scale" : "2x" }, { diff --git a/Tonnerre/Assets.xcassets/settings.imageset/setting@2x.png b/Tonnerre/Assets.xcassets/settings.imageset/setting@2x.png new file mode 100644 index 0000000..9e2e936 Binary files /dev/null and b/Tonnerre/Assets.xcassets/settings.imageset/setting@2x.png differ diff --git a/Tonnerre/Assets.xcassets/settings.imageset/setting@3x-1.png b/Tonnerre/Assets.xcassets/settings.imageset/setting@3x-1.png deleted file mode 100644 index 70de800..0000000 Binary files a/Tonnerre/Assets.xcassets/settings.imageset/setting@3x-1.png and /dev/null differ diff --git a/Tonnerre/Assets.xcassets/settings.imageset/setting@3x.png b/Tonnerre/Assets.xcassets/settings.imageset/setting@3x.png index 1539da3..c985bf6 100644 Binary files a/Tonnerre/Assets.xcassets/settings.imageset/setting@3x.png and b/Tonnerre/Assets.xcassets/settings.imageset/setting@3x.png differ diff --git a/Tonnerre/Assets.xcassets/text.imageset/Contents.json b/Tonnerre/Assets.xcassets/text.imageset/Contents.json index 3968bca..443001e 100644 --- a/Tonnerre/Assets.xcassets/text.imageset/Contents.json +++ b/Tonnerre/Assets.xcassets/text.imageset/Contents.json @@ -6,12 +6,12 @@ }, { "idiom" : "universal", - "filename" : "tonnerre@3x-1.png", + "filename" : "text@2x.png", "scale" : "2x" }, { "idiom" : "universal", - "filename" : "tonnerre@3x.png", + "filename" : "text@3x.png", "scale" : "3x" } ], diff --git a/Tonnerre/Assets.xcassets/text.imageset/text@2x.png b/Tonnerre/Assets.xcassets/text.imageset/text@2x.png new file mode 100644 index 0000000..f870f63 Binary files /dev/null and b/Tonnerre/Assets.xcassets/text.imageset/text@2x.png differ diff --git a/Tonnerre/Assets.xcassets/text.imageset/text@3x.png b/Tonnerre/Assets.xcassets/text.imageset/text@3x.png new file mode 100644 index 0000000..3c181c5 Binary files /dev/null and b/Tonnerre/Assets.xcassets/text.imageset/text@3x.png differ diff --git a/Tonnerre/Assets.xcassets/text.imageset/tonnerre@3x-1.png b/Tonnerre/Assets.xcassets/text.imageset/tonnerre@3x-1.png deleted file mode 100644 index 7cb855e..0000000 Binary files a/Tonnerre/Assets.xcassets/text.imageset/tonnerre@3x-1.png and /dev/null differ diff --git a/Tonnerre/Assets.xcassets/text.imageset/tonnerre@3x.png b/Tonnerre/Assets.xcassets/text.imageset/tonnerre@3x.png deleted file mode 100644 index b2abdb8..0000000 Binary files a/Tonnerre/Assets.xcassets/text.imageset/tonnerre@3x.png and /dev/null differ diff --git a/Tonnerre/Assets.xcassets/tonnerre.imageset/tonnerre@2x.png b/Tonnerre/Assets.xcassets/tonnerre.imageset/tonnerre@2x.png index 2189d4d..00dd15e 100644 Binary files a/Tonnerre/Assets.xcassets/tonnerre.imageset/tonnerre@2x.png and b/Tonnerre/Assets.xcassets/tonnerre.imageset/tonnerre@2x.png differ diff --git a/Tonnerre/Assets.xcassets/tonnerre.imageset/tonnerre@3x.png b/Tonnerre/Assets.xcassets/tonnerre.imageset/tonnerre@3x.png index 9e1a3e2..fe5e637 100644 Binary files a/Tonnerre/Assets.xcassets/tonnerre.imageset/tonnerre@3x.png and b/Tonnerre/Assets.xcassets/tonnerre.imageset/tonnerre@3x.png differ diff --git a/Tonnerre/Assets.xcassets/tonnerre_extension.imageset/Contents.json b/Tonnerre/Assets.xcassets/tonnerre_extension.imageset/Contents.json deleted file mode 100644 index b3112d7..0000000 --- a/Tonnerre/Assets.xcassets/tonnerre_extension.imageset/Contents.json +++ /dev/null @@ -1,22 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "filename" : "extension@2x.png", - "scale" : "2x" - }, - { - "idiom" : "universal", - "filename" : "extension@3x.png", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/Tonnerre/Assets.xcassets/tonnerre_extension.imageset/extension@2x.png b/Tonnerre/Assets.xcassets/tonnerre_extension.imageset/extension@2x.png deleted file mode 100644 index 9ecc172..0000000 Binary files a/Tonnerre/Assets.xcassets/tonnerre_extension.imageset/extension@2x.png and /dev/null differ diff --git a/Tonnerre/Assets.xcassets/tonnerre_extension.imageset/extension@3x.png b/Tonnerre/Assets.xcassets/tonnerre_extension.imageset/extension@3x.png deleted file mode 100644 index 56c9e3b..0000000 Binary files a/Tonnerre/Assets.xcassets/tonnerre_extension.imageset/extension@3x.png and /dev/null differ diff --git a/Tonnerre/GUI/Designs/Base.lproj/Main.storyboard b/Tonnerre/GUI/Designs/Base.lproj/Main.storyboard index bb818d4..cc124bb 100644 --- a/Tonnerre/GUI/Designs/Base.lproj/Main.storyboard +++ b/Tonnerre/GUI/Designs/Base.lproj/Main.storyboard @@ -1,8 +1,7 @@ - + - - + @@ -620,7 +619,7 @@ - + diff --git a/Tonnerre/GUI/PreviewPopover.swift b/Tonnerre/GUI/PreviewPopover.swift index 2ec0905..b87c97c 100644 --- a/Tonnerre/GUI/PreviewPopover.swift +++ b/Tonnerre/GUI/PreviewPopover.swift @@ -109,13 +109,8 @@ private extension PreviewPopover { private func TextView(text: NSAttributedString) -> NSView { let targetView: NSView let textView: NSTextView - if #available(OSX 10.14, *) { - targetView = NSTextView.scrollablePlainDocumentContentTextView() - textView = (targetView as! NSScrollView).documentView as! NSTextView - } else { - textView = NSTextView() - targetView = textView - } + targetView = NSTextView.scrollablePlainDocumentContentTextView() + textView = (targetView as! NSScrollView).documentView as! NSTextView textView.textStorage?.append(text) textView.drawsBackground = false textView.isEditable = false diff --git a/Tonnerre/GUI/ServiceCell.swift b/Tonnerre/GUI/ServiceCell.swift index 3c08c97..b09fe5d 100644 --- a/Tonnerre/GUI/ServiceCell.swift +++ b/Tonnerre/GUI/ServiceCell.swift @@ -24,11 +24,7 @@ final class ServiceCell: LiteTableCell { } override var highlightedColour: NSColor { - if #available(OSX 10.14, *) { - return NSColor.controlAccentColor.withAlphaComponent(0.8) - } else { - return super.highlightedColour.withAlphaComponent(0.8) - } + return NSColor.controlAccentColor.withAlphaComponent(0.8) } /// Display a popover next to the cell that presents the preview for this item diff --git a/Tonnerre/GUI/TonnerreIconView.swift b/Tonnerre/GUI/TonnerreIconView.swift index 0cb8029..7093f0d 100644 --- a/Tonnerre/GUI/TonnerreIconView.swift +++ b/Tonnerre/GUI/TonnerreIconView.swift @@ -18,10 +18,10 @@ final class TonnerreIconView: NSImageView { } } - private static let imagesWithTheme: Set = [#imageLiteral(resourceName: "tonnerre_extension"), #imageLiteral(resourceName: "tonnerre.icns"), #imageLiteral(resourceName: "tonnerre"), #imageLiteral(resourceName: "close"), #imageLiteral(resourceName: "eject"), #imageLiteral(resourceName: "settings"), #imageLiteral(resourceName: "clipboard")] + private static let imagesTintWithTheme: Set = [#imageLiteral(resourceName: "tonnerre.icns"), #imageLiteral(resourceName: "tonnerre")] override func draw(_ dirtyRect: NSRect) { - if image != nil && type(of: self).imagesWithTheme.contains(image!) { + if image != nil && type(of: self).imagesTintWithTheme.contains(image!) { image = image?.tintedImage(with: .labelColor) } super.draw(dirtyRect) diff --git a/Tonnerre/Info.plist b/Tonnerre/Info.plist index 6f779ba..39072e9 100644 --- a/Tonnerre/Info.plist +++ b/Tonnerre/Info.plist @@ -12,7 +12,7 @@ tne CFBundleTypeIconFile - tne_icon + tonnerrePlus CFBundleTypeMIMETypes com.tonnerre.tne @@ -44,7 +44,7 @@ CFBundlePackageType APPL CFBundleShortVersionString - 1.0.4 + 1.1 CFBundleVersion 1 LSApplicationCategoryType @@ -73,7 +73,7 @@ UTTypeDescription Tonnerre Extension UTTypeIconFile - tne_icon + tonnerrePlus UTTypeIdentifier com.tonnerre.tne UTTypeTagSpecification @@ -107,7 +107,7 @@ UTTypeDescription Tonnerre Extension UTTypeIconFile - tne_icon + tonnerrePlus UTTypeIdentifier com.tonnerre.tne UTTypeTagSpecification diff --git a/Tonnerre/Tools/LocalNotification.swift b/Tonnerre/Tools/LocalNotification.swift index 099822c..4781625 100644 --- a/Tonnerre/Tools/LocalNotification.swift +++ b/Tonnerre/Tools/LocalNotification.swift @@ -15,21 +15,12 @@ struct LocalNotification { var muted: Bool = false func send() { - if #available(OSX 10.14, *) { - let notification = UNMutableNotificationContent() - notification.title = title - notification.body = content - notification.sound = muted ? nil : UNNotificationSound.default - let request = UNNotificationRequest(identifier: title, content: notification, trigger: nil) - let centre = UNUserNotificationCenter.current() - centre.add(request, withCompletionHandler: nil) - } else { - // Fallback on earlier versions - let notification = NSUserNotification() - notification.title = title - notification.informativeText = content - if !muted { notification.soundName = NSUserNotificationDefaultSoundName } - NSUserNotificationCenter.default.deliver(notification) - } + let notification = UNMutableNotificationContent() + notification.title = title + notification.body = content + notification.sound = muted ? nil : UNNotificationSound.default + let request = UNNotificationRequest(identifier: title, content: notification, trigger: nil) + let centre = UNUserNotificationCenter.current() + centre.add(request, withCompletionHandler: nil) } } diff --git a/Tonnerre/tne_icon.icns b/Tonnerre/tne_icon.icns deleted file mode 100644 index 839481a..0000000 Binary files a/Tonnerre/tne_icon.icns and /dev/null differ diff --git a/Tonnerre/tonnerrePlus.icns b/Tonnerre/tonnerrePlus.icns new file mode 100644 index 0000000..a71512e Binary files /dev/null and b/Tonnerre/tonnerrePlus.icns differ diff --git a/TonnerreIndexHelper/Assets.xcassets/AppIcon.appiconset/Contents.json b/TonnerreIndexHelper/Assets.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 2db2b1c..0000000 --- a/TonnerreIndexHelper/Assets.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "size" : "16x16", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "16x16", - "scale" : "2x" - }, - { - "idiom" : "mac", - "size" : "32x32", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "32x32", - "scale" : "2x" - }, - { - "idiom" : "mac", - "size" : "128x128", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "128x128", - "scale" : "2x" - }, - { - "idiom" : "mac", - "size" : "256x256", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "256x256", - "scale" : "2x" - }, - { - "idiom" : "mac", - "size" : "512x512", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "512x512", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/TonnerreIndexHelper/Assets.xcassets/Contents.json b/TonnerreIndexHelper/Assets.xcassets/Contents.json deleted file mode 100644 index da4a164..0000000 --- a/TonnerreIndexHelper/Assets.xcassets/Contents.json +++ /dev/null @@ -1,6 +0,0 @@ -{ - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file