diff --git a/src/plugins/debugger/debugger.qrc b/src/plugins/debugger/debugger.qrc index 8c3a1c6118a..d7bd49643d1 100644 --- a/src/plugins/debugger/debugger.qrc +++ b/src/plugins/debugger/debugger.qrc @@ -46,6 +46,10 @@ images/qml/apply-on-save.png images/debugger_restart_small.png images/debugger_restart_small@2x.png + images/recordfill.png + images/recordfill@2x.png + images/recordoutline.png + images/recordoutline@2x.png Debugger.mimetypes.xml diff --git a/src/plugins/debugger/debuggericons.h b/src/plugins/debugger/debuggericons.h index 234f9000067..8a1b2699a83 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 00000000000..57dc3054c83 Binary files /dev/null and b/src/plugins/debugger/images/recordfill.png differ diff --git a/src/plugins/debugger/images/recordfill@2x.png b/src/plugins/debugger/images/recordfill@2x.png new file mode 100644 index 00000000000..d4062c909c2 Binary files /dev/null and b/src/plugins/debugger/images/recordfill@2x.png differ diff --git a/src/plugins/debugger/images/recordoutline.png b/src/plugins/debugger/images/recordoutline.png new file mode 100644 index 00000000000..1d82d1028d6 Binary files /dev/null and b/src/plugins/debugger/images/recordoutline.png differ diff --git a/src/plugins/debugger/images/recordoutline@2x.png b/src/plugins/debugger/images/recordoutline@2x.png new file mode 100644 index 00000000000..f4710c98f03 Binary files /dev/null and b/src/plugins/debugger/images/recordoutline@2x.png differ diff --git a/src/plugins/qmlprofiler/qml/qmlprofiler.qrc b/src/plugins/qmlprofiler/qml/qmlprofiler.qrc index ffef45e6a80..88bd7130ec3 100644 --- a/src/plugins/qmlprofiler/qml/qmlprofiler.qrc +++ b/src/plugins/qmlprofiler/qml/qmlprofiler.qrc @@ -1,7 +1,5 @@ - recordOff.png - recordOn.png bindingloops.vert bindingloops.frag diff --git a/src/plugins/qmlprofiler/qml/recordOff.png b/src/plugins/qmlprofiler/qml/recordOff.png deleted file mode 100644 index 45f5136ca8b..00000000000 Binary files a/src/plugins/qmlprofiler/qml/recordOff.png and /dev/null differ diff --git a/src/plugins/qmlprofiler/qml/recordOn.png b/src/plugins/qmlprofiler/qml/recordOn.png deleted file mode 100644 index e693af81622..00000000000 Binary files a/src/plugins/qmlprofiler/qml/recordOn.png and /dev/null differ diff --git a/src/plugins/qmlprofiler/qmlprofilertool.cpp b/src/plugins/qmlprofiler/qmlprofilertool.cpp index a351f65a242..e4d04b86561 100644 --- a/src/plugins/qmlprofiler/qmlprofilertool.cpp +++ b/src/plugins/qmlprofiler/qmlprofilertool.cpp @@ -37,6 +37,7 @@ #include "qmlprofilersettings.h" #include "qmlprofilerplugin.h" +#include #include #include #include @@ -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 da438b13cd1..263f02d7480 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" /> + + + + + + + +