gui: use stack names

4 files changed, 20 insertions, 19 deletions

diff --git a/gui/include/tracker.hpp b/gui/include/tracker.hpp
index 39b7403..347e89e 100644
--- a/gui/include/tracker.hpp
+++ b/gui/include/tracker.hpp
@@ -39,7 +39,6 @@ namespace Turns::gui
   {
     auto constexpr inline static children = std::array{
         "controls",
-        "empty",
         "overlay",
         "stack",
         "start",
@@ -79,7 +78,6 @@ namespace Turns::gui
     auto update_subtitle() -> void;
 
     Gtk::Revealer * m_controls;
-    Gtk::Widget * m_empty;
     Adwaita::ToastOverlay * m_overlay;
     Gtk::Stack * m_stack;
     Gtk::Button * m_start;
diff --git a/gui/src/tracker.cpp b/gui/src/tracker.cpp
index c45b896..3810480 100644
--- a/gui/src/tracker.cpp
+++ b/gui/src/tracker.cpp
@@ -61,7 +61,6 @@
 #include <exception>
 #include <format>
 #include <memory>
-#include <print>
 #include <string>
 #include <utility>
 
@@ -87,7 +86,6 @@ namespace Turns::gui
       : Glib::ObjectBase{TYPE_NAME}
       , template_widget{TEMPLATE, app}
       , m_controls{get_widget<Gtk::Revealer>("controls")}
-      , m_empty{get_widget<Gtk::Widget>("empty")}
       , m_overlay{get_widget<Adwaita::ToastOverlay>("overlay")}
       , m_stack{get_widget<Gtk::Stack>("stack")}
       , m_start{get_widget<Gtk::Button>("start")}
@@ -105,8 +103,7 @@ namespace Turns::gui
     setup_colors();
     setup_actions();
 
-    auto view = Gtk::make_managed<TurnOrderView>(m_turn_order);
-    m_stack->add(*view);
+    m_stack->add(*Gtk::make_managed<TurnOrderView>(m_turn_order), "turn-order");
 
     m_turn_order->property_empty().signal_changed().connect(sigc::mem_fun(*this, &Tracker::update_subtitle));
     // m_turn_order->round_number().signal_changed().connect(sigc::mem_fun(*this, &Tracker::update_subtitle));
@@ -114,9 +111,9 @@ namespace Turns::gui
 
     // clang-format off
     Glib::Binding::bind_property(m_turn_order->property_empty(),
-                                 m_stack->property_visible_child(),
+                                 m_stack->property_visible_child_name(),
                                  Glib::Binding::Flags::SYNC_CREATE,
-                                 [this, view](auto empty) { return empty ? m_empty : view; });
+                                 [](auto empty) { return empty ? "empty" : "turn-order"; });
 
     Glib::Binding::bind_property(m_turn_order->property_running(),
                                  m_controls->property_reveal_child(),
diff --git a/gui/ui/tracker.ui b/gui/ui/tracker.ui
index 84a764d..0187ca5 100644
--- a/gui/ui/tracker.ui
+++ b/gui/ui/tracker.ui
@@ -13,19 +13,25 @@
             <property name="child">
               <object class="GtkStack" id="stack">
                 <child>
-                  <object class="AdwStatusPage" id="empty">
+                  <object class="GtkStackPage">
                     <property name="child">
-                      <object class="GtkButton">
-                        <property name="action-name">win.add_participant</property>
-                        <property name="halign">center</property>
-                        <property name="label" translatable="yes">Add participant</property>
-                        <style>
-                          <class name="pill"/>
-                          <class name="suggested-action"/>
-                        </style>
+                      <object class="AdwStatusPage">
+                        <property name="child">
+                          <object class="GtkButton">
+                            <property name="action-name">win.add_participant</property>
+                            <property name="halign">center</property>
+                            <property name="label" translatable="yes">Add participant</property>
+                            <style>
+                              <class name="pill"/>
+                              <class name="suggested-action"/>
+                            </style>
+                          </object>
+                        </property>
+                        <property name="icon-name">contact-new-symbolic</property>
                       </object>
                     </property>
                     <property name="icon-name">contact-new-symbolic</property>
+                    <property name="name">empty</property>
                   </object>
                 </child>
               </object>
diff --git a/gui/ui/turns.cmb b/gui/ui/turns.cmb
index 5c94a9b..5373ee0 100644
--- a/gui/ui/turns.cmb
+++ b/gui/ui/turns.cmb
@@ -2,8 +2,8 @@
 <!DOCTYPE cambalache-project SYSTEM "cambalache-project.dtd">
 <!-- Created with Cambalache 0.96.1 -->
 <cambalache-project version="0.96.0" target_tk="gtk-4.0">
-  <ui template-class="gtkmm__CustomObject_Tracker" filename="tracker.ui" sha256="810d3f91a263b75e145f6c292d544d0f055b6b404ab046b77053617bac5fbe25"/>
-  <ui template-class="gtkmm__CustomObject_ParticipantEditor" filename="participant_editor.ui" sha256="dfd252ee0f508c9b8aecd85e37dca151ee149d7cdb7c346e9ec68185b59edde8"/>
+  <ui template-class="gtkmm__CustomObject_Tracker" filename="tracker.ui" sha256="17ce0addf3f83db7ddb3f63dcd9a496f8f4135b04cf7ff21cf71b778b7b655f5"/>
+  <ui template-class="gtkmm__CustomObject_ParticipantEditor" filename="participant_editor.ui" sha256="85418d5d8c8f6d8acd773b42c10bcee9183095dbb85c516c56ea8ae588f3afe0"/>
   <ui template-class="gtkmm__CustomObject_ParticipantRow" filename="participant_row.ui" sha256="ab4db80068f811a2b77608fca128ba72c3e753ff33748822afd7a0f74c955dcd"/>
   <ui template-class="gtkmm__CustomObject_TurnOrderView" filename="turn_order_view.ui" sha256="1a71db6bcf70d48123f1bd876b344f64f3e3d0c7f9fe12c6daefb326763cbef7"/>
   <ui template-class="gtkmm__CustomObject_Preferences" filename="preferences.ui" sha256="3c47beaa2297fa45f8c29ac7aa410227b7f9d43971d6b6c31fa4278f2bb43f6a"/>