beenull/ladybird
1
0
Fork 0
mirror of https://github.com/LadybirdBrowser/ladybird.git synced 2024-11-22 23:50:19 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 6

TextEditor: Fix nullptr refrence to save action & m_path (#364)

Browse source 
We forgot to persist our actions in the constructor for later reference, whoops.
Also use the correct path in the "open" action.
This commit is contained in:
Rhin 2019-07-25 23:48:39 -05:00 committed by Andreas Kling
parent 4316fa8123
commit d6cd98cfa1
Notes: sideshowbarker 2024-07-19 13:03:09 +09:00 
Author: https://github.com/RyanGrieb
Commit: https://github.com/SerenityOS/serenity/commit/d6cd98cfa1a
Pull-request: https://github.com/SerenityOS/serenity/pull/364
2 changed files with 16 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
Applications/TextEditor/TextEditorWidget.cpp
View file

@ -29,20 +29,20 @@ TextEditorWidget::TextEditorWidget()
statusbar->set_text(builder.to_string()); statusbar->set_text(builder.to_string());
}; };
auto new_action = GAction::create("New", { Mod_Ctrl, Key_N }, GraphicsBitmap::load_from_file("/res/icons/16x16/new.png"), [](const GAction&) { m_new_action = GAction::create("New", { Mod_Ctrl, Key_N }, GraphicsBitmap::load_from_file("/res/icons/16x16/new.png"), [](const GAction&) {
dbgprintf("FIXME: Implement File/New\n"); dbgprintf("FIXME: Implement File/New\n");
}); });
auto open_action = GAction::create("Open...", { Mod_Ctrl, Key_O }, GraphicsBitmap::load_from_file("/res/icons/16x16/open.png"), [this](const GAction&) { m_open_action = GAction::create("Open...", { Mod_Ctrl, Key_O }, GraphicsBitmap::load_from_file("/res/icons/16x16/open.png"), [this](const GAction&) {
Optional<String> open_name = GFilePicker::get_open_filepath(); Optional<String> open_name = GFilePicker::get_open_filepath();
if (!open_name.has_value()) if (!open_name.has_value())
return; return;
open_sesame(m_path); open_sesame(open_name.value());
}); });
auto save_as_action = GAction::create("Save as...", { Mod_None, Key_F12 }, GraphicsBitmap::load_from_file("/res/icons/16x16/save.png"), [this](const GAction&) { m_save_as_action = GAction::create("Save as...", { Mod_None, Key_F12 }, GraphicsBitmap::load_from_file("/res/icons/16x16/save.png"), [this](const GAction&) {
Optional<String> save_name = GFilePicker::get_save_filepath(); Optional<String> save_name = GFilePicker::get_save_filepath();
if (!save_name.has_value()) if (!save_name.has_value())
return; return;
@ -56,14 +56,14 @@ TextEditorWidget::TextEditorWidget()
dbg() << "Wrote document to " << save_name.value(); dbg() << "Wrote document to " << save_name.value();
}); });
auto save_action = GAction::create("Save", { Mod_Ctrl, Key_S }, GraphicsBitmap::load_from_file("/res/icons/16x16/save.png"), [&](const GAction&) { m_save_action = GAction::create("Save", { Mod_Ctrl, Key_S }, GraphicsBitmap::load_from_file("/res/icons/16x16/save.png"), [&](const GAction&) {
if (!m_path.is_empty()) { if (!m_path.is_empty()) {
if (!m_editor->write_to_file(m_path)) if (!m_editor->write_to_file(m_path))
GMessageBox::show("Unable to save file.\n", "Error", GMessageBox::Type::Error, GMessageBox::InputType::OK, window()); GMessageBox::show("Unable to save file.\n", "Error", GMessageBox::Type::Error, GMessageBox::InputType::OK, window());
return; return;
} }
save_as_action->activate(); m_save_as_action->activate();
}); });
auto menubar = make<GMenuBar>(); auto menubar = make<GMenuBar>();
@ -75,10 +75,9 @@ TextEditorWidget::TextEditorWidget()
menubar->add_menu(move(app_menu)); menubar->add_menu(move(app_menu));
auto file_menu = make<GMenu>("File"); auto file_menu = make<GMenu>("File");
file_menu->add_action(new_action); file_menu->add_action(*m_new_action);
file_menu->add_action(open_action); file_menu->add_action(*m_open_action);
file_menu->add_action(save_action); file_menu->add_action(*m_save_action);
file_menu->add_action(save_as_action);
menubar->add_menu(move(file_menu)); menubar->add_menu(move(file_menu));
auto edit_menu = make<GMenu>("Edit"); auto edit_menu = make<GMenu>("Edit");
@ -108,9 +107,9 @@ TextEditorWidget::TextEditorWidget()
GApplication::the().set_menubar(move(menubar)); GApplication::the().set_menubar(move(menubar));
toolbar->add_action(move(new_action)); toolbar->add_action(*m_new_action);
toolbar->add_action(move(open_action)); toolbar->add_action(*m_open_action);
toolbar->add_action(move(save_action)); toolbar->add_action(*m_save_action);
toolbar->add_separator(); toolbar->add_separator();

4
Applications/TextEditor/TextEditorWidget.h
View file

@ -19,4 +19,8 @@ private:
GTextEditor* m_editor { nullptr }; GTextEditor* m_editor { nullptr };
String m_path; String m_path;
RefPtr<GAction> m_new_action;
RefPtr<GAction> m_open_action;
RefPtr<GAction> m_save_action;
RefPtr<GAction> m_save_as_action;
}; };