X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fgeometryval.h;h=b2d907643c8383c842a1713efa6b41eee5401dd0;hb=3023f05e20e715e680de50cc9450e611df3393ff;hp=6e9786ab3395aed6b24e55a8c411a2c2d9ededa4;hpb=c2279ac0a3b7e1b07bd27423297316b5aec4966c;p=kdenlive

diff --git a/src/geometryval.h b/src/geometryval.h
index 6e9786ab..b2d90764 100644
--- a/src/geometryval.h
+++ b/src/geometryval.h
@@ -22,12 +22,14 @@
 #include <QWidget>
 #include <QDomElement>
 #include <QGraphicsPathItem>
+#include <QGraphicsView>
 
 #include <mlt++/Mlt.h>
 
 #include "ui_geometryval_ui.h"
 #include "definitions.h"
 #include "keyframehelper.h"
+#include "ui_geometryposition_ui.h"
 
 //class QGraphicsScene;
 class GraphicsSceneRectMove;
@@ -35,41 +37,53 @@ class QGraphicsRectItem;
 class QMouseEvent;
 
 
-class Geometryval : public QWidget {
+class Geometryval : public QWidget, public Ui::Geometryval
+{
     Q_OBJECT
 public:
-    Geometryval(const MltVideoProfile profile, QWidget* parent = 0);
+    explicit Geometryval(const MltVideoProfile profile, QPoint frame_size, int startPoint = 0, QWidget* parent = 0);
+    virtual ~Geometryval();
     QDomElement getParamDesc();
+    QString getValue() const;
+    void setFrameSize(QPoint p);
 
 private:
-    Ui::Geometryval ui;
     MltVideoProfile m_profile;
-    //QGraphicsScene* scene;
-    GraphicsSceneRectMove *scene;
-    QDomElement param;
-    QGraphicsRectItem *paramRect;
+    int m_realWidth;
+    GraphicsSceneRectMove *m_scene;
+    QGraphicsRectItem *m_paramRect;
     Mlt::Geometry *m_geom;
     KeyframeHelper *m_helper;
     QGraphicsPathItem *m_path;
+    QMenu *m_configMenu;
     QMenu *m_scaleMenu;
     QMenu *m_alignMenu;
-
+    QAction *m_syncAction;
+    QAction *m_editGeom;
+    bool m_fixedMode;
+    QPoint m_frameSize;
+    Ui::GeometryPosition_UI m_view;
     void updateTransitionPath();
+    double m_dar;
+    int m_startPoint;
+    QGraphicsView *m_sceneview;
 
 public slots:
-    void setupParam(const QDomElement&, int, int);
+    void setupParam(const QDomElement, int, int);
 
 private slots:
     void slotNextFrame();
     void slotPreviousFrame();
-    void slotPositionChanged(int pos);
-    void slotDeleteFrame();
-    void slotAddFrame();
+    void slotPositionChanged(int pos, bool seek = true);
+    void slotDeleteFrame(int pos = -1);
+    void slotAddFrame(int pos = -1);
     void slotUpdateTransitionProperties();
     void slotTransparencyChanged(int transp);
     void slotResize50();
     void slotResize100();
     void slotResize200();
+    void slotResizeCustom();
+    void slotResizeOriginal();
     void slotAlignRight();
     void slotAlignLeft();
     void slotAlignTop();
@@ -77,9 +91,14 @@ private slots:
     void slotAlignCenter();
     void slotAlignHCenter();
     void slotAlignVCenter();
+    void slotSyncCursor();
+    void slotGeometry();
+    void slotResetPosition();
+    void slotKeyframeMoved(int);
 
 signals:
     void parameterChanged();
+    void seekToPos(int);
 };
 
 #endif