RGBCube/serenity
1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-23 20:17:42 +00:00
Code Issues Activity Actions

PDFViewer: Use FileSystemAccessClient::try_* APIs

Browse source
This commit is contained in:
Mustafa Quraish 2022-01-16 20:47:11 -05:00 • committed by Andreas Kling
parent 1c3e93c6e0
commit effb19f996
3 changed files with 11 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

24
Userland/Applications/PDFViewer/PDFViewerWidget.cpp
View file

@ -41,15 +41,10 @@ void PDFViewerWidget::initialize_menubar(GUI::Window& window)
{ {
auto& file_menu = window.add_menu("&File"); auto& file_menu = window.add_menu("&File");
file_menu.add_action(GUI::CommonActions::make_open_action([&](auto&) { file_menu.add_action(GUI::CommonActions::make_open_action([&](auto&) {
auto response = FileSystemAccessClient::Client::the().open_file(window.window_id()); auto response = FileSystemAccessClient::Client::the().try_open_file(&window);
if (response.is_error())
if (response.error != 0) {
if (response.error != -1)
GUI::MessageBox::show_error(&window, String::formatted("Opening \"{}\" failed: {}", *response.chosen_file, strerror(response.error)));
return; return;
} open_file(*response.value());
open_file(*response.fd, *response.chosen_file);
})); }));
file_menu.add_separator(); file_menu.add_separator();
file_menu.add_action(GUI::CommonActions::make_quit_action([](auto&) { file_menu.add_action(GUI::CommonActions::make_quit_action([](auto&) {
@ -151,19 +146,14 @@ void PDFViewerWidget::create_toolbar()
toolbar.add_action(*m_rotate_clockwise_action); toolbar.add_action(*m_rotate_clockwise_action);
} }
void PDFViewerWidget::open_file(int fd, String const& path) void PDFViewerWidget::open_file(Core::File& file)
{ {
auto file = Core::File::construct(); window()->set_title(String::formatted("{} - PDF Viewer", file.filename()));
if (!file->open(fd, Core::OpenMode::ReadOnly, Core::File::ShouldCloseFileDescriptor::Yes) && file->error() != ENOENT) {
GUI::MessageBox::show(window(), String::formatted("Opening \"{}\" failed: {}", path, strerror(errno)), "Error", GUI::MessageBox::Type::Error);
return;
}
window()->set_title(String::formatted("{} - PDF Viewer", path));
m_buffer = file->read_all(); m_buffer = file.read_all();
auto document = PDF::Document::create(m_buffer); auto document = PDF::Document::create(m_buffer);
if (!document) { if (!document) {
GUI::MessageBox::show_error(nullptr, String::formatted("Couldn't load PDF: {}", path)); GUI::MessageBox::show_error(nullptr, String::formatted("Couldn't load PDF: {}", file.filename()));
return; return;
} }

2
Userland/Applications/PDFViewer/PDFViewerWidget.h
View file

@ -23,7 +23,7 @@ public:
void initialize_menubar(GUI::Window&); void initialize_menubar(GUI::Window&);
void create_toolbar(); void create_toolbar();
void open_file(int fd, const String& path); void open_file(Core::File&);
private: private:
PDFViewerWidget(); PDFViewerWidget();

10
Userland/Applications/PDFViewer/main.cpp
View file

@ -38,14 +38,10 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
window->set_icon(app_icon.bitmap_for_size(16)); window->set_icon(app_icon.bitmap_for_size(16));
if (arguments.argc >= 2) { if (arguments.argc >= 2) {
auto response = FileSystemAccessClient::Client::the().request_file_read_only_approved(window->window_id(), arguments.argv[1]); auto response = FileSystemAccessClient::Client::the().try_request_file_read_only_approved(window, arguments.argv[1]);
if (response.is_error())
if (response.error != 0) {
if (response.error != -1)
GUI::MessageBox::show_error(window, String::formatted("Opening \"{}\" failed: {}", *response.chosen_file, strerror(response.error)));
return 1; return 1;
} pdf_viewer_widget->open_file(*response.value());
pdf_viewer_widget->open_file(*response.fd, *response.chosen_file);
} }
return app->exec(); return app->exec();