[prev in list] [next in list] [prev in thread] [next in thread]
List: kde-commits
Subject: [kdenlive] src: Merge branch '16.12'
From: Jean-Baptiste Mardelle <null () kde ! org>
Date: 2016-12-16 13:28:30
Message-ID: E1cHsYo-0006RC-MM () code ! kde ! org
[Download RAW message or body]
Git commit a8013449aca5820bad91d8e9eea184c98a33aa0d by Jean-Baptiste Mardelle.
Committed on 16/12/2016 at 13:28.
Pushed by mardelle into branch 'master'.
Merge branch '16.12'
M +9 -3 src/effectstack/widgets/animationwidget.cpp
M +2 -0 src/effectstack/widgets/animationwidget.h
M +1 -1 src/mainwindow.cpp
M +1 -0 src/timeline/customtrackview.cpp
https://commits.kde.org/kdenlive/a8013449aca5820bad91d8e9eea184c98a33aa0d
diff --cc src/effectstack/widgets/animationwidget.cpp
index 9a4ef7a8c,99c296109..ea407c4f9
--- a/src/effectstack/widgets/animationwidget.cpp
+++ b/src/effectstack/widgets/animationwidget.cpp
@@@ -498,9 -498,10 +502,11 @@@ void AnimationWidget::slotPositionChang
updateRect(pos - m_offset);
}
updateSlider(pos - m_offset);
+ m_previous->setEnabled(pos > 0);
+ m_next->setEnabled(pos < (m_outPoint - m_inPoint - 1));
- if (seek)
+ if (seek) {
emit seekToPos(pos);
+ }
}
void AnimationWidget::updateSlider(int pos)
diff --cc src/effectstack/widgets/animationwidget.h
index 34642fbb4,4c8a18a54..02dd27361
--- a/src/effectstack/widgets/animationwidget.h
+++ b/src/effectstack/widgets/animationwidget.h
@@@ -68,8 -68,10 +68,10 @@@ private
Monitor *m_monitor;
QPoint m_frameSize;
TimecodeDisplay *m_timePos;
- KDualAction* m_addKeyframe;
+ KDualAction *m_addKeyframe;
QComboBox *m_presetCombo;
+ QAction *m_previous;
+ QAction *m_next;
/** @brief True if effect is currently selected in stack */
bool m_active;
int m_clipPos;
diff --cc src/mainwindow.cpp
index 0332e6314,6c765376f..53ad1a70a
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@@ -1989,27 -1949,27 +1989,27 @@@ void MainWindow::connectDocument(
//connect(m_projectList, SIGNAL(addMarkers(QString,QList<CommentedTime>)), \
trackView->projectView(), SLOT(slotAddClipMarker(QString,QList<CommentedTime>)));
// Effect stack signals
- connect(m_effectStack, \
SIGNAL(updateEffect(ClipItem*,int,QDomElement,QDomElement,int,bool)), \
trackView->projectView(), \
SLOT(slotUpdateClipEffect(ClipItem*,int,QDomElement,QDomElement,int,bool)));
- connect(m_effectStack, SIGNAL(updateClipRegion(ClipItem*,int,QString)), \
trackView->projectView(), \
SLOT(slotUpdateClipRegion(ClipItem*,int,QString)));
- connect(m_effectStack, SIGNAL(removeEffect(ClipItem*,int,QDomElement)), \
trackView->projectView(), \
SLOT(slotDeleteEffect(ClipItem*,int,QDomElement)));
- connect(m_effectStack, SIGNAL(removeEffectGroup(ClipItem*,int,QDomDocument)), \
trackView->projectView(), SLOT(slotDeleteEffectGroup(ClipItem*,int,QDomDocument))); \
+ connect(m_effectStack, &EffectStackView2::updateEffect, \
trackView->projectView(), &CustomTrackView::slotUpdateClipEffect); + \
connect(m_effectStack, &EffectStackView2::updateClipRegion, trackView->projectView(), \
&CustomTrackView::slotUpdateClipRegion); + connect(m_effectStack, \
SIGNAL(removeEffect(ClipItem *, int, QDomElement)), trackView->projectView(), \
SLOT(slotDeleteEffect(ClipItem *, int, QDomElement))); + connect(m_effectStack, \
SIGNAL(removeEffectGroup(ClipItem *, int, QDomDocument)), trackView->projectView(), \
SLOT(slotDeleteEffectGroup(ClipItem *, int, QDomDocument)));
- connect(m_effectStack, SIGNAL(addEffect(ClipItem*,QDomElement,int)), \
trackView->projectView(), \
SLOT(slotAddEffect(ClipItem*,QDomElement,int)));
- connect(m_effectStack, \
SIGNAL(changeEffectState(ClipItem*,int,QList<int>,bool)), trackView->projectView(), \
SLOT(slotChangeEffectState(ClipItem*,int,QList<int>,bool)));
- connect(m_effectStack, \
SIGNAL(changeEffectPosition(ClipItem*,int,QList<int>,int)), trackView->projectView(), \
SLOT(slotChangeEffectPosition(ClipItem*,int,QList<int>,int))); + \
connect(m_effectStack, SIGNAL(addEffect(ClipItem *, QDomElement, int)), \
trackView->projectView(), SLOT(slotAddEffect(ClipItem *, QDomElement, int))); + \
connect(m_effectStack, SIGNAL(changeEffectState(ClipItem *, int, QList<int>, bool)), \
trackView->projectView(), SLOT(slotChangeEffectState(ClipItem *, int, QList<int>, \
bool))); + connect(m_effectStack, SIGNAL(changeEffectPosition(ClipItem *, int, \
QList<int>, int)), trackView->projectView(), SLOT(slotChangeEffectPosition(ClipItem \
*, int, QList<int>, int)));
- connect(m_effectStack, SIGNAL(refreshEffectStack(ClipItem*)), \
trackView->projectView(), SLOT(slotRefreshEffects(ClipItem*)));
- connect(m_effectStack, SIGNAL(seekTimeline(int)), trackView->projectView(), \
SLOT(seekCursorPos(int)));
- connect(m_effectStack, SIGNAL(importClipKeyframes(GraphicsRectItem, ItemInfo, \
QDomElement, QMap<QString,QString>)), trackView->projectView(), \
SLOT(slotImportClipKeyframes(GraphicsRectItem, ItemInfo, QDomElement, \
QMap<QString,QString>))); + connect(m_effectStack, \
&EffectStackView2::refreshEffectStack, trackView->projectView(), \
&CustomTrackView::slotRefreshEffects); + connect(m_effectStack, \
&EffectStackView2::seekTimeline, trackView->projectView(), \
&CustomTrackView::seekCursorPos); + connect(m_effectStack, \
SIGNAL(importClipKeyframes(GraphicsRectItem, ItemInfo, QDomElement, QMap<QString, \
QString>)), trackView->projectView(), SLOT(slotImportClipKeyframes(GraphicsRectItem, \
ItemInfo, QDomElement, QMap<QString, QString>)));
// Transition config signals
- connect(m_effectStack->transitionConfig(), \
SIGNAL(transitionUpdated(Transition*,QDomElement)), trackView->projectView() , \
SLOT(slotTransitionUpdated(Transition*,QDomElement)));
- connect(m_effectStack->transitionConfig(), SIGNAL(seekTimeline(int)), \
trackView->projectView() , SLOT(seekCursorPos(int))); + \
connect(m_effectStack->transitionConfig(), SIGNAL(transitionUpdated(Transition *, \
QDomElement)), trackView->projectView(), SLOT(slotTransitionUpdated(Transition *, \
QDomElement))); + connect(m_effectStack->transitionConfig(), \
&TransitionSettings::seekTimeline, trackView->projectView(), \
&CustomTrackView::seekCursorPos);
- connect(trackView->projectView(), SIGNAL(activateDocumentMonitor()), \
m_projectMonitor, SLOT(slotActivateMonitor())); + \
connect(trackView->projectView(), SIGNAL(activateDocumentMonitor()), \
m_projectMonitor, SLOT(slotActivateMonitor()), Qt::DirectConnection);
connect(project, &KdenliveDoc::updateFps, trackView, &Timeline::updateProfile, \
Qt::DirectConnection);
- connect(trackView, SIGNAL(zoneMoved(int,int)), this, \
SLOT(slotZoneMoved(int,int)));
- trackView->projectView()->setContextMenu(m_timelineContextMenu, \
m_timelineContextClipMenu, m_timelineContextTransitionMenu, m_clipTypeGroup, \
static_cast<QMenu*>(factory()->container(QStringLiteral("marker_menu"), this))); + \
connect(trackView, &Timeline::zoneMoved, this, &MainWindow::slotZoneMoved); + \
trackView->projectView()->setContextMenu(m_timelineContextMenu, \
m_timelineContextClipMenu, m_timelineContextTransitionMenu, m_clipTypeGroup, \
static_cast<QMenu *>(factory()->container(QStringLiteral("marker_menu"), this))); if \
(m_renderWidget) { slotCheckRenderStatus();
m_renderWidget->setProfile(project->mltProfile());
diff --cc src/timeline/customtrackview.cpp
index 648b1539a,877d969c6..4a6cf2a24
--- a/src/timeline/customtrackview.cpp
+++ b/src/timeline/customtrackview.cpp
@@@ -844,8 -799,9 +844,9 @@@ void CustomTrackView::updateTimelineSel
}
// virtual
-void CustomTrackView::mousePressEvent(QMouseEvent * event)
+void CustomTrackView::mousePressEvent(QMouseEvent *event)
{
+ emit activateDocumentMonitor();
setFocus(Qt::MouseFocusReason);
m_menuPosition = QPoint();
if (m_moveOpMode == MoveOperation) {
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic