diff --git a/kernel/server/serve.go b/kernel/server/serve.go index 0a209c951..c44992a2c 100644 --- a/kernel/server/serve.go +++ b/kernel/server/serve.go @@ -317,19 +317,39 @@ func serveCheckAuth(c *gin.Context) { return } + keymapHideWindow := "⌥M" + if nil != (*model.Conf.Keymap)["general"] { + switch (*model.Conf.Keymap)["general"].(type) { + case map[string]interface{}: + keymapGeneral := (*model.Conf.Keymap)["general"].(map[string]interface{}) + if nil != keymapGeneral["toggleWin"] { + switch keymapGeneral["toggleWin"].(type) { + case map[string]interface{}: + toggleWin := keymapGeneral["toggleWin"].(map[string]interface{}) + if nil != toggleWin["custom"] { + keymapHideWindow = toggleWin["custom"].(string) + } + } + } + } + if "" == keymapHideWindow { + keymapHideWindow = "⌥M" + } + } model := map[string]interface{}{ - "l0": model.Conf.Language(173), - "l1": model.Conf.Language(174), - "l2": template.HTML(model.Conf.Language(172)), - "l3": model.Conf.Language(175), - "l4": model.Conf.Language(176), - "l5": model.Conf.Language(177), - "l6": model.Conf.Language(178), - "l7": template.HTML(model.Conf.Language(184)), - "appearanceMode": model.Conf.Appearance.Mode, - "appearanceModeOS": model.Conf.Appearance.ModeOS, - "workspace": filepath.Base(util.WorkspaceDir), - "workspacePath": util.WorkspaceDir, + "l0": model.Conf.Language(173), + "l1": model.Conf.Language(174), + "l2": template.HTML(model.Conf.Language(172)), + "l3": model.Conf.Language(175), + "l4": model.Conf.Language(176), + "l5": model.Conf.Language(177), + "l6": model.Conf.Language(178), + "l7": template.HTML(model.Conf.Language(184)), + "appearanceMode": model.Conf.Appearance.Mode, + "appearanceModeOS": model.Conf.Appearance.ModeOS, + "workspace": filepath.Base(util.WorkspaceDir), + "workspacePath": util.WorkspaceDir, + "keymapGeneralToggleWin": keymapHideWindow, } buf := &bytes.Buffer{} if err = tpl.Execute(buf, model); nil != err {