From fbf8c5fb61b73e9db6d6c423858b2c60cfee0739 Mon Sep 17 00:00:00 2001 From: Stefan Hansson Date: Tue, 19 Aug 2025 16:01:12 +0200 Subject: [PATCH 1/2] conf-tweaks: Rename from pmos-tweaks The name is being changed for two reasons: - While this scheme originated in postmarketOS, it is not strictly related or dependent on postmarketOS. - The name postmarketOS is due to be changed soon, but actually changing it will take a while. Waiting for a new name before landing this doesn't make much sense. Signed-off-by: Stefan Hansson Part-of: --- src/{pmos-tweaks => conf-tweaks}/README.md | 6 +++--- src/{pmos-tweaks => conf-tweaks}/meson.build | 2 +- .../ms-tweaks-backend-interface.c | 0 .../ms-tweaks-backend-interface.h | 0 .../ms-tweaks-callback-handlers.c | 0 .../ms-tweaks-callback-handlers.h | 0 src/{pmos-tweaks => conf-tweaks}/ms-tweaks-gtk-utils.c | 0 src/{pmos-tweaks => conf-tweaks}/ms-tweaks-gtk-utils.h | 0 src/{pmos-tweaks => conf-tweaks}/ms-tweaks-mappings.c | 0 src/{pmos-tweaks => conf-tweaks}/ms-tweaks-mappings.h | 0 src/{pmos-tweaks => conf-tweaks}/ms-tweaks-page-builder.c | 0 src/{pmos-tweaks => conf-tweaks}/ms-tweaks-page-builder.h | 0 src/{pmos-tweaks => conf-tweaks}/ms-tweaks-parser.c | 0 src/{pmos-tweaks => conf-tweaks}/ms-tweaks-parser.h | 0 src/{pmos-tweaks => conf-tweaks}/ms-tweaks-utils.c | 0 src/{pmos-tweaks => conf-tweaks}/ms-tweaks-utils.h | 0 src/meson.build | 4 ++-- src/mobile-settings-window.c | 6 +++--- tests/test-tweaks-gtk-utils.c | 2 +- tests/test-tweaks-mappings.c | 2 +- tests/test-tweaks-page-builder.c | 2 +- tests/test-tweaks-parser.c | 2 +- tests/test-tweaks-utils.c | 2 +- tests/utils/ms-tweaks-backend-dummy.h | 2 +- 24 files changed, 15 insertions(+), 15 deletions(-) rename src/{pmos-tweaks => conf-tweaks}/README.md (74%) rename src/{pmos-tweaks => conf-tweaks}/meson.build (93%) rename src/{pmos-tweaks => conf-tweaks}/ms-tweaks-backend-interface.c (100%) rename src/{pmos-tweaks => conf-tweaks}/ms-tweaks-backend-interface.h (100%) rename src/{pmos-tweaks => conf-tweaks}/ms-tweaks-callback-handlers.c (100%) rename src/{pmos-tweaks => conf-tweaks}/ms-tweaks-callback-handlers.h (100%) rename src/{pmos-tweaks => conf-tweaks}/ms-tweaks-gtk-utils.c (100%) rename src/{pmos-tweaks => conf-tweaks}/ms-tweaks-gtk-utils.h (100%) rename src/{pmos-tweaks => conf-tweaks}/ms-tweaks-mappings.c (100%) rename src/{pmos-tweaks => conf-tweaks}/ms-tweaks-mappings.h (100%) rename src/{pmos-tweaks => conf-tweaks}/ms-tweaks-page-builder.c (100%) rename src/{pmos-tweaks => conf-tweaks}/ms-tweaks-page-builder.h (100%) rename src/{pmos-tweaks => conf-tweaks}/ms-tweaks-parser.c (100%) rename src/{pmos-tweaks => conf-tweaks}/ms-tweaks-parser.h (100%) rename src/{pmos-tweaks => conf-tweaks}/ms-tweaks-utils.c (100%) rename src/{pmos-tweaks => conf-tweaks}/ms-tweaks-utils.h (100%) diff --git a/src/pmos-tweaks/README.md b/src/conf-tweaks/README.md similarity index 74% rename from src/pmos-tweaks/README.md rename to src/conf-tweaks/README.md index eaf2215d..cb18dae2 100644 --- a/src/pmos-tweaks/README.md +++ b/src/conf-tweaks/README.md @@ -1,9 +1,9 @@ -# Phosh Mobile Settings postmarketOS Tweaks support +# Configurable Tweaks support ## Introduction -This optional feature implements support for the YAML definition format -implemented by the now deprecated [postmarketOS Tweaks application][1]. +This feature implements support for the YAML definition format implemented by +the now deprecated [postmarketOS Tweaks application][1]. Since the original documentation is incomplete, this serves as an up-to-date reference that also includes notable changes from the original. While this diff --git a/src/pmos-tweaks/meson.build b/src/conf-tweaks/meson.build similarity index 93% rename from src/pmos-tweaks/meson.build rename to src/conf-tweaks/meson.build index 0c8638e1..ee8a3e2f 100644 --- a/src/pmos-tweaks/meson.build +++ b/src/conf-tweaks/meson.build @@ -1,4 +1,4 @@ -pmos_tweaks_sources = files( +conf_tweaks_sources = files( 'ms-tweaks-backend-interface.c', 'ms-tweaks-backend-interface.h', 'ms-tweaks-callback-handlers.c', diff --git a/src/pmos-tweaks/ms-tweaks-backend-interface.c b/src/conf-tweaks/ms-tweaks-backend-interface.c similarity index 100% rename from src/pmos-tweaks/ms-tweaks-backend-interface.c rename to src/conf-tweaks/ms-tweaks-backend-interface.c diff --git a/src/pmos-tweaks/ms-tweaks-backend-interface.h b/src/conf-tweaks/ms-tweaks-backend-interface.h similarity index 100% rename from src/pmos-tweaks/ms-tweaks-backend-interface.h rename to src/conf-tweaks/ms-tweaks-backend-interface.h diff --git a/src/pmos-tweaks/ms-tweaks-callback-handlers.c b/src/conf-tweaks/ms-tweaks-callback-handlers.c similarity index 100% rename from src/pmos-tweaks/ms-tweaks-callback-handlers.c rename to src/conf-tweaks/ms-tweaks-callback-handlers.c diff --git a/src/pmos-tweaks/ms-tweaks-callback-handlers.h b/src/conf-tweaks/ms-tweaks-callback-handlers.h similarity index 100% rename from src/pmos-tweaks/ms-tweaks-callback-handlers.h rename to src/conf-tweaks/ms-tweaks-callback-handlers.h diff --git a/src/pmos-tweaks/ms-tweaks-gtk-utils.c b/src/conf-tweaks/ms-tweaks-gtk-utils.c similarity index 100% rename from src/pmos-tweaks/ms-tweaks-gtk-utils.c rename to src/conf-tweaks/ms-tweaks-gtk-utils.c diff --git a/src/pmos-tweaks/ms-tweaks-gtk-utils.h b/src/conf-tweaks/ms-tweaks-gtk-utils.h similarity index 100% rename from src/pmos-tweaks/ms-tweaks-gtk-utils.h rename to src/conf-tweaks/ms-tweaks-gtk-utils.h diff --git a/src/pmos-tweaks/ms-tweaks-mappings.c b/src/conf-tweaks/ms-tweaks-mappings.c similarity index 100% rename from src/pmos-tweaks/ms-tweaks-mappings.c rename to src/conf-tweaks/ms-tweaks-mappings.c diff --git a/src/pmos-tweaks/ms-tweaks-mappings.h b/src/conf-tweaks/ms-tweaks-mappings.h similarity index 100% rename from src/pmos-tweaks/ms-tweaks-mappings.h rename to src/conf-tweaks/ms-tweaks-mappings.h diff --git a/src/pmos-tweaks/ms-tweaks-page-builder.c b/src/conf-tweaks/ms-tweaks-page-builder.c similarity index 100% rename from src/pmos-tweaks/ms-tweaks-page-builder.c rename to src/conf-tweaks/ms-tweaks-page-builder.c diff --git a/src/pmos-tweaks/ms-tweaks-page-builder.h b/src/conf-tweaks/ms-tweaks-page-builder.h similarity index 100% rename from src/pmos-tweaks/ms-tweaks-page-builder.h rename to src/conf-tweaks/ms-tweaks-page-builder.h diff --git a/src/pmos-tweaks/ms-tweaks-parser.c b/src/conf-tweaks/ms-tweaks-parser.c similarity index 100% rename from src/pmos-tweaks/ms-tweaks-parser.c rename to src/conf-tweaks/ms-tweaks-parser.c diff --git a/src/pmos-tweaks/ms-tweaks-parser.h b/src/conf-tweaks/ms-tweaks-parser.h similarity index 100% rename from src/pmos-tweaks/ms-tweaks-parser.h rename to src/conf-tweaks/ms-tweaks-parser.h diff --git a/src/pmos-tweaks/ms-tweaks-utils.c b/src/conf-tweaks/ms-tweaks-utils.c similarity index 100% rename from src/pmos-tweaks/ms-tweaks-utils.c rename to src/conf-tweaks/ms-tweaks-utils.c diff --git a/src/pmos-tweaks/ms-tweaks-utils.h b/src/conf-tweaks/ms-tweaks-utils.h similarity index 100% rename from src/pmos-tweaks/ms-tweaks-utils.h rename to src/conf-tweaks/ms-tweaks-utils.h diff --git a/src/meson.build b/src/meson.build index 100b9243..8b79d07e 100644 --- a/src/meson.build +++ b/src/meson.build @@ -1,5 +1,5 @@ subdir('dbus') -subdir('pmos-tweaks') +subdir('conf-tweaks') mobile_settings_enum_sources = gnome.mkenums_simple( 'ms-enum-types', @@ -131,7 +131,7 @@ mobile_settings_generated_sources = [ ms_lib = static_library( 'ms', mobile_settings_sources, - pmos_tweaks_sources, + conf_tweaks_sources, mobile_settings_generated_sources, dependencies: mobile_settings_deps, install: false, diff --git a/src/mobile-settings-window.c b/src/mobile-settings-window.c index dd1ba1e2..9c10c05b 100644 --- a/src/mobile-settings-window.c +++ b/src/mobile-settings-window.c @@ -17,9 +17,9 @@ #include "ms-feedback-panel.h" #include "ms-plugin-panel.h" -#include "pmos-tweaks/ms-tweaks-page-builder.h" -#include "pmos-tweaks/ms-tweaks-parser.h" -#include "pmos-tweaks/ms-tweaks-utils.h" +#include "conf-tweaks/ms-tweaks-page-builder.h" +#include "conf-tweaks/ms-tweaks-parser.h" +#include "conf-tweaks/ms-tweaks-utils.h" #include diff --git a/tests/test-tweaks-gtk-utils.c b/tests/test-tweaks-gtk-utils.c index f5d38e29..b91b1cbc 100644 --- a/tests/test-tweaks-gtk-utils.c +++ b/tests/test-tweaks-gtk-utils.c @@ -6,7 +6,7 @@ * Author: Stefan Hansson */ -#include "pmos-tweaks/ms-tweaks-gtk-utils.h" +#include "conf-tweaks/ms-tweaks-gtk-utils.h" static void diff --git a/tests/test-tweaks-mappings.c b/tests/test-tweaks-mappings.c index e271e293..152465ed 100644 --- a/tests/test-tweaks-mappings.c +++ b/tests/test-tweaks-mappings.c @@ -6,7 +6,7 @@ * Author: Stefan Hansson */ -#include "pmos-tweaks/ms-tweaks-mappings.h" +#include "conf-tweaks/ms-tweaks-mappings.h" typedef struct { diff --git a/tests/test-tweaks-page-builder.c b/tests/test-tweaks-page-builder.c index 37cc9955..6ff9d327 100644 --- a/tests/test-tweaks-page-builder.c +++ b/tests/test-tweaks-page-builder.c @@ -6,7 +6,7 @@ * Author: Stefan Hansson */ -#include "pmos-tweaks/ms-tweaks-page-builder.c" +#include "conf-tweaks/ms-tweaks-page-builder.c" #include "utils/ms-tweaks-backend-dummy.h" diff --git a/tests/test-tweaks-parser.c b/tests/test-tweaks-parser.c index f99b5d6a..9b45f1fc 100644 --- a/tests/test-tweaks-parser.c +++ b/tests/test-tweaks-parser.c @@ -6,7 +6,7 @@ * Author: Stefan Hansson */ -#include "pmos-tweaks/ms-tweaks-parser.h" +#include "conf-tweaks/ms-tweaks-parser.h" #define SETTING_COUNT 3 diff --git a/tests/test-tweaks-utils.c b/tests/test-tweaks-utils.c index 8d6983c2..eaa21d7e 100644 --- a/tests/test-tweaks-utils.c +++ b/tests/test-tweaks-utils.c @@ -8,7 +8,7 @@ #define G_LOG_DOMAIN "test-tweaks-utils" -#include "pmos-tweaks/ms-tweaks-utils.h" +#include "conf-tweaks/ms-tweaks-utils.h" #define TEST_WARNING_MESSAGE "scary warning: " diff --git a/tests/utils/ms-tweaks-backend-dummy.h b/tests/utils/ms-tweaks-backend-dummy.h index c119368a..9e573d0d 100644 --- a/tests/utils/ms-tweaks-backend-dummy.h +++ b/tests/utils/ms-tweaks-backend-dummy.h @@ -8,7 +8,7 @@ #pragma once -#include "pmos-tweaks/ms-tweaks-backend-interface.h" +#include "conf-tweaks/ms-tweaks-backend-interface.h" G_BEGIN_DECLS -- GitLab From 4093b74bbcdb778c4d64849a26d3c48c35aaae73 Mon Sep 17 00:00:00 2001 From: Stefan Hansson Date: Mon, 4 Aug 2025 21:49:44 +0200 Subject: [PATCH 2/2] conf-tweaks: Rename page-builder to preferences-page Now that this file contains a class called PreferencesPage, it makes more sense for it to be named after that. Signed-off-by: Stefan Hansson Part-of: --- src/conf-tweaks/meson.build | 4 +- src/conf-tweaks/ms-tweaks-callback-handlers.c | 2 +- src/conf-tweaks/ms-tweaks-callback-handlers.h | 6 +- ...builder.c => ms-tweaks-preferences-page.c} | 26 ++-- ...builder.h => ms-tweaks-preferences-page.h} | 0 src/mobile-settings-window.c | 2 +- tests/meson.build | 2 +- ...ilder.c => test-tweaks-preferences-page.c} | 122 +++++++++--------- 8 files changed, 82 insertions(+), 82 deletions(-) rename src/conf-tweaks/{ms-tweaks-page-builder.c => ms-tweaks-preferences-page.c} (96%) rename src/conf-tweaks/{ms-tweaks-page-builder.h => ms-tweaks-preferences-page.h} (100%) rename tests/{test-tweaks-page-builder.c => test-tweaks-preferences-page.c} (56%) diff --git a/src/conf-tweaks/meson.build b/src/conf-tweaks/meson.build index ee8a3e2f..027d02e2 100644 --- a/src/conf-tweaks/meson.build +++ b/src/conf-tweaks/meson.build @@ -7,10 +7,10 @@ conf_tweaks_sources = files( 'ms-tweaks-gtk-utils.h', 'ms-tweaks-mappings.c', 'ms-tweaks-mappings.h', - 'ms-tweaks-page-builder.c', - 'ms-tweaks-page-builder.h', 'ms-tweaks-parser.c', 'ms-tweaks-parser.h', + 'ms-tweaks-preferences-page.c', + 'ms-tweaks-preferences-page.h', 'ms-tweaks-utils.c', 'ms-tweaks-utils.h', ) diff --git a/src/conf-tweaks/ms-tweaks-callback-handlers.c b/src/conf-tweaks/ms-tweaks-callback-handlers.c index 5c861943..63b9b198 100644 --- a/src/conf-tweaks/ms-tweaks-callback-handlers.c +++ b/src/conf-tweaks/ms-tweaks-callback-handlers.c @@ -122,7 +122,7 @@ ms_tweaks_callback_handlers_type_color (GtkColorDialogButton *widget, void ms_tweaks_callback_handlers_type_file (GObject *source_object, GAsyncResult *result, gpointer data) { - MsTweaksPageBuilderOpenFilePickerMetadata *metadata = (MsTweaksPageBuilderOpenFilePickerMetadata *) data; + MsTweaksPreferencesPageFilePickerMeta *metadata = (MsTweaksPreferencesPageFilePickerMeta *) data; g_autoptr (GtkFileDialog) file_picker_dialog = NULL; const MsTweaksSetting *setting_data = NULL; GValue path_to_picked_file = G_VALUE_INIT; diff --git a/src/conf-tweaks/ms-tweaks-callback-handlers.h b/src/conf-tweaks/ms-tweaks-callback-handlers.h index 441508e0..a7236814 100644 --- a/src/conf-tweaks/ms-tweaks-callback-handlers.h +++ b/src/conf-tweaks/ms-tweaks-callback-handlers.h @@ -13,17 +13,17 @@ /** - * MsTweaksPageBuilderOpenFilePickerMetadata: + * MsTweaksPreferencesPageFilePickerMeta: * * Yes, the name is ridiculously long. Improvements welcome. * - * Used by file_widget_open_file_picker () in ms-tweaks-page-builder.c, but has to be here in a + * Used by file_widget_open_file_picker () in ms-tweaks-preferences-page.c, but has to be here in a * different header to avoid circular imports when also used in backends. */ typedef struct { MsTweaksBackend *backend_state; GtkWidget *file_picker_label; -} MsTweaksPageBuilderOpenFilePickerMetadata; +} MsTweaksPreferencesPageFilePickerMeta; void ms_tweaks_callback_handlers_type_boolean (AdwSwitchRow *switch_row, diff --git a/src/conf-tweaks/ms-tweaks-page-builder.c b/src/conf-tweaks/ms-tweaks-preferences-page.c similarity index 96% rename from src/conf-tweaks/ms-tweaks-page-builder.c rename to src/conf-tweaks/ms-tweaks-preferences-page.c index bf656a0c..e9474902 100644 --- a/src/conf-tweaks/ms-tweaks-page-builder.c +++ b/src/conf-tweaks/ms-tweaks-preferences-page.c @@ -6,9 +6,9 @@ * Author: Stefan Hansson */ -#define G_LOG_DOMAIN "ms-tweaks-page-builder" +#define G_LOG_DOMAIN "ms-tweaks-preferences-page" -#include "ms-tweaks-page-builder.h" +#include "ms-tweaks-preferences-page.h" #include "ms-tweaks-backend-interface.h" #include "ms-tweaks-callback-handlers.h" @@ -160,9 +160,9 @@ setting_data_to_color_widget (const MsTweaksSetting *setting_data, static void -file_widget_open_file_picker (GtkButton *widget, - GdkEvent *evnt, - MsTweaksPageBuilderOpenFilePickerMetadata *metadata) +file_widget_open_file_picker (GtkButton *widget, + GdkEvent *evnt, + MsTweaksPreferencesPageFilePickerMeta *metadata) { GtkFileDialog *file_picker_dialog = gtk_file_dialog_new (); @@ -178,9 +178,9 @@ static const char *restrict none_selected_label = "(None selected)"; static void -file_widget_unset (GtkButton *widget, - GdkEvent *evnt, - MsTweaksPageBuilderOpenFilePickerMetadata *metadata) +file_widget_unset (GtkButton *widget, + GdkEvent *evnt, + MsTweaksPreferencesPageFilePickerMeta *metadata) { MsTweaksBackendInterface *backend = MS_TWEAKS_BACKEND_GET_IFACE (metadata->backend_state); @@ -193,10 +193,10 @@ file_widget_unset (GtkButton *widget, static GtkWidget * -setting_data_to_file_widget (const MsTweaksSetting *setting_data, - MsTweaksBackend *backend_state, - const GValue *widget_value, - MsTweaksPageBuilderOpenFilePickerMetadata *metadata) +setting_data_to_file_widget (const MsTweaksSetting *setting_data, + MsTweaksBackend *backend_state, + const GValue *widget_value, + MsTweaksPreferencesPageFilePickerMeta *metadata) { GtkWidget *restrict reset_selection_button = gtk_button_new (); GtkWidget *restrict file_picker_row = adw_action_row_new (); @@ -403,7 +403,7 @@ ms_tweaks_preferences_page_initable_init (GInitable *initable, widget_to_add = setting_data_to_color_widget (setting_data, backend_state, widget_value); break; case MS_TWEAKS_TYPE_FILE: - MsTweaksPageBuilderOpenFilePickerMetadata *metadata = g_new (MsTweaksPageBuilderOpenFilePickerMetadata, 1); + MsTweaksPreferencesPageFilePickerMeta *metadata = g_new (MsTweaksPreferencesPageFilePickerMeta, 1); widget_to_add = setting_data_to_file_widget (setting_data, backend_state, widget_value, diff --git a/src/conf-tweaks/ms-tweaks-page-builder.h b/src/conf-tweaks/ms-tweaks-preferences-page.h similarity index 100% rename from src/conf-tweaks/ms-tweaks-page-builder.h rename to src/conf-tweaks/ms-tweaks-preferences-page.h diff --git a/src/mobile-settings-window.c b/src/mobile-settings-window.c index 9c10c05b..7e4d5b7b 100644 --- a/src/mobile-settings-window.c +++ b/src/mobile-settings-window.c @@ -17,8 +17,8 @@ #include "ms-feedback-panel.h" #include "ms-plugin-panel.h" -#include "conf-tweaks/ms-tweaks-page-builder.h" #include "conf-tweaks/ms-tweaks-parser.h" +#include "conf-tweaks/ms-tweaks-preferences-page.h" #include "conf-tweaks/ms-tweaks-utils.h" #include diff --git a/tests/meson.build b/tests/meson.build index 31eb4041..43c61124 100644 --- a/tests/meson.build +++ b/tests/meson.build @@ -35,8 +35,8 @@ if phoc.found() unit_tests = [ 'tweaks-gtk-utils', 'tweaks-mappings', - 'tweaks-page-builder', 'tweaks-parser', + 'tweaks-preferences-page', 'tweaks-utils', ] diff --git a/tests/test-tweaks-page-builder.c b/tests/test-tweaks-preferences-page.c similarity index 56% rename from tests/test-tweaks-page-builder.c rename to tests/test-tweaks-preferences-page.c index 6ff9d327..ae10718c 100644 --- a/tests/test-tweaks-page-builder.c +++ b/tests/test-tweaks-preferences-page.c @@ -6,7 +6,7 @@ * Author: Stefan Hansson */ -#include "conf-tweaks/ms-tweaks-page-builder.c" +#include "conf-tweaks/ms-tweaks-preferences-page.c" #include "utils/ms-tweaks-backend-dummy.h" @@ -15,14 +15,14 @@ typedef struct { MsTweaksSetting *setting; MsTweaksBackend *backend; GValue * value; -} PageBuilderTestFixture; +} PreferencesPageTestFixture; #define DEBUG_SETTING_NAME "Debug" static void -test_page_builder_fixture_setup (PageBuilderTestFixture *fixture, gconstpointer unused) +test_preferences_page_fixture_setup (PreferencesPageTestFixture *fixture, gconstpointer unused) { fixture->setting = g_new0 (MsTweaksSetting, 1); fixture->backend = ms_tweaks_backend_dummy_new (fixture->setting); @@ -40,9 +40,9 @@ test_page_builder_fixture_setup (PageBuilderTestFixture *fixture, gconstpointer static void -test_page_builder_fixture_setup_with_map (PageBuilderTestFixture *fixture, gconstpointer unused) +test_preferences_page_fixture_setup_with_map (PreferencesPageTestFixture *fixture, gconstpointer unused) { - test_page_builder_fixture_setup (fixture, unused); + test_preferences_page_fixture_setup (fixture, unused); fixture->setting->map = g_hash_table_new (g_str_hash, g_str_equal); @@ -53,7 +53,7 @@ test_page_builder_fixture_setup_with_map (PageBuilderTestFixture *fixture, gcons static void -test_page_builder_fixture_teardown (PageBuilderTestFixture *fixture, gconstpointer unused) +test_preferences_page_fixture_teardown (PreferencesPageTestFixture *fixture, gconstpointer unused) { if (fixture->setting->map) g_hash_table_destroy (fixture->setting->map); @@ -64,23 +64,23 @@ test_page_builder_fixture_teardown (PageBuilderTestFixture *fixture, gconstpoint } -#define PAGE_BUILDER_TEST_ADD(name, test_func) g_test_add ((name), \ - PageBuilderTestFixture, \ - NULL, \ - test_page_builder_fixture_setup, \ - (test_func), \ - test_page_builder_fixture_teardown) +#define PREFERENCES_PAGE_TEST_ADD(name, test_func) g_test_add ((name), \ + PreferencesPageTestFixture, \ + NULL, \ + test_preferences_page_fixture_setup, \ + (test_func), \ + test_preferences_page_fixture_teardown) -#define PAGE_BUILDER_TEST_ADD_WITH_MAP(name, test_func) g_test_add ((name), \ - PageBuilderTestFixture, \ - NULL, \ - test_page_builder_fixture_setup_with_map, \ - (test_func), \ - test_page_builder_fixture_teardown) +#define PREFERENCES_PAGE_TEST_ADD_WITH_MAP(name, test_func) g_test_add ((name), \ + PreferencesPageTestFixture, \ + NULL, \ + test_preferences_page_fixture_setup_with_map, \ + (test_func), \ + test_preferences_page_fixture_teardown) static void -test_setting_data_to_boolean_widget (PageBuilderTestFixture *fixture, gconstpointer unused) +test_setting_data_to_boolean_widget (PreferencesPageTestFixture *fixture, gconstpointer unused) { GtkWidget *widget = setting_data_to_boolean_widget (fixture->setting, fixture->backend, NULL); @@ -93,7 +93,7 @@ test_setting_data_to_boolean_widget (PageBuilderTestFixture *fixture, gconstpoin static void -test_setting_data_to_boolean_widget_with_value (PageBuilderTestFixture *fixture, gconstpointer unused) +test_setting_data_to_boolean_widget_with_value (PreferencesPageTestFixture *fixture, gconstpointer unused) { GValue *value = g_new0 (GValue, 1); GtkWidget *widget_1 = NULL; @@ -121,9 +121,9 @@ test_setting_data_to_boolean_widget_with_value (PageBuilderTestFixture *fixture, static void -test_setting_data_to_choice_widget (PageBuilderTestFixture *fixture, gconstpointer unused) +test_setting_data_to_choice_widget (PreferencesPageTestFixture *fixture, gconstpointer unused) { - g_test_expect_message ("ms-tweaks-page-builder", + g_test_expect_message ("ms-tweaks-preferences-page", G_LOG_LEVEL_WARNING, "[Setting \"" DEBUG_SETTING_NAME "\"] Choice widget with NULL map — either the datasource failed or the markup is wrong"); @@ -132,7 +132,7 @@ test_setting_data_to_choice_widget (PageBuilderTestFixture *fixture, gconstpoint static void -test_setting_data_to_choice_widget_with_map (PageBuilderTestFixture *fixture, gconstpointer unused) +test_setting_data_to_choice_widget_with_map (PreferencesPageTestFixture *fixture, gconstpointer unused) { GtkWidget *widget = NULL; @@ -146,7 +146,7 @@ test_setting_data_to_choice_widget_with_map (PageBuilderTestFixture *fixture, gc static void -test_setting_data_to_choice_widget_with_map_and_value (PageBuilderTestFixture *fixture, gconstpointer unused) +test_setting_data_to_choice_widget_with_map_and_value (PreferencesPageTestFixture *fixture, gconstpointer unused) { GtkStringObject *string_object = NULL; GtkWidget *widget_1 = NULL; @@ -174,9 +174,9 @@ test_setting_data_to_choice_widget_with_map_and_value (PageBuilderTestFixture *f static void -test_setting_data_to_file_widget (PageBuilderTestFixture *fixture, gconstpointer unused) +test_setting_data_to_file_widget (PreferencesPageTestFixture *fixture, gconstpointer unused) { - MsTweaksPageBuilderOpenFilePickerMetadata *metadata = g_new (MsTweaksPageBuilderOpenFilePickerMetadata, 1); + MsTweaksPreferencesPageFilePickerMeta *metadata = g_new (MsTweaksPreferencesPageFilePickerMeta, 1); GtkWidget *widget = setting_data_to_file_widget (fixture->setting, fixture->backend, NULL, @@ -193,9 +193,9 @@ test_setting_data_to_file_widget (PageBuilderTestFixture *fixture, gconstpointer static void -test_setting_data_to_file_widget_with_value (PageBuilderTestFixture *fixture, gconstpointer unused) +test_setting_data_to_file_widget_with_value (PreferencesPageTestFixture *fixture, gconstpointer unused) { - MsTweaksPageBuilderOpenFilePickerMetadata *metadata = g_new (MsTweaksPageBuilderOpenFilePickerMetadata, 1); + MsTweaksPreferencesPageFilePickerMeta *metadata = g_new (MsTweaksPreferencesPageFilePickerMeta, 1); GtkWidget *widget = setting_data_to_file_widget (fixture->setting, fixture->backend, fixture->value, @@ -212,7 +212,7 @@ test_setting_data_to_file_widget_with_value (PageBuilderTestFixture *fixture, gc static void -test_setting_data_to_font_widget (PageBuilderTestFixture *fixture, gconstpointer unused) +test_setting_data_to_font_widget (PreferencesPageTestFixture *fixture, gconstpointer unused) { GtkWidget *widget = setting_data_to_font_widget (fixture->setting, fixture->backend, NULL); @@ -224,7 +224,7 @@ test_setting_data_to_font_widget (PageBuilderTestFixture *fixture, gconstpointer static void -test_setting_data_to_font_widget_with_value (PageBuilderTestFixture *fixture, gconstpointer unused) +test_setting_data_to_font_widget_with_value (PreferencesPageTestFixture *fixture, gconstpointer unused) { GtkWidget *widget = setting_data_to_font_widget (fixture->setting, fixture->backend, @@ -238,9 +238,9 @@ test_setting_data_to_font_widget_with_value (PageBuilderTestFixture *fixture, gc static void -test_setting_data_to_info_widget (PageBuilderTestFixture *fixture, gconstpointer unused) +test_setting_data_to_info_widget (PreferencesPageTestFixture *fixture, gconstpointer unused) { - g_test_expect_message ("ms-tweaks-page-builder", + g_test_expect_message ("ms-tweaks-preferences-page", G_LOG_LEVEL_WARNING, "[Setting \"" DEBUG_SETTING_NAME "\"] widget_value was NULL in setting_data_to_boolean_widget ()"); @@ -249,7 +249,7 @@ test_setting_data_to_info_widget (PageBuilderTestFixture *fixture, gconstpointer static void -test_setting_data_to_info_widget_with_value (PageBuilderTestFixture *fixture, gconstpointer unused) +test_setting_data_to_info_widget_with_value (PreferencesPageTestFixture *fixture, gconstpointer unused) { GtkWidget *widget = setting_data_to_info_widget (fixture->setting, fixture->value); @@ -261,7 +261,7 @@ test_setting_data_to_info_widget_with_value (PageBuilderTestFixture *fixture, gc static void -test_setting_data_to_number_widget (PageBuilderTestFixture *fixture, gconstpointer unused) +test_setting_data_to_number_widget (PreferencesPageTestFixture *fixture, gconstpointer unused) { GtkWidget *widget = setting_data_to_number_widget (fixture->setting, fixture->backend, NULL); @@ -273,7 +273,7 @@ test_setting_data_to_number_widget (PageBuilderTestFixture *fixture, gconstpoint static void -test_setting_data_to_number_widget_with_value (PageBuilderTestFixture *fixture, gconstpointer unused) +test_setting_data_to_number_widget_with_value (PreferencesPageTestFixture *fixture, gconstpointer unused) { GValue value = G_VALUE_INIT; GtkWidget *widget = NULL; @@ -295,32 +295,32 @@ main (int argc, char *argv[]) { gtk_test_init (&argc, &argv, NULL); - PAGE_BUILDER_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-boolean-widget", - test_setting_data_to_boolean_widget); - PAGE_BUILDER_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-boolean-widget-with-value", - test_setting_data_to_boolean_widget_with_value); - PAGE_BUILDER_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-choice-widget", - test_setting_data_to_choice_widget); - PAGE_BUILDER_TEST_ADD_WITH_MAP ("/phosh-mobile-settings/test-tweaks-setting-data-to-choice-widget-with-map", - test_setting_data_to_choice_widget_with_map); - PAGE_BUILDER_TEST_ADD_WITH_MAP ("/phosh-mobile-settings/test-tweaks-setting-data-to-choice-widget-with-map-and-value", - test_setting_data_to_choice_widget_with_map_and_value); - PAGE_BUILDER_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-file-widget", - test_setting_data_to_file_widget); - PAGE_BUILDER_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-file-widget-with-value", - test_setting_data_to_file_widget_with_value); - PAGE_BUILDER_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-font-widget", - test_setting_data_to_font_widget); - PAGE_BUILDER_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-font-widget-with-value", - test_setting_data_to_font_widget_with_value); - PAGE_BUILDER_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-info-widget", - test_setting_data_to_info_widget); - PAGE_BUILDER_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-info-widget-with-value", - test_setting_data_to_info_widget_with_value); - PAGE_BUILDER_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-number-widget", - test_setting_data_to_number_widget); - PAGE_BUILDER_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-number-widget-with-value", - test_setting_data_to_number_widget_with_value); + PREFERENCES_PAGE_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-boolean-widget", + test_setting_data_to_boolean_widget); + PREFERENCES_PAGE_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-boolean-widget-with-value", + test_setting_data_to_boolean_widget_with_value); + PREFERENCES_PAGE_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-choice-widget", + test_setting_data_to_choice_widget); + PREFERENCES_PAGE_TEST_ADD_WITH_MAP ("/phosh-mobile-settings/test-tweaks-setting-data-to-choice-widget-with-map", + test_setting_data_to_choice_widget_with_map); + PREFERENCES_PAGE_TEST_ADD_WITH_MAP ("/phosh-mobile-settings/test-tweaks-setting-data-to-choice-widget-with-map-and-value", + test_setting_data_to_choice_widget_with_map_and_value); + PREFERENCES_PAGE_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-file-widget", + test_setting_data_to_file_widget); + PREFERENCES_PAGE_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-file-widget-with-value", + test_setting_data_to_file_widget_with_value); + PREFERENCES_PAGE_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-font-widget", + test_setting_data_to_font_widget); + PREFERENCES_PAGE_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-font-widget-with-value", + test_setting_data_to_font_widget_with_value); + PREFERENCES_PAGE_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-info-widget", + test_setting_data_to_info_widget); + PREFERENCES_PAGE_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-info-widget-with-value", + test_setting_data_to_info_widget_with_value); + PREFERENCES_PAGE_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-number-widget", + test_setting_data_to_number_widget); + PREFERENCES_PAGE_TEST_ADD ("/phosh-mobile-settings/test-tweaks-setting-data-to-number-widget-with-value", + test_setting_data_to_number_widget_with_value); return g_test_run (); } -- GitLab