From f14dffe68143b89405ba2616986dac52ae29cb0f Mon Sep 17 00:00:00 2001
From: Aurindam Jana <aurindam.jana@nokia.com>
Date: Fri, 23 Mar 2012 12:39:19 +0100
Subject: [PATCH] QmlJSInspector: Remove Color Picker Tool
Change-Id: Ic1a158f3e96052fcf30071ec827c23a4a83625f5
Reviewed-by: Kai Koehne <kai.koehne@nokia.com>
---
.../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
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
LNkvXXu0mjfG^Y4|
diff --git a/src/plugins/qmljsinspector/images/color-picker.png b/src/plugins/qmljsinspector/images/color-picker.png
deleted file mode 100644
index 73d9ae3dfc40995337e3a0762831fa908e390120..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001
literal 3185
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
XD;K9R=+%az00000NkvXXu0mjfG4lXV
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<int>)),
SLOT(onCurrentObjectsChanged(QList<int>)));
- 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 @@
<RCC>
<qresource prefix="/qml">
- <file>images/color-picker.png</file>
<file>images/from-qml.png</file>
<file>images/pause.png</file>
<file>images/reload.png</file>
@@ -9,7 +8,6 @@
<file>images/to-qml.png</file>
<file>images/select-marquee.png</file>
<file>images/zoom.png</file>
- <file>images/color-picker-small.png</file>
<file>images/select-small.png</file>
<file>images/play-small.png</file>
<file>images/to-qml-small.png</file>
@@ -17,7 +15,6 @@
<file>images/from-qml-small.png</file>
<file>images/zoom-small.png</file>
<file>images/select-marquee-small.png</file>
- <file>images/color-picker-small-hicontrast.png</file>
<file>images/app-on-top.png</file>
</qresource>
</RCC>
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 <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())
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<int> &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 <coreplugin/actionmanager/actionmanager.h>
#include <coreplugin/actionmanager/command.h>
@@ -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 <QPixmap>
-#include <QPainter>
-#include <QMenu>
-#include <QAction>
-#include <QContextMenuEvent>
-#include <QClipboard>
-#include <QApplication>
-#include <QColorDialog>
-#include <QDrag>
-
-#include <QMimeData>
-#include <QDebug>
-
-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 <QLabel>
-#include <QColor>
-#include <QPoint>
-
-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
--
GitLab