From c2ebd5551ff2569f56e3321efd2d9bedaf079955 Mon Sep 17 00:00:00 2001 From: Didier Raboud Date: Thu, 27 Dec 2012 09:54:55 +0100 Subject: [PATCH] Add SVG colobot icon - Refer to the icon in the desktop file - Use rsvg-convert to get scaled PNG versions - Add librsvg2-bin to travis --- .travis.yml | 2 +- src/desktop/CMakeLists.txt | 24 ++++ src/desktop/colobot.desktop.in | 1 + src/desktop/colobot.svg | 238 +++++++++++++++++++++++++++++++++ 4 files changed, 264 insertions(+), 1 deletion(-) create mode 100644 src/desktop/colobot.svg diff --git a/.travis.yml b/.travis.yml index 3e836bb2..660a2f59 100644 --- a/.travis.yml +++ b/.travis.yml @@ -5,4 +5,4 @@ script: cmake . -DCMAKE_VERBOSE_MAKEFILE=ON && make all doc test before_install: - git submodule update --init --recursive - sudo apt-get update -qq - - sudo apt-get install -qq --no-install-recommends libgl1-mesa-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-ttf2.0-dev libpng12-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev google-mock libgtest-dev doxygen graphviz po4a + - sudo apt-get install -qq --no-install-recommends libgl1-mesa-dev libsdl1.2-dev libsdl-image1.2-dev libsdl-ttf2.0-dev libpng12-dev libboost-dev libboost-system-dev libboost-filesystem-dev libboost-regex-dev google-mock libgtest-dev doxygen graphviz po4a librsvg2-bin diff --git a/src/desktop/CMakeLists.txt b/src/desktop/CMakeLists.txt index 6deac2f9..cc159a9c 100644 --- a/src/desktop/CMakeLists.txt +++ b/src/desktop/CMakeLists.txt @@ -14,6 +14,30 @@ install( DESTINATION ${CMAKE_INSTALL_PREFIX}/share/applications/ ) +# Install Icon +set(COLOBOT_ICON_FILE colobot.svg) +install( + FILES ${CMAKE_CURRENT_SOURCE_DIR}/${COLOBOT_ICON_FILE} + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/scalable/apps/ + ) + +# Render SVG icon in various sizes +find_program(RSVG_CONVERT rsvg-convert) +if(RSVG_CONVERT) + foreach(PNGSIZE "48" "32" "16") + file(MAKE_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/${PNGSIZE}) + add_custom_target(resize_icon_${PNGSIZE} ALL + COMMAND ${RSVG_CONVERT} -w ${PNGSIZE} -h ${PNGSIZE} ${CMAKE_CURRENT_SOURCE_DIR}/${COLOBOT_ICON_FILE} + > ${CMAKE_CURRENT_BINARY_DIR}/${PNGSIZE}/colobot.png + ) + install( + FILES ${CMAKE_CURRENT_BINARY_DIR}/${PNGSIZE}/colobot.png + DESTINATION ${CMAKE_INSTALL_PREFIX}/share/icons/hicolor/${PNGSIZE}x${PNGSIZE}/apps/ + ) + endforeach() +endif() + +# Translate translatable material find_program(PO4A po4a) if(PO4A) diff --git a/src/desktop/colobot.desktop.in b/src/desktop/colobot.desktop.in index ddb7264e..74378fd4 100644 --- a/src/desktop/colobot.desktop.in +++ b/src/desktop/colobot.desktop.in @@ -2,3 +2,4 @@ Version=1.0 Type=Application Exec=colobot +Icon=colobot diff --git a/src/desktop/colobot.svg b/src/desktop/colobot.svg new file mode 100644 index 00000000..85a05450 --- /dev/null +++ b/src/desktop/colobot.svg @@ -0,0 +1,238 @@ + + + +