From 1d74095f77cc19ba4886d502bbb7a290f9874c9f Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Tue, 29 Apr 2025 14:00:29 +0200 Subject: ui: move UI builder files --- ui/CMakeLists.txt | 12 +-- ui/res/CMakeLists.txt | 20 ----- ui/res/ui.cmb | 10 --- ui/res/widgets/participant_row.ui | 88 ------------------ ui/res/widgets/preferences.ui | 103 ---------------------- ui/res/widgets/turn_order_view.ui | 37 -------- ui/res/windows/about.ui | 12 --- ui/res/windows/participant_editor.ui | 70 --------------- ui/res/windows/tracker.ui | 152 -------------------------------- ui/src/widgets/participant_row.cpp | 2 +- ui/src/widgets/participant_row.ui | 88 ++++++++++++++++++ ui/src/widgets/preferences.cpp | 2 +- ui/src/widgets/preferences.ui | 103 ++++++++++++++++++++++ ui/src/widgets/turn_order_view.cpp | 2 +- ui/src/widgets/turn_order_view.ui | 37 ++++++++ ui/src/windows/participant_editor.ui | 70 +++++++++++++++ ui/src/windows/tracker.ui | 152 ++++++++++++++++++++++++++++++++ ui/src/windows/tracker/actions.cpp | 2 +- ui/tests/windows/participant_editor.cpp | 2 +- ui/tests/windows/resources.cpp | 4 +- ui/tests/windows/tracker.cpp | 2 +- ui/ui.cmb | 10 +++ 22 files changed, 475 insertions(+), 505 deletions(-) delete mode 100644 ui/res/CMakeLists.txt delete mode 100644 ui/res/ui.cmb delete mode 100644 ui/res/widgets/participant_row.ui delete mode 100644 ui/res/widgets/preferences.ui delete mode 100644 ui/res/widgets/turn_order_view.ui delete mode 100644 ui/res/windows/about.ui delete mode 100644 ui/res/windows/participant_editor.ui delete mode 100644 ui/res/windows/tracker.ui create mode 100644 ui/src/widgets/participant_row.ui create mode 100644 ui/src/widgets/preferences.ui create mode 100644 ui/src/widgets/turn_order_view.ui create mode 100644 ui/src/windows/participant_editor.ui create mode 100644 ui/src/windows/tracker.ui create mode 100644 ui/ui.cmb (limited to 'ui') diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt index ed27699..736db84 100644 --- a/ui/CMakeLists.txt +++ b/ui/CMakeLists.txt @@ -9,8 +9,6 @@ add_library("ui" "src/windows/tracker.cpp" "src/windows/tracker/actions.cpp" "src/windows/tracker/event_handlers.cpp" - - $ ) add_library("turns::ui" ALIAS "ui") @@ -34,11 +32,15 @@ target_link_libraries("ui" PUBLIC "PkgConfig::gtkmm" ) -enable_coverage("ui") +file(GLOB_RECURSE UI_FILES RELATIVE "${CMAKE_CURRENT_SOURCE_DIR}/src" CONFIGURE_DEPENDS "**.ui") -# Resources +target_add_glib_resources("ui" + PREFIX "/ch/arknet/Turns/" + WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/src" + UI_FILES ${UI_FILES} +) -add_subdirectory("res") +enable_coverage("ui") # Tests diff --git a/ui/res/CMakeLists.txt b/ui/res/CMakeLists.txt deleted file mode 100644 index 340232a..0000000 --- a/ui/res/CMakeLists.txt +++ /dev/null @@ -1,20 +0,0 @@ -add_library("ui-res" OBJECT) - -target_link_libraries("ui-res" PRIVATE - "PkgConfig::giomm" -) - -set(UI_FILES - "widgets/participant_row.ui" - "widgets/preferences.ui" - "widgets/turn_order_view.ui" - "windows/participant_editor.ui" - "windows/tracker.ui" -) - -target_add_glib_resources("ui-res" - PREFIX "/" - UI_FILES ${UI_FILES} -) - -enable_coverage("ui-res") \ No newline at end of file diff --git a/ui/res/ui.cmb b/ui/res/ui.cmb deleted file mode 100644 index 132e8d2..0000000 --- a/ui/res/ui.cmb +++ /dev/null @@ -1,10 +0,0 @@ - - - - - - - - - - diff --git a/ui/res/widgets/participant_row.ui b/ui/res/widgets/participant_row.ui deleted file mode 100644 index da7712d..0000000 --- a/ui/res/widgets/participant_row.ui +++ /dev/null @@ -1,88 +0,0 @@ - - - - - - diff --git a/ui/res/widgets/preferences.ui b/ui/res/widgets/preferences.ui deleted file mode 100644 index 74a7845..0000000 --- a/ui/res/widgets/preferences.ui +++ /dev/null @@ -1,103 +0,0 @@ - - - - - - - diff --git a/ui/res/widgets/turn_order_view.ui b/ui/res/widgets/turn_order_view.ui deleted file mode 100644 index 50d91c5..0000000 --- a/ui/res/widgets/turn_order_view.ui +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - diff --git a/ui/res/windows/about.ui b/ui/res/windows/about.ui deleted file mode 100644 index 6ba49c5..0000000 --- a/ui/res/windows/about.ui +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - Turns - Felix Morgner <felix.morgner@gmail.com> - https://source.arknet.ch/fmorgner/turns/-/issues - lgpl-2-1 - https://turns.arknet.ch - - diff --git a/ui/res/windows/participant_editor.ui b/ui/res/windows/participant_editor.ui deleted file mode 100644 index 0eebf52..0000000 --- a/ui/res/windows/participant_editor.ui +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - True - 18 - 12 - 12 - 18 - vertical - 18 - start - - - - - Name - - - - - - - -1000.0 - 1.0 - 1000.0 - - - 1 - True - Priority - - - - - Disposition - - - - - - - True - Finish - - - - - - - - - - - - - True - - diff --git a/ui/res/windows/tracker.ui b/ui/res/windows/tracker.ui deleted file mode 100644 index 787347c..0000000 --- a/ui/res/windows/tracker.ui +++ /dev/null @@ -1,152 +0,0 @@ - - - - - - - - - - - - - - - - - - win.add_participant - center - Add participant - - - - contact-new-symbolic - - - - - - - - - strict - - - True - No active turn order - Turns - - - - - open-menu - main_menu - Main Menu - True - - - - - win.add_participant - contact-new - Add participant - - - - - win.start - media-playback-start-symbolic - Start turn order - - - - - - - - win.stop - media-playback-stop-symbolic - End turn order - - - - - - win.next - media-skip-forward-symbolic - Next participant - - - - - - - slide-up - - - + + + + + + + + True + vertical + center + + + word-char + 0.0 + + + + + + word-char + 0.0 + + + + + + + + center + + + edit-delete-symbolic + Delete participant + + + + + + document-edit-symbolic + Edit participant + + + + + + + + + + False + center + + diff --git a/ui/src/widgets/preferences.cpp b/ui/src/widgets/preferences.cpp index e9dde1e..327860f 100644 --- a/ui/src/widgets/preferences.cpp +++ b/ui/src/widgets/preferences.cpp @@ -28,7 +28,7 @@ namespace turns::ui::widgets namespace { auto constexpr static TYPE_NAME = "preferences"; - auto constexpr static TEMPLATE = "/widgets/preferences.ui"; + auto constexpr static TEMPLATE = "/ch/arknet/Turns/widgets/preferences.ui"; } // namespace preferences::preferences(Glib::RefPtr settings) diff --git a/ui/src/widgets/preferences.ui b/ui/src/widgets/preferences.ui new file mode 100644 index 0000000..74a7845 --- /dev/null +++ b/ui/src/widgets/preferences.ui @@ -0,0 +1,103 @@ + + + + + + + diff --git a/ui/src/widgets/turn_order_view.cpp b/ui/src/widgets/turn_order_view.cpp index f3db3c4..97f3834 100644 --- a/ui/src/widgets/turn_order_view.cpp +++ b/ui/src/widgets/turn_order_view.cpp @@ -24,7 +24,7 @@ namespace turns::ui::widgets namespace { auto constexpr static TYPE_NAME = "turn_order_view"; - auto constexpr static TEMPLATE = "/widgets/turn_order_view.ui"; + auto constexpr static TEMPLATE = "/ch/arknet/Turns/widgets/turn_order_view.ui"; } // namespace turn_order_view::turn_order_view(Glib::RefPtr model) diff --git a/ui/src/widgets/turn_order_view.ui b/ui/src/widgets/turn_order_view.ui new file mode 100644 index 0000000..50d91c5 --- /dev/null +++ b/ui/src/widgets/turn_order_view.ui @@ -0,0 +1,37 @@ + + + + + + + diff --git a/ui/src/windows/participant_editor.ui b/ui/src/windows/participant_editor.ui new file mode 100644 index 0000000..0eebf52 --- /dev/null +++ b/ui/src/windows/participant_editor.ui @@ -0,0 +1,70 @@ + + + + + + + + + + + + + True + 18 + 12 + 12 + 18 + vertical + 18 + start + + + + + Name + + + + + + + -1000.0 + 1.0 + 1000.0 + + + 1 + True + Priority + + + + + Disposition + + + + + + + True + Finish + + + + + + + + + + + + + True + + diff --git a/ui/src/windows/tracker.ui b/ui/src/windows/tracker.ui new file mode 100644 index 0000000..787347c --- /dev/null +++ b/ui/src/windows/tracker.ui @@ -0,0 +1,152 @@ + + + + + + + + + + + + + + + + + + win.add_participant + center + Add participant + + + + contact-new-symbolic + + + + + + + + + strict + + + True + No active turn order + Turns + + + + + open-menu + main_menu + Main Menu + True + + + + + win.add_participant + contact-new + Add participant + + + + + win.start + media-playback-start-symbolic + Start turn order + + + + + + + + win.stop + media-playback-stop-symbolic + End turn order + + + + + + win.next + media-skip-forward-symbolic + Next participant + + + + + + + slide-up + + +