Commit 43b1a751 authored by Hugo Beauzee-Luyssen's avatar Hugo Beauzee-Luyssen
Browse files

Activating gui feedback for clip moving undo/redo

parent ee2dcdcb
......@@ -269,7 +269,7 @@ void MainWorkflow::moveClip( const QUuid& clipUuid, unsigned int oldTr
m_tracks[newTrack].activate();
}
computeLength();
emit clipMoved( clipUuid, oldTrack, newTrack, startingFrame );
emit clipMoved( clipUuid, newTrack, startingFrame );
}
Clip* MainWorkflow::removeClip( const QUuid& uuid, unsigned int trackId )
......
......@@ -129,7 +129,7 @@ class MainWorkflow : public QObject, public Singleton<MainWorkflow>
void mainWorkflowEndReached();
void mainWorkflowPaused();
void clipRemoved( QUuid, unsigned int );
void clipMoved( QUuid, unsigned int, unsigned int, qint64 );
void clipMoved( QUuid, unsigned int, qint64 );
};
#endif // MAINWORKFLOW_H
......@@ -59,6 +59,7 @@ Timeline::Timeline( QWidget *parent ) :
setDuration( 0 );
connect( m_tracksView->horizontalScrollBar(), SIGNAL( valueChanged( int ) ), m_tracksRuler, SLOT( moveRuler( int ) ) );
connect( m_tracksView, SIGNAL( durationChanged(int) ), this, SLOT( setDuration(int) ) );
connect( m_mainWorkflow, SIGNAL( clipMoved(QUuid, uint, qint64 ) ), m_tracksView, SLOT( moveMediaItem(QUuid, uint, qint64 ) ) );
}
Timeline::~Timeline()
......
......@@ -155,7 +155,7 @@ void TracksView::dragMoveEvent( QDragMoveEvent* event )
moveMediaItem( m_dragItem, event->pos() );
}
void TracksView::moveMediaItem( const QUuid& uuid, int track, int time )
void TracksView::moveMediaItem( const QUuid& uuid, unsigned int track, qint64 time )
{
QList<QGraphicsItem*> sceneItems = m_scene->items();
......
......@@ -91,7 +91,7 @@ public:
QList<AbstractGraphicsMediaItem*> mediaItems( const QPoint& pos );
public slots:
void moveMediaItem( const QUuid& uuid, int track, int time );
void moveMediaItem( const QUuid& uuid, unsigned int track, qint64 time );
protected:
virtual void resizeEvent( QResizeEvent* event );
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment