summaryrefslogtreecommitdiff
path: root/ui/src
diff options
context:
space:
mode:
Diffstat (limited to 'ui/src')
-rw-r--r--ui/src/init.cpp16
-rw-r--r--ui/src/participant_editor.cpp (renamed from ui/src/widgets/participant_editor.cpp)10
-rw-r--r--ui/src/participant_editor.ui (renamed from ui/src/widgets/participant_editor.ui)0
-rw-r--r--ui/src/participant_row.cpp (renamed from ui/src/widgets/participant_row.cpp)10
-rw-r--r--ui/src/participant_row.ui (renamed from ui/src/widgets/participant_row.ui)0
-rw-r--r--ui/src/preferences.cpp (renamed from ui/src/widgets/preferences.cpp)8
-rw-r--r--ui/src/preferences.ui (renamed from ui/src/widgets/preferences.ui)0
-rw-r--r--ui/src/tracker.cpp (renamed from ui/src/windows/tracker.cpp)8
-rw-r--r--ui/src/tracker.ui (renamed from ui/src/windows/tracker.ui)0
-rw-r--r--ui/src/tracker/actions.cpp (renamed from ui/src/windows/tracker/actions.cpp)16
-rw-r--r--ui/src/tracker/event_handlers.cpp (renamed from ui/src/windows/tracker/event_handlers.cpp)6
-rw-r--r--ui/src/turn_order_view.cpp (renamed from ui/src/widgets/turn_order_view.cpp)12
-rw-r--r--ui/src/turn_order_view.ui (renamed from ui/src/widgets/turn_order_view.ui)0
13 files changed, 43 insertions, 43 deletions
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<void>(widgets::ParticipantEditor{{}});
- static_cast<void>(widgets::participant_row{{}});
- static_cast<void>(widgets::preferences{{}});
- static_cast<void>(widgets::turn_order_view{{}});
+ static_cast<void>(ParticipantEditor{{}});
+ static_cast<void>(participant_row{{}});
+ static_cast<void>(preferences{{}});
+ static_cast<void>(turn_order_view{{}});
}
} // namespace turns::ui \ No newline at end of file
diff --git a/ui/src/widgets/participant_editor.cpp b/ui/src/participant_editor.cpp
index 816ad09..8598139 100644
--- a/ui/src/widgets/participant_editor.cpp
+++ b/ui/src/participant_editor.cpp
@@ -1,9 +1,9 @@
-#include "turns/ui/widgets/participant_editor.hpp"
+#include "turns/ui/participant_editor.hpp"
#include "turns/core/disposition.hpp"
#include "turns/core/participant.hpp"
#include "turns/lang/messages.hpp"
-#include "turns/ui/widgets/template_widget.hpp"
+#include "turns/ui/template_widget.hpp"
#include <sigc++/functors/mem_fun.h>
@@ -31,12 +31,12 @@
#include <memory>
#include <ranges>
-namespace turns::ui::widgets
+namespace turns::ui
{
namespace
{
auto constexpr static TYPE_NAME = "ParticipantEditor";
- auto constexpr static TEMPLATE = "/ch/arknet/Turns/widgets/participant_editor.ui";
+ auto constexpr static TEMPLATE = "/ch/arknet/Turns/participant_editor.ui";
} // namespace
ParticipantEditor::ParticipantEditor(Glib::RefPtr<core::participant> participant)
@@ -136,4 +136,4 @@ namespace turns::ui::widgets
item->set_child(*Gtk::make_managed<Gtk::Label>());
}
-} // namespace turns::ui::widgets \ No newline at end of file
+} // namespace turns::ui \ No newline at end of file
diff --git a/ui/src/widgets/participant_editor.ui b/ui/src/participant_editor.ui
index 6bcf83e..6bcf83e 100644
--- a/ui/src/widgets/participant_editor.ui
+++ b/ui/src/participant_editor.ui
diff --git a/ui/src/widgets/participant_row.cpp b/ui/src/participant_row.cpp
index 6902a1c..b6d18a8 100644
--- a/ui/src/widgets/participant_row.cpp
+++ b/ui/src/participant_row.cpp
@@ -1,9 +1,9 @@
-#include "turns/ui/widgets/participant_row.hpp"
+#include "turns/ui/participant_row.hpp"
#include "turns/core/disposition.hpp"
#include "turns/core/participant.hpp"
#include "turns/lang/messages.hpp"
-#include "turns/ui/widgets/template_widget.hpp"
+#include "turns/ui/template_widget.hpp"
#include <sigc++/functors/mem_fun.h>
@@ -24,12 +24,12 @@
#include <format>
#include <vector>
-namespace turns::ui::widgets
+namespace turns::ui
{
namespace
{
auto constexpr static TYPE_NAME = "participant_row";
- auto constexpr static TEMPLATE = "/ch/arknet/Turns/widgets/participant_row.ui";
+ auto constexpr static TEMPLATE = "/ch/arknet/Turns/participant_row.ui";
auto css_class_for(core::disposition value) -> Glib::ustring
{
@@ -146,4 +146,4 @@ namespace turns::ui::widgets
activate_action("win.edit", index);
}
-} // namespace turns::ui::widgets \ No newline at end of file
+} // namespace turns::ui \ No newline at end of file
diff --git a/ui/src/widgets/participant_row.ui b/ui/src/participant_row.ui
index 1a215c6..1a215c6 100644
--- a/ui/src/widgets/participant_row.ui
+++ b/ui/src/participant_row.ui
diff --git a/ui/src/widgets/preferences.cpp b/ui/src/preferences.cpp
index 327860f..b521a25 100644
--- a/ui/src/widgets/preferences.cpp
+++ b/ui/src/preferences.cpp
@@ -1,7 +1,7 @@
-#include "turns/ui/widgets/preferences.hpp"
+#include "turns/ui/preferences.hpp"
#include "turns/core/settings.hpp"
-#include "turns/ui/widgets/template_widget.hpp"
+#include "turns/ui/template_widget.hpp"
#include <sigc++/adaptors/bind.h>
#include <sigc++/functors/mem_fun.h>
@@ -23,12 +23,12 @@
#include <gdkmm/rgba.h>
-namespace turns::ui::widgets
+namespace turns::ui
{
namespace
{
auto constexpr static TYPE_NAME = "preferences";
- auto constexpr static TEMPLATE = "/ch/arknet/Turns/widgets/preferences.ui";
+ auto constexpr static TEMPLATE = "/ch/arknet/Turns/preferences.ui";
} // namespace
preferences::preferences(Glib::RefPtr<Gio::Settings> settings)
diff --git a/ui/src/widgets/preferences.ui b/ui/src/preferences.ui
index 3831274..3831274 100644
--- a/ui/src/widgets/preferences.ui
+++ b/ui/src/preferences.ui
diff --git a/ui/src/windows/tracker.cpp b/ui/src/tracker.cpp
index 851d233..17aff89 100644
--- a/ui/src/windows/tracker.cpp
+++ b/ui/src/tracker.cpp
@@ -1,8 +1,8 @@
-#include "turns/ui/windows/tracker.hpp"
+#include "turns/ui/tracker.hpp"
#include "turns/core/turn_order.hpp"
#include "turns/lang/messages.hpp"
-#include "turns/ui/widgets/turn_order_view.hpp"
+#include "turns/ui/turn_order_view.hpp"
#include <sigc++/adaptors/bind.h>
#include <sigc++/functors/mem_fun.h>
@@ -45,7 +45,7 @@
#include <string>
#include <utility>
-namespace turns::ui::windows
+namespace turns::ui
{
tracker::tracker(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder, Glib::RefPtr<Gio::Settings> settings)
@@ -57,7 +57,7 @@ namespace turns::ui::windows
, m_start{builder->get_widget<Gtk::Button>("start")}
, m_title{builder->get_widget<Adwaita::WindowTitle>("title")}
, m_turn_order{core::turn_order::create()}
- , m_turn_order_view{Gtk::make_managed<widgets::turn_order_view>(m_turn_order)}
+ , m_turn_order_view{Gtk::make_managed<turn_order_view>(m_turn_order)}
, m_settings{std::move(settings)}
, m_subtitle{m_title->property_subtitle()}
, m_css{Gtk::CssProvider::create()}
diff --git a/ui/src/windows/tracker.ui b/ui/src/tracker.ui
index b875d10..b875d10 100644
--- a/ui/src/windows/tracker.ui
+++ b/ui/src/tracker.ui
diff --git a/ui/src/windows/tracker/actions.cpp b/ui/src/tracker/actions.cpp
index 54580ca..51642f8 100644
--- a/ui/src/windows/tracker/actions.cpp
+++ b/ui/src/tracker/actions.cpp
@@ -1,8 +1,8 @@
#include "turns/core/participant.hpp"
#include "turns/lang/messages.hpp"
-#include "turns/ui/widgets/participant_editor.hpp"
-#include "turns/ui/widgets/preferences.hpp"
-#include "turns/ui/windows/tracker.hpp"
+#include "turns/ui/participant_editor.hpp"
+#include "turns/ui/preferences.hpp"
+#include "turns/ui/tracker.hpp"
#include <sigc++/adaptors/bind.h>
#include <sigc++/functors/mem_fun.h>
@@ -31,7 +31,7 @@
#include <utility>
-namespace turns::ui::windows
+namespace turns::ui
{
namespace
{
@@ -48,7 +48,7 @@ namespace turns::ui::windows
auto tracker::add_participant() -> void
{
- auto dialog = Gtk::make_managed<widgets::ParticipantEditor>(nullptr);
+ auto dialog = Gtk::make_managed<ParticipantEditor>(nullptr);
dialog->present(this);
dialog->signal_finished().connect([this](auto n, auto p, auto d) { m_turn_order->add(n, p, d); });
}
@@ -63,7 +63,7 @@ namespace turns::ui::windows
{
auto index = Glib::VariantBase::cast_dynamic<Glib::Variant<int>>(param);
auto participant = m_turn_order->get_typed_object<core::participant>(index.get());
- auto dialog = Gtk::make_managed<widgets::ParticipantEditor>(participant);
+ auto dialog = Gtk::make_managed<ParticipantEditor>(participant);
dialog->present(this);
}
@@ -76,7 +76,7 @@ namespace turns::ui::windows
auto tracker::preferences() -> void
{
- auto preferences = Gtk::make_managed<widgets::preferences>(m_settings);
+ auto preferences = Gtk::make_managed<struct preferences>(m_settings);
auto dialog = Gtk::make_managed<Adwaita::PreferencesDialog>();
dialog->add(*preferences);
dialog->set_visible_page(*preferences);
@@ -122,4 +122,4 @@ namespace turns::ui::windows
m_turn_order->stop();
});
}
-} // namespace turns::ui::windows \ No newline at end of file
+} // namespace turns::ui \ No newline at end of file
diff --git a/ui/src/windows/tracker/event_handlers.cpp b/ui/src/tracker/event_handlers.cpp
index a3cf788..80664e4 100644
--- a/ui/src/windows/tracker/event_handlers.cpp
+++ b/ui/src/tracker/event_handlers.cpp
@@ -1,5 +1,5 @@
#include "turns/lang/messages.hpp"
-#include "turns/ui/windows/tracker.hpp"
+#include "turns/ui/tracker.hpp"
#include <sigc++/functors/mem_fun.h>
@@ -19,7 +19,7 @@
#include <format>
#include <string_view>
-namespace turns::ui::windows
+namespace turns::ui
{
auto tracker::on_load_content_done(Glib::RefPtr<Gio::AsyncResult> result) -> void
@@ -102,4 +102,4 @@ namespace turns::ui::windows
update_colors();
}
-} // namespace turns::ui::windows \ No newline at end of file
+} // namespace turns::ui \ No newline at end of file
diff --git a/ui/src/widgets/turn_order_view.cpp b/ui/src/turn_order_view.cpp
index 97f3834..2ab8bba 100644
--- a/ui/src/widgets/turn_order_view.cpp
+++ b/ui/src/turn_order_view.cpp
@@ -1,8 +1,8 @@
-#include "turns/ui/widgets/turn_order_view.hpp"
+#include "turns/ui/turn_order_view.hpp"
#include "turns/core/participant.hpp"
-#include "turns/ui/widgets/participant_row.hpp"
-#include "turns/ui/widgets/template_widget.hpp"
+#include "turns/ui/participant_row.hpp"
+#include "turns/ui/template_widget.hpp"
#include <sigc++/functors/mem_fun.h>
@@ -19,12 +19,12 @@
#include <memory>
-namespace turns::ui::widgets
+namespace turns::ui
{
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 = "/ch/arknet/Turns/turn_order_view.ui";
} // namespace
turn_order_view::turn_order_view(Glib::RefPtr<model_type> model)
@@ -48,7 +48,7 @@ namespace turns::ui::widgets
auto turn_order_view::handle_create_row(Glib::RefPtr<Glib::Object> const item) -> Gtk::Widget *
{
auto participant = std::dynamic_pointer_cast<core::participant>(item);
- auto row = Gtk::make_managed<widgets::participant_row>(participant);
+ auto row = Gtk::make_managed<participant_row>(participant);
Glib::Binding::bind_property(m_model->is_running(),
row->delete_enabled(),
diff --git a/ui/src/widgets/turn_order_view.ui b/ui/src/turn_order_view.ui
index d5a1006..d5a1006 100644
--- a/ui/src/widgets/turn_order_view.ui
+++ b/ui/src/turn_order_view.ui
generated by cgit v1.2.3 (git 2.25.1) at 2026-04-17 19:20:46 +0000