p
/
logdiag
1
1
Fork 0
Code Issues Pull Requests Releases 4 Wiki Activity

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".
This commit is contained in:
Přemysl Eric Janouch 2021-10-28 05:18:03 +02:00
parent b45670f9e9
commit a4a0dd2106
Signed by: p
GPG Key ID: A0420B94F92B9493
2 changed files with 7 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
CMakeLists.txt
View File

@ -155,19 +155,10 @@ set (logdiag_HEADERS
${liblogdiag_HEADERS} ${liblogdiag_HEADERS}
src/ld-window-main.h) src/ld-window-main.h)
# Resource compilation for MinGW # Resource compilation for Windows
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)
if (WIN32) if (WIN32)
set (logdiag_SOURCES # The file isn't scanned for dependencies, but they will only rarely change
${logdiag_SOURCES} list (APPEND logdiag_SOURCES share/logdiag.rc)
share/logdiag.rc)
endif (WIN32) endif (WIN32)
# Generate a configure file # Generate a configure file

8
share/gui/window-main.ui
View File

@ -1,6 +1,6 @@
<ui> <ui>
<menubar name="MenuBar"> <menubar name="MenuBar">
<menu name="FileMenu" action="FileMenu"> <menu action="FileMenu">
<menuitem action="New" /> <menuitem action="New" />
<menuitem action="Open" /> <menuitem action="Open" />
<menuitem action="Save" /> <menuitem action="Save" />
@ -12,7 +12,7 @@
--> -->
<menuitem action="Quit" /> <menuitem action="Quit" />
</menu> </menu>
<menu name="EditMenu" action="EditMenu"> <menu action="EditMenu">
<menuitem action="Undo" /> <menuitem action="Undo" />
<menuitem action="Redo" /> <menuitem action="Redo" />
<separator /> <separator />
@ -25,7 +25,7 @@
<separator /> <separator />
<menuitem action="SelectAll" /> <menuitem action="SelectAll" />
</menu> </menu>
<menu name="ViewMenu" action="ViewMenu"> <menu action="ViewMenu">
<menuitem action="MainToolbar" /> <menuitem action="MainToolbar" />
<menuitem action="LibraryPane" /> <menuitem action="LibraryPane" />
<separator /> <separator />
@ -35,7 +35,7 @@
<menuitem action="ZoomOut" /> <menuitem action="ZoomOut" />
<menuitem action="NormalSize" /> <menuitem action="NormalSize" />
</menu> </menu>
<menu name="HelpMenu" action="HelpMenu"> <menu action="HelpMenu">
<menuitem action="UserGuide" /> <menuitem action="UserGuide" />
<menuitem action="About" /> <menuitem action="About" />
</menu> </menu>