From fcb667619ca922fb1a1947b4e8c23b57290f97b6 Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@gmail.com>
Date: Sun, 14 Jul 2024 01:47:41 +0200
Subject: app/ui: rename main window ui file

---
 app/src/application.cpp    |  4 +--
 res/CMakeLists.txt         |  2 +-
 res/windows/main.ui        | 68 ++++++++++++++++++++++++++++++++++++++++++++++
 res/windows/main_window.ui | 68 ----------------------------------------------
 res/windows/windows.cmb    |  8 +++---
 5 files changed, 75 insertions(+), 75 deletions(-)
 create mode 100644 res/windows/main.ui
 delete mode 100644 res/windows/main_window.ui

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.ui b/res/windows/main.ui
new file mode 100644
index 0000000..2ad66f7
--- /dev/null
+++ b/res/windows/main.ui
@@ -0,0 +1,68 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Created with Cambalache 0.90.4 -->
+<interface>
+  <!-- interface-name main_window.ui -->
+  <requires lib="gtk" version="4.14"/>
+  <requires lib="libadwaita" version="1.5"/>
+  <requires lib="gio" version="2.0"/>
+  <object class="AdwApplicationWindow" id="main">
+    <property name="content">
+      <object class="AdwToolbarView">
+        <property name="content">
+          <object class="GtkScrolledWindow">
+            <property name="vexpand">True</property>
+            <child>
+              <object class="AdwClamp">
+                <property name="child">
+                  <object class="GtkListBox" id="participant_list">
+                    <property name="margin-bottom">18</property>
+                    <property name="margin-end">12</property>
+                    <property name="margin-start">12</property>
+                    <property name="margin-top">18</property>
+                    <property name="selection-mode">none</property>
+                    <property name="valign">start</property>
+                    <style>
+                      <class name="boxed-list"/>
+                    </style>
+                  </object>
+                </property>
+              </object>
+            </child>
+          </object>
+        </property>
+        <child type="top">
+          <object class="AdwHeaderBar" id="header">
+            <property name="title-widget">
+              <object class="AdwWindowTitle" id="title">
+                <property name="title" translatable="yes">Turns</property>
+              </object>
+            </property>
+            <child type="end">
+              <object class="GtkMenuButton" id="open_main_menu">
+                <property name="icon-name">open-menu</property>
+                <property name="menu-model">main_menu</property>
+              </object>
+            </child>
+            <child type="start">
+              <object class="GtkButton" id="add_participant">
+                <property name="icon-name">contact-new</property>
+              </object>
+            </child>
+            <style/>
+          </object>
+        </child>
+        <style/>
+      </object>
+    </property>
+    <property name="default-height">720</property>
+    <property name="default-width">360</property>
+    <property name="height-request">480</property>
+    <property name="width-request">360</property>
+  </object>
+  <menu id="main_menu">
+    <item>
+      <attribute name="action">app.quit</attribute>
+      <attribute name="label" translatable="yes">_Quit</attribute>
+    </item>
+  </menu>
+</interface>
diff --git a/res/windows/main_window.ui b/res/windows/main_window.ui
deleted file mode 100644
index df3952e..0000000
--- a/res/windows/main_window.ui
+++ /dev/null
@@ -1,68 +0,0 @@
-<?xml version='1.0' encoding='UTF-8'?>
-<!-- Created with Cambalache 0.90.4 -->
-<interface>
-  <!-- interface-name main_window.ui -->
-  <requires lib="gtk" version="4.14"/>
-  <requires lib="libadwaita" version="1.5"/>
-  <requires lib="gio" version="2.0"/>
-  <object class="AdwApplicationWindow" id="main_window">
-    <property name="content">
-      <object class="AdwToolbarView">
-        <property name="content">
-          <object class="GtkScrolledWindow">
-            <property name="vexpand">True</property>
-            <child>
-              <object class="AdwClamp">
-                <property name="child">
-                  <object class="GtkListBox" id="participant_list">
-                    <property name="margin-bottom">18</property>
-                    <property name="margin-end">12</property>
-                    <property name="margin-start">12</property>
-                    <property name="margin-top">18</property>
-                    <property name="selection-mode">none</property>
-                    <property name="valign">start</property>
-                    <style>
-                      <class name="boxed-list"/>
-                    </style>
-                  </object>
-                </property>
-              </object>
-            </child>
-          </object>
-        </property>
-        <child type="top">
-          <object class="AdwHeaderBar" id="header">
-            <property name="title-widget">
-              <object class="AdwWindowTitle" id="title">
-                <property name="title" translatable="yes">Turns</property>
-              </object>
-            </property>
-            <child type="end">
-              <object class="GtkMenuButton" id="open_main_menu">
-                <property name="icon-name">open-menu</property>
-                <property name="menu-model">main_menu</property>
-              </object>
-            </child>
-            <child type="start">
-              <object class="GtkButton" id="add_participant">
-                <property name="icon-name">contact-new</property>
-              </object>
-            </child>
-            <style/>
-          </object>
-        </child>
-        <style/>
-      </object>
-    </property>
-    <property name="default-height">720</property>
-    <property name="default-width">360</property>
-    <property name="height-request">480</property>
-    <property name="width-request">360</property>
-  </object>
-  <menu id="main_menu">
-    <item>
-      <attribute name="action">app.quit</attribute>
-      <attribute name="label" translatable="yes">_Quit</attribute>
-    </item>
-  </menu>
-</interface>
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>
-- 
cgit v1.2.3