From f3d5f0165afefb57836f5dc29ae4b6b267ad8af9 Mon Sep 17 00:00:00 2001 From: casey langen Date: Sun, 28 May 2017 23:22:10 -0700 Subject: [PATCH] Unified ServerOverlay save key. --- src/musikbox/app/overlay/ServerOverlay.cpp | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) diff --git a/src/musikbox/app/overlay/ServerOverlay.cpp b/src/musikbox/app/overlay/ServerOverlay.cpp index 2701ba94a..fbc8bfe87 100644 --- a/src/musikbox/app/overlay/ServerOverlay.cpp +++ b/src/musikbox/app/overlay/ServerOverlay.cpp @@ -82,12 +82,6 @@ static const char* KEY_PASSWORD = "password"; #define RIGHT(x) (x->GetX() + x->GetWidth()) #define TEXT_WIDTH(x) ((int) u8cols(x->GetText())) -#ifdef WIN32 -#define SAVE_KEY "^S" -#else -#define SAVE_KEY "M-s" -#endif - using Callback = ServerOverlay::Callback; using Prefs = ServerOverlay::Prefs; @@ -153,7 +147,7 @@ void ServerOverlay::InitViews() { this->shortcuts.reset(new ShortcutsWindow()); this->shortcuts->SetAlignment(text::AlignRight); this->shortcuts->AddShortcut("ESC", _TSTR("button_cancel")); - this->shortcuts->AddShortcut(SAVE_KEY, _TSTR("button_save")); + this->shortcuts->AddShortcut("M-s", _TSTR("button_save")); /* web socket server */ this->enableWssCb.reset(new Checkbox()); @@ -303,7 +297,7 @@ bool ServerOverlay::KeyPress(const std::string& key) { this->Dismiss(); return true; } - else if (key == SAVE_KEY) { + else if (key == "M-s") { if (Save()) { this->Dismiss(); }