diff --git a/Glance.xcodeproj/project.pbxproj b/Glance.xcodeproj/project.pbxproj index 04c320d..a41136f 100644 --- a/Glance.xcodeproj/project.pbxproj +++ b/Glance.xcodeproj/project.pbxproj @@ -117,6 +117,7 @@ 7ED140622450B36D007A7C70 /* SupportedFilesWC.xib in Resources */ = {isa = PBXBuildFile; fileRef = 7ED140602450B36D007A7C70 /* SupportedFilesWC.xib */; }; 7ED140642450C4A7007A7C70 /* Credits.rtf in Resources */ = {isa = PBXBuildFile; fileRef = 7ED140632450C4A7007A7C70 /* Credits.rtf */; }; 7ED140662450C671007A7C70 /* SupportedFilesWC.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7ED140652450C671007A7C70 /* SupportedFilesWC.swift */; }; + 7EE0465C246EB5DE006172D9 /* AppIcon.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7EE0465B246EB5DE006172D9 /* AppIcon.swift */; }; 7EE10F84244F679B007214D8 /* Log.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7EE10F82244F6774007214D8 /* Log.swift */; }; 7EE10F85244F696F007214D8 /* Log.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7EE10F82244F6774007214D8 /* Log.swift */; }; 7EE8D463245969B000616E5B /* FileTreeTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7EE8D462245969B000616E5B /* FileTreeTests.swift */; }; @@ -278,6 +279,7 @@ 7ED140602450B36D007A7C70 /* SupportedFilesWC.xib */ = {isa = PBXFileReference; lastKnownFileType = file.xib; path = SupportedFilesWC.xib; sourceTree = ""; }; 7ED140632450C4A7007A7C70 /* Credits.rtf */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.rtf; path = Credits.rtf; sourceTree = ""; }; 7ED140652450C671007A7C70 /* SupportedFilesWC.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = SupportedFilesWC.swift; sourceTree = ""; }; + 7EE0465B246EB5DE006172D9 /* AppIcon.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppIcon.swift; sourceTree = ""; }; 7EE10F82244F6774007214D8 /* Log.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = Log.swift; sourceTree = ""; }; 7EE8D460245969B000616E5B /* GlanceTests.xctest */ = {isa = PBXFileReference; explicitFileType = wrapper.cfbundle; includeInIndex = 0; path = GlanceTests.xctest; sourceTree = BUILT_PRODUCTS_DIR; }; 7EE8D462245969B000616E5B /* FileTreeTests.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FileTreeTests.swift; sourceTree = ""; }; @@ -600,6 +602,7 @@ 7ECC8CF3240CB4CC000D6970 /* ViewController.swift */, 7ED140602450B36D007A7C70 /* SupportedFilesWC.xib */, 7ED140652450C671007A7C70 /* SupportedFilesWC.swift */, + 7EE0465B246EB5DE006172D9 /* AppIcon.swift */, ); path = Glance; sourceTree = ""; @@ -875,6 +878,7 @@ isa = PBXSourcesBuildPhase; buildActionMask = 2147483647; files = ( + 7EE0465C246EB5DE006172D9 /* AppIcon.swift in Sources */, 7E458AF0243944810091BD0F /* URL.swift in Sources */, 7ECC8CF4240CB4CC000D6970 /* ViewController.swift in Sources */, 7EE10F85244F696F007214D8 /* Log.swift in Sources */, diff --git a/Glance/AppIcon.swift b/Glance/AppIcon.swift new file mode 100644 index 0000000..0b2adfa --- /dev/null +++ b/Glance/AppIcon.swift @@ -0,0 +1,8 @@ +import Cocoa + +class AppIcon: NSImageView { + required init?(coder: NSCoder) { + super.init(coder: coder) + image = NSApplication.shared.applicationIconImage + } +} diff --git a/Glance/Assets.xcassets/AppIcon.appiconset/Contents.json b/Glance/Assets.xcassets/AppIcon.appiconset/Contents.json index 2db2b1c..2e3047f 100644 --- a/Glance/Assets.xcassets/AppIcon.appiconset/Contents.json +++ b/Glance/Assets.xcassets/AppIcon.appiconset/Contents.json @@ -1,58 +1,68 @@ { "images" : [ { + "filename" : "app-icon-16pt@1x.png", "idiom" : "mac", - "size" : "16x16", - "scale" : "1x" + "scale" : "1x", + "size" : "16x16" }, { + "filename" : "app-icon-16pt@2x.png", "idiom" : "mac", - "size" : "16x16", - "scale" : "2x" + "scale" : "2x", + "size" : "16x16" }, { + "filename" : "app-icon-32pt@1x.png", "idiom" : "mac", - "size" : "32x32", - "scale" : "1x" + "scale" : "1x", + "size" : "32x32" }, { + "filename" : "app-icon-32pt@2x.png", "idiom" : "mac", - "size" : "32x32", - "scale" : "2x" + "scale" : "2x", + "size" : "32x32" }, { + "filename" : "app-icon-128pt@1x.png", "idiom" : "mac", - "size" : "128x128", - "scale" : "1x" + "scale" : "1x", + "size" : "128x128" }, { + "filename" : "app-icon-128pt@2x.png", "idiom" : "mac", - "size" : "128x128", - "scale" : "2x" + "scale" : "2x", + "size" : "128x128" }, { + "filename" : "app-icon-256pt@1x.png", "idiom" : "mac", - "size" : "256x256", - "scale" : "1x" + "scale" : "1x", + "size" : "256x256" }, { + "filename" : "app-icon-256pt@2x.png", "idiom" : "mac", - "size" : "256x256", - "scale" : "2x" + "scale" : "2x", + "size" : "256x256" }, { + "filename" : "app-icon-512pt@1x.png", "idiom" : "mac", - "size" : "512x512", - "scale" : "1x" + "scale" : "1x", + "size" : "512x512" }, { + "filename" : "app-icon-512pt@2x.png", "idiom" : "mac", - "size" : "512x512", - "scale" : "2x" + "scale" : "2x", + "size" : "512x512" } ], "info" : { - "version" : 1, - "author" : "xcode" + "author" : "xcode", + "version" : 1 } -} \ No newline at end of file +} diff --git a/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-128pt@1x.png b/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-128pt@1x.png new file mode 100644 index 0000000..6e7517f Binary files /dev/null and b/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-128pt@1x.png differ diff --git a/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-128pt@2x.png b/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-128pt@2x.png new file mode 100644 index 0000000..70c6924 Binary files /dev/null and b/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-128pt@2x.png differ diff --git a/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-16pt@1x.png b/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-16pt@1x.png new file mode 100644 index 0000000..200a2a7 Binary files /dev/null and b/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-16pt@1x.png differ diff --git a/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-16pt@2x.png b/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-16pt@2x.png new file mode 100644 index 0000000..61bb431 Binary files /dev/null and b/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-16pt@2x.png differ diff --git a/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-256pt@1x.png b/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-256pt@1x.png new file mode 100644 index 0000000..70c6924 Binary files /dev/null and b/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-256pt@1x.png differ diff --git a/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-256pt@2x.png b/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-256pt@2x.png new file mode 100644 index 0000000..9c6a88a Binary files /dev/null and b/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-256pt@2x.png differ diff --git a/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-32pt@1x.png b/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-32pt@1x.png new file mode 100644 index 0000000..61bb431 Binary files /dev/null and b/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-32pt@1x.png differ diff --git a/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-32pt@2x.png b/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-32pt@2x.png new file mode 100644 index 0000000..9aab5f9 Binary files /dev/null and b/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-32pt@2x.png differ diff --git a/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-512pt@1x.png b/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-512pt@1x.png new file mode 100644 index 0000000..9c6a88a Binary files /dev/null and b/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-512pt@1x.png differ diff --git a/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-512pt@2x.png b/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-512pt@2x.png new file mode 100644 index 0000000..d30e402 Binary files /dev/null and b/Glance/Assets.xcassets/AppIcon.appiconset/app-icon-512pt@2x.png differ diff --git a/Glance/Credits.rtf b/Glance/Credits.rtf index c5dd91e..3c0d89d 100644 --- a/Glance/Credits.rtf +++ b/Glance/Credits.rtf @@ -2,6 +2,8 @@ \cocoatextscaling0\cocoaplatform0{\fonttbl\f0\fswiss\fcharset0 Helvetica-Bold;\f1\fswiss\fcharset0 Helvetica;} {\colortbl;\red255\green255\blue255;\red0\green0\blue0;} {\*\expandedcolortbl;;\cssrgb\c0\c0\c0;} +{\*\listtable{\list\listtemplateid1\listhybrid{\listlevel\levelnfc23\levelnfcn23\leveljc0\leveljcn0\levelfollow0\levelstartat1\levelspace360\levelindent0{\*\levelmarker \{disc\}}{\leveltext\leveltemplateid1\'01\uc0\u8226 ;}{\levelnumbers;}\fi-360\li720\lin720 }{\listname ;}\listid1}} +{\*\listoverridetable{\listoverride\listid1\listoverridecount0\ls1}} \paperw11900\paperh16840\margl1440\margr1440\vieww28600\viewh16280\viewkind0 \deftab720 \pard\pardeftab720\partightenfactor0 @@ -15,6 +17,21 @@ Portions of this software may utilize the following copyrighted material, the us \ \pard\pardeftab720\partightenfactor0 +\f0\b \cf2 App icon\ +\ +\pard\tx220\tx720\pardeftab720\li720\fi-720\partightenfactor0 +\ls1\ilvl0\cf2 \kerning1\expnd0\expndtw0 {\listtext \uc0\u8226 }Document: +\f1\b0 "Generic Document Icon" by Apple Inc. +\f0\b \ +{\listtext \uc0\u8226 }Magnifying glass: +\f1\b0 {\field{\*\fldinst{HYPERLINK "https://www.freepik.com/free-vector/magnifying-glass-background-realistic-style_2038298.htm"}}{\fldrslt \expnd0\expndtw0\kerning0 +"Magnifying glass background in realistic style Free Vector"}}\expnd0\expndtw0\kerning0 + by freepik\ +\pard\pardeftab720\partightenfactor0 +\cf2 \ +\ +\pard\pardeftab720\partightenfactor0 + \f0\b \cf2 Chroma\ \pard\pardeftab720\partightenfactor0 diff --git a/Glance/Main.storyboard b/Glance/Main.storyboard index 0129dba..fb4ffed 100644 --- a/Glance/Main.storyboard +++ b/Glance/Main.storyboard @@ -1,7 +1,6 @@ - @@ -399,21 +398,21 @@ - + - - + + - + - + - + @@ -813,7 +812,7 @@ - +