turns: perform widespread code cleanup actions

4 files changed, 26 insertions, 16 deletions

diff --git a/app/include/turns/app/application.hpp b/app/include/turns/app/application.hpp
index c74f340..81fe333 100644
--- a/app/include/turns/app/application.hpp
+++ b/app/include/turns/app/application.hpp
@@ -1,13 +1,13 @@
 #ifndef TURNS_APP_APPLICATION_HPP
 #define TURNS_APP_APPLICATION_HPP
 
-#include <adwaita.h>
+#include "turns/app/windows/main.hpp"
+
+#include <memory>
 
+#include <adwaita.h>
 #include <glibmm/refptr.h>
 #include <gtkmm/application.h>
-#include <gtkmm/applicationwindow.h>
-
-#include <memory>
 
 namespace turns::app
 {
@@ -27,9 +27,9 @@ namespace turns::app
     auto on_shutdown() -> void;
     auto on_startup() -> void;
 
-    AdwApplication * m_self;
+    AdwApplication * m_adw;
     Glib::RefPtr<Gtk::Application> m_application;
-    AdwApplicationWindow * m_main_window;
+    windows::main * m_main;
   };
 
 }  // namespace turns::app
diff --git a/app/include/turns/app/widgets/participant_list_row.hpp b/app/include/turns/app/widgets/participant_list_row.hpp
index 2e3b176..6a9a6c2 100644
--- a/app/include/turns/app/widgets/participant_list_row.hpp
+++ b/app/include/turns/app/widgets/participant_list_row.hpp
@@ -2,9 +2,12 @@
 #define TURNS_APP_WIDGETS_PARTICIPANT_LIST_ROW_HPP
 
 #include "turns/app/widgets/template_widget.hpp"
+#include "turns/domain/participant.hpp"
 
 #include <array>
 
+#include <glibmm/binding.h>
+#include <glibmm/refptr.h>
 #include <glibmm/ustring.h>
 #include <gtkmm/button.h>
 #include <gtkmm/label.h>
@@ -23,20 +26,24 @@ namespace turns::app::widgets
         "toggle_defeated",
     };
 
-    participant_list_row();
+    participant_list_row(Glib::RefPtr<domain::participant> participant);
 
     auto set_subtitle(Glib::ustring const & value) -> void;
     auto set_title(Glib::ustring const & value) -> void;
 
   private:
     auto handle_delete() -> void;
-    auto handle_toggle_defeated() -> void;
+    auto handle_edit() -> void;
 
     Gtk::Button * m_delete;
     Gtk::Button * m_edit;
     Gtk::Label * m_subtitle;
     Gtk::Label * m_title;
     Gtk::ToggleButton * m_toggle_defeated;
+
+    Glib::RefPtr<Glib::Binding> m_subtitle_visibility{};
+    Glib::RefPtr<Glib::Binding> m_title_visibility{};
+    Glib::RefPtr<Glib::Binding> m_toggle_defeated_icon{};
   };
 }  // namespace turns::app::widgets
 
diff --git a/app/include/turns/app/windows/main.hpp b/app/include/turns/app/windows/main.hpp
index 22dab74..ca8237c 100644
--- a/app/include/turns/app/windows/main.hpp
+++ b/app/include/turns/app/windows/main.hpp
@@ -4,15 +4,14 @@
 #include "turns/domain/turn_order.hpp"
 
 #include <adwaita.h>
-#include <giomm/liststore.h>
+#include <glibmm/binding.h>
 #include <glibmm/object.h>
 #include <glibmm/refptr.h>
+#include <glibmm/ustring.h>
 #include <glibmm/variant.h>
 #include <gtkmm/applicationwindow.h>
 #include <gtkmm/builder.h>
-#include <gtkmm/button.h>
 #include <gtkmm/listbox.h>
-#include <gtkmm/menubutton.h>
 #include <gtkmm/scrolledwindow.h>
 #include <gtkmm/stack.h>
 #include <gtkmm/widget.h>
@@ -36,7 +35,12 @@ namespace turns::app::windows
     AdwWindowTitle * m_title;
     Gtk::ScrolledWindow * m_turn_order;
 
-    Glib::RefPtr<domain::turn_order> m_participants;
+    Glib::RefPtr<domain::turn_order> m_participant_list_data;
+
+    Glib::PropertyProxy<Glib::ustring> m_subtitle;
+
+    Glib::RefPtr<Glib::Binding> m_visible_child_widget{};
+    Glib::RefPtr<Glib::Binding> m_subtitle_text{};
   };
 
 }  // namespace turns::app::windows
diff --git a/app/include/turns/app/windows/participant_editor.hpp b/app/include/turns/app/windows/participant_editor.hpp
index 0d7b518..38b1887 100644
--- a/app/include/turns/app/windows/participant_editor.hpp
+++ b/app/include/turns/app/windows/participant_editor.hpp
@@ -30,14 +30,13 @@ namespace turns::app::windows
     auto handle_finish_clicked() -> void;
 
     AdwDialog * m_adw;
-    Gtk::Button * m_finish;
-
-    Glib::RefPtr<domain::participant> m_participant;
-
     AdwComboRow * m_disposition{};
+    Gtk::Button * m_finish;
     AdwEntryRow * m_name{};
     AdwSpinRow * m_priority{};
 
+    Glib::RefPtr<domain::participant> m_participant;
+
     signal_finished_type m_signal_finished{};
   };