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

Browser: Add option in DownloadWidget to open download's in folder

Browse source 
When a download has completed, instead of graying out the cancel
option, replace it with an option to open your download in the file
manager.
This commit is contained in:
FalseHonesty 2020-05-26 12:54:58 -04:00 • committed by Andreas Kling
parent 4a9deddb4a
commit e4760e5b42
3 changed files with 17 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Applications/Browser/CMakeLists.txt
View file

@ -10,4 +10,4 @@ set(SOURCES
) )
serenity_bin(Browser) serenity_bin(Browser)
target_link_libraries(Browser LibWeb LibProtocol LibGUI) target_link_libraries(Browser LibWeb LibProtocol LibGUI LibDesktop)

9
Applications/Browser/DownloadWidget.cpp
View file

@ -30,6 +30,7 @@
#include <AK/StringBuilder.h> #include <AK/StringBuilder.h>
#include <LibCore/File.h> #include <LibCore/File.h>
#include <LibCore/StandardPaths.h> #include <LibCore/StandardPaths.h>
#include <LibDesktop/Launcher.h>
#include <LibGUI/BoxLayout.h> #include <LibGUI/BoxLayout.h>
#include <LibGUI/Button.h> #include <LibGUI/Button.h>
#include <LibGUI/Label.h> #include <LibGUI/Label.h>
@ -162,8 +163,14 @@ void DownloadWidget::did_finish(bool success, const ByteBuffer& payload, RefPtr<
(void)payload_storage; (void)payload_storage;
(void)response_headers; (void)response_headers;
dbg() << "did_finish, success=" << success; dbg() << "did_finish, success=" << success;
m_cancel_button->set_enabled(false);
m_close_button->set_enabled(true); m_close_button->set_enabled(true);
m_cancel_button->set_text("Open in Folder");
m_cancel_button->on_click = [this](auto) {
Desktop::Launcher::open(URL::create_with_file_protocol(Core::StandardPaths::downloads_directory()));
window()->close();
};
m_cancel_button->update();
if (!success) { if (!success) {
GUI::MessageBox::show(String::format("Download failed for some reason"), "Download failed", GUI::MessageBox::Type::Error, GUI::MessageBox::InputType::OK, window()); GUI::MessageBox::show(String::format("Download failed for some reason"), "Download failed", GUI::MessageBox::Type::Error, GUI::MessageBox::InputType::OK, window());

9
Applications/Browser/main.cpp
View file

@ -64,7 +64,8 @@ int main(int argc, char** argv)
// Connect to the ProtocolServer immediately so we can drop the "unix" pledge. // Connect to the ProtocolServer immediately so we can drop the "unix" pledge.
Web::ResourceLoader::the(); Web::ResourceLoader::the();
if (pledge("stdio shared_buffer accept cpath rpath wpath", nullptr) < 0) { // FIXME: Once there is a standalone Download Manager, we can drop the "unix" pledge.
if (pledge("stdio shared_buffer accept unix cpath rpath wpath", nullptr) < 0) {
perror("pledge"); perror("pledge");
return 1; return 1;
} }
@ -84,6 +85,12 @@ int main(int argc, char** argv)
return 1; return 1;
} }
// FIXME: Once there is a standalone Download Manager, we don't need to unveil this
if (unveil("/tmp/portal/launch", "rw") < 0) {
perror("unveil");
return 1;
}
unveil(nullptr, nullptr); unveil(nullptr, nullptr);
auto m_config = Core::ConfigFile::get_for_app("Browser"); auto m_config = Core::ConfigFile::get_for_app("Browser");