diff options
| author | Felix Morgner <felix.morgner@gmail.com> | 2024-07-14 01:47:41 +0200 |
|---|---|---|
| committer | Felix Morgner <felix.morgner@gmail.com> | 2024-07-14 01:47:41 +0200 |
| commit | fcb667619ca922fb1a1947b4e8c23b57290f97b6 (patch) | |
| tree | 1321aefff03f6c00144ff7174a8a6f8ea0803508 | |
| parent | ec3fa197624cea242b05303461e6fece78d78009 (diff) | |
| download | turns-fcb667619ca922fb1a1947b4e8c23b57290f97b6.tar.xz turns-fcb667619ca922fb1a1947b4e8c23b57290f97b6.zip | |
app/ui: rename main window ui file
| -rw-r--r-- | app/src/application.cpp | 4 | ||||
| -rw-r--r-- | res/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | res/windows/main.ui (renamed from res/windows/main_window.ui) | 2 | ||||
| -rw-r--r-- | res/windows/windows.cmb | 8 |
4 files changed, 8 insertions, 8 deletions
diff --git a/app/src/application.cpp b/app/src/application.cpp index a120f40..9408335 100644 --- a/app/src/application.cpp +++ b/app/src/application.cpp @@ -28,8 +28,8 @@ namespace turns::app m_self = adw_application_new("ch.arknet.Turns", G_APPLICATION_DEFAULT_FLAGS); m_application = Glib::wrap(GTK_APPLICATION(m_self)); - auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/main_window.ui"); - auto main_window = Gtk::Builder::get_widget_derived<windows::main>(builder, "main_window"); + auto builder = Gtk::Builder::create_from_resource("/ch/arknet/Turns/windows/main.ui"); + auto main_window = Gtk::Builder::get_widget_derived<windows::main>(builder, "main"); m_main_window = ADW_APPLICATION_WINDOW(main_window->gobj()); diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt index dd5b139..3ae8a0b 100644 --- a/res/CMakeLists.txt +++ b/res/CMakeLists.txt @@ -7,7 +7,7 @@ target_add_glib_resources("res" UI_FILES "widgets/participant_list_row.ui" "windows/create_participant.ui" - "windows/main_window.ui" + "windows/main.ui" CSS_FILES "style.css" "style-dark.css" diff --git a/res/windows/main_window.ui b/res/windows/main.ui index df3952e..2ad66f7 100644 --- a/res/windows/main_window.ui +++ b/res/windows/main.ui @@ -5,7 +5,7 @@ <requires lib="gtk" version="4.14"/> <requires lib="libadwaita" version="1.5"/> <requires lib="gio" version="2.0"/> - <object class="AdwApplicationWindow" id="main_window"> + <object class="AdwApplicationWindow" id="main"> <property name="content"> <object class="AdwToolbarView"> <property name="content"> diff --git a/res/windows/windows.cmb b/res/windows/windows.cmb index 1679737..9483e85 100644 --- a/res/windows/windows.cmb +++ b/res/windows/windows.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,"main_window.ui","main_window.ui",None,None,None,None,None,None,None), + (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) </ui> <ui_library> @@ -12,7 +12,7 @@ (2,"libadwaita","1.5",None) </ui_library> <object> - (1,1,"AdwApplicationWindow","main_window",None,None,None,None,-1,None,None), + (1,1,"AdwApplicationWindow","main",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,4,"GtkScrolledWindow",None,2,None,None,None,-1,None,None), @@ -99,9 +99,9 @@ <object_data_arg> (1,1,"GtkWidget",2,2,"name","background"), (1,4,"GtkWidget",2,2,"name","boxed-list"), - (1,12,"GtkWidget",2,2,"name","boxed-list"), (2,6,"GtkWidget",2,2,"name","boxed-list"), (2,9,"GtkWidget",2,2,"name","pill"), - (2,9,"GtkWidget",2,3,"name","suggested-action") + (2,9,"GtkWidget",2,3,"name","suggested-action"), + (1,12,"GtkWidget",2,2,"name","boxed-list") </object_data_arg> </cambalache-project> |