From 3ff5bd46952144926d9bd9beedf50023a51913ee Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Tue, 29 Apr 2025 16:33:32 +0200 Subject: ui: flatten namespace hierarchy --- ui/CMakeLists.txt | 25 +-- ui/include/turns/ui/fwd.hpp | 14 ++ ui/include/turns/ui/participant_editor.hpp | 73 +++++++ 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 | 89 ++++++++ ui/include/turns/ui/turn_order_view.hpp | 40 ++++ ui/include/turns/ui/widgets/fwd.hpp | 12 -- ui/include/turns/ui/widgets/participant_editor.hpp | 73 ------- ui/include/turns/ui/widgets/participant_row.hpp | 50 ----- ui/include/turns/ui/widgets/preferences.hpp | 53 ----- ui/include/turns/ui/widgets/template_widget.hpp | 67 ------ ui/include/turns/ui/widgets/turn_order_view.hpp | 40 ---- ui/include/turns/ui/windows/fwd.hpp | 9 - ui/include/turns/ui/windows/tracker.hpp | 89 -------- ui/src/init.cpp | 16 +- ui/src/participant_editor.cpp | 139 ++++++++++++ ui/src/participant_editor.ui | 71 ++++++ ui/src/participant_row.cpp | 149 +++++++++++++ ui/src/participant_row.ui | 89 ++++++++ ui/src/preferences.cpp | 81 +++++++ ui/src/preferences.ui | 104 +++++++++ ui/src/tracker.cpp | 240 +++++++++++++++++++++ ui/src/tracker.ui | 153 +++++++++++++ ui/src/tracker/actions.cpp | 125 +++++++++++ ui/src/tracker/event_handlers.cpp | 105 +++++++++ ui/src/turn_order_view.cpp | 64 ++++++ ui/src/turn_order_view.ui | 38 ++++ ui/src/widgets/participant_editor.cpp | 139 ------------ ui/src/widgets/participant_editor.ui | 71 ------ ui/src/widgets/participant_row.cpp | 149 ------------- ui/src/widgets/participant_row.ui | 89 -------- ui/src/widgets/preferences.cpp | 81 ------- ui/src/widgets/preferences.ui | 104 --------- ui/src/widgets/turn_order_view.cpp | 64 ------ ui/src/widgets/turn_order_view.ui | 38 ---- ui/src/windows/tracker.cpp | 240 --------------------- ui/src/windows/tracker.ui | 153 ------------- ui/src/windows/tracker/actions.cpp | 125 ----------- ui/src/windows/tracker/event_handlers.cpp | 105 --------- ui/tests/participant_editor.cpp | 108 ++++++++++ ui/tests/participant_row.cpp | 30 +++ ui/tests/resources.cpp | 14 ++ ui/tests/tracker.cpp | 77 +++++++ ui/tests/widgets/participant_editor.cpp | 108 ---------- ui/tests/widgets/participant_row.cpp | 30 --- ui/tests/windows/resources.cpp | 14 -- ui/tests/windows/tracker.cpp | 77 ------- ui/ui.cmb | 10 +- 50 files changed, 1991 insertions(+), 2013 deletions(-) create mode 100644 ui/include/turns/ui/fwd.hpp create mode 100644 ui/include/turns/ui/participant_editor.hpp create mode 100644 ui/include/turns/ui/participant_row.hpp create mode 100644 ui/include/turns/ui/preferences.hpp create mode 100644 ui/include/turns/ui/template_widget.hpp create mode 100644 ui/include/turns/ui/tracker.hpp create mode 100644 ui/include/turns/ui/turn_order_view.hpp delete mode 100644 ui/include/turns/ui/widgets/fwd.hpp delete mode 100644 ui/include/turns/ui/widgets/participant_editor.hpp delete mode 100644 ui/include/turns/ui/widgets/participant_row.hpp delete mode 100644 ui/include/turns/ui/widgets/preferences.hpp delete mode 100644 ui/include/turns/ui/widgets/template_widget.hpp delete mode 100644 ui/include/turns/ui/widgets/turn_order_view.hpp delete mode 100644 ui/include/turns/ui/windows/fwd.hpp delete mode 100644 ui/include/turns/ui/windows/tracker.hpp create mode 100644 ui/src/participant_editor.cpp create mode 100644 ui/src/participant_editor.ui create mode 100644 ui/src/participant_row.cpp create mode 100644 ui/src/participant_row.ui create mode 100644 ui/src/preferences.cpp create mode 100644 ui/src/preferences.ui create mode 100644 ui/src/tracker.cpp create mode 100644 ui/src/tracker.ui create mode 100644 ui/src/tracker/actions.cpp create mode 100644 ui/src/tracker/event_handlers.cpp create mode 100644 ui/src/turn_order_view.cpp create mode 100644 ui/src/turn_order_view.ui delete mode 100644 ui/src/widgets/participant_editor.cpp delete mode 100644 ui/src/widgets/participant_editor.ui delete mode 100644 ui/src/widgets/participant_row.cpp delete mode 100644 ui/src/widgets/participant_row.ui delete mode 100644 ui/src/widgets/preferences.cpp delete mode 100644 ui/src/widgets/preferences.ui delete mode 100644 ui/src/widgets/turn_order_view.cpp delete mode 100644 ui/src/widgets/turn_order_view.ui delete mode 100644 ui/src/windows/tracker.cpp delete mode 100644 ui/src/windows/tracker.ui delete mode 100644 ui/src/windows/tracker/actions.cpp delete mode 100644 ui/src/windows/tracker/event_handlers.cpp create mode 100644 ui/tests/participant_editor.cpp create mode 100644 ui/tests/participant_row.cpp create mode 100644 ui/tests/resources.cpp create mode 100644 ui/tests/tracker.cpp delete mode 100644 ui/tests/widgets/participant_editor.cpp delete mode 100644 ui/tests/widgets/participant_row.cpp delete mode 100644 ui/tests/windows/resources.cpp delete mode 100644 ui/tests/windows/tracker.cpp (limited to 'ui') diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt index 212559c..1584479 100644 --- a/ui/CMakeLists.txt +++ b/ui/CMakeLists.txt @@ -1,16 +1,10 @@ # Library -add_library("ui" - "src/init.cpp" - "src/widgets/participant_editor.cpp" - "src/widgets/participant_row.cpp" - "src/widgets/preferences.cpp" - "src/widgets/turn_order_view.cpp" - "src/windows/tracker.cpp" - "src/windows/tracker/actions.cpp" - "src/windows/tracker/event_handlers.cpp" -) +file(GLOB_RECURSE UI_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/src" CONFIGURE_DEPENDS "*.ui") +file(GLOB_RECURSE UI_SOURCES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" CONFIGURE_DEPENDS "src/*.cpp") +file(GLOB_RECURSE UI_TESTS RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}" CONFIGURE_DEPENDS "tests/*.cpp") +add_library("ui" ${UI_SOURCES}) add_library("turns::ui" ALIAS "ui") target_compile_options("ui" PUBLIC @@ -32,8 +26,6 @@ target_link_libraries("ui" PUBLIC "PkgConfig::gtkmm" ) -file(GLOB_RECURSE UI_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/src" CONFIGURE_DEPENDS "**.ui") - target_add_glib_resources("ui" PREFIX "/ch/arknet/Turns/" WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src" @@ -46,14 +38,7 @@ enable_coverage("ui") get_target_property(TRANSLATIONS_BINARY_DIR "lang" BINARY_DIR) -add_executable("ui-tests" - "tests/gtk_test_init.cpp" - - "tests/widgets/participant_row.cpp" - "tests/widgets/participant_editor.cpp" - "tests/windows/resources.cpp" - "tests/windows/tracker.cpp" -) +add_executable("ui-tests" ${UI_TESTS}) target_compile_definitions("ui-tests" PUBLIC "TESTLOCALEDIR=\"${TRANSLATIONS_BINARY_DIR}\"" diff --git a/ui/include/turns/ui/fwd.hpp b/ui/include/turns/ui/fwd.hpp new file mode 100644 index 0000000..69dc0b5 --- /dev/null +++ b/ui/include/turns/ui/fwd.hpp @@ -0,0 +1,14 @@ +#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/participant_editor.hpp b/ui/include/turns/ui/participant_editor.hpp new file mode 100644 index 0000000..e2017fd --- /dev/null +++ b/ui/include/turns/ui/participant_editor.hpp @@ -0,0 +1,73 @@ +#ifndef TURNS_UI_PARTICIPANT_EDITOR_HPP +#define TURNS_UI_PARTICIPANT_EDITOR_HPP + +#include "turns/core/disposition.hpp" +#include "turns/core/fwd.hpp" +#include "turns/ui/template_widget.hpp" + +#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", + }; + + ParticipantEditor(Glib::RefPtr participant); + + [[nodiscard]] auto get_disposition() const -> core::disposition; + [[nodiscard]] auto get_name() const -> Glib::ustring; + [[nodiscard]] auto get_priority() const -> double; + + auto set_disposition(core::disposition value) -> void; + auto set_name(Glib::ustring const & value) -> void; + auto set_priority(double value) -> void; + + 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; + + 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::RefPtr m_participant; + + SignalFinishedType m_signal_finished{}; + }; + +} // namespace turns::ui::widgets + +#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 new file mode 100644 index 0000000..dc72013 --- /dev/null +++ b/ui/include/turns/ui/participant_row.hpp @@ -0,0 +1,50 @@ +#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 participant_row : template_widget + { + auto constexpr inline static children = std::array{ + "delete", + "edit", + "subtitle", + "title", + "toggle_defeated", + }; + + participant_row(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 new file mode 100644 index 0000000..bf24274 --- /dev/null +++ b/ui/include/turns/ui/preferences.hpp @@ -0,0 +1,53 @@ +#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 new file mode 100644 index 0000000..7147560 --- /dev/null +++ b/ui/include/turns/ui/template_widget.hpp @@ -0,0 +1,67 @@ +#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 new file mode 100644 index 0000000..3bd631e --- /dev/null +++ b/ui/include/turns/ui/tracker.hpp @@ -0,0 +1,89 @@ +#ifndef TURNS_UI_TRACKER_HPP +#define TURNS_UI_TRACKER_HPP + +#include "turns/core/turn_order.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 + +namespace turns::ui +{ + + struct tracker : Adwaita::ApplicationWindow + { + tracker(BaseObjectType * base, Glib::RefPtr const builder, Glib::RefPtr settings); + + auto load(Glib::RefPtr file) -> void; + + private: + /** 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; + turn_order_view * 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::windows + +#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 new file mode 100644 index 0000000..12a51eb --- /dev/null +++ b/ui/include/turns/ui/turn_order_view.hpp @@ -0,0 +1,40 @@ +#ifndef TURNS_UI_TURN_ORDER_VIEW_HPP +#define TURNS_UI_TURN_ORDER_VIEW_HPP + +#include "turns/core/fwd.hpp" +#include "turns/core/turn_order.hpp" +#include "turns/ui/template_widget.hpp" + +#include +#include + +#include +#include +#include +#include + +#include + +namespace turns::ui +{ + struct turn_order_view : template_widget + { + using model_type = core::turn_order; + + auto constexpr inline static children = std::array{ + "progress", + "view", + }; + + explicit turn_order_view(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 diff --git a/ui/include/turns/ui/widgets/fwd.hpp b/ui/include/turns/ui/widgets/fwd.hpp deleted file mode 100644 index 69f324d..0000000 --- a/ui/include/turns/ui/widgets/fwd.hpp +++ /dev/null @@ -1,12 +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 turn_order_view; - struct preferences; -} // namespace turns::ui::widgets - -#endif \ No newline at end of file diff --git a/ui/include/turns/ui/widgets/participant_editor.hpp b/ui/include/turns/ui/widgets/participant_editor.hpp deleted file mode 100644 index 2fab47d..0000000 --- a/ui/include/turns/ui/widgets/participant_editor.hpp +++ /dev/null @@ -1,73 +0,0 @@ -#ifndef TURNS_UI_WIDGETS_PARTICIPANT_EDITOR_HPP -#define TURNS_UI_WIDGETS_PARTICIPANT_EDITOR_HPP - -#include "turns/core/disposition.hpp" -#include "turns/core/fwd.hpp" -#include "turns/ui/widgets/template_widget.hpp" - -#include - -#include -#include - -#include -#include -#include -#include -#include -#include - -#include -#include -#include -#include - -#include - -namespace turns::ui::widgets -{ - - struct ParticipantEditor : template_widget - { - using SignalFinishedType = sigc::signal; - - auto constexpr inline static children = std::array{ - "disposition", - "finish", - "name", - "priority", - }; - - ParticipantEditor(Glib::RefPtr participant); - - [[nodiscard]] auto get_disposition() const -> core::disposition; - [[nodiscard]] auto get_name() const -> Glib::ustring; - [[nodiscard]] auto get_priority() const -> double; - - auto set_disposition(core::disposition value) -> void; - auto set_name(Glib::ustring const & value) -> void; - auto set_priority(double value) -> void; - - 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; - - 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::RefPtr m_participant; - - SignalFinishedType m_signal_finished{}; - }; - -} // 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 deleted file mode 100644 index f33da34..0000000 --- a/ui/include/turns/ui/widgets/participant_row.hpp +++ /dev/null @@ -1,50 +0,0 @@ -#ifndef TURNS_UI_WIDGETS_PARTICIPANT_ROW_HPP -#define TURNS_UI_WIDGETS_PARTICIPANT_ROW_HPP - -#include "turns/core/fwd.hpp" -#include "turns/ui/widgets/template_widget.hpp" - -#include -#include -#include - -#include -#include -#include -#include - -#include - -namespace turns::ui::widgets -{ - struct participant_row : template_widget - { - auto constexpr inline static children = std::array{ - "delete", - "edit", - "subtitle", - "title", - "toggle_defeated", - }; - - participant_row(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/widgets/preferences.hpp b/ui/include/turns/ui/widgets/preferences.hpp deleted file mode 100644 index 2a56f0b..0000000 --- a/ui/include/turns/ui/widgets/preferences.hpp +++ /dev/null @@ -1,53 +0,0 @@ -#ifndef TURNS_UI_WIDGETS_PREFERENCES_HPP -#define TURNS_UI_WIDGETS_PREFERENCES_HPP - -#include "turns/ui/widgets/template_widget.hpp" - -#include -#include - -#include - -#include -#include - -#include -#include - -#include - -namespace turns::ui::widgets -{ - 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/widgets/template_widget.hpp b/ui/include/turns/ui/widgets/template_widget.hpp deleted file mode 100644 index f04f331..0000000 --- a/ui/include/turns/ui/widgets/template_widget.hpp +++ /dev/null @@ -1,67 +0,0 @@ -#ifndef TURNS_UI_WIDGETS_TEMPLATE_WIDGET_HPP -#define TURNS_UI_WIDGETS_TEMPLATE_WIDGET_HPP - -#include -#include -#include - -#include - -#include -#include -#include - -#include -#include - -namespace turns::ui::widgets -{ - - 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/widgets/turn_order_view.hpp b/ui/include/turns/ui/widgets/turn_order_view.hpp deleted file mode 100644 index a9a3654..0000000 --- a/ui/include/turns/ui/widgets/turn_order_view.hpp +++ /dev/null @@ -1,40 +0,0 @@ -#ifndef TURNS_UI_WIDGETS_TURN_ORDER_VIEW_HPP -#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 -#include - -#include -#include -#include -#include - -#include - -namespace turns::ui::widgets -{ - struct turn_order_view : template_widget - { - using model_type = core::turn_order; - - auto constexpr inline static children = std::array{ - "progress", - "view", - }; - - explicit turn_order_view(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 diff --git a/ui/include/turns/ui/windows/fwd.hpp b/ui/include/turns/ui/windows/fwd.hpp deleted file mode 100644 index 14dbfd1..0000000 --- a/ui/include/turns/ui/windows/fwd.hpp +++ /dev/null @@ -1,9 +0,0 @@ -#ifndef TURNS_UI_WINDOWS_FWD_HPP -#define TURNS_UI_WINDOWS_FWD_HPP - -namespace turns::ui::windows -{ - struct tracker; -} // 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 deleted file mode 100644 index 495f825..0000000 --- a/ui/include/turns/ui/windows/tracker.hpp +++ /dev/null @@ -1,89 +0,0 @@ -#ifndef TURNS_UI_WINDOWS_TRACKER_HPP -#define TURNS_UI_WINDOWS_TRACKER_HPP - -#include "turns/core/turn_order.hpp" -#include "turns/ui/widgets/turn_order_view.hpp" - -#include -#include -#include -#include - -#include -#include -#include - -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include -#include - -#include -#include - -namespace turns::ui::windows -{ - - struct tracker : Adwaita::ApplicationWindow - { - tracker(BaseObjectType * base, Glib::RefPtr const builder, Glib::RefPtr settings); - - auto load(Glib::RefPtr file) -> void; - - private: - /** 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; - widgets::turn_order_view * 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::windows - -#endif \ No newline at end of file diff --git a/ui/src/init.cpp b/ui/src/init.cpp index 6139044..73bd909 100644 --- a/ui/src/init.cpp +++ b/ui/src/init.cpp @@ -1,19 +1,19 @@ #include "turns/ui/init.hpp" -#include "turns/ui/widgets/participant_editor.hpp" -#include "turns/ui/widgets/participant_row.hpp" -#include "turns/ui/widgets/preferences.hpp" -#include "turns/ui/widgets/turn_order_view.hpp" +#include "turns/ui/participant_editor.hpp" +#include "turns/ui/participant_row.hpp" +#include "turns/ui/preferences.hpp" +#include "turns/ui/turn_order_view.hpp" namespace turns::ui { auto register_types() -> void { - static_cast(widgets::ParticipantEditor{{}}); - static_cast(widgets::participant_row{{}}); - static_cast(widgets::preferences{{}}); - static_cast(widgets::turn_order_view{{}}); + static_cast(ParticipantEditor{{}}); + static_cast(participant_row{{}}); + static_cast(preferences{{}}); + static_cast(turn_order_view{{}}); } } // namespace turns::ui \ No newline at end of file diff --git a/ui/src/participant_editor.cpp b/ui/src/participant_editor.cpp new file mode 100644 index 0000000..8598139 --- /dev/null +++ b/ui/src/participant_editor.cpp @@ -0,0 +1,139 @@ +#include "turns/ui/participant_editor.hpp" + +#include "turns/core/disposition.hpp" +#include "turns/core/participant.hpp" +#include "turns/lang/messages.hpp" +#include "turns/ui/template_widget.hpp" + +#include + +#include +#include +#include +#include + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include + +#include +#include +#include + +namespace turns::ui +{ + namespace + { + auto constexpr static TYPE_NAME = "ParticipantEditor"; + auto constexpr static TEMPLATE = "/ch/arknet/Turns/participant_editor.ui"; + } // namespace + + ParticipantEditor::ParticipantEditor(Glib::RefPtr participant) + : Glib::ObjectBase{TYPE_NAME} + , template_widget{TEMPLATE} + , m_disposition{get_widget("disposition")} + , m_finish{get_widget("finish")} + , m_name{get_widget("name")} + , m_priority{get_widget("priority")} + , m_disposition_factory{Gtk::SignalListItemFactory::create()} + , m_disposition_model{Gtk::StringList::create()} + , m_participant{participant} + { + set_title(_(m_participant ? lang::edit_participant : lang::add_participant)); + + m_finish->signal_clicked().connect(sigc::mem_fun(*this, &ParticipantEditor::handle_finish_clicked)); + + for (auto n : std::views::iota(std::uint8_t{}, static_cast(core::disposition::END))) + { + m_disposition_model->append(presentation_name_for(core::disposition{n})); + } + + m_disposition_factory->signal_bind().connect(sigc::mem_fun(*this, &ParticipantEditor::handle_item_bind)); + m_disposition_factory->signal_setup().connect(sigc::mem_fun(*this, &ParticipantEditor::handle_item_setup)); + + m_disposition->set_factory(m_disposition_factory); + m_disposition->set_model(m_disposition_model); + + if (m_participant) + { + set_name(m_participant->property_name().get_value()); + set_priority(m_participant->property_priority()); + set_disposition(m_participant->property_disposition().get_value()); + } + } + + auto ParticipantEditor::get_disposition() const -> core::disposition + { + return static_cast(m_disposition->get_selected()); + } + + auto ParticipantEditor::get_name() const -> Glib::ustring + { + return m_name->get_text(); + } + + auto ParticipantEditor::get_priority() const -> double + { + return m_priority->get_value(); + } + + auto ParticipantEditor::set_disposition(core::disposition value) -> void + { + m_disposition->set_selected(static_cast(value)); + } + + auto ParticipantEditor::set_name(Glib::ustring const & value) -> void + { + m_name->set_text(value); + } + + auto ParticipantEditor::set_priority(double value) -> void + { + m_priority->set_value(value); + } + + auto ParticipantEditor::signal_finished() -> SignalFinishedType + { + return m_signal_finished; + } + + auto ParticipantEditor::handle_finish_clicked() -> void + { + auto name = m_name->get_text(); + auto priority = m_priority->get_value(); + auto disposition = static_cast(m_disposition->get_selected()); + + if (m_participant) + { + m_participant->property_name() = name; + m_participant->property_priority() = priority; + m_participant->property_disposition() = disposition; + } + + m_signal_finished.emit(name, priority, disposition); + close(); + } + + auto ParticipantEditor::handle_item_bind(Glib::RefPtr item) -> void + { + auto value = std::dynamic_pointer_cast(item->get_item())->get_string(); + dynamic_cast(item->get_child())->set_label(value); + } + + auto ParticipantEditor::handle_item_setup(Glib::RefPtr item) -> void + { + item->set_child(*Gtk::make_managed()); + } + +} // namespace turns::ui \ No newline at end of file diff --git a/ui/src/participant_editor.ui b/ui/src/participant_editor.ui new file mode 100644 index 0000000..6bcf83e --- /dev/null +++ b/ui/src/participant_editor.ui @@ -0,0 +1,71 @@ + + + + + + + + diff --git a/ui/src/participant_row.cpp b/ui/src/participant_row.cpp new file mode 100644 index 0000000..b6d18a8 --- /dev/null +++ b/ui/src/participant_row.cpp @@ -0,0 +1,149 @@ +#include "turns/ui/participant_row.hpp" + +#include "turns/core/disposition.hpp" +#include "turns/core/participant.hpp" +#include "turns/lang/messages.hpp" +#include "turns/ui/template_widget.hpp" + +#include + +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include +#include + +#include +#include +#include + +namespace turns::ui +{ + namespace + { + auto constexpr static TYPE_NAME = "participant_row"; + auto constexpr static TEMPLATE = "/ch/arknet/Turns/participant_row.ui"; + + auto css_class_for(core::disposition value) -> Glib::ustring + { + switch (value) + { + case core::disposition::friendly: + return "disposition-friendly"; + case core::disposition::hostile: + return "disposition-hostile"; + case core::disposition::secret: + return "disposition-secret"; + default: + return ""; + } + } + } // namespace + + participant_row::participant_row(Glib::RefPtr participant) + : Glib::ObjectBase(TYPE_NAME) + , template_widget{TEMPLATE} + , m_delete{get_widget("delete")} + , m_edit{get_widget("edit")} + , m_subtitle{get_widget("subtitle")} + , m_title{get_widget("title")} + , m_toggle_defeated{get_widget("toggle_defeated")} + , m_delete_enabled{*this, "delete-enabled", true} + , m_edit_enabled{*this, "edit-enabled", true} + + { + m_delete->signal_clicked().connect(sigc::mem_fun(*this, &participant_row::handle_delete)); + m_edit->signal_clicked().connect(sigc::mem_fun(*this, &participant_row::handle_edit)); + + Glib::Binding::bind_property(m_subtitle->property_label(), + m_subtitle->property_visible(), + Glib::Binding::Flags::DEFAULT, + sigc::mem_fun(&Glib::ustring::size)); + Glib::Binding::bind_property(m_title->property_label(), + m_title->property_visible(), + Glib::Binding::Flags::INVERT_BOOLEAN, + sigc::mem_fun(&Glib::ustring::size)); + Glib::Binding::bind_property(m_toggle_defeated->property_active(), + m_toggle_defeated->property_icon_name(), + Glib::Binding::Flags::SYNC_CREATE, + [](auto active) { return active ? "face-sick-symbolic" : "face-smile-symbolic"; }); + + // clang-format off + Glib::Binding::bind_property(delete_enabled(), + m_delete->property_sensitive(), + Glib::Binding::Flags::SYNC_CREATE); + Glib::Binding::bind_property(edit_enabled(), + m_edit->property_sensitive(), + Glib::Binding::Flags::SYNC_CREATE); + // clang-format on + + if (participant) + { + Glib::Binding::bind_property(participant->property_name(), m_title->property_label(), Glib::Binding::Flags::SYNC_CREATE); + + Glib::Binding::bind_property(participant->property_priority(), + m_subtitle->property_label(), + Glib::Binding::Flags::SYNC_CREATE, + [](auto n) { return std::vformat(_(lang::priority_number), std::make_format_args(n)); }); + + Glib::Binding::bind_property(participant->property_disposition(), + m_toggle_defeated->property_css_classes(), + Glib::Binding::Flags::SYNC_CREATE, + [this](auto value) { + auto classes = m_toggle_defeated->get_css_classes(); + auto removed = std::ranges::remove_if(classes, [](auto cls) { + return (cls == "disposition-friendly") | (cls == "disposition-hostile") || (cls == "disposition-secret"); + }); + classes.erase(removed.begin(), removed.end()); + classes.push_back(css_class_for(value)); + return classes; + }); + + Glib::Binding::bind_property(participant->property_is_active(), + property_css_classes(), + Glib::Binding::Flags::SYNC_CREATE, + [this](auto value) { + auto classes = get_css_classes(); + if (!value) + { + std::erase(classes, "active-participant"); + } + else + { + classes.push_back("active-participant"); + } + return classes; + }); + } + } + + auto participant_row::delete_enabled() -> Glib::PropertyProxy + { + return m_delete_enabled.get_proxy(); + } + + auto participant_row::edit_enabled() -> Glib::PropertyProxy + { + return m_edit_enabled.get_proxy(); + } + + auto participant_row::handle_delete() -> void + { + auto index = Glib::Variant::create(get_index()); + activate_action("win.delete", index); + } + + auto participant_row::handle_edit() -> void + { + auto index = Glib::Variant::create(get_index()); + activate_action("win.edit", index); + } + +} // namespace turns::ui \ No newline at end of file diff --git a/ui/src/participant_row.ui b/ui/src/participant_row.ui new file mode 100644 index 0000000..1a215c6 --- /dev/null +++ b/ui/src/participant_row.ui @@ -0,0 +1,89 @@ + + + + + + + diff --git a/ui/src/preferences.cpp b/ui/src/preferences.cpp new file mode 100644 index 0000000..b521a25 --- /dev/null +++ b/ui/src/preferences.cpp @@ -0,0 +1,81 @@ +#include "turns/ui/preferences.hpp" + +#include "turns/core/settings.hpp" +#include "turns/ui/template_widget.hpp" + +#include +#include + +#include +#include +#include +#include +#include + +#include + +#include +#include +#include +#include + +#include + +#include + +namespace turns::ui +{ + namespace + { + auto constexpr static TYPE_NAME = "preferences"; + auto constexpr static TEMPLATE = "/ch/arknet/Turns/preferences.ui"; + } // namespace + + preferences::preferences(Glib::RefPtr settings) + : Glib::ObjectBase{TYPE_NAME} + , template_widget{TEMPLATE} + , m_settings{settings} + , m_friendly_reset_button{get_widget("friendly_reset_button")} + , m_hostile_reset_button{get_widget("hostile_reset_button")} + , m_secret_reset_button{get_widget("secret_reset_button")} + , m_friendly_color_button{get_widget("friendly_color_button")} + , m_hostile_color_button{get_widget("hostile_color_button")} + , m_secret_color_button{get_widget("secret_color_button")} + , m_skip_defeated{get_widget("skip_defeated")} + { + if (!m_settings) + { + return; + } + + bind_reset(core::settings::key::disposition_friendly_color, m_friendly_reset_button); + bind_setting(core::settings::key::disposition_friendly_color, m_friendly_color_button); + bind_reset(core::settings::key::disposition_hostile_color, m_hostile_reset_button); + bind_setting(core::settings::key::disposition_hostile_color, m_hostile_color_button); + bind_reset(core::settings::key::disposition_secret_color, m_secret_reset_button); + bind_setting(core::settings::key::disposition_secret_color, m_secret_color_button); + + m_settings->bind(core::settings::key::skip_defeated, m_skip_defeated->property_active()); + } + + auto preferences::bind_reset(Glib::ustring const & key, Gtk::Button * button) -> void + { + m_settings->signal_changed(key).connect([=, this](auto) { update_sensitive(key, button); }); + update_sensitive(key, button); + button->signal_clicked().connect(sigc::bind(sigc::mem_fun(*m_settings, &Gio::Settings::reset), key)); + } + + auto preferences::bind_setting(Glib::ustring const & key, Gtk::ColorDialogButton * button) -> void + { + m_settings->bind(key, button->property_rgba(), Gio::Settings::BindFlags::DEFAULT, [](auto value) { + return Gdk::RGBA{value}; + }, [](auto color) { return color.to_string(); }); + } + + auto preferences::update_sensitive(Glib::ustring const & key, Gtk::Button * button) -> void + { + auto v = Glib::Variant{}; + button->set_sensitive(m_settings->get_user_value(key, v)); + } + +} // namespace turns::ui::widgets \ No newline at end of file diff --git a/ui/src/preferences.ui b/ui/src/preferences.ui new file mode 100644 index 0000000..3831274 --- /dev/null +++ b/ui/src/preferences.ui @@ -0,0 +1,104 @@ + + + + + + + + diff --git a/ui/src/tracker.cpp b/ui/src/tracker.cpp new file mode 100644 index 0000000..17aff89 --- /dev/null +++ b/ui/src/tracker.cpp @@ -0,0 +1,240 @@ +#include "turns/ui/tracker.hpp" + +#include "turns/core/turn_order.hpp" +#include "turns/lang/messages.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 +#include + +#include +#include +#include +#include + +#include +#include + +#include +#include +#include +#include +#include + +namespace turns::ui +{ + + tracker::tracker(BaseObjectType * base, Glib::RefPtr const builder, Glib::RefPtr settings) + : ApplicationWindow{base} + , m_controls{builder->get_widget("controls")} + , m_empty{builder->get_widget("empty")} + , m_overlay{builder->get_widget("overlay")} + , m_stack{builder->get_widget("stack")} + , m_start{builder->get_widget("start")} + , m_title{builder->get_widget("title")} + , m_turn_order{core::turn_order::create()} + , m_turn_order_view{Gtk::make_managed(m_turn_order)} + , m_settings{std::move(settings)} + , m_subtitle{m_title->property_subtitle()} + , m_css{Gtk::CssProvider::create()} + { + setup_colors(); + setup_actions(); + + m_stack->add(*m_turn_order_view); + + m_turn_order->is_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)); + update_subtitle(); + + // clang-format off + Glib::Binding::bind_property(m_turn_order->is_empty(), + m_stack->property_visible_child(), + Glib::Binding::Flags::SYNC_CREATE, + [this](auto empty) { return empty ? m_empty : m_turn_order_view; }); + + Glib::Binding::bind_property(m_turn_order->is_running(), + m_controls->property_reveal_child(), + Glib::Binding::Flags::SYNC_CREATE); + // clang-format on + + m_settings->bind("skip-defeated", m_turn_order->skip_defeated()); + } + + auto tracker::setup_actions() -> void + { + // win.add_participant + // depends-on: turn_order:state == stopped + { + auto action = add_action("add_participant", sigc::mem_fun(*this, &tracker::add_participant)); + + Glib::Binding::bind_property(m_turn_order->is_running(), + action->property_enabled(), + Glib::Binding::Flags::SYNC_CREATE | Glib::Binding::Flags::INVERT_BOOLEAN); + } + + // win.clear + // depends-on: turn_order:is_empty == false + { + auto action = add_action("clear", sigc::mem_fun(*m_turn_order, &core::turn_order::clear)); + + Glib::Binding::bind_property(m_turn_order->is_empty(), + action->property_enabled(), + Glib::Binding::Flags::SYNC_CREATE | Glib::Binding::Flags::INVERT_BOOLEAN); + } + + // win.next + // depends-on: turn_order:state == running + { + auto action = add_action("next", sigc::mem_fun(*m_turn_order, &core::turn_order::next)); + + Glib::Binding::bind_property(m_turn_order->is_running(), action->property_enabled(), Glib::Binding::Flags::SYNC_CREATE); + } + + // win.previous + // depends-on: turn_order:has_previous == true + { + auto action = add_action("previous", sigc::mem_fun(*m_turn_order, &core::turn_order::previous)); + + Glib::Binding::bind_property(m_turn_order->has_previous(), action->property_enabled(), Glib::Binding::Flags::SYNC_CREATE); + } + + // win.start + // depends-on: turn_order:is_empty == false + { + auto action = add_action("start", sigc::mem_fun(*m_turn_order, &core::turn_order::start)); + + Glib::Binding::bind_property(m_turn_order->is_empty(), + action->property_enabled(), + Glib::Binding::Flags::SYNC_CREATE | Glib::Binding::Flags::INVERT_BOOLEAN); + + Glib::Binding::bind_property(m_turn_order->is_running(), + m_start->property_visible(), + Glib::Binding::Flags::SYNC_CREATE | Glib::Binding::Flags::INVERT_BOOLEAN); + } + + // win.stop + // depends-on: turn_or