From 36c338f291c688932bb35880475898c26dd1d17f Mon Sep 17 00:00:00 2001
From: L1cardo <1014660822@qq.com>
Date: Sun, 20 Oct 2019 14:19:03 +0800
Subject: [PATCH 1/7] small fix

---
 uPic/PreferencesWindow/Base.lproj/Preferences.storyboard | 6 +++---
 uPic/PreferencesWindow/en.lproj/Preferences.strings      | 4 ++--
 uPic/PreferencesWindow/zh-Hans.lproj/Preferences.strings | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/uPic/PreferencesWindow/Base.lproj/Preferences.storyboard b/uPic/PreferencesWindow/Base.lproj/Preferences.storyboard
index 08ca0a68..cf397458 100644
--- a/uPic/PreferencesWindow/Base.lproj/Preferences.storyboard
+++ b/uPic/PreferencesWindow/Base.lproj/Preferences.storyboard
@@ -82,7 +82,7 @@
                                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="ct1-0Y-gVn">
                                         <rect key="frame" x="18" y="0.0" width="203" height="14"/>
                                         <textFieldCell key="cell" selectable="YES" title="uPic will automatically launch at login." id="ngT-lX-vFA">
-                                            <font key="font" metaFont="message" size="11"/>
+                                            <font key="font" metaFont="menu" size="11"/>
                                             <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
@@ -245,7 +245,7 @@
                                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="3HK-ud-hMQ">
                                         <rect key="frame" x="-2" y="0.0" width="252" height="14"/>
                                         <textFieldCell key="cell" selectable="YES" title="⚠️ Note that this will reset all user preferences" id="2Rg-te-FPU">
-                                            <font key="font" metaFont="message" size="11"/>
+                                            <font key="font" metaFont="menu" size="11"/>
                                             <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
@@ -926,7 +926,7 @@ Gw
                                             <button verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="YZD-zT-qZX">
                                                 <rect key="frame" x="345" y="2" width="97" height="32"/>
                                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                                <buttonCell key="cell" type="push" title="⚠️Reset" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="TD4-LI-X9U">
+                                                <buttonCell key="cell" type="push" title="⚠️ Reset" bezelStyle="rounded" alignment="center" borderStyle="border" imageScaling="proportionallyDown" inset="2" id="TD4-LI-X9U">
                                                     <behavior key="behavior" pushIn="YES" lightByBackground="YES" lightByGray="YES"/>
                                                     <font key="font" metaFont="system"/>
                                                 </buttonCell>
diff --git a/uPic/PreferencesWindow/en.lproj/Preferences.strings b/uPic/PreferencesWindow/en.lproj/Preferences.strings
index 83ef6e6c..f803cb58 100644
--- a/uPic/PreferencesWindow/en.lproj/Preferences.strings
+++ b/uPic/PreferencesWindow/en.lproj/Preferences.strings
@@ -71,8 +71,8 @@
 /* Class = "NSTextFieldCell"; title = "💡 HomePage:"; ObjectID = "OjL-Zl-YKD"; */
 "OjL-Zl-YKD.title" = "💡 HomePage:";
 
-/* Class = "NSButtonCell"; title = "⚠️Reset"; ObjectID = "TD4-LI-X9U"; */
-"TD4-LI-X9U.title" = "⚠️Reset";
+/* Class = "NSButtonCell"; title = "⚠️ Reset"; ObjectID = "TD4-LI-X9U"; */
+"TD4-LI-X9U.title" = "⚠️ Reset";
 
 /* Class = "NSTextFieldCell"; title = "💸 Donate:"; ObjectID = "Vjv-pA-ffP"; */
 "Vjv-pA-ffP.title" = "💸 Donate:";
diff --git a/uPic/PreferencesWindow/zh-Hans.lproj/Preferences.strings b/uPic/PreferencesWindow/zh-Hans.lproj/Preferences.strings
index 130fd478..13da7e53 100644
--- a/uPic/PreferencesWindow/zh-Hans.lproj/Preferences.strings
+++ b/uPic/PreferencesWindow/zh-Hans.lproj/Preferences.strings
@@ -71,8 +71,8 @@
 /* Class = "NSTextFieldCell"; title = "💡 主页:"; ObjectID = "OjL-Zl-YKD"; */
 "OjL-Zl-YKD.title" = "💡 主页:";
 
-/* Class = "NSButtonCell"; title = "⚠️撤销"; ObjectID = "TD4-LI-X9U"; */
-"TD4-LI-X9U.title" = "⚠️撤销";
+/* Class = "NSButtonCell"; title = "⚠️ 撤销"; ObjectID = "TD4-LI-X9U"; */
+"TD4-LI-X9U.title" = "⚠️ 撤销";
 
 /* Class = "NSTextFieldCell"; title = "💸 捐赠:"; ObjectID = "Vjv-pA-ffP"; */
 "Vjv-pA-ffP.title" = "💸 捐赠:";

From 8dfffc8769cdec096876e441f6924d5bc26924f3 Mon Sep 17 00:00:00 2001
From: L1cardo <1014660822@qq.com>
Date: Sun, 20 Oct 2019 16:31:17 +0800
Subject: [PATCH 2/7] Sorry that I missed this one

---
 uPic/PreferencesWindow/Base.lproj/Preferences.storyboard | 4 ++--
 uPic/PreferencesWindow/zh-Hans.lproj/Preferences.strings | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/uPic/PreferencesWindow/Base.lproj/Preferences.storyboard b/uPic/PreferencesWindow/Base.lproj/Preferences.storyboard
index cf397458..47830104 100644
--- a/uPic/PreferencesWindow/Base.lproj/Preferences.storyboard
+++ b/uPic/PreferencesWindow/Base.lproj/Preferences.storyboard
@@ -82,7 +82,7 @@
                                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="ct1-0Y-gVn">
                                         <rect key="frame" x="18" y="0.0" width="203" height="14"/>
                                         <textFieldCell key="cell" selectable="YES" title="uPic will automatically launch at login." id="ngT-lX-vFA">
-                                            <font key="font" metaFont="menu" size="11"/>
+                                            <font key="font" metaFont="message" size="11"/>
                                             <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
@@ -245,7 +245,7 @@
                                     <textField verticalHuggingPriority="750" horizontalCompressionResistancePriority="250" translatesAutoresizingMaskIntoConstraints="NO" id="3HK-ud-hMQ">
                                         <rect key="frame" x="-2" y="0.0" width="252" height="14"/>
                                         <textFieldCell key="cell" selectable="YES" title="⚠️ Note that this will reset all user preferences" id="2Rg-te-FPU">
-                                            <font key="font" metaFont="menu" size="11"/>
+                                            <font key="font" metaFont="message" size="11"/>
                                             <color key="textColor" name="secondaryLabelColor" catalog="System" colorSpace="catalog"/>
                                             <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
                                         </textFieldCell>
diff --git a/uPic/PreferencesWindow/zh-Hans.lproj/Preferences.strings b/uPic/PreferencesWindow/zh-Hans.lproj/Preferences.strings
index 13da7e53..0d862cfe 100644
--- a/uPic/PreferencesWindow/zh-Hans.lproj/Preferences.strings
+++ b/uPic/PreferencesWindow/zh-Hans.lproj/Preferences.strings
@@ -122,8 +122,8 @@
 /* Class = "NSButtonCell"; title = "重置偏好设置"; ObjectID = "jyI-H7-qN3"; */
 "jyI-H7-qN3.title" = "重置偏好设置";
 
-/* Class = "NSViewController"; title = "About"; ObjectID = "k6X-N1-mVu"; */
-"k6X-N1-mVu.title" = "About";
+/* Class = "NSViewController"; title = "关于"; ObjectID = "k6X-N1-mVu"; */
+"k6X-N1-mVu.title" = "关于";
 
 /* Class = "NSTextFieldCell"; title = "/"; ObjectID = "kdM-To-7Hl"; */
 "kdM-To-7Hl.title" = "/";

From 1424149085ab8d7dd805f5b98b424aa93c450526 Mon Sep 17 00:00:00 2001
From: Svend <svend.jin@gmail.com>
Date: Mon, 21 Oct 2019 21:59:58 +0800
Subject: [PATCH 3/7] :pencil: add release tutorial

:pencil: add release tutorial
---
 ReleaseTutorial.md | 10 ++++++++++
 1 file changed, 10 insertions(+)
 create mode 100644 ReleaseTutorial.md

diff --git a/ReleaseTutorial.md b/ReleaseTutorial.md
new file mode 100644
index 00000000..7ae855ad
--- /dev/null
+++ b/ReleaseTutorial.md
@@ -0,0 +1,10 @@
+- 1. Download the latest [appcast_pre.xml] (https://svend.cc/uPic/appcast_pre.xml)
+```
+https://svend.cc/uPic/appcast_pre.xml
+```
+- 2. Get the dmg's Sparkle signature
+```
+Pods/Sparkle/bin/sign_update upic.dmg
+```
+- 3. Fill in the output information to the location of the corresponding version in `appcast_pre.xml`
+- 4. Copy the `appcast_pre.xml` content to the `appcast.xml` file.
\ No newline at end of file

From f0aa52f1a889fa13c38ab5188b92342b217f264c Mon Sep 17 00:00:00 2001
From: nlnlnull <houmeng@outlook.it>
Date: Tue, 22 Oct 2019 15:02:45 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E4=BC=98=E5=8C=96=E4=B8=8A=E4=BC=A0?=
 =?UTF-8?q?=E5=8E=86=E5=8F=B2=E9=A2=84=E8=A7=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 uPic.xcodeproj/project.pbxproj        |  4 ++++
 uPic/Views/PreviewView.swift          | 34 +++++++++++++++++++++++++++
 uPic/Views/StatusMenuController.swift | 11 ++++++++-
 3 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 uPic/Views/PreviewView.swift

diff --git a/uPic.xcodeproj/project.pbxproj b/uPic.xcodeproj/project.pbxproj
index fe9d1c36..5b51be1d 100644
--- a/uPic.xcodeproj/project.pbxproj
+++ b/uPic.xcodeproj/project.pbxproj
@@ -101,6 +101,7 @@
 		16EA205C22AF8FB90006FB9C /* ConfigManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16EA205B22AF8FB90006FB9C /* ConfigManager.swift */; };
 		16F7467422E994A300480A62 /* FinderSync.swift in Sources */ = {isa = PBXBuildFile; fileRef = 16F7467322E994A300480A62 /* FinderSync.swift */; };
 		16F7467922E994A300480A62 /* uPicFinderExtension.appex in Embed App Extensions */ = {isa = PBXBuildFile; fileRef = 16F7467122E994A300480A62 /* uPicFinderExtension.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; };
+		4B66A850235ED44600DED242 /* PreviewView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4B66A84F235ED44600DED242 /* PreviewView.swift */; };
 		68BBB3EF25C92DCAE216A4DF /* AmazonS3Uploader.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68BBB5C4550545707614BE4D /* AmazonS3Uploader.swift */; };
 		68BBB6E5FFBB050D05107413 /* AmazonS3HostConfig.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68BBB8CF2838A67CA1AD438F /* AmazonS3HostConfig.swift */; };
 		68BBB99780D7F4586458D4F5 /* AmazonS3Util.swift in Sources */ = {isa = PBXBuildFile; fileRef = 68BBB2F5FAEEFFF55935F022 /* AmazonS3Util.swift */; };
