From 87d659ca1a14fe8cf4871b8db0f42d005964f565 Mon Sep 17 00:00:00 2001
From: Felix Morgner <felix.morgner@gmail.com>
Date: Fri, 12 Jul 2024 12:37:10 +0200
Subject: app/windows: add basic main window

---
 res/CMakeLists.txt         |  4 ++--
 res/tests/main.cpp         | 12 ------------
 res/windows/main_window.ui |  2 +-
 res/windows/windows.cmb    |  2 +-
 4 files changed, 4 insertions(+), 16 deletions(-)
 delete mode 100644 res/tests/main.cpp

(limited to 'res')

diff --git a/res/CMakeLists.txt b/res/CMakeLists.txt
index 4969787..f823bec 100644
--- a/res/CMakeLists.txt
+++ b/res/CMakeLists.txt
@@ -29,16 +29,16 @@ add_library("turns::res" ALIAS "res")
 # Tests
 
 add_executable("res-tests"
-  "tests/main.cpp"
   "tests/windows.cpp"
 )
 
-target_link_libraries("res-tests"
+target_link_libraries("res-tests" PRIVATE
   "Catch2::Catch2"
   
   "$<$<CXX_COMPILER_ID:GNU,Clang>:-Wl,--whole-archive>"
   "turns::res"
   "$<$<CXX_COMPILER_ID:GNU,Clang>:-Wl,--no-whole-archive>"
+  "turns::gtk-test-main"
 )
 
 catch_discover_tests("res-tests")
\ No newline at end of file
diff --git a/res/tests/main.cpp b/res/tests/main.cpp
deleted file mode 100644
index 02173f9..0000000
--- a/res/tests/main.cpp
+++ /dev/null
@@ -1,12 +0,0 @@
-#include <catch2/catch_session.hpp>
-
-#include <adwaita.h>
-#include <gtkmm/init.h>
-
-auto main(int argc, char * argv[]) -> int
-{
-  Gtk::init_gtkmm_internals();
-  adw_init();
-
-  return Catch::Session().run(argc, argv);
-}
\ No newline at end of file
diff --git a/res/windows/main_window.ui b/res/windows/main_window.ui
index 5489996..c9dbf26 100644
--- a/res/windows/main_window.ui
+++ b/res/windows/main_window.ui
@@ -18,7 +18,7 @@
         <child type="top">
           <object class="AdwHeaderBar" id="header">
             <property name="title-widget">
-              <object class="AdwWindowTitle">
+              <object class="AdwWindowTitle" id="title">
                 <property name="title">Turns</property>
               </object>
             </property>
diff --git a/res/windows/windows.cmb b/res/windows/windows.cmb
index e911ec0..8236b71 100644
--- a/res/windows/windows.cmb
+++ b/res/windows/windows.cmb
@@ -14,7 +14,7 @@
 	(1,3,"AdwHeaderBar","header",2,None,"top",None,-1,None,None),
 	(1,4,"GtkScrolledWindow",None,2,None,None,None,-1,None,None),
 	(1,5,"GtkListBox","entry_list",4,None,None,None,-1,None,None),
-	(1,6,"AdwWindowTitle",None,3,None,None,None,-1,None,None),
+	(1,6,"AdwWindowTitle","title",3,None,None,None,-1,None,None),
 	(1,7,"GtkMenuButton","open_menu",3,None,"start",None,None,None,None),
 	(1,8,"GtkButton","add_participant",3,None,"start",None,None,None,None),
 	(1,9,"(menu)","main_menu",None,None,None,None,-1,None,None),
-- 
cgit v1.2.3