Merge branch 'release/V1.3'

Author: uclort

OpenFile.xcodeproj/project.pbxproj

@@ -526,7 +526,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 1.2;
+				MARKETING_VERSION = 1.3;
 				PRODUCT_BUNDLE_IDENTIFIER = houmeng.OpenFile;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;
@@ -549,7 +549,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 1.2;
+				MARKETING_VERSION = 1.3;
 				PRODUCT_BUNDLE_IDENTIFIER = houmeng.OpenFile;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_VERSION = 5.0;

OpenFile.xcodeproj/xcuserdata/HouMeng.xcuserdatad/xcschemes/xcschememanagement.plist

@@ -7,7 +7,7 @@
 		<key>OpenFile.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>5</integer>
+			<integer>6</integer>
 		</dict>
 	</dict>
 </dict>

OpenFile/Info.plist

@@ -38,5 +38,9 @@
 	<true/>
 	<key>NSSupportsSuddenTermination</key>
 	<true/>
+	<key>SUFeedURL</key>
+	<string>https://nlnlnull.github.io/OpenFile/appcast.xml</string>
+	<key>SUPublicEDKey</key>
+	<string>mlAnWwD5PcINpVSLEZi/qImGtO2k7h5x/JAKwRgyDyA=</string>
 </dict>
 </plist>

OpenFile/Main.storyboard

@@ -49,6 +49,7 @@
                         <outlet property="statusMenu" destination="qWY-tW-89H" id="tF6-v0-l7p"/>
                     </connections>
                 </customObject>
+                <customObject id="uN7-1I-SGm" customClass="SUUpdater"/>
                 <menu id="qWY-tW-89H">
                     <items>
                         <menuItem title="偏好设置" keyEquivalent="，" id="rMY-48-dQ6">
@@ -61,6 +62,12 @@
                                 <action selector="clearAddedFile:" target="Wbg-Gb-Ihh" id="4Gt-qt-ItK"/>
                             </connections>
                         </menuItem>
+                        <menuItem title="检查更新" id="E6t-Wu-t9V">
+                            <modifierMask key="keyEquivalentModifierMask"/>
+                            <connections>
+                                <action selector="checkForUpdates:" target="uN7-1I-SGm" id="leL-FV-C93"/>
+                            </connections>
+                        </menuItem>
                         <menuItem isSeparatorItem="YES" id="jCa-jD-TvC"/>
                         <menuItem title="退出" keyEquivalent="q" id="GMy-nS-wuu">
                             <connections>

OpenFile/Main/HmMainWindowController.swift

@@ -17,8 +17,6 @@ class HmMainWindowController: NSWindowController {
     func show(button: NSButton?) {
 
         guard let button = button, let buttonWindow = button.window, let window = self.window else { return }
-        showWindow(button)
-        window.makeKeyAndOrderFront(self)
         let frameOrigin = buttonWindow.frame.origin
 
         let screenWidth = NSScreen.main?.frame.width ?? 0
@@ -33,13 +31,15 @@ class HmMainWindowController: NSWindowController {
         if right > screenMaxX {
             left = left - ((right - screenMaxX) + 10)
         } else if left < screenMinX {
-//            left = screenMinX + 10
             left = screenMaxX - window.frame.width - 10
         }
 
 
         let yourPoint = CGPoint(x: left, y: top)
         window.setFrameOrigin(yourPoint)
         NSApp.activate(ignoringOtherApps: true)
+        showWindow(NSScreen.main)
+        window.makeKeyAndOrderFront(NSScreen.main)
+        
     }
 }

Podfile

@@ -1,5 +1,5 @@
 # Uncomment the next line to define a global platform for your project
-# platform :ios, '9.0'
+ platform :osx, '10.13'
 source 'https://cdn.cocoapods.org/'
 install! 'cocoapods', :generate_multiple_pod_projects => true
 target 'OpenFile' do
@@ -8,6 +8,7 @@ target 'OpenFile' do
   pod 'SnapKit'
   pod 'MASShortcut'
   pod 'LoginServiceKit', :git => 'https://github.com/Clipy/LoginServiceKit.git'
+  pod 'Sparkle'
   # Pods for OpenFile
 
 end