Merge pull request #696 from Caldis/dev/control

dev/control

Author: Caldis

.gitignore

@@ -1,14 +1,12 @@
-# RESOURCES
+# docs
 docs/.idea
+docs/.next
 docs/node_modules
-Resource/DMG
-Resource/Designs
 
-# SYS
+# macOS
 .DS_Store
 
-# Xcode
+# XCode
 xcuserdata
 *.xcuserstate
 *.xcuserdated
-Mos.xcodeproj/project.xcworkspace/xcuserdata/Caldis.xcuserdatad/UserInterfaceState.xcuserstate

Mos.xcodeproj/project.pbxproj

@@ -7,6 +7,7 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
+		0B02ADB12D38EDA000DE4132 /* DesktopManager.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B02ADB02D38EDA000DE4132 /* DesktopManager.swift */; };
 		0B12EF1A203AD9C80058B169 /* Options.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B12EF19203AD9C80058B169 /* Options.swift */; };
 		0B12EF1D203ADD230058B169 /* ScrollUtils.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B12EF1C203ADD230058B169 /* ScrollUtils.swift */; };
 		0B12EF1F203ADFB10058B169 /* Interpolator.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0B12EF1E203ADFB10058B169 /* Interpolator.swift */; };
@@ -62,6 +63,7 @@
 		0B02ADA72D312AB500DE4132 /* el */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = el; path = el.lproj/Localizable.strings; sourceTree = "<group>"; };
 		0B02ADA82D312ABB00DE4132 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Main.strings; sourceTree = "<group>"; };
 		0B02ADA92D312ABB00DE4132 /* uk */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = uk; path = uk.lproj/Localizable.strings; sourceTree = "<group>"; };
+		0B02ADB02D38EDA000DE4132 /* DesktopManager.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = DesktopManager.swift; sourceTree = "<group>"; };
 		0B0D5B5A2066195A0077C2AC /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Main.strings; sourceTree = "<group>"; };
 		0B0D5B5C206619680077C2AC /* zh-Hant */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hant"; path = "zh-Hant.lproj/Main.strings"; sourceTree = "<group>"; };
 		0B0D5B5D2066197B0077C2AC /* ja */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = ja; path = ja.lproj/Localizable.strings; sourceTree = "<group>"; };
@@ -223,6 +225,7 @@
 				0B6D3B672041A790004CC064 /* WindowManager.swift */,
 				23BB4D2E21D754D3009B51E9 /* PopoverManager.swift */,
 				0BD39F67204EFC6C000CCC42 /* StatusItemManager.swift */,
+				0B02ADB02D38EDA000DE4132 /* DesktopManager.swift */,
 			);
 			path = Managers;
 			sourceTree = "<group>";
@@ -449,6 +452,7 @@
 				0BD39F68204EFC6C000CCC42 /* StatusItemManager.swift in Sources */,
 				23E9673F23613D1100E652F6 /* PreferencesExceptionInputViewController.swift in Sources */,
 				232E50A7236B372100265C58 /* PreferencesAdvanceWithApplicationViewController.swift in Sources */,
+				0B02ADB12D38EDA000DE4132 /* DesktopManager.swift in Sources */,
 				22A32B331E334B2E00A5CF38 /* PreferencesAboutViewController.swift in Sources */,
 				0BE4C93B20617C6E0001EA0E /* ScrollFilter.swift in Sources */,
 				0B6D3B682041A790004CC064 /* WindowManager.swift in Sources */,
@@ -643,12 +647,14 @@
 				DEVELOPMENT_TEAM = 2H959AEV62;
 				ENABLE_HARDENED_RUNTIME = NO;
 				INFOPLIST_FILE = Mos/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = Mos;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 3.5.0;
+				MARKETING_VERSION = 3.5.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.caldis.Mos;
 				PRODUCT_NAME = "$(TARGET_NAME)";
@@ -679,12 +685,14 @@
 				ENABLE_HARDENED_RUNTIME = NO;
 				GCC_OPTIMIZATION_LEVEL = fast;
 				INFOPLIST_FILE = Mos/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = Mos;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
 				MACOSX_DEPLOYMENT_TARGET = 10.13;
