mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 15:57:34 +00:00
DisplaySettings: Rename DisplaySettingsWidget => MonitorSettingsWidget
This commit is contained in:
Andreas Kling
parent
540acc1a32
commit
c79e33d00c
5 changed files with 23 additions and 20 deletions
147
Userland/Applications/DisplaySettings/MonitorSettingsWidget.cpp
Normal file
147
Userland/Applications/DisplaySettings/MonitorSettingsWidget.cpp
Normal file
|
|
@ -0,0 +1,147 @@
|
|||
/*
|
||||
* Copyright (c) 2019-2020, Jesse Buhagiar <jooster669@gmail.com>
|
||||
* Copyright (c) 2020-2021, Andreas Kling <kling@serenityos.org>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include "MonitorSettingsWidget.h"
|
||||
#include <Applications/DisplaySettings/DisplaySettingsWindowGML.h>
|
||||
#include <LibCore/ConfigFile.h>
|
||||
#include <LibGUI/BoxLayout.h>
|
||||
#include <LibGUI/Button.h>
|
||||
#include <LibGUI/ComboBox.h>
|
||||
#include <LibGUI/Desktop.h>
|
||||
#include <LibGUI/ItemListModel.h>
|
||||
#include <LibGUI/MessageBox.h>
|
||||
#include <LibGUI/RadioButton.h>
|
||||
#include <LibGUI/WindowServerConnection.h>
|
||||
#include <LibGfx/SystemTheme.h>
|
||||
|
||||
namespace DisplaySettings {
|
||||
|
||||
MonitorSettingsWidget::MonitorSettingsWidget()
|
||||
{
|
||||
create_resolution_list();
|
||||
create_frame();
|
||||
load_current_settings();
|
||||
}
|
||||
|
||||
void MonitorSettingsWidget::create_resolution_list()
|
||||
{
|
||||
// TODO: Find a better way to get the default resolution
|
||||
m_resolutions.append({ 640, 480 });
|
||||
m_resolutions.append({ 800, 600 });
|
||||
m_resolutions.append({ 1024, 768 });
|
||||
m_resolutions.append({ 1280, 720 });
|
||||
m_resolutions.append({ 1280, 768 });
|
||||
m_resolutions.append({ 1280, 960 });
|
||||
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({ 1600, 1200 });
|
||||
m_resolutions.append({ 1920, 1080 });
|
||||
m_resolutions.append({ 2048, 1152 });
|
||||
m_resolutions.append({ 2560, 1080 });
|
||||
m_resolutions.append({ 2560, 1440 });
|
||||
}
|
||||
|
||||
void MonitorSettingsWidget::create_frame()
|
||||
{
|
||||
load_from_gml(display_settings_window_gml);
|
||||
|
||||
m_monitor_widget = *find_descendant_of_type_named<DisplaySettings::MonitorWidget>("monitor_widget");
|
||||
|
||||
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));
|
||||
m_resolution_combo->on_change = [this](auto&, const GUI::ModelIndex& index) {
|
||||
m_monitor_widget->set_desktop_resolution(m_resolutions.at(index.row()));
|
||||
m_monitor_widget->update();
|
||||
};
|
||||
|
||||
m_display_scale_radio_1x = *find_descendant_of_type_named<GUI::RadioButton>("scale_1x");
|
||||
m_display_scale_radio_1x->on_checked = [this](bool checked) {
|
||||
if (checked) {
|
||||
m_monitor_widget->set_desktop_scale_factor(1);
|
||||
m_monitor_widget->update();
|
||||
}
|
||||
};
|
||||
m_display_scale_radio_2x = *find_descendant_of_type_named<GUI::RadioButton>("scale_2x");
|
||||
m_display_scale_radio_2x->on_checked = [this](bool checked) {
|
||||
if (checked) {
|
||||
m_monitor_widget->set_desktop_scale_factor(2);
|
||||
m_monitor_widget->update();
|
||||
}
|
||||
};
|
||||
}
|
||||
|
||||
void MonitorSettingsWidget::load_current_settings()
|
||||
{
|
||||
auto ws_config = Core::ConfigFile::open("/etc/WindowServer.ini");
|
||||
|
||||
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);
|
||||
scale_factor = 1;
|
||||
}
|
||||
(scale_factor == 1 ? m_display_scale_radio_1x : m_display_scale_radio_2x)->set_checked(true);
|
||||
m_monitor_widget->set_desktop_scale_factor(scale_factor);
|
||||
|
||||
// Let's attempt to find the current resolution and select it!
|
||||
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));
|
||||
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);
|
||||
|
||||
m_monitor_widget->update();
|
||||
}
|
||||
|
||||
void MonitorSettingsWidget::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"));
|
||||
Gfx::IntSize current_resolution;
|
||||
current_resolution.set_width(ws_config->read_num_entry("Screen", "Width", 1024));
|
||||
current_resolution.set_height(ws_config->read_num_entry("Screen", "Height", 768));
|
||||
int current_scale_factor = ws_config->read_num_entry("Screen", "ScaleFactor", 1);
|
||||
if (current_scale_factor != 1 && current_scale_factor != 2) {
|
||||
dbgln("unexpected ScaleFactor {}, setting to 1", current_scale_factor);
|
||||
current_scale_factor = 1;
|
||||
}
|
||||
|
||||
if (current_resolution != m_monitor_widget->desktop_resolution() || current_scale_factor != m_monitor_widget->desktop_scale_factor()) {
|
||||
auto result = GUI::WindowServerConnection::the().set_resolution(m_monitor_widget->desktop_resolution(), m_monitor_widget->desktop_scale_factor());
|
||||
if (!result.success()) {
|
||||
GUI::MessageBox::show(nullptr, String::formatted("Reverting to resolution {}x{} @ {}x", result.resolution().width(), result.resolution().height(), result.scale_factor()),
|
||||
"Unable to set resolution", GUI::MessageBox::Type::Error);
|
||||
} else {
|
||||
auto box = GUI::MessageBox::construct(window(), String::formatted("Do you want to keep the new settings? They will be reverted after 10 seconds."),
|
||||
String::formatted("New screen resolution: {}x{} @ {}x", m_monitor_widget->desktop_resolution().width(), m_monitor_widget->desktop_resolution().height(),
|
||||
m_monitor_widget->desktop_scale_factor()),
|
||||
GUI::MessageBox::Type::Question, GUI::MessageBox::InputType::YesNo);
|
||||
box->set_icon(window()->icon());
|
||||
|
||||
// If after 10 seconds the user doesn't close the message box, just close it.
|
||||
auto timer = Core::Timer::construct(10000, [&] {
|
||||
box->close();
|
||||
});
|
||||
|
||||
// If the user selects "No", closes the window or the window gets closed by the 10 seconds timer, revert the changes.
|
||||
if (box->exec() != GUI::MessageBox::ExecYes) {
|
||||
result = GUI::WindowServerConnection::the().set_resolution(current_resolution, current_scale_factor);
|
||||
if (!result.success()) {
|
||||
GUI::MessageBox::show(nullptr, String::formatted("Reverting to resolution {}x{} @ {}x", result.resolution().width(), result.resolution().height(), result.scale_factor()),
|
||||
"Unable to set resolution", GUI::MessageBox::Type::Error);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue