summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--app/CMakeLists.txt6
-rw-r--r--app/include/turns/app/application.hpp4
-rw-r--r--app/include/turns/app/windows/tracker.hpp (renamed from app/include/turns/app/windows/main.hpp)8
-rw-r--r--app/src/application.cpp16
-rw-r--r--app/src/main.cpp (renamed from app/src/turns.cpp)0
-rw-r--r--app/src/windows/tracker.cpp (renamed from app/src/windows/main.cpp)12
-rw-r--r--app/tests/windows/tracker.cpp (renamed from app/tests/windows/main.cpp)8
-rw-r--r--res/CMakeLists.txt2
-rw-r--r--res/tests/windows.cpp4
-rw-r--r--res/ui.cmb4
10 files changed, 32 insertions, 32 deletions
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt
index eb426ca..0514383 100644
--- a/app/CMakeLists.txt
+++ b/app/CMakeLists.txt
@@ -4,8 +4,8 @@ add_library("app"
"src/application.cpp"
"src/widgets/participant_row.cpp"
"src/widgets/turn_order_view.cpp"
- "src/windows/main.cpp"
"src/windows/participant_editor.cpp"
+ "src/windows/tracker.cpp"
)
add_library("turns::app" ALIAS "app")
@@ -41,7 +41,7 @@ target_link_libraries("app" PUBLIC
# Application
add_executable("exe"
- "src/turns.cpp"
+ "src/main.cpp"
)
target_link_libraries("exe" PRIVATE
@@ -69,8 +69,8 @@ install(FILES
add_executable("app-tests"
"tests/widgets/participant_row.cpp"
- "tests/windows/main.cpp"
"tests/windows/participant_editor.cpp"
+ "tests/windows/tracker.cpp"
)
target_link_libraries("app-tests" PRIVATE
diff --git a/app/include/turns/app/application.hpp b/app/include/turns/app/application.hpp
index 6506dd7..680c3af 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/main.hpp"
+#include "turns/app/windows/tracker.hpp"
#include <memory>
@@ -31,7 +31,7 @@ namespace turns::app
AdwApplication * m_adw;
Glib::RefPtr<Gtk::Application> m_application;
- windows::main * m_main;
+ windows::tracker * m_tracker;
};
} // namespace turns::app
diff --git a/app/include/turns/app/windows/main.hpp b/app/include/turns/app/windows/tracker.hpp
index 29bad85..ed7260e 100644
--- a/app/include/turns/app/windows/main.hpp
+++ b/app/include/turns/app/windows/tracker.hpp
@@ -1,5 +1,5 @@
-#ifndef TURNS_APP_WINDOWS_MAIN_WINDOW_HPP
-#define TURNS_APP_WINDOWS_MAIN_WINDOW_HPP
+#ifndef TURNS_APP_WINDOWS_TRACKER_HPP
+#define TURNS_APP_WINDOWS_TRACKER_HPP
#include "turns/domain/turn_order.hpp"
#include "turns/app/widgets/turn_order_view.hpp"
@@ -22,9 +22,9 @@
namespace turns::app::windows
{
- struct main : Gtk::ApplicationWindow
+ struct tracker : Gtk::ApplicationWindow
{
- main(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder);
+ tracker(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder);
private:
auto handle_add_participant() -> void;
diff --git a/app/src/application.cpp b/app/src/application.cpp
index 35dcfdb..efa1ce0 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/main.hpp"
+#include "turns/app/windows/tracker.hpp"
#include <glibmm/wrap.h>
#include <gtkmm/builder.h>
@@ -37,22 +37,22 @@ namespace turns::app
auto application::handle_action_quit() -> void
{
- m_main->close();
+ m_tracker->close();
}
auto application::on_activate() -> void
{
- auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/main.ui");
- m_main = Gtk::Builder::get_widget_derived<windows::main>(builder, "main");
+ auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/tracker.ui");
+ m_tracker = Gtk::Builder::get_widget_derived<windows::tracker>(builder, "tracker");
- m_application->add_window(*m_main);
- m_main->present();
+ m_application->add_window(*m_tracker);
+ m_tracker->present();
}
auto application::on_shutdown() -> void
{
- m_main->close();
- delete m_main;
+ m_tracker->close();
+ delete m_tracker;
}
auto application::on_startup() -> void
diff --git a/app/src/turns.cpp b/app/src/main.cpp
index d81f34f..d81f34f 100644
--- a/app/src/turns.cpp
+++ b/app/src/main.cpp
diff --git a/app/src/windows/main.cpp b/app/src/windows/tracker.cpp
index a532dc0..f57e9eb 100644
--- a/app/src/windows/main.cpp
+++ b/app/src/windows/tracker.cpp
@@ -1,4 +1,4 @@
-#include "turns/app/windows/main.hpp"
+#include "turns/app/windows/tracker.hpp"
#include "turns/app/widgets/participant_row.hpp"
#include "turns/app/windows/participant_editor.hpp"
@@ -23,7 +23,7 @@ namespace turns::app::windows
}
} // namespace
- main::main(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder)
+ tracker::tracker(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder)
: Gtk::ApplicationWindow{base}
, m_adw{ADW_APPLICATION_WINDOW(gobj())}
, m_controls{builder->get_widget<Gtk::Revealer>("controls")}
@@ -56,22 +56,22 @@ namespace turns::app::windows
[](auto count) { return count ? "" : _(lang::no_active_turn_order); });
// clang-format on
- add_action("add_participant", sigc::mem_fun(*this, &main::handle_add_participant));
+ add_action("add_participant", sigc::mem_fun(*this, &tracker::handle_add_participant));
add_action_with_parameter("delete", Glib::VARIANT_TYPE_INT32, [this](auto param) {
auto index = Glib::VariantBase::cast_dynamic<Glib::Variant<int>>(param);
m_turn_order->remove(index.get());
});
- add_action_with_parameter("edit", Glib::VARIANT_TYPE_INT32, sigc::mem_fun(*this, &main::handle_edit_participant));
+ add_action_with_parameter("edit", Glib::VARIANT_TYPE_INT32, sigc::mem_fun(*this, &tracker::handle_edit_participant));
}
- auto main::handle_add_participant() -> void
+ auto tracker::handle_add_participant() -> void
{
auto [lifeline, dialog] = editor_for(nullptr);
dialog->present(this);
dialog->signal_finished().connect(sigc::mem_fun(*m_turn_order, &widgets::turn_order_view::append));
}
- auto main::handle_edit_participant(Glib::VariantBase param) -> void
+ auto tracker::handle_edit_participant(Glib::VariantBase param) -> void
{
static_cast<void>(param);
auto index = Glib::VariantBase::cast_dynamic<Glib::Variant<int>>(param);
diff --git a/app/tests/windows/main.cpp b/app/tests/windows/tracker.cpp
index a04a130..c522bd4 100644
--- a/app/tests/windows/main.cpp
+++ b/app/tests/windows/tracker.cpp
@@ -1,4 +1,4 @@
-#include "turns/app/windows/main.hpp"
+#include "turns/app/windows/tracker.hpp"
#include "turns/lang/messages.hpp"
@@ -19,13 +19,13 @@
namespace turns::app::windows::tests
{
- TEST_CASE("A freshly constructed main window", "[windows]")
+ TEST_CASE("A freshly constructed tracker window", "[windows]")
{
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/main.ui");
- auto instance = Gtk::Builder::get_widget_derived<main>(builder, "main");
+ auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/tracker.ui");
+ auto instance = Gtk::Builder::get_widget_derived<tracker>(builder, "tracker");
SECTION("was successfully constructed")
{
diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt
index 325c584..a825e4c 100644
--- a/res/CMakeLists.txt
+++ b/res/CMakeLists.txt
@@ -5,8 +5,8 @@ add_library("res")
set(UI_FILES
"widgets/participant_row.ui"
"widgets/turn_order_view.ui"
- "windows/main.ui"
"windows/participant_editor.ui"
+ "windows/tracker.ui"
)
export_cambalache_files("ui.cmb" UI_FILES ${UI_FILES})
diff --git a/res/tests/windows.cpp b/res/tests/windows.cpp
index a442824..75e21fb 100644
--- a/res/tests/windows.cpp
+++ b/res/tests/windows.cpp
@@ -2,9 +2,9 @@
#include <gtkmm/builder.h>
-TEST_CASE("GResource for main")
+TEST_CASE("GResource for tracker")
{
- auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/main.ui");
+ auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/tracker.ui");
SECTION("can create Gtk.Builder for the main window UI definition")
{
diff --git a/res/ui.cmb b/res/ui.cmb
index 9343018..1bfae73 100644
--- a/res/ui.cmb
+++ b/res/ui.cmb
@@ -2,7 +2,7 @@
<!DOCTYPE cambalache-project SYSTEM "cambalache-project.dtd">
<cambalache-project version="0.17.3" target_tk="gtk-4.0">
<ui>
- (1,None,None,"windows/main.ui",None,None,None,None,None,None,None),
+ (1,None,None,"windows/tracker.ui",None,None,None,None,None,None,None),
(2,None,None,"windows/participant_editor.ui",None,None,None,None,None,None,None),
(3,1,None,"widgets/participant_row.ui",None,None,None,None,None,None,None),
(4,1,None,"widgets/turn_order_view.ui",None,None,None,None,None,None,None)
@@ -15,7 +15,7 @@
(3,"gtk","4.14",None)
</ui_library>
<object>
- (1,1,"AdwApplicationWindow","main",None,None,None,None,-1,None,None),
+ (1,1,"AdwApplicationWindow","tracker",None,None,None,None,-1,None,None),
(1,2,"AdwToolbarView",None,1,None,None,None,-1,None,None),
(1,3,"AdwHeaderBar","header",2,None,"top",None,-1,None,None),
(1,6,"AdwWindowTitle","title",3,None,None,None,3,None,None),
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-17 18:13:02 +0000