添加重启 finder 的帮助

bqlin · Jan 15, 2021 · Jan 16, 2021 · Jan 16, 2021 · Jan 16, 2021 · Jan 16, 2021
commit d55d5d0987cb77c62e0e97cae8692864a178f106
diff --git a/uPic.xcodeproj/project.pbxproj b/uPic.xcodeproj/project.pbxproj
@@ -349,6 +349,7 @@
 		965E819A25B7274E0031A01F /* WelcomeWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WelcomeWindowController.swift; sourceTree = "<group>"; };
 		968ECC08240DFCF900B2D78C /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		968ECC0A240DFCFA00B2D78C /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
+		96AA47FE25B88BE3006B4DAE /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Preferences.strings; sourceTree = "<group>"; };
 		96B6C3EE25AD89F200B1A584 /* uPicShareExtension.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = uPicShareExtension.appex; sourceTree = BUILT_PRODUCTS_DIR; };
 		96B6C3F025AD89F200B1A584 /* icon.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = icon.icns; sourceTree = "<group>"; };
 		96B6C3F225AD89F200B1A584 /* ShareViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareViewController.swift; sourceTree = "<group>"; };
@@ -363,7 +364,6 @@
 		96B8520C25B80D0700424535 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/Welcome.strings"; sourceTree = "<group>"; };
 		96B8520E25B80D0800424535 /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Welcome.strings"; sourceTree = "<group>"; };
 		96CA5B8925B41B1F00855629 /* OutputFormatCustomization.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = OutputFormatCustomization.swift; sourceTree = "<group>"; };
-		96CF336325B5F20800265690 /* en */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = en; path = en.lproj/Preferences.strings; sourceTree = "<group>"; };
 		96DBE27C25B7B7A7006F02FE /* WindowManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = WindowManager.swift; sourceTree = "<group>"; };
 		96F633ED25AEBE5E005514EB /* DatabaseWindowController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatabaseWindowController.swift; sourceTree = "<group>"; };
 		96F633F525AEC3C6005514EB /* DatabaseViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DatabaseViewController.swift; sourceTree = "<group>"; };
@@ -1248,7 +1248,7 @@
 				169F073C22AF53DE008E8525 /* Base */,
 				161ABBE323B212C800805C5B /* zh-Hans */,
 				1605DDD9246D993C00262C89 /* zh-Hant */,
-				96CF336325B5F20800265690 /* en */,
+				96AA47FE25B88BE3006B4DAE /* en */,
 			);
 			name = Preferences.storyboard;
 			sourceTree = "<group>";

diff --git a/uPic/Assets.xcassets/finderRestart.imageset/Contents.json b/uPic/Assets.xcassets/finderRestart.imageset/Contents.json
@@ -0,0 +1,56 @@
+{
+  "images" : [
+    {
+      "filename" : "finderRestart-light.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "finderRestart-dark.png",
+      "idiom" : "universal",
+      "scale" : "1x"
+    },
+    {
+      "filename" : "finderRestart-light@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "finderRestart-dark@2x.png",
+      "idiom" : "universal",
+      "scale" : "2x"
+    },
+    {
+      "filename" : "finderRestart-light@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    },
+    {
+      "appearances" : [
+        {
+          "appearance" : "luminosity",
+          "value" : "dark"
+        }
+      ],
+      "filename" : "finderRestart-dark@3x.png",
+      "idiom" : "universal",
+      "scale" : "3x"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/uPic/Assets.xcassets/finderRestart.imageset/finderRestart-dark.png b/uPic/Assets.xcassets/finderRestart.imageset/finderRestart-dark.png
diff --git a/uPic/Assets.xcassets/finderRestart.imageset/finderRestart-dark@2x.png b/uPic/Assets.xcassets/finderRestart.imageset/finderRestart-dark@2x.png
diff --git a/uPic/Assets.xcassets/finderRestart.imageset/finderRestart-dark@3x.png b/uPic/Assets.xcassets/finderRestart.imageset/finderRestart-dark@3x.png
diff --git a/uPic/Assets.xcassets/finderRestart.imageset/finderRestart-light.png b/uPic/Assets.xcassets/finderRestart.imageset/finderRestart-light.png
diff --git a/uPic/Assets.xcassets/finderRestart.imageset/finderRestart-light@2x.png b/uPic/Assets.xcassets/finderRestart.imageset/finderRestart-light@2x.png
diff --git a/uPic/Assets.xcassets/finderRestart.imageset/finderRestart-light@3x.png b/uPic/Assets.xcassets/finderRestart.imageset/finderRestart-light@3x.png
diff --git a/uPic/Assets.xcassets/welcome/leftButton.imageset/Contents.json b/uPic/Assets.xcassets/welcome/leftButton.imageset/Contents.json
@@ -19,5 +19,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }
diff --git a/uPic/Assets.xcassets/welcome/rightButton.imageset/Contents.json b/uPic/Assets.xcassets/welcome/rightButton.imageset/Contents.json
@@ -19,5 +19,8 @@
   "info" : {
     "author" : "xcode",
     "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
 }
diff --git a/uPic/Views/PreferencesWindow/AboutPreferencesViewController.swift b/uPic/Views/PreferencesWindow/AboutPreferencesViewController.swift
@@ -15,8 +15,9 @@ class AboutPreferencesViewController: PreferencesViewController {
     override func viewDidLoad() {
         super.viewDidLoad()
 
-        let versionObject = Bundle.main.infoDictionary?["CFBundleShortVersionString"]
-        versionLabel.stringValue = versionObject as? String ?? ""
+        let versionNum = Bundle.main.infoDictionary?["CFBundleShortVersionString"] as! String
+        let buildNum = Bundle.main.infoDictionary?["CFBundleVersion"] as! String
+        versionLabel.stringValue = "v\(versionNum) (\(buildNum))"
     }
 
     @IBAction func githubButtonClicked(_ sender: NSButton) {
@@ -54,6 +55,9 @@ class AboutPreferencesViewController: PreferencesViewController {
         NSWorkspace.shared.open(url)
     }
 
+    @IBAction func didClickShowWelcomePageButton(_ sender: NSButton) {
+        WindowManager.shared.showWindow(storyboard: "Welcome", withIdentifier: "welcomeWindowController")
+    }
 }
 
 class LinkButton: NSButton {