Update application and some other icons

Task-number: BOUL-711
Change-Id: Idcdbb723f03c4329df9efd752360e9e1958ef9b9
Reviewed-by: Miikka Heikkinen <miikka.heikkinen@qt.io>
Reviewed-by: Pasi Keränen <pasi.keranen@qt.io>

18 files changed, 8 insertions, 6 deletions

diff --git a/src/Authoring/Q3DStudio.pro b/src/Authoring/Q3DStudio.pro
index fb9bb0d5..0a6887e1 100644
--- a/src/Authoring/Q3DStudio.pro
+++ b/src/Authoring/Q3DStudio.pro
@@ -225,4 +225,4 @@ RESOURCES += \
 target.path = $$[QT_INSTALL_BINS]
 INSTALLS += target
 
-RC_ICONS = Studio/images/Studio.ico
+RC_ICONS = Studio/images/3D-studio.ico
diff --git a/src/Authoring/Studio/MainFrm.ui b/src/Authoring/Studio/MainFrm.ui
index e838cf40..dc589aa6 100644
--- a/src/Authoring/Studio/MainFrm.ui
+++ b/src/Authoring/Studio/MainFrm.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="MainFrm.qrc">
-    <normaloff>:/images/Studio.png</normaloff>:/images/Studio.png</iconset>
+    <normaloff>:/images/icon_256x256</normaloff>:/images/icon_256x256</iconset>
   </property>
   <widget class="QWidget" name="centralwidget"/>
   <widget class="QMenuBar" name="menubar">
diff --git a/src/Authoring/Studio/images.qrc b/src/Authoring/Studio/images.qrc
index 6305ec6d..24d13027 100644
--- a/src/Authoring/Studio/images.qrc
+++ b/src/Authoring/Studio/images.qrc
@@ -199,7 +199,8 @@
         <file>images/Toolbar-06.png</file>
         <file>images/Toolbar-07.png</file>
         <file>images/About Icon.bmp</file>
-        <file>images/Studio.png</file>
+        <file>images/icon_256x256.png</file>
+        <file>images/icon_256x256@2x.png</file>
         <file>images/separator.png</file>
         <file>images/editcamera_tools_hi-00_disabled.png</file>
         <file>images/editcamera_tools_hi-01_disabled.png</file>
diff --git a/src/Authoring/Studio/images/3D-studio.ico b/src/Authoring/Studio/images/3D-studio.ico
new file mode 100644
index 00000000..afcf8c68
--- /dev/null
+++ b/src/Authoring/Studio/images/3D-studio.ico
diff --git a/src/Authoring/Studio/images/Studio.ico b/src/Authoring/Studio/images/Studio.ico
deleted file mode 100644
index 0911ac1f..00000000
--- a/src/Authoring/Studio/images/Studio.ico
+++ /dev/null
diff --git a/src/Authoring/Studio/images/Studio.png b/src/Authoring/Studio/images/Studio.png
deleted file mode 100644
index 11c6e526..00000000
--- a/src/Authoring/Studio/images/Studio.png
+++ /dev/null
diff --git a/src/Authoring/Studio/images/anim_progress.png b/src/Authoring/Studio/images/anim_progress.png
index 6f0b5a83..1bd3a396 100644
--- a/src/Authoring/Studio/images/anim_progress.png
+++ b/src/Authoring/Studio/images/anim_progress.png
diff --git a/src/Authoring/Studio/images/anim_progress@2x.png b/src/Authoring/Studio/images/anim_progress@2x.png
index 28f20fd6..909b415f 100644
--- a/src/Authoring/Studio/images/anim_progress@2x.png
+++ b/src/Authoring/Studio/images/anim_progress@2x.png
diff --git a/src/Authoring/Studio/images/icon_256x256.png b/src/Authoring/Studio/images/icon_256x256.png
new file mode 100644
index 00000000..4f088d3a
--- /dev/null
+++ b/src/Authoring/Studio/images/icon_256x256.png
diff --git a/src/Authoring/Studio/images/icon_256x256@2x.png b/src/Authoring/Studio/images/icon_256x256@2x.png
new file mode 100644
index 00000000..4f575b14
--- /dev/null
+++ b/src/Authoring/Studio/images/icon_256x256@2x.png
diff --git a/src/Viewer/Qt3DViewer/Viewer.qrc b/src/Viewer/Qt3DViewer/Viewer.qrc
index d557d3da..72650fb2 100644
--- a/src/Viewer/Qt3DViewer/Viewer.qrc
+++ b/src/Viewer/Qt3DViewer/Viewer.qrc
@@ -1,6 +1,7 @@
 <RCC>
     <qresource prefix="/">
