PierMesh
/
direwolf
mirror of https://github.com/wb2osz/direwolf.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

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.
This commit is contained in:
classabbyamp 2022-05-16 02:07:53 -04:00
parent c9ffbd71c3
commit ea68a191d0
No known key found for this signature in database
GPG Key ID: 6BE0755918A4C7F5
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
CMakeLists.txt
View File

@ -32,15 +32,6 @@ set(COPYRIGHT "Copyright (c) 2019 John Langner, WB2OSZ. All rights reserved.")
add_definitions("-DCOPYRIGHT=\"${COPYRIGHT}\"") add_definitions("-DCOPYRIGHT=\"${COPYRIGHT}\"")
set(IDENTIFIER "com.${COMPANY}.${APPLICATION_NAME}") set(IDENTIFIER "com.${COMPANY}.${APPLICATION_NAME}")
add_definitions("-DIDENTIFIER=\"${IDENTIFIER}\"") add_definitions("-DIDENTIFIER=\"${IDENTIFIER}\"")
# raspberry as only lxterminal not xterm
if(NOT (WIN32 OR CYGWIN))
find_program(BINARY_TERMINAL_BIN lxterminal)
if(BINARY_TERMINAL_BIN)
set(APPLICATION_DESKTOP_EXEC "${BINARY_TERMINAL_BIN} -e ${CMAKE_PROJECT_NAME}")
else()
set(APPLICATION_DESKTOP_EXEC "xterm -e ${CMAKE_PROJECT_NAME}")
endif()
endif()
find_package(Git) find_package(Git)
if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git/") if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git/")

6
cmake/cpack/direwolf.desktop.in
View File

@ -1,10 +1,10 @@
[Desktop Entry] [Desktop Entry]
Name=@APPLICATION_NAME@ Name=@APPLICATION_NAME@
Comment=APRS Soundcard TNC Comment=APRS Soundcard TNC
Exec=@APPLICATION_DESKTOP_EXEC@ Exec=@CMAKE_PROJECT_NAME@
Icon=@CMAKE_PROJECT_NAME@_icon.png Icon=@CMAKE_PROJECT_NAME@_icon
StartupNotify=true StartupNotify=true
Terminal=false Terminal=true
Type=Application Type=Application
Categories=HamRadio Categories=HamRadio
Keywords=Ham Radio;APRS;Soundcard TNC;KISS;AGWPE;AX.25 Keywords=Ham Radio;APRS;Soundcard TNC;KISS;AGWPE;AX.25