From 0b6928f1021911c1a25acfb6a8694ac456fb09fa Mon Sep 17 00:00:00 2001 From: Humdinger Date: Fri, 2 Apr 2021 07:15:33 +0200 Subject: [PATCH] HaikuDepot: Rename/consolidate menus * Rename "Tools" to "HaikuDepot" * Move "Settings..." and "Quit" from the new and not well fitting "Window" menu to "HaikuDepot" * Add the SettingsWindow to DoCatalogs Change-Id: I14ca7b6304772555cc440998438e38e3e507214c Reviewed-on: https://review.haiku-os.org/c/haiku/+/3831 Reviewed-by: Andrew Lindesay --- src/apps/haikudepot/Jamfile | 1 + src/apps/haikudepot/ui/MainWindow.cpp | 15 ++++++--------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/apps/haikudepot/Jamfile b/src/apps/haikudepot/Jamfile index 6fbb92ff5a..ab2adf242f 100644 --- a/src/apps/haikudepot/Jamfile +++ b/src/apps/haikudepot/Jamfile @@ -270,6 +270,7 @@ DoCatalogs HaikuDepot : ServerPkgDataUpdateProcess.cpp ServerReferenceDataUpdateProcess.cpp ServerRepositoryDataUpdateProcess.cpp + SettingsWindow.cpp UserLoginWindow.cpp WorkStatusView.cpp ; diff --git a/src/apps/haikudepot/ui/MainWindow.cpp b/src/apps/haikudepot/ui/MainWindow.cpp index b567f798ee..85d200a50f 100644 --- a/src/apps/haikudepot/ui/MainWindow.cpp +++ b/src/apps/haikudepot/ui/MainWindow.cpp @@ -639,15 +639,7 @@ MainWindow::GetModel() void MainWindow::_BuildMenu(BMenuBar* menuBar) { - BMenu* windowMenu = new BMenu(B_TRANSLATE("Window")); - windowMenu->AddItem(new BMenuItem(B_TRANSLATE("Settings" B_UTF8_ELLIPSIS), - new BMessage(MSG_SETTINGS))); - windowMenu->AddSeparatorItem(); - windowMenu->AddItem(new BMenuItem(B_TRANSLATE("Quit" B_UTF8_ELLIPSIS), - new BMessage(B_QUIT_REQUESTED), 'Q')); - menuBar->AddItem(windowMenu); - - BMenu* menu = new BMenu(B_TRANSLATE("Tools")); + BMenu* menu = new BMenu(B_TRANSLATE_SYSTEM_NAME("HaikuDepot")); fRefreshRepositoriesItem = new BMenuItem( B_TRANSLATE("Refresh repositories"), new BMessage(MSG_REFRESH_REPOS)); menu->AddItem(fRefreshRepositoriesItem); @@ -655,6 +647,11 @@ MainWindow::_BuildMenu(BMenuBar* menuBar) B_UTF8_ELLIPSIS), new BMessage(MSG_MANAGE_REPOS))); menu->AddItem(new BMenuItem(B_TRANSLATE("Check for updates" B_UTF8_ELLIPSIS), new BMessage(MSG_SOFTWARE_UPDATER))); + menu->AddSeparatorItem(); + menu->AddItem(new BMenuItem(B_TRANSLATE("Settings" B_UTF8_ELLIPSIS), + new BMessage(MSG_SETTINGS))); + menu->AddItem(new BMenuItem(B_TRANSLATE("Quit"), + new BMessage(B_QUIT_REQUESTED), 'Q')); menuBar->AddItem(menu); fRepositoryMenu = new BMenu(B_TRANSLATE("Repositories"));