[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: 2017-03-06 12:10:58
Message-ID: E1ckrTe-0003B6-5Q () code ! kde ! org
[Download RAW message or body]
Git commit 6bb47691939439e200e025ebbe1de4b12db2acc5 by Jean-Baptiste Mardelle.
Committed on 06/03/2017 at 12:10.
Pushed by mardelle into branch 'master'.
Merge branch '16.12'
M +2 -2 src/bin/bin.cpp
M +2 -1 src/bin/bin.h
M +2 -2 src/bin/bincommands.cpp
M +1 -1 src/bin/bincommands.h
M +14 -9 src/dialogs/renderwidget.cpp
M +4 -4 src/dvdwizard/dvdwizard.cpp
M +5 -0 src/dvdwizard/dvdwizardmenu.cpp
M +1 -1 src/effectstack/effectstackview2.cpp
M +1 -1 src/effectstack/effectstackview2.h
M +4 -3 src/effectstack/graphicsscenerectmove.cpp
M +3 -1 src/mainwindow.cpp
https://commits.kde.org/kdenlive/6bb47691939439e200e025ebbe1de4b12db2acc5
diff --cc src/bin/bin.cpp
index 4a7c05d92,3804ac26c..2f8ad73d7
--- a/src/bin/bin.cpp
+++ b/src/bin/bin.cpp
@@@ -2613,15 -2361,11 +2613,15 @@@ void Bin::slotEffectDropped(QString id
m_doc->commandStack()->push(command);
}
- void Bin::slotUpdateEffect(QString id, QDomElement oldEffect, QDomElement \
newEffect, int ix) + void Bin::slotUpdateEffect(QString id, QDomElement oldEffect, \
QDomElement newEffect, int ix, bool refreshStack) {
- if (id.isEmpty()) id = m_monitor->activeClipId();
- if (id.isEmpty()) return;
+ if (id.isEmpty()) {
+ id = m_monitor->activeClipId();
+ }
+ if (id.isEmpty()) {
+ return;
+ }
- UpdateBinEffectCommand *command = new UpdateBinEffectCommand(this, id, \
oldEffect, newEffect, ix); + UpdateBinEffectCommand *command = new \
UpdateBinEffectCommand(this, id, oldEffect, newEffect, ix, refreshStack); \
m_doc->commandStack()->push(command); }
diff --cc src/bin/bin.h
index c1c1a38b7,f67012963..d8c267017
--- a/src/bin/bin.h
+++ b/src/bin/bin.h
@@@ -367,14 -555,14 +367,15 @@@ private slots
void selectProxyModel(const QModelIndex &id);
void autoSelect();
void slotSaveHeaders();
- void slotItemDropped(QStringList ids, const QModelIndex &parent);
- void slotItemDropped(const QList<QUrl>&urls, const QModelIndex &parent);
- void slotEffectDropped(QString effect, const QModelIndex &parent);
+ void slotItemDropped(const QStringList &ids, const QModelIndex &parent);
+ void slotItemDropped(const QList<QUrl> &urls, const QModelIndex &parent);
+ void slotEffectDropped(const QString &effect, const QModelIndex &parent);
- void slotUpdateEffect(QString id, QDomElement oldEffect, QDomElement newEffect, \
int ix); + void slotUpdateEffect(QString id, QDomElement oldEffect, QDomElement \
newEffect, int ix, bool refreshStack = false);
- void slotChangeEffectState(QString id, QList<int> indexes, bool disable);
- void slotItemEdited(QModelIndex,QModelIndex,QVector<int>);
- void slotAddUrl(QString url, int folderId, QMap <QString, QString> data = QMap \
<QString, QString>());
- void slotAddUrl(QString url, QMap <QString, QString> data = QMap <QString, \
QString>()); + void slotChangeEffectState(QString id, const QList<int> &indexes, \
bool disable); + void slotItemEdited(const QModelIndex &, const QModelIndex &, \
const QVector<int> &); + void slotAddUrl(const QString &url, int folderId, const \
QMap<QString, QString> &data = QMap<QString, QString>()); + void slotAddUrl(const \
QString &url, const QMap<QString, QString> &data = QMap<QString, QString>()); ++
void slotPrepareJobsMenu();
void slotShowJobLog();
/** @brief process clip job result. */
diff --cc src/bin/bincommands.cpp
index c71f346f1,354b5b458..b675405e8
--- a/src/bin/bincommands.cpp
+++ b/src/bin/bincommands.cpp
@@@ -154,14 -150,14 +154,14 @@@ void RemoveBinEffectCommand::redo(
m_bin->removeEffect(m_clipId, m_effect);
}
- UpdateBinEffectCommand::UpdateBinEffectCommand(Bin *bin, const QString &clipId, \
QDomElement &oldEffect, QDomElement &newEffect, int ix, QUndoCommand *parent) : + \
UpdateBinEffectCommand::UpdateBinEffectCommand(Bin *bin, const QString &clipId, \
QDomElement &oldEffect, QDomElement &newEffect, int ix, bool refreshStack, \
QUndoCommand *parent) :
- QUndoCommand(parent),
- m_bin(bin),
- m_clipId(clipId),
- m_oldEffect(oldEffect),
- m_newEffect(newEffect),
- m_ix(ix),
- m_refreshStack(refreshStack)
+ QUndoCommand(parent),
+ m_bin(bin),
+ m_clipId(clipId),
+ m_oldEffect(oldEffect),
+ m_newEffect(newEffect),
+ m_ix(ix),
- m_refreshStack(false)
++ m_refreshStack(refreshStack)
{
setText(i18n("Edit Bin Effect"));
}
diff --cc src/bin/bincommands.h
index 43f22ca0e,799cb21f7..29f3e61b4
--- a/src/bin/bincommands.h
+++ b/src/bin/bincommands.h
@@@ -106,9 -109,9 +106,9 @@@ private
class UpdateBinEffectCommand : public QUndoCommand
{
public:
- explicit UpdateBinEffectCommand(Bin *bin, const QString &clipId, QDomElement \
&oldEffect, QDomElement &newEffect, int ix, QUndoCommand *parent = \
nullptr);
- explicit UpdateBinEffectCommand(Bin *bin, const QString &clipId, QDomElement \
&oldEffect, QDomElement &newEffect, int ix, bool refreshStack, QUndoCommand *parent = \
0);
- void undo();
- void redo();
++ explicit UpdateBinEffectCommand(Bin *bin, const QString &clipId, QDomElement \
&oldEffect, QDomElement &newEffect, int ix, bool refreshStack, QUndoCommand *parent = \
nullptr); + void undo() Q_DECL_OVERRIDE;
+ void redo() Q_DECL_OVERRIDE;
private:
Bin *m_bin;
QString m_clipId;
diff --cc src/dialogs/renderwidget.cpp
index 0e82550e6,f631b65e5..bcb085c0f
--- a/src/dialogs/renderwidget.cpp
+++ b/src/dialogs/renderwidget.cpp
@@@ -285,10 -286,15 +285,15 @@@ RenderWidget::RenderWidget(const QStrin
//m_view.splitter->setStretchFactor(0, 2);
m_view.out_file->setMode(KFile::File);
+
+ #if KXMLGUI_VERSION_MINOR > 32 || KXMLGUI_VERSION_MAJOR > 5
+ m_view.out_file->setAcceptMode(QFileDialog::AcceptSave);
+ #endif
+
m_view.out_file->setFocusPolicy(Qt::ClickFocus);
- m_view.running_jobs->setHeaderLabels(QStringList() << QString() << \
i18n("File")); m_jobsDelegate = new RenderViewDelegate(this);
+ m_view.running_jobs->setHeaderLabels(QStringList() << QString() << \
i18n("File")); m_view.running_jobs->setItemDelegate(m_jobsDelegate);
QHeaderView *header = m_view.running_jobs->header();
diff --cc src/effectstack/effectstackview2.cpp
index 923481740,4835d271d..505274da5
--- a/src/effectstack/effectstackview2.cpp
+++ b/src/effectstack/effectstackview2.cpp
@@@ -951,13 -923,13 +951,13 @@@ void EffectStackView2::slotResetEffect(
break;
}
}
- emit updateEffect(NULL, m_trackindex, old, dom, ix,false);
+ emit updateEffect(nullptr, m_trackindex, old, dom, ix, false);
} else if (m_status == TIMELINE_CLIP) {
m_clipref->initEffect(m_effectMetaInfo.monitor->profileInfo(), dom);
- emit updateEffect(m_clipref, -1, old, dom, ix,true);
+ emit updateEffect(m_clipref, -1, old, dom, ix, true);
} else if (m_status == MASTER_CLIP) {
m_masterclipref->initEffect(m_effectMetaInfo.monitor->profileInfo(), \
dom);
- emit updateMasterEffect(m_masterclipref->clipId(), old, dom, ix);
+ emit updateMasterEffect(m_masterclipref->clipId(), old, dom, ix,true);
}
}
diff --cc src/effectstack/effectstackview2.h
index 0604d0eb4,fc290f19d..db66d1a47
--- a/src/effectstack/effectstackview2.h
+++ b/src/effectstack/effectstackview2.h
@@@ -256,14 -259,14 +256,14 @@@ private slots
void slotSwitchCompare(bool enable);
signals:
- void removeEffectGroup(ClipItem*, int, const QDomDocument);
- void removeEffect(ClipItem*, int, const QDomElement);
- void removeMasterEffect(const QString &id, const QDomElement);
- void addMasterEffect(const QString &id, const QDomElement&);
+ void removeEffectGroup(ClipItem *, int, const QDomDocument &);
+ void removeEffect(ClipItem *, int, const QDomElement &);
+ void removeMasterEffect(const QString &id, const QDomElement &);
+ void addMasterEffect(const QString &id, const QDomElement &);
/** Parameters for an effect changed, update the filter in timeline */
- void updateEffect(ClipItem*, int, const QDomElement&, const QDomElement &, \
int,bool); + void updateEffect(ClipItem *, int, const QDomElement &, const \
QDomElement &, int, bool);
/** Parameters for an effect changed, update the filter in timeline */
- void updateMasterEffect(QString, const QDomElement &, const QDomElement &, \
int);
- void updateMasterEffect(QString, const QDomElement&, const QDomElement &, int \
ix,bool refreshStack = false); ++ void updateMasterEffect(QString, const \
QDomElement &, const QDomElement &, int ix,bool refreshStack = false); /** An effect \
in stack was moved, we need to regenerate all effects for this clip in the playlist \
*/ void refreshEffectStack(ClipItem *);
diff --cc src/effectstack/graphicsscenerectmove.cpp
index a3f5dc056,6a5b3a8f2..7d9c851e8
--- a/src/effectstack/graphicsscenerectmove.cpp
+++ b/src/effectstack/graphicsscenerectmove.cpp
@@@ -780,9 -757,8 +782,8 @@@ void GraphicsSceneRectMove::clearTextSe
t->setTextCursor(QTextCursor(cur));
t->setTextInteractionFlags(Qt::NoTextInteraction);
}
- m_selectedItem = nullptr;
- clearSelection();
- if (reset && m_selectedItem) {
- m_selectedItem = NULL;
+ if (reset) {
++ m_selectedItem = nullptr;
clearSelection();
}
}
diff --cc src/mainwindow.cpp
index 5e9d0b641,005e81ffa..facc5de67
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@@ -316,16 -328,16 +316,18 @@@ void MainWindow::init(const QString &Ml
m_projectBinDock = addDock(i18n("Project Bin"), QStringLiteral("project_bin"), \
pCore->bin()); m_effectStack = new EffectStackView2(m_projectMonitor, this);
- connect(m_effectStack, SIGNAL(startFilterJob(const ItemInfo&,const \
QString&,QMap<QString,QString>&,QMap<QString,QString>&,QMap<QString,QString>&)), \
pCore->bin(), SLOT(slotStartFilterJob(const ItemInfo &,const \
QString&,QMap<QString,QString>&,QMap<QString,QString>&,QMap<QString,QString>&)));
- connect(pCore->bin(), SIGNAL(masterClipSelected(ClipController *, Monitor *)), \
m_effectStack, SLOT(slotMasterClipItemSelected(ClipController *, \
Monitor *)));
- connect(pCore->bin(), SIGNAL(masterClipUpdated(ClipController *, Monitor *)), \
m_effectStack, SLOT(slotRefreshMasterClipEffects(ClipController *, \
Monitor *)));
- connect(m_effectStack, SIGNAL(addMasterEffect(QString,QDomElement)), \
pCore->bin(), SLOT(slotEffectDropped(QString,QDomElement))); ++
+ connect(m_effectStack, &EffectStackView2::startFilterJob, pCore->bin(), \
&Bin::slotStartFilterJob); + connect(pCore->bin(), &Bin::masterClipSelected, \
m_effectStack, &EffectStackView2::slotMasterClipItemSelected); + \
connect(pCore->bin(), &Bin::masterClipUpdated, m_effectStack, \
&EffectStackView2::slotRefreshMasterClipEffects); + connect(m_effectStack, \
SIGNAL(addMasterEffect(QString, QDomElement)), pCore->bin(), \
SLOT(slotEffectDropped(QString, QDomElement)));
- connect(m_effectStack, SIGNAL(updateMasterEffect(QString, QDomElement, \
QDomElement, int)), pCore->bin(), SLOT(slotUpdateEffect(QString, QDomElement, \
QDomElement, int))); + connect(m_effectStack, \
SIGNAL(updateMasterEffect(QString,QDomElement,QDomElement,int,bool)), pCore->bin(), \
SLOT(slotUpdateEffect(QString,QDomElement,QDomElement,int,bool)));
- connect(m_effectStack, \
SIGNAL(changeMasterEffectState(QString,QList<int>,bool)), pCore->bin(), \
SLOT(slotChangeEffectState(QString,QList<int>,bool)));
- connect(m_effectStack, SIGNAL(removeMasterEffect(QString,QDomElement)), \
pCore->bin(), SLOT(slotDeleteEffect(QString,QDomElement)));
- connect(m_effectStack, SIGNAL(changeEffectPosition(QString,const QList \
<int>,int)), pCore->bin(), SLOT(slotMoveEffect(QString,const QList \
<int>,int)));
- connect(m_effectStack, SIGNAL(reloadEffects()), this, \
SLOT(slotReloadEffects()));
- connect(m_effectStack, SIGNAL(displayMessage(QString,int)), m_messageLabel, \
SLOT(setProgressMessage(QString,int))); + connect(m_effectStack, \
SIGNAL(changeMasterEffectState(QString, QList<int>, bool)), pCore->bin(), \
SLOT(slotChangeEffectState(QString, QList<int>, bool))); + connect(m_effectStack, \
&EffectStackView2::removeMasterEffect, pCore->bin(), &Bin::slotDeleteEffect); + \
connect(m_effectStack, SIGNAL(changeEffectPosition(QString, QList<int>, int)), \
pCore->bin(), SLOT(slotMoveEffect(QString, QList<int>, int))); + \
connect(m_effectStack, &EffectStackView2::reloadEffects, this, \
&MainWindow::slotReloadEffects); + connect(m_effectStack, \
SIGNAL(displayMessage(QString, int)), m_messageLabel, \
SLOT(setProgressMessage(QString, int))); ++
m_effectStackDock = addDock(i18n("Properties"), QStringLiteral("effect_stack"), \
m_effectStack);
m_effectList = new EffectsListView();
[prev in list] [next in list] [prev in thread] [next in thread]
Configure |
About |
News |
Add a list |
Sponsored by KoreLogic