From c346c15f3b130ac8b4d5bca6355bac8d734a5e5e Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Wed, 30 Apr 2025 10:18:33 +0200 Subject: ui: add default constructor to Tracker --- ui/include/turns/ui/tracker.hpp | 5 ++++- ui/src/init.cpp | 2 +- ui/src/tracker.cpp | 9 ++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) (limited to 'ui') diff --git a/ui/include/turns/ui/tracker.hpp b/ui/include/turns/ui/tracker.hpp index 20f3800..58ed84a 100644 --- a/ui/include/turns/ui/tracker.hpp +++ b/ui/include/turns/ui/tracker.hpp @@ -51,7 +51,10 @@ namespace turns::ui auto load(Glib::RefPtr file) -> void; private: - /** Setup */ + friend auto register_types() -> void; + Tracker(); + + /** Setup */ auto setup_actions() -> void; auto setup_colors() -> void; diff --git a/ui/src/init.cpp b/ui/src/init.cpp index eeb808a..1c0295a 100644 --- a/ui/src/init.cpp +++ b/ui/src/init.cpp @@ -16,7 +16,7 @@ namespace turns::ui static_cast(ParticipantEditor{{}}); static_cast(ParticipantRow{{}}); static_cast(Preferences{{}}); - static_cast(Tracker{{}, {}}); + static_cast(Tracker{}); static_cast(TurnOrderView{{}}); } diff --git a/ui/src/tracker.cpp b/ui/src/tracker.cpp index 3f70b16..cb4d79c 100644 --- a/ui/src/tracker.cpp +++ b/ui/src/tracker.cpp @@ -1,5 +1,6 @@ #include "turns/ui/tracker.hpp" +#include "turns/core/settings.hpp" #include "turns/core/turn_order.hpp" #include "turns/lang/messages.hpp" #include "turns/ui/template_widget.hpp" @@ -56,6 +57,11 @@ namespace turns::ui auto constexpr static TEMPLATE = "/ch/arknet/Turns/tracker.ui"; } // namespace + Tracker::Tracker() + : Tracker{{}, core::get_settings()} + { + } + Tracker::Tracker(Glib::RefPtr const & app, Glib::RefPtr const & settings) : Glib::ObjectBase{TYPE_NAME} , template_widget{TEMPLATE, app} @@ -71,9 +77,6 @@ namespace turns::ui , m_subtitle{m_title->property_subtitle()} , m_css{Gtk::CssProvider::create()} { - if(!app || !settings) - return; - setup_colors(); setup_actions(); -- cgit v1.2.3