summaryrefslogtreecommitdiff
path: root/ui
diff options
context:
space:
mode:
Diffstat (limited to 'ui')
-rw-r--r--ui/CMakeLists.txt12
-rw-r--r--ui/res/CMakeLists.txt20
-rw-r--r--ui/res/ui.cmb10
-rw-r--r--ui/res/windows/about.ui12
-rw-r--r--ui/src/widgets/participant_row.cpp2
-rw-r--r--ui/src/widgets/participant_row.ui (renamed from ui/res/widgets/participant_row.ui)0
-rw-r--r--ui/src/widgets/preferences.cpp2
-rw-r--r--ui/src/widgets/preferences.ui (renamed from ui/res/widgets/preferences.ui)0
-rw-r--r--ui/src/widgets/turn_order_view.cpp2
-rw-r--r--ui/src/widgets/turn_order_view.ui (renamed from ui/res/widgets/turn_order_view.ui)0
-rw-r--r--ui/src/windows/participant_editor.ui (renamed from ui/res/windows/participant_editor.ui)0
-rw-r--r--ui/src/windows/tracker.ui (renamed from ui/res/windows/tracker.ui)0
-rw-r--r--ui/src/windows/tracker/actions.cpp2
-rw-r--r--ui/tests/windows/participant_editor.cpp2
-rw-r--r--ui/tests/windows/resources.cpp4
-rw-r--r--ui/tests/windows/tracker.cpp2
-rw-r--r--ui/ui.cmb10
17 files changed, 25 insertions, 55 deletions
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"
-
- $<TARGET_OBJECTS:ui-res>
)
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 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?>
-<!DOCTYPE cambalache-project SYSTEM "cambalache-project.dtd">
-<!-- Created with Cambalache 0.96.0 -->
-<cambalache-project version="0.96.0" target_tk="gtk-4.0">
- <ui filename="windows/tracker.ui" sha256="202fa40749c48dd8164080e93bd3bca2a8f4e3a6cb3664b9636bfa35fbcbe357"/>
- <ui filename="windows/participant_editor.ui" sha256="0883791ea75d2e99a7a0369d00e34f41e1d8dff92d61568b2565891d4e096f35"/>
- <ui template-class="gtkmm__CustomObject_participant_row" filename="widgets/participant_row.ui" sha256="01de522f8035830ca30ee41d3a309d2fe48c55c58c8f8e58ceb399049aa9894c"/>
- <ui template-class="gtkmm__CustomObject_turn_order_view" filename="widgets/turn_order_view.ui" sha256="ed88438fb1ea77f4efc4345063ea8f2393614f02d60a1403353bd383869529c9"/>
- <ui template-class="gtkmm__CustomObject_preferences" filename="widgets/preferences.ui" sha256="33a36973a4ccfe559dcfd2835d0f35ab1a7659bd3151a301e8177f001a8f32e3"/>
-</cambalache-project>
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 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.94.1 -->
-<interface>
- <requires lib="libadwaita" version="1.5"/>
- <object class="AdwAboutDialog" id="about">
- <property name="application-name">Turns</property>
- <property name="developers">Felix Morgner &lt;felix.morgner@gmail.com&gt;</property>
- <property name="issue-url">https://source.arknet.ch/fmorgner/turns/-/issues</property>
- <property name="license-type">lgpl-2-1</property>
- <property name="website">https://turns.arknet.ch</property>
- </object>
-</interface>
diff --git a/ui/src/widgets/participant_row.cpp b/ui/src/widgets/participant_row.cpp
index 367870a..6902a1c 100644
--- a/ui/src/widgets/participant_row.cpp
+++ b/ui/src/widgets/participant_row.cpp
@@ -29,7 +29,7 @@ namespace turns::ui::widgets
namespace
{
auto constexpr static TYPE_NAME = "participant_row";
- auto constexpr static TEMPLATE = "/widgets/participant_row.ui";
+ auto constexpr static TEMPLATE = "/ch/arknet/Turns/widgets/participant_row.ui";
auto css_class_for(core::disposition value) -> Glib::ustring
{
diff --git a/ui/res/widgets/participant_row.ui b/ui/src/widgets/participant_row.ui
index da7712d..da7712d 100644
--- a/ui/res/widgets/participant_row.ui
+++ b/ui/src/widgets/participant_row.ui
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<Gio::Settings> settings)
diff --git a/ui/res/widgets/preferences.ui b/ui/src/widgets/preferences.ui
index 74a7845..74a7845 100644
--- a/ui/res/widgets/preferences.ui
+++ b/ui/src/widgets/preferences.ui
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_type> model)
diff --git a/ui/res/widgets/turn_order_view.ui b/ui/src/widgets/turn_order_view.ui
index 50d91c5..50d91c5 100644
--- a/ui/res/widgets/turn_order_view.ui
+++ b/ui/src/widgets/turn_order_view.ui
diff --git a/ui/res/windows/participant_editor.ui b/ui/src/windows/participant_editor.ui
index 0eebf52..0eebf52 100644
--- a/ui/res/windows/participant_editor.ui
+++ b/ui/src/windows/participant_editor.ui
diff --git a/ui/res/windows/tracker.ui b/ui/src/windows/tracker.ui
index 787347c..787347c 100644
--- a/ui/res/windows/tracker.ui
+++ b/ui/src/windows/tracker.ui
diff --git a/ui/src/windows/tracker/actions.cpp b/ui/src/windows/tracker/actions.cpp
index 36d12f3..bbb0c7e 100644
--- a/ui/src/windows/tracker/actions.cpp
+++ b/ui/src/windows/tracker/actions.cpp
@@ -37,7 +37,7 @@ namespace turns::ui::windows
{
auto editor_for(Glib::RefPtr<core::participant> participant)
{
- auto builder = Gtk::Builder::create_from_resource("/windows/participant_editor.ui");
+ auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/participant_editor.ui");
return std::pair{builder, Gtk::Builder::get_widget_derived<participant_editor>(builder, "participant_editor", participant)};
}
diff --git a/ui/tests/windows/participant_editor.cpp b/ui/tests/windows/participant_editor.cpp
index 3bc5cf4..02e387f 100644
--- a/ui/tests/windows/participant_editor.cpp
+++ b/ui/tests/windows/participant_editor.cpp
@@ -30,7 +30,7 @@ namespace turns::ui::windows::tests
auto locale = GENERATE("en_US.UTF-8", "de_CH.UTF-8");
setlocale(LC_ALL, locale);
- auto builder = Gtk::Builder::create_from_resource("/windows/participant_editor.ui");
+ auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/participant_editor.ui");
auto instance = Gtk::Builder::get_widget_derived<participant_editor>(builder, "participant_editor");
auto window = Gtk::Window{};
diff --git a/ui/tests/windows/resources.cpp b/ui/tests/windows/resources.cpp
index eb1fce4..b9ac42e 100644
--- a/ui/tests/windows/resources.cpp
+++ b/ui/tests/windows/resources.cpp
@@ -5,7 +5,7 @@
TEST_CASE("GResource for tracker")
{
- auto builder = Gtk::Builder::create_from_resource("/windows/tracker.ui");
+ auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/tracker.ui");
SECTION("can create Gtk.Builder for the tracker window UI definition")
{
@@ -15,7 +15,7 @@ TEST_CASE("GResource for tracker")
TEST_CASE("GResource for participant_editor")
{
- auto builder = Gtk::Builder::create_from_resource("/windows/participant_editor.ui");
+ auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/participant_editor.ui");
SECTION("can create Gtk.Builder for the participant_editor window UI definition")
{
diff --git a/ui/tests/windows/tracker.cpp b/ui/tests/windows/tracker.cpp
index 384d7f1..0f79000 100644
--- a/ui/tests/windows/tracker.cpp
+++ b/ui/tests/windows/tracker.cpp
@@ -26,7 +26,7 @@ namespace turns::ui::windows::tests
auto locale = GENERATE("en_US.UTF-8", "de_CH.UTF-8");
setlocale(LC_ALL, locale);
- auto builder = Gtk::Builder::create_from_resource("/windows/tracker.ui");
+ auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/tracker.ui");
auto instance = Gtk::Builder::get_widget_derived<tracker>(builder, "tracker", core::get_settings());
SECTION("was successfully constructed")
diff --git a/ui/ui.cmb b/ui/ui.cmb
new file mode 100644
index 0000000..89ae040
--- /dev/null
+++ b/ui/ui.cmb
@@ -0,0 +1,10 @@
+<?xml version='1.0' encoding='UTF-8' standalone='no'?>
+<!DOCTYPE cambalache-project SYSTEM "cambalache-project.dtd">
+<!-- Created with Cambalache 0.96.0 -->
+<cambalache-project version="0.96.0" target_tk="gtk-4.0">
+ <ui filename="src/windows/tracker.ui" sha256="202fa40749c48dd8164080e93bd3bca2a8f4e3a6cb3664b9636bfa35fbcbe357"/>
+ <ui filename="src/windows/participant_editor.ui" sha256="0883791ea75d2e99a7a0369d00e34f41e1d8dff92d61568b2565891d4e096f35"/>
+ <ui template-class="gtkmm__CustomObject_participant_row" filename="src/widgets/participant_row.ui" sha256="01de522f8035830ca30ee41d3a309d2fe48c55c58c8f8e58ceb399049aa9894c"/>
+ <ui template-class="gtkmm__CustomObject_turn_order_view" filename="src/widgets/turn_order_view.ui" sha256="ed88438fb1ea77f4efc4345063ea8f2393614f02d60a1403353bd383869529c9"/>
+ <ui template-class="gtkmm__CustomObject_preferences" filename="src/widgets/preferences.ui" sha256="33a36973a4ccfe559dcfd2835d0f35ab1a7659bd3151a301e8177f001a8f32e3"/>
+</cambalache-project>
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-17 18:06:16 +0000