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

PixelPaint: Display an error message if saving to PP file fails

Browse source
This commit is contained in:
Andreas Kling 2021-06-14 21:46:29 +02:00
parent fa7bb98b1e
commit c333aec9f3
3 changed files with 17 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

16
Userland/Applications/PixelPaint/Image.cpp
View file

@ -12,6 +12,7 @@
#include <AK/JsonValue.h> #include <AK/JsonValue.h>
#include <AK/MappedFile.h> #include <AK/MappedFile.h>
#include <AK/StringBuilder.h> #include <AK/StringBuilder.h>
#include <LibCore/File.h>
#include <LibGUI/Painter.h> #include <LibGUI/Painter.h>
#include <LibGfx/BMPWriter.h> #include <LibGfx/BMPWriter.h>
#include <LibGfx/Bitmap.h> #include <LibGfx/Bitmap.h>
@ -140,9 +141,8 @@ RefPtr<Image> Image::try_create_from_file(String const& file_path)
return Image::try_create_from_bitmap(bitmap.release_nonnull()); return Image::try_create_from_bitmap(bitmap.release_nonnull());
} }
void Image::save(String const& file_path) const Result<void, String> Image::write_to_file(const String& file_path) const
{ {
// Build json file
StringBuilder builder; StringBuilder builder;
JsonObjectSerializer json(builder); JsonObjectSerializer json(builder);
json.add("width", m_size.width()); json.add("width", m_size.width());
@ -165,11 +165,13 @@ void Image::save(String const& file_path) const
} }
json.finish(); json.finish();
// Write json to disk auto file_or_error = Core::File::open(file_path, (Core::OpenMode)(Core::OpenMode::WriteOnly | Core::OpenMode::Truncate));
auto file = fopen(file_path.characters(), "w"); if (file_or_error.is_error())
auto byte_buffer = builder.to_byte_buffer(); return file_or_error.error();
fwrite(byte_buffer.data(), sizeof(u8), byte_buffer.size(), file);
fclose(file); if (!file_or_error.value()->write(builder.string_view()))
return String { file_or_error.value()->error_string() };
return {};
} }
void Image::export_bmp(String const& file_path) void Image::export_bmp(String const& file_path)

3
Userland/Applications/PixelPaint/Image.h
View file

@ -10,6 +10,7 @@
#include <AK/NonnullRefPtrVector.h> #include <AK/NonnullRefPtrVector.h>
#include <AK/RefCounted.h> #include <AK/RefCounted.h>
#include <AK/RefPtr.h> #include <AK/RefPtr.h>
#include <AK/Result.h>
#include <AK/Vector.h> #include <AK/Vector.h>
#include <LibGUI/Command.h> #include <LibGUI/Command.h>
#include <LibGUI/Forward.h> #include <LibGUI/Forward.h>
@ -52,7 +53,7 @@ public:
void restore_snapshot(Image const&); void restore_snapshot(Image const&);
void paint_into(GUI::Painter&, Gfx::IntRect const& dest_rect); void paint_into(GUI::Painter&, Gfx::IntRect const& dest_rect);
void save(String const& file_path) const; Result<void, String> write_to_file(String const& file_path) const;
void export_bmp(String const& file_path); void export_bmp(String const& file_path);
void export_png(String const& file_path); void export_png(String const& file_path);

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

@ -115,10 +115,14 @@ int main(int argc, char** argv)
auto save_image_as_action = GUI::CommonActions::make_save_as_action([&](auto&) { auto save_image_as_action = GUI::CommonActions::make_save_as_action([&](auto&) {
if (!image_editor.image()) if (!image_editor.image())
return; return;
Optional<String> save_path = GUI::FilePicker::get_save_filepath(window, "untitled", "pp"); auto save_path = GUI::FilePicker::get_save_filepath(window, "untitled", "pp");
if (!save_path.has_value()) if (!save_path.has_value())
return; return;
image_editor.image()->save(save_path.value()); auto result = image_editor.image()->write_to_file(save_path.value());
if (result.is_error()) {
GUI::MessageBox::show_error(window, String::formatted("Could not save {}: {}", save_path.value(), result.error()));
return;
}
}); });
auto menubar = GUI::Menubar::construct(); auto menubar = GUI::Menubar::construct();