From 44d2614a260d2b029a79c59ee7fdd45e1958feb8 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Tue, 16 Jul 2024 13:02:46 +0200 Subject: app: extract turn order view --- app/src/application.cpp | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) (limited to 'app/src/application.cpp') diff --git a/app/src/application.cpp b/app/src/application.cpp index 1d38ea1..35dcfdb 100644 --- a/app/src/application.cpp +++ b/app/src/application.cpp @@ -1,5 +1,6 @@ #include "turns/app/application.hpp" +#include "turns/app/widgets/turn_order_view.hpp" #include "turns/app/windows/main.hpp" #include @@ -29,9 +30,6 @@ namespace turns::app m_adw = adw_application_new("ch.arknet.Turns", G_APPLICATION_DEFAULT_FLAGS); m_application = Glib::wrap(GTK_APPLICATION(m_adw)); - auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/main.ui"); - m_main = Gtk::Builder::get_widget_derived(builder, "main"); - m_application->signal_activate().connect(sigc::mem_fun(*this, &application::on_activate)); m_application->signal_shutdown().connect(sigc::mem_fun(*this, &application::on_shutdown)); m_application->signal_startup().connect(sigc::mem_fun(*this, &application::on_startup)); @@ -44,6 +42,9 @@ namespace turns::app auto application::on_activate() -> void { + auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/main.ui"); + m_main = Gtk::Builder::get_widget_derived(builder, "main"); + m_application->add_window(*m_main); m_main->present(); } @@ -62,6 +63,13 @@ namespace turns::app m_application->add_action("quit", sigc::mem_fun(*this, &application::handle_action_quit)); m_application->set_accel_for_action("app.quit", "q"); m_application->set_accel_for_action("win.clear", "x"); + + register_derived_widgets(); + } + + auto application::register_derived_widgets() -> void + { + static_cast(widgets::turn_order_view{}); } } // namespace turns::app \ No newline at end of file -- cgit v1.2.3