1
Fork 0
mirror of https://github.com/RGBCube/serenity synced 2025-07-26 01:47:34 +00:00

BrowserSettings: Use new GML compiler

This commit is contained in:
kleines Filmröllchen 2023-05-26 13:12:24 +02:00 committed by Sam Atkins
parent 6f554af9c5
commit 182126dfda
11 changed files with 59 additions and 32 deletions

View file

@ -5,7 +5,6 @@
*/
#include "AutoplaySettingsWidget.h"
#include <Applications/BrowserSettings/AutoplaySettingsWidgetGML.h>
#include <Applications/BrowserSettings/Defaults.h>
#include <LibConfig/Client.h>
#include <LibCore/StandardPaths.h>
@ -28,13 +27,15 @@ void AutoplayAllowlistModel::reset_default_values()
did_update(UpdateFlag::InvalidateAllIndices);
}
namespace BrowserSettings {
ErrorOr<NonnullRefPtr<AutoplaySettingsWidget>> AutoplaySettingsWidget::create()
{
auto allowlist_model = TRY(try_make_ref_counted<AutoplayAllowlistModel>());
TRY(allowlist_model->load());
auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) AutoplaySettingsWidget(move(allowlist_model))));
TRY(widget->load_from_gml(autoplay_settings_widget_gml));
auto widget = TRY(AutoplaySettingsWidget::try_create());
widget->set_allowlist_model(move(allowlist_model));
widget->m_allow_autoplay_on_all_websites_checkbox = widget->find_descendant_of_type_named<GUI::CheckBox>("allow_autoplay_on_all_websites_checkbox");
widget->m_allow_autoplay_on_all_websites_checkbox->set_checked(Config::read_bool("Browser"sv, "Preferences"sv, "AllowAutoplayOnAllWebsites"sv, Browser::default_allow_autoplay_on_all_websites), GUI::AllowCallback::No);
@ -71,9 +72,9 @@ ErrorOr<NonnullRefPtr<AutoplaySettingsWidget>> AutoplaySettingsWidget::create()
return widget;
}
AutoplaySettingsWidget::AutoplaySettingsWidget(NonnullRefPtr<AutoplayAllowlistModel> allowlist_model)
: m_allowlist_model(move(allowlist_model))
void AutoplaySettingsWidget::set_allowlist_model(NonnullRefPtr<AutoplayAllowlistModel> model)
{
m_allowlist_model = model;
}
void AutoplaySettingsWidget::apply_settings()
@ -87,3 +88,5 @@ void AutoplaySettingsWidget::reset_default_values()
m_allowlist_model->reset_default_values();
m_allow_autoplay_on_all_websites_checkbox->set_checked(Browser::default_allow_autoplay_on_all_websites);
}
}

View file