-        <file>resources/images/viewer_icon.png</file>
+        <file>resources/images/icon_256x256.png</file>
+        <file>resources/images/icon_256x256@2x.png</file>
         <file>viewer.qml</file>
         <file alias="style.qss">../../Authoring/Studio/style.qss</file>
         <file alias="images/arrow_down.png">../../Authoring/Studio/images/arrow_down.png</file>
diff --git a/src/Viewer/Qt3DViewer/Viewer.rc b/src/Viewer/Qt3DViewer/Viewer.rc
index bda70099..ee243d46 100644
--- a/src/Viewer/Qt3DViewer/Viewer.rc
+++ b/src/Viewer/Qt3DViewer/Viewer.rc
@@ -2,7 +2,7 @@
 #include "../../Authoring/Build/versionnumber.h"
 #undef APSTUDIO_READONLY_SYMBOLS
 
-IDI_ICON1               ICON    DISCARDABLE     "resources/images/Viewer.ico"
+IDI_ICON1               ICON    DISCARDABLE     "resources/images/3D-studio-viewer.ico"
 IDI_ICON2				ICON	DISCARDABLE		"resources/images/ViewerDoc.ico"
 
 1 VERSIONINFO
diff --git a/src/Viewer/Qt3DViewer/mainwindow.ui b/src/Viewer/Qt3DViewer/mainwindow.ui
index 94d99740..cddbff72 100644
--- a/src/Viewer/Qt3DViewer/mainwindow.ui
+++ b/src/Viewer/Qt3DViewer/mainwindow.ui
@@ -15,7 +15,7 @@
   </property>
   <property name="windowIcon">
    <iconset resource="Viewer.qrc">
-    <normaloff>:/resources/images/viewer_icon.png</normaloff>:/resources/images/viewer_icon.png</iconset>
+    <normaloff>:/resources/images/icon_256x256.png</normaloff>:/resources/images/icon_256x256.png</iconset>
   </property>
   <property name="styleSheet">
    <string notr="true"/>
diff --git a/src/Viewer/Qt3DViewer/resources/images/3D-studio-viewer.ico b/src/Viewer/Qt3DViewer/resources/images/3D-studio-viewer.ico
new file mode 100644
index 00000000..c15cd68a
--- /dev/null
+++ b/src/Viewer/Qt3DViewer/resources/images/3D-studio-viewer.ico
diff --git a/src/Viewer/Qt3DViewer/resources/images/Viewer.ico b/src/Viewer/Qt3DViewer/resources/images/Viewer.ico
deleted file mode 100644
index 09d91c78..00000000
--- a/src/Viewer/Qt3DViewer/resources/images/Viewer.ico
+++ /dev/null
diff --git a/src/Viewer/Qt3DViewer/resources/images/icon_256x256.png b/src/Viewer/Qt3DViewer/resources/images/icon_256x256.png
new file mode 100644
index 00000000..0c7bf48b
--- /dev/null
+++ b/src/Viewer/Qt3DViewer/resources/images/icon_256x256.png
diff --git a/src/Viewer/Qt3DViewer/resources/images/icon_256x256@2x.png b/src/Viewer/Qt3DViewer/resources/images/icon_256x256@2x.png
new file mode 100644
index 00000000..29a8ed75
--- /dev/null
+++ b/src/Viewer/Qt3DViewer/resources/images/icon_256x256@2x.png
diff --git a/src/Viewer/Qt3DViewer/resources/images/viewer_icon.png b/src/Viewer/Qt3DViewer/resources/images/viewer_icon.png
deleted file mode 100644
index 312e9b10..00000000
--- a/src/Viewer/Qt3DViewer/resources/images/viewer_icon.png
+++ /dev/null