turns: perform source cleanup

8 files changed, 37 insertions, 32 deletions

diff --git a/ui/include/turns/ui/init.hpp b/ui/include/turns/ui/init.hpp
index a1b1184..b872063 100644
--- a/ui/include/turns/ui/init.hpp
+++ b/ui/include/turns/ui/init.hpp
@@ -6,6 +6,6 @@ namespace turns::ui
 
   auto register_types() -> void;
 
-}  // namespace turns::aop
+}  // namespace turns::ui
 
 #endif
\ No newline at end of file
diff --git a/ui/include/turns/ui/widgets/fwd.hpp b/ui/include/turns/ui/widgets/fwd.hpp
index 4d2ddb7..353db58 100644
--- a/ui/include/turns/ui/widgets/fwd.hpp
+++ b/ui/include/turns/ui/widgets/fwd.hpp
@@ -5,6 +5,6 @@ namespace turns::ui::widgets
 {
   struct participant_row;
   struct turn_order_view;
-}  // namespace turns::ui::windows
+}  // namespace turns::ui::widgets
 
 #endif
\ No newline at end of file
diff --git a/ui/include/turns/ui/widgets/participant_row.hpp b/ui/include/turns/ui/widgets/participant_row.hpp
index e7796d3..f33da34 100644
--- a/ui/include/turns/ui/widgets/participant_row.hpp
+++ b/ui/include/turns/ui/widgets/participant_row.hpp
@@ -1,10 +1,11 @@
 #ifndef TURNS_UI_WIDGETS_PARTICIPANT_ROW_HPP
 #define TURNS_UI_WIDGETS_PARTICIPANT_ROW_HPP
 
-#include "turns/ui/widgets/template_widget.hpp"
 #include "turns/core/fwd.hpp"
+#include "turns/ui/widgets/template_widget.hpp"
 
 #include <glibmm/property.h>
+#include <glibmm/propertyproxy.h>
 #include <glibmm/refptr.h>
 
 #include <gtkmm/button.h>
@@ -28,8 +29,8 @@ namespace turns::ui::widgets
 
     participant_row(Glib::RefPtr<core::participant> participant);
 
-    auto property_delete_enabled() -> Glib::PropertyProxy<bool>;
-    auto property_edit_enabled() -> Glib::PropertyProxy<bool>;
+    auto delete_enabled() -> Glib::PropertyProxy<bool>;
+    auto edit_enabled() -> Glib::PropertyProxy<bool>;
 
   private:
     auto handle_delete() -> void;
diff --git a/ui/include/turns/ui/widgets/template_widget.hpp b/ui/include/turns/ui/widgets/template_widget.hpp
index b3e5195..c01fff2 100644
--- a/ui/include/turns/ui/widgets/template_widget.hpp
+++ b/ui/include/turns/ui/widgets/template_widget.hpp
@@ -6,6 +6,8 @@
 
 #include <gtkmm/widget.h>
 
+#include <glib-object.h>
+#include <glib.h>
 #include <gtk/gtk.h>
 
 #include <algorithm>
diff --git a/ui/include/turns/ui/widgets/turn_order_view.hpp b/ui/include/turns/ui/widgets/turn_order_view.hpp
index 6790563..a9a3654 100644
--- a/ui/include/turns/ui/widgets/turn_order_view.hpp
+++ b/ui/include/turns/ui/widgets/turn_order_view.hpp
@@ -2,6 +2,7 @@
 #define TURNS_UI_WIDGETS_TURN_ORDER_VIEW_HPP
 
 #include "turns/core/fwd.hpp"
+#include "turns/core/turn_order.hpp"
 #include "turns/ui/widgets/template_widget.hpp"
 
 #include <glibmm/object.h>
diff --git a/ui/include/turns/ui/windows/fwd.hpp b/ui/include/turns/ui/windows/fwd.hpp
index b0eb69e..f228d7b 100644
--- a/ui/include/turns/ui/windows/fwd.hpp
+++ b/ui/include/turns/ui/windows/fwd.hpp
@@ -5,6 +5,6 @@ namespace turns::ui::windows
 {
   struct participant_editor;
   struct tracker;
-}  // namespace turns::app::windows
+}  // namespace turns::ui::windows
 
 #endif
\ No newline at end of file
diff --git a/ui/include/turns/ui/windows/participant_editor.hpp b/ui/include/turns/ui/windows/participant_editor.hpp
index 3ef8729..8618a0e 100644
--- a/ui/include/turns/ui/windows/participant_editor.hpp
+++ b/ui/include/turns/ui/windows/participant_editor.hpp
@@ -22,7 +22,7 @@ namespace turns::ui::windows
 
   struct participant_editor : Gtk::Widget
   {
-    using signal_finished_type = sigc::signal<void (Glib::ustring, float, core::disposition)>;
+    using signal_finished_type = sigc::signal<void(Glib::ustring, float, core::disposition)>;
 
     participant_editor(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder, Glib::RefPtr<core::participant> obj = {});
 
@@ -49,6 +49,6 @@ namespace turns::ui::windows
     signal_finished_type m_signal_finished{};
   };
 
-}  // namespace turns::app::windows
+}  // namespace turns::ui::windows
 
 #endif
\ No newline at end of file
diff --git a/ui/include/turns/ui/windows/tracker.hpp b/ui/include/turns/ui/windows/tracker.hpp
index f520097..03260f1 100644
--- a/ui/include/turns/ui/windows/tracker.hpp
+++ b/ui/include/turns/ui/windows/tracker.hpp
@@ -4,6 +4,7 @@
 #include "turns/core/turn_order.hpp"
 #include "turns/ui/widgets/turn_order_view.hpp"
 
+#include <glibmm/propertyproxy.h>
 #include <glibmm/refptr.h>
 #include <glibmm/ustring.h>
 #include <glibmm/variant.h>
@@ -19,11 +20,8 @@
 #include <gtkmm/stack.h>
 #include <gtkmm/widget.h>
 
-#include <adwaita.h>
-
-#include <optional>
+#include <exception>
 #include <string>
-#include <stdexcept>
 
 namespace turns::ui::windows
 {
@@ -33,39 +31,42 @@ namespace turns::ui::windows
     tracker(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder);
 
   private:
-    auto do_save() -> void;
-
-    auto handle_add_participant() -> void;
-    auto handle_delete_participant(Glib::VariantBase param) -> void;
-    auto handle_edit_participant(Glib::VariantBase param) -> void;
-    auto handle_open() -> void;
-    auto handle_open_done(Glib::RefPtr<Gio::AsyncResult> result) -> void;
-    auto handle_open_response(Glib::RefPtr<Gio::AsyncResult> result, Glib::RefPtr<Gtk::FileDialog> dialog) -> void;
-    auto handle_save(bool force_ask) -> void;
-    auto handle_save_done(Glib::RefPtr<Gio::AsyncResult> result) -> void;
-    auto handle_save_response(Glib::RefPtr<Gio::AsyncResult> result, Glib::RefPtr<Gtk::FileDialog> dialog) -> void;
-    auto handle_stop() -> void;
-
-
+    /** Setup */
     auto setup_actions() -> void;
-    auto show_error_toast(std::exception const & e) -> void;
 
+    /** Actions */
+    auto add_participant() -> void;
+    auto delete_participant(Glib::VariantBase param) -> void;
+    auto edit_participant(Glib::VariantBase param) -> void;
+    auto open() -> void;
+    auto save(bool force_ask) -> void;
+    auto stop() -> void;
+
+    /** Event Handlers */
+    auto on_open_response(Glib::RefPtr<Gio::AsyncResult> result, Glib::RefPtr<Gtk::FileDialog> dialog) -> void;
+    auto on_save_response(Glib::RefPtr<Gio::AsyncResult> result, Glib::RefPtr<Gtk::FileDialog> dialog) -> void;
+    auto on_load_content_done(Glib::RefPtr<Gio::AsyncResult> result) -> void;
+    auto on_replace_content_done(Glib::RefPtr<Gio::AsyncResult> result) -> void;
+
+    /** Helpers */
+    auto show_error(std::exception const & e) -> void;
+    auto show_toast(std::string const & message) -> void;
+    auto start_replace_content() -> void;
     auto update_subtitle() -> void;
 
-    AdwApplicationWindow * m_adw;
     Gtk::Revealer * m_controls;
     Gtk::Widget * m_empty;
-    AdwToastOverlay * m_overlay;
+    Gtk::Widget * m_overlay;
     Gtk::Stack * m_stack;
     Gtk::Button * m_start;
-    AdwWindowTitle * m_title;
+    Gtk::Widget * m_title;
     Glib::RefPtr<core::turn_order> m_turn_order;
     widgets::turn_order_view * m_turn_order_view;
     Glib::PropertyProxy<Glib::ustring> m_subtitle;
 
-    std::string m_file_tag{};
     Glib::RefPtr<Gio::File> m_file{};
-    std::string m_buffer{};
+    std::string m_file_etag{};
+    std::string m_file_buffer{};
   };
 
 }  // namespace turns::ui::windows