diff options
| -rw-r--r-- | app/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | app/include/turns/app/windows/participant_editor.hpp (renamed from app/include/turns/app/windows/create_participant.hpp) | 10 | ||||
| -rw-r--r-- | app/src/windows/main.cpp | 7 | ||||
| -rw-r--r-- | app/src/windows/participant_editor.cpp (renamed from app/src/windows/create_participant.cpp) | 17 | ||||
| -rw-r--r-- | res/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | res/windows/participant_editor.ui (renamed from res/windows/create_participant.ui) | 3 | ||||
| -rw-r--r-- | res/windows/windows.cmb | 5 |
7 files changed, 26 insertions, 20 deletions
diff --git a/app/CMakeLists.txt b/app/CMakeLists.txt index ac7da67..a65a489 100644 --- a/app/CMakeLists.txt +++ b/app/CMakeLists.txt @@ -3,8 +3,8 @@ add_library("app" "src/application.cpp" "src/widgets/participant_list_row.cpp" - "src/windows/create_participant.cpp" "src/windows/main.cpp" + "src/windows/participant_editor.cpp" ) add_library("turns::app" ALIAS "app") diff --git a/app/include/turns/app/windows/create_participant.hpp b/app/include/turns/app/windows/participant_editor.hpp index f572bd5..e9c26a0 100644 --- a/app/include/turns/app/windows/create_participant.hpp +++ b/app/include/turns/app/windows/participant_editor.hpp @@ -1,5 +1,5 @@ -#ifndef TURNS_APP_WINDOWS_CREATE_PARTICIPANT_HPP -#define TURNS_APP_WINDOWS_CREATE_PARTICIPANT_HPP +#ifndef TURNS_APP_WINDOWS_PARTICIPANT_EDITOR_HPP +#define TURNS_APP_WINDOWS_PARTICIPANT_EDITOR_HPP #include <adwaita.h> #include <glibmm/refptr.h> @@ -12,14 +12,16 @@ namespace turns::app::windows { - struct create_participant : Gtk::Widget + struct participant_editor : Gtk::Widget { using signal_finished_type = sigc::signal<void (Glib::ustring, float)>; - create_participant(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder); + participant_editor(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder); auto present(Gtk::Widget * parent) -> void; + auto set_title(Glib::ustring const & value) -> void; + auto signal_finished() -> signal_finished_type; private: diff --git a/app/src/windows/main.cpp b/app/src/windows/main.cpp index 0a5c18d..d217e9f 100644 --- a/app/src/windows/main.cpp +++ b/app/src/windows/main.cpp @@ -1,7 +1,7 @@ #include "turns/app/windows/main.hpp" #include "turns/app/widgets/participant_list_row.hpp" -#include "turns/app/windows/create_participant.hpp" +#include "turns/app/windows/participant_editor.hpp" #include "turns/lang/messages.hpp" #include <format> @@ -58,8 +58,9 @@ namespace turns::app::windows auto main::handle_add_participant() -> void { - auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/create_participant.ui"); - auto dialog = Gtk::Builder::get_widget_derived<windows::create_participant>(builder, "create_participant_dialog"); + auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/participant_editor.ui"); + auto dialog = Gtk::Builder::get_widget_derived<windows::participant_editor>(builder, "participant_editor"); + dialog->set_title(_("Add participant")); dialog->present(this); dialog->signal_finished().connect([this](auto name, auto priority) { m_participants->append(name, priority); }); } diff --git a/app/src/windows/create_participant.cpp b/app/src/windows/participant_editor.cpp index 86583a0..f89fc20 100644 --- a/app/src/windows/create_participant.cpp +++ b/app/src/windows/participant_editor.cpp @@ -1,4 +1,4 @@ -#include "turns/app/windows/create_participant.hpp" +#include "turns/app/windows/participant_editor.hpp" #include <print> @@ -8,7 +8,7 @@ namespace turns::app::windows { - create_participant::create_participant(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder) + participant_editor::participant_editor(BaseObjectType * base, Glib::RefPtr<Gtk::Builder> const builder) : Gtk::Widget{base} , m_adw{ADW_DIALOG(gobj())} , m_finish{builder->get_widget<Gtk::Button>("finish")} @@ -17,20 +17,25 @@ namespace turns::app::windows m_name = ADW_ENTRY_ROW(builder->get_widget<Gtk::ListBoxRow>("name")->gobj()); m_priority = ADW_SPIN_ROW(builder->get_widget<Gtk::ListBoxRow>("priority")->gobj()); - m_finish->signal_clicked().connect(sigc::mem_fun(*this, &create_participant::handle_finish_clicked)); + m_finish->signal_clicked().connect(sigc::mem_fun(*this, &participant_editor::handle_finish_clicked)); } - auto create_participant::present(Gtk::Widget * parent) -> void + auto participant_editor::present(Gtk::Widget * parent) -> void { adw_dialog_present(m_adw, parent->gobj()); } - auto create_participant::signal_finished() -> signal_finished_type + auto participant_editor::set_title(Glib::ustring const & value) -> void + { + adw_dialog_set_title(m_adw, value.c_str()); + } + + auto participant_editor::signal_finished() -> signal_finished_type { return m_signal_finished; } - auto create_participant::handle_finish_clicked() -> void + auto participant_editor::handle_finish_clicked() -> void { auto name = gtk_editable_get_text(GTK_EDITABLE(m_name)); auto priority = adw_spin_row_get_value(m_priority); diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt index 3ae8a0b..6131388 100644 --- a/res/CMakeLists.txt +++ b/res/CMakeLists.txt @@ -6,8 +6,8 @@ target_add_glib_resources("res" PREFIX "ch/arknet/Turns" UI_FILES "widgets/participant_list_row.ui" - "windows/create_participant.ui" "windows/main.ui" + "windows/participant_editor.ui" CSS_FILES "style.css" "style-dark.css" diff --git a/res/windows/create_participant.ui b/res/windows/participant_editor.ui index 3ff60ad..3b483b4 100644 --- a/res/windows/create_participant.ui +++ b/res/windows/participant_editor.ui @@ -3,7 +3,7 @@ <interface> <requires lib="gtk" version="4.14"/> <requires lib="libadwaita" version="1.5"/> - <object class="AdwDialog" id="create_participant_dialog"> + <object class="AdwDialog" id="participant_editor"> <property name="child"> <object class="AdwToolbarView"> <property name="content"> @@ -69,6 +69,5 @@ </object> </property> <property name="hexpand">True</property> - <property name="title" translatable="yes">Add participant</property> </object> </interface> diff --git a/res/windows/windows.cmb b/res/windows/windows.cmb index 262b898..1d1d2d2 100644 --- a/res/windows/windows.cmb +++ b/res/windows/windows.cmb @@ -3,7 +3,7 @@ <cambalache-project version="0.17.3" target_tk="gtk-4.0"> <ui> (1,None,"main_window.ui","main.ui",None,None,None,None,None,None,None), - (2,None,None,"create_participant.ui",None,None,None,None,None,None,None) + (2,None,None,"participant_editor.ui",None,None,None,None,None,None,None) </ui> <ui_library> (1,"gtk","4.14",None), @@ -26,7 +26,7 @@ (1,15,"GtkListBox","participant_list",14,None,None,None,None,None,None), (1,16,"AdwStatusPage","empty",11,None,None,None,-1,None,None), (1,17,"GtkButton",None,16,None,None,None,-1,None,None), - (2,1,"AdwDialog","create_participant_dialog",None,None,None,None,-1,None,None), + (2,1,"AdwDialog","participant_editor",None,None,None,None,-1,None,None), (2,2,"AdwToolbarView",None,1,None,None,None,-1,None,None), (2,3,"AdwHeaderBar",None,2,None,"top",None,-1,None,None), (2,4,"AdwClamp",None,2,None,None,None,-1,None,None), @@ -71,7 +71,6 @@ (1,17,"GtkWidget","halign","center",None,None,None,None,None,None,None,None,None), (2,1,"AdwDialog","child",None,None,None,None,None,2,None,None,None,None), (2,1,"AdwDialog","default-widget",None,None,None,None,None,None,None,None,None,None), - (2,1,"AdwDialog","title","Add participant",1,None,None,None,None,None,None,None,None), (2,1,"GtkWidget","hexpand","True",None,None,None,None,None,None,None,None,None), (2,2,"AdwToolbarView","content",None,None,None,None,None,4,None,None,None,None), (2,4,"AdwClamp","child",None,None,None,None,None,5,None,None,None,None), |