1 files changed, 27 insertions, 41 deletions

diff --git a/app/src/windows/main.cpp b/app/src/windows/main.cpp
index 8c9ca5c..95ed221 100644
--- a/app/src/windows/main.cpp
+++ b/app/src/windows/main.cpp
@@ -14,6 +14,15 @@
 namespace turns::app::windows
 {
 
+  namespace
+  {
+    auto editor_for(Glib::RefPtr<domain::participant> participant)
+    {
+      auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/participant_editor.ui");
+      return std::pair{builder, Gtk::Builder::get_widget_derived<windows::participant_editor>(builder, "participant_editor", participant)};
+    }
+  }  // namespace
+
   main::main(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder)
       : Gtk::ApplicationWindow{base}
       , m_adw{ADW_APPLICATION_WINDOW(gobj())}
@@ -22,71 +31,48 @@ namespace turns::app::windows
       , m_stack{builder->get_widget<Gtk::Stack>("stack")}
       , m_title(ADW_WINDOW_TITLE(builder->get_widget<Gtk::Widget>("title")->gobj()))
       , m_turn_order{builder->get_widget<Gtk::ScrolledWindow>("turn_order")}
-      , m_participants{domain::turn_order::create()}
+      , m_participant_list_data{domain::turn_order::create()}
+      , m_subtitle{Glib::wrap(GTK_WIDGET(m_title)), "subtitle"}
   {
-    m_stack->set_visible_child(*m_empty);
-    m_stack->property_visible_child().signal_changed().connect([this] {
-      if (m_stack->get_visible_child() == m_empty)
-      {
-        adw_window_title_set_subtitle(m_title, _(lang::no_active_turn_order));
-      }
-      else
-      {
-        adw_window_title_set_subtitle(m_title, "");
-      }
-    });
+    m_visible_child_widget = Glib::Binding::bind_property(m_participant_list_data->property_n_items(),
+                                                          m_stack->property_visible_child(),
+                                                          Glib::Binding::Flags::SYNC_CREATE,
+                                                          [this](auto count) { return count ? m_turn_order : m_empty; });
 
-    m_participants->property_n_items().signal_changed().connect([this] {
-      if (m_participants->get_n_items())
-      {
-        m_stack->set_visible_child(*m_turn_order);
-      }
-      else
-      {
-        m_stack->set_visible_child(*m_empty);
-      }
-    });
-    m_participant_list->bind_model(m_participants, sigc::mem_fun(*this, &main::handle_create_list_row));
+    m_subtitle_text = Glib::Binding::bind_property(m_participant_list_data->property_n_items(),
+                                                   m_subtitle,
+                                                   Glib::Binding::Flags::SYNC_CREATE,
+                                                   [](auto count) { return count ? "" : _(lang::no_active_turn_order); });
+
+    m_participant_list->bind_model(m_participant_list_data, sigc::mem_fun(*this, &main::handle_create_list_row));
 
     add_action("add_participant", sigc::mem_fun(*this, &main::handle_add_participant));
     add_action_with_parameter("delete", Glib::VARIANT_TYPE_INT32, [this](auto param) {
       auto index = Glib::VariantBase::cast_dynamic<Glib::Variant<int>>(param);
-      m_participants->remove(index.get());
+      m_participant_list_data->remove(index.get());
     });
     add_action_with_parameter("edit", Glib::VARIANT_TYPE_INT32, sigc::mem_fun(*this, &main::handle_edit_participant));
-
   }
 
   auto main::handle_create_list_row(Glib::RefPtr<Glib::Object> const item) -> Gtk::Widget *
   {
     auto participant = std::dynamic_pointer_cast<domain::participant>(item);
-    auto widget = Gtk::make_managed<widgets::participant_list_row>();
-    auto priority = participant->property_priority().get_value();
-    widget->set_title(participant->property_name());
-    widget->set_subtitle(std::vformat(_("Priority {}"), std::make_format_args(priority)));
-    return widget;
+    return Gtk::make_managed<widgets::participant_list_row>(participant);
   }
 
   auto main::handle_add_participant() -> void
   {
-    auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/participant_editor.ui");
-    auto dialog = Gtk::Builder::get_widget_derived<windows::participant_editor>(builder, "participant_editor");
-    dialog->set_title(_(lang::add_participant));
+    auto [lifeline, dialog] = editor_for(nullptr);
     dialog->present(this);
-    dialog->signal_finished().connect([this](auto name, auto priority) { m_participants->append(name, priority); });
+    dialog->signal_finished().connect([this](auto name, auto priority) { m_participant_list_data->append(name, priority); });
   }
 
   auto main::handle_edit_participant(Glib::VariantBase param) -> void
   {
     auto index = Glib::VariantBase::cast_dynamic<Glib::Variant<int>>(param);
-    auto participant = m_participants->get_item(index.get());
-
-    auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/participant_editor.ui");
-    auto dialog = Gtk::Builder::get_widget_derived<windows::participant_editor>(builder, "participant_editor", participant);
-
-    dialog->set_title(_(lang::edit_participant));
+    auto participant = m_participant_list_data->get_item(index.get());
+    auto [lifeline, dialog] = editor_for(participant);
     dialog->present(this);
-    dialog->signal_finished().connect([this](auto name, auto priority) { m_participants->append(name, priority); });
   }
 
 }  // namespace turns::app::windows