diff options
| -rw-r--r-- | media/CMakeLists.txt | 11 | ||||
| -rw-r--r-- | media/icons/tigervnc_128.png | bin | 0 -> 10419 bytes | |||
| -rw-r--r-- | media/icons/tigervnc_64.png | bin | 0 -> 4793 bytes | |||
| -rw-r--r-- | vncviewer/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | vncviewer/vncviewer.cxx | 2 |
5 files changed, 10 insertions, 5 deletions
diff --git a/media/CMakeLists.txt b/media/CMakeLists.txt index 487e9d00..4bed4b6b 100644 --- a/media/CMakeLists.txt +++ b/media/CMakeLists.txt @@ -1,4 +1,4 @@ -set(ICON_SIZES 16 22 24 32 48) +set(ICON_SIZES 16 22 24 32 48 64 128) find_program(CONVERT_EXECUTABLE convert) @@ -9,11 +9,16 @@ if(CONVERT_EXECUTABLE) add_custom_target(icons DEPENDS ${ICON_FILES}) foreach(SIZE ${ICON_SIZES}) + if(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_${SIZE}.svg) + set(ICON_SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_${SIZE}.svg) + else() + set(ICON_SRC_FILE ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_48.svg) + endif() add_custom_command(OUTPUT ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_${SIZE}.png COMMAND ${CONVERT_EXECUTABLE} -depth 8 -background transparent - ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_${SIZE}.svg + -size ${SIZE}x${SIZE} ${ICON_SRC_FILE} ${CMAKE_CURRENT_SOURCE_DIR}/icons/tigervnc_${SIZE}.png - DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/tigervnc_${SIZE}.svg + DEPENDS ${ICON_SRC_FILE} COMMENT "Generating icons/tigervnc_${SIZE}.png") endforeach() endif() diff --git a/media/icons/tigervnc_128.png b/media/icons/tigervnc_128.png Binary files differnew file mode 100644 index 00000000..7eab42d7 --- /dev/null +++ b/media/icons/tigervnc_128.png diff --git a/media/icons/tigervnc_64.png b/media/icons/tigervnc_64.png Binary files differnew file mode 100644 index 00000000..cd21c2cf --- /dev/null +++ b/media/icons/tigervnc_64.png diff --git a/vncviewer/CMakeLists.txt b/vncviewer/CMakeLists.txt index 7d4455a8..b076347c 100644 --- a/vncviewer/CMakeLists.txt +++ b/vncviewer/CMakeLists.txt @@ -131,7 +131,7 @@ if(UNIX) add_custom_target(appstream ALL DEPENDS org.tigervnc.vncviewer.metainfo.xml) install(FILES ${CMAKE_CURRENT_BINARY_DIR}/org.tigervnc.vncviewer.metainfo.xml DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/metainfo) - foreach(res 16 22 24 32 48) + foreach(res 16 22 24 32 48 64 128) install(FILES ../media/icons/tigervnc_${res}.png DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/icons/hicolor/${res}x${res}/apps RENAME tigervnc.png) endforeach() install(FILES ../media/icons/tigervnc.svg DESTINATION ${CMAKE_INSTALL_FULL_DATADIR}/icons/hicolor/scalable/apps) diff --git a/vncviewer/vncviewer.cxx b/vncviewer/vncviewer.cxx index 028935b7..4afdba46 100644 --- a/vncviewer/vncviewer.cxx +++ b/vncviewer/vncviewer.cxx @@ -355,7 +355,7 @@ static void init_fltk() Fl_Window::default_icons(lg, sm); #elif ! defined(__APPLE__) - const int icon_sizes[] = {48, 32, 24, 16}; + const int icon_sizes[] = {128, 64, 48, 32, 24, 22, 16}; Fl_PNG_Image *icons[sizeof(icon_sizes)/sizeof(icon_sizes[0])]; int count; |
