RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 02:07:35 +00:00
Code Issues Activity Actions

FontEditor: Disambiguate save function from save-as action

Browse source
This commit is contained in:
thankyouverycool 2022-01-16 09:36:43 -05:00 • committed by Andreas Kling
parent c2b7bbbb2c
commit 8f60ea4470
2 changed files with 5 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

7
Userland/Applications/FontEditor/FontEditor.cpp
View file

@ -169,14 +169,14 @@ FontEditorWidget::FontEditorWidget()
if (m_path.is_empty()) if (m_path.is_empty())
m_save_as_action->activate(); m_save_as_action->activate();
else else
save_as(m_path); save_file(m_path);
}); });
m_save_as_action = GUI::CommonActions::make_save_as_action([&](auto&) { m_save_as_action = GUI::CommonActions::make_save_as_action([&](auto&) {
LexicalPath lexical_path(m_path.is_empty() ? "Untitled.font" : m_path); LexicalPath lexical_path(m_path.is_empty() ? "Untitled.font" : m_path);
Optional<String> save_path = GUI::FilePicker::get_save_filepath(window(), lexical_path.title(), lexical_path.extension()); Optional<String> save_path = GUI::FilePicker::get_save_filepath(window(), lexical_path.title(), lexical_path.extension());
if (!save_path.has_value()) if (!save_path.has_value())
return; return;
save_as(save_path.value()); save_file(save_path.value());
}); });
m_cut_action = GUI::CommonActions::make_cut_action([&](auto&) { m_cut_action = GUI::CommonActions::make_cut_action([&](auto&) {
cut_selected_glyphs(); cut_selected_glyphs();
@ -558,7 +558,7 @@ void FontEditorWidget::initialize_menubar(GUI::Window& window)
help_menu.add_action(GUI::CommonActions::make_about_action("Font Editor", GUI::Icon::default_icon("app-font-editor"), &window)); help_menu.add_action(GUI::CommonActions::make_about_action("Font Editor", GUI::Icon::default_icon("app-font-editor"), &window));
} }
bool FontEditorWidget::save_as(String const& path) bool FontEditorWidget::save_file(String const& path)
{ {
auto saved_font = m_edited_font->masked_character_set(); auto saved_font = m_edited_font->masked_character_set();
auto ret_val = saved_font->write_to_file(path); auto ret_val = saved_font->write_to_file(path);
@ -757,6 +757,7 @@ void FontEditorWidget::set_scale_and_save(i32 scale)
Config::write_i32("FontEditor", "GlyphEditor", "Scale", scale); Config::write_i32("FontEditor", "GlyphEditor", "Scale", scale);
did_resize_glyph_editor(); did_resize_glyph_editor();
} }
void FontEditorWidget::copy_selected_glyphs() void FontEditorWidget::copy_selected_glyphs()
{ {
ByteBuffer buffer; ByteBuffer buffer;

2
Userland/Applications/FontEditor/FontEditor.h
View file

@ -24,7 +24,7 @@ public:
virtual ~FontEditorWidget() override; virtual ~FontEditorWidget() override;
bool open_file(String const&); bool open_file(String const&);
bool save_as(String const&); bool save_file(String const&);
bool request_close(); bool request_close();
void update_title(); void update_title();