diff options
| -rw-r--r-- | .lcovrc | 3 | ||||
| -rw-r--r-- | CMakeLists.txt | 4 | ||||
| -rw-r--r-- | app/CMakeLists.txt | 71 | ||||
| -rw-r--r-- | app/include/turns/app/application.hpp | 2 | ||||
| -rw-r--r-- | app/src/application.cpp | 6 | ||||
| -rw-r--r-- | cmake/Modules/EnableCoverage.cmake | 6 | ||||
| -rw-r--r-- | core/CMakeLists.txt | 32 | ||||
| -rw-r--r-- | lang/CMakeLists.txt | 6 | ||||
| -rw-r--r-- | res/CMakeLists.txt | 55 | ||||
| -rw-r--r-- | style/CMakeLists.txt | 18 | ||||
| -rw-r--r-- | style/style-dark.css (renamed from res/style-dark.css) | 0 | ||||
| -rw-r--r-- | style/style.css (renamed from res/style.css) | 0 | ||||
| -rw-r--r-- | ui/CMakeLists.txt | 60 | ||||
| -rw-r--r-- | ui/include/turns/ui/widgets/fwd.hpp | 10 | ||||
| -rw-r--r-- | ui/include/turns/ui/widgets/participant_row.hpp (renamed from app/include/turns/app/widgets/participant_row.hpp) | 2 | ||||
| -rw-r--r-- | ui/include/turns/ui/widgets/template_widget.hpp (renamed from app/include/turns/app/widgets/template_widget.hpp) | 0 | ||||
| -rw-r--r-- | ui/include/turns/ui/widgets/turn_order_view.hpp (renamed from app/include/turns/app/widgets/turn_order_view.hpp) | 2 | ||||
| -rw-r--r-- | ui/include/turns/ui/windows/fwd.hpp | 10 | ||||
| -rw-r--r-- | ui/include/turns/ui/windows/participant_editor.hpp (renamed from app/include/turns/app/windows/participant_editor.hpp) | 0 | ||||
| -rw-r--r-- | ui/include/turns/ui/windows/tracker.hpp (renamed from app/include/turns/app/windows/tracker.hpp) | 2 | ||||
| -rw-r--r-- | ui/res/.gitignore (renamed from res/.gitignore) | 0 | ||||
| -rw-r--r-- | ui/res/CMakeLists.txt | 23 | ||||
| -rw-r--r-- | ui/res/ui.cmb (renamed from res/ui.cmb) | 0 | ||||
| -rw-r--r-- | ui/src/widgets/participant_row.cpp (renamed from app/src/widgets/participant_row.cpp) | 4 | ||||
| -rw-r--r-- | ui/src/widgets/turn_order_view.cpp (renamed from app/src/widgets/turn_order_view.cpp) | 6 | ||||
| -rw-r--r-- | ui/src/windows/participant_editor.cpp (renamed from app/src/windows/participant_editor.cpp) | 2 | ||||
| -rw-r--r-- | ui/src/windows/tracker.cpp (renamed from app/src/windows/tracker.cpp) | 6 | ||||
| -rw-r--r-- | ui/tests/widgets/participant_row.cpp (renamed from app/tests/widgets/participant_row.cpp) | 2 | ||||
| -rw-r--r-- | ui/tests/windows/participant_editor.cpp (renamed from app/tests/windows/participant_editor.cpp) | 6 | ||||
| -rw-r--r-- | ui/tests/windows/resources.cpp (renamed from res/tests/windows.cpp) | 2 | ||||
| -rw-r--r-- | ui/tests/windows/tracker.cpp (renamed from app/tests/windows/tracker.cpp) | 4 |
31 files changed, 179 insertions, 165 deletions
@@ -1,8 +1,5 @@ #lcov -c -o cov.info -d build -b . exclude = /usr/include/* -exclude = */catch2/* -exclude = */tests/* -exclude = app/src/application.cpp ignore_errors = unused,empty
\ No newline at end of file diff --git a/CMakeLists.txt b/CMakeLists.txt index 088f9d2..37c5081 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -12,6 +12,7 @@ list(APPEND CMAKE_MODULE_PATH "${PROJECT_SOURCE_DIR}/cmake/Modules") include("Cambalache") include("CheckIPOSupported") +include("EnableCoverage") include("GlibCompileResources") include("GNUInstallDirs") @@ -66,8 +67,9 @@ include("Catch") add_subdirectory("app") add_subdirectory("core") add_subdirectory("lang") -add_subdirectory("res") +add_subdirectory("style") add_subdirectory("test_support") +add_subdirectory("ui") # License diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index 22cf9bf..c39bdf8 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -1,30 +1,15 @@ -# Library +# Application -add_library("app" +add_executable("app" "src/application.cpp" - "src/widgets/participant_row.cpp" - "src/widgets/turn_order_view.cpp" - "src/windows/participant_editor.cpp" - "src/windows/tracker.cpp" -) - -add_library("turns::app" ALIAS "app") - -target_compile_options("app" PUBLIC - "$<$<CXX_COMPILER_ID:GNU,Clang>:-Wall>" - "$<$<CXX_COMPILER_ID:GNU,Clang>:-Wextra>" - "$<$<CXX_COMPILER_ID:GNU,Clang>:-Werror>" - "$<$<CXX_COMPILER_ID:GNU,Clang>:-pedantic-errors>" - PRIVATE - "$<$<AND:$<CXX_COMPILER_ID:GNU,Clang>,$<CONFIG:Debug>>:-fprofile-arcs>" - "$<$<AND:$<CXX_COMPILER_ID:GNU,Clang>,$<CONFIG:Debug>>:-ftest-coverage>" + "src/main.cpp" ) -target_include_directories("app" PUBLIC +target_include_directories("app" PRIVATE "include" ) -target_link_libraries("app" PUBLIC +target_link_libraries("app" PRIVATE "$<$<AND:$<CXX_COMPILER_ID:GNU,Clang>,$<CONFIG:Debug>>:gcov>" "PkgConfig::adwaita" @@ -34,49 +19,7 @@ target_link_libraries("app" PUBLIC "turns::lang" "$<$<CXX_COMPILER_ID:GNU,Clang>:-Wl,--whole-archive>" - "turns::res" + "turns::ui" + "turns::style" "$<$<CXX_COMPILER_ID:GNU,Clang>:-Wl,--no-whole-archive>" ) - -# Application - -add_executable("exe" - "src/main.cpp" -) - -target_link_libraries("exe" PRIVATE - "turns::app" -) - -set_target_properties("exe" PROPERTIES - OUTPUT_NAME "turns" -) - -install(TARGETS "exe" - RUNTIME DESTINATION "${CMAKE_INSTALL_BINDIR}" -) - -configure_file("desktop.in" - "turns.desktop" -) - -install(FILES - "${CMAKE_CURRENT_BINARY_DIR}/turns.desktop" - DESTINATION "${CMAKE_INSTALL_DATAROOTDIR}/applications" -) - -# Tests - -add_executable("app-tests" - "tests/widgets/participant_row.cpp" - "tests/windows/participant_editor.cpp" - "tests/windows/tracker.cpp" -) - -target_link_libraries("app-tests" PRIVATE - "Catch2::Catch2" - "turns::app" - "turns::gtk-test-main" -) - -catch_discover_tests("app-tests")
\ No newline at end of file diff --git a/app/include/turns/app/application.hpp b/app/include/turns/app/application.hpp index 67217f0..c8bc862 100644 --- a/app/include/turns/app/application.hpp +++ b/app/include/turns/app/application.hpp @@ -1,7 +1,7 @@ #ifndef TURNS_APP_APPLICATION_HPP #define TURNS_APP_APPLICATION_HPP -#include "turns/app/windows/tracker.hpp" +#include "turns/ui/windows/fwd.hpp" #include <glibmm/refptr.h> diff --git a/app/src/application.cpp b/app/src/application.cpp index 211d7d9..c0aba86 100644 --- a/app/src/application.cpp +++ b/app/src/application.cpp @@ -1,7 +1,7 @@ #include "turns/app/application.hpp" -#include "turns/app/widgets/turn_order_view.hpp" -#include "turns/app/windows/tracker.hpp" +#include "turns/ui/widgets/turn_order_view.hpp" +#include "turns/ui/windows/tracker.hpp" #include <sigc++/functors/mem_fun.h> @@ -41,7 +41,7 @@ namespace turns::app auto application::on_activate() -> void { - auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/tracker.ui"); + auto builder = Gtk::Builder::create_from_resource("/windows/tracker.ui"); m_tracker = Gtk::Builder::get_widget_derived<windows::tracker>(builder, "tracker"); m_application->add_window(*m_tracker); diff --git a/cmake/Modules/EnableCoverage.cmake b/cmake/Modules/EnableCoverage.cmake new file mode 100644 index 0000000..7d6780e --- /dev/null +++ b/cmake/Modules/EnableCoverage.cmake @@ -0,0 +1,6 @@ +function(enable_coverage TARGET) + target_compile_options("${TARGET}" PRIVATE + "$<$<AND:$<CXX_COMPILER_ID:GNU,Clang>,$<CONFIG:Debug>>:-fcondition-coverage>" + "$<$<AND:$<CXX_COMPILER_ID:GNU,Clang>,$<CONFIG:Debug>>:--coverage>" + ) +endfunction()
\ No newline at end of file diff --git a/core/CMakeLists.txt b/core/CMakeLists.txt index 785421c..4928843 100644 --- a/core/CMakeLists.txt +++ b/core/CMakeLists.txt @@ -1,44 +1,34 @@ -set(COMPONENT "core") - # Library -add_library("${COMPONENT}" +add_library("core" "src/disposition.cpp" "src/participant.cpp" "src/turn_order.cpp" ) -add_library("turns::${COMPONENT}" ALIAS "${COMPONENT}") - +add_library("turns::core" ALIAS "core") -target_compile_options("${COMPONENT}" PUBLIC +target_compile_options("core" PUBLIC "$<$<CXX_COMPILER_ID:GNU,Clang>:-Wall>" "$<$<CXX_COMPILER_ID:GNU,Clang>:-Wextra>" "$<$<CXX_COMPILER_ID:GNU,Clang>:-Werror>" "$<$<CXX_COMPILER_ID:GNU,Clang>:-pedantic-errors>" - PRIVATE - "$<$<AND:$<CXX_COMPILER_ID:GNU,Clang>,$<CONFIG:Debug>>:-fprofile-arcs>" - "$<$<AND:$<CXX_COMPILER_ID:GNU,Clang>,$<CONFIG:Debug>>:-ftest-coverage>" ) -target_include_directories("${COMPONENT}" PUBLIC +target_include_directories("core" PUBLIC "include" ) -target_link_libraries("${COMPONENT}" PUBLIC - "$<$<AND:$<CXX_COMPILER_ID:GNU,Clang>,$<CONFIG:Debug>>:gcov>" - +target_link_libraries("core" PUBLIC "PkgConfig::giomm" "PkgConfig::glibmm" ) -target_link_options("${COMPONENT}" PRIVATE - "$<$<AND:$<CXX_COMPILER_ID:GNU,Clang>,$<CONFIG:Debug>>:--coverage>" -) +enable_coverage("core") # Tests -add_executable("${COMPONENT}-tests" +add_executable("core-tests" "tests/register_types.cpp" "tests/disposition.cpp" @@ -47,11 +37,15 @@ add_executable("${COMPONENT}-tests" "tests/turn_order.cpp" ) -target_link_libraries("${COMPONENT}-tests" +target_link_libraries("core-tests" PRIVATE "Catch2::Catch2" "turns::core" "turns::glib-test-main" ) -catch_discover_tests("${COMPONENT}-tests")
\ No newline at end of file +target_link_options("core-tests" PRIVATE + "$<$<AND:$<CXX_COMPILER_ID:GNU,Clang>,$<CONFIG:Debug>>:--coverage>" +) + +catch_discover_tests("core-tests")
\ No newline at end of file diff --git a/lang/CMakeLists.txt b/lang/CMakeLists.txt index ca5fb0b..303abfe 100644 --- a/lang/CMakeLists.txt +++ b/lang/CMakeLists.txt @@ -61,4 +61,10 @@ target_link_libraries("lang-tests" PRIVATE "turns::intl-test-main" ) +enable_coverage("lang-tests") + +target_link_options("lang-tests" PRIVATE + "$<$<AND:$<CXX_COMPILER_ID:GNU,Clang>,$<CONFIG:Debug>>:--coverage>" +) + catch_discover_tests("lang-tests")
\ No newline at end of file diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt deleted file mode 100644 index a825e4c..0000000 --- a/res/CMakeLists.txt +++ /dev/null @@ -1,55 +0,0 @@ -# Library - -add_library("res") - -set(UI_FILES - "widgets/participant_row.ui" - "widgets/turn_order_view.ui" - "windows/participant_editor.ui" - "windows/tracker.ui" -) - -export_cambalache_files("ui.cmb" UI_FILES ${UI_FILES}) - -target_add_glib_resources("res" - PREFIX "ch/arknet/Turns" - UI_FILES ${UI_FILES} - CSS_FILES - "style.css" - "style-dark.css" -) - -target_compile_options("res" PRIVATE - "$<$<AND:$<CXX_COMPILER_ID:GNU,Clang>,$<CONFIG:Debug>>:-fprofile-arcs>" - "$<$<AND:$<CXX_COMPILER_ID:GNU,Clang>,$<CONFIG:Debug>>:-ftest-coverage>" -) - -target_link_libraries("res" PUBLIC - "$<$<AND:$<CXX_COMPILER_ID:GNU,Clang>,$<CONFIG:Debug>>:gcov>" - - "PkgConfig::adwaita" - "PkgConfig::gtkmm" -) - -target_link_options("res" PRIVATE - "$<$<AND:$<CXX_COMPILER_ID:GNU,Clang>,$<CONFIG:Debug>>:--coverage>" -) - -add_library("turns::res" ALIAS "res") - -# Tests - -add_executable("res-tests" - "tests/windows.cpp" -) - -target_link_libraries("res-tests" PRIVATE - "Catch2::Catch2" - - "$<$<CXX_COMPILER_ID:GNU,Clang>:-Wl,--whole-archive>" - "turns::res" - "$<$<CXX_COMPILER_ID:GNU,Clang>:-Wl,--no-whole-archive>" - "turns::gtk-test-main" -) - -catch_discover_tests("res-tests")
\ No newline at end of file diff --git a/style/CMakeLists.txt b/style/CMakeLists.txt new file mode 100644 index 0000000..8ddbae8 --- /dev/null +++ b/style/CMakeLists.txt @@ -0,0 +1,18 @@ +add_library("style") + +add_library("turns::style" ALIAS "style") + +target_add_glib_resources("style" + PREFIX "ch/arknet/Turns" + CSS_FILES + "style.css" + "style-dark.css" +) + +target_link_libraries("style" PUBLIC + "PkgConfig::giomm" + PRIVATE + "$<$<AND:$<CXX_COMPILER_ID:GNU,Clang>,$<CONFIG:Debug>>:gcov>" +) + +enable_coverage("style") diff --git a/res/style-dark.css b/style/style-dark.css index 926150f..926150f 100644 --- a/res/style-dark.css +++ b/style/style-dark.css diff --git a/res/style.css b/style/style.css index fbc70ad..fbc70ad 100644 --- a/res/style.css +++ b/style/style.css diff --git a/ui/CMakeLists.txt b/ui/CMakeLists.txt new file mode 100644 index 0000000..e3d8941 --- /dev/null +++ b/ui/CMakeLists.txt @@ -0,0 +1,60 @@ +# Library + +add_library("ui" + "src/widgets/participant_row.cpp" + "src/widgets/turn_order_view.cpp" + "src/windows/participant_editor.cpp" + "src/windows/tracker.cpp" + + $<TARGET_OBJECTS:ui-res> +) + +add_library("turns::ui" ALIAS "ui") + +target_compile_options("ui" PUBLIC + "$<$<CXX_COMPILER_ID:GNU,Clang>:-Wall>" + "$<$<CXX_COMPILER_ID:GNU,Clang>:-Wextra>" + "$<$<CXX_COMPILER_ID:GNU,Clang>:-Werror>" + "$<$<CXX_COMPILER_ID:GNU,Clang>:-pedantic-errors>" +) + +target_include_directories("ui" PUBLIC + "include" +) + +target_link_libraries("ui" PUBLIC + "turns::core" + "turns::lang" + "PkgConfig::adwaita" + "PkgConfig::gtkmm" +) + +enable_coverage("ui") + +# Resources + +add_subdirectory("res") + +# Tests + +add_executable("ui-tests" + "tests/widgets/participant_row.cpp" + "tests/windows/participant_editor.cpp" + "tests/windows/resources.cpp" + "tests/windows/tracker.cpp" +) + +target_link_libraries("ui-tests" PRIVATE + "Catch2::Catch2" + + "$<$<CXX_COMPILER_ID:GNU,Clang>:-Wl,--whole-archive>" + "turns::ui" + "$<$<CXX_COMPILER_ID:GNU,Clang>:-Wl,--no-whole-archive>" + "turns::gtk-test-main" +) + +target_link_options("ui-tests" PRIVATE + "$<$<AND:$<CXX_COMPILER_ID:GNU,Clang>,$<CONFIG:Debug>>:--coverage>" +) + +catch_discover_tests("ui-tests") diff --git a/ui/include/turns/ui/widgets/fwd.hpp b/ui/include/turns/ui/widgets/fwd.hpp new file mode 100644 index 0000000..cbb9cae --- /dev/null +++ b/ui/include/turns/ui/widgets/fwd.hpp @@ -0,0 +1,10 @@ +#ifndef TURNS_UI_WIDGETS_FWD_HPP +#define TURNS_UI_WIDGETS_FWD_HPP + +namespace turns::app::widgets +{ + struct participant_row; + struct turn_order_view; +} // namespace turns::app::windows + +#endif
\ No newline at end of file diff --git a/app/include/turns/app/widgets/participant_row.hpp b/ui/include/turns/ui/widgets/participant_row.hpp index 88360db..5564ef4 100644 --- a/app/include/turns/app/widgets/participant_row.hpp +++ b/ui/include/turns/ui/widgets/participant_row.hpp @@ -1,7 +1,7 @@ #ifndef TURNS_APP_WIDGETS_PARTICIPANT_ROW_HPP #define TURNS_APP_WIDGETS_PARTICIPANT_ROW_HPP -#include "turns/app/widgets/template_widget.hpp" +#include "turns/ui/widgets/template_widget.hpp" #include "turns/core/fwd.hpp" #include <glibmm/property.h> diff --git a/app/include/turns/app/widgets/template_widget.hpp b/ui/include/turns/ui/widgets/template_widget.hpp index 5643cb4..5643cb4 100644 --- a/app/include/turns/app/widgets/template_widget.hpp +++ b/ui/include/turns/ui/widgets/template_widget.hpp diff --git a/app/include/turns/app/widgets/turn_order_view.hpp b/ui/include/turns/ui/widgets/turn_order_view.hpp index 88dcde1..b174ce7 100644 --- a/app/include/turns/app/widgets/turn_order_view.hpp +++ b/ui/include/turns/ui/widgets/turn_order_view.hpp @@ -1,7 +1,7 @@ #ifndef TURNS_APP_WIDGETS_TURN_ORDER_VIEW_HPP #define TURNS_APP_WIDGETS_TURN_ORDER_VIEW_HPP -#include "turns/app/widgets/template_widget.hpp" +#include "turns/ui/widgets/template_widget.hpp" #include "turns/core/fwd.hpp" #include <glibmm/object.h> diff --git a/ui/include/turns/ui/windows/fwd.hpp b/ui/include/turns/ui/windows/fwd.hpp new file mode 100644 index 0000000..95d9acd --- /dev/null +++ b/ui/include/turns/ui/windows/fwd.hpp @@ -0,0 +1,10 @@ +#ifndef TURNS_UI_WINDOWS_FWD_HPP +#define TURNS_UI_WINDOWS_FWD_HPP + +namespace turns::app::windows +{ + struct participant_editor; + struct tracker; +} // namespace turns::app::windows + +#endif
\ No newline at end of file diff --git a/app/include/turns/app/windows/participant_editor.hpp b/ui/include/turns/ui/windows/participant_editor.hpp index 1fa42bb..1fa42bb 100644 --- a/app/include/turns/app/windows/participant_editor.hpp +++ b/ui/include/turns/ui/windows/participant_editor.hpp diff --git a/app/include/turns/app/windows/tracker.hpp b/ui/include/turns/ui/windows/tracker.hpp index bf3531a..4af7c43 100644 --- a/app/include/turns/app/windows/tracker.hpp +++ b/ui/include/turns/ui/windows/tracker.hpp @@ -1,7 +1,7 @@ #ifndef TURNS_APP_WINDOWS_TRACKER_HPP #define TURNS_APP_WINDOWS_TRACKER_HPP -#include "turns/app/widgets/turn_order_view.hpp" +#include "turns/ui/widgets/turn_order_view.hpp" #include "turns/core/turn_order.hpp" #include <glibmm/refptr.h> diff --git a/res/.gitignore b/ui/res/.gitignore index 25284c2..25284c2 100644 --- a/res/.gitignore +++ b/ui/res/.gitignore diff --git a/ui/res/CMakeLists.txt b/ui/res/CMakeLists.txt new file mode 100644 index 0000000..94d41ef --- /dev/null +++ b/ui/res/CMakeLists.txt @@ -0,0 +1,23 @@ +add_library("ui-res" OBJECT) + +target_link_libraries("ui-res" PRIVATE + "PkgConfig::giomm" +) + +set(UI_FILES + "widgets/participant_row.ui" + "widgets/turn_order_view.ui" + "windows/participant_editor.ui" + "windows/tracker.ui" +) + +export_cambalache_files("ui.cmb" + UI_FILES ${UI_FILES} +) + +target_add_glib_resources("ui-res" + PREFIX "/" + UI_FILES ${UI_FILES} +) + +enable_coverage("ui-res")
\ No newline at end of file diff --git a/res/ui.cmb b/ui/res/ui.cmb index f3cc8e8..f3cc8e8 100644 --- a/res/ui.cmb +++ b/ui/res/ui.cmb diff --git a/app/src/widgets/participant_row.cpp b/ui/src/widgets/participant_row.cpp index c04eee0..3e058b2 100644 --- a/app/src/widgets/participant_row.cpp +++ b/ui/src/widgets/participant_row.cpp @@ -1,4 +1,4 @@ -#include "turns/app/widgets/participant_row.hpp" +#include "turns/ui/widgets/participant_row.hpp" #include "turns/core/disposition.hpp" #include "turns/core/participant.hpp" @@ -17,7 +17,7 @@ namespace turns::app::widgets namespace { auto constexpr static TYPE_NAME = "participant_row"; - auto constexpr static TEMPLATE = "/ch/arknet/Turns/widgets/participant_row.ui"; + auto constexpr static TEMPLATE = "/widgets/participant_row.ui"; auto css_class_for(core::disposition value) -> Glib::ustring { diff --git a/app/src/widgets/turn_order_view.cpp b/ui/src/widgets/turn_order_view.cpp index 9e69127..9456cbe 100644 --- a/app/src/widgets/turn_order_view.cpp +++ b/ui/src/widgets/turn_order_view.cpp @@ -1,6 +1,6 @@ -#include "turns/app/widgets/turn_order_view.hpp" +#include "turns/ui/widgets/turn_order_view.hpp" -#include "turns/app/widgets/participant_row.hpp" +#include "turns/ui/widgets/participant_row.hpp" #include "turns/core/participant.hpp" #include "turns/core/turn_order.hpp" @@ -15,7 +15,7 @@ namespace turns::app::widgets namespace { auto constexpr static TYPE_NAME = "turn_order_view"; - auto constexpr static TEMPLATE = "/ch/arknet/Turns/widgets/turn_order_view.ui"; + auto constexpr static TEMPLATE = "/widgets/turn_order_view.ui"; } // namespace turn_order_view::turn_order_view(Glib::RefPtr<model_type> model) diff --git a/app/src/windows/participant_editor.cpp b/ui/src/windows/participant_editor.cpp index 1c8d05c..ec31c68 100644 --- a/app/src/windows/participant_editor.cpp +++ b/ui/src/windows/participant_editor.cpp @@ -1,4 +1,4 @@ -#include "turns/app/windows/participant_editor.hpp" +#include "turns/ui/windows/participant_editor.hpp" #include "turns/core/disposition.hpp" #include "turns/core/participant.hpp" diff --git a/app/src/windows/tracker.cpp b/ui/src/windows/tracker.cpp index 7188968..4372117 100644 --- a/app/src/windows/tracker.cpp +++ b/ui/src/windows/tracker.cpp @@ -1,6 +1,6 @@ -#include "turns/app/windows/tracker.hpp" +#include "turns/ui/windows/tracker.hpp" -#include "turns/app/windows/participant_editor.hpp" +#include "turns/ui/windows/participant_editor.hpp" #include "turns/core/participant.hpp" #include "turns/core/turn_order.hpp" #include "turns/lang/messages.hpp" @@ -19,7 +19,7 @@ namespace turns::app::windows { auto editor_for(Glib::RefPtr<core::participant> participant) { - auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/participant_editor.ui"); + auto builder = Gtk::Builder::create_from_resource("/windows/participant_editor.ui"); return std::pair{builder, Gtk::Builder::get_widget_derived<windows::participant_editor>(builder, "participant_editor", participant)}; } diff --git a/app/tests/widgets/participant_row.cpp b/ui/tests/widgets/participant_row.cpp index 8f20f56..f2af510 100644 --- a/app/tests/widgets/participant_row.cpp +++ b/ui/tests/widgets/participant_row.cpp @@ -1,4 +1,4 @@ -#include "turns/app/widgets/participant_row.hpp" +#include "turns/ui/widgets/participant_row.hpp" #include "turns/core/disposition.hpp" #include "turns/core/participant.hpp" diff --git a/app/tests/windows/participant_editor.cpp b/ui/tests/windows/participant_editor.cpp index f9f59ee..99a4ded 100644 --- a/app/tests/windows/participant_editor.cpp +++ b/ui/tests/windows/participant_editor.cpp @@ -1,4 +1,4 @@ -#include "turns/app/windows/participant_editor.hpp" +#include "turns/ui/windows/participant_editor.hpp" #include "turns/core/disposition.hpp" #include "turns/core/participant.hpp" @@ -24,7 +24,7 @@ namespace turns::app::windows::tests auto locale = GENERATE("en_US.UTF-8", "de_CH.UTF-8"); setlocale(LC_ALL, locale); - auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/participant_editor.ui"); + auto builder = Gtk::Builder::create_from_resource("/windows/participant_editor.ui"); auto instance = Gtk::Builder::get_widget_derived<participant_editor>(builder, "participant_editor"); auto window = Gtk::Window{}; @@ -69,7 +69,7 @@ namespace turns::app::windows::tests setlocale(LC_ALL, locale); auto participant = core::participant::create("Qibi Babblebranch", 12, core::disposition::neutral); - auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/participant_editor.ui"); + auto builder = Gtk::Builder::create_from_resource("/windows/participant_editor.ui"); auto instance = Gtk::Builder::get_widget_derived<participant_editor>(builder, "participant_editor", participant); auto window = Gtk::Window{}; diff --git a/res/tests/windows.cpp b/ui/tests/windows/resources.cpp index 75e21fb..315181a 100644 --- a/res/tests/windows.cpp +++ b/ui/tests/windows/resources.cpp @@ -4,7 +4,7 @@ TEST_CASE("GResource for tracker") { - auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/tracker.ui"); + auto builder = Gtk::Builder::create_from_resource("/windows/tracker.ui"); SECTION("can create Gtk.Builder for the main window UI definition") { diff --git a/app/tests/windows/tracker.cpp b/ui/tests/windows/tracker.cpp index 3d7f0c2..3ec5658 100644 --- a/app/tests/windows/tracker.cpp +++ b/ui/tests/windows/tracker.cpp @@ -1,4 +1,4 @@ -#include "turns/app/windows/tracker.hpp" +#include "turns/ui/windows/tracker.hpp" #include "turns/lang/messages.hpp" @@ -23,7 +23,7 @@ namespace turns::app::windows::tests auto locale = GENERATE("en_US.UTF-8", "de_CH.UTF-8"); setlocale(LC_ALL, locale); - auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/tracker.ui"); + auto builder = Gtk::Builder::create_from_resource("/windows/tracker.ui"); auto instance = Gtk::Builder::get_widget_derived<tracker>(builder, "tracker"); SECTION("was successfully constructed") |