mirror of
https://github.com/RGBCube/serenity
synced 2025-07-26 23:47:45 +00:00
DisplaySettings: Rename DisplaySettingsWidget => MonitorSettingsWidget
This commit is contained in:
parent
540acc1a32
commit
c79e33d00c
5 changed files with 23 additions and 20 deletions
|
@ -1,11 +1,11 @@
|
|||
compile_gml(DisplaySettingsWindow.gml DisplaySettingsWindowGML.h display_settings_window_gml)
|
||||
compile_gml(MonitorSettings.gml MonitorSettingsGML.h monitor_settings_window_gml)
|
||||
compile_gml(BackgroundSettings.gml BackgroundSettingsGML.h background_settings_gml)
|
||||
|
||||
set(SOURCES
|
||||
BackgroundSettingsGML.h
|
||||
BackgroundSettingsWidget.cpp
|
||||
DisplaySettings.cpp
|
||||
DisplaySettingsWindowGML.h
|
||||
MonitorSettingsWidget.cpp
|
||||
MonitorSettingsGML.h
|
||||
MonitorWidget.cpp
|
||||
main.cpp
|
||||
)
|
||||
|
|
|
@ -1,36 +1,33 @@
|
|||
/*
|
||||
* Copyright (c) 2019-2020, Jesse Buhagiar <jooster669@gmail.com>
|
||||
* Copyright (c) 2020, Andreas Kling <kling@serenityos.org>
|
||||
* Copyright (c) 2020-2021, Andreas Kling <kling@serenityos.org>
|
||||
*
|
||||
* SPDX-License-Identifier: BSD-2-Clause
|
||||
*/
|
||||
|
||||
#include "DisplaySettings.h"
|
||||
#include <AK/StringBuilder.h>
|
||||
#include "MonitorSettingsWidget.h"
|
||||
#include <Applications/DisplaySettings/DisplaySettingsWindowGML.h>
|
||||
#include <LibCore/ConfigFile.h>
|
||||
#include <LibCore/DirIterator.h>
|
||||
#include <LibGUI/Application.h>
|
||||
#include <LibGUI/BoxLayout.h>
|
||||
#include <LibGUI/Button.h>
|
||||
#include <LibGUI/ComboBox.h>
|
||||
#include <LibGUI/Desktop.h>
|
||||
#include <LibGUI/FilePicker.h>
|
||||
#include <LibGUI/ItemListModel.h>
|
||||
#include <LibGUI/MessageBox.h>
|
||||
#include <LibGUI/RadioButton.h>
|
||||
#include <LibGUI/WindowServerConnection.h>
|
||||
#include <LibGfx/Palette.h>
|
||||
#include <LibGfx/SystemTheme.h>
|
||||
|
||||
DisplaySettingsWidget::DisplaySettingsWidget()
|
||||
namespace DisplaySettings {
|
||||
|
||||
MonitorSettingsWidget::MonitorSettingsWidget()
|
||||
{
|
||||
create_resolution_list();
|
||||
create_frame();
|
||||
load_current_settings();
|
||||
}
|
||||
|
||||
void DisplaySettingsWidget::create_resolution_list()
|
||||
void MonitorSettingsWidget::create_resolution_list()
|
||||
{
|
||||
// TODO: Find a better way to get the default resolution
|
||||
m_resolutions.append({ 640, 480 });
|
||||
|
@ -51,7 +48,7 @@ void DisplaySettingsWidget::create_resolution_list()
|
|||
m_resolutions.append({ 2560, 1440 });
|
||||
}
|
||||
|
||||
void DisplaySettingsWidget::create_frame()
|
||||
void MonitorSettingsWidget::create_frame()
|
||||
{
|
||||
load_from_gml(display_settings_window_gml);
|
||||
|
||||
|
@ -81,7 +78,7 @@ void DisplaySettingsWidget::create_frame()
|
|||
};
|
||||
}
|
||||
|
||||
void DisplaySettingsWidget::load_current_settings()
|
||||
void MonitorSettingsWidget::load_current_settings()
|
||||
{
|
||||
auto ws_config = Core::ConfigFile::open("/etc/WindowServer.ini");
|
||||
|
||||
|
@ -105,7 +102,7 @@ void DisplaySettingsWidget::load_current_settings()
|
|||
m_monitor_widget->update();
|
||||
}
|
||||
|
||||
void DisplaySettingsWidget::apply_settings()
|
||||
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"));
|
||||
|
@ -146,3 +143,5 @@ void DisplaySettingsWidget::apply_settings()
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
|
@ -12,14 +12,16 @@
|
|||
#include <LibGUI/ComboBox.h>
|
||||
#include <LibGUI/RadioButton.h>
|
||||
|
||||
class DisplaySettingsWidget : public GUI::Widget {
|
||||
C_OBJECT(DisplaySettingsWidget);
|
||||
namespace DisplaySettings {
|
||||
|
||||
class MonitorSettingsWidget : public GUI::Widget {
|
||||
C_OBJECT(MonitorSettingsWidget);
|
||||
|
||||
public:
|
||||
void apply_settings();
|
||||
|
||||
private:
|
||||
DisplaySettingsWidget();
|
||||
MonitorSettingsWidget();
|
||||
|
||||
void create_frame();
|
||||
void create_resolution_list();
|
||||
|
@ -32,3 +34,5 @@ private:
|
|||
RefPtr<GUI::RadioButton> m_display_scale_radio_1x;
|
||||
RefPtr<GUI::RadioButton> m_display_scale_radio_2x;
|
||||
};
|
||||
|
||||
}
|
|
@ -6,7 +6,7 @@
|
|||
*/
|
||||
|
||||
#include "BackgroundSettingsWidget.h"
|
||||
#include "DisplaySettings.h"
|
||||
#include "MonitorSettingsWidget.h"
|
||||
#include <LibGUI/Action.h>
|
||||
#include <LibGUI/Application.h>
|
||||
#include <LibGUI/BoxLayout.h>
|
||||
|
@ -49,7 +49,7 @@ int main(int argc, char** argv)
|
|||
|
||||
auto& tab_widget = main_widget.add<GUI::TabWidget>();
|
||||
auto& background_settings_widget = tab_widget.add_tab<DisplaySettings::BackgroundSettingsWidget>("Background");
|
||||
auto& monitor_settings_widget = tab_widget.add_tab<DisplaySettingsWidget>("Monitor");
|
||||
auto& monitor_settings_widget = tab_widget.add_tab<DisplaySettings::MonitorSettingsWidget>("Monitor");
|
||||
|
||||
auto& button_container = main_widget.add<GUI::Widget>();
|
||||
button_container.set_shrink_to_fit(true);
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue