mirror of
https://github.com/RGBCube/serenity
synced 2025-07-25 23:17:45 +00:00
DisplayProperties: Add options to set the background color and wallpaper mode.
Wallpaper mode and background color change options are now available. Monitor preview widget show new settings before apply. We have some missing preview features :(
This commit is contained in:
Hüseyin ASLITÜRK
Andreas Kling
parent
f88b90f6fd
commit
7971af474d
6 changed files with 463 additions and 153 deletions
|
|
@ -27,33 +27,34 @@
|
|||
#include "DisplayProperties.h"
|
||||
#include "ItemListModel.h"
|
||||
#include <AK/StringBuilder.h>
|
||||
#include <LibCore/ConfigFile.h>
|
||||
#include <LibCore/DirIterator.h>
|
||||
#include <LibGUI/Action.h>
|
||||
#include <LibGUI/Application.h>
|
||||
#include <LibGUI/BoxLayout.h>
|
||||
#include <LibGUI/Button.h>
|
||||
#include <LibGUI/ColorPicker.h>
|
||||
#include <LibGUI/ComboBox.h>
|
||||
#include <LibGUI/Desktop.h>
|
||||
#include <LibGUI/FileSystemModel.h>
|
||||
#include <LibGUI/GroupBox.h>
|
||||
#include <LibGUI/FilePicker.h>
|
||||
#include <LibGUI/Label.h>
|
||||
#include <LibGUI/ListView.h>
|
||||
#include <LibGUI/MessageBox.h>
|
||||
#include <LibGUI/ScrollBar.h>
|
||||
#include <LibGUI/Splitter.h>
|
||||
#include <LibGUI/TabWidget.h>
|
||||
#include <LibGUI/TextBox.h>
|
||||
#include <LibGUI/ToolBar.h>
|
||||
#include <LibGUI/Widget.h>
|
||||
#include <LibGUI/Window.h>
|
||||
#include <LibGUI/WindowServerConnection.h>
|
||||
#include <Servers/WindowServer/WindowManager.h>
|
||||
|
||||
//#define DEBUG_MODE
|
||||
|
||||
DisplayPropertiesWidget::DisplayPropertiesWidget()
|
||||
: m_wm_config(Core::ConfigFile::open("/etc/WindowServer/WindowServer.ini"))
|
||||
{
|
||||
create_resolution_list();
|
||||
create_wallpaper_list();
|
||||
create_root_widget();
|
||||
|
||||
create_frame();
|
||||
|
||||
load_current_settings();
|
||||
}
|
||||
|
||||
void DisplayPropertiesWidget::create_resolution_list()
|
||||
|
|
@ -63,153 +64,227 @@ void DisplayPropertiesWidget::create_resolution_list()
|
|||
m_resolutions.append({ 800, 600 });
|
||||
m_resolutions.append({ 1024, 768 });
|
||||
m_resolutions.append({ 1280, 720 });
|
||||
m_resolutions.append({ 1368, 768 });
|
||||
m_resolutions.append({ 1366, 768 });
|
||||
m_resolutions.append({ 1280, 768 });
|
||||
m_resolutions.append({ 1280, 1024 });
|
||||
m_resolutions.append({ 1360, 768 });
|
||||
m_resolutions.append({ 1368, 768 });
|
||||
m_resolutions.append({ 1440, 900 });
|
||||
m_resolutions.append({ 1600, 900 });
|
||||
m_resolutions.append({ 1920, 1080 });
|
||||
m_resolutions.append({ 2560, 1080 });
|
||||
|
||||
Gfx::Size find_size;
|
||||
|
||||
bool okay = false;
|
||||
// Let's attempt to find the current resolution and select it!
|
||||
find_size.set_width(m_wm_config->read_entry("Screen", "Width", "1024").to_int(okay));
|
||||
if (!okay) {
|
||||
fprintf(stderr, "DisplayProperties: failed to convert width to int!");
|
||||
return;
|
||||
}
|
||||
|
||||
find_size.set_height(m_wm_config->read_entry("Screen", "Height", "768").to_int(okay));
|
||||
if (!okay) {
|
||||
fprintf(stderr, "DisplayProperties: failed to convert height to int!");
|
||||
return;
|
||||
}
|
||||
|
||||
int index = 0;
|
||||
for (auto& resolution : m_resolutions) {
|
||||
if (resolution == find_size) {
|
||||
m_selected_resolution = m_resolutions.at(index);
|
||||
return; // We don't need to do anything else
|
||||
}
|
||||
|
||||
index++;
|
||||
}
|
||||
|
||||
m_selected_resolution = m_resolutions.at(0);
|
||||
}
|
||||
|
||||
void DisplayPropertiesWidget::create_root_widget()
|
||||
{
|
||||
m_root_widget = GUI::Widget::construct();
|
||||
m_root_widget->set_layout<GUI::VerticalBoxLayout>();
|
||||
m_root_widget->set_fill_with_background_color(true);
|
||||
m_root_widget->layout()->set_margins({ 4, 4, 4, 16 });
|
||||
}
|
||||
|
||||
void DisplayPropertiesWidget::create_wallpaper_list()
|
||||
{
|
||||
m_selected_wallpaper = m_wm_config->read_entry("Background", "Wallpaper");
|
||||
if (!m_selected_wallpaper.is_empty()) {
|
||||
auto name_parts = m_selected_wallpaper.split('/');
|
||||
m_selected_wallpaper = name_parts[2];
|
||||
}
|
||||
|
||||
Core::DirIterator iterator("/res/wallpapers/", Core::DirIterator::Flags::SkipDots);
|
||||
|
||||
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("scaled");
|
||||
}
|
||||
|
||||
void DisplayPropertiesWidget::create_frame()
|
||||
{
|
||||
auto& tab_widget = m_root_widget->add<GUI::TabWidget>();
|
||||
m_root_widget = GUI::Widget::construct();
|
||||
m_root_widget->set_layout<GUI::VerticalBoxLayout>();
|
||||
m_root_widget->set_fill_with_background_color(true);
|
||||
m_root_widget->layout()->set_margins({ 4, 4, 4, 4 });
|
||||
|
||||
auto wallpaper_splitter = tab_widget.add_tab<GUI::VerticalSplitter>("Wallpaper");
|
||||
|
||||
auto& wallpaper_content = wallpaper_splitter->add<GUI::Widget>();
|
||||
wallpaper_content.set_layout<GUI::VerticalBoxLayout>();
|
||||
wallpaper_content.layout()->set_margins({ 4, 4, 4, 4 });
|
||||
|
||||
m_wallpaper_preview = wallpaper_splitter->add<GUI::Label>();
|
||||
|
||||
auto& wallpaper_list = wallpaper_content.add<GUI::ListView>();
|
||||
wallpaper_list.set_background_color(Color::White);
|
||||
wallpaper_list.set_model(*ItemListModel<AK::String>::create(m_wallpapers));
|
||||
|
||||
auto wallpaper_model = wallpaper_list.model();
|
||||
auto find_first_wallpaper_index = m_wallpapers.find_first_index(m_selected_wallpaper);
|
||||
if (find_first_wallpaper_index.has_value()) {
|
||||
auto wallpaper_index_in_model = wallpaper_model->index(find_first_wallpaper_index.value(), wallpaper_list.model_column());
|
||||
if (wallpaper_model->is_valid(wallpaper_index_in_model))
|
||||
wallpaper_list.selection().set(wallpaper_index_in_model);
|
||||
}
|
||||
|
||||
wallpaper_list.horizontal_scrollbar().set_visible(false);
|
||||
wallpaper_list.on_selection = [this](auto& index) {
|
||||
StringBuilder builder;
|
||||
m_selected_wallpaper = m_wallpapers.at(index.row());
|
||||
builder.append("/res/wallpapers/");
|
||||
builder.append(m_selected_wallpaper);
|
||||
m_wallpaper_preview->set_icon(Gfx::Bitmap::load_from_file(builder.to_string()));
|
||||
m_wallpaper_preview->set_should_stretch_icon(true);
|
||||
};
|
||||
|
||||
auto settings_splitter = tab_widget.add_tab<GUI::VerticalSplitter>("Settings");
|
||||
|
||||
auto& settings_content = settings_splitter->add<GUI::Widget>();
|
||||
auto& settings_content = m_root_widget->add<GUI::Widget>();
|
||||
settings_content.set_layout<GUI::VerticalBoxLayout>();
|
||||
settings_content.set_backcolor("red");
|
||||
settings_content.set_background_color(Color::Blue);
|
||||
settings_content.set_background_role(ColorRole::Window);
|
||||
settings_content.layout()->set_margins({ 4, 4, 4, 4 });
|
||||
|
||||
auto& resolution_list = settings_content.add<GUI::ListView>();
|
||||
resolution_list.set_background_color(Color::White);
|
||||
resolution_list.set_model(*ItemListModel<Gfx::Size>::create(m_resolutions));
|
||||
/// Wallpaper Preview /////////////////////////////////////////////////////////////////////////
|
||||
|
||||
auto resolution_model = resolution_list.model();
|
||||
auto find_first_resolution_index = m_resolutions.find_first_index(m_selected_resolution);
|
||||
ASSERT(find_first_resolution_index.has_value());
|
||||
auto resolution_index_in_model = resolution_model->index(find_first_resolution_index.value(), resolution_list.model_column());
|
||||
if (resolution_model->is_valid(resolution_index_in_model))
|
||||
resolution_list.selection().set(resolution_index_in_model);
|
||||
m_monitor_widget = settings_content.add<MonitorWidget>();
|
||||
m_monitor_widget->set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed);
|
||||
m_monitor_widget->set_preferred_size(338, 248);
|
||||
|
||||
resolution_list.horizontal_scrollbar().set_visible(false);
|
||||
resolution_list.on_selection = [this](auto& index) {
|
||||
m_selected_resolution = m_resolutions.at(index.row());
|
||||
/// Wallpaper Row /////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
auto& m_wallpaper_selection_container = settings_content.add<GUI::Widget>();
|
||||
m_wallpaper_selection_container.set_layout<GUI::HorizontalBoxLayout>();
|
||||
m_wallpaper_selection_container.layout()->set_margins({ 0, 4, 0, 0 });
|
||||
m_wallpaper_selection_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
m_wallpaper_selection_container.set_preferred_size(0, 22);
|
||||
|
||||
auto& m_wallpaper_label = m_wallpaper_selection_container.add<GUI::Label>();
|
||||
m_wallpaper_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
m_wallpaper_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
|
||||
m_wallpaper_label.set_preferred_size({ 70, 0 });
|
||||
m_wallpaper_label.set_text("Wallpaper:");
|
||||
|
||||
m_wallpaper_combo = m_wallpaper_selection_container.add<GUI::ComboBox>();
|
||||
m_wallpaper_combo->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
m_wallpaper_combo->set_preferred_size(0, 22);
|
||||
m_wallpaper_combo->set_only_allow_values_from_model(true);
|
||||
m_wallpaper_combo->set_model(*ItemListModel<AK::String>::create(m_wallpapers));
|
||||
m_wallpaper_combo->on_change = [this](auto& text, const GUI::ModelIndex& index) {
|
||||
String path = text;
|
||||
if (index.is_valid()) {
|
||||
|
||||
StringBuilder builder;
|
||||
builder.append("/res/wallpapers/");
|
||||
builder.append(path);
|
||||
path = builder.to_string();
|
||||
}
|
||||
|
||||
#ifdef DEBUG_MODE
|
||||
dbg() << "New wallpaper path:" << path;
|
||||
#endif
|
||||
|
||||
this->m_monitor_widget->set_wallpaper(path);
|
||||
this->m_monitor_widget->update();
|
||||
};
|
||||
|
||||
settings_content.layout()->add_spacer();
|
||||
auto& button = m_wallpaper_selection_container.add<GUI::Button>();
|
||||
button.set_tooltip("Select Wallpaper from file system.");
|
||||
button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/open.png"));
|
||||
button.set_button_style(Gfx::ButtonStyle::CoolBar);
|
||||
button.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fixed);
|
||||
button.set_preferred_size(22, 22);
|
||||
button.on_click = [this]() {
|
||||
Optional<String> open_path = GUI::FilePicker::get_open_filepath("Select wallpaper from file system");
|
||||
|
||||
// Add the apply and cancel buttons
|
||||
auto& bottom_widget = m_root_widget->add<GUI::Widget>();
|
||||
if (!open_path.has_value())
|
||||
return;
|
||||
|
||||
#ifdef DEBUG_MODE
|
||||
dbg() << "Selected file : " << open_path.value();
|
||||
#endif
|
||||
|
||||
m_wallpaper_combo->set_only_allow_values_from_model(false);
|
||||
this->m_wallpaper_combo->set_text(open_path.value());
|
||||
m_wallpaper_combo->set_only_allow_values_from_model(true);
|
||||
};
|
||||
|
||||
/// Mode //////////////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
auto& m_mode_selection_container = settings_content.add<GUI::Widget>();
|
||||
m_mode_selection_container.set_layout<GUI::HorizontalBoxLayout>();
|
||||
m_mode_selection_container.layout()->set_margins({ 0, 4, 0, 0 });
|
||||
m_mode_selection_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
m_mode_selection_container.set_preferred_size(0, 22);
|
||||
|
||||
auto& m_mode_label = m_mode_selection_container.add<GUI::Label>();
|
||||
m_mode_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
m_mode_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
|
||||
m_mode_label.set_preferred_size({ 70, 0 });
|
||||
m_mode_label.set_text("Mode:");
|
||||
|
||||
m_mode_combo = m_mode_selection_container.add<GUI::ComboBox>();
|
||||
m_mode_combo->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
m_mode_combo->set_preferred_size(0, 22);
|
||||
m_mode_combo->set_only_allow_values_from_model(true);
|
||||
m_mode_combo->set_model(*ItemListModel<AK::String>::create(m_modes));
|
||||
m_mode_combo->on_change = [this](auto&, const GUI::ModelIndex& index) {
|
||||
this->m_monitor_widget->set_wallpaper_mode(m_modes.at(index.row()));
|
||||
this->m_monitor_widget->update();
|
||||
};
|
||||
|
||||
/// Resulation Row ////////////////////////////////////////////////////////////////////////////
|
||||
|
||||
auto& m_resolution_selection_container = settings_content.add<GUI::Widget>();
|
||||
m_resolution_selection_container.set_layout<GUI::HorizontalBoxLayout>();
|
||||
m_resolution_selection_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
m_resolution_selection_container.set_preferred_size(0, 22);
|
||||
|
||||
auto& m_resolution_label = m_resolution_selection_container.add<GUI::Label>();
|
||||
m_resolution_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
m_resolution_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
|
||||
m_resolution_label.set_preferred_size({ 70, 0 });
|
||||
m_resolution_label.set_text("Resolution:");
|
||||
|
||||
m_resolution_combo = m_resolution_selection_container.add<GUI::ComboBox>();
|
||||
m_resolution_combo->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
m_resolution_combo->set_preferred_size(0, 22);
|
||||
m_resolution_combo->set_only_allow_values_from_model(true);
|
||||
m_resolution_combo->set_model(*ItemListModel<Gfx::Size>::create(m_resolutions));
|
||||
m_resolution_combo->on_change = [this](auto&, const GUI::ModelIndex& index) {
|
||||
this->m_monitor_widget->set_desktop_resolution(m_resolutions.at(index.row()));
|
||||
this->m_monitor_widget->update();
|
||||
};
|
||||
|
||||
/// Background Color Row //////////////////////////////////////////////////////////////////////
|
||||
|
||||
auto& m_color_selection_container = settings_content.add<GUI::Widget>();
|
||||
m_color_selection_container.set_layout<GUI::HorizontalBoxLayout>();
|
||||
m_color_selection_container.set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fixed);
|
||||
m_color_selection_container.set_preferred_size(0, 22);
|
||||
|
||||
auto& m_color_label = m_color_selection_container.add<GUI::Label>();
|
||||
m_color_label.set_text_alignment(Gfx::TextAlignment::CenterLeft);
|
||||
m_color_label.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
|
||||
m_color_label.set_preferred_size({ 70, 0 });
|
||||
m_color_label.set_text("Color Name:");
|
||||
|
||||
m_color_textbox = m_color_selection_container.add<GUI::TextBox>();
|
||||
m_color_textbox->set_size_policy(GUI::SizePolicy::Fill, GUI::SizePolicy::Fill);
|
||||
m_color_textbox->set_preferred_size({ 0, 0 });
|
||||
m_color_textbox->on_change = [this] {
|
||||
auto optional = Color::from_string(this->m_color_textbox->text());
|
||||
if (!optional.has_value())
|
||||
return;
|
||||
|
||||
this->m_monitor_widget->set_background_color(optional.value());
|
||||
this->m_monitor_widget->update();
|
||||
};
|
||||
|
||||
auto& color_button = m_color_selection_container.add<GUI::Button>();
|
||||
color_button.set_size_policy(GUI::SizePolicy::Fixed, GUI::SizePolicy::Fill);
|
||||
color_button.set_preferred_size(22, 0);
|
||||
color_button.set_icon(Gfx::Bitmap::load_from_file("/res/icons/16x16/color-chooser.png"));
|
||||
color_button.set_tooltip("Color Chooser");
|
||||
color_button.on_click = [this]() {
|
||||
auto optional = Color::from_string(this->m_color_textbox->text());
|
||||
|
||||
Color default_color = this->palette().desktop_background();
|
||||
if (optional.has_value())
|
||||
default_color = optional.value();
|
||||
|
||||
auto dialog = GUI::ColorPicker::construct(default_color, window());
|
||||
if (dialog->exec() == GUI::Dialog::ExecOK) {
|
||||
auto tmp = dialog->color();
|
||||
m_color_textbox->set_text(tmp.to_string());
|
||||
}
|
||||
};
|
||||
|
||||
/// Add the apply and cancel buttons //////////////////////////////////////////////////////////
|
||||
|
||||
auto& bottom_widget = settings_content.add<GUI::Widget>();
|
||||
bottom_widget.set_layout<GUI::HorizontalBoxLayout>();
|
||||
bottom_widget.layout()->add_spacer();
|
||||
//bottom_widget.layout()->set_margins({ 4, 10, 4, 10 });
|
||||
bottom_widget.set_size_policy(Orientation::Vertical, GUI::SizePolicy::Fixed);
|
||||
bottom_widget.set_preferred_size(1, 22);
|
||||
|
||||
auto& apply_button = bottom_widget.add<GUI::Button>();
|
||||
apply_button.set_text("Apply");
|
||||
apply_button.set_size_policy(Orientation::Vertical, GUI::SizePolicy::Fixed);
|
||||
apply_button.set_size_policy(Orientation::Horizontal, GUI::SizePolicy::Fixed);
|
||||
apply_button.set_preferred_size(60, 22);
|
||||
apply_button.on_click = [this, tab_widget = &tab_widget] {
|
||||
send_settings_to_window_server(tab_widget->active_tab_index());
|
||||
apply_button.on_click = [this] {
|
||||
send_settings_to_window_server();
|
||||
};
|
||||
|
||||
auto& ok_button = bottom_widget.add<GUI::Button>();
|
||||
ok_button.set_text("OK");
|
||||
ok_button.set_size_policy(Orientation::Vertical, GUI::SizePolicy::Fixed);
|
||||
ok_button.set_size_policy(Orientation::Horizontal, GUI::SizePolicy::Fixed);
|
||||
ok_button.set_preferred_size(60, 22);
|
||||
ok_button.on_click = [this, tab_widget = &tab_widget] {
|
||||
send_settings_to_window_server(tab_widget->active_tab_index());
|
||||
ok_button.on_click = [this] {
|
||||
send_settings_to_window_server();
|
||||
GUI::Application::the().quit();
|
||||
};
|
||||
|
||||
auto& cancel_button = bottom_widget.add<GUI::Button>();
|
||||
cancel_button.set_text("Cancel");
|
||||
cancel_button.set_size_policy(Orientation::Vertical, GUI::SizePolicy::Fixed);
|
||||
cancel_button.set_size_policy(Orientation::Horizontal, GUI::SizePolicy::Fixed);
|
||||
cancel_button.set_preferred_size(60, 22);
|
||||
cancel_button.on_click = [] {
|
||||
|
|
@ -217,19 +292,93 @@ void DisplayPropertiesWidget::create_frame()
|
|||
};
|
||||
}
|
||||
|
||||
void DisplayPropertiesWidget::send_settings_to_window_server(int tab_index)
|
||||
void DisplayPropertiesWidget::load_current_settings()
|
||||
{
|
||||
if (tab_index == TabIndices::Wallpaper) {
|
||||
StringBuilder builder;
|
||||
builder.append("/res/wallpapers/");
|
||||
builder.append(m_selected_wallpaper);
|
||||
GUI::Desktop::the().set_wallpaper(builder.to_string());
|
||||
} else if (tab_index == TabIndices::Settings) {
|
||||
dbg() << "Attempting to set resolution " << m_selected_resolution;
|
||||
auto result = GUI::WindowServerConnection::the().send_sync<Messages::WindowServer::SetResolution>(m_selected_resolution);
|
||||
if (!result->success())
|
||||
GUI::MessageBox::show(String::format("Reverting to resolution %dx%d", result->resolution().width(), result->resolution().height()), String::format("Unable to set resolution"), GUI::MessageBox::Type::Error, GUI::MessageBox::InputType::OK);
|
||||
auto m_ws_config(Core::ConfigFile::open("/etc/WindowServer/WindowServer.ini"));
|
||||
auto wm_config = Core::ConfigFile::get_for_app("WindowManager");
|
||||
|
||||
/// Wallpaper path ////////////////////////////////////////////////////////////////////////////
|
||||
/// Read wallpaper path from config file and set value to monitor widget and combo box.
|
||||
auto m_selected_wallpaper = wm_config->read_entry("Background", "Wallpaper", "");
|
||||
if (!m_selected_wallpaper.is_empty()) {
|
||||
m_monitor_widget->set_wallpaper(m_selected_wallpaper);
|
||||
|
||||
Optional<size_t> optional_index;
|
||||
if (m_selected_wallpaper.starts_with("/res/wallpapers/")) {
|
||||
auto name_parts = m_selected_wallpaper.split('/');
|
||||
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(m_selected_wallpaper);
|
||||
m_wallpaper_combo->set_only_allow_values_from_model(true);
|
||||
}
|
||||
}
|
||||
|
||||
/// Mode //////////////////////////////////////////////////////////////////////////////////////
|
||||
auto mode = m_ws_config->read_entry("Background", "Mode");
|
||||
if (!mode.is_empty()) {
|
||||
this->m_monitor_widget->set_wallpaper_mode(mode);
|
||||
auto index = m_modes.find_first_index(mode).value();
|
||||
m_mode_combo->set_selected_index(index);
|
||||
}
|
||||
|
||||
/// Resolution ////////////////////////////////////////////////////////////////////////////////
|
||||
Gfx::Size find_size;
|
||||
|
||||
bool okay = false;
|
||||
// Let's attempt to find the current resolution and select it!
|
||||
find_size.set_width(m_ws_config->read_entry("Screen", "Width", "1024").to_int(okay));
|
||||
if (!okay) {
|
||||
fprintf(stderr, "DisplayProperties: failed to convert width to int!");
|
||||
ASSERT_NOT_REACHED();
|
||||
}
|
||||
|
||||
find_size.set_height(m_ws_config->read_entry("Screen", "Height", "768").to_int(okay));
|
||||
if (!okay) {
|
||||
fprintf(stderr, "DisplayProperties: failed to convert height to int!");
|
||||
ASSERT_NOT_REACHED();
|
||||
}
|
||||
|
||||
size_t index = m_resolutions.find_first_index(find_size).value_or(0);
|
||||
Gfx::Size 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 palet color.
|
||||
auto background_color = m_ws_config->read_entry("Background", "Color", "");
|
||||
if (!background_color.is_empty()) {
|
||||
m_color_textbox->set_text(background_color);
|
||||
m_monitor_widget->set_background_color(Color::from_string(background_color).value());
|
||||
} else {
|
||||
dbg() << "Invalid tab index " << tab_index;
|
||||
Color palette_desktop_color = this->palette().desktop_background();
|
||||
m_monitor_widget->set_background_color(palette_desktop_color);
|
||||
}
|
||||
|
||||
m_monitor_widget->update();
|
||||
}
|
||||
|
||||
void DisplayPropertiesWidget::send_settings_to_window_server()
|
||||
{
|
||||
auto result = GUI::WindowServerConnection::the().send_sync<Messages::WindowServer::SetResolution>(m_monitor_widget->desktop_resolution());
|
||||
if (!result->success()) {
|
||||
GUI::MessageBox::show(String::format("Reverting to resolution %dx%d", result->resolution().width(), result->resolution().height()),
|
||||
String::format("Unable to set resolution"), GUI::MessageBox::Type::Error, GUI::MessageBox::InputType::OK);
|
||||
}
|
||||
|
||||
if (!m_monitor_widget->wallpaper().is_empty()) {
|
||||
GUI::Desktop::the().set_wallpaper(m_monitor_widget->wallpaper());
|
||||
}
|
||||
|
||||
GUI::Desktop::the().set_wallpaper_mode(m_monitor_widget->wallpaper_mode());
|
||||
|
||||
if (!m_color_textbox->text().is_empty()) {
|
||||
GUI::Desktop::the().set_background_color(m_color_textbox->text());
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue