Unify qmleasing and easingcurveeditor

Keeping the name qmleasing, but most of the code from easingcurveeditor.
easingcurveeditor had more UI and functionality, as qmleasing could only
import AfterEffects curves. That functionality has now been added to
easingcurveeditor.

Change-Id: Iac1a004f13fe33a18449af1b08bd22138d525322
Reviewed-by: Lars Knoll <lars.knoll@digia.com>
Reviewed-by: Christopher Adams <chris.adams@jollamobile.com>
Reviewed-by: Thomas Hartmann <Thomas.Hartmann@digia.com>

1 files changed, 6 insertions, 67 deletions

diff --git a/tools/qmleasing/main.cpp b/tools/qmleasing/main.cpp
index 60a6f37f55..212b9b1fd2 100644
--- a/tools/qmleasing/main.cpp
+++ b/tools/qmleasing/main.cpp
@@ -39,78 +39,17 @@
 **
 ****************************************************************************/
 
-#include <QPainter>
-#include <QtQuick/QQuickView>
-#include <QGuiApplication>
-#include <QEasingCurve>
-#include <QtQuick/QQuickPaintedItem>
+#include "mainwindow.h"
 
-class EasingPlot : public QQuickPaintedItem
-{
-    Q_OBJECT
-    Q_PROPERTY(QEasingCurve easing READ easing WRITE setEasing NOTIFY easingChanged);
-
-public:
-    EasingPlot();
-
-    QEasingCurve easing() const;
-    void setEasing(const QEasingCurve &);
-
-signals:
-    void easingChanged();
-
-protected:
-    virtual void paint(QPainter *painter);
-
-private:
-    QEasingCurve m_easing;
-};
-
-EasingPlot::EasingPlot()
-{
-}
-
-QEasingCurve EasingPlot::easing() const
-{
-    return m_easing;
-}
-
-void EasingPlot::setEasing(const QEasingCurve &e)
-{
-    if (m_easing == e)
-        return;
-
-    m_easing = e;
-    emit easingChanged();
-
-    update();
-}
-
-void EasingPlot::paint(QPainter *painter)
-{
-    QPointF lastPoint(0, 0);
-
-    for (int ii = 1; ii <= 100; ++ii) {
-        qreal value = m_easing.valueForProgress(qreal(ii) / 100.);
-
-        QPointF currentPoint(width() * qreal(ii) / 100., value * (height() - 1));
-        painter->drawLine(lastPoint, currentPoint);
-
-        lastPoint = currentPoint;
-    }
-}
+#include <QApplication>
 
 int main(int argc, char ** argv)
 {
-    QGuiApplication app(argc, argv);
-
-    qmlRegisterType<EasingPlot>("EasingPlot", 1, 0, "EasingPlot");
+    QApplication app(argc, argv);
 
-    QQuickView view;
-    view.setSource(QUrl("qrc:/easing.qml"));
-    view.show();
+    MainWindow mainWindow;
+    mainWindow.show();
+    mainWindow.showQuickView();
 
     return app.exec();
 }
-
-#include "main.moc"