From a4a0dd2106bc183408441c20a17d5d1c53fa52b9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C5=99emysl=20Eric=20Janouch?= <p@janouch.name>
Date: Thu, 28 Oct 2021 05:18:03 +0200
Subject: [PATCH] Clean up

It turns out the RC detection snippet is no longer necessary
after the recent CMake version bump.

The "name" argument in the UI file is redundant, implied by "action".
---
 CMakeLists.txt           | 15 +++------------
 share/gui/window-main.ui |  8 ++++----
 2 files changed, 7 insertions(+), 16 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index fae6c48..a105bd6 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -155,19 +155,10 @@ set (logdiag_HEADERS
 	${liblogdiag_HEADERS}
 	src/ld-window-main.h)
 
-# Resource compilation for MinGW
-if (MINGW)
-	set (CMAKE_RC_COMPILER_INIT windres)
-	enable_language (RC)
-	set (CMAKE_RC_FLAGS "-O coff")
-	set (CMAKE_RC_COMPILE_OBJECT
-		"<CMAKE_RC_COMPILER> <FLAGS> <DEFINES> -o <OBJECT> <SOURCE>")
-endif (MINGW)
-
+# Resource compilation for Windows
 if (WIN32)
-	set (logdiag_SOURCES
-		${logdiag_SOURCES}
-		share/logdiag.rc)
+	# The file isn't scanned for dependencies, but they will only rarely change
+	list (APPEND logdiag_SOURCES share/logdiag.rc)
 endif (WIN32)
 
 # Generate a configure file
diff --git a/share/gui/window-main.ui b/share/gui/window-main.ui
index 1d90531..8209cd4 100644
--- a/share/gui/window-main.ui
+++ b/share/gui/window-main.ui
@@ -1,6 +1,6 @@
 <ui>
 	<menubar name="MenuBar">
-		<menu name="FileMenu" action="FileMenu">
+		<menu action="FileMenu">
 			<menuitem action="New" />
 			<menuitem action="Open" />
 			<menuitem action="Save" />
@@ -12,7 +12,7 @@
 -->
 			<menuitem action="Quit" />
 		</menu>
-		<menu name="EditMenu" action="EditMenu">
+		<menu action="EditMenu">
 			<menuitem action="Undo" />
 			<menuitem action="Redo" />
 			<separator />
@@ -25,7 +25,7 @@
 			<separator />
 			<menuitem action="SelectAll" />
 		</menu>
-		<menu name="ViewMenu" action="ViewMenu">
+		<menu action="ViewMenu">
 			<menuitem action="MainToolbar" />
 			<menuitem action="LibraryPane" />
 			<separator />
@@ -35,7 +35,7 @@
 			<menuitem action="ZoomOut" />
 			<menuitem action="NormalSize" />
 		</menu>
-		<menu name="HelpMenu" action="HelpMenu">
+		<menu action="HelpMenu">
 			<menuitem action="UserGuide" />
 			<menuitem action="About" />
 		</menu>