[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 <jb () kdenlive ! org>
Date: 2016-12-05 7:36:50
Message-ID: E1cDnpS-0006N2-GC () code ! kde ! org
[Download RAW message or body]
Git commit f895c949fd5c53dbf305a636c16aec8c19571e6f by Jean-Baptiste Mardelle.
Committed on 05/12/2016 at 07:36.
Pushed by mardelle into branch 'master'.
Merge branch '16.12'
M +8 -2 src/doc/documentchecker.cpp
M +9 -8 src/mainwindow.cpp
M +3 -3 src/mainwindow.h
M +13 -5 src/timeline/customtrackview.cpp
M +3 -3 src/timeline/customtrackview.h
M +2 -2 src/timeline/timeline.cpp
M +1 -1 src/timeline/timeline.h
https://commits.kde.org/kdenlive/f895c949fd5c53dbf305a636c16aec8c19571e6f
diff --cc src/mainwindow.cpp
index 43d768c24,b6026065a..d28a1c797
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@@ -1923,12 -1927,12 +1923,14 @@@ void MainWindow::connectDocument(
connect(trackView->projectView(), \
SIGNAL(transitionItemSelected(Transition*,int,QPoint,bool)), m_effectStack, \
SLOT(slotTransitionItemSelected(Transition*,int,QPoint,bool)), Qt::DirectConnection); \
connect(trackView->projectView(), \
SIGNAL(transitionItemSelected(Transition*,int,QPoint,bool)), this, \
SLOT(slotActivateTransitionView(Transition*)));
- connect(trackView->projectView(), SIGNAL(zoomIn(bool)), this, \
SLOT(slotZoomIn(bool)));
- connect(trackView->projectView(), SIGNAL(zoomOut(bool)), this, \
SLOT(slotZoomOut(bool)));
- connect(trackView, SIGNAL(setZoom(int)), this, SLOT(slotSetZoom(int)));
++
+ connect(trackView->projectView(), &CustomTrackView::zoomIn, this, \
&MainWindow::slotZoomIn); + connect(trackView->projectView(), \
&CustomTrackView::zoomOut, this, &MainWindow::slotZoomOut); + connect(trackView, \
&Timeline::setZoom, this, &MainWindow::slotSetZoom); ++
connect(trackView, SIGNAL(displayMessage(QString,MessageType)), m_messageLabel, \
SLOT(setMessage(QString,MessageType)));
connect(trackView->projectView(), SIGNAL(displayMessage(QString,MessageType)), \
m_messageLabel, SLOT(setMessage(QString,MessageType)));
- connect(pCore->bin(), SIGNAL(clipNameChanged(QString)), \
trackView->projectView(), SLOT(clipNameChanged(QString))); + \
connect(pCore->bin(), &Bin::clipNameChanged, trackView->projectView(), \
&CustomTrackView::clipNameChanged);
connect(pCore->bin(), SIGNAL(displayMessage(QString,int,MessageType)), \
m_messageLabel, SLOT(setProgressMessage(QString,int,MessageType)));
connect(trackView->projectView(), SIGNAL(showClipFrame(const QString&,int)), \
pCore->bin(), SLOT(selectClipById(const QString&,int)));
diff --cc src/timeline/customtrackview.cpp
index 5fa236b26,2cba623cf..e80f61c07
--- a/src/timeline/customtrackview.cpp
+++ b/src/timeline/customtrackview.cpp
@@@ -194,10 -195,10 +194,10 @@@ void CustomTrackView::initTools(
m_toolManagers.insert(AbstractToolManager::TrimType, trim);
m_toolManagers.insert(AbstractToolManager::SpacerType, new SpacerManager(this, \
m_commandStack));
m_toolManagers.insert(AbstractToolManager::ResizeType, new ResizeManager(this, \
m_commandStack));
-
+
AbstractToolManager *razorManager = new RazorManager(this, m_commandStack);
m_toolManagers.insert(AbstractToolManager::RazorType, razorManager);
- connect(horizontalScrollBar(), SIGNAL(valueChanged(int)), razorManager, \
SLOT(updateTimelineItems())); + connect(horizontalScrollBar(), \
&QAbstractSlider::valueChanged, razorManager, \
&AbstractToolManager::updateTimelineItems);
m_toolManagers.insert(AbstractToolManager::MoveType, new \
MoveManager(m_timeline->transitionHandler, this, m_commandStack));
m_toolManagers.insert(AbstractToolManager::SelectType, m_currentToolManager);
m_toolManagers.insert(AbstractToolManager::GuideType, new GuideManager(this, \
m_commandStack));
diff --cc src/timeline/customtrackview.h
index 4218b0ff6,7c68fb947..0a737e701
--- a/src/timeline/customtrackview.h
+++ b/src/timeline/customtrackview.h
@@@ -74,29 -75,29 +74,29 @@@ public
/** move transition, startPos = (old start, old end), endPos = (new start, new \
end) */
void moveTransition(const ItemInfo &start, const ItemInfo &end, bool refresh);
void resizeClip(const ItemInfo &start, const ItemInfo &end, bool dontWorry = \
false);
- void addClip(const QString &clipId, ItemInfo info, EffectsList list, \
PlaylistState::ClipState state, bool refresh = true);
- void deleteClip(ItemInfo info, bool refresh = true);
+ void addClip(const QString &clipId, const ItemInfo &info, const EffectsList \
&list, PlaylistState::ClipState state, bool refresh = true); + void \
deleteClip(const ItemInfo &info, bool refresh = true); void addMarker(const QString \
&id, const CommentedTime &marker);
void addData(const QString &id, const QString &key, const QString &data);
- void setScale(double scaleFactor, double verticalScale);
+ void setScale(double scaleFactor, double verticalScale, bool zoomOnMouse = \
false); void deleteClip(const QString &clipId, QUndoCommand *deleteCommand);
/** @brief An effect was dropped on @param clip */
- void slotDropEffect(ClipItem *clip, QDomElement effect, GenTime pos, int \
track); + void slotDropEffect(ClipItem *clip, const QDomElement &effect, GenTime \
pos, int track); /** @brief A transition was dropped on @param clip */
- void slotDropTransition(ClipItem *clip, QDomElement transition, QPointF \
scenePos); + void slotDropTransition(ClipItem *clip, const QDomElement \
&transition, QPointF scenePos); /** @brief Add effect to current clip */
- void slotAddEffectToCurrentItem(QDomElement effect);
+ void slotAddEffectToCurrentItem(const QDomElement &effect);
/** @brief Add effect to a clip or selection */
- void slotAddEffect(QDomElement effect, const GenTime &pos, int track);
- void slotAddGroupEffect(QDomElement effect, AbstractGroupItem *group, \
AbstractClipItem *dropTarget = NULL);
- void addEffect(int track, GenTime pos, QDomElement effect);
+ void slotAddEffect(const QDomElement &effect, const GenTime &pos, int track);
+ void slotAddGroupEffect(const QDomElement &effect, AbstractGroupItem *group, \
AbstractClipItem *dropTarget = Q_NULLPTR); + void addEffect(int track, GenTime \
pos, const QDomElement &effect);
void deleteEffect(int track, const GenTime &pos, const QDomElement &effect);
- void updateEffect(int track, GenTime pos, QDomElement insertedEffect, bool \
refreshEffectStack = false, bool replaceEffect = false, bool refreshMonitor = true); \
+ void updateEffect(int track, GenTime pos, const QDomElement &insertedEffect, \
bool refreshEffectStack = false, bool replaceEffect = false, bool refreshMonitor = \
true); /** @brief Enable / disable a list of effects */
- void updateEffectState(int track, GenTime pos, QList <int> effectIndexes, bool \
disable, bool updateEffectStack); + void updateEffectState(int track, GenTime \
pos, const QList<int> &effectIndexes, bool disable, bool \
updateEffectStack);
void moveEffect(int track, const GenTime &pos, const QList<int> &oldPos, const \
QList<int> &newPos);
void addTransition(const ItemInfo &transitionInfo, int endTrack, const \
QDomElement ¶ms, bool refresh);
- void deleteTransition(const ItemInfo &transitionInfo, int endTrack, QDomElement \
params, bool refresh); + void deleteTransition(const ItemInfo &transitionInfo, \
int endTrack, const QDomElement ¶ms, bool refresh);
void updateTransition(int track, const GenTime &pos, const QDomElement \
&oldTransition, const QDomElement &transition, bool updateTransitionWidget); void \
activateMonitor(); int duration() const;
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic