system/serenity
system/serenity
1
0
Fork 0
mirror of https://github.com/SerenityOS/serenity synced 2024-10-17 13:22:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Terminal+LibVT: Add settings window to the terminal context menu

Browse source
This commit is contained in:
Andreas Kling 2020-12-30 13:42:16 +01:00
parent 04e3bcfa75
commit 2c9147154c
2 changed files with 24 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

35
Applications/Terminal/main.cpp
View file

@ -178,7 +178,7 @@ static pid_t run_command(int ptm_fd, String command)
static RefPtr<GUI::Window> create_settings_window(TerminalWidget& terminal)
{
auto window = GUI::Window::construct();
window->set_title("Terminal Settings");
window->set_title("Terminal settings");
window->set_resizable(false);
window->resize(200, 210);
window->set_modal(true);
@ -413,6 +413,25 @@ int main(int argc, char** argv)
auto new_scrollback_size = config->read_num_entry("Terminal", "MaxHistorySize", terminal.max_history_size());
terminal.set_max_history_size(new_scrollback_size);
auto open_settings_action = GUI::Action::create("Settings...", Gfx::Bitmap::load_from_file("/res/icons/16x16/gear.png"),
[&](const GUI::Action&) {
if (!settings_window) {
settings_window = create_settings_window(terminal);
settings_window->on_close_request = [&] {
settings_window = nullptr;
return GUI::Window::CloseRequestDecision::Close;
};
}
if (!settings_window->is_visible()) {
settings_window->center_within(*window);
settings_window->show();
}
settings_window->move_to_front();
});
terminal.context_menu().add_separator();
terminal.context_menu().add_action(open_settings_action);
auto menubar = GUI::MenuBar::construct();
auto& app_menu = menubar->add_menu("Terminal");
@ -426,18 +445,8 @@ int main(int argc, char** argv)
perror("disown");
}
}));
app_menu.add_action(GUI::Action::create("Settings...", Gfx::Bitmap::load_from_file("/res/icons/16x16/gear.png"),
[&](const GUI::Action&) {
if (!settings_window) {
settings_window = create_settings_window(terminal);
settings_window->on_close_request = [&] {
settings_window = nullptr;
return GUI::Window::CloseRequestDecision::Close;
};
}
settings_window->show();
settings_window->move_to_front();
}));
app_menu.add_action(open_settings_action);
app_menu.add_separator();
app_menu.add_action(GUI::CommonActions::make_quit_action([](auto&) {
dbgln("Terminal: Quit menu activated!");

2
Libraries/LibVT/TerminalWidget.h
View file

@ -104,6 +104,8 @@ public:
Function<void(const StringView&)> on_title_change;
Function<void()> on_command_exit;
GUI::Menu& context_menu() { return *m_context_menu; }
private:
// ^GUI::Widget
virtual void event(Core::Event&) override;