@ -1,4 +1,4 @@
@GUI::Frame {
@BrowserSettings::AutoplaySettingsWidget {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
margins: [8]

View file

@ -12,6 +12,7 @@
#include <AK/RefPtr.h>
#include <AK/String.h>
#include <LibGUI/Forward.h>
#include <LibGUI/Menu.h>
#include <LibGUI/SettingsWindow.h>
class AutoplayAllowlistModel : public DomainListModel {
@ -20,6 +21,8 @@ public:
virtual void reset_default_values() override;
};
namespace BrowserSettings {
class AutoplaySettingsWidget : public GUI::SettingsWindow::Tab {
C_OBJECT_ABSTRACT(AutoplaySettingsWidget)
@ -30,11 +33,16 @@ public:
virtual void reset_default_values() override;
private:
explicit AutoplaySettingsWidget(NonnullRefPtr<AutoplayAllowlistModel>);
static ErrorOr<NonnullRefPtr<AutoplaySettingsWidget>> try_create();
AutoplaySettingsWidget() = default;
void set_allowlist_model(NonnullRefPtr<AutoplayAllowlistModel> model);
RefPtr<GUI::Menu> m_entry_context_menu;
RefPtr<GUI::CheckBox> m_allow_autoplay_on_all_websites_checkbox;
RefPtr<GUI::Button> m_add_website_button;
RefPtr<GUI::ListView> m_allowlist_view;
NonnullRefPtr<AutoplayAllowlistModel> m_allowlist_model;
RefPtr<AutoplayAllowlistModel> m_allowlist_model;
};
}

View file

@ -6,7 +6,6 @@
*/
#include "BrowserSettingsWidget.h"
#include <Applications/BrowserSettings/BrowserSettingsWidgetGML.h>
#include <Applications/BrowserSettings/Defaults.h>
#include <LibConfig/Client.h>
#include <LibGUI/Label.h>
@ -14,6 +13,8 @@
#include <LibGUI/Model.h>
#include <LibWebView/SearchEngine.h>
namespace BrowserSettings {
struct ColorScheme {
ByteString title;
ByteString setting_value;
@ -96,9 +97,8 @@ private:
ErrorOr<NonnullRefPtr<BrowserSettingsWidget>> BrowserSettingsWidget::create()
{
auto widget = TRY(try_make_ref_counted<BrowserSettingsWidget>());
auto widget = TRY(BrowserSettingsWidget::try_create());
TRY(widget->load_from_gml(browser_settings_widget_gml));
TRY(widget->setup());
return widget;
@ -251,3 +251,5 @@ void BrowserSettingsWidget::reset_default_values()
m_auto_close_download_windows_checkbox->set_checked(Browser::default_close_download_widget_on_finish);
set_search_engine_url(WebView::default_search_engine().query_url);
}
}

View file

@ -1,4 +1,4 @@
@GUI::Frame {
@BrowserSettings::BrowserSettingsWidget {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
margins: [8]

View file

@ -12,6 +12,8 @@
#include <LibGUI/SettingsWindow.h>
#include <LibGUI/TextBox.h>
namespace BrowserSettings {
class BrowserSettingsWidget final : public GUI::SettingsWindow::Tab {
C_OBJECT_ABSTRACT(BrowserSettingsWidget)
public:
@ -22,6 +24,8 @@ public:
virtual void reset_default_values() override;
private:
static ErrorOr<NonnullRefPtr<BrowserSettingsWidget>> try_create();
ErrorOr<void> setup();
RefPtr<GUI::TextBox> m_homepage_url_textbox;
@ -39,3 +43,5 @@ private:
RefPtr<GUI::Widget> m_custom_search_engine_group;
RefPtr<GUI::TextBox> m_custom_search_engine_textbox;
};
}

View file

@ -4,22 +4,19 @@ serenity_component(
TARGETS BrowserSettings
)
stringify_gml(AutoplaySettingsWidget.gml AutoplaySettingsWidgetGML.h autoplay_settings_widget_gml)
stringify_gml(BrowserSettingsWidget.gml BrowserSettingsWidgetGML.h browser_settings_widget_gml)
stringify_gml(ContentFilterSettingsWidget.gml ContentFilterSettingsWidgetGML.h content_filter_settings_widget_gml)
compile_gml(AutoplaySettingsWidget.gml AutoplaySettingsWidgetGML.cpp)
compile_gml(BrowserSettingsWidget.gml BrowserSettingsWidgetGML.cpp)
compile_gml(ContentFilterSettingsWidget.gml ContentFilterSettingsWidgetGML.cpp)
set(SOURCES
AutoplaySettingsWidget.cpp
BrowserSettingsWidget.cpp
ContentFilterSettingsWidget.cpp
AutoplaySettingsWidgetGML.cpp
BrowserSettingsWidgetGML.cpp
ContentFilterSettingsWidgetGML.cpp
main.cpp
)
set(GENERATED_SOURCES
AutoplaySettingsWidgetGML.h
BrowserSettingsWidgetGML.h
ContentFilterSettingsWidgetGML.h
)
serenity_app(BrowserSettings ICON app-browser)
target_link_libraries(BrowserSettings PRIVATE LibCore LibGfx LibGUI LibConfig LibMain LibWebView)

View file

@ -8,7 +8,6 @@
#include <AK/NonnullRefPtr.h>
#include <AK/String.h>
#include <Applications/BrowserSettings/ContentFilterSettingsWidgetGML.h>
#include <Applications/BrowserSettings/Defaults.h>
#include <LibConfig/Client.h>
#include <LibCore/StandardPaths.h>
@ -116,13 +115,15 @@ void DomainListModel::reset_default_values()
did_update(UpdateFlag::InvalidateAllIndices);
}
namespace BrowserSettings {
ErrorOr<NonnullRefPtr<ContentFilterSettingsWidget>> ContentFilterSettingsWidget::create()
{
auto domain_list_model = TRY(try_make_ref_counted<DomainListModel>());
TRY(domain_list_model->load());
auto widget = TRY(adopt_nonnull_ref_or_enomem(new (nothrow) ContentFilterSettingsWidget(move(domain_list_model))));
TRY(widget->load_from_gml(content_filter_settings_widget_gml));
auto widget = TRY(ContentFilterSettingsWidget::try_create());
widget->set_domain_list_model(move(domain_list_model));
widget->m_enable_content_filtering_checkbox = widget->find_descendant_of_type_named<GUI::CheckBox>("enable_content_filtering_checkbox");
widget->m_enable_content_filtering_checkbox->set_checked(Config::read_bool("Browser"sv, "Preferences"sv, "EnableContentFilters"sv, Browser::default_enable_content_filters), GUI::AllowCallback::No);
@ -159,9 +160,9 @@ ErrorOr<NonnullRefPtr<ContentFilterSettingsWidget>> ContentFilterSettingsWidget:
return widget;
}
ContentFilterSettingsWidget::ContentFilterSettingsWidget(NonnullRefPtr<DomainListModel> domain_list_model)
: m_domain_list_model(move(domain_list_model))
void ContentFilterSettingsWidget::set_domain_list_model(NonnullRefPtr<DomainListModel> domain_list_model)
{
m_domain_list_model = move(domain_list_model);
}
void ContentFilterSettingsWidget::apply_settings()
@ -175,3 +176,5 @@ void ContentFilterSettingsWidget::reset_default_values()
m_domain_list_model->reset_default_values();
m_enable_content_filtering_checkbox->set_checked(Browser::default_enable_content_filters);
}
}

View file

@ -1,4 +1,4 @@
@GUI::Frame {
@BrowserSettings::ContentFilterSettingsWidget {
fill_with_background_color: true
layout: @GUI::VerticalBoxLayout {
margins: [8]

View file

@ -9,6 +9,7 @@
#include <LibGUI/Button.h>
#include <LibGUI/CheckBox.h>
#include <LibGUI/ListView.h>
#include <LibGUI/Menu.h>
#include <LibGUI/SettingsWindow.h>
class DomainListModel : public GUI::Model {
@ -30,6 +31,8 @@ protected:
Vector<String> m_domain_list;
};
namespace BrowserSettings {
class ContentFilterSettingsWidget : public GUI::SettingsWindow::Tab {
C_OBJECT_ABSTRACT(ContentFilterSettingsWidget)
@ -40,11 +43,16 @@ public:
virtual void reset_default_values() override;
private:
explicit ContentFilterSettingsWidget(NonnullRefPtr<DomainListModel>);
static ErrorOr<NonnullRefPtr<ContentFilterSettingsWidget>> try_create();
ContentFilterSettingsWidget() = default;
void set_domain_list_model(NonnullRefPtr<DomainListModel>);
RefPtr<GUI::Menu> m_entry_context_menu;
RefPtr<GUI::CheckBox> m_enable_content_filtering_checkbox;
RefPtr<GUI::Button> m_add_new_domain_button;
RefPtr<GUI::ListView> m_domain_list_view;
NonnullRefPtr<DomainListModel> m_domain_list_model;
RefPtr<DomainListModel> m_domain_list_model;
};
}

View file

@ -37,9 +37,9 @@ ErrorOr<int> serenity_main(Main::Arguments arguments)
auto window = TRY(GUI::SettingsWindow::create("Browser Settings", GUI::SettingsWindow::ShowDefaultsButton::Yes));
window->set_icon(app_icon.bitmap_for_size(16));
(void)TRY(window->add_tab(TRY(BrowserSettingsWidget::create()), "Browser"_string, "browser"sv));
(void)TRY(window->add_tab(TRY(ContentFilterSettingsWidget::create()), "Content Filtering"_string, "content-filtering"sv));
(void)TRY(window->add_tab(TRY(AutoplaySettingsWidget::create()), "Autoplay"_string, "autoplay"sv));
(void)TRY(window->add_tab(TRY(BrowserSettings::BrowserSettingsWidget::create()), "Browser"_string, "browser"sv));
(void)TRY(window->add_tab(TRY(BrowserSettings::ContentFilterSettingsWidget::create()), "Content Filtering"_string, "content-filtering"sv));
(void)TRY(window->add_tab(TRY(BrowserSettings::AutoplaySettingsWidget::create()), "Autoplay"_string, "autoplay"sv));
window->set_active_tab(selected_tab);
window->show();