Commit 7360236a authored by Ronan's avatar Ronan

chore(icons): use generic name for icons

parent c39fe349
......@@ -433,14 +433,14 @@ if (UNIX AND NOT APPLE)
install(FILES "${CMAKE_CURRENT_BINARY_DIR}/${EXECUTABLE_NAME}.desktop"
DESTINATION "${CMAKE_INSTALL_DATADIR}/applications"
)
install(FILES "${ASSETS_DIR}/images/linphone_logo.svg"
install(FILES "${ASSETS_DIR}/images/app_logo.svg"
DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/scalable/apps/"
RENAME "${EXECUTABLE_NAME}.svg"
)
set(ICON_DIRS 16x16 22x22 24x24 32x32 64x64 128x128)
foreach (DIR ${ICON_DIRS})
install(FILES "${ASSETS_DIR}/icons/hicolor/${DIR}/apps/linphone.png"
install(FILES "${ASSETS_DIR}/icons/hicolor/${DIR}/apps/icon.png"
DESTINATION "${CMAKE_INSTALL_DATADIR}/icons/hicolor/${DIR}/apps/"
RENAME "${EXECUTABLE_NAME}.png"
)
......
......@@ -3,5 +3,5 @@
for i in 16 22 24 32 64 128
do
mkdir -p hicolor/${i}x${i}/apps
inkscape -z -e hicolor/${i}x${i}/apps/linphone.png -w $i -h $i ../images/linphone_logo.svg
inkscape -z -e hicolor/${i}x${i}/apps/icon.png -w $i -h $i ../images/app_logo.svg
done
A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "linphone.ico"
A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "icon.ico"
......@@ -298,8 +298,8 @@ if (WIN32)
set(CPACK_GENERATOR "NSIS")
set(CPACK_PACKAGE_ICON "${CMAKE_CURRENT_SOURCE_DIR}\\\\linphone-banner.bmp")
set(CPACK_PACKAGE_FILE_NAME "${CPACK_PACKAGE_NAME}-${LINPHONE_GIT_REVISION}-win32")
set(CPACK_NSIS_MUI_ICON "${LINPHONE_DESKTOP_DIR}/assets/${EXECUTABLE_NAME}.ico")
set(CPACK_NSIS_MUI_UNIICON "${LINPHONE_DESKTOP_DIR}/assets/${EXECUTABLE_NAME}.ico")
set(CPACK_NSIS_MUI_ICON "${LINPHONE_DESKTOP_DIR}/assets/icon.ico")
set(CPACK_NSIS_MUI_UNIICON "${LINPHONE_DESKTOP_DIR}/assets/icon.ico")
set(CPACK_NSIS_DISPLAY_NAME "${APPLICATION_NAME}")
if (LINPHONE_MICRO_VERSION)
set(CPACK_NSIS_PACKAGE_NAME "${APPLICATION_NAME} ${LINPHONE_MAJOR_VERSION}.${LINPHONE_MINOR_VERSION}.${LINPHONE_MICRO_VERSION}")
......
......@@ -12,6 +12,7 @@
<file>assets/images/add_hovered.svg</file>
<file>assets/images/add_normal.svg</file>
<file>assets/images/add_pressed.svg</file>
<file>assets/images/app_logo.svg</file>
<file>assets/images/attachment_disabled.svg</file>
<file>assets/images/attachment_hovered.svg</file>
<file>assets/images/attachment_normal.svg</file>
......@@ -125,7 +126,6 @@
<file>assets/images/led_orange.svg</file>
<file>assets/images/led_red.svg</file>
<file>assets/images/led_white.svg</file>
<file>assets/images/linphone_logo.svg</file>
<file>assets/images/message_sign.svg</file>
<file>assets/images/micro_off_hovered.svg</file>
<file>assets/images/micro_off_normal.svg</file>
......
......@@ -44,7 +44,7 @@ namespace LinphoneUtils {
linphone::TransportType stringToTransportType (const QString &transport);
static constexpr char WindowIconPath[] = ":/assets/images/linphone_logo.svg";
static constexpr char WindowIconPath[] = ":/assets/images/app_logo.svg";
}
#endif // ifndef LINPHONE_UTILS_H_
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment