From 5d8f799a1171f92054d4b45ba130cd7fdad0bd01 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Fri, 23 May 2025 14:04:27 +0200 Subject: app: prepare restructuring --- ui/include/turns/ui/fwd.hpp | 14 ---- ui/include/turns/ui/init.hpp | 15 ----- ui/include/turns/ui/participant_editor.hpp | 82 ----------------------- ui/include/turns/ui/participant_row.hpp | 50 -------------- ui/include/turns/ui/preferences.hpp | 53 --------------- ui/include/turns/ui/template_widget.hpp | 67 ------------------- ui/include/turns/ui/tracker.hpp | 104 ----------------------------- ui/include/turns/ui/turn_order_view.hpp | 40 ----------- 8 files changed, 425 deletions(-) delete mode 100644 ui/include/turns/ui/fwd.hpp delete mode 100644 ui/include/turns/ui/init.hpp delete mode 100644 ui/include/turns/ui/participant_editor.hpp delete mode 100644 ui/include/turns/ui/participant_row.hpp delete mode 100644 ui/include/turns/ui/preferences.hpp delete mode 100644 ui/include/turns/ui/template_widget.hpp delete mode 100644 ui/include/turns/ui/tracker.hpp delete mode 100644 ui/include/turns/ui/turn_order_view.hpp (limited to 'ui/include') diff --git a/ui/include/turns/ui/fwd.hpp b/ui/include/turns/ui/fwd.hpp deleted file mode 100644 index 69dc0b5..0000000 --- a/ui/include/turns/ui/fwd.hpp +++ /dev/null @@ -1,14 +0,0 @@ -#ifndef TURNS_UI_WIDGETS_FWD_HPP -#define TURNS_UI_WIDGETS_FWD_HPP - -namespace turns::ui::widgets -{ - struct participant_editor; - struct participant_row; - struct preferences; - struct tracker; - struct turn_order_view; - struct preferences; -} // namespace turns::ui::widgets - -#endif \ No newline at end of file diff --git a/ui/include/turns/ui/init.hpp b/ui/include/turns/ui/init.hpp deleted file mode 100644 index 77bd009..0000000 --- a/ui/include/turns/ui/init.hpp +++ /dev/null @@ -1,15 +0,0 @@ -#ifndef TURNS_UI_INIT_HPP -#define TURNS_UI_INIT_HPP - -#include - -#include - -namespace turns::ui -{ - - auto register_types() -> void; - -} // namespace turns::ui - -#endif \ No newline at end of file diff --git a/ui/include/turns/ui/participant_editor.hpp b/ui/include/turns/ui/participant_editor.hpp deleted file mode 100644 index 0fbc504..0000000 --- a/ui/include/turns/ui/participant_editor.hpp +++ /dev/null @@ -1,82 +0,0 @@ -#ifndef TURNS_UI_PARTICIPANT_EDITOR_HPP -#define TURNS_UI_PARTICIPANT_EDITOR_HPP - -#include "turns/core/disposition.hpp" -#include "turns/core/fwd.hpp" -#include "turns/core/participant.hpp" -#include "turns/ui/template_widget.hpp" - -#include - -#include -#include -#include -#include - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include - -namespace turns::ui -{ - - struct ParticipantEditor : template_widget - { - using SignalFinishedType = sigc::signal; - - auto constexpr inline static children = std::array{ - "disposition", - "finish", - "name", - "priority", - }; - - explicit ParticipantEditor(Glib::RefPtr participant); - - [[nodiscard]] auto get_disposition() const -> core::Disposition; - [[nodiscard]] auto get_name() const -> Glib::ustring; - [[nodiscard]] auto get_participant() const -> Glib::RefPtr; - [[nodiscard]] auto get_priority() const -> double; - - auto set_disposition(core::Disposition value) -> void; - auto set_name(Glib::ustring const & value) -> void; - auto set_participant(Glib::RefPtr const & value) -> void; - auto set_priority(double value) -> void; - - [[nodiscard]] auto property_participant() -> Glib::PropertyProxy>; - [[nodiscard]] auto property_participant() const -> Glib::PropertyProxy_ReadOnly>; - - auto signal_finished() -> SignalFinishedType; - - private: - auto handle_finish_clicked() -> void; - auto handle_item_bind(Glib::RefPtr item) -> void; - auto handle_item_setup(Glib::RefPtr item) -> void; - auto handle_participant_changed() -> void; - - Adwaita::ComboRow * m_disposition; - Gtk::Button * m_finish; - Adwaita::EntryRow * m_name; - Adwaita::SpinRow * m_priority; - - Glib::RefPtr m_disposition_factory; - Glib::RefPtr m_disposition_model; - - Glib::Property> m_participant; - - SignalFinishedType m_signal_finished{}; - }; - -} // namespace turns::ui - -#endif \ No newline at end of file diff --git a/ui/include/turns/ui/participant_row.hpp b/ui/include/turns/ui/participant_row.hpp deleted file mode 100644 index 561214b..0000000 --- a/ui/include/turns/ui/participant_row.hpp +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef TURNS_UI_PARTICIPANT_ROW_HPP -#define TURNS_UI_PARTICIPANT_ROW_HPP - -#include "turns/core/fwd.hpp" -#include "turns/ui/template_widget.hpp" - -#include -#include -#include - -#include -#include -#include -#include - -#include - -namespace turns::ui -{ - struct ParticipantRow : template_widget - { - auto constexpr inline static children = std::array{ - "delete", - "edit", - "subtitle", - "title", - "toggle_defeated", - }; - - ParticipantRow(Glib::RefPtr participant); - - auto delete_enabled() -> Glib::PropertyProxy; - auto edit_enabled() -> Glib::PropertyProxy; - - private: - auto handle_delete() -> 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::Property m_delete_enabled; - Glib::Property m_edit_enabled; - }; -} // namespace turns::ui::widgets - -#endif \ No newline at end of file diff --git a/ui/include/turns/ui/preferences.hpp b/ui/include/turns/ui/preferences.hpp deleted file mode 100644 index b68b91c..0000000 --- a/ui/include/turns/ui/preferences.hpp +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef TURNS_UI_PREFERENCES_HPP -#define TURNS_UI_PREFERENCES_HPP - -#include "turns/ui/template_widget.hpp" - -#include -#include - -#include - -#include -#include - -#include -#include - -#include - -namespace turns::ui -{ - struct Preferences : template_widget - { - - auto constexpr inline static children = std::array{ - "friendly_reset_button", - "hostile_reset_button", - "secret_reset_button", - "friendly_color_button", - "hostile_color_button", - "secret_color_button", - "skip_defeated", - }; - - explicit Preferences(Glib::RefPtr settings = {}); - - private: - auto bind_reset(Glib::ustring const & key, Gtk::Button * button) -> void; - auto bind_setting(Glib::ustring const & key, Gtk::ColorDialogButton * button) -> void; - auto update_sensitive(Glib::ustring const & key, Gtk::Button * button) -> void; - - Glib::RefPtr m_settings; - - Gtk::Button * m_friendly_reset_button{}; - Gtk::Button * m_hostile_reset_button{}; - Gtk::Button * m_secret_reset_button{}; - Gtk::ColorDialogButton * m_friendly_color_button{}; - Gtk::ColorDialogButton * m_hostile_color_button{}; - Gtk::ColorDialogButton * m_secret_color_button{}; - Adwaita::SwitchRow * m_skip_defeated{}; - }; -} // namespace turns::ui::widgets - -#endif \ No newline at end of file diff --git a/ui/include/turns/ui/template_widget.hpp b/ui/include/turns/ui/template_widget.hpp deleted file mode 100644 index 7147560..0000000 --- a/ui/include/turns/ui/template_widget.hpp +++ /dev/null @@ -1,67 +0,0 @@ -#ifndef TURNS_UI_TEMPLATE_WIDGET_HPP -#define TURNS_UI_TEMPLATE_WIDGET_HPP - -#include -#include -#include - -#include - -#include -#include -#include - -#include -#include - -namespace turns::ui -{ - - template - struct template_widget : Glib::ExtraClassInit, - BaseWidgetType - { - template - template_widget(Glib::ustring && resource_path, BaseWidgetCtorArgTypes &&... base_widget_ctor_args) - : Glib::ExtraClassInit{class_init, &resource_path, instance_init} - , BaseWidgetType{std::forward(base_widget_ctor_args)...} - { - } - - protected: - template - auto get_widget(char const * name) -> WidgetType * - { - auto self = static_cast(this); - auto widget = GTK_WIDGET(Glib::unwrap(self)); - auto type = G_OBJECT_TYPE(Glib::unwrap(self)); - auto child = GTK_WIDGET(gtk_widget_get_template_child(widget, type, name)); - g_assert_nonnull(child); - return dynamic_cast(Glib::wrap(child)); - } - - private: - auto static class_init(void * g_class, void * g_class_data) -> void - { - g_return_if_fail(GTK_IS_WIDGET_CLASS(g_class)); - - auto resource_path = static_cast(g_class_data); - - gtk_widget_class_set_template_from_resource(GTK_WIDGET_CLASS(g_class), resource_path->c_str()); - - std::ranges::for_each(CustomWidgetType::children, [g_class](auto const & child) { - gtk_widget_class_bind_template_child_full(GTK_WIDGET_CLASS(g_class), child, false, 0); - }); - } - - auto static instance_init(GTypeInstance * instance, void * /* type_class */) -> void - { - g_return_if_fail(GTK_IS_WIDGET(instance)); - - gtk_widget_init_template(GTK_WIDGET(instance)); - } - }; - -} // namespace turns::ui::widgets - -#endif \ No newline at end of file diff --git a/ui/include/turns/ui/tracker.hpp b/ui/include/turns/ui/tracker.hpp deleted file mode 100644 index 2e3adf5..0000000 --- a/ui/include/turns/ui/tracker.hpp +++ /dev/null @@ -1,104 +0,0 @@ -#ifndef TURNS_UI_TRACKER_HPP -#define TURNS_UI_TRACKER_HPP - -#include "turns/core/turn_order_model.hpp" -#include "turns/ui/template_widget.hpp" -#include "turns/ui/turn_order_view.hpp" - -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include -#include -#include - -namespace turns::ui -{ - - struct Tracker : template_widget - { - auto constexpr inline static children = std::array{ - "controls", - "empty", - "overlay", - "stack", - "start", - "title", - }; - - Tracker(Glib::RefPtr const & app, Glib::RefPtr const & settings); - - auto load(Glib::RefPtr file) -> void; - - private: - friend auto register_types() -> void; - Tracker(); - - /** Setup */ - auto setup_actions() -> void; - auto setup_colors() -> void; - - /** Actions */ - auto add_participant() -> void; - auto delete_participant(Glib::VariantBase param) -> void; - auto edit_participant(Glib::VariantBase param) -> void; - auto open() -> void; - auto preferences() -> void; - auto save(bool force_ask) -> void; - auto stop() -> void; - - /** Event Handlers */ - auto on_open_response(Glib::RefPtr result, Glib::RefPtr dialog) -> void; - auto on_save_response(Glib::RefPtr result, Glib::RefPtr dialog) -> void; - auto on_load_content_done(Glib::RefPtr result) -> void; - auto on_replace_content_done(Glib::RefPtr result) -> void; - auto on_settings_changed(Glib::ustring key) -> 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_colors() -> void; - auto update_subtitle() -> void; - - Gtk::Revealer * m_controls; - Gtk::Widget * m_empty; - Adwaita::ToastOverlay * m_overlay; - Gtk::Stack * m_stack; - Gtk::Button * m_start; - Adwaita::WindowTitle * m_title; - Glib::RefPtr m_turn_order; - TurnOrderView * m_turn_order_view; - Glib::RefPtr m_settings{}; - Glib::PropertyProxy m_subtitle; - - Glib::RefPtr m_file{}; - std::string m_file_etag{}; - std::string m_file_buffer{}; - - Glib::RefPtr m_css{}; - }; - -} // namespace turns::ui - -#endif \ No newline at end of file diff --git a/ui/include/turns/ui/turn_order_view.hpp b/ui/include/turns/ui/turn_order_view.hpp deleted file mode 100644 index 8dae4e4..0000000 --- a/ui/include/turns/ui/turn_order_view.hpp +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef TURNS_UI_TURN_ORDER_VIEW_HPP -#define TURNS_UI_TURN_ORDER_VIEW_HPP - -#include "turns/core/fwd.hpp" -#include "turns/core/turn_order_model.hpp" -#include "turns/ui/template_widget.hpp" - -#include -#include - -#include -#include -#include -#include - -#include - -namespace turns::ui -{ - struct TurnOrderView : template_widget - { - using model_type = core::TurnOderModel; - - auto constexpr inline static children = std::array{ - "progress", - "view", - }; - - explicit TurnOrderView(Glib::RefPtr model = {}); - - private: - auto handle_create_row(Glib::RefPtr const item) -> Gtk::Widget *; - - Glib::RefPtr m_model; - Gtk::ProgressBar * m_progress; - Gtk::ListBox * m_view; - }; -} // namespace turns::ui::widgets - -#endif \ No newline at end of file -- cgit v1.2.3