zhangyuheng/ClashX
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove option for showSpeedTestItemAtTop

Browse Source
This commit is contained in:
yicheng 2020-04-29 19:44:01 +08:00
parent e8bed427d6
commit f744fdabfd
1 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
ClashX/General/Managers/MenuItemFactory.swift
View File

@ -13,12 +13,6 @@ import SwiftyJSON
class MenuItemFactory {
private static var cachedProxyData: ClashProxyResp?
private static var showSpeedTestItemAtTop: Bool = UserDefaults.standard.object(forKey: "kShowSpeedTestItemAtTop") as? Bool ?? AppDelegate.isAboveMacOS14 {
didSet {
UserDefaults.standard.set(showSpeedTestItemAtTop, forKey: "kShowSpeedTestItemAtTop")
}
}
static var useViewToRenderProxy: Bool = UserDefaults.standard.object(forKey: "useViewToRenderProxy") as? Bool ?? AppDelegate.isAboveMacOS152 {
didSet {
UserDefaults.standard.set(useViewToRenderProxy, forKey: "useViewToRenderProxy")
@ -204,13 +198,8 @@ class MenuItemFactory {
guard proxyGroup.speedtestAble.count > 0 else { return }
let speedTestItem = ProxyGroupSpeedTestMenuItem(group: proxyGroup)
let separator = NSMenuItem.separator()
if showSpeedTestItemAtTop {
menu.insertItem(separator, at: 0)
menu.insertItem(speedTestItem, at: 0)
} else {
menu.addItem(separator)
menu.addItem(speedTestItem)
}
menu.insertItem(separator, at: 0)
menu.insertItem(speedTestItem, at: 0)
(menu as? ProxyGroupMenu)?.add(delegate: speedTestItem)
}
@ -262,32 +251,16 @@ class MenuItemFactory {
extension MenuItemFactory {
static func addExperimentalMenuItem(_ menu: inout NSMenu) {
let speedtestItem = NSMenuItem(title: NSLocalizedString("Show speedTest at top", comment: ""), action: #selector(optionSpeedtestMenuItemTap(sender:)), keyEquivalent: "")
speedtestItem.target = self
menu.addItem(speedtestItem)
updateSpeedtestMenuItemStatus(speedtestItem)
let useViewRender = NSMenuItem(title: NSLocalizedString("Enhance proxy list render", comment: ""), action: #selector(optionUseViewRenderMenuItemTap(sender:)), keyEquivalent: "")
useViewRender.target = self
menu.addItem(useViewRender)
updateUseViewRenderMenuItem(useViewRender)
}
static func updateSpeedtestMenuItemStatus(_ item: NSMenuItem) {
item.state = showSpeedTestItemAtTop ? .on : .off
}
static func updateUseViewRenderMenuItem(_ item: NSMenuItem) {
item.state = useViewToRenderProxy ? .on : .off
}
@objc static func optionSpeedtestMenuItemTap(sender: NSMenuItem) {
showSpeedTestItemAtTop = !showSpeedTestItemAtTop
updateSpeedtestMenuItemStatus(sender)
refreshExistingMenuItems()
recreateProxyMenuItems()
}
@objc static func optionUseViewRenderMenuItemTap(sender: NSMenuItem) {
useViewToRenderProxy = !useViewToRenderProxy
updateUseViewRenderMenuItem(sender)