Skip to content

Commit f9ffec7

Browse files
committed
direwolf.desktop: remove xterm hard-coding, fix icon
fixes #308 Per the [desktop entry specification](https://specifications.freedesktop.org/desktop-entry-spec/desktop-entry-spec-latest.html#recognized-keys), all that should be needed to run direwolf in the default terminal of a user's system should be setting `Terminal=true`. Per the [xdg icon theme specification](https://specifications.freedesktop.org/icon-theme-spec/icon-theme-spec-latest.html#icon_lookup), the `Icon` key in a desktop file should only include the basename of the icon's filename, not include the extension.
1 parent 7d3c1d1 commit f9ffec7

File tree

2 files changed

+3
-12
lines changed

2 files changed

+3
-12
lines changed

CMakeLists.txt

-9
Original file line numberDiff line numberDiff line change
@@ -31,15 +31,6 @@ set(COPYRIGHT "Copyright (c) 2019 John Langner, WB2OSZ. All rights reserved.")
3131
add_definitions("-DCOPYRIGHT=\"${COPYRIGHT}\"")
3232
set(IDENTIFIER "com.${COMPANY}.${APPLICATION_NAME}")
3333
add_definitions("-DIDENTIFIER=\"${IDENTIFIER}\"")
34-
# raspberry as only lxterminal not xterm
35-
if(NOT (WIN32 OR CYGWIN))
36-
find_program(BINARY_TERMINAL_BIN lxterminal)
37-
if(BINARY_TERMINAL_BIN)
38-
set(APPLICATION_DESKTOP_EXEC "${BINARY_TERMINAL_BIN} -e ${CMAKE_PROJECT_NAME}")
39-
else()
40-
set(APPLICATION_DESKTOP_EXEC "xterm -e ${CMAKE_PROJECT_NAME}")
41-
endif()
42-
endif()
4334

4435
find_package(Git)
4536
if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git/")

cmake/cpack/direwolf.desktop.in

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
[Desktop Entry]
22
Name=@APPLICATION_NAME@
33
Comment=APRS Soundcard TNC
4-
Exec=@APPLICATION_DESKTOP_EXEC@
5-
Icon=@CMAKE_PROJECT_NAME@_icon.png
4+
Exec=@CMAKE_PROJECT_NAME@
5+
Icon=@CMAKE_PROJECT_NAME@_icon
66
StartupNotify=true
7-
Terminal=false
7+
Terminal=true
88
Type=Application
99
Categories=HamRadio
1010
Keywords=Ham Radio;APRS;Soundcard TNC;KISS;AGWPE;AX.25

0 commit comments

Comments
 (0)