Core: Fresh filesave icon

Change-Id: Ide9d92fb6cb7b6e6af457eb8680960e2ddc5ef77
Reviewed-by: Alessandro Portale <alessandro.portale@theqtcompany.com>

7 files changed, 44 insertions, 3 deletions

diff --git a/src/plugins/coreplugin/core.qrc b/src/plugins/coreplugin/core.qrc
index 6d8c5faa58..4780a273c4 100644
--- a/src/plugins/coreplugin/core.qrc
+++ b/src/plugins/coreplugin/core.qrc
@@ -12,6 +12,7 @@
         <file>images/filenew.png</file>
         <file>images/fileopen.png</file>
         <file>images/filesave.png</file>
+        <file>images/filesave@2x.png</file>
         <file>images/logo/128/QtProject-qtcreator.png</file>
         <file>images/logo/32/QtProject-qtcreator.png</file>
         <file>images/inputfield.png</file>
diff --git a/src/plugins/coreplugin/coreicons.cpp b/src/plugins/coreplugin/coreicons.cpp
index 43952524c4..fbaf2a9a7b 100644
--- a/src/plugins/coreplugin/coreicons.cpp
+++ b/src/plugins/coreplugin/coreicons.cpp
@@ -34,8 +34,10 @@ const Icon NEWFILE(
         QLatin1String(":/core/images/filenew.png"));
 const Icon OPENFILE(
         QLatin1String(":/core/images/fileopen.png"));
-const Icon SAVEFILE(
-        QLatin1String(":/core/images/filesave.png"));
+const Icon SAVEFILE({
+        {QLatin1String(":/core/images/filesave.png"), Theme::PanelTextColorMid}}, Icon::Tint);
+const Icon SAVEFILE_TOOLBAR({
+        {QLatin1String(":/core/images/filesave.png"), Theme::IconsBaseColor}});
 const Icon UNDO(
         QLatin1String(":/core/images/undo.png"));
 const Icon REDO(
diff --git a/src/plugins/coreplugin/coreicons.h b/src/plugins/coreplugin/coreicons.h
index 93669f4906..537a349271 100644
--- a/src/plugins/coreplugin/coreicons.h
+++ b/src/plugins/coreplugin/coreicons.h
@@ -36,6 +36,7 @@ namespace Icons {
 CORE_EXPORT extern const Utils::Icon NEWFILE;
 CORE_EXPORT extern const Utils::Icon OPENFILE;
 CORE_EXPORT extern const Utils::Icon SAVEFILE;
+CORE_EXPORT extern const Utils::Icon SAVEFILE_TOOLBAR;
 CORE_EXPORT extern const Utils::Icon UNDO;
 CORE_EXPORT extern const Utils::Icon REDO;
 CORE_EXPORT extern const Utils::Icon COPY;
diff --git a/src/plugins/coreplugin/images/filesave.png b/src/plugins/coreplugin/images/filesave.png
index 604ee3b834..0766a53881 100644
--- a/src/plugins/coreplugin/images/filesave.png
+++ b/src/plugins/coreplugin/images/filesave.png
diff --git a/src/plugins/coreplugin/images/filesave@2x.png b/src/plugins/coreplugin/images/filesave@2x.png
new file mode 100644
index 0000000000..b1eefab613
--- /dev/null
+++ b/src/plugins/coreplugin/images/filesave@2x.png
diff --git a/src/plugins/imageviewer/imageviewer.cpp b/src/plugins/imageviewer/imageviewer.cpp
index 4122794176..f3121d62d0 100644
--- a/src/plugins/imageviewer/imageviewer.cpp
+++ b/src/plugins/imageviewer/imageviewer.cpp
@@ -101,7 +101,7 @@ void ImageViewer::ctor()
     d->toolbar = new QWidget();
     d->ui_toolbar.setupUi(d->toolbar);
     d->ui_toolbar.toolButtonExportImage->setIcon(QIcon::fromTheme(QLatin1String("document-save"),
-                                                                  Core::Icons::SAVEFILE.icon()));
+                                                                  Core::Icons::SAVEFILE_TOOLBAR.icon()));
     const Utils::Icon backgroundIcon({
             {QLatin1String(":/core/images/desktopdevicesmall.png"), Utils::Theme::IconsBaseColor}});
     d->ui_toolbar.toolButtonBackground->setIcon(backgroundIcon.icon());
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index e6e9207075..68647b9c9e 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -5029,5 +5029,42 @@
        transform="matrix(0.5,0,0,0.5,285,189.5)"
        width="100%"
        height="100%" />
+    <g
+       id="src/plugins/coreplugin/images/filesave">
+      <rect
+         style="display:inline;fill:#ffffff;fill-opacity:1"
+         x="1000"
+         y="568"
+         width="16"
+         height="16"
+         id="rect6782-96-9-4-4" />
+      <path
+         sodipodi:nodetypes="cccccc"
+         inkscape:connector-curvature="0"
+         id="path5579"
+         d="m 1002,580.5 0,-10.5 12,0 0,12 -10.5,0 -1.5,-1.5"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <rect
+         y="578"
+         x="1005"
+         height="4"
+         width="6"
+         id="rect5600"
+         style="opacity:1;fill:#b3b3b3;fill-opacity:1;stroke:none;stroke-opacity:1" />
+      <path
+         sodipodi:nodetypes="ccccc"
+         inkscape:connector-curvature="0"
+         id="path5581"
+         d="m 1007,579 0,3 -1,0 0,-3 z"
+         style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" />
+      <rect
+         ry="0"
+         y="571"
+         x="1003"
+         height="6"
+         width="10"
+         id="rect5583"
+         style="opacity:1;fill:#ffffff;fill-opacity:1;stroke:none;stroke-opacity:1" />
+    </g>
   </g>
 </svg>