From 81ff22fe7897c6a405111304b74616677a3a7261 Mon Sep 17 00:00:00 2001 From: Felix Morgner Date: Sun, 14 Jul 2024 23:41:34 +0200 Subject: turns: rename "order value" to "priority" --- .../turns/app/windows/create_participant.hpp | 2 +- app/src/windows/create_participant.cpp | 8 ++++---- app/src/windows/main.cpp | 6 +++--- domain/include/turns/domain/participant.hpp | 10 +++++----- domain/include/turns/domain/turn_order.hpp | 2 +- domain/src/participant.cpp | 18 +++++++++--------- domain/src/turn_order.cpp | 6 +++--- domain/tests/participant.cpp | 22 +++++++++++----------- lang/include/turns/lang/messages.hpp | 2 +- lang/po/de.po | 4 ++-- lang/po/en.po | 4 ++-- lang/tests/messages.cpp | 2 +- res/windows/create_participant.ui | 4 ++-- res/windows/windows.cmb | 4 ++-- 14 files changed, 47 insertions(+), 47 deletions(-) diff --git a/app/include/turns/app/windows/create_participant.hpp b/app/include/turns/app/windows/create_participant.hpp index a9f19ea..f572bd5 100644 --- a/app/include/turns/app/windows/create_participant.hpp +++ b/app/include/turns/app/windows/create_participant.hpp @@ -30,7 +30,7 @@ namespace turns::app::windows AdwComboRow * m_disposition{}; AdwEntryRow * m_name{}; - AdwSpinRow * m_order{}; + AdwSpinRow * m_priority{}; signal_finished_type m_signal_finished{}; }; diff --git a/app/src/windows/create_participant.cpp b/app/src/windows/create_participant.cpp index eadc41e..86583a0 100644 --- a/app/src/windows/create_participant.cpp +++ b/app/src/windows/create_participant.cpp @@ -2,8 +2,8 @@ #include -#include #include +#include namespace turns::app::windows { @@ -15,7 +15,7 @@ namespace turns::app::windows { m_disposition = ADW_COMBO_ROW(builder->get_widget("disposition")->gobj()); m_name = ADW_ENTRY_ROW(builder->get_widget("name")->gobj()); - m_order = ADW_SPIN_ROW(builder->get_widget("order")->gobj()); + m_priority = ADW_SPIN_ROW(builder->get_widget("priority")->gobj()); m_finish->signal_clicked().connect(sigc::mem_fun(*this, &create_participant::handle_finish_clicked)); } @@ -33,8 +33,8 @@ namespace turns::app::windows auto create_participant::handle_finish_clicked() -> void { auto name = gtk_editable_get_text(GTK_EDITABLE(m_name)); - auto order = adw_spin_row_get_value(m_order); - m_signal_finished.emit(name, order); + auto priority = adw_spin_row_get_value(m_priority); + m_signal_finished.emit(name, priority); adw_dialog_close(m_adw); } } // namespace turns::app::windows \ No newline at end of file diff --git a/app/src/windows/main.cpp b/app/src/windows/main.cpp index 410d449..0a5c18d 100644 --- a/app/src/windows/main.cpp +++ b/app/src/windows/main.cpp @@ -50,9 +50,9 @@ namespace turns::app::windows { auto participant = std::dynamic_pointer_cast(item); auto widget = Gtk::make_managed(); - auto order = participant->property_order_value().get_value(); + auto priority = participant->property_priority().get_value(); widget->set_title(participant->property_name()); - widget->set_subtitle(std::vformat(_("Order {}"), std::make_format_args(order))); + widget->set_subtitle(std::vformat(_("Priority {}"), std::make_format_args(priority))); return widget; } @@ -61,7 +61,7 @@ namespace turns::app::windows auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/create_participant.ui"); auto dialog = Gtk::Builder::get_widget_derived(builder, "create_participant_dialog"); dialog->present(this); - dialog->signal_finished().connect([this](auto name, auto order) { m_participants->append(name, order); }); + dialog->signal_finished().connect([this](auto name, auto priority) { m_participants->append(name, priority); }); } } // namespace turns::app::windows diff --git a/domain/include/turns/domain/participant.hpp b/domain/include/turns/domain/participant.hpp index 934e0bb..f417ec7 100644 --- a/domain/include/turns/domain/participant.hpp +++ b/domain/include/turns/domain/participant.hpp @@ -14,20 +14,20 @@ namespace turns::domain struct participant : Glib::Object { - auto static create(Glib::ustring name, float order_value) -> Glib::RefPtr; + auto static create(Glib::ustring name, float priority) -> Glib::RefPtr; - participant(Glib::ustring name, float order_value); + participant(Glib::ustring name, float priority); auto operator<=>(participant const & other) const noexcept -> std::partial_ordering; auto property_name() -> Glib::PropertyProxy; auto property_name() const -> Glib::PropertyProxy_ReadOnly; - auto property_order_value() -> Glib::PropertyProxy; - auto property_order_value() const -> Glib::PropertyProxy_ReadOnly; + auto property_priority() -> Glib::PropertyProxy; + auto property_priority() const -> Glib::PropertyProxy_ReadOnly; private: Glib::Property m_name; - Glib::Property m_order_value; + Glib::Property m_priority; }; auto operator<=>(Glib::RefPtr const & lhs, Glib::RefPtr const & rhs) -> std::partial_ordering; diff --git a/domain/include/turns/domain/turn_order.hpp b/domain/include/turns/domain/turn_order.hpp index 6495a27..f7eb773 100644 --- a/domain/include/turns/domain/turn_order.hpp +++ b/domain/include/turns/domain/turn_order.hpp @@ -20,7 +20,7 @@ namespace turns::domain auto static create() -> Glib::RefPtr; - auto append(Glib::ustring const & name, float order_value) -> void; + auto append(Glib::ustring const & name, float priority) -> void; auto remove(Glib::RefPtr item) -> void; auto sort() -> void; }; diff --git a/domain/src/participant.cpp b/domain/src/participant.cpp index b52bcca..5c31e2a 100644 --- a/domain/src/participant.cpp +++ b/domain/src/participant.cpp @@ -6,21 +6,21 @@ namespace turns::domain { - auto participant::create(Glib::ustring name, float order_value) -> Glib::RefPtr + auto participant::create(Glib::ustring name, float priority) -> Glib::RefPtr { - return Glib::make_refptr_for_instance(new participant{name, order_value}); + return Glib::make_refptr_for_instance(new participant{name, priority}); } - participant::participant(Glib::ustring name, float order_value) + participant::participant(Glib::ustring name, float priority) : Glib::ObjectBase{typeid(participant)} , m_name{*this, "name", name} - , m_order_value{*this, "order_value", order_value} + , m_priority{*this, "priority", priority} { } auto participant::operator<=>(participant const & other) const noexcept -> std::partial_ordering { - return m_order_value <=> other.m_order_value; + return m_priority <=> other.m_priority; } auto participant::property_name() -> Glib::PropertyProxy @@ -33,14 +33,14 @@ namespace turns::domain return m_name.get_proxy(); } - auto participant::property_order_value() -> Glib::PropertyProxy + auto participant::property_priority() -> Glib::PropertyProxy { - return m_order_value.get_proxy(); + return m_priority.get_proxy(); } - auto participant::property_order_value() const -> Glib::PropertyProxy_ReadOnly + auto participant::property_priority() const -> Glib::PropertyProxy_ReadOnly { - return m_order_value.get_proxy(); + return m_priority.get_proxy(); } auto operator<=>(Glib::RefPtr const & lhs, Glib::RefPtr const & rhs) -> std::partial_ordering diff --git a/domain/src/turn_order.cpp b/domain/src/turn_order.cpp index 677e993..4c5c587 100644 --- a/domain/src/turn_order.cpp +++ b/domain/src/turn_order.cpp @@ -24,10 +24,10 @@ namespace turns::domain return Glib::make_refptr_for_instance(new turn_order{}); } - auto turn_order::append(Glib::ustring const & name, float order_value) -> void + auto turn_order::append(Glib::ustring const & name, float priority) -> void { - auto participant = participant::create(name, order_value); - participant->property_order_value().signal_changed().connect([this] { sort(); }); + auto participant = participant::create(name, priority); + participant->property_priority().signal_changed().connect([this] { sort(); }); insert_sorted(participant, comparator); } diff --git a/domain/tests/participant.cpp b/domain/tests/participant.cpp index 4f32aa0..f6abef9 100644 --- a/domain/tests/participant.cpp +++ b/domain/tests/participant.cpp @@ -12,12 +12,12 @@ namespace turns::domain::tests TEST_CASE("A participant") { auto constexpr constructed_name = "Vana Thistletop"; - auto constexpr constructed_order = 17; - auto instance = participant{constructed_name, constructed_order}; + auto constexpr constructed_priority = 17; + auto instance = participant{constructed_name, constructed_priority}; SECTION("can be created") { - REQUIRE(participant::create(constructed_name, constructed_order)); + REQUIRE(participant::create(constructed_name, constructed_priority)); } SECTION("the name can be read") @@ -31,22 +31,22 @@ namespace turns::domain::tests REQUIRE(instance.property_name() == "replaced"); } - SECTION("the order can be read") + SECTION("the priority can be read") { - REQUIRE(instance.property_order_value() == constructed_order); + REQUIRE(instance.property_priority() == constructed_priority); } - SECTION("the order can be changed") + SECTION("the priority can be changed") { - instance.property_order_value() = 8; - REQUIRE(instance.property_order_value() == 8); + instance.property_priority() = 8; + REQUIRE(instance.property_priority() == 8); } SECTION("can be compared with another participant") { - auto equivalent_instance = participant{"Equivalent", constructed_order}; - auto lesser_instance = participant{"Lesser", constructed_order - 1}; - auto greater_instance = participant{"Greater", constructed_order + 1}; + auto equivalent_instance = participant{"Equivalent", constructed_priority}; + auto lesser_instance = participant{"Lesser", constructed_priority - 1}; + auto greater_instance = participant{"Greater", constructed_priority + 1}; SECTION("yielding std::partial_ordering::equivalent for itself") { diff --git a/lang/include/turns/lang/messages.hpp b/lang/include/turns/lang/messages.hpp index 359798d..1bb572a 100644 --- a/lang/include/turns/lang/messages.hpp +++ b/lang/include/turns/lang/messages.hpp @@ -10,7 +10,7 @@ namespace turns::lang auto constexpr static mark_as_defeated = "Mark as defeated"; auto constexpr static name = "Name"; auto constexpr static no_active_turn_order = "No active turn order"; - auto constexpr static order = "Order"; + auto constexpr static priority = "Priority"; auto constexpr static quit = "_Quit"; auto constexpr static turns = "Turns"; } // namespace turns::lang diff --git a/lang/po/de.po b/lang/po/de.po index 78cba48..a129f68 100644 --- a/lang/po/de.po +++ b/lang/po/de.po @@ -29,8 +29,8 @@ msgstr "Name" msgid "No active turn order" msgstr "Keine aktive Zugreihenfolge" -msgid "Order" -msgstr "Reihenfolge" +msgid "Priority" +msgstr "Priorität" msgid "_Quit" msgstr "_Beenden" diff --git a/lang/po/en.po b/lang/po/en.po index d04b751..399bdc1 100644 --- a/lang/po/en.po +++ b/lang/po/en.po @@ -29,8 +29,8 @@ msgstr "Name" msgid "No active turn order" msgstr "No active turn order" -msgid "Order" -msgstr "Order" +msgid "Priority" +msgstr "Priority" msgid "_Quit" msgstr "_Quit" diff --git a/lang/tests/messages.cpp b/lang/tests/messages.cpp index 39b9bc0..cf454c7 100644 --- a/lang/tests/messages.cpp +++ b/lang/tests/messages.cpp @@ -21,7 +21,7 @@ namespace turns::lang::tests mark_as_defeated, // name, a better solution is required to test this entry. no_active_turn_order, - order, + priority, quit, turns ); diff --git a/res/windows/create_participant.ui b/res/windows/create_participant.ui index 1e95f03..3ff60ad 100644 --- a/res/windows/create_participant.ui +++ b/res/windows/create_participant.ui @@ -26,7 +26,7 @@ - + -1000.0 @@ -36,7 +36,7 @@ 1 True - Order + Priority diff --git a/res/windows/windows.cmb b/res/windows/windows.cmb index d3ac071..262b898 100644 --- a/res/windows/windows.cmb +++ b/res/windows/windows.cmb @@ -34,7 +34,7 @@ (2,6,"GtkListBox",None,5,None,None,None,None,None,None), (2,7,"AdwEntryRow","name",6,None,None,None,None,None,None), (2,9,"GtkButton","finish",5,None,None,None,1,None,None), - (2,10,"AdwSpinRow","order",6,None,None,None,1,None,None), + (2,10,"AdwSpinRow","priority",6,None,None,None,1,None,None), (2,11,"AdwComboRow","disposition",6,None,None,None,2,None,None), (2,12,"GtkAdjustment",None,10,None,None,None,-1,None,None) @@ -86,7 +86,7 @@ (2,7,"AdwPreferencesRow","title","Name",1,None,None,None,None,None,None,None,None), (2,9,"GtkButton","label","Finish",1,None,None,None,None,None,None,None,None), (2,9,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), - (2,10,"AdwPreferencesRow","title","Order",1,None,None,None,None,None,None,None,None), + (2,10,"AdwPreferencesRow","title","Priority",1,None,None,None,None,None,None,None,None), (2,10,"AdwSpinRow","adjustment",None,None,None,None,None,12,None,None,None,None), (2,10,"AdwSpinRow","digits","1",None,None,None,None,None,None,None,None,None), (2,10,"AdwSpinRow","numeric","True",None,None,None,None,None,None,None,None,None), -- cgit v1.2.3