X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fgraphicsscenerectmove.cpp;h=710d1d50e4ce13e829b574e479ebb5abb6e3955d;hb=b7f8784570081908aee225669b47d84cac4026c2;hp=d6bd318893dd7601905702e5c1d38d70b99a539e;hpb=71d3850c926564bfbe9ca45935757d247eb0211a;p=kdenlive

diff --git a/src/graphicsscenerectmove.cpp b/src/graphicsscenerectmove.cpp
index d6bd3188..710d1d50 100644
--- a/src/graphicsscenerectmove.cpp
+++ b/src/graphicsscenerectmove.cpp
@@ -2,15 +2,90 @@
 #include <KDebug>
 #include <QGraphicsSceneMouseEvent>
 #include <QGraphicsRectItem>
+#include <QGraphicsSvgItem>
 #include <QGraphicsView>
 #include <QCursor>
+#include <QTextCursor>
 #include <QList>
+#include <QKeyEvent>
+#include <QApplication>
+#include <QTextBlock>
 
 #include "graphicsscenerectmove.h"
 
-GraphicsSceneRectMove::GraphicsSceneRectMove(QObject *parent): QGraphicsScene(parent), m_selectedItem(NULL), resizeMode(NoResize) {
+GraphicsSceneRectMove::GraphicsSceneRectMove(QObject *parent): QGraphicsScene(parent), m_selectedItem(NULL), resizeMode(NoResize), m_tool(TITLE_RECTANGLE) {
     //grabMouse();
     zoom = 1.0;
+    setBackgroundBrush(QBrush(Qt::transparent));
+}
+
+void GraphicsSceneRectMove::setSelectedItem(QGraphicsItem *item) {
+    clearSelection();
+    m_selectedItem = item;
+    item->setSelected(true);
+    update();
+}
+
+TITLETOOL GraphicsSceneRectMove::tool() {
+    return m_tool;
+}
+
+void GraphicsSceneRectMove::setTool(TITLETOOL tool) {
+    m_tool = tool;
+    switch (m_tool) {
+    case TITLE_RECTANGLE:
+        setCursor(Qt::CrossCursor);
+        break;
+    case TITLE_TEXT:
+        setCursor(Qt::IBeamCursor);
+        break;
+    default:
+        setCursor(Qt::ArrowCursor);
+    }
+}
+
+//virtual
+void GraphicsSceneRectMove::keyPressEvent(QKeyEvent * keyEvent) {
+    if (m_selectedItem == NULL) {
+        QGraphicsScene::keyPressEvent(keyEvent);
+        return;
+    }
+    int diff = 1;
+    if (m_selectedItem->type() == 8) {
+        QGraphicsTextItem *t = static_cast<QGraphicsTextItem *>(m_selectedItem);
+        if (t->textInteractionFlags() & Qt::TextEditorInteraction) {
+            QGraphicsScene::keyPressEvent(keyEvent);
+            return;
+        }
+    }
+    if (keyEvent->modifiers() & Qt::ControlModifier) diff = 10;
+    switch (keyEvent->key()) {
+    case Qt::Key_Left:
+        m_selectedItem->setPos(m_selectedItem->pos() - QPointF(diff, 0));
+        emit itemMoved();
+        break;
+    case Qt::Key_Right:
+        m_selectedItem->setPos(m_selectedItem->pos() + QPointF(diff, 0));
+        emit itemMoved();
+        break;
+    case Qt::Key_Up:
+        m_selectedItem->setPos(m_selectedItem->pos() - QPointF(0, diff));
+        emit itemMoved();
+        break;
+    case Qt::Key_Down:
+        m_selectedItem->setPos(m_selectedItem->pos() + QPointF(0, diff));
+        emit itemMoved();
+        break;
+    case Qt::Key_Delete:
+    case Qt::Key_Backspace:
+        delete m_selectedItem;
+        m_selectedItem = NULL;
+        emit selectionChanged();
+        break;
+    default:
+        QGraphicsScene::keyPressEvent(keyEvent);
+    }
+    emit actionFinished();
 }
 
 //virtual
@@ -23,132 +98,185 @@ void GraphicsSceneRectMove::mouseDoubleClickEvent(QGraphicsSceneMouseEvent* e) {
     if (g) {
         if (g->type() == 8) {
             QGraphicsTextItem *t = static_cast<QGraphicsTextItem *>(g);
+            m_selectedItem = g;
             t->setTextInteractionFlags(Qt::TextEditorInteraction);
         }
     }
     QGraphicsScene::mouseDoubleClickEvent(e);
 }
 
+void GraphicsSceneRectMove::mouseReleaseEvent(QGraphicsSceneMouseEvent *e) {
+    if (m_tool == TITLE_RECTANGLE && m_selectedItem) setSelectedItem(m_selectedItem);
+    emit actionFinished();
+    QGraphicsScene::mouseReleaseEvent(e);
+}
+
 void GraphicsSceneRectMove::mousePressEvent(QGraphicsSceneMouseEvent* e) {
+    m_clickPoint = e->screenPos();
     QPointF p = e->scenePos();
     p += QPoint(-2, -2);
     resizeMode = NoResize;
-    QList <QGraphicsItem *> list = items(QRectF(p , QSizeF(4, 4)).toRect());
+    const QList <QGraphicsItem *> list = items(QRectF(p , QSizeF(4, 4)).toRect());
     QGraphicsItem *item = NULL;
     bool hasSelected = false;
-    foreach(QGraphicsItem* g, list) {
-        // check is there is a selected item in list
-        if (g->zValue() > -1000 && g->isSelected()) {
-            hasSelected = true;
-            item = g;
-            break;
-        }
-    }
-    if (item == NULL) {
-        if (m_selectedItem && m_selectedItem->type() == 8) {
-            // disable text editing
-            QGraphicsTextItem *t = static_cast<QGraphicsTextItem *>(m_selectedItem);
-            t->setTextInteractionFlags(Qt::NoTextInteraction);
-        }
-        m_selectedItem = NULL;
-        foreach(QGraphicsItem* g, list) {
-            if (g->zValue() > -1000) {
+
+    if (m_tool == TITLE_SELECT) {
+        foreach(QGraphicsItem *g, list) {
+            kDebug() << " - - CHECKING ITEM Z:" << g->zValue() << ", TYPE: " << g->type();
+            // check is there is a selected item in list
+            if (g->zValue() > -1000 && g->isSelected()) {
+                hasSelected = true;
                 item = g;
                 break;
             }
         }
-    }
-    if (item != NULL) {
-        m_clickPoint = e->scenePos();
-        m_selectedItem = item;
-        if (item->type() == 8) {
-            QGraphicsTextItem *t = static_cast<QGraphicsTextItem *>(item);
-            if (t->textInteractionFlags() == Qt::TextEditorInteraction) {
-                QGraphicsScene::mousePressEvent(e);
-                return;
+        if (item == NULL) {
+            if (m_selectedItem && m_selectedItem->type() == 8) {
+                // disable text editing
+                QGraphicsTextItem *t = static_cast<QGraphicsTextItem *>(m_selectedItem);
+                t->textCursor().setPosition(0);
+                QTextBlock cur = t->textCursor().block();
+                t->setTextCursor(QTextCursor(cur));
+                t->setTextInteractionFlags(Qt::NoTextInteraction);
             }
-            t->setTextInteractionFlags(Qt::NoTextInteraction);
-        } else if (item->type() == 3) {
-            QGraphicsRectItem *gi = (QGraphicsRectItem*)item;
-            QRectF r = gi->rect();
-            r.translate(gi->scenePos());
-            if ((r.toRect().topLeft() - e->scenePos().toPoint()).manhattanLength() < 6 / zoom) {
-                resizeMode = TopLeft;
-            } else if ((r.toRect().bottomLeft() - e->scenePos().toPoint()).manhattanLength() < 6 / zoom) {
-                resizeMode = BottomLeft;
-            } else if ((r.toRect().topRight() - e->scenePos().toPoint()).manhattanLength() < 6 / zoom) {
-                resizeMode = TopRight;
-            } else if ((r.toRect().bottomRight() - e->scenePos().toPoint()).manhattanLength() < 6 / zoom) {
-                resizeMode = BottomRight;
-            } else if (qAbs(r.toRect().left() - e->scenePos().toPoint().x()) < 3 / zoom) {
-                resizeMode = Left;
-            } else if (qAbs(r.toRect().right() - e->scenePos().toPoint().x()) < 3 / zoom) {
-                resizeMode = Right;
-            } else if (qAbs(r.toRect().top() - e->scenePos().toPoint().y()) < 3 / zoom) {
-                resizeMode = Up;
-            } else if (qAbs(r.toRect().bottom() - e->scenePos().toPoint().y()) < 3 / zoom) {
-                resizeMode = Down;
+            m_selectedItem = NULL;
+            foreach(QGraphicsItem* g, list) {
+                if (g->zValue() > -1000) {
+                    item = g;
+                    break;
+                }
             }
         }
+        if (item != NULL) {
+            m_sceneClickPoint = e->scenePos();
+            m_selectedItem = item;
+            kDebug() << "/////////  ITEM TYPE: " << item->type();
+            if (item->type() == 8) {
+                QGraphicsTextItem *t = static_cast<QGraphicsTextItem *>(item);
+                if (t->textInteractionFlags() == Qt::TextEditorInteraction) {
+                    QGraphicsScene::mousePressEvent(e);
+                    return;
+                }
+                t->setTextInteractionFlags(Qt::NoTextInteraction);
+                setCursor(Qt::ClosedHandCursor);
+            } else if (item->type() == 3 || item->type() == 13 || item->type() == 7) {
+                QRectF r;
+                if (m_selectedItem->type() == 3) {
+                    r = ((QGraphicsRectItem*)m_selectedItem)->rect();
+                } else r = m_selectedItem->boundingRect();
+
+                r.translate(item->scenePos());
+                if ((r.toRect().topLeft() - e->scenePos().toPoint()).manhattanLength() < 6 / zoom) {
+                    resizeMode = TopLeft;
+                } else if ((r.toRect().bottomLeft() - e->scenePos().toPoint()).manhattanLength() < 6 / zoom) {
+                    resizeMode = BottomLeft;
+                } else if ((r.toRect().topRight() - e->scenePos().toPoint()).manhattanLength() < 6 / zoom) {
+                    resizeMode = TopRight;
+                } else if ((r.toRect().bottomRight() - e->scenePos().toPoint()).manhattanLength() < 6 / zoom) {
+                    resizeMode = BottomRight;
+                } else if (qAbs(r.toRect().left() - e->scenePos().toPoint().x()) < 3 / zoom) {
+                    resizeMode = Left;
+                } else if (qAbs(r.toRect().right() - e->scenePos().toPoint().x()) < 3 / zoom) {
+                    resizeMode = Right;
+                } else if (qAbs(r.toRect().top() - e->scenePos().toPoint().y()) < 3 / zoom) {
+                    resizeMode = Up;
+                } else if (qAbs(r.toRect().bottom() - e->scenePos().toPoint().y()) < 3 / zoom) {
+                    resizeMode = Down;
+                } else setCursor(Qt::ClosedHandCursor);
+            }
+        }
+        QGraphicsScene::mousePressEvent(e);
+    } else if (m_tool == TITLE_RECTANGLE) {
+        m_sceneClickPoint = e->scenePos();
+        m_selectedItem = NULL;
+    } else if (m_tool == TITLE_TEXT) {
+        m_selectedItem = addText(QString());
+        emit newText((QGraphicsTextItem *) m_selectedItem);
+        m_selectedItem->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+        ((QGraphicsTextItem *)m_selectedItem)->setTextInteractionFlags(Qt::TextEditorInteraction);
+        m_selectedItem->setPos(e->scenePos());
+        QGraphicsScene::mousePressEvent(e);
     }
-    if (!hasSelected) QGraphicsScene::mousePressEvent(e);
 
     kDebug() << "//////  MOUSE CLICK, RESIZE MODE: " << resizeMode;
 
 }
 
-//virtual
-void GraphicsSceneRectMove::mouseReleaseEvent(QGraphicsSceneMouseEvent* e) {
-    //m_selectedItem = NULL;
+void GraphicsSceneRectMove::clearTextSelection() {
+    if (m_selectedItem && m_selectedItem->type() == 8) {
+        // disable text editing
+        QGraphicsTextItem *t = static_cast<QGraphicsTextItem *>(m_selectedItem);
+        t->textCursor().setPosition(0);
+        QTextBlock cur = t->textCursor().block();
+        t->setTextCursor(QTextCursor(cur));
+        t->setTextInteractionFlags(Qt::NoTextInteraction);
+    }
+    m_selectedItem = NULL;
+    clearSelection();
 }
 
-
 //virtual
 void GraphicsSceneRectMove::mouseMoveEvent(QGraphicsSceneMouseEvent* e) {
-
+    if ((e->screenPos() - m_clickPoint).manhattanLength() < QApplication::startDragDistance()) {
+        e->accept();
+        return;
+    }
     if (m_selectedItem && e->buttons() & Qt::LeftButton) {
-        if (m_selectedItem->type() == 3) {
-            QGraphicsRectItem *gi = (QGraphicsRectItem*)m_selectedItem;
-            QRectF newrect = gi->rect();
+        if (m_selectedItem->type() == 3 || m_selectedItem->type() == 13 || m_selectedItem->type() == 7) {
+            QRectF newrect;
+            if (m_selectedItem->type() == 3) {
+                newrect = ((QGraphicsRectItem*)m_selectedItem)->rect();
+            } else newrect = m_selectedItem->boundingRect();
+
             QPointF newpoint = e->scenePos();
             //newpoint -= m_selectedItem->scenePos();
             switch (resizeMode) {
             case TopLeft:
-                newrect.setBottomRight(newrect.bottomRight() + gi->pos() - newpoint);
-                gi->setPos(newpoint);
+                newrect.setBottomRight(newrect.bottomRight() + m_selectedItem->pos() - newpoint);
+                m_selectedItem->setPos(newpoint);
                 break;
             case BottomLeft:
-                newrect.setBottomRight(QPointF(newrect.bottomRight().x() + gi->pos().x() - newpoint.x(), newpoint.y() - gi->pos().y()));
-                gi->setPos(QPointF(newpoint.x(), gi->pos().y()));
+                newrect.setBottomRight(QPointF(newrect.bottomRight().x() + m_selectedItem->pos().x() - newpoint.x(), newpoint.y() - m_selectedItem->pos().y()));
+                m_selectedItem->setPos(QPointF(newpoint.x(), m_selectedItem->pos().y()));
                 break;
             case TopRight:
-                newrect.setBottomRight(QPointF(newpoint.x() - gi->pos().x(), newrect.bottom() + gi->pos().y() - newpoint.y()));
-                gi->setPos(QPointF(gi->pos().x(), newpoint.y()));
+                newrect.setBottomRight(QPointF(newpoint.x() - m_selectedItem->pos().x(), newrect.bottom() + m_selectedItem->pos().y() - newpoint.y()));
+                m_selectedItem->setPos(QPointF(m_selectedItem->pos().x(), newpoint.y()));
                 break;
             case BottomRight:
-                newrect.setBottomRight(newpoint - gi->pos());
+                newrect.setBottomRight(newpoint - m_selectedItem->pos());
                 break;
             case Left:
-                newrect.setRight(gi->pos().x() + newrect.width() - newpoint.x());
-                gi->setPos(QPointF(newpoint.x(), gi->pos().y()));
+                newrect.setRight(m_selectedItem->pos().x() + newrect.width() - newpoint.x());
+                m_selectedItem->setPos(QPointF(newpoint.x(), m_selectedItem->pos().y()));
                 break;
             case Right:
-                newrect.setRight(newpoint.x() - gi->pos().x());
+                newrect.setRight(newpoint.x() - m_selectedItem->pos().x());
                 break;
             case Up:
-                newrect.setBottom(gi->pos().y() + newrect.bottom() - newpoint.y());
-                gi->setPos(QPointF(gi->pos().x(), newpoint.y()));
+                newrect.setBottom(m_selectedItem->pos().y() + newrect.bottom() - newpoint.y());
+                m_selectedItem->setPos(QPointF(m_selectedItem->pos().x(), newpoint.y()));
                 break;
             case Down:
-                newrect.setBottom(newpoint.y() - gi->pos().y());
+                newrect.setBottom(newpoint.y() - m_selectedItem->pos().y());
                 break;
             default:
-                QPointF diff = e->scenePos() - m_clickPoint;
-                m_clickPoint = e->scenePos();
-                gi->moveBy(diff.x(), diff.y());
+                QPointF diff = e->scenePos() - m_sceneClickPoint;
+                m_sceneClickPoint = e->scenePos();
+                m_selectedItem->moveBy(diff.x(), diff.y());
                 break;
             }
-            gi->setRect(newrect);
+            if (m_selectedItem->type() == 3 && resizeMode != NoResize) {
+                QGraphicsRectItem *gi = (QGraphicsRectItem*)m_selectedItem;
+                gi->setRect(newrect);
+            }
+            /*else {
+            qreal s;
+            if (resizeMode == Left || resizeMode == Right ) s = m_selectedItem->boundingRect().width() / newrect.width();
+            else s = m_selectedItem->boundingRect().height() / newrect.height();
+            m_selectedItem->scale( 1 / s, 1 / s );
+            kDebug()<<"/// SCALING SVG, RESIZE MODE: "<<resizeMode<<", RECT:"<<m_selectedItem->boundingRect();
+            }*/
             //gi->setPos(m_selectedItem->scenePos());
             /*if (resizeMode == NoResize) {
                 QGraphicsScene::mouseMoveEvent(e);
@@ -160,25 +288,25 @@ void GraphicsSceneRectMove::mouseMoveEvent(QGraphicsSceneMouseEvent* e) {
                 QGraphicsScene::mouseMoveEvent(e);
                 return;
             }
-            QPointF diff = e->scenePos() - m_clickPoint;
-            m_clickPoint = e->scenePos();
+            QPointF diff = e->scenePos() - m_sceneClickPoint;
+            m_sceneClickPoint = e->scenePos();
             m_selectedItem->moveBy(diff.x(), diff.y());
         }
         emit itemMoved();
-    } else {
-
+    } else if (m_tool == TITLE_SELECT) {
         QPointF p = e->scenePos();
         p += QPoint(-2, -2);
         resizeMode = NoResize;
-
-        foreach(QGraphicsItem* g, items(QRectF(p , QSizeF(4, 4)).toRect())) {
-
-            if (g->type() == 3) {
-
-                QGraphicsRectItem *gi = (QGraphicsRectItem*)g;
-                QRectF r = gi->rect();
-                r.translate(gi->scenePos());
-
+        bool itemFound = false;
+        foreach(const QGraphicsItem* g, items(QRectF(p , QSizeF(4, 4)).toRect())) {
+            if ((g->type() == 13 || g->type() == 7) && g->zValue() > -1000) {
+                // image or svg item
+                setCursor(Qt::OpenHandCursor);
+                break;
+            } else if (g->type() == 3 && g->zValue() > -1000) {
+                QRectF r = ((QGraphicsRectItem*)g)->rect();
+                r.translate(g->scenePos());
+                itemFound = true;
                 if ((r.toRect().topLeft() - e->scenePos().toPoint()).manhattanLength() < 6 / zoom) {
                     setCursor(QCursor(Qt::SizeFDiagCursor));
                 } else if ((r.toRect().bottomLeft() - e->scenePos().toPoint()).manhattanLength() < 6 / zoom) {
@@ -195,11 +323,22 @@ void GraphicsSceneRectMove::mouseMoveEvent(QGraphicsSceneMouseEvent* e) {
                     setCursor(Qt::SizeVerCursor);
                 } else if (qAbs(r.toRect().bottom() - e->scenePos().toPoint().y()) < 3 / zoom) {
                     setCursor(Qt::SizeVerCursor);
-                } else setCursor(QCursor(Qt::ArrowCursor));
+                } else setCursor(Qt::OpenHandCursor);
+                break;
             }
-            break;
+            if (!itemFound) setCursor(Qt::ArrowCursor);
         }
         QGraphicsScene::mouseMoveEvent(e);
+    } else if (m_tool == TITLE_RECTANGLE && e->buttons() & Qt::LeftButton) {
+        if (m_selectedItem == NULL && (m_clickPoint - e->screenPos()).manhattanLength() >= QApplication::startDragDistance()) {
+            // create new rect item
+            m_selectedItem = addRect(0, 0, e->scenePos().x() - m_sceneClickPoint.x(), e->scenePos().y() - m_sceneClickPoint.y());
+            emit newRect((QGraphicsRectItem *) m_selectedItem);
+            m_selectedItem->setFlags(QGraphicsItem::ItemIsMovable | QGraphicsItem::ItemIsSelectable);
+            m_selectedItem->setPos(m_sceneClickPoint);
+            resizeMode = BottomRight;
+            QGraphicsScene::mouseMoveEvent(e);
+        }
     }
 }
 
@@ -236,7 +375,7 @@ void GraphicsSceneRectMove::setZoom(double s) {
 }
 
 void GraphicsSceneRectMove::setCursor(QCursor c) {
-    QList<QGraphicsView*> l = views();
+    const QList<QGraphicsView*> l = views();
     foreach(QGraphicsView* v, l) {
         v->setCursor(c);
     }