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

DisplaySettings: Use FileSystemAccessServer instead of FilePicker

Browse source 
Make a call to the FileSystemAccessServer instead of using FilePicker to
select a new wallpaper in BackgroundSettings.
This commit is contained in:
huttongrabiel 2023-03-14 21:58:05 -07:00 committed by Andrew Kaster
parent 150ffc7336
commit ad5abc9a8f
Notes: sideshowbarker 2024-07-17 06:38:11 +09:00 
Author: https://github.com/huttongrabiel
Commit: https://github.com/SerenityOS/serenity/commit/ad5abc9a8f
Pull-request: https://github.com/SerenityOS/serenity/pull/17861
Reviewed-by: https://github.com/ADKaster ✅
Reviewed-by: https://github.com/LucasChollet
Reviewed-by: https://github.com/caoimhebyrne ✅
2 changed files with 6 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Userland/Applications/DisplaySettings/BackgroundSettingsWidget.cpp
View file

@ -7,11 +7,13 @@
*/
#include "BackgroundSettingsWidget.h"
#include <AK/LexicalPath.h>
#include <AK/StringBuilder.h>
#include <Applications/DisplaySettings/BackgroundSettingsGML.h>
#include <LibConfig/Client.h>
#include <LibCore/ConfigFile.h>
#include <LibDesktop/Launcher.h>
#include <LibFileSystemAccessClient/Client.h>
#include <LibGUI/Application.h>
#include <LibGUI/BoxLayout.h>
#include <LibGUI/Button.h>
@ -19,7 +21,6 @@
#include <LibGUI/ComboBox.h>
#include <LibGUI/ConnectionToWindowServer.h>
#include <LibGUI/Desktop.h>
#include <LibGUI/FilePicker.h>
#include <LibGUI/FileSystemModel.h>
#include <LibGUI/FileTypeFilter.h>
#include <LibGUI/IconView.h>
@ -100,16 +101,11 @@ ErrorOr<void> BackgroundSettingsWidget::create_frame()
auto& button = *find_descendant_of_type_named<GUI::Button>("wallpaper_open_button");
button.on_click = [this](auto) {
auto path_or_empty = GUI::FilePicker::get_open_filepath(window(), "Select wallpaper from file system", "/res/wallpapers"sv, false, GUI::Dialog::ScreenPosition::CenterWithinParent, { { GUI::FileTypeFilter::image_files(), GUI::FileTypeFilter::all_files() } });
if (!path_or_empty.has_value())
auto response = FileSystemAccessClient::Client::the().open_file(window(), "Select wallpaper"sv, "/res/wallpapers"sv, Core::File::OpenMode::Read, { { GUI::FileTypeFilter::image_files(), GUI::FileTypeFilter::all_files() } });
if (response.is_error())
return;
auto path = String::from_deprecated_string(path_or_empty.value());
if (path.is_error()) {
GUI::MessageBox::show_error(window(), "Unable to set wallpaper"sv);
return;
}
m_wallpaper_view->selection().clear();
m_monitor_widget->set_wallpaper(path.release_value());
m_monitor_widget->set_wallpaper(response.release_value().filename());
m_background_settings_changed = true;
set_modified(true);
};

2
Userland/Applications/DisplaySettings/CMakeLists.txt
View file

@ -33,4 +33,4 @@ set(GENERATED_SOURCES
)
serenity_app(DisplaySettings ICON app-display-settings)
target_link_libraries(DisplaySettings PRIVATE LibCore LibDesktop LibGfx LibGUI LibConfig LibIPC LibMain LibEDID LibThreading)
target_link_libraries(DisplaySettings PRIVATE LibCore LibDesktop LibGfx LibGUI LibConfig LibIPC LibMain LibEDID LibThreading LibFileSystemAccessClient)