RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-28 11:07:46 +00:00
Code Issues Activity Actions

Userland: Turn all application menus into window menus :^)

Browse source
This commit is contained in:
Andreas Kling 2021-03-25 21:41:39 +01:00
parent fcc8e3484f
commit 78b12e1521
47 changed files with 100 additions and 110 deletions
Download patch file Download diff file Expand all files Collapse all files

4
Userland/Applications/Browser/Tab.cpp
View file

@ -290,7 +290,7 @@ Tab::Tab(Type type)
m_menubar = GUI::MenuBar::construct();
auto& app_menu = m_menubar->add_menu("Browser");
auto& app_menu = m_menubar->add_menu("File");
app_menu.add_action(WindowActions::the().create_new_tab_action());
app_menu.add_action(GUI::Action::create(
"Close tab", { Mod_Ctrl, Key_W }, Gfx::Bitmap::load_from_file("/res/icons/16x16/close-tab.png"), [this](auto&) {
@ -568,7 +568,7 @@ void Tab::did_become_active()
m_toolbar_container->set_visible(!is_fullscreen);
m_statusbar->set_visible(!is_fullscreen);
GUI::Application::the()->set_menubar(m_menubar);
window()->set_menubar(m_menubar);
}
void Tab::context_menu_requested(const Gfx::IntPoint& screen_position)

7
Userland/Applications/Calculator/main.cpp
View file

@ -71,10 +71,9 @@ int main(int argc, char** argv)
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("Calculator");
auto& app_menu = menubar->add_menu("File");
app_menu.add_action(GUI::CommonActions::make_quit_action([](auto&) {
GUI::Application::the()->quit();
return;
}));
auto& edit_menu = menubar->add_menu("Edit");
@ -93,8 +92,6 @@ int main(int argc, char** argv)
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("Calculator", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
return app->exec();
}

4
Userland/Applications/Calendar/main.cpp
View file

@ -159,7 +159,7 @@ int main(int argc, char** argv)
};
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("Calendar");
auto& app_menu = menubar->add_menu("File");
app_menu.add_action(GUI::Action::create("Add Event", { Mod_Ctrl | Mod_Shift, Key_E }, Gfx::Bitmap::load_from_file("/res/icons/16x16/add-event.png"),
[&](const GUI::Action&) {
AddEventDialog::show(calendar_widget.selected_date(), window);
@ -176,7 +176,7 @@ int main(int argc, char** argv)
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("Calendar", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
window->show();
app->exec();
}

4
Userland/Applications/DisplaySettings/main.cpp
View file

@ -68,7 +68,7 @@ int main(int argc, char** argv)
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("Display Settings");
auto& app_menu = menubar->add_menu("File");
app_menu.add_action(GUI::CommonActions::make_quit_action([&](const GUI::Action&) {
app->quit();
}));
@ -76,7 +76,7 @@ int main(int argc, char** argv)
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("Display Settings", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
window->show();
return app->exec();
}

4
Userland/Applications/FileManager/main.cpp
View file

@ -755,7 +755,7 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("File Manager");
auto& app_menu = menubar->add_menu("File");
app_menu.add_action(mkdir_action);
app_menu.add_action(touch_action);
app_menu.add_action(copy_action);
@ -814,7 +814,7 @@ int run_in_windowed_mode(RefPtr<Core::ConfigFile> config, String initial_locatio
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("File Manager", GUI::Icon::default_icon("app-file-manager"), window));
GUI::Application::the()->set_menubar(move(menubar));
window->set_menubar(menubar);
main_toolbar.add_action(go_back_action);
main_toolbar.add_action(go_forward_action);

6
Userland/Applications/FontEditor/main.cpp
View file

@ -106,7 +106,7 @@ int main(int argc, char** argv)
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("Font Editor");
auto& app_menu = menubar->add_menu("File");
app_menu.add_action(GUI::CommonActions::make_open_action([&](auto&) {
Optional<String> open_path = GUI::FilePicker::get_open_filepath(window);
if (!open_path.has_value())
@ -138,7 +138,6 @@ int main(int argc, char** argv)
app_menu.add_separator();
app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) {
app->quit();
return;
}));
auto& help_menu = menubar->add_menu("Help");
@ -148,8 +147,7 @@ int main(int argc, char** argv)
help_menu.add_action(GUI::CommonActions::make_about_action("Font Editor", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
window->show();
return app->exec();

4
Userland/Applications/Help/main.cpp
View file

@ -274,7 +274,7 @@ int main(int argc, char* argv[])
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("Help");
auto& app_menu = menubar->add_menu("File");
app_menu.add_action(GUI::CommonActions::make_about_action("Help", app_icon, window));
app_menu.add_separator();
app_menu.add_action(GUI::CommonActions::make_quit_action([](auto&) {
@ -286,7 +286,7 @@ int main(int argc, char* argv[])
go_menu.add_action(*go_forward_action);
go_menu.add_action(*go_home_action);
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
if (start_page) {
URL url = URL::create_with_url_or_path(start_page);

2
Userland/Applications/HexEditor/HexEditorWidget.cpp
View file

@ -137,7 +137,7 @@ HexEditorWidget::~HexEditorWidget()
void HexEditorWidget::initialize_menubar(GUI::MenuBar& menubar)
{
auto& app_menu = menubar.add_menu("Hex Editor");
auto& app_menu = menubar.add_menu("File");
app_menu.add_action(*m_new_action);
app_menu.add_action(*m_open_action);
app_menu.add_action(*m_save_action);

3
Userland/Applications/HexEditor/main.cpp
View file

@ -61,8 +61,7 @@ int main(int argc, char** argv)
auto menubar = GUI::MenuBar::construct();
hex_editor_widget.initialize_menubar(menubar);
app->set_menubar(menubar);
window->set_menubar(menubar);
window->show();
window->set_icon(app_icon.bitmap_for_size(16));

4
Userland/Applications/IRCClient/IRCAppWindow.cpp
View file

@ -258,7 +258,7 @@ void IRCAppWindow::setup_actions()
void IRCAppWindow::setup_menus()
{
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("IRC Client");
auto& app_menu = menubar->add_menu("File");
app_menu.add_action(GUI::CommonActions::make_quit_action([](auto&) {
dbgln("Terminal: Quit menu activated!");
GUI::Application::the()->quit();
@ -297,7 +297,7 @@ void IRCAppWindow::setup_menus()
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("IRC Client", GUI::Icon::default_icon("app-irc-client"), this));
GUI::Application::the()->set_menubar(move(menubar));
set_menubar(move(menubar));
}
void IRCAppWindow::setup_widgets()

4
Userland/Applications/KeyboardMapper/main.cpp
View file

@ -106,7 +106,7 @@ int main(int argc, char** argv)
// Menu
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("Keyboard Mapper");
auto& app_menu = menubar->add_menu("File");
app_menu.add_action(open_action);
app_menu.add_action(save_action);
app_menu.add_action(save_as_action);
@ -116,7 +116,7 @@ int main(int argc, char** argv)
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("Keyboard Mapper", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
return app->exec();
}

4
Userland/Applications/KeyboardSettings/main.cpp
View file

@ -188,13 +188,13 @@ int main(int argc, char** argv)
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("Keyboard Settings");
auto& app_menu = menubar->add_menu("File");
app_menu.add_action(quit_action);
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("Keyboard Settings", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
window->show();

4
Userland/Applications/MouseSettings/main.cpp
View file

@ -120,13 +120,13 @@ int main(int argc, char** argv)
};
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("Mouse Settings");
auto& app_menu = menubar->add_menu("File");
app_menu.add_action(GUI::CommonActions::make_quit_action([&](auto&) {
app->quit();
}));
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("Mouse Settings", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
window->show();
return app->exec();

4
Userland/Applications/Piano/main.cpp
View file

@ -106,7 +106,7 @@ int main(int argc, char** argv)
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("Piano");
auto& app_menu = menubar->add_menu("File");
app_menu.add_action(GUI::Action::create("Export", { Mod_Ctrl, Key_E }, [&](const GUI::Action&) {
save_path = GUI::FilePicker::get_save_filepath(window, "Untitled", "wav");
if (!save_path.has_value())
@ -131,7 +131,7 @@ int main(int argc, char** argv)
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("Piano", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
return app->exec();
}

4
Userland/Applications/PixelPaint/main.cpp
View file

@ -115,7 +115,7 @@ int main(int argc, char** argv)
window->show();
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("PixelPaint");
auto& app_menu = menubar->add_menu("File");
auto open_image_file = [&](auto& path) {
auto image = PixelPaint::Image::create_from_file(path);
@ -382,7 +382,7 @@ int main(int argc, char** argv)
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("PixelPaint", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
image_editor.on_active_layer_change = [&](auto* layer) {
layer_list_widget.set_selected_layer(layer);

4
Userland/Applications/QuickShow/main.cpp
View file

@ -275,7 +275,7 @@ int main(int argc, char** argv)
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("QuickShow");
auto& app_menu = menubar->add_menu("File");
app_menu.add_action(open_action);
app_menu.add_action(delete_action);
app_menu.add_separator();
@ -310,7 +310,7 @@ int main(int argc, char** argv)
}));
help_menu.add_action(GUI::CommonActions::make_about_action("QuickShow", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
if (path != nullptr) {
widget.load_from_file(path);

4
Userland/Applications/SoundPlayer/main.cpp
View file

@ -66,7 +66,7 @@ int main(int argc, char** argv)
window->set_icon(app_icon.bitmap_for_size(16));
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("Sound Player");
auto& app_menu = menubar->add_menu("File");
auto& player = window->set_main_widget<SoundPlayerWidget>(window, audio_client);
if (argc > 1) {
@ -102,7 +102,7 @@ int main(int argc, char** argv)
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("Sound Player", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
window->show();
return app->exec();

4
Userland/Applications/SpaceAnalyzer/main.cpp
View file

@ -291,7 +291,7 @@ int main(int argc, char* argv[])
// Configure the menubar.
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu(APP_NAME);
auto& app_menu = menubar->add_menu("File");
app_menu.add_action(GUI::Action::create("Analyze", [&](auto&) {
analyze(tree, treemapwidget, statusbar);
}));
@ -300,7 +300,7 @@ int main(int argc, char* argv[])
}));
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action(APP_NAME, app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
// Configure the nodes context menu.
auto open_folder_action = GUI::Action::create("Open Folder", { Mod_Ctrl, Key_O }, Gfx::Bitmap::load_from_file("/res/icons/16x16/open.png"), [&](auto&) {

4
Userland/Applications/Spreadsheet/main.cpp
View file

@ -111,7 +111,7 @@ int main(int argc, char* argv[])
spreadsheet_widget.load(filename);
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("Spreadsheet");
auto& app_menu = menubar->add_menu("File");
app_menu.add_action(GUI::Action::create("Add New Sheet", Gfx::Bitmap::load_from_file("/res/icons/16x16/new-tab.png"), [&](auto&) {
spreadsheet_widget.add_sheet();
@ -270,7 +270,7 @@ int main(int argc, char* argv[])
help_menu.add_action(GUI::CommonActions::make_about_action("Spreadsheet", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
window->show();

5
Userland/Applications/SystemMonitor/main.cpp
View file

@ -279,10 +279,9 @@ int main(int argc, char** argv)
});
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("System Monitor");
auto& app_menu = menubar->add_menu("File");
app_menu.add_action(GUI::CommonActions::make_quit_action([](auto&) {
GUI::Application::the()->quit();
return;
}));
auto& process_menu = menubar->add_menu("Process");
@ -324,7 +323,7 @@ int main(int argc, char** argv)
auto& help_menu = menubar->add_menu("Help");
help_menu.add_action(GUI::CommonActions::make_about_action("System Monitor", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(move(menubar));
auto& process_tab_unused_widget = process_container_splitter->add<UnavailableProcessWidget>("No process selected");
process_tab_unused_widget.set_visible(true);

5
Userland/Applications/Terminal/main.cpp
View file

@ -428,7 +428,7 @@ int main(int argc, char** argv)
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("Terminal");
auto& app_menu = menubar->add_menu("File");
app_menu.add_action(GUI::Action::create("Open new Terminal", { Mod_Ctrl | Mod_Shift, Key_N }, Gfx::Bitmap::load_from_file("/res/icons/16x16/app-terminal.png"), [&](auto&) {
pid_t child;
const char* argv[] = { "Terminal", nullptr };
@ -473,7 +473,8 @@ int main(int argc, char** argv)
}));
help_menu.add_action(GUI::CommonActions::make_about_action("Terminal", app_icon, window));
app->set_menubar(move(menubar));
window->set_menubar(menubar);
window->set_menubar(menubar);
if (unveil("/res", "r") < 0) {
perror("unveil");

2
Userland/Applications/TextEditor/TextEditorWidget.cpp
View file

@ -361,7 +361,7 @@ TextEditorWidget::~TextEditorWidget()
void TextEditorWidget::initialize_menubar(GUI::MenuBar& menubar)
{
auto& app_menu = menubar.add_menu("Text Editor");
auto& app_menu = menubar.add_menu("File");
app_menu.add_action(*m_new_action);
app_menu.add_action(*m_open_action);
app_menu.add_action(*m_save_action);

4
Userland/Applications/TextEditor/main.cpp
View file

@ -87,7 +87,7 @@ int main(int argc, char** argv)
auto menubar = GUI::MenuBar::construct();
text_widget.initialize_menubar(menubar);
app->set_menubar(menubar);
window->set_menubar(menubar);
if (file_to_edit)
if (!text_widget.open_file(file_to_edit))
@ -101,5 +101,7 @@ int main(int argc, char** argv)
window->show();
window->set_icon(app_icon.bitmap_for_size(16));
window->set_menubar(menubar);
return app->exec();
}