Merge branch 'meta-dev' into meta

MetaCubeX · Jun 30, 2023 · 36a0773 · 36a0773
2 parents 79a5fc6 + 5b8fea2
commit 36a0773
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 14 deletions.
diff --git a/ClashX/AppDelegate.swift b/ClashX/AppDelegate.swift
@@ -882,7 +882,7 @@ extension AppDelegate {
         }.done {
             Logger.log("Init config file success.")
 
-			self.showUpdateNotification("ClashX_Meta_1.3.0_UpdateTips", info: "Config Floder migrated from\n~/.config/clash to\n~/.config/ClashMeta")
+			self.showUpdateNotification("ClashX_Meta_1.3.0_UpdateTips", info: "Config Floder migrated from\n~/.config/clash to\n~/.config/clash.meta")
 
 
         }.catch { error in
@@ -1521,7 +1521,7 @@ extension AppDelegate {
 
         guard let components = URLComponents(string: url),
               let scheme = components.scheme,
-              scheme.hasPrefix("clashmeta"),
+              scheme.hasPrefix("clash"),
               let host = components.host
         else { return }
 

diff --git a/ClashX/General/Managers/ClashResourceManager.swift b/ClashX/General/Managers/ClashResourceManager.swift
@@ -70,7 +70,7 @@ class ClashResourceManager {
 
     static func showCreateConfigDirFailAlert(err: String) {
         let alert = NSAlert()
-        alert.messageText = NSLocalizedString("ClashX fail to create ~/.config/ClashMeta folder. Please check privileges or manually create folder and restart ClashX." + err, comment: "")
+        alert.messageText = NSLocalizedString("ClashX fail to create ~/.config/clash.meta folder. Please check privileges or manually create folder and restart ClashX." + err, comment: "")
         alert.alertStyle = .warning
         alert.addButton(withTitle: NSLocalizedString("Quit", comment: ""))
         alert.runModal()

diff --git a/ClashX/Info.plist b/ClashX/Info.plist
@@ -41,10 +41,10 @@
 			<key>CFBundleURLIconFile</key>
 			<string>Icon</string>
 			<key>CFBundleURLName</key>
-			<string>com.metacubex.ClashX</string>
+			<string>com.west2online.ClashX</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>clashxmeta</string>
+				<string>clashx</string>
 			</array>
 		</dict>
 		<dict>
@@ -53,10 +53,10 @@
 			<key>CFBundleURLIconFile</key>
 			<string>Icon</string>
 			<key>CFBundleURLName</key>
-			<string>com.metacubex.ClashX</string>
+			<string>com.west2online.Clash</string>
 			<key>CFBundleURLSchemes</key>
 			<array>
-				<string>clashmeta</string>
+				<string>clash</string>
 			</array>
 		</dict>
 	</array>
@@ -101,12 +101,12 @@
 	<false/>
 	<key>NSUbiquitousContainers</key>
 	<dict>
-		<key>iCloud.com.metacubex.ClashX</key>
+		<key>iCloud.com.west2online.ClashX</key>
 		<dict>
 			<key>NSUbiquitousContainerIsDocumentScopePublic</key>
 			<true/>
 			<key>NSUbiquitousContainerName</key>
-			<string>ClashXMeta</string>
+			<string>ClashX</string>
 			<key>NSUbiquitousContainerSupportedFolderLevels</key>
 			<string>Any</string>
 		</dict>

diff --git a/ClashX/Macro/Paths.swift b/ClashX/Macro/Paths.swift
@@ -7,7 +7,7 @@
 //
 import Foundation
 
-let kConfigFolderPath = "\(NSHomeDirectory())/.config/ClashMeta/"
+let kConfigFolderPath = "\(NSHomeDirectory())/.config/clash.meta/"
 
 let kDefaultConfigFilePath = "\(kConfigFolderPath)config.yaml"
 

diff --git a/ClashX/Resources/sampleConfig.yaml b/ClashX/Resources/sampleConfig.yaml
@@ -1,5 +1,5 @@
 #---------------------------------------------------#
-## 配置文件需要放置在 $HOME/.config/ClashMeta/*.yaml
+## 配置文件需要放置在 $HOME/.config/clash.meta/*.yaml
 
 ## 这份文件是clashX的基础配置文件，请尽量新建配置文件进行修改。
 

diff --git a/ClashX/Support Files/en.lproj/Localizable.strings b/ClashX/Support Files/en.lproj/Localizable.strings
@@ -29,7 +29,7 @@
 "Cancel" = "Cancel";
 
 /* No comment provided by engineer. */
-"ClashX fail to create ~/.config/ClashMeta folder. Please check privileges or manually create folder and restart ClashX." = "ClashX fail to create ~/.config/ClashMeta folder. Please check privileges or manually create folder and restart ClashX.";
+"ClashX fail to create ~/.config/clash.meta folder. Please check privileges or manually create folder and restart ClashX." = "ClashX fail to create ~/.config/clash.meta folder. Please check privileges or manually create folder and restart ClashX.";
 
 /* No comment provided by engineer. */
 "ClashX needs to install/update a helper tool with administrator privileges, otherwise ClashX won't be able to configure system proxy." = "ClashX needs to install/update a helper tool with administrator privileges, otherwise ClashX won't be able to configure system proxy.";

diff --git a/ClashX/Support Files/zh-Hans.lproj/Localizable.strings b/ClashX/Support Files/zh-Hans.lproj/Localizable.strings
@@ -29,7 +29,7 @@
 "Cancel" = "取消";
 
 /* No comment provided by engineer. */
-"ClashX fail to create ~/.config/ClashMeta folder. Please check privileges or manually create folder and restart ClashX." = "ClashX 创建 ~/.config/ClashMeta 文件夹失败，请检查权限设置或者手动创建文件夹后重启 ClashX";
+"ClashX fail to create ~/.config/clash.meta folder. Please check privileges or manually create folder and restart ClashX." = "ClashX 创建 ~/.config/clash.meta 文件夹失败，请检查权限设置或者手动创建文件夹后重启 ClashX";
 
 /* No comment provided by engineer. */
 "ClashX needs to install/update a helper tool with administrator privileges, otherwise ClashX won't be able to configure system proxy." = "ClashX 需要使用管理员权限安装/更新一个帮助程序，否则 ClashX 将无法设置系统代理。";

diff --git a/ClashX/Views/StatusItem/StatusItemTool.swift b/ClashX/Views/StatusItem/StatusItemTool.swift
@@ -10,7 +10,7 @@ import AppKit
 
 enum StatusItemTool {
     static let menuImage: NSImage = {
-        let customImagePath = (NSHomeDirectory() as NSString).appendingPathComponent("/.config/ClashMeta/menuImage.png")
+        let customImagePath = (NSHomeDirectory() as NSString).appendingPathComponent("/.config/clash.meta/menuImage.png")
         if let image = NSImage(contentsOfFile: customImagePath) {
             return image
         }