RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

mac/menu: move conditional Bundle menu items into config 

only add the "Show log File…" menu item config when invoked from the
bundle, instead of testing on menu item creation. this is similar to the
touch bar menu items now.
This commit is contained in:
der richter 2024-03-04 00:29:07 +01:00
parent 73e494a237
commit 4eb58f6ea7
1 changed files with 6 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
osdep/mac/menu_bar.swift
View File

@ -210,7 +210,7 @@ class MenuBar: NSObject {
Config(name: "Zoom", commandSpecial: .zoom),
]
let helpMenuConfigs = [
var helpMenuConfigs = [
Config(name: "mpv Website…", action: #selector(url(_:)), target: self, url: "https://mpv.io"),
Config(name: "mpv on GitHub…", action: #selector(url(_:)), target: self, url: "https://github.com/mpv-player/mpv"),
Config(name: "separator"),
@ -220,13 +220,12 @@ class MenuBar: NSObject {
Config(name: "Keyboard Shortcuts…", action: #selector(url(_:)), target: self, url: "https://github.com/mpv-player/mpv/blob/master/etc/input.conf"),
Config(name: "separator"),
Config(name: "Report Issue…", action: #selector(url(_:)), target: self, url: "https://github.com/mpv-player/mpv/issues/new/choose"),
Config(
name: "Show log File…",
action: #selector(showFile(_:)),
target: self,
url: NSHomeDirectory() + "/Library/Logs/mpv.log"
),
]
if ProcessInfo.processInfo.environment["MPVBUNDLE"] == "true" {
helpMenuConfigs += [
Config(name: "Show log File…", action: #selector(showFile(_:)), target: self, url: NSHomeDirectory() + "/Library/Logs/mpv.log")
]
}
menuConfigs = [
Config(name: "Apple", configs: appMenuConfigs),
@ -256,10 +255,6 @@ class MenuBar: NSObject {
mainMenu.setSubmenu(menu, for: item)
for subConfig in menuConfig.configs ?? [] {
if subConfig.name == "Show log File…" && ProcessInfo.processInfo.environment["MPVBUNDLE"] != "true" {
continue
}
if subConfig.name == "separator" {
menu.addItem(MenuItem.separator())
} else {