-				MARKETING_VERSION = 3.5.0;
+				MARKETING_VERSION = 3.5.1;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				PRODUCT_BUNDLE_IDENTIFIER = com.caldis.Mos;
 				PRODUCT_NAME = "$(TARGET_NAME)";

Mos.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -3,18 +3,4 @@
    uuid = "32EA6F78-F020-42D7-AE40-730D164E821A"
    type = "1"
    version = "2.0">
-   <Breakpoints>
-      <BreakpointProxy
-         BreakpointExtensionID = "Xcode.Breakpoint.ExceptionBreakpoint">
-         <BreakpointContent
-            uuid = "737FF52F-5223-411B-8F37-5CE0D46FACB4"
-            shouldBeEnabled = "Yes"
-            ignoreCount = "0"
-            continueAfterRunningActions = "No"
-            breakpointStackSelectionBehavior = "1"
-            scope = "1"
-            stopOnStyle = "0">
-         </BreakpointContent>
-      </BreakpointProxy>
-   </Breakpoints>
 </Bucket>

Mos.xcodeproj/xcshareddata/xcschemes/Debug.xcscheme

@@ -4,8 +4,10 @@
 <dict>
 	<key>SchemeUserState</key>
 	<dict>
-		<key>Debug.xcscheme_^#shared#^_</key>
+		<key>Debug.xcscheme</key>
 		<dict>
+			<key>isShown</key>
+			<false/>
 			<key>orderHint</key>
 			<integer>0</integer>
 		</dict>
@@ -49,12 +51,12 @@
 			<key>isShown</key>
 			<false/>
 			<key>orderHint</key>
-			<integer>1</integer>
+			<integer>2</integer>
 		</dict>
 		<key>Profile.xcscheme_^#shared#^_</key>
 		<dict>
 			<key>orderHint</key>
-			<integer>4</integer>
+			<integer>1</integer>
 		</dict>
 	</dict>
 	<key>SuppressBuildableAutocreation</key>

Mos.xcodeproj/xcuserdata/Caldis.xcuserdatad/xcdebugger/Breakpoints_v2.xcbkptlist

@@ -13,17 +13,18 @@ class AppDelegate: NSObject, NSApplicationDelegate {
 
     // 运行前预处理
     func applicationWillFinishLaunching(_ notification: Notification) {
-        // DEBUG
-        // 清空用户设置
+        // 禁止重复运行, 结束正在运行的实例
+        Utils.preventMultiRunning(killExist: true)
+        
+        // DEBUG: 清空用户设置
         // UserDefaults.standard.removePersistentDomain(forName: Bundle.main.bundleIdentifier!)
-        // 直接弹出设置窗口
-        // WindowManager.shared.showWindow(withIdentifier: WINDOW_IDENTIFIER.preferencesWindowController)
 
-        // 开始
-        // 禁止重复运行
-        Utils.preventMultiRunning(killExist: true)
         // 读取用户设置
         Options.shared.readOptions()
+        
+        // DEBUG: 直接弹出设置窗口
+        // WindowManager.shared.showWindow(withIdentifier: WINDOW_IDENTIFIER.preferencesWindowController)
+        
         // 监听用户切换, 在切换用户 session 时停止运行
         NSWorkspace.shared.notificationCenter.addObserver(
             self,
@@ -43,6 +44,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         startWithAccessibilityPermissionsChecker(nil)
     }
 
+    // 用户双击打开应用程序
     func applicationShouldHandleReopen(_ sender: NSApplication, hasVisibleWindows flag: Bool) -> Bool {
         guard !flag else {
             return true
@@ -52,6 +54,7 @@ class AppDelegate: NSObject, NSApplicationDelegate {
         }
         return false
     }
+    
     // 关闭前停止滚动处理
     func applicationWillTerminate(_ aNotification: Notification) {
         ScrollCore.shared.endHandlingScroll()