diff options
| author | Felix Morgner <felix.morgner@gmail.com> | 2024-08-19 09:16:39 +0200 |
|---|---|---|
| committer | Felix Morgner <felix.morgner@gmail.com> | 2024-08-19 09:16:39 +0200 |
| commit | 29af89fc6536de128a123566d2854350d00d150f (patch) | |
| tree | 71c9487cefde54faa6730854be6ed8a407e0451a /ui | |
| parent | e2dad5f30ca4d8502558e0560d2059a51aae4c4c (diff) | |
| download | turns-29af89fc6536de128a123566d2854350d00d150f.tar.xz turns-29af89fc6536de128a123566d2854350d00d150f.zip | |
app: pass down settings
Diffstat (limited to 'ui')
| -rw-r--r-- | ui/include/turns/ui/windows/tracker.hpp | 3 | ||||
| -rw-r--r-- | ui/src/windows/tracker.cpp | 6 | ||||
| -rw-r--r-- | ui/tests/windows/tracker.cpp | 3 |
3 files changed, 6 insertions, 6 deletions
diff --git a/ui/include/turns/ui/windows/tracker.hpp b/ui/include/turns/ui/windows/tracker.hpp index c6cbccb..8f44d08 100644 --- a/ui/include/turns/ui/windows/tracker.hpp +++ b/ui/include/turns/ui/windows/tracker.hpp @@ -3,7 +3,6 @@ #include "turns/adw/toastoverlay.hpp" #include "turns/core/turn_order.hpp" -#include "turns/ui/widgets/preferences.hpp" #include "turns/ui/widgets/turn_order_view.hpp" #include <glibmm/propertyproxy.h> @@ -34,7 +33,7 @@ namespace turns::ui::windows struct tracker : Gtk::ApplicationWindow { - tracker(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder); + tracker(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder, Glib::RefPtr<Gio::Settings> settings); auto load(Glib::RefPtr<Gio::File> file) -> void; diff --git a/ui/src/windows/tracker.cpp b/ui/src/windows/tracker.cpp index b38b9da..cd32bee 100644 --- a/ui/src/windows/tracker.cpp +++ b/ui/src/windows/tracker.cpp @@ -2,7 +2,6 @@ #include "turns/adw/toast.hpp" #include "turns/adw/toastoverlay.hpp" -#include "turns/core/settings.hpp" #include "turns/core/turn_order.hpp" #include "turns/lang/messages.hpp" #include "turns/ui/widgets/turn_order_view.hpp" @@ -42,11 +41,12 @@ #include <format> #include <print> #include <string> +#include <utility> namespace turns::ui::windows { - tracker::tracker(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder) + tracker::tracker(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder, Glib::RefPtr<Gio::Settings> settings) : Gtk::ApplicationWindow{base} , m_controls{builder->get_widget<Gtk::Revealer>("controls")} , m_empty{builder->get_widget<Gtk::Widget>("empty")} @@ -56,7 +56,7 @@ namespace turns::ui::windows , m_title{builder->get_widget<Gtk::Widget>("title")} , m_turn_order{core::turn_order::create()} , m_turn_order_view{Gtk::make_managed<widgets::turn_order_view>(m_turn_order)} - , m_settings{turns::core::get_settings()} + , m_settings{std::move(settings)} , m_subtitle{m_title, "subtitle"} , m_css{Gtk::CssProvider::create()} { diff --git a/ui/tests/windows/tracker.cpp b/ui/tests/windows/tracker.cpp index 236dad0..4af1dcd 100644 --- a/ui/tests/windows/tracker.cpp +++ b/ui/tests/windows/tracker.cpp @@ -1,5 +1,6 @@ #include "turns/ui/windows/tracker.hpp" +#include "turns/core/settings.hpp" #include "turns/lang/messages.hpp" #include <catch2/catch_test_macros.hpp> @@ -27,7 +28,7 @@ namespace turns::ui::windows::tests setlocale(LC_ALL, locale); auto builder = Gtk::Builder::create_from_resource("/windows/tracker.ui"); - auto instance = Gtk::Builder::get_widget_derived<tracker>(builder, "tracker"); + auto instance = Gtk::Builder::get_widget_derived<tracker>(builder, "tracker", core::get_settings()); SECTION("was successfully constructed") { |