Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

HaikuDepot: Rename/consolidate menus

Browse Source 
* 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 <apl@lindesay.co.nz>
This commit is contained in:
Humdinger 2021-04-02 07:15:33 +02:00 committed by humdinger
parent f67bf6411c
commit 0b6928f102
2 changed files with 7 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/apps/haikudepot/Jamfile
View File

@ -270,6 +270,7 @@ DoCatalogs HaikuDepot :
ServerPkgDataUpdateProcess.cpp ServerPkgDataUpdateProcess.cpp
ServerReferenceDataUpdateProcess.cpp ServerReferenceDataUpdateProcess.cpp
ServerRepositoryDataUpdateProcess.cpp ServerRepositoryDataUpdateProcess.cpp
SettingsWindow.cpp
UserLoginWindow.cpp UserLoginWindow.cpp
WorkStatusView.cpp WorkStatusView.cpp
; ;

15
src/apps/haikudepot/ui/MainWindow.cpp
View File

@ -639,15 +639,7 @@ MainWindow::GetModel()
void void
MainWindow::_BuildMenu(BMenuBar* menuBar) MainWindow::_BuildMenu(BMenuBar* menuBar)
{ {
BMenu* windowMenu = new BMenu(B_TRANSLATE("Window")); BMenu* menu = new BMenu(B_TRANSLATE_SYSTEM_NAME("HaikuDepot"));
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"));
fRefreshRepositoriesItem = new BMenuItem( fRefreshRepositoriesItem = new BMenuItem(
B_TRANSLATE("Refresh repositories"), new BMessage(MSG_REFRESH_REPOS)); B_TRANSLATE("Refresh repositories"), new BMessage(MSG_REFRESH_REPOS));
menu->AddItem(fRefreshRepositoriesItem); menu->AddItem(fRefreshRepositoriesItem);
@ -655,6 +647,11 @@ MainWindow::_BuildMenu(BMenuBar* menuBar)
B_UTF8_ELLIPSIS), new BMessage(MSG_MANAGE_REPOS))); B_UTF8_ELLIPSIS), new BMessage(MSG_MANAGE_REPOS)));
menu->AddItem(new BMenuItem(B_TRANSLATE("Check for updates" menu->AddItem(new BMenuItem(B_TRANSLATE("Check for updates"
B_UTF8_ELLIPSIS), new BMessage(MSG_SOFTWARE_UPDATER))); 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); menuBar->AddItem(menu);
fRepositoryMenu = new BMenu(B_TRANSLATE("Repositories")); fRepositoryMenu = new BMenu(B_TRANSLATE("Repositories"));