fix bug

Author: DevilFinger

WindowSnap.xcodeproj/project.pbxproj

@@ -417,6 +417,7 @@
 				CODE_SIGN_ENTITLEMENTS = WindowSnap/WindowSnap.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = A2APD4VYNX;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = WindowSnap/Info.plist;
@@ -425,6 +426,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = DevilFingerTeam.WindowSnap;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "WindowSnap/WindowSnap-Bridging-Header.h";
@@ -443,6 +445,7 @@
 				CODE_SIGN_ENTITLEMENTS = WindowSnap/WindowSnap.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				CURRENT_PROJECT_VERSION = 2;
 				DEVELOPMENT_TEAM = A2APD4VYNX;
 				ENABLE_HARDENED_RUNTIME = YES;
 				INFOPLIST_FILE = WindowSnap/Info.plist;
@@ -451,6 +454,7 @@
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.14;
+				MARKETING_VERSION = 1.0.1;
 				PRODUCT_BUNDLE_IDENTIFIER = DevilFingerTeam.WindowSnap;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				SWIFT_OBJC_BRIDGING_HEADER = "WindowSnap/WindowSnap-Bridging-Header.h";

WindowSnap/AppDelegate.swift

@@ -10,6 +10,7 @@ import Cocoa
 import AVFoundation
 import ApplicationServices.HIServices.Processes
 import DFAXUIElement
+import MASShortcut
 
 @NSApplicationMain
 class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
@@ -48,30 +49,16 @@ class AppDelegate: NSObject, NSApplicationDelegate, NSWindowDelegate {
     }
 
     func applicationDidFinishLaunching(_ aNotification: Notification) {
-        //2.快捷键
 
-        //3.一键最小化 -- show desktop
-        
-        //4.一键自动化分屏 - 1.设置同程序左右分割， 2.设置同程序叠加，3.随机
-        
-        //1.自定义 - 1.均分【多少行，多少列】 2.不均分。设置一共多少个。设置大小
-        
-        //设置hotkey界面
-        // 整理AXUI的类
-        // 整理按键模拟
-        // 整理苹果apple script
-        // 整理自启动
-        // 整理无window，only in menu的文档
-        
-        
-     
+        DFShortCutViewController.regiseterAllWithDefault()
+        DFMouseAreaHelper.helper.setupAll()
+        DFAreaSizeHelper.helper.setupTopAreaSize()
+        DFAreaSizeHelper.helper.setupBottomAreaSize()
 
         launchAtLoginMenu.state = DFLaunchAgentHelper.enabled() ? .on : .off
-        let _ = NSEvent.addGlobalMonitorForEvents(matching: [.leftMouseUp, .leftMouseDown, .leftMouseDragged]) { (event : NSEvent) in
-            DFShortCutViewController.regiseterAllWithDefault()
-            DFMouseAreaHelper.helper.setupAll()
-            DFAreaSizeHelper.helper.setupTopAreaSize()
-            DFAreaSizeHelper.helper.setupBottomAreaSize()
+        let _ = NSEvent.addGlobalMonitorForEvents(matching: [.leftMouseUp, .leftMouseDown, .leftMouseDragged]) {
+            (event : NSEvent) in
+            
             DFMouseMonitorManger.shared.moniter(event: event)
 
         }

WindowSnap/Base.lproj/Main.storyboard

@@ -108,7 +108,7 @@
                             <textField horizontalHuggingPriority="251" verticalHuggingPriority="750" fixedFrame="YES" translatesAutoresizingMaskIntoConstraints="NO" id="JXK-8I-3Iq">
                                 <rect key="frame" x="-2" y="84" width="454" height="16"/>
                                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMinY="YES"/>
-                                <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="V1.0(Build:1)" id="Q32-Zj-3mj">
+                                <textFieldCell key="cell" lineBreakMode="clipping" alignment="center" title="V1.0(Build:2)" id="Q32-Zj-3mj">
                                     <font key="font" metaFont="system"/>
                                     <color key="textColor" name="labelColor" catalog="System" colorSpace="catalog"/>
                                     <color key="backgroundColor" name="textBackgroundColor" catalog="System" colorSpace="catalog"/>
@@ -134,7 +134,7 @@
                 </viewController>
                 <customObject id="3On-gs-WLo" userLabel="First Responder" customClass="NSResponder" sceneMemberID="firstResponder"/>
             </objects>
-            <point key="canvasLocation" x="-232" y="25"/>
+            <point key="canvasLocation" x="-491" y="89"/>
         </scene>
         <!--Help View Controller-->
         <scene sceneID="J6F-Ww-Cjl">

WindowSnap/Info.plist

@@ -23,9 +23,9 @@
 	<key>CFBundlePackageType</key>
 	<string>$(PRODUCT_BUNDLE_PACKAGE_TYPE)</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0</string>
+	<string>$(MARKETING_VERSION)</string>
 	<key>CFBundleVersion</key>
-	<string>1</string>
+	<string>$(CURRENT_PROJECT_VERSION)</string>
 	<key>LSApplicationCategoryType</key>
 	<string>public.app-category.utilities</string>
 	<key>LSMinimumSystemVersion</key>

WindowSnap/ViewController/DFAboutViewController.swift

@@ -38,7 +38,7 @@ class DFAboutViewController: NSViewController {
             let build = dict["CFBundleVersion"] as? String
 
             if let  version = version, let build = build{
-                versionLbl.stringValue = "V\(version)(Build:1\(build)"
+                versionLbl.stringValue = "V\(version)(Build:\(build))"
             }
         }
 

WindowSnap/ViewController/DFShortCutViewController.swift

@@ -401,7 +401,7 @@ extension DFShortCutViewController{
     private static func _register(shortcut:MASShortcut?, action:@escaping ()->Void) {
         if let sc = shortcut{
             if let isReg = MASShortcutMonitor.shared()?.isShortcutRegistered(sc){
-                if isReg{
+                if !isReg{
                     MASShortcutMonitor.shared()?.register(sc, withAction: action)
                 }
             }