diff --git a/CMakeLists.txt b/CMakeLists.txt
index 36ac6726b..2db4bd278 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -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"
)
diff --git a/assets/icons/genicons.sh b/assets/icons/genicons.sh
index d7fda1bfd..adf8df433 100755
--- a/assets/icons/genicons.sh
+++ b/assets/icons/genicons.sh
@@ -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
diff --git a/assets/icons/hicolor/128x128/apps/linphone.png b/assets/icons/hicolor/128x128/apps/icon.png
similarity index 100%
rename from assets/icons/hicolor/128x128/apps/linphone.png
rename to assets/icons/hicolor/128x128/apps/icon.png
diff --git a/assets/icons/hicolor/16x16/apps/linphone.png b/assets/icons/hicolor/16x16/apps/icon.png
similarity index 100%
rename from assets/icons/hicolor/16x16/apps/linphone.png
rename to assets/icons/hicolor/16x16/apps/icon.png
diff --git a/assets/icons/hicolor/22x22/apps/linphone.png b/assets/icons/hicolor/22x22/apps/icon.png
similarity index 100%
rename from assets/icons/hicolor/22x22/apps/linphone.png
rename to assets/icons/hicolor/22x22/apps/icon.png
diff --git a/assets/icons/hicolor/24x24/apps/linphone.png b/assets/icons/hicolor/24x24/apps/icon.png
similarity index 100%
rename from assets/icons/hicolor/24x24/apps/linphone.png
rename to assets/icons/hicolor/24x24/apps/icon.png
diff --git a/assets/icons/hicolor/32x32/apps/linphone.png b/assets/icons/hicolor/32x32/apps/icon.png
similarity index 100%
rename from assets/icons/hicolor/32x32/apps/linphone.png
rename to assets/icons/hicolor/32x32/apps/icon.png
diff --git a/assets/icons/hicolor/64x64/apps/linphone.png b/assets/icons/hicolor/64x64/apps/icon.png
similarity index 100%
rename from assets/icons/hicolor/64x64/apps/linphone.png
rename to assets/icons/hicolor/64x64/apps/icon.png
diff --git a/assets/images/linphone_logo.svg b/assets/images/app_logo.svg
similarity index 100%
rename from assets/images/linphone_logo.svg
rename to assets/images/app_logo.svg
diff --git a/assets/linphone.ico b/assets/linphone.ico
deleted file mode 100644
index c955b0a6e..000000000
Binary files a/assets/linphone.ico and /dev/null differ
diff --git a/assets/linphone.rc b/assets/linphone.rc
index 6d0928ebf..c6cfde3ca 100644
--- a/assets/linphone.rc
+++ b/assets/linphone.rc
@@ -1,2 +1 @@
-A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "linphone.ico"
-
+A ICON MOVEABLE PURE LOADONCALL DISCARDABLE "icon.ico"
diff --git a/cmake_builder/linphone_package/CMakeLists.txt b/cmake_builder/linphone_package/CMakeLists.txt
index 0a77bd474..eb4997f62 100644
--- a/cmake_builder/linphone_package/CMakeLists.txt
+++ b/cmake_builder/linphone_package/CMakeLists.txt
@@ -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}")
diff --git a/resources.qrc b/resources.qrc
index d22b9a713..1c19021db 100644
--- a/resources.qrc
+++ b/resources.qrc
@@ -12,6 +12,7 @@
assets/images/add_hovered.svg
assets/images/add_normal.svg
assets/images/add_pressed.svg
+ assets/images/app_logo.svg
assets/images/attachment_disabled.svg
assets/images/attachment_hovered.svg
assets/images/attachment_normal.svg
@@ -125,7 +126,6 @@
assets/images/led_orange.svg
assets/images/led_red.svg
assets/images/led_white.svg
- assets/images/linphone_logo.svg
assets/images/message_sign.svg
assets/images/micro_off_hovered.svg
assets/images/micro_off_normal.svg
diff --git a/src/utils/LinphoneUtils.hpp b/src/utils/LinphoneUtils.hpp
index bb0a7518a..b6c5fbb33 100644
--- a/src/utils/LinphoneUtils.hpp
+++ b/src/utils/LinphoneUtils.hpp
@@ -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_