diff --git a/ShadowsocksX-NG/Base.lproj/HTTPPreferencesWindowController.xib b/ShadowsocksX-NG/Base.lproj/HTTPPreferencesWindowController.xib index 15bd866..6a4f3ba 100644 --- a/ShadowsocksX-NG/Base.lproj/HTTPPreferencesWindowController.xib +++ b/ShadowsocksX-NG/Base.lproj/HTTPPreferencesWindowController.xib @@ -1,23 +1,29 @@ - + - + + - + + + + + + - - + + - + - + @@ -45,7 +51,7 @@ - + @@ -53,7 +59,7 @@ - + @@ -68,7 +74,7 @@ - + @@ -83,33 +89,56 @@ + + + - - + + + + - - - - + + + + - - - - + + + + + - + + diff --git a/ShadowsocksX-NG/Base.lproj/UserRulesController.xib b/ShadowsocksX-NG/Base.lproj/UserRulesController.xib index 621b98d..8c90980 100644 --- a/ShadowsocksX-NG/Base.lproj/UserRulesController.xib +++ b/ShadowsocksX-NG/Base.lproj/UserRulesController.xib @@ -1,8 +1,9 @@ - + - + + @@ -17,7 +18,7 @@ - + @@ -55,14 +56,14 @@ Gw - + - + - + @@ -74,7 +75,7 @@ Gw - + diff --git a/ShadowsocksX-NG/HTTPPreferencesWindowController.swift b/ShadowsocksX-NG/HTTPPreferencesWindowController.swift index 36326e6..29a8a75 100644 --- a/ShadowsocksX-NG/HTTPPreferencesWindowController.swift +++ b/ShadowsocksX-NG/HTTPPreferencesWindowController.swift @@ -10,6 +10,9 @@ import Cocoa class HTTPPreferencesWindowController: NSWindowController, NSWindowDelegate { + @IBOutlet weak var address: NSTextField! + @IBOutlet weak var port: NSTextField! + override func windowDidLoad() { super.windowDidLoad() @@ -24,4 +27,13 @@ class HTTPPreferencesWindowController: NSWindowController, NSWindowDelegate { .post(name: Notification.Name(rawValue: NOTIFY_HTTP_CONF_CHANGED), object: nil) } + @IBAction func copyExportCommand(_ sender: Any) { + let command = "export http_proxy=http://\(address.stringValue):\(port.stringValue);export https_proxy=http://\(address.stringValue):\(port.stringValue);" + NSPasteboard.general().clearContents() + NSPasteboard.general().setString(command, forType: NSStringPboardType) + let notification = NSUserNotification() + notification.title = "Export Command Copied.".localized + NSUserNotificationCenter.default + .deliver(notification) + } } diff --git a/ShadowsocksX-NG/zh-Hans.lproj/HTTPPreferencesWindowController.strings b/ShadowsocksX-NG/zh-Hans.lproj/HTTPPreferencesWindowController.strings index 7604bc2..cc82ba2 100644 --- a/ShadowsocksX-NG/zh-Hans.lproj/HTTPPreferencesWindowController.strings +++ b/ShadowsocksX-NG/zh-Hans.lproj/HTTPPreferencesWindowController.strings @@ -13,3 +13,6 @@ /* Class = "NSButtonCell"; title = "Follow Global Mode"; ObjectID = "ofk-Pc-c8f"; */ "ofk-Pc-c8f.title" = "跟随全局模式"; + +/* Class = "NSButton"; title = "Copy Shell Export Command"; ObjectID = "ySG-BC-5r0"; */ +"ySG-BC-5r0.title" = "复制终端 Export 命令"; diff --git a/ShadowsocksX-NG/zh-Hans.lproj/Localizable.strings b/ShadowsocksX-NG/zh-Hans.lproj/Localizable.strings index 0332c8b..1839eb1 100755 --- a/ShadowsocksX-NG/zh-Hans.lproj/Localizable.strings +++ b/ShadowsocksX-NG/zh-Hans.lproj/Localizable.strings @@ -59,3 +59,9 @@ "Manual" = "手动"; "Show Running Mode On Status Bar" = "在状态栏显示运行模式"; + +/* + * ./HTTPPreferencesWindowController.swift + */ + +"Export Command Copied." = "Export 命令已复制至剪贴板";