From 3465557a5b3b09b563fc45d2c3b13f09c4935a34 Mon Sep 17 00:00:00 2001
From: Přemysl Eric Janouch <p@janouch.name>
Date: Mon, 1 Nov 2021 10:53:03 +0100
Subject: Use GResources for the UI file and the LICENSE

 - The About dialog now displays the licence.
 - The main UI file is now integrated into the binary.

The project needed some of its ugly CMake code back.
---
 share/gui/window-main.ui    | 50 ---------------------------------------------
 share/logdiag.gresource.xml |  7 +++++++
 share/logdiag.ui            | 50 +++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 57 insertions(+), 50 deletions(-)
 delete mode 100644 share/gui/window-main.ui
 create mode 100644 share/logdiag.gresource.xml
 create mode 100644 share/logdiag.ui

(limited to 'share')

diff --git a/share/gui/window-main.ui b/share/gui/window-main.ui
deleted file mode 100644
index f826698..0000000
--- a/share/gui/window-main.ui
+++ /dev/null
@@ -1,50 +0,0 @@
-<ui>
-	<menubar name="MenuBar">
-		<menu action="FileMenu">
-			<menuitem action="New" />
-			<menuitem action="Open" />
-			<menuitem action="Save" />
-			<menuitem action="SaveAs" />
-			<separator />
-			<menuitem action="Print" />
-			<separator />
-			<menuitem action="Quit" />
-		</menu>
-		<menu action="EditMenu">
-			<menuitem action="Undo" />
-			<menuitem action="Redo" />
-			<separator />
-<!--
-			<menuitem action="Cut" />
-			<menuitem action="Copy" />
-			<menuitem action="Paste" />
--->
-			<menuitem action="Delete" />
-			<separator />
-			<menuitem action="SelectAll" />
-		</menu>
-		<menu action="ViewMenu">
-			<menuitem action="MainToolbar" />
-			<menuitem action="LibraryPane" />
-			<separator />
-			<menuitem action="ShowGrid" />
-			<separator />
-			<menuitem action="ZoomIn" />
-			<menuitem action="ZoomOut" />
-			<menuitem action="NormalSize" />
-		</menu>
-		<menu action="HelpMenu">
-			<menuitem action="UserGuide" />
-			<menuitem action="About" />
-		</menu>
-	</menubar>
-	<toolbar action="Toolbar">
-		<toolitem action="New" />
-		<toolitem action="Open" />
-		<toolitem action="Save" />
-		<separator />
-		<toolitem action="Undo" />
-		<toolitem action="Redo" />
-	</toolbar>
-</ui>
-
diff --git a/share/logdiag.gresource.xml b/share/logdiag.gresource.xml
new file mode 100644
index 0000000..eae7e24
--- /dev/null
+++ b/share/logdiag.gresource.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<gresources>
+	<gresource prefix="/logdiag">
+		<file>logdiag.ui</file>
+		<file alias="LICENSE">../LICENSE</file>
+	</gresource>
+</gresources>
diff --git a/share/logdiag.ui b/share/logdiag.ui
new file mode 100644
index 0000000..f826698
--- /dev/null
+++ b/share/logdiag.ui
@@ -0,0 +1,50 @@
+<ui>
+	<menubar name="MenuBar">
+		<menu action="FileMenu">
+			<menuitem action="New" />
+			<menuitem action="Open" />
+			<menuitem action="Save" />
+			<menuitem action="SaveAs" />
+			<separator />
+			<menuitem action="Print" />
+			<separator />
+			<menuitem action="Quit" />
+		</menu>
+		<menu action="EditMenu">
+			<menuitem action="Undo" />
+			<menuitem action="Redo" />
+			<separator />
+<!--
+			<menuitem action="Cut" />
+			<menuitem action="Copy" />
+			<menuitem action="Paste" />
+-->
+			<menuitem action="Delete" />
+			<separator />
+			<menuitem action="SelectAll" />
+		</menu>
+		<menu action="ViewMenu">
+			<menuitem action="MainToolbar" />
+			<menuitem action="LibraryPane" />
+			<separator />
+			<menuitem action="ShowGrid" />
+			<separator />
+			<menuitem action="ZoomIn" />
+			<menuitem action="ZoomOut" />
+			<menuitem action="NormalSize" />
+		</menu>
+		<menu action="HelpMenu">
+			<menuitem action="UserGuide" />
+			<menuitem action="About" />
+		</menu>
+	</menubar>
+	<toolbar action="Toolbar">
+		<toolitem action="New" />
+		<toolitem action="Open" />
+		<toolitem action="Save" />
+		<separator />
+		<toolitem action="Undo" />
+		<toolitem action="Redo" />
+	</toolbar>
+</ui>
+
-- 
cgit v1.2.3-70-g09d2