From b81d624543c5e663c9a8788a85d9db6102cc8905 Mon Sep 17 00:00:00 2001 From: Alessandro Portale Date: Fri, 8 Apr 2016 18:19:25 +0200 Subject: [PATCH] QmlProfiler: New Record ON/OFF button icons Change-Id: I95f4a28de5aeefdd321a5fe131351a6aab5b9498 Reviewed-by: hjk --- src/plugins/debugger/debugger.qrc | 4 ++ src/plugins/debugger/debuggericons.h | 6 +++ src/plugins/debugger/images/recordfill.png | Bin 0 -> 147 bytes src/plugins/debugger/images/recordfill@2x.png | Bin 0 -> 254 bytes src/plugins/debugger/images/recordoutline.png | Bin 0 -> 207 bytes .../debugger/images/recordoutline@2x.png | Bin 0 -> 393 bytes src/plugins/qmlprofiler/qml/qmlprofiler.qrc | 2 - src/plugins/qmlprofiler/qml/recordOff.png | Bin 406 -> 0 bytes src/plugins/qmlprofiler/qml/recordOn.png | Bin 484 -> 0 bytes src/plugins/qmlprofiler/qmlprofilertool.cpp | 13 ++++--- src/tools/icons/qtcreatoricons.svg | 36 ++++++++++++++++++ 11 files changed, 54 insertions(+), 7 deletions(-) create mode 100644 src/plugins/debugger/images/recordfill.png create mode 100644 src/plugins/debugger/images/recordfill@2x.png create mode 100644 src/plugins/debugger/images/recordoutline.png create mode 100644 src/plugins/debugger/images/recordoutline@2x.png delete mode 100644 src/plugins/qmlprofiler/qml/recordOff.png delete mode 100644 src/plugins/qmlprofiler/qml/recordOn.png 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 0000000000000000000000000000000000000000..57dc3054c831ba0c3a74d5caebe2a071b2858549 GIT binary patch literal 147 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4h9AW2CEqh_A)RqM0vV6hDb~;J%5(BL4k+u z!oAEGSHGrYr|^`HZ!F7{GMewN)qg1;A{@cA{6Wl#KMpq?AD`yE^V&N?@gRq$jPN2R zKL_sHyHsy4d~-bNW&6+fiCei`k4%2@e`mSW&pG|fU+%=-0oms1>gTe~DWM4famqLv literal 0 HcmV?d00001 diff --git a/src/plugins/debugger/images/recordfill@2x.png b/src/plugins/debugger/images/recordfill@2x.png new file mode 100644 index 0000000000000000000000000000000000000000..d4062c909c2dc9e1a2975713478238054926eedc GIT binary patch literal 254 zcmeAS@N?(olHy`uVBq!ia0y~yU{C;I4h9AWhA=@@4F(2=qn<8~Ar_~PUbg0IGLT{W zP|qdZ8Z7ZpO=I`s=8G?$MLt=0UE%7H*Af~=6`V0XFCTjsT*`mD{^e_JUg3rJo0fSz zR_M6Asdd5a>MxwpwlM+4mxQ>a=SWB*42jXgQl1%O+{Z$BGX;S&N!h zibNz#&@?!#5Y~`v8pMGNQk_TTSDw#1%2 z^rS42Yj@G12-RIXm)6SGn%3SueCu@9%z}9-=|A_cXaCH$kHJPmVONPi$YY+aelF{r G5}E*E#AV$8 literal 0 HcmV?d00001 diff --git a/src/plugins/debugger/images/recordoutline.png b/src/plugins/debugger/images/recordoutline.png new file mode 100644 index 0000000000000000000000000000000000000000..1d82d1028d6cd154b673dd7374b8c793d99be471 GIT binary patch literal 207 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4h9AW2CEqh_A)RqO!IVc43UszJ@`7X*+GKg z!23_!>~B1U*E%>EO3s5*91$goj1(Abb80S$BJL2 z559cJDPj-biZ=WWobpS!VWH+nX>*2YCnhE{CiLysILmS1LxfW`!-JK= z&rBF=-i95l{>oevp5C<9|95|?+`RJVy$wsVm1ezTW4u$mkNN-Xho?G&S?m2lF7$am@9VOBpV6GOjiX zkXdV9|2j}`Lm1-%o{xD2Tl{2n4eiOKc`qt4YY{%N&Y{$^dbVE5_(X)o!7 zoPw2?H#9u#R0wLH$S2|C%renfC|h=e-y~7TeGlX6ms>}07`3X~e&8^6w0jWBZ{zGg zL2l0rM)6-w8XLYIU_Qey8D#YPx{bZhij9te>`%4_oi;5g`<-9#c>eDv#<%7lGk6|- z*kX6v%y~|yx6fhSShnH6T(j4OEn)!@dA`>uSyiJ4AWUUC&jp xaLZiRIq&+3+*>=_w(IZlHkDZMRQ~0)EBwl_nopls|Je=-V^3E - 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 45f5136ca8b0460f68448adb53a4365e90bdeab5..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 406 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4rT@h1`S>QUdbiAhOG$;rtnDJiL`scC6x>FMbi85xO-;?s%`Gi0Jv}|Wy}f;Xef|CYQ>RXy zHf`GU>Chp6yt3+h8xh1agnyTWniPxW0w-Q`Fty(vG**Y$d9t9K2dBtZl`Of48bcoHqTc*i+rso952ZL!we3mh9!VfVC zx&>-56(?2+aO`+s!*JbM`jo@rqLQn&M{0c@GymHZYSA0K@4JDp%RNK+#S9D#44$rj JF6*2UngBM~u~Gm4 diff --git a/src/plugins/qmlprofiler/qml/recordOn.png b/src/plugins/qmlprofiler/qml/recordOn.png deleted file mode 100644 index e693af81622aa4b1da4f9fecb253d77ceafa4063..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 484 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7S9`iRhFJ7YopjdkP=G*d z<;-cX+9n7%by$ZnX`8>vD0$0Y*vj9a&%n)L*YN&;8?#1$sS*pPMxe-(?XQGo&gXiw z=sM1>nR&<3c=_d*r54j{dfk}qBg3+9N8Aew{8AMda80uISmn}*0$camPBH(JalHS6 z^~t1)s;)Y-?)D0qS@-i_Y*X7A!=?g??Pewdlf06)D&GzjR+~#e7(FaF(zr*LOW} zw%Lw7hZSEuF-}?3eprINxnfD3I*-WH?<}IOW=G79ns1jD-uLwG^TX_qJD%%(*1fsr zVx6BtnSz~T&vg~qOOsW2QYMFYTAsYJ>Pb}{yYXaiF7qXBQPWNuzr3`-IckaCOw(=q z1Mf876e)e3n|twu=d7^J7xK!&W0rN9dWIV9-+t`bs;Q@g#Y?@{Zx-lXTBNSJF=F}U q4%d0 #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" /> + + + + + + + +