From ff8890823d5173989055a4ae69dbb8a4856cc365 Mon Sep 17 00:00:00 2001
From: latenightdef <pongpeera054@protonmail.com>
Date: Thu, 24 Oct 2024 08:55:40 +0000
Subject: [PATCH] revert d02a7927f3f4e618f50cee73996a7a6abf18cdcb

revert Migrate to Blueprint and go back to xml-based UI since I don't quite understand GTK yet
---
 .gitignore                          |  2 --
 src/meson.build                     |  9 ------
 src/window.blp                      | 33 ---------------------
 src/window.ui                       | 46 +++++++++++++++++++++++++++++
 subprojects/blueprint-compiler.wrap |  8 -----
 5 files changed, 46 insertions(+), 52 deletions(-)
 delete mode 100644 .gitignore
 delete mode 100644 src/window.blp
 create mode 100644 src/window.ui
 delete mode 100644 subprojects/blueprint-compiler.wrap

diff --git a/.gitignore b/.gitignore
deleted file mode 100644
index f8c9ff8..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-target
-/subprojects/blueprint-compiler
diff --git a/src/meson.build b/src/meson.build
index 71ba490..5cd93cd 100644
--- a/src/meson.build
+++ b/src/meson.build
@@ -1,20 +1,11 @@
 pkgdatadir = get_option('prefix') / get_option('datadir') / meson.project_name()
 gnome = import('gnome')
 
-blueprints = custom_target('blueprints',
-  input: files(
-    'window.blp'
-  ),
-  output: '.',
-  command: [find_program('blueprint-compiler'), 'batch-compile', '@OUTPUT@', '@CURRENT_SOURCE_DIR@', '@INPUT@'],
-)
-
 gnome.compile_resources('boostcontroller',
   'boostcontroller.gresource.xml',
   gresource_bundle: true,
   install: true,
   install_dir: pkgdatadir,
-  dependencies: blueprints,
 )
 
 conf = configuration_data()
diff --git a/src/window.blp b/src/window.blp
deleted file mode 100644
index ad2cb5a..0000000
--- a/src/window.blp
+++ /dev/null
@@ -1,33 +0,0 @@
-using Gtk 4.0;
-using Adw 1;
-
-template BoostcontrollerWindow : Adw.ApplicationWindow {
-  default-width: 600;
-  default-height: 300;
-  title: _("Boost Controller");
-
-  Adw.ToolbarView {
-    [top]
-    Adw.HeaderBar {
-      [end]
-      MenuButton button_menu {
-        menu-model: menu_app;
-        icon-name: "open-menu-symbolic";
-        primary: true;
-      }
-    }
-
-    content: Label label {
-      label: "Yay, blueprint is setup!";
-    };
-  }
-}
-
-menu menu_app {
-  section {
-    item {
-      label: _("About My App");
-      action: "app.about";
-    }
-  }
-}
diff --git a/src/window.ui b/src/window.ui
new file mode 100644
index 0000000..c63d2ab
--- /dev/null
+++ b/src/window.ui
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk" version="4.0"/>
+  <requires lib="Adw" version="1.0"/>
+  <template class="BoostcontrollerWindow" parent="AdwApplicationWindow">
+    <property name="title" translatable="yes">Boost Controller</property>
+    <property name="default-width">800</property>
+    <property name="default-height">600</property>
+    <property name="content">
+      <object class="AdwToolbarView">
+        <child type="top">
+          <object class="AdwHeaderBar">
+            <child type="end">
+              <object class="GtkMenuButton">
+                <property name="primary">True</property>
+                <property name="icon-name">open-menu-symbolic</property>
+                <property name="tooltip-text" translatable="yes">Main Menu</property>
+                <property name="menu-model">primary_menu</property>
+              </object>
+            </child>
+          </object>
+        </child>
+        <property name="content">
+          <object class="GtkLabel" id="label">
+            <property name="label" translatable="yes">Hello, World!</property>
+            <style>
+              <class name="title-1"/>
+            </style>
+          </object>
+        </property>
+      </object>
+    </property>
+  </template>
+  <menu id="primary_menu">
+    <section>
+      <item>
+        <attribute name="label" translatable="yes">_Keyboard Shortcuts</attribute>
+        <attribute name="action">win.show-help-overlay</attribute>
+      </item>
+      <item>
+        <attribute name="label" translatable="yes">_About Boostcontroller</attribute>
+        <attribute name="action">app.about</attribute>
+      </item>
+    </section>
+  </menu>
+</interface>
diff --git a/subprojects/blueprint-compiler.wrap b/subprojects/blueprint-compiler.wrap
deleted file mode 100644
index 5c978d6..0000000
--- a/subprojects/blueprint-compiler.wrap
+++ /dev/null
@@ -1,8 +0,0 @@
-[wrap-git]
-directory = blueprint-compiler
-url = https://gitlab.gnome.org/jwestman/blueprint-compiler.git
-revision = main
-depth = 1
-
-[provide]
-program_names = blueprint-compiler