From 15ba64aaa3f39ec4d7fcd45083357381ec1b8955 Mon Sep 17 00:00:00 2001 From: Adrien Destugues Date: Mon, 13 Jul 2020 20:29:31 +0200 Subject: [PATCH] Unify Settings menu shortcut Use , as the shortcut key for settings in all built-in apps. Some used S, but that's already the shortcut for saving. , is the recommended shortcut in the HIG already, but built-in apps were not updated to match. Fixes #11733. --- src/apps/activitymonitor/ActivityWindow.cpp | 2 +- src/apps/expander/ExpanderWindow.cpp | 2 +- src/apps/mediaplayer/MainWin.cpp | 2 +- src/apps/terminal/TermWindow.cpp | 3 ++- src/apps/tv/MainWin.cpp | 2 +- src/apps/webpositive/BrowserWindow.cpp | 2 +- src/kits/tracker/ContainerWindow.cpp | 2 +- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/src/apps/activitymonitor/ActivityWindow.cpp b/src/apps/activitymonitor/ActivityWindow.cpp index 5a65e870d5..6b64ff40e5 100644 --- a/src/apps/activitymonitor/ActivityWindow.cpp +++ b/src/apps/activitymonitor/ActivityWindow.cpp @@ -135,7 +135,7 @@ ActivityWindow::ActivityWindow() // "Settings" menu menu = new BMenu(B_TRANSLATE("Settings")); menu->AddItem(new BMenuItem(B_TRANSLATE("Settings" B_UTF8_ELLIPSIS), - new BMessage(kMsgShowSettings))); + new BMessage(kMsgShowSettings), ',')); menu->AddSeparatorItem(); fAlwaysOnTop = new BMenuItem(B_TRANSLATE("Always on top"), new BMessage(kMsgAlwaysOnTop)); diff --git a/src/apps/expander/ExpanderWindow.cpp b/src/apps/expander/ExpanderWindow.cpp index a128d5142e..3a49373ba2 100644 --- a/src/apps/expander/ExpanderWindow.cpp +++ b/src/apps/expander/ExpanderWindow.cpp @@ -634,7 +634,7 @@ ExpanderWindow::_CreateMenuBar() menu = new BMenu(B_TRANSLATE("Settings")); menu->AddItem(fPreferencesItem = new BMenuItem(B_TRANSLATE("Settings" B_UTF8_ELLIPSIS), - new BMessage(MSG_PREFERENCES), 'S')); + new BMessage(MSG_PREFERENCES), ',')); fBar->AddItem(menu); } diff --git a/src/apps/mediaplayer/MainWin.cpp b/src/apps/mediaplayer/MainWin.cpp index c124d6d35e..6832535afd 100644 --- a/src/apps/mediaplayer/MainWin.cpp +++ b/src/apps/mediaplayer/MainWin.cpp @@ -1567,7 +1567,7 @@ MainWin::_CreateMenu() new BMessage(M_TOGGLE_ALWAYS_ON_TOP), 'A')); item = new BMenuItem(B_TRANSLATE("Settings" B_UTF8_ELLIPSIS), - new BMessage(M_SETTINGS), 'S'); + new BMessage(M_SETTINGS), ','); fFileMenu->AddItem(item); item->SetTarget(be_app); diff --git a/src/apps/terminal/TermWindow.cpp b/src/apps/terminal/TermWindow.cpp index a68880d2cb..2f4268e16b 100644 --- a/src/apps/terminal/TermWindow.cpp +++ b/src/apps/terminal/TermWindow.cpp @@ -537,7 +537,8 @@ TermWindow::_SetupMenu() .AddItem(fFontSizeMenu) .AddItem(B_TRANSLATE("Save as default"), MSG_SAVE_AS_DEFAULT) .AddSeparator() - .AddItem(B_TRANSLATE("Settings" B_UTF8_ELLIPSIS), MENU_PREF_OPEN) + .AddItem(B_TRANSLATE("Settings" B_UTF8_ELLIPSIS), MENU_PREF_OPEN, + ',') .End(); AddChild(fMenuBar); diff --git a/src/apps/tv/MainWin.cpp b/src/apps/tv/MainWin.cpp index 6f5911df27..58860a8a93 100644 --- a/src/apps/tv/MainWin.cpp +++ b/src/apps/tv/MainWin.cpp @@ -211,7 +211,7 @@ MainWin::CreateMenu() new BMessage(M_TOGGLE_KEEP_ASPECT_RATIO), 'K', B_COMMAND_KEY)); fSettingsMenu->AddSeparatorItem(); fSettingsMenu->AddItem(new BMenuItem(B_TRANSLATE("Settings" B_UTF8_ELLIPSIS) - , new BMessage(M_PREFERENCES), 'P', B_COMMAND_KEY)); + , new BMessage(M_PREFERENCES), ',', B_COMMAND_KEY)); const char* pixel_ratio = B_TRANSLATE("pixel aspect ratio"); BString str1 = pixel_ratio; diff --git a/src/apps/webpositive/BrowserWindow.cpp b/src/apps/webpositive/BrowserWindow.cpp index 5328bcd973..47f56403d5 100644 --- a/src/apps/webpositive/BrowserWindow.cpp +++ b/src/apps/webpositive/BrowserWindow.cpp @@ -418,7 +418,7 @@ BrowserWindow::BrowserWindow(BRect frame, SettingsMessage* appSettings, menu->AddItem(new BMenuItem(B_TRANSLATE("Downloads"), new BMessage(SHOW_DOWNLOAD_WINDOW), 'D')); menu->AddItem(new BMenuItem(B_TRANSLATE("Settings"), - new BMessage(SHOW_SETTINGS_WINDOW))); + new BMessage(SHOW_SETTINGS_WINDOW), ',')); menu->AddItem(new BMenuItem(B_TRANSLATE("Cookie manager"), new BMessage(SHOW_COOKIE_WINDOW))); menu->AddItem(new BMenuItem(B_TRANSLATE("Script console"), diff --git a/src/kits/tracker/ContainerWindow.cpp b/src/kits/tracker/ContainerWindow.cpp index fb7b01c628..ac57bad7ce 100644 --- a/src/kits/tracker/ContainerWindow.cpp +++ b/src/kits/tracker/ContainerWindow.cpp @@ -2194,7 +2194,7 @@ BContainerWindow::AddWindowMenu(BMenu* menu) menu->AddSeparatorItem(); item = new BMenuItem(B_TRANSLATE("Preferences" B_UTF8_ELLIPSIS), - new BMessage(kShowSettingsWindow)); + new BMessage(kShowSettingsWindow), ','); item->SetTarget(be_app); menu->AddItem(item); }