@@ -243,6 +244,7 @@
 		16F7467322E994A300480A62 /* FinderSync.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = FinderSync.swift; sourceTree = "<group>"; };
 		16F7467522E994A300480A62 /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
 		16F7467622E994A300480A62 /* uPicFinderExtension.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = uPicFinderExtension.entitlements; sourceTree = "<group>"; };
+		4B66A84F235ED44600DED242 /* PreviewView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = PreviewView.swift; sourceTree = "<group>"; };
 		68BBB2F5FAEEFFF55935F022 /* AmazonS3Util.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AmazonS3Util.swift; sourceTree = "<group>"; };
 		68BBB5C4550545707614BE4D /* AmazonS3Uploader.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AmazonS3Uploader.swift; sourceTree = "<group>"; };
 		68BBB8CF2838A67CA1AD438F /* AmazonS3HostConfig.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AmazonS3HostConfig.swift; sourceTree = "<group>"; };
@@ -560,6 +562,7 @@
 		16ADBE5E22D1D74D00E6C605 /* Views */ = {
 			isa = PBXGroup;
 			children = (
+				4B66A84F235ED44600DED242 /* PreviewView.swift */,
 				169F074322AF7A3D008E8525 /* StatusMenuController.swift */,
 			);
 			path = Views;
@@ -867,6 +870,7 @@
 				168A831122B606C000344E77 /* UpYunUploader.swift in Sources */,
 				165701A122C8A6E600C57EE9 /* Regex.swift in Sources */,
 				163632F122B274B400805E7F /* Date+Extension.swift in Sources */,
+				4B66A850235ED44600DED242 /* PreviewView.swift in Sources */,
 				16995A3622B6026500B1F923 /* UpYunUtil.swift in Sources */,
 				167DDBED22C76F6600B03357 /* GithubHostConfig.swift in Sources */,
 				1646B80822C79349009271DF /* GiteeUtil.swift in Sources */,
diff --git a/uPic/Views/PreviewView.swift b/uPic/Views/PreviewView.swift
new file mode 100644
index 00000000..798972d4
--- /dev/null
+++ b/uPic/Views/PreviewView.swift
@@ -0,0 +1,34 @@
+//
+//  HistoryViewController.swift
+//  uPic
+//
+//  Created by 侯猛 on 2019/10/22.
+//  Copyright © 2019 Svend Jin. All rights reserved.
+//
+
+import Cocoa
+
+class PreviewView: NSView {
+    
+    private(set) var imageView: NSImageView!
+    
+    required init?(coder: NSCoder) {
+        fatalError("init(coder:) has not been implemented")
+    }
+
+    override init(frame frameRect: NSRect) {
+        super.init(frame: frameRect)
+        initializeView()
+    }
+    
+    func initializeView() {
+        imageView = NSImageView()
+        addSubview(imageView)
+    }
+    
+    override func layout() {
+        super.layout()
+        imageView.frame = bounds
+    }
+    
+}
diff --git a/uPic/Views/StatusMenuController.swift b/uPic/Views/StatusMenuController.swift
index 493f5e04..beb3b9cf 100644
--- a/uPic/Views/StatusMenuController.swift
+++ b/uPic/Views/StatusMenuController.swift
@@ -260,11 +260,20 @@ class StatusMenuController: NSObject, NSMenuDelegate {
 
                 // 创建 NSImage 并验证其有效性，最后添加到对应的历史记录项的子菜单
                 if let image = NSImage(data: data!), image.isValid {
+                    let imageWidth: CGFloat = 300
+                    let imageSize = NSSize(width: imageWidth, height: imageWidth / (image.size.width / image.size.height))
                     let imgMenuItem = NSMenuItem(title: "", action: #selector(self.copyUrl(_:)), keyEquivalent: "")
                     imgMenuItem.image = image
                     imgMenuItem.toolTip = urlStr
                     imgMenuItem.target = self
-                    imgMenuItem.image?.size = NSSize(width: 250, height: 230)
+
+                    DispatchQueue.main.async(execute: {
+                        let previewView = PreviewView()
+                        previewView.frame.size = imageSize
+                        previewView.imageView.image = image
+                        imgMenuItem.view = previewView
+                    })
+                    
                     let imgSubMenu = NSMenu(title: "")
                     imgSubMenu.addItem(imgMenuItem)
                     menuItem.submenu = imgSubMenu

From c209b8c1e0c2e956d320abd3423707c52276270c Mon Sep 17 00:00:00 2001
From: Svend <svend.jin@gmail.com>
Date: Wed, 23 Oct 2019 19:18:04 +0800
Subject: [PATCH 5/7] :pencil: update release tutorial

---
 ReleaseTutorial.md | 14 ++++++--------
 1 file changed, 6 insertions(+), 8 deletions(-)

diff --git a/ReleaseTutorial.md b/ReleaseTutorial.md
index 7ae855ad..832f9d5f 100644
--- a/ReleaseTutorial.md
+++ b/ReleaseTutorial.md
@@ -1,10 +1,8 @@
-- 1. Download the latest [appcast_pre.xml] (https://svend.cc/uPic/appcast_pre.xml)
-```
-https://svend.cc/uPic/appcast_pre.xml
-```
+- 1. Download the latest [appcast_pre.xml](https://svend.cc/uPic/appcast_pre.xml)
 - 2. Get the dmg's Sparkle signature
-```
-Pods/Sparkle/bin/sign_update upic.dmg
-```
+     
+     ```
+     Pods/Sparkle/bin/sign_update upic.dmg
+     ```
 - 3. Fill in the output information to the location of the corresponding version in `appcast_pre.xml`
-- 4. Copy the `appcast_pre.xml` content to the `appcast.xml` file.
\ No newline at end of file
+- 4. Copy the `appcast_pre.xml` content to the `appcast.xml` file.

From efc2b560433da02701e67162635bdd14fd9b66a4 Mon Sep 17 00:00:00 2001
From: Svend <svend.jin@gmail.com>
Date: Thu, 31 Oct 2019 15:50:40 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=F0=9F=90=9B=20Fix=20the=20problem=20of=20w?=
 =?UTF-8?q?eibo=20upload=20error=20403?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🐛 Fix the problem of weibo upload error 403
🎨 Adjust the position of the configuration interface help button
🎨 Adjust notification permission request timing
---
 CONTRIBUTING.md                               | 87 +++++++++++++++++++
 Podfile.lock                                  |  8 +-
 uPic/AppDelegate.swift                        |  3 +
 uPic/Extensions/NotificationExt.swift         | 29 +++++--
 uPic/Models/Weibo/WeiboUploader.swift         |  3 +-
 .../ConfigView/ConfigView.swift               | 10 +++
 .../ConfigView/Views/AliyunConfigView.swift   |  8 +-
 .../ConfigView/Views/AmazonS3ConfigView.swift |  8 +-
 .../ConfigView/Views/CustomConfigView.swift   |  8 +-
 .../ConfigView/Views/GiteeConfigView.swift    |  8 +-
 .../ConfigView/Views/GithubConfigView.swift   |  8 +-
 .../ConfigView/Views/ImgurConfigView.swift    |  8 +-
 .../ConfigView/Views/QiniuConfigView.swift    |  8 +-
 .../ConfigView/Views/TencentConfigView.swift  |  8 +-
 .../ConfigView/Views/UpYunConfigView.swift    |  8 +-
 .../ConfigView/Views/WeiboConfigView.swift    |  8 +-
 uPic/Views/StatusMenuController.swift         |  5 +-
 17 files changed, 140 insertions(+), 85 deletions(-)
 create mode 100644 CONTRIBUTING.md

diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
new file mode 100644
index 00000000..25a20ccd
--- /dev/null
+++ b/CONTRIBUTING.md
@@ -0,0 +1,87 @@
+# Contributing
+
+When contributing to this repository, please first discuss the change you wish to make via issue,
+email, or any other method with the owners of this repository before making a change. 
+
+Please note we have a code of conduct, please follow it in all your interactions with the project.
+
+## Pull Request Process
+
+1. Ensure any install or build dependencies are removed before the end of the layer when doing a 
+   build.
+2. Please fully test whether the existing features are affected by your modifications.
+
+## Code of Conduct
+
+### Our Pledge
+
+In the interest of fostering an open and welcoming environment, we as
+contributors and maintainers pledge to making participation in our project and
+our community a harassment-free experience for everyone, regardless of age, body
+size, disability, ethnicity, gender identity and expression, level of experience,
+nationality, personal appearance, race, religion, or sexual identity and
+orientation.
+
+### Our Standards
+
+Examples of behavior that contributes to creating a positive environment
+include:
+
+* Using welcoming and inclusive language
+* Being respectful of differing viewpoints and experiences
+* Gracefully accepting constructive criticism
+* Focusing on what is best for the community
+* Showing empathy towards other community members
+
+Examples of unacceptable behavior by participants include:
+
+* The use of sexualized language or imagery and unwelcome sexual attention or
+advances
+* Trolling, insulting/derogatory comments, and personal or political attacks
+* Public or private harassment
+* Publishing others' private information, such as a physical or electronic
+  address, without explicit permission
+* Other conduct which could reasonably be considered inappropriate in a
+  professional setting
+
+### Our Responsibilities
+
+Project maintainers are responsible for clarifying the standards of acceptable
+behavior and are expected to take appropriate and fair corrective action in
+response to any instances of unacceptable behavior.
+
+Project maintainers have the right and responsibility to remove, edit, or
+reject comments, commits, code, wiki edits, issues, and other contributions
+that are not aligned to this Code of Conduct, or to ban temporarily or
+permanently any contributor for other behaviors that they deem inappropriate,
+threatening, offensive, or harmful.
+
+### Scope
+
+This Code of Conduct applies both within project spaces and in public spaces
+when an individual is representing the project or its community. Examples of
+representing a project or community include using an official project e-mail
+address, posting via an official social media account, or acting as an appointed
+representative at an online or offline event. Representation of a project may be
+further defined and clarified by project maintainers.
+
+### Enforcement
+
+Instances of abusive, harassing, or otherwise unacceptable behavior may be
+reported by contacting the project team at [INSERT EMAIL ADDRESS]. All
+complaints will be reviewed and investigated and will result in a response that
+is deemed necessary and appropriate to the circumstances. The project team is
+obligated to maintain confidentiality with regard to the reporter of an incident.
+Further details of specific enforcement policies may be posted separately.
+
+Project maintainers who do not follow or enforce the Code of Conduct in good
+faith may face temporary or permanent repercussions as determined by other
+members of the project's leadership.
+
+### Attribution
+
+This Code of Conduct is adapted from the [Contributor Covenant][homepage], version 1.4,
+available at [http://contributor-covenant.org/version/1/4][version]
+
+[homepage]: http://contributor-covenant.org
+[version]: http://contributor-covenant.org/version/1/4/
diff --git a/Podfile.lock b/Podfile.lock
index 474256fc..710f6520 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -1,6 +1,6 @@
 PODS:
   - Alamofire (5.0.0-rc.2)
-  - CryptoSwift (1.1.2)
+  - CryptoSwift (1.1.3)
   - MASShortcut (2.4.0)
   - Sparkle (1.22.0)
   - SwiftyJSON (5.0.0)
@@ -30,7 +30,7 @@ EXTERNAL SOURCES:
 
 CHECKOUT OPTIONS:
   CryptoSwift:
-    :commit: 4ccfe9034a07af4b153657ba1cdac702ffcf8f2f
+    :commit: 3e911edb36b57de4fa37ecbb989fd3a0bc8c59b9
     :git: https://github.com/krzyzanowskim/CryptoSwift
   SwiftyXMLParser:
     :commit: bc85162ecee60d6eb94b778648bc4c51e1c4d34f
@@ -38,7 +38,7 @@ CHECKOUT OPTIONS:
 
 SPEC CHECKSUMS:
   Alamofire: f9450d3c7f6bea2ad62e7a541c3e9b186c7991d6
-  CryptoSwift: 31dacd1f13427439ddae5b5cbaae4c8dbc43047e
+  CryptoSwift: 6b6e488df0598b3e9fa49254ed1a65e8c1b1e10b
   MASShortcut: d9e4909e878661cc42877cc9d6efbe638273ab57
   Sparkle: 593ac2e677c07bcb6c3b22d621240e7cbedaab57
   SwiftyJSON: 36413e04c44ee145039d332b4f4e2d3e8d6c4db7
@@ -46,4 +46,4 @@ SPEC CHECKSUMS:
 
 PODFILE CHECKSUM: d426de3f20f6f6f0df58c0732d6bb48c0d8764b6
 
-COCOAPODS: 1.8.3
+COCOAPODS: 1.8.4
diff --git a/uPic/AppDelegate.swift b/uPic/AppDelegate.swift
index 6eb7da6e..20373725 100644
--- a/uPic/AppDelegate.swift
+++ b/uPic/AppDelegate.swift
@@ -44,6 +44,9 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         // Insert code here to initialize your application
         ConfigManager.shared.firstSetup()
         
+        // Request notification permission
+        NotificationExt.requestAuthorization()
+        
         self.resetNewVersionLaunchAtLogin()
 
         self.setupStatusBar()
diff --git a/uPic/Extensions/NotificationExt.swift b/uPic/Extensions/NotificationExt.swift
index e21dcb4c..795edc89 100644
--- a/uPic/Extensions/NotificationExt.swift
+++ b/uPic/Extensions/NotificationExt.swift
@@ -91,15 +91,9 @@ extension NotificationExt: UNUserNotificationCenterDelegate {
         notificationCenter.delegate = self
         notificationCenter.setNotificationCategories([])
         
-        notificationCenter.requestAuthorization(options: [.alert, .sound]) { (success, error) in
-            if success {
-                notificationCenter.add(request) { (error) in
-                    if error != nil {
-                        // Handle any errors.
-                    }
-                }
-            } else {
-                // user rejection
+        notificationCenter.add(request) { (error) in
+            if error != nil {
+                // Handle any errors.
             }
         }
         
@@ -156,3 +150,20 @@ extension NotificationExt: NSUserNotificationCenterDelegate {
     }
     
 }
+
+extension NotificationExt {
+    // MARK: 请求通知权限
+    static func requestAuthorization () {
+        if #available(OSX 10.14, *) {
+            UNUserNotificationCenter.current().requestAuthorization(options: [.alert, .sound]) { (success, error) in
+                if success {
+                    // user accept
+                } else {
+                    // user rejection
+                }
+            }
+        } else {
+            // Fallback on earlier versions
+        }
+    }
+}
diff --git a/uPic/Models/Weibo/WeiboUploader.swift b/uPic/Models/Weibo/WeiboUploader.swift
index 76835282..367dddda 100644
--- a/uPic/Models/Weibo/WeiboUploader.swift
+++ b/uPic/Models/Weibo/WeiboUploader.swift
@@ -15,7 +15,8 @@ class WeiboUploader: BaseUploader {
     static let shared = WeiboUploader()
     static let fileExtensions: [String] = ["jpeg", "jpg", "png", "gif", "bmp"]
     
-    let url = "http://picupload.service.weibo.com/interface/pic_upload.php?ori=1&mime=image%2Fjpeg&data=base64&url=0&markpos=1&logo=&nick=0&marks=1&app=miniblog"
+    let url = "https://picupload.weibo.com/interface/pic_upload.php?ori=1&mime=image%2Fjpeg&data=base64&url=0&markpos=1&logo=&nick=0&marks=1&app=miniblog"
+    
 
     func _upload(_ fileUrl: URL?, fileData: Data?) {
         guard let host = ConfigManager.shared.getDefaultHost(), let data = host.data else {
diff --git a/uPic/PreferencesWindow/ConfigView/ConfigView.swift b/uPic/PreferencesWindow/ConfigView/ConfigView.swift
index 58d9dbf3..5cdb62db 100644
--- a/uPic/PreferencesWindow/ConfigView/ConfigView.swift
+++ b/uPic/PreferencesWindow/ConfigView/ConfigView.swift
@@ -95,6 +95,16 @@ class ConfigView: NSView {
         // Subclasses override
     }
     
+    func createHelpBtn(_ paddingRight: Int, _ y: Int, _ url: String) {
+        let helpBtn = NSButton(title: "", target: self, action: #selector(openTutorial(_:)))
+        let helpBtnWidth = Int(helpBtn.frame.width)
+        helpBtn.frame = NSRect(x: Int(self.frame.width) - helpBtnWidth - paddingRight, y: y, width: helpBtnWidth, height: Int(helpBtn.frame.height))
+        helpBtn.bezelStyle = .helpButton
+        helpBtn.setButtonType(.momentaryPushIn)
+        helpBtn.toolTip = url
+        self.addSubview(helpBtn)
+    }
+    
     func setNextKeyViews() {
         if nextKeyViews.count > 1 {
             for (index, item) in nextKeyViews.enumerated() {
diff --git a/uPic/PreferencesWindow/ConfigView/Views/AliyunConfigView.swift b/uPic/PreferencesWindow/ConfigView/Views/AliyunConfigView.swift
index 384c1f4c..e3231950 100644
--- a/uPic/PreferencesWindow/ConfigView/Views/AliyunConfigView.swift
+++ b/uPic/PreferencesWindow/ConfigView/Views/AliyunConfigView.swift
@@ -145,13 +145,7 @@ class AliyunConfigView: ConfigView {
         
         // MARK: help
         y = y - gapTop * 2 - labelHeight
-        let helpBtn = NSButton(title: "", target: self, action: #selector(openTutorial(_:)))
-        let helpBtnWidth = Int(helpBtn.frame.width)
-        helpBtn.frame = NSRect(x: viewWidth - helpBtnWidth * 3 / 2, y: y, width: helpBtnWidth, height: Int(helpBtn.frame.height))
-        helpBtn.bezelStyle = .helpButton
-        helpBtn.setButtonType(.momentaryPushIn)
-        helpBtn.toolTip = "https://blog.svend.cc/upic/tutorials/aliyun_oss"
-        self.addSubview(helpBtn)
+        super.createHelpBtn(paddingLeft, y, "https://blog.svend.cc/upic/tutorials/aliyun_oss")
     }
 
     
diff --git a/uPic/PreferencesWindow/ConfigView/Views/AmazonS3ConfigView.swift b/uPic/PreferencesWindow/ConfigView/Views/AmazonS3ConfigView.swift
index d9e80b94..ef74e5b4 100644
--- a/uPic/PreferencesWindow/ConfigView/Views/AmazonS3ConfigView.swift
+++ b/uPic/PreferencesWindow/ConfigView/Views/AmazonS3ConfigView.swift
@@ -147,13 +147,7 @@ class AmazonS3ConfigView: ConfigView {
         
         // MARK: help
         y = y - gapTop * 2 - labelHeight
-        let helpBtn = NSButton(title: "", target: self, action: #selector(openTutorial(_:)))
-        let helpBtnWidth = Int(helpBtn.frame.width)
-        helpBtn.frame = NSRect(x: viewWidth - helpBtnWidth * 3 / 2, y: y, width: helpBtnWidth, height: Int(helpBtn.frame.height))
-        helpBtn.bezelStyle = .helpButton
-        helpBtn.setButtonType(.momentaryPushIn)
-        helpBtn.toolTip = "https://blog.svend.cc/upic/tutorials/amazon_s3"
-        self.addSubview(helpBtn)
+        super.createHelpBtn(paddingLeft, y, "https://blog.svend.cc/upic/tutorials/amazon_s3")
     }
 
     
diff --git a/uPic/PreferencesWindow/ConfigView/Views/CustomConfigView.swift b/uPic/PreferencesWindow/ConfigView/Views/CustomConfigView.swift
index 353788cb..d2eb8ff9 100644
--- a/uPic/PreferencesWindow/ConfigView/Views/CustomConfigView.swift
+++ b/uPic/PreferencesWindow/ConfigView/Views/CustomConfigView.swift
@@ -162,13 +162,7 @@ class CustomConfigView: ConfigView {
         
         // MARK: help
         y = y - gapTop - labelHeight
-        let helpBtn = NSButton(title: "", target: self, action: #selector(openTutorial(_:)))
-        let helpBtnWidth = Int(helpBtn.frame.width)
-        helpBtn.frame = NSRect(x: viewWidth - helpBtnWidth * 3 / 2, y: y, width: helpBtnWidth, height: Int(helpBtn.frame.height))
-        helpBtn.bezelStyle = .helpButton
-        helpBtn.setButtonType(.momentaryPushIn)
-        helpBtn.toolTip = "https://blog.svend.cc/upic/tutorials/custom"
-        self.addSubview(helpBtn)
+        super.createHelpBtn(paddingLeft, y, "https://blog.svend.cc/upic/tutorials/custom")
         
     }
     
diff --git a/uPic/PreferencesWindow/ConfigView/Views/GiteeConfigView.swift b/uPic/PreferencesWindow/ConfigView/Views/GiteeConfigView.swift
index b360eb11..fb76ed3f 100644
--- a/uPic/PreferencesWindow/ConfigView/Views/GiteeConfigView.swift
+++ b/uPic/PreferencesWindow/ConfigView/Views/GiteeConfigView.swift
@@ -124,13 +124,7 @@ class GiteeConfigView: ConfigView {
         
         // MARK: help
         y = y - gapTop * 2 - labelHeight
-        let helpBtn = NSButton(title: "", target: self, action: #selector(openTutorial(_:)))
-        let helpBtnWidth = Int(helpBtn.frame.width)
-        helpBtn.frame = NSRect(x: viewWidth - helpBtnWidth * 3 / 2, y: y, width: helpBtnWidth, height: Int(helpBtn.frame.height))
-        helpBtn.bezelStyle = .helpButton
-        helpBtn.setButtonType(.momentaryPushIn)
-        helpBtn.toolTip = "https://blog.svend.cc/upic/tutorials/gitee"
-        self.addSubview(helpBtn)
+        super.createHelpBtn(paddingLeft, y, "https://blog.svend.cc/upic/tutorials/gitee")
     }
     
 }
diff --git a/uPic/PreferencesWindow/ConfigView/Views/GithubConfigView.swift b/uPic/PreferencesWindow/ConfigView/Views/GithubConfigView.swift
index 78b79f46..bc07b37f 100644
--- a/uPic/PreferencesWindow/ConfigView/Views/GithubConfigView.swift
+++ b/uPic/PreferencesWindow/ConfigView/Views/GithubConfigView.swift
@@ -124,13 +124,7 @@ class GithubConfigView: ConfigView {
         
         // MARK: help
         y = y - gapTop * 2 - labelHeight
-        let helpBtn = NSButton(title: "", target: self, action: #selector(openTutorial(_:)))
-        let helpBtnWidth = Int(helpBtn.frame.width)
-        helpBtn.frame = NSRect(x: viewWidth - helpBtnWidth * 3 / 2, y: y, width: helpBtnWidth, height: Int(helpBtn.frame.height))
-        helpBtn.bezelStyle = .helpButton
-        helpBtn.setButtonType(.momentaryPushIn)
-        helpBtn.toolTip = "https://blog.svend.cc/upic/tutorials/github"
-        self.addSubview(helpBtn)
+        super.createHelpBtn(paddingLeft, y, "https://blog.svend.cc/upic/tutorials/github")
     }
     
     
diff --git a/uPic/PreferencesWindow/ConfigView/Views/ImgurConfigView.swift b/uPic/PreferencesWindow/ConfigView/Views/ImgurConfigView.swift
index 8b4f5a1f..7cea43be 100644
--- a/uPic/PreferencesWindow/ConfigView/Views/ImgurConfigView.swift
+++ b/uPic/PreferencesWindow/ConfigView/Views/ImgurConfigView.swift
@@ -40,13 +40,7 @@ class ImgurConfigView: ConfigView {
         
         // MARK: help
         y = y - gapTop * 2 - labelHeight
-        let helpBtn = NSButton(title: "", target: self, action: #selector(openTutorial(_:)))
-        let helpBtnWidth = Int(helpBtn.frame.width)
-        helpBtn.frame = NSRect(x: viewWidth - helpBtnWidth * 3 / 2, y: y, width: helpBtnWidth, height: Int(helpBtn.frame.height))
-        helpBtn.bezelStyle = .helpButton
-        helpBtn.setButtonType(.momentaryPushIn)
-        helpBtn.toolTip = "https://blog.svend.cc/upic/tutorials/imgur"
-        self.addSubview(helpBtn)
+        super.createHelpBtn(paddingLeft, y, "https://blog.svend.cc/upic/tutorials/imgur")
     }
     
 }
diff --git a/uPic/PreferencesWindow/ConfigView/Views/QiniuConfigView.swift b/uPic/PreferencesWindow/ConfigView/Views/QiniuConfigView.swift
index 7cf5bd57..87583e79 100644
--- a/uPic/PreferencesWindow/ConfigView/Views/QiniuConfigView.swift
+++ b/uPic/PreferencesWindow/ConfigView/Views/QiniuConfigView.swift
@@ -144,13 +144,7 @@ class QiniuConfigView: ConfigView {
         
         // MARK: help
         y = y - gapTop * 2 - labelHeight
-        let helpBtn = NSButton(title: "", target: self, action: #selector(openTutorial(_:)))
-        let helpBtnWidth = Int(helpBtn.frame.width)
-        helpBtn.frame = NSRect(x: viewWidth - helpBtnWidth * 3 / 2, y: y, width: helpBtnWidth, height: Int(helpBtn.frame.height))
-        helpBtn.bezelStyle = .helpButton
-        helpBtn.setButtonType(.momentaryPushIn)
-        helpBtn.toolTip = "https://blog.svend.cc/upic/tutorials/qiniu_kodo"
-        self.addSubview(helpBtn)
+        super.createHelpBtn(paddingLeft, y, "https://blog.svend.cc/upic/tutorials/qiniu_kodo")
         
     }
     
diff --git a/uPic/PreferencesWindow/ConfigView/Views/TencentConfigView.swift b/uPic/PreferencesWindow/ConfigView/Views/TencentConfigView.swift
index 7bc11871..a80dc96e 100644
--- a/uPic/PreferencesWindow/ConfigView/Views/TencentConfigView.swift
+++ b/uPic/PreferencesWindow/ConfigView/Views/TencentConfigView.swift
@@ -145,13 +145,7 @@ class TencentConfigView: ConfigView {
         
         // MARK: help
         y = y - gapTop * 2 - labelHeight
-        let helpBtn = NSButton(title: "", target: self, action: #selector(openTutorial(_:)))
-        let helpBtnWidth = Int(helpBtn.frame.width)
-        helpBtn.frame = NSRect(x: viewWidth - helpBtnWidth * 3 / 2, y: y, width: helpBtnWidth, height: Int(helpBtn.frame.height))
-        helpBtn.bezelStyle = .helpButton
-        helpBtn.setButtonType(.momentaryPushIn)
-        helpBtn.toolTip = "https://blog.svend.cc/upic/tutorials/tencent_cos"
-        self.addSubview(helpBtn)
+        super.createHelpBtn(paddingLeft, y, "https://blog.svend.cc/upic/tutorials/tencent_cos")
     }
     
     
diff --git a/uPic/PreferencesWindow/ConfigView/Views/UpYunConfigView.swift b/uPic/PreferencesWindow/ConfigView/Views/UpYunConfigView.swift
index 31bf424b..c4afcfc2 100644
--- a/uPic/PreferencesWindow/ConfigView/Views/UpYunConfigView.swift
+++ b/uPic/PreferencesWindow/ConfigView/Views/UpYunConfigView.swift
@@ -108,13 +108,7 @@ class UpYunConfigView: ConfigView {
         
         // MARK: help
         y = y - gapTop * 2 - labelHeight
-        let helpBtn = NSButton(title: "", target: self, action: #selector(openTutorial(_:)))
-        let helpBtnWidth = Int(helpBtn.frame.width)
-        helpBtn.frame = NSRect(x: viewWidth - helpBtnWidth * 3 / 2, y: y, width: helpBtnWidth, height: Int(helpBtn.frame.height))
-        helpBtn.bezelStyle = .helpButton
-        helpBtn.setButtonType(.momentaryPushIn)
-        helpBtn.toolTip = "https://blog.svend.cc/upic/tutorials/upyun_uss"
-        self.addSubview(helpBtn)
+        super.createHelpBtn(paddingLeft, y, "https://blog.svend.cc/upic/tutorials/upyun_uss")
         
     }
 
diff --git a/uPic/PreferencesWindow/ConfigView/Views/WeiboConfigView.swift b/uPic/PreferencesWindow/ConfigView/Views/WeiboConfigView.swift
index 917fdb71..f237a4d1 100644
--- a/uPic/PreferencesWindow/ConfigView/Views/WeiboConfigView.swift
+++ b/uPic/PreferencesWindow/ConfigView/Views/WeiboConfigView.swift
@@ -134,13 +134,7 @@ class WeiboConfigView: ConfigView {
         
         // MARK: help
         y = y - gapTop * 2 - labelHeight
-        let helpBtn = NSButton(title: "", target: self, action: #selector(openTutorial(_:)))
-        let helpBtnWidth = Int(helpBtn.frame.width)
-        helpBtn.frame = NSRect(x: viewWidth - helpBtnWidth * 3 / 2, y: y, width: helpBtnWidth, height: Int(helpBtn.frame.height))
-        helpBtn.bezelStyle = .helpButton
-        helpBtn.setButtonType(.momentaryPushIn)
-        helpBtn.toolTip = "https://blog.svend.cc/upic/tutorials/weibo"
-        self.addSubview(helpBtn)
+        super.createHelpBtn(paddingLeft, y, "https://blog.svend.cc/upic/tutorials/weibo")
     }
     
     @objc func cookieModeChanged(_ sender: NSButton) {
diff --git a/uPic/Views/StatusMenuController.swift b/uPic/Views/StatusMenuController.swift
index beb3b9cf..6fab77a3 100644
--- a/uPic/Views/StatusMenuController.swift
+++ b/uPic/Views/StatusMenuController.swift
@@ -260,7 +260,10 @@ class StatusMenuController: NSObject, NSMenuDelegate {
 
                 // 创建 NSImage 并验证其有效性，最后添加到对应的历史记录项的子菜单
                 if let image = NSImage(data: data!), image.isValid {
-                    let imageWidth: CGFloat = 300
+                    var imageWidth: CGFloat = 300
+                    if image.size.width < imageWidth {
+                        imageWidth = image.size.width
+                    }
                     let imageSize = NSSize(width: imageWidth, height: imageWidth / (image.size.width / image.size.height))
                     let imgMenuItem = NSMenuItem(title: "", action: #selector(self.copyUrl(_:)), keyEquivalent: "")
                     imgMenuItem.image = image

From 1170724e7df63cb633cfa40266999c4342c83729 Mon Sep 17 00:00:00 2001
From: Svend <svend.jin@gmail.com>
Date: Thu, 31 Oct 2019 16:10:18 +0800
Subject: [PATCH 7/7] :bookmark: Releasing v0.12.4
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

🐛 Fix the problem of weibo upload error 403
🐛 Fix After switching the system theme, the icons in the Finder cannot adjust the color in time.
🎨 Adjust the position of the configuration interface help button
🎨 Adjust notification permission request timing
---
 uPic.xcodeproj/project.pbxproj                   |   8 ++++----
 .../Assets.xcassets/icon.imageset/Contents.json  |  15 +++++++++++++++
 .../Assets.xcassets/icon.imageset/light@2x-1.png | Bin 0 -> 1116 bytes
 .../upload.imageset/Contents.json                |   2 ++
 .../Assets.xcassets/upload.imageset/light-1.png  | Bin 0 -> 591 bytes
 .../upload.imageset/light@2x-2.png               | Bin 0 -> 1116 bytes
 uPicFinderExtension/FinderSync.swift             |   2 +-
 7 files changed, 22 insertions(+), 5 deletions(-)
 create mode 100644 uPicFinderExtension/Assets.xcassets/icon.imageset/Contents.json
 create mode 100644 uPicFinderExtension/Assets.xcassets/icon.imageset/light@2x-1.png
 create mode 100644 uPicFinderExtension/Assets.xcassets/upload.imageset/light-1.png
 create mode 100644 uPicFinderExtension/Assets.xcassets/upload.imageset/light@2x-2.png

diff --git a/uPic.xcodeproj/project.pbxproj b/uPic.xcodeproj/project.pbxproj
index 5b51be1d..15a2ecb2 100644
--- a/uPic.xcodeproj/project.pbxproj
+++ b/uPic.xcodeproj/project.pbxproj
@@ -1119,7 +1119,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 20191020;
+				CURRENT_PROJECT_VERSION = 20191031;
 				DEVELOPMENT_TEAM = W863J6W8DZ;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
@@ -1128,7 +1128,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 0.12.3;
+				MARKETING_VERSION = 0.12.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
@@ -1149,7 +1149,7 @@
 				CODE_SIGN_IDENTITY = "Mac Developer";
 				CODE_SIGN_STYLE = Manual;
 				COMBINE_HIDPI_IMAGES = YES;
-				CURRENT_PROJECT_VERSION = 20191020;
+				CURRENT_PROJECT_VERSION = 20191031;
 				DEVELOPMENT_TEAM = W863J6W8DZ;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = "$(SRCROOT)/uPic/Supporting Files/Info.plist";
@@ -1158,7 +1158,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.12;
-				MARKETING_VERSION = 0.12.3;
+				MARKETING_VERSION = 0.12.4;
 				PRODUCT_BUNDLE_IDENTIFIER = com.svend.uPic;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
diff --git a/uPicFinderExtension/Assets.xcassets/icon.imageset/Contents.json b/uPicFinderExtension/Assets.xcassets/icon.imageset/Contents.json
new file mode 100644
index 00000000..7e541cc9
--- /dev/null
+++ b/uPicFinderExtension/Assets.xcassets/icon.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "light@2x-1.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/uPicFinderExtension/Assets.xcassets/icon.imageset/light@2x-1.png b/uPicFinderExtension/Assets.xcassets/icon.imageset/light@2x-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc983709a8343e6e25f1bf8c7cf54c8a828b692f
GIT binary patch
literal 1116
zcmV-i1f%<jP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px(7D+@wRCodHT1jXWK@^>6A}+aziYCE09z<|OQE@{jh<Xx4FXB;LKtu!)6(t~e
zQb9b49+HdV&8r&0gd7CD7z71R<7g6%k+{Vr2}a)=?2u`@tEzkIx6@c3US_7N>izfM
z)Kpg&$z)tO2b=@W0q1~oz&Y^0I#6Y~@CD%839JF?fd*g>@EPd-g92Xf0QZ3rAoWp;
z3eEt}fL{?XfW9rjIv|x%4b_K$w?LG_gZkb82WL!bVjh%s0YSyYz4irsN7LZI28euT
zx%ly>T>-c4waJ>VT;PTTi}#GUg&Z}&RA3RX9oPhLk(~nklURnVgMcSe`ZX*UzX0Ar
z_;Z;KBoZ@`B@aj!9hLtBH1Q5J4G@jnV2>&;$^OrwZ=sX}yiX@tOx#?bpmU3a37si1
zfW~phx!k4+n^RQ0H*<QR*?4iBpmA%Lro9rIxuZO9OIRL6p0jCs{R!PmO-xYD01{+P
zNGh-o>*8~YHdF>I(T=X{4tpSvyGdoJ3`o_}SwNLDaE<2@%1{|lryQA%#>G0BDg$Qg
z2B)BXl}@9|0NvPf+dqPU0uKVb!$`ydkahrCBmBwt<H9f?b?amCtH&kfiajcrZv@<@
z0PQ&gXT&8zAvBc52Q5yAh4V7^1wa`W(JJ+=la~)HYZVHP2<NAU&||l4Xq23Wd{E(&
zr7kE?@=M?@akpQ@EL?aan3xBiJWDi<W9TSp!T|WWPZ*1Hcqf%`5ZoKbGMT?QE~tsM
zUiPF+#G7uRWGtSCnQ`L;21<P~T#tC@n%N<g<STe{K)G=e1X3pKrMRmC3BG}|iR6~z
zG<YOTxJG?<Et9i&iL<%0mUYt5E+F&5BJp={Z6&EtG=taXOz5iyVWUN{55UE3XD);@
zkL!hyHt#aG$YJOFooM6jy3Xrd=4<inupcBgT~%@2G!XngK|TH4`}Z1%veo640g-No
z7*H5@>7@ZlCVXii&7_Y3jZv2Z4d7iMspv3B)NatnR+nP!bHS$i-P&q<YN(oLk)sJ|
zV(rDahrhN84ddaq)->ACF^tF7^^%#t0tqEu=i(RT9~)K*>tU^|xg=Wg$(Fl*p5mUn
zB%A(&q#knr6?`&!0{F$3`<c%gaiSK3xK%ATzkfVyEItJWiE6~f*A|m<ZQ*V+Zg7$6
z0sKY8{mj}}qcXV7d<4Wz;*Glwjv8eqv&IH=dklEIabH=J@fLbAI`ee+M~uXM7_$$s
z8PvlQoFO2p0jz<wkRx(rF`@<FQMN8Ica+Tlf4fpKAH=NyPjhs7sF~WcKxkBjwv;w-
zDmMY^0Zz$!U>M+Y1aEO|02h~}ViFSN0G>5ci#N5Yhik?|pdH|osSD?TbHF*^9B>Xe
i2b=@W0p~z~1HS>6o>+JrBZ@Zw0000<MNUMnLSTY95Bl@~

literal 0
HcmV?d00001

diff --git a/uPicFinderExtension/Assets.xcassets/upload.imageset/Contents.json b/uPicFinderExtension/Assets.xcassets/upload.imageset/Contents.json
index ae9444f7..5c21fbc4 100644
--- a/uPicFinderExtension/Assets.xcassets/upload.imageset/Contents.json
+++ b/uPicFinderExtension/Assets.xcassets/upload.imageset/Contents.json
@@ -2,6 +2,7 @@
   "images" : [
     {
       "idiom" : "universal",
+      "filename" : "light-1.png",
       "scale" : "1x"
     },
     {
@@ -28,6 +29,7 @@
     },
     {
       "idiom" : "universal",
+      "filename" : "light@2x-2.png",
       "scale" : "2x"
     },
     {
diff --git a/uPicFinderExtension/Assets.xcassets/upload.imageset/light-1.png b/uPicFinderExtension/Assets.xcassets/upload.imageset/light-1.png
new file mode 100644
index 0000000000000000000000000000000000000000..759edf321631425ad924b3a4a8e2c48744106fe6
GIT binary patch
literal 591
zcmV-V0<iswP)<h;3K|Lk000e1NJLTq001BW001Be1^@s6b9#F800001b5ch_0Itp)
z=>Px%2}wjjR9Fe^mN`!qQ5c3Vs{|tmp%6q35(*O%mLFh=6;RR;LSb)XW1{{8prp1Y
zG!z)^C<u$UAyTjgN(jp}fdnKfJnv)(GlyBeA(zDBe#vuZ&iUSNnKLtIZZ21{(h8)n
zKpT?Jun7Bb4!iIb-a;MRi`9^I0xsY(fjxX9P*iIo+X5sNc75aME1?yhKsnsWs)(8c
zw}55*ClGhU`6M(#Ci{TeQp~E+EgH0TP>=9eksDB>zo8dWZ5W01%ChP<$X)Ap;65mQ
zuAqqH4ss2-`P>GcyMiK*-?;hQ1{z#J%6JLCmey*o5q8IkKjQcY)_XgT_7Svzny|*{
zRs94Zd(X(4Kss$w!7cbH<IRjY-l6wQ561;q8_+i)Slmm(Pb+MJHIHgOgWOn#pk=h$
zE8<KEx53(kw(s1kF(8lbu>w*|Z_*A}n#h+SJcWmlWQRDlM-+U~8ApAZgQlym@F!ky
z{0`OrIPP#Fhmu;l4QhTwWIVn@o`Uv)wTNVCQ&BNdbE$dMz*L$l!ar@Ci;#t;yxRKy
zuRw5#lg?*DDQ*T2IQ^L+k7}y6XFdGt!AdGD-vKm3oOR(ihqOGZrJ5mo#YhiVT<|x1
z-o_D%x;^M*O0R5O9@S7S&-5AwP5<dep&#1eFRX*^m9W}%o&f@0`a#;DX5b6xdr-2{
d3j7}{a0M9VRB*)#S*!p6002ovPDHLkV1flv2J!#^

literal 0
HcmV?d00001

diff --git a/uPicFinderExtension/Assets.xcassets/upload.imageset/light@2x-2.png b/uPicFinderExtension/Assets.xcassets/upload.imageset/light@2x-2.png
new file mode 100644
index 0000000000000000000000000000000000000000..bc983709a8343e6e25f1bf8c7cf54c8a828b692f
GIT binary patch
literal 1116
zcmV-i1f%<jP)<h;3K|Lk000e1NJLTq002M$002M;1^@s6s%dfF00001b5ch_0Itp)
z=>Px(7D+@wRCodHT1jXWK@^>6A}+aziYCE09z<|OQE@{jh<Xx4FXB;LKtu!)6(t~e
zQb9b49+HdV&8r&0gd7CD7z71R<7g6%k+{Vr2}a)=?2u`@tEzkIx6@c3US_7N>izfM
z)Kpg&$z)tO2b=@W0q1~oz&Y^0I#6Y~@CD%839JF?fd*g>@EPd-g92Xf0QZ3rAoWp;
z3eEt}fL{?XfW9rjIv|x%4b_K$w?LG_gZkb82WL!bVjh%s0YSyYz4irsN7LZI28euT
zx%ly>T>-c4waJ>VT;PTTi}#GUg&Z}&RA3RX9oPhLk(~nklURnVgMcSe`ZX*UzX0Ar
z_;Z;KBoZ@`B@aj!9hLtBH1Q5J4G@jnV2>&;$^OrwZ=sX}yiX@tOx#?bpmU3a37si1
zfW~phx!k4+n^RQ0H*<QR*?4iBpmA%Lro9rIxuZO9OIRL6p0jCs{R!PmO-xYD01{+P
zNGh-o>*8~YHdF>I(T=X{4tpSvyGdoJ3`o_}SwNLDaE<2@%1{|lryQA%#>G0BDg$Qg
z2B)BXl}@9|0NvPf+dqPU0uKVb!$`ydkahrCBmBwt<H9f?b?amCtH&kfiajcrZv@<@
z0PQ&gXT&8zAvBc52Q5yAh4V7^1wa`W(JJ+=la~)HYZVHP2<NAU&||l4Xq23Wd{E(&
zr7kE?@=M?@akpQ@EL?aan3xBiJWDi<W9TSp!T|WWPZ*1Hcqf%`5ZoKbGMT?QE~tsM
zUiPF+#G7uRWGtSCnQ`L;21<P~T#tC@n%N<g<STe{K)G=e1X3pKrMRmC3BG}|iR6~z
zG<YOTxJG?<Et9i&iL<%0mUYt5E+F&5BJp={Z6&EtG=taXOz5iyVWUN{55UE3XD);@
zkL!hyHt#aG$YJOFooM6jy3Xrd=4<inupcBgT~%@2G!XngK|TH4`}Z1%veo640g-No
z7*H5@>7@ZlCVXii&7_Y3jZv2Z4d7iMspv3B)NatnR+nP!bHS$i-P&q<YN(oLk)sJ|
zV(rDahrhN84ddaq)->ACF^tF7^^%#t0tqEu=i(RT9~)K*>tU^|xg=Wg$(Fl*p5mUn
zB%A(&q#knr6?`&!0{F$3`<c%gaiSK3xK%ATzkfVyEItJWiE6~f*A|m<ZQ*V+Zg7$6
z0sKY8{mj}}qcXV7d<4Wz;*Glwjv8eqv&IH=dklEIabH=J@fLbAI`ee+M~uXM7_$$s
z8PvlQoFO2p0jz<wkRx(rF`@<FQMN8Ica+Tlf4fpKAH=NyPjhs7sF~WcKxkBjwv;w-
zDmMY^0Zz$!U>M+Y1aEO|02h~}ViFSN0G>5ci#N5Yhik?|pdH|osSD?TbHF*^9B>Xe
i2b=@W0p~z~1HS>6o>+JrBZ@Zw0000<MNUMnLSTY95Bl@~

literal 0
HcmV?d00001

diff --git a/uPicFinderExtension/FinderSync.swift b/uPicFinderExtension/FinderSync.swift
index 74d0ba59..bf11e816 100644
--- a/uPicFinderExtension/FinderSync.swift
+++ b/uPicFinderExtension/FinderSync.swift
@@ -39,7 +39,7 @@ class FinderSync: FIFinderSync {
     }
 
     override var toolbarItemImage: NSImage {
-        return NSImage(named: "upload")!
+        return NSImage(named: "icon")!
     }
 
     override func menu(for menuKind: FIMenuKind) -> NSMenu? {