mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 11:17:44 +00:00
DisplaySettings: Give the UI a facelift :^)
- Split the main UI into two tabs: "Background" and "Monitor". - Use a GUI::IconView for selecting background pictures. - Tweak layout, spacing, etc.
This commit is contained in:
Andreas Kling
parent
ff519e5421
commit
540acc1a32
10 changed files with 417 additions and 267 deletions
|
|
@ -17,22 +17,16 @@
|
|||
#include <LibGUI/Desktop.h>
|
||||
#include <LibGUI/FilePicker.h>
|
||||
#include <LibGUI/ItemListModel.h>
|
||||
#include <LibGUI/Label.h>
|
||||
#include <LibGUI/MessageBox.h>
|
||||
#include <LibGUI/RadioButton.h>
|
||||
#include <LibGUI/WindowServerConnection.h>
|
||||
#include <LibGfx/Palette.h>
|
||||
#include <LibGfx/SystemTheme.h>
|
||||
|
||||
REGISTER_WIDGET(DisplaySettings, MonitorWidget)
|
||||
|
||||
DisplaySettingsWidget::DisplaySettingsWidget()
|
||||
{
|
||||
create_resolution_list();
|
||||
create_wallpaper_list();
|
||||
|
||||
create_frame();
|
||||
|
||||
load_current_settings();
|
||||
}
|
||||
|
||||
|
|
@ -57,74 +51,12 @@ void DisplaySettingsWidget::create_resolution_list()
|
|||
m_resolutions.append({ 2560, 1440 });
|
||||
}
|
||||
|
||||
void DisplaySettingsWidget::create_wallpaper_list()
|
||||
{
|
||||
Core::DirIterator iterator("/res/wallpapers/", Core::DirIterator::Flags::SkipDots);
|
||||
|
||||
m_wallpapers.append("Use background color");
|
||||
|
||||
while (iterator.has_next()) {
|
||||
m_wallpapers.append(iterator.next_path());
|
||||
}
|
||||
|
||||
m_modes.append("simple");
|
||||
m_modes.append("tile");
|
||||
m_modes.append("center");
|
||||
m_modes.append("stretch");
|
||||
}
|
||||
|
||||
void DisplaySettingsWidget::create_frame()
|
||||
{
|
||||
load_from_gml(display_settings_window_gml);
|
||||
|
||||
m_monitor_widget = *find_descendant_of_type_named<DisplaySettings::MonitorWidget>("monitor_widget");
|
||||
|
||||
m_wallpaper_combo = *find_descendant_of_type_named<GUI::ComboBox>("wallpaper_combo");
|
||||
m_wallpaper_combo->set_only_allow_values_from_model(true);
|
||||
m_wallpaper_combo->set_model(*GUI::ItemListModel<String>::create(m_wallpapers));
|
||||
m_wallpaper_combo->on_change = [this](auto& text, const GUI::ModelIndex& index) {
|
||||
String path = text;
|
||||
if (path.starts_with("/") && m_monitor_widget->set_wallpaper(path)) {
|
||||
m_monitor_widget->update();
|
||||
return;
|
||||
}
|
||||
|
||||
if (index.row() == 0) {
|
||||
path = "";
|
||||
} else {
|
||||
if (index.is_valid()) {
|
||||
StringBuilder builder;
|
||||
builder.append("/res/wallpapers/");
|
||||
builder.append(path);
|
||||
path = builder.to_string();
|
||||
}
|
||||
}
|
||||
|
||||
m_monitor_widget->set_wallpaper(path);
|
||||
m_monitor_widget->update();
|
||||
};
|
||||
|
||||
auto& button = *find_descendant_of_type_named<GUI::Button>("wallpaper_open_button");
|
||||
button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/open.png"));
|
||||
button.on_click = [this](auto) {
|
||||
Optional<String> open_path = GUI::FilePicker::get_open_filepath(nullptr, "Select wallpaper from file system.");
|
||||
|
||||
if (!open_path.has_value())
|
||||
return;
|
||||
|
||||
m_wallpaper_combo->set_only_allow_values_from_model(false);
|
||||
m_wallpaper_combo->set_text(open_path.value());
|
||||
m_wallpaper_combo->set_only_allow_values_from_model(true);
|
||||
};
|
||||
|
||||
m_mode_combo = *find_descendant_of_type_named<GUI::ComboBox>("mode_combo");
|
||||
m_mode_combo->set_only_allow_values_from_model(true);
|
||||
m_mode_combo->set_model(*GUI::ItemListModel<String>::create(m_modes));
|
||||
m_mode_combo->on_change = [this](auto&, const GUI::ModelIndex& index) {
|
||||
m_monitor_widget->set_wallpaper_mode(m_modes.at(index.row()));
|
||||
m_monitor_widget->update();
|
||||
};
|
||||
|
||||
m_resolution_combo = *find_descendant_of_type_named<GUI::ComboBox>("resolution_combo");
|
||||
m_resolution_combo->set_only_allow_values_from_model(true);
|
||||
m_resolution_combo->set_model(*GUI::ItemListModel<Gfx::IntSize>::create(m_resolutions));
|
||||
|
|
@ -147,75 +79,12 @@ void DisplaySettingsWidget::create_frame()
|
|||
m_monitor_widget->update();
|
||||
}
|
||||
};
|
||||
|
||||
m_color_input = *find_descendant_of_type_named<GUI::ColorInput>("color_input");
|
||||
m_color_input->set_color_has_alpha_channel(false);
|
||||
m_color_input->set_color_picker_title("Select color for desktop");
|
||||
m_color_input->on_change = [this] {
|
||||
m_monitor_widget->set_background_color(m_color_input->color());
|
||||
m_monitor_widget->update();
|
||||
};
|
||||
|
||||
auto& ok_button = *find_descendant_of_type_named<GUI::Button>("ok_button");
|
||||
ok_button.on_click = [this](auto) {
|
||||
send_settings_to_window_server();
|
||||
GUI::Application::the()->quit();
|
||||
};
|
||||
|
||||
auto& cancel_button = *find_descendant_of_type_named<GUI::Button>("cancel_button");
|
||||
cancel_button.on_click = [](auto) {
|
||||
GUI::Application::the()->quit();
|
||||
};
|
||||
|
||||
auto& apply_button = *find_descendant_of_type_named<GUI::Button>("apply_button");
|
||||
apply_button.on_click = [this](auto) {
|
||||
send_settings_to_window_server();
|
||||
};
|
||||
}
|
||||
|
||||
void DisplaySettingsWidget::load_current_settings()
|
||||
{
|
||||
auto ws_config(Core::ConfigFile::open("/etc/WindowServer.ini"));
|
||||
auto wm_config = Core::ConfigFile::get_for_app("WindowManager");
|
||||
auto ws_config = Core::ConfigFile::open("/etc/WindowServer.ini");
|
||||
|
||||
/// Wallpaper path ////////////////////////////////////////////////////////////////////////////
|
||||
/// Read wallpaper path from config file and set value to monitor widget and combo box.
|
||||
auto selected_wallpaper = wm_config->read_entry("Background", "Wallpaper", "");
|
||||
if (!selected_wallpaper.is_empty()) {
|
||||
m_monitor_widget->set_wallpaper(selected_wallpaper);
|
||||
|
||||
Optional<size_t> optional_index;
|
||||
if (selected_wallpaper.starts_with("/res/wallpapers/")) {
|
||||
auto name_parts = selected_wallpaper.split('/', true);
|
||||
optional_index = m_wallpapers.find_first_index(name_parts[2]);
|
||||
|
||||
if (optional_index.has_value()) {
|
||||
m_wallpaper_combo->set_selected_index(optional_index.value());
|
||||
}
|
||||
}
|
||||
|
||||
if (!optional_index.has_value()) {
|
||||
m_wallpaper_combo->set_only_allow_values_from_model(false);
|
||||
m_wallpaper_combo->set_text(selected_wallpaper);
|
||||
m_wallpaper_combo->set_only_allow_values_from_model(true);
|
||||
}
|
||||
} else {
|
||||
m_wallpaper_combo->set_selected_index(0);
|
||||
}
|
||||
|
||||
size_t index;
|
||||
|
||||
/// Mode //////////////////////////////////////////////////////////////////////////////////////
|
||||
auto mode = ws_config->read_entry("Background", "Mode", "simple");
|
||||
if (!m_modes.contains_slow(mode)) {
|
||||
warnln("Invalid background mode '{}' in WindowServer config, falling back to 'simple'", mode);
|
||||
mode = "simple";
|
||||
}
|
||||
m_monitor_widget->set_wallpaper_mode(mode);
|
||||
index = m_modes.find_first_index(mode).value();
|
||||
m_mode_combo->set_selected_index(index);
|
||||
|
||||
/// Resolution and scale factor ///////////////////////////////////////////////////////////////
|
||||
int scale_factor = ws_config->read_num_entry("Screen", "ScaleFactor", 1);
|
||||
if (scale_factor != 1 && scale_factor != 2) {
|
||||
dbgln("unexpected ScaleFactor {}, setting to 1", scale_factor);
|
||||
|
|
@ -228,29 +97,15 @@ void DisplaySettingsWidget::load_current_settings()
|
|||
Gfx::IntSize find_size;
|
||||
find_size.set_width(ws_config->read_num_entry("Screen", "Width", 1024));
|
||||
find_size.set_height(ws_config->read_num_entry("Screen", "Height", 768));
|
||||
index = m_resolutions.find_first_index(find_size).value_or(0);
|
||||
auto index = m_resolutions.find_first_index(find_size).value_or(0);
|
||||
Gfx::IntSize m_current_resolution = m_resolutions.at(index);
|
||||
m_monitor_widget->set_desktop_resolution(m_current_resolution);
|
||||
m_resolution_combo->set_selected_index(index);
|
||||
|
||||
/// Color /////////////////////////////////////////////////////////////////////////////////////
|
||||
/// If presend read from config file. If not paint with palette color.
|
||||
Color palette_desktop_color = palette().desktop_background();
|
||||
|
||||
auto background_color = ws_config->read_entry("Background", "Color", "");
|
||||
if (!background_color.is_empty()) {
|
||||
auto opt_color = Color::from_string(background_color);
|
||||
if (opt_color.has_value())
|
||||
palette_desktop_color = opt_color.value();
|
||||
}
|
||||
|
||||
m_color_input->set_color(palette_desktop_color);
|
||||
m_monitor_widget->set_background_color(palette_desktop_color);
|
||||
|
||||
m_monitor_widget->update();
|
||||
}
|
||||
|
||||
void DisplaySettingsWidget::send_settings_to_window_server()
|
||||
void DisplaySettingsWidget::apply_settings()
|
||||
{
|
||||
// Store the current screen resolution and scale factor in case the user wants to revert to it.
|
||||
auto ws_config(Core::ConfigFile::open("/etc/WindowServer.ini"));
|
||||
|
|
@ -290,14 +145,4 @@ void DisplaySettingsWidget::send_settings_to_window_server()
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
if (!m_monitor_widget->wallpaper().is_empty()) {
|
||||
GUI::Desktop::the().set_wallpaper(m_monitor_widget->wallpaper());
|
||||
} else {
|
||||
dbgln("Setting color input: __{}__", m_color_input->text());
|
||||
GUI::Desktop::the().set_wallpaper("");
|
||||
GUI::Desktop::the().set_background_color(m_color_input->text());
|
||||
}
|
||||
|
||||
GUI::Desktop::the().set_wallpaper_mode(m_monitor_widget->wallpaper_mode());
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue