QmlProfiler: New Record ON/OFF button icons

Change-Id: I95f4a28de5aeefdd321a5fe131351a6aab5b9498
Reviewed-by: hjk <hjk@theqtcompany.com>

11 files changed, 54 insertions, 7 deletions

diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc
index 8c3a1c6118..d7bd49643d 100644
--- a/src/plugins/debugger/debugger.qrc
+++ b/src/plugins/debugger/debugger.qrc
@@ -46,6 +46,10 @@
         <file>images/qml/apply-on-save.png</file>
         <file>images/debugger_restart_small.png</file>
         <file>images/debugger_restart_small@2x.png</file>
+        <file>images/recordfill.png</file>
+        <file>images/recordfill@2x.png</file>
+        <file>images/recordoutline.png</file>
+        <file>images/recordoutline@2x.png</file>
         <file>Debugger.mimetypes.xml</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/debugger/debuggericons.h b/src/plugins/debugger/debuggericons.h
index 234f900006..8a1b2699a8 100644
--- a/src/plugins/debugger/debuggericons.h
+++ b/src/plugins/debugger/debuggericons.h
@@ -78,6 +78,12 @@ const Utils::Icon SELECT(
         QLatin1String(":/debugger/images/qml/select.png"));
 const Utils::Icon EMPTY(
         QLatin1String(":/debugger/images/debugger_empty_14.png"));
+const Utils::Icon RECORD_ON({
+        {QLatin1String(":/debugger/images/recordfill.png"), Utils::Theme::IconsStopColor},
+        {QLatin1String(":/debugger/images/recordoutline.png"), Utils::Theme::IconsBaseColor}}, Utils::Icon::Tint | Utils::Icon::DropShadow);
+const Utils::Icon RECORD_OFF({
+        {QLatin1String(":/debugger/images/recordfill.png"), Utils::Theme::IconsDisabledColor},
+        {QLatin1String(":/debugger/images/recordoutline.png"), Utils::Theme::IconsBaseColor}}, Utils::Icon::Tint | Utils::Icon::DropShadow);
 
 const Utils::Icon STEP_OVER({
         {QLatin1String(":/debugger/images/debugger_stepover_small.png"), Utils::Theme::IconsBaseColor}});
diff --git a/src/plugins/debugger/images/recordfill.png b/src/plugins/debugger/images/recordfill.png
new file mode 100644
index 0000000000..57dc3054c8
--- /dev/null
+++ b/src/plugins/debugger/images/recordfill.png
diff --git a/src/plugins/debugger/images/recordfill@2x.png b/src/plugins/debugger/images/recordfill@2x.png
new file mode 100644
index 0000000000..d4062c909c
--- /dev/null
+++ b/src/plugins/debugger/images/recordfill@2x.png
diff --git a/src/plugins/debugger/images/recordoutline.png b/src/plugins/debugger/images/recordoutline.png
new file mode 100644
index 0000000000..1d82d1028d
--- /dev/null
+++ b/src/plugins/debugger/images/recordoutline.png
diff --git a/src/plugins/debugger/images/recordoutline@2x.png b/src/plugins/debugger/images/recordoutline@2x.png
new file mode 100644
index 0000000000..f4710c98f0
--- /dev/null
+++ b/src/plugins/debugger/images/recordoutline@2x.png
diff --git a/src/plugins/qmlprofiler/qml/qmlprofiler.qrc b/src/plugins/qmlprofiler/qml/qmlprofiler.qrc
index ffef45e6a8..88bd7130ec 100644
--- a/src/plugins/qmlprofiler/qml/qmlprofiler.qrc
+++ b/src/plugins/qmlprofiler/qml/qmlprofiler.qrc
@@ -1,7 +1,5 @@
 <RCC>
     <qresource prefix="/qmlprofiler">
-        <file>recordOff.png</file>
-        <file>recordOn.png</file>
         <file>bindingloops.vert</file>
         <file>bindingloops.frag</file>
     </qresource>
diff --git a/src/plugins/qmlprofiler/qml/recordOff.png b/src/plugins/qmlprofiler/qml/recordOff.png
deleted file mode 100644
index 45f5136ca8..0000000000
--- a/src/plugins/qmlprofiler/qml/recordOff.png
+++ /dev/null
diff --git a/src/plugins/qmlprofiler/qml/recordOn.png b/src/plugins/qmlprofiler/qml/recordOn.png
deleted file mode 100644
index e693af8162..0000000000
--- a/src/plugins/qmlprofiler/qml/recordOn.png
+++ /dev/null
diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp
index a351f65a24..e4d04b8656 100644
--- a/src/plugins/qmlprofiler/qmlprofilertool.cpp
+++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp
@@ -37,6 +37,7 @@
 #include "qmlprofilersettings.h"
 #include "qmlprofilerplugin.h"
 
+#include <debugger/debuggericons.h>
 #include <debugger/analyzer/analyzermanager.h>
 #include <debugger/analyzer/analyzerruncontrol.h>
 #include <debugger/analyzer/analyzerstartparameters.h>
@@ -204,7 +205,7 @@ QmlProfilerTool::QmlProfilerTool(QObject *parent)
     setRecording(d->m_profilerState->clientRecording());
 
     d->m_clearButton = new QToolButton;
-    d->m_clearButton->setIcon(Icons::CLEAN_PANE.icon());
+    d->m_clearButton->setIcon(Core::Icons::CLEAN_PANE.icon());
     d->m_clearButton->setToolTip(tr("Discard data"));
 
     connect(d->m_clearButton, &QAbstractButton::clicked, [this](){
@@ -213,13 +214,13 @@ QmlProfilerTool::QmlProfilerTool(QObject *parent)
     });
 
     d->m_searchButton = new QToolButton;
-    d->m_searchButton->setIcon(Icons::ZOOM_TOOLBAR.icon());
+    d->m_searchButton->setIcon(Core::Icons::ZOOM_TOOLBAR.icon());
     d->m_searchButton->setToolTip(tr("Search timeline event notes."));
 
     connect(d->m_searchButton, &QToolButton::clicked, this, &QmlProfilerTool::showTimeLineSearch);
 
     d->m_displayFeaturesButton = new QToolButton;
-    d->m_displayFeaturesButton->setIcon(Icons::FILTER.icon());
+    d->m_displayFeaturesButton->setIcon(Core::Icons::FILTER.icon());
     d->m_displayFeaturesButton->setToolTip(tr("Hide or show event categories."));
     d->m_displayFeaturesButton->setPopupMode(QToolButton::InstantPopup);
     d->m_displayFeaturesButton->setProperty("noArrow", true);
@@ -428,10 +429,12 @@ void QmlProfilerTool::recordingButtonChanged(bool recording)
 
 void QmlProfilerTool::setRecording(bool recording)
 {
+    const static QIcon recordOn = Debugger::Icons::RECORD_ON.icon();
+    const static QIcon recordOff = Debugger::Icons::RECORD_OFF.icon();
+
     // update display
     d->m_recordButton->setToolTip( recording ? tr("Disable Profiling") : tr("Enable Profiling"));
-    d->m_recordButton->setIcon(QIcon(recording ? QLatin1String(":/qmlprofiler/recordOn.png") :
-                                                 QLatin1String(":/qmlprofiler/recordOff.png")));
+    d->m_recordButton->setIcon(recording ? recordOn : recordOff);
 
     d->m_recordButton->setChecked(recording);
 
diff --git a/src/tools/icons/qtcreatoricons.svg b/src/tools/icons/qtcreatoricons.svg
index da438b13cd..263f02d748 100644
--- a/src/tools/icons/qtcreatoricons.svg
+++ b/src/tools/icons/qtcreatoricons.svg
@@ -3059,6 +3059,42 @@
          points="555,374 555,362 561,362 561,374 558,370 "
          style="fill:#000000;fill-opacity:1" />
     </g>
+    <g
+       transform="translate(16,0)"
+       style="display:inline"
+       id="src/plugins/debugger/images/recordoutline">
+      <rect
+         id="rect6782-96-9"
+         height="16"
+         width="16"
+         y="568"
+         x="952"
+         style="fill:#ffffff;fill-opacity:1" />
+      <circle
+         style="opacity:1;fill:none;fill-opacity:1;stroke:#000000;stroke-width:1.3;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path4864"
+         cx="960"
+         cy="576"
+         r="6.5" />
+    </g>
+    <g
+       transform="translate(32,0)"
+       style="display:inline"
+       id="src/plugins/debugger/images/recordfill">
+      <rect
+         id="rect6782-96-9-4"
+         height="16"
+         width="16"
+         y="568"
+         x="952"
+         style="fill:#ffffff;fill-opacity:1" />
+      <circle
+         style="display:inline;opacity:1;fill:#000000;fill-opacity:1;stroke:none;stroke-width:0.80000001;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+         id="path4864-3"
+         cx="960"
+         cy="576"
+         r="6" />
+    </g>
   </g>
   <g
      inkscape:groupmode="layer"