feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

QmlJSInspector: Remove Color Picker Tool

Browse Source 
Change-Id: Ic1a158f3e96052fcf30071ec827c23a4a83625f5
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
This commit is contained in:
Aurindam Jana
2012-03-23 12:39:19 +01:00
committed by Kai Koehne
parent ebeb5b7f49
commit f14dffe681
17 changed files with 2 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
src/plugins/qmljsinspector/qmljsinspectorclient.cpp
View File

@@ -33,8 +33,6 @@
#include "qmljsclientproxy.h"
#include "qmljsinspectorconstants.h"
#include <QColor>
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())