From f14dffe68143b89405ba2616986dac52ae29cb0f Mon Sep 17 00:00:00 2001 From: Aurindam Jana Date: Fri, 23 Mar 2012 12:39:19 +0100 Subject: [PATCH] QmlJSInspector: Remove Color Picker Tool Change-Id: Ic1a158f3e96052fcf30071ec827c23a4a83625f5 Reviewed-by: Kai Koehne --- .../images/color-picker-small-hicontrast.png | Bin 3206 -> 0 bytes .../images/color-picker-small.png | Bin 3173 -> 0 bytes .../qmljsinspector/images/color-picker.png | Bin 3185 -> 0 bytes .../qmljsinspector/qmljsclientproxy.cpp | 10 -- src/plugins/qmljsinspector/qmljsclientproxy.h | 3 - src/plugins/qmljsinspector/qmljsinspector.cpp | 20 --- src/plugins/qmljsinspector/qmljsinspector.h | 1 - src/plugins/qmljsinspector/qmljsinspector.pro | 2 - src/plugins/qmljsinspector/qmljsinspector.qbs | 2 - src/plugins/qmljsinspector/qmljsinspector.qrc | 3 - .../qmljsinspector/qmljsinspectorclient.cpp | 35 +---- .../qmljsinspector/qmljsinspectorclient.h | 3 - .../qmljsinspector/qmljsinspectorconstants.h | 2 - .../qmljsinspector/qmljsinspectortoolbar.cpp | 43 ------ .../qmljsinspector/qmljsinspectortoolbar.h | 11 -- .../qmljsinspector/qmljstoolbarcolorbox.cpp | 132 ------------------ .../qmljsinspector/qmljstoolbarcolorbox.h | 75 ---------- 17 files changed, 2 insertions(+), 340 deletions(-) delete mode 100644 src/plugins/qmljsinspector/images/color-picker-small-hicontrast.png delete mode 100644 src/plugins/qmljsinspector/images/color-picker-small.png delete mode 100644 src/plugins/qmljsinspector/images/color-picker.png delete mode 100644 src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp delete mode 100644 src/plugins/qmljsinspector/qmljstoolbarcolorbox.h diff --git a/src/plugins/qmljsinspector/images/color-picker-small-hicontrast.png b/src/plugins/qmljsinspector/images/color-picker-small-hicontrast.png deleted file mode 100644 index 95b88ac8f0a20ce091821002793d1cfc3302c0b2..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3206 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 diff --git a/src/plugins/qmljsinspector/images/color-picker-small.png b/src/plugins/qmljsinspector/images/color-picker-small.png deleted file mode 100644 index 026c31b3e1ddaaf4697b077ac693f3ad576b7023..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 3173 zcmeAS@N?(olHy`uVBq!ia0y~yU=RRd4mJh`2Kmqb6B!s7I14-?iy0WWg+Z8+Vb&Z8 z1_mzwOlRkSfQjkW+Vq$V4?QMNR>)4#kBxMFS5Cy1KGRpIFer+}GF8BO0i~)5Udz{fXkDzUIXp zU8jCOtX`abZO`{-Xa8-zZufl6=ee8DvmfB#ndV^}XxhND(n(J6LG$q=#~wb>b7d=7!LT(K42iz{-6Jq)65vgh8D&HB@->Y zIT}P59IE=9mN7WEF*eMdp%%=rfQ2F9baK*Th5%iL1oir7ml+!7{+LO86pfAMAE#ESTfwuWiapzPxD~du$|$+IRWlX3>-WR27w)| znhY$}3<)Qcl`9xpW-^GleG0evsJ%|$xfTOM#mr4MJ5?-Q8>2aN3)#cN_2e|pd5UX` zm?bhL&T`N@R5?@9sL_P~!RIp!3=1ZT3O;E5{I}v9-@0?>%=)(R#p}M>&-Py_De3XQ zr{`A}I503gEUCNrPe*^VRD(5JL+-yts_$4b;Q;wm;6nz~Hi=QEP*v^p}GYItSQf4zk`k$o(h5ti?&?$RQ^IC$5wR znW6;EHBC+$ZD%*gY9;7jaga4R5SY<6xqwgaQ0NXm+XDVyi5&9|YV2v`WN|#fA)Kgq ztAjDAD?+)CLwsiI5524k8#^I(fR~~ zQPZEcJ?@568aD;nUg6p5ymN)QREygp?h7d;hO_#`7Ra3h?;vuCx`Q)vX>`m;JQ*;!xPqaRn z`{eKw<0sNj6hB3C%}sJBT=FCMkw(y|EHBBY0#8kzvZc;2atvKOE9mZug&~5b{ZUS9 z7j6q$AK1P^*rarp<=JL2Pw%B`7frn^l_8$-J#+nwl3jv#r^@+FzYu=u^h@^_(_b)u zDd*vB6Ky`;k**;*TY_C8U9wza{S2RFl9#(BkB1nT8@`_Ld?x?Q{Ll!kZCW*=6HjqX z^_r?SRa#3wWaX-5tM0Ah4*eW@I;4MPTyX6=w@~BY$16FnOj{kgYHq;mVCmrWmDVfT zSEaAW53yfT7x}l7E%LC>VSnc(feSXqKi+dpfje1pbA^s#Ht*`T(nixGY8%hqtSQsl zJ>#$J?rz&vD;HWi8+#dtZw~rACC#4w@r=SBb4vU;pKC0i{<*H}p2&O6N1D>hOni14 zrp9Einl^n}#A=V#fveqL?=@TZcKO_8dtG-&{%+)RJnp3)qwb#Ge~xwT^WdAocb9W5 z7xT5X`npbURrXTpg}YtK_vbBtH)GzuxQ2N?`OEKB?tT7CrdI!N$lu&w%fGtwM6hk< zQDM8yb56qMsA*xojjaCh+aCj+V-GtxFHM}9IQ?PE#GMyy7GHJib>r{JJQnj<<#Fz@ z++&N?*whr&ynSE!zMB=~yK|Z5GHV}epW|oGoLzMG+Dy~gwuaY@p3i|aQRNZ$$qQnT}wZ_ z;p4WG+g5Iu-0<`U+wFDRa<|ncrYDJ~Z$G;3@Vm)-C)e((?fq-Z&f9*IZ?$ZcY+dn| zA`z=Ft9!G~&3R{Ed-Th+m-^`u=LOE+Fn+vE__XGc%(=m{FT1CUr|&Fo{@l^s>D_c% zZ@Qh{Z0TcnPwai-Rr0kk_F>hfuXAT_o_*-;ireeonZ3(=*M4XI8I$>%^CFFlFC0GM z{2=h@MSJe~Qw_53uc`BQ_HRtz`dnE*S$|^q+Upy(FD+m7J@LJ`-8Z|U`H$@$+nC=o zx)&LL#{9tc6WdSwAI_f_-+JGbFfd-#Ydz*y$+h*x$6a>FL3>iWw)~OjxV<{rQY@6VGMxwFcC^xORa(@mXT`;W{4m z*7nx$Hv7JUjtHrXhSN>UFWzx3zVGtOWtz*q+3AM1Em6GT&vg%l?>N zTI89l5pyFvbG&6N^|aQR<>lEq&E}ym{zJB zHD0RobZ3kD$_aaXczy29wwfn4t4tx+$kuAFVe_Pk6AGPHDf&*{mi{XJSz6iYHL0ze z{vFNh-mWh&l+efI5{&8Kcp zFrV{&{{Oc^hlCzZ+P1XKJ6u;b;@RFcS(ck@3M+4OJr-rvZVO{uW3!`cn^x{s|J859 zr?0Eqt5)Tk-57W9RMWw&jM=ZbL%E)|*1o=T{cWs&gns1xt%<+d=1SX%c6O~3xh+0j zwEl+1orFOT=;tu4Iw!?wKr z`pxyW{`9jNw|6&hbKbdlzs-(4smo8EJ8NwpvLxh7$gdEycbD#NO}zdi@8Ub@>OJ2~ z-dw#Mz32O1yOaBFhcbrxUQN52`rGsO=I{3FI#<2?G3|G5>{`Fv!nennFERgRSLWMx zedm>{vX^W_g8Hv%zjo(4F2C>J-1p_Wyk@+iy>pH|QZ8_*eDd-;=l$<;yjHi$daBnv zWWOw5CYvs+pXD^`(=4~y!LxoxCq?h_KVx_C+N*n2f81}&^UpD{iLCVc9C9-A*2|{L zlhZ$)@0mMwZf%|3&pQdX7j3J4o_y|p7JvTxT>>Q!FS-8jer~a_1KrRSNSyZdEtD@QW)!(h%=ES4z)+>iz|hdl z!0_`w14F}028L1t28LG&3=CE?7#PI!C&eFiV_;yM;OXKRQgJKk&;S4S%&HBYB1h-V zo44rZ&6~SYBoCZEef#VG|Nq0^ym>SI)$7;Qo<i@d%5_K${c0H*dGr6LPoM5TdHOUr;nhULU5q|F zJUn-}#r61qefoNQ@BR9JcKjS17H1A0{ye9>-MxDPL_zU$eg3Nd|6cFSzh7@x{o%t$ zr_9VuPc}BT)D-c@Mh(gLnyxbH$Jg%q{_*kl^zHff5h~i++I@1tJ9rYz3{0k0{rGWs z>h*j(``u-K|0zjI`kej2lVDr-DePYJ@%jESdusAm&6%^uVx39TX@+T;m#1qSJG$J{ z*udb!1Mh?vYzHneDl;=PD>E}6uGdIAkj`L~u*AfgnTjkW+Vq$V4?QMNR>)4#kBxMFS5Cy1KGRpIFer+}GF8BO0i~)5Udz{fXkDzUIXp zU8jCOtX`abZO`{-Xa8-zZufl6=ee8DvmfB#ndV^}XxhND(n(J6LG$q=#~wb>b7d=7!LT(K42iz{-6Jq)65vgh8D&HB@->Y zIT}P59IE=9mN7WEF*eMdp%%=rfQ2F9baK*Th5%iL1oir7ml+!7{+LO86pfAMAE#ESTfwuWiapzPxD~du$|$+IRWlX3>-WR27w)| znhY$}3<)Qcl`9xpW-^GleG0evsJ%|$xfTOM#mr4MJ5?-Q8>2aN3)#cN_2e|pd5UX` zm?bhL&T`N@R5?@9sL_P~!RIp!3=1ZT3O;E5{I}v9-@0?>%=)(R#p}M>&-Py_De3XQ zr{`A}I503gEUCNrPe*^VRD(5JL+-yts_$4b;Q;wm;6nz~Hi=QEP*v^p}GYItSQf4zk`k$o(h5ti?&?$RQ^IC$5wR znW6;EHBC+$ZD%*gY9;7jaga4R5SY<6xqwgaQ0NXm+XDVyi5&9|YV2v`WN|#fA)Kgq ztAjDAD?+)CLwsiI5524k8#^I(fR~~ zQPZEcJ?@568aD;nUg6p5ymN)QREygp?h7d;hO_#`7Ra3h?;vuCx`Q)vX>`m;JQ*;!xPqaRn z`{eKw<0sNj6hB3C%}sJBT=FCMkw(y|EHBBY0#8kzvZc;2atvKOE9mZug&~5b{ZUS9 z7j6q$AK1P^*rarp<=JL2Pw%B`7frn^l_8$-J#+nwl3jv#r^@+FzYu=u^h@^_(_b)u zDd*vB6Ky`;k**;*TY_C8U9wza{S2RFl9#(BkB1nT8@`_Ld?x?Q{Ll!kZCW*=6HjqX z^_r?SRa#3wWaX-5tM0Ah4*eW@I;4MPTyX6=w@~BY$16FnOj{kgYHq;mVCmrWmDVfT zSEaAW53yfT7x}l7E%LC>VSnc(feSXqKi+dpfje1pbA^s#Ht*`T(nixGY8%hqtSQsl zJ>#$J?rz&vD;HWi8+#dtZw~rACC#4w@r=SBb4vU;pKC0i{<*H}p2&O6N1D>hOni14 zrp9Einl^n}#A=V#fveqL?=@TZcKO_8dtG-&{%+)RJnp3)qwb#Ge~xwT^WdAocb9W5 z7xT5X`npbURrXTpg}YtK_vbBtH)GzuxQ2N?`OEKB?tT7CrdI!N$lu&w%fGtwM6hk< zQDM8yb56qMsA*xojjaCh+aCj+V-GtxFHM}9IQ?PE#GMyy7GHJib>r{JJQnj<<#Fz@ z++&N?*whr&ynSE!zMB=~yK|Z5GHV}epW|oGoLzMG+Dy~gwuaY@p3i|aQRNZ$$qQnT}wZ_ z;p4WG+g5Iu-0<`U+wFDRa<|ncrYDJ~Z$G;3@Vm)-C)e((?fq-Z&f9*IZ?$ZcY+dn| zA`z=Ft9!G~&3R{Ed-Th+m-^`u=LOE+Fn+vE__XGc%(=m{FT1CUr|&Fo{@l^s>D_c% zZ@Qh{Z0TcnPwai-Rr0kk_F>hfuXAT_o_*-;ireeonZ3(=*M4XI8I$>%^CFFlFC0GM z{2=h@MSJe~Qw_53uc`BQ_HRtz`dnE*S$|^q+Upy(FD+m7J@LJ`-8Z|U`H$@$+nC=o zx)&LL#{9tc6WdSwAI_f_-+JGbFfd-#Ydz*y$+h*x$6a>FL3>iWw)~OjxV<{rQY@6VGMxwFcC^xORa(@mXT`;W{4m z*7nx$Hv7JUjtHrXhSN>UFWzx3zVGtOWtz*q+3AM1Em6GT&vg%l?>N zTI89l5pyFvbG&6N^|aQR<>lEq&E}ym{zJB zHD0RobZ3kD$_aaXczy29wwfn4t4tx+$kuAFVe_Pk6AGPHDf&*{mi{XJSz6iYHL0ze z{vFNh-mWh&l+efI5{&8Kcp zFrV{&{{Oc^hlCzZ+P1XKJ6u;b;@RFcS(ck@3M+4OJr-rvZVO{uW3!`cn^x{s|J859 zr?0Eqt5)Tk-57W9RMWw&jM=ZbL%E)|*1o=T{cWs&gns1xt%<+d=1SX%c6O~3xh+0j zwEl+1orFOT=;tu4Iw!?wKr z`pxyW{`9jNw|6&hbKbdlzs-(4smo8EJ8NwpvLxh7$gdEycbD#NO}zdi@8Ub@>OJ2~ z-dw#Mz32O1yOaBFhcbrxUQN52`rGsO=I{3FI#<2?G3|G5>{`Fv!nennFERgRSLWMx zedm>{vX^W_g8Hv%zjo(4F2C>J-1p_Wyk@+iy>pH|QZ8_*eDd-;=l$<;yjHi$daBnv zWWOw5CYvs+pXD^`(=4~y!LxoxCq?h_KVx_C+N*n2f81}&^UpD{iLCVc9C9-A*2|{L zlhZ$)@0mMwZf%|3&pQdX7j3J4o_y|p7JvTxT>>Q!FS-8jer~a_1KrRSNSyZdEtD@QW)!(h%=ES4z)+>iz|hdl z!0_`w14F}028L1t28LG&3=CE?7#PI!C&eFiV_;yM1tvhK7A_t`~UxcQEThpOMm_P6}KvC!J-+or@0UM6H&@?c@9+Qr>v?)q=j{kz6C)iE8CvTX7WQrbo;`oeD=RCd zV}1pmQA%JGW@cvoeyH_y^S+wDh3~)5-+!K&iHYy?hYvQ-A3nUe=n9h>8ynlZou8+( z@2&s;_1^aP_VaBkepD>nvSo`3Gjp@iJ^_VmOnsHyVeETqzP`M7y#M~ZyZinoOkA^O zjYZWVh3iad%+A3p+xzWfD*rzFygB>&d;Lih51Pyo;*RK_zh~2<4Ih*nHmY3clj~`uLA}JwJ@gdd2N$kNX_8uM{9uWS&P$J*xIJ<=V>N5}X850<^ Y#g`ktxZ1Xefq{X+)78&qol`;+05S6bPXGV_ diff --git a/src/plugins/qmljsinspector/qmljsclientproxy.cpp b/src/plugins/qmljsinspector/qmljsclientproxy.cpp index 83126d8809a..d188832ebd9 100644 --- a/src/plugins/qmljsinspector/qmljsclientproxy.cpp +++ b/src/plugins/qmljsinspector/qmljsclientproxy.cpp @@ -95,8 +95,6 @@ void ClientProxy::connectToServer() this, SLOT(clientStatusChanged(QDeclarativeDebugClient::Status))); connect(m_inspectorClient, SIGNAL(currentObjectsChanged(QList)), SLOT(onCurrentObjectsChanged(QList))); - connect(m_inspectorClient, SIGNAL(colorPickerActivated()), - SIGNAL(colorPickerActivated())); connect(m_inspectorClient, SIGNAL(zoomToolActivated()), SIGNAL(zoomToolActivated())); connect(m_inspectorClient, SIGNAL(selectToolActivated()), @@ -113,8 +111,6 @@ void ClientProxy::connectToServer() SIGNAL(showAppOnTopChanged(bool))); connect(m_inspectorClient, SIGNAL(reloaded()), this, SIGNAL(serverReloaded())); - connect(m_inspectorClient, SIGNAL(selectedColorChanged(QColor)), - SIGNAL(selectedColorChanged(QColor))); connect(m_inspectorClient, SIGNAL(logActivity(QString,QString)), m_adapter.data(), SLOT(logServiceActivity(QString,QString))); @@ -609,12 +605,6 @@ void ClientProxy::setAnimationPaused(bool paused) m_inspectorClient->setAnimationPaused(paused); } -void ClientProxy::changeToColorPickerTool() -{ - if (isConnected()) - m_inspectorClient->changeToColorPickerTool(); -} - void ClientProxy::changeToZoomTool() { if (isConnected()) diff --git a/src/plugins/qmljsinspector/qmljsclientproxy.h b/src/plugins/qmljsinspector/qmljsclientproxy.h index 4ae0bd6e406..be8befa2ef7 100644 --- a/src/plugins/qmljsinspector/qmljsclientproxy.h +++ b/src/plugins/qmljsinspector/qmljsclientproxy.h @@ -108,7 +108,6 @@ signals: void connected(); void disconnected(); - void colorPickerActivated(); void selectToolActivated(); void selectMarqueeToolActivated(); void zoomToolActivated(); @@ -117,7 +116,6 @@ signals: void designModeBehaviorChanged(bool inDesignMode); void showAppOnTopChanged(bool showAppOnTop); void serverReloaded(); - void selectedColorChanged(const QColor &color); void propertyChanged(int debugId, const QByteArray &propertyName, const QVariant &propertyValue); void result(quint32 queryId, const QVariant &result); @@ -130,7 +128,6 @@ public slots: void setDesignModeBehavior(bool inDesignMode); void setAnimationSpeed(qreal slowDownFactor); void setAnimationPaused(bool paused); - void changeToColorPickerTool(); void changeToZoomTool(); void changeToSelectTool(); void changeToSelectMarqueeTool(); diff --git a/src/plugins/qmljsinspector/qmljsinspector.cpp b/src/plugins/qmljsinspector/qmljsinspector.cpp index 9fef93c421a..ecc32a32f8f 100644 --- a/src/plugins/qmljsinspector/qmljsinspector.cpp +++ b/src/plugins/qmljsinspector/qmljsinspector.cpp @@ -720,20 +720,6 @@ void InspectorUi::gotoObjectReferenceDefinition(const QmlDebugObjectReference &o } } -bool InspectorUi::addQuotesForData(const QVariant &value) const -{ - switch (value.type()) { - case QVariant::String: - case QVariant::Color: - case QVariant::Date: - return true; - default: - break; - } - - return false; -} - void InspectorUi::setupDockWidgets() { Debugger::DebuggerMainWindow *mw = Debugger::DebuggerPlugin::mainWindow(); @@ -877,8 +863,6 @@ void InspectorUi::connectSignals() connect(m_clientProxy, SIGNAL(disconnected()), this, SLOT(disable())); - connect(m_clientProxy, SIGNAL(colorPickerActivated()), - m_toolBar, SLOT(activateColorPicker())); connect(m_clientProxy, SIGNAL(selectToolActivated()), m_toolBar, SLOT(activateSelectTool())); connect(m_clientProxy, SIGNAL(zoomToolActivated()), @@ -887,8 +871,6 @@ void InspectorUi::connectSignals() m_toolBar, SLOT(setDesignModeBehavior(bool))); connect(m_clientProxy, SIGNAL(showAppOnTopChanged(bool)), m_toolBar, SLOT(setShowAppOnTop(bool))); - connect(m_clientProxy, SIGNAL(selectedColorChanged(QColor)), - m_toolBar, SLOT(setSelectedColor(QColor))); connect(m_clientProxy, SIGNAL(animationSpeedChanged(qreal)), m_toolBar, SLOT(setAnimationSpeed(qreal))); connect(m_clientProxy, SIGNAL(animationPausedChanged(bool)), @@ -905,8 +887,6 @@ void InspectorUi::connectSignals() m_clientProxy, SLOT(setAnimationSpeed(qreal))); connect(m_toolBar, SIGNAL(animationPausedChanged(bool)), m_clientProxy, SLOT(setAnimationPaused(bool))); - connect(m_toolBar, SIGNAL(colorPickerSelected()), - m_clientProxy, SLOT(changeToColorPickerTool())); connect(m_toolBar, SIGNAL(zoomToolSelected()), m_clientProxy, SLOT(changeToZoomTool())); connect(m_toolBar, SIGNAL(selectToolSelected()), diff --git a/src/plugins/qmljsinspector/qmljsinspector.h b/src/plugins/qmljsinspector/qmljsinspector.h index 37d72e1cdf1..6bebf448143 100644 --- a/src/plugins/qmljsinspector/qmljsinspector.h +++ b/src/plugins/qmljsinspector/qmljsinspector.h @@ -136,7 +136,6 @@ private slots: void showDebuggerTooltip(const QPoint &mousePos, TextEditor::ITextEditor *editor, int cursorPos); private: - bool addQuotesForData(const QVariant &value) const; void resetViews(); void initializeDocuments(); diff --git a/src/plugins/qmljsinspector/qmljsinspector.pro b/src/plugins/qmljsinspector/qmljsinspector.pro index fe64d757eaa..72d6395bff8 100644 --- a/src/plugins/qmljsinspector/qmljsinspector.pro +++ b/src/plugins/qmljsinspector/qmljsinspector.pro @@ -20,7 +20,6 @@ qmljsclientproxy.h \ qmljsinspector.h \ qmljsinspectortoolbar.h \ qmljslivetextpreview.h \ -qmljstoolbarcolorbox.h \ qmljsinspectorclient.h \ qmljscontextcrumblepath.h \ qmljsinspectorsettings.h \ @@ -32,7 +31,6 @@ qmljsclientproxy.cpp \ qmljsinspector.cpp \ qmljsinspectortoolbar.cpp \ qmljslivetextpreview.cpp \ -qmljstoolbarcolorbox.cpp \ qmljsinspectorclient.cpp \ qmljscontextcrumblepath.cpp \ qmljsinspectorsettings.cpp \ diff --git a/src/plugins/qmljsinspector/qmljsinspector.qbs b/src/plugins/qmljsinspector/qmljsinspector.qbs index f76b02cc959..c2eb41dee20 100644 --- a/src/plugins/qmljsinspector/qmljsinspector.qbs +++ b/src/plugins/qmljsinspector/qmljsinspector.qbs @@ -39,7 +39,6 @@ QtcPlugin { "qmljsinspector.h", "qmljsinspectortoolbar.h", "qmljslivetextpreview.h", - "qmljstoolbarcolorbox.h", "qmljsinspectorclient.h", "qmljscontextcrumblepath.h", "qmljsinspectorsettings.h", @@ -50,7 +49,6 @@ QtcPlugin { "qmljsinspector.cpp", "qmljsinspectortoolbar.cpp", "qmljslivetextpreview.cpp", - "qmljstoolbarcolorbox.cpp", "qmljsinspectorclient.cpp", "qmljscontextcrumblepath.cpp", "qmljsinspectorsettings.cpp", diff --git a/src/plugins/qmljsinspector/qmljsinspector.qrc b/src/plugins/qmljsinspector/qmljsinspector.qrc index 9c1a710a6eb..51f4e888ab3 100644 --- a/src/plugins/qmljsinspector/qmljsinspector.qrc +++ b/src/plugins/qmljsinspector/qmljsinspector.qrc @@ -1,6 +1,5 @@ - images/color-picker.png images/from-qml.png images/pause.png images/reload.png @@ -9,7 +8,6 @@ images/to-qml.png images/select-marquee.png images/zoom.png - images/color-picker-small.png images/select-small.png images/play-small.png images/to-qml-small.png @@ -17,7 +15,6 @@ images/from-qml-small.png images/zoom-small.png images/select-marquee-small.png - images/color-picker-small-hicontrast.png images/app-on-top.png diff --git a/src/plugins/qmljsinspector/qmljsinspectorclient.cpp b/src/plugins/qmljsinspector/qmljsinspectorclient.cpp index 45e52603cc1..0b4bc2aaab4 100644 --- a/src/plugins/qmljsinspector/qmljsinspectorclient.cpp +++ b/src/plugins/qmljsinspector/qmljsinspectorclient.cpp @@ -33,8 +33,6 @@ #include "qmljsclientproxy.h" #include "qmljsinspectorconstants.h" -#include - using namespace QmlJSDebugger; namespace QmlJSInspector { @@ -85,9 +83,7 @@ void QmlJSInspectorClient::messageReceived(const QByteArray &message) log(LogReceive, type, QString::number(toolId)); - if (toolId == Constants::ColorPickerMode) { - emit colorPickerActivated(); - } else if (toolId == Constants::ZoomMode) { + if (toolId == Constants::ZoomMode) { emit zoomToolActivated(); } else if (toolId == Constants::SelectionToolMode) { emit selectToolActivated(); @@ -137,17 +133,8 @@ void QmlJSInspectorClient::messageReceived(const QByteArray &message) emit reloaded(); break; } - case InspectorProtocol::ColorChanged: { - QColor col; - ds >> col; - - log(LogReceive, type, col.name()); - - emit selectedColorChanged(col); - break; - } default: - qWarning() << "Warning: Not handling message:" << type; + log(LogReceive, type, QLatin1String("Warning: Not handling message")); } } @@ -300,24 +287,6 @@ void QmlJSInspectorClient::setAnimationPaused(bool paused) sendMessage(message); } -void QmlJSInspectorClient::changeToColorPickerTool() -{ - if (!m_connection || !m_connection->isConnected()) - return; - - QByteArray message; - QDataStream ds(&message, QIODevice::WriteOnly); - - InspectorProtocol::Message cmd = InspectorProtocol::ChangeTool; - InspectorProtocol::Tool tool = InspectorProtocol::ColorPickerTool; - ds << cmd - << tool; - - log(LogSend, cmd, InspectorProtocol::toString(tool)); - - sendMessage(message); -} - void QmlJSInspectorClient::changeToSelectTool() { if (!m_connection || !m_connection->isConnected()) diff --git a/src/plugins/qmljsinspector/qmljsinspectorclient.h b/src/plugins/qmljsinspector/qmljsinspectorclient.h index 94ae980bd08..37420d192c0 100644 --- a/src/plugins/qmljsinspector/qmljsinspectorclient.h +++ b/src/plugins/qmljsinspector/qmljsinspectorclient.h @@ -51,7 +51,6 @@ public: void setDesignModeBehavior(bool inDesignMode); void setAnimationSpeed(qreal slowDownFactor); void setAnimationPaused(bool paused); - void changeToColorPickerTool(); void changeToSelectTool(); void changeToSelectMarqueeTool(); void changeToZoomTool(); @@ -76,8 +75,6 @@ signals: void connectedStatusChanged(QDeclarativeDebugClient::Status status); void currentObjectsChanged(const QList &debugIds); - void selectedColorChanged(const QColor &color); - void colorPickerActivated(); void selectToolActivated(); void selectMarqueeToolActivated(); void zoomToolActivated(); diff --git a/src/plugins/qmljsinspector/qmljsinspectorconstants.h b/src/plugins/qmljsinspector/qmljsinspectorconstants.h index d338a9eea50..41b985f6a6e 100644 --- a/src/plugins/qmljsinspector/qmljsinspectorconstants.h +++ b/src/plugins/qmljsinspector/qmljsinspectorconstants.h @@ -42,7 +42,6 @@ const char INFO_OUT_OF_SYNC[] = "QmlInspector.OutOfSyncWarning"; const char PLAY_ACTION[] = "QmlInspector.Play"; const char SELECT_ACTION[] = "QmlInspector.Select"; const char ZOOM_ACTION[] = "QmlInspector.Zoom"; -const char COLOR_PICKER_ACTION[] = "QmlInspector.ColorPicker"; const char FROM_QML_ACTION[] = "QmlInspector.FromQml"; const char SHOW_APP_ON_TOP_ACTION[] = "QmlInspector.ShowAppOnTop"; @@ -56,7 +55,6 @@ enum DesignTool { MarqueeSelectionToolMode = 2, MoveToolMode = 3, ResizeToolMode = 4, - ColorPickerMode = 5, ZoomMode = 6 }; diff --git a/src/plugins/qmljsinspector/qmljsinspectortoolbar.cpp b/src/plugins/qmljsinspector/qmljsinspectortoolbar.cpp index 88a015adf2f..04fe2861ef9 100644 --- a/src/plugins/qmljsinspector/qmljsinspectortoolbar.cpp +++ b/src/plugins/qmljsinspector/qmljsinspectortoolbar.cpp @@ -33,7 +33,6 @@ #include "qmljsinspectortoolbar.h" #include "qmljsinspectorconstants.h" -#include "qmljstoolbarcolorbox.h" #include #include @@ -70,12 +69,10 @@ QmlJsInspectorToolBar::QmlJsInspectorToolBar(QObject *parent) : m_playAction(0), m_selectAction(0), m_zoomAction(0), - m_colorPickerAction(0), m_showAppOnTopAction(0), m_playSpeedMenuActions(0), m_playIcon(QIcon(QLatin1String(":/qml/images/play-small.png"))), m_pauseIcon(QIcon(QLatin1String(":/qml/images/pause-small.png"))), - m_colorBox(0), m_emitSignals(true), m_paused(false), m_animationSpeed(1.0f), @@ -92,8 +89,6 @@ void QmlJsInspectorToolBar::setEnabled(bool value) m_playAction->setEnabled(value); m_selectAction->setEnabled(value); m_zoomAction->setEnabled(value); - m_colorPickerAction->setEnabled(value); - m_colorBox->setEnabled(value); } void QmlJsInspectorToolBar::enable() @@ -115,11 +110,6 @@ void QmlJsInspectorToolBar::disable() setEnabled(false); } -void QmlJsInspectorToolBar::activateColorPicker() -{ - updateDesignModeActions(ColorPickerMode); -} - void QmlJsInspectorToolBar::activateSelectTool() { updateDesignModeActions(SelectionToolMode); @@ -191,9 +181,6 @@ void QmlJsInspectorToolBar::createActions() m_zoomAction = new QAction(QIcon(QLatin1String(":/qml/images/zoom-small.png")), tr("Zoom"), this); - m_colorPickerAction = - new QAction(QIcon(QLatin1String(":/qml/images/color-picker-small.png")), - tr("Color Picker"), this); m_fromQmlAction->setCheckable(true); m_fromQmlAction->setChecked(true); @@ -201,13 +188,11 @@ void QmlJsInspectorToolBar::createActions() m_showAppOnTopAction->setChecked(false); m_selectAction->setCheckable(true); m_zoomAction->setCheckable(true); - m_colorPickerAction->setCheckable(true); Core::Command *command = am->registerAction(m_playAction, Constants::PLAY_ACTION, context); command->setAttribute(Core::Command::CA_UpdateIcon); am->registerAction(m_selectAction, Constants::SELECT_ACTION, context); am->registerAction(m_zoomAction, Constants::ZOOM_ACTION, context); - am->registerAction(m_colorPickerAction, Constants::COLOR_PICKER_ACTION, context); am->registerAction(m_fromQmlAction, Constants::FROM_QML_ACTION, context); am->registerAction(m_showAppOnTopAction, Constants::SHOW_APP_ON_TOP_ACTION, context); @@ -271,19 +256,10 @@ void QmlJsInspectorToolBar::createActions() toolBarLayout->addWidget(new Utils::StyledSeparator); toolBarLayout->addWidget(toolButton(am->command(Constants::SELECT_ACTION)->action())); toolBarLayout->addWidget(toolButton(am->command(Constants::ZOOM_ACTION)->action())); - toolBarLayout->addWidget(toolButton(am->command(Constants::COLOR_PICKER_ACTION)->action())); - - m_colorBox = new ToolBarColorBox(m_barWidget); - m_colorBox->setMinimumSize(20, 20); - m_colorBox->setMaximumSize(20, 20); - m_colorBox->setInnerBorderColor(QColor(192, 192, 192)); - m_colorBox->setOuterBorderColor(QColor(58, 58, 58)); - toolBarLayout->addWidget(m_colorBox); connect(m_fromQmlAction, SIGNAL(triggered()), SLOT(activateFromQml())); connect(m_showAppOnTopAction, SIGNAL(triggered()), SLOT(showAppOnTopClick())); connect(m_playAction, SIGNAL(triggered()), SLOT(activatePlayOnClick())); - connect(m_colorPickerAction, SIGNAL(triggered(bool)), SLOT(colorPickerTriggered(bool))); connect(m_selectAction, SIGNAL(triggered(bool)), SLOT(selectToolTriggered(bool))); connect(m_zoomAction, SIGNAL(triggered(bool)), SLOT(zoomToolTriggered(bool))); @@ -320,19 +296,6 @@ void QmlJsInspectorToolBar::updatePlayAction() m_playAction->setIcon(m_paused ? m_playIcon : m_pauseIcon); } -void QmlJsInspectorToolBar::colorPickerTriggered(bool checked) -{ - updateDesignModeActions(ColorPickerMode); - - if (m_designModeActive != checked) { - m_designModeActive = checked; - emit designModeSelected(checked); - } - - if (checked) - emit colorPickerSelected(); -} - void QmlJsInspectorToolBar::selectToolTriggered(bool checked) { updateDesignModeActions(SelectionToolMode); @@ -365,11 +328,6 @@ void QmlJsInspectorToolBar::showAppOnTopClick() emit showAppOnTopSelected(m_showAppOnTopAction->isChecked()); } -void QmlJsInspectorToolBar::setSelectedColor(const QColor &color) -{ - m_colorBox->setColor(color); -} - void QmlJsInspectorToolBar::activateFromQml() { if (m_emitSignals) @@ -386,7 +344,6 @@ void QmlJsInspectorToolBar::updateDesignModeActions(DesignTool activeTool) m_activeTool = activeTool; m_selectAction->setChecked(m_designModeActive && (m_activeTool == SelectionToolMode)); m_zoomAction->setChecked(m_designModeActive && (m_activeTool == ZoomMode)); - m_colorPickerAction->setChecked(m_designModeActive && (m_activeTool == ColorPickerMode)); } } // namespace Internal diff --git a/src/plugins/qmljsinspector/qmljsinspectortoolbar.h b/src/plugins/qmljsinspector/qmljsinspectortoolbar.h index b533c38de66..bde54fb6325 100644 --- a/src/plugins/qmljsinspector/qmljsinspectortoolbar.h +++ b/src/plugins/qmljsinspector/qmljsinspectortoolbar.h @@ -41,7 +41,6 @@ QT_BEGIN_NAMESPACE class QAction; class QActionGroup; -class QColor; class QToolButton; QT_END_NAMESPACE @@ -51,8 +50,6 @@ class StyledBar; namespace QmlJSInspector { -class ToolBarColorBox; - namespace Internal { class QmlJsInspectorToolBar : public QObject @@ -66,7 +63,6 @@ public: MarqueeSelectionToolMode = 2, MoveToolMode = 3, ResizeToolMode = 4, - ColorPickerMode = 5, ZoomMode = 6 }; @@ -79,7 +75,6 @@ public slots: void enable(); void disable(); - void activateColorPicker(); void activateSelectTool(); void activateZoomTool(); @@ -88,14 +83,12 @@ public slots: void setDesignModeBehavior(bool inDesignMode); void setShowAppOnTop(bool showAppOnTop); - void setSelectedColor(const QColor &color); signals: void applyChangesFromQmlFileTriggered(bool isChecked); void designModeSelected(bool); void reloadSelected(); - void colorPickerSelected(); void selectToolSelected(); void zoomToolSelected(); @@ -106,7 +99,6 @@ signals: private slots: void activatePlayOnClick(); - void colorPickerTriggered(bool checked); void selectToolTriggered(bool checked); void zoomToolTriggered(bool checked); @@ -129,7 +121,6 @@ private: QAction *m_playAction; QAction *m_selectAction; QAction *m_zoomAction; - QAction *m_colorPickerAction; QAction *m_showAppOnTopAction; @@ -139,8 +130,6 @@ private: QIcon m_playIcon; QIcon m_pauseIcon; - ToolBarColorBox *m_colorBox; - bool m_emitSignals; bool m_paused; qreal m_animationSpeed; diff --git a/src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp b/src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp deleted file mode 100644 index b16fa407710..00000000000 --- a/src/plugins/qmljsinspector/qmljstoolbarcolorbox.cpp +++ /dev/null @@ -1,132 +0,0 @@ -/************************************************************************** -** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** -** GNU Lesser General Public License Usage -** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -**************************************************************************/ -#include "qmljstoolbarcolorbox.h" - -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#include -#include - -namespace QmlJSInspector { - -ToolBarColorBox::ToolBarColorBox(QWidget *parent) : - QLabel(parent) -{ - m_color = Qt::white; - m_borderColorOuter = Qt::white; - m_borderColorInner = QColor(143, 143 ,143); - - m_copyHexColorAction = new QAction(QIcon(QLatin1String(":/qml/images/color-picker-small-hicontrast.png")), tr("Copy Color"), this); - connect(m_copyHexColorAction, SIGNAL(triggered()), SLOT(copyColorToClipboard())); - setScaledContents(false); -} - -void ToolBarColorBox::setColor(const QColor &color) -{ - m_color = color; - - QPixmap pix = createDragPixmap(width()); - setPixmap(pix); - update(); -} - -void ToolBarColorBox::setInnerBorderColor(const QColor &color) -{ - m_borderColorInner = color; - setColor(m_color); -} - -void ToolBarColorBox::setOuterBorderColor(const QColor &color) - { - m_borderColorOuter = color; - setColor(m_color); - } - -void ToolBarColorBox::mousePressEvent(QMouseEvent *event) -{ - m_dragBeginPoint = event->pos(); - m_dragStarted = false; -} - -void ToolBarColorBox::mouseMoveEvent(QMouseEvent *event) -{ - if (event->buttons() & Qt::LeftButton - && QPoint(event->pos() - m_dragBeginPoint).manhattanLength() > QApplication::startDragDistance() - && !m_dragStarted) - { - m_dragStarted = true; - QDrag *drag = new QDrag(this); - QMimeData *mimeData = new QMimeData; - - mimeData->setText(m_color.name()); - drag->setMimeData(mimeData); - drag->setPixmap(createDragPixmap()); - - drag->exec(); - } -} - -QPixmap ToolBarColorBox::createDragPixmap(int size) const -{ - QPixmap pix(size, size); - QPainter p(&pix); - - p.setBrush(QBrush(m_color)); - p.setPen(QPen(QBrush(m_borderColorInner),1)); - - p.fillRect(0, 0, size, size, m_borderColorOuter); - p.drawRect(1,1, size - 3, size - 3); - return pix; -} - -void ToolBarColorBox::contextMenuEvent(QContextMenuEvent *ev) -{ - QMenu contextMenu; - contextMenu.addAction(m_copyHexColorAction); - contextMenu.exec(ev->globalPos()); -} - -void ToolBarColorBox::copyColorToClipboard() -{ - QClipboard *clipboard = QApplication::clipboard(); - clipboard->setText(m_color.name()); -} - -} // namespace QmlJSInspector diff --git a/src/plugins/qmljsinspector/qmljstoolbarcolorbox.h b/src/plugins/qmljsinspector/qmljstoolbarcolorbox.h deleted file mode 100644 index 449804d1399..00000000000 --- a/src/plugins/qmljsinspector/qmljstoolbarcolorbox.h +++ /dev/null @@ -1,75 +0,0 @@ -/************************************************************************** -** -** This file is part of Qt Creator -** -** Copyright (c) 2012 Nokia Corporation and/or its subsidiary(-ies). -** -** Contact: Nokia Corporation (qt-info@nokia.com) -** -** -** GNU Lesser General Public License Usage -** -** This file may be used under the terms of the GNU Lesser General Public -** License version 2.1 as published by the Free Software Foundation and -** appearing in the file LICENSE.LGPL included in the packaging of this file. -** Please review the following information to ensure the GNU Lesser General -** Public License version 2.1 requirements will be met: -** http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. -** -** In addition, as a special exception, Nokia gives you certain additional -** rights. These rights are described in the Nokia Qt LGPL Exception -** version 1.1, included in the file LGPL_EXCEPTION.txt in this package. -** -** Other Usage -** -** Alternatively, this file may be used in accordance with the terms and -** conditions contained in a signed written agreement between you and Nokia. -** -** If you have questions regarding the use of this file, please contact -** Nokia at qt-info@nokia.com. -** -**************************************************************************/ -#ifndef TOOLBARCOLORBOX_H -#define TOOLBARCOLORBOX_H - -#include -#include -#include - -QT_FORWARD_DECLARE_CLASS(QContextMenuEvent) -QT_FORWARD_DECLARE_CLASS(QAction) - -namespace QmlJSInspector { - -class ToolBarColorBox : public QLabel -{ - Q_OBJECT -public: - explicit ToolBarColorBox(QWidget *parent = 0); - void setColor(const QColor &color); - void setInnerBorderColor(const QColor &color); - void setOuterBorderColor(const QColor &color); - -protected: - void contextMenuEvent(QContextMenuEvent *ev); - void mousePressEvent(QMouseEvent *ev); - void mouseMoveEvent(QMouseEvent *ev); -private slots: - void copyColorToClipboard(); - -private: - QPixmap createDragPixmap(int size = 24) const; - -private: - bool m_dragStarted; - QPoint m_dragBeginPoint; - QAction *m_copyHexColorAction; - QColor m_color; - - QColor m_borderColorOuter; - QColor m_borderColorInner; -}; - -} // namespace QmlJSInspector - -#endif // TOOLBARCOLORBOX_H