Commit 6c3c0e59 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle

Merge branch 'Applications/15.08' of git://anongit.kde.org/kdenlive into 15.08

parents ed584916 72357fb8
......@@ -6,7 +6,7 @@ project(Kdenlive)
# KDE Application Version, managed by release script
set (KDE_APPLICATIONS_VERSION_MAJOR "15")
set (KDE_APPLICATIONS_VERSION_MINOR "08")
set (KDE_APPLICATIONS_VERSION_MICRO "0")
set (KDE_APPLICATIONS_VERSION_MICRO "1")
set(KDENLIVE_VERSION ${KDE_APPLICATIONS_VERSION_MAJOR}.${KDE_APPLICATIONS_VERSION_MINOR}.${KDE_APPLICATIONS_VERSION_MICRO})
cmake_minimum_required(VERSION 2.8.12)
......
......@@ -1281,43 +1281,30 @@ void MainWindow::readOptions()
{
KSharedConfigPtr config = KSharedConfig::openConfig();
pCore->projectManager()->recentFilesAction()->loadEntries(KConfigGroup(config, "Recent Files"));
KConfigGroup initialGroup(config, "version");
bool upgrade = false;
if (initialGroup.exists()) {
if (initialGroup.readEntry("version", QString()).section(' ', 0, 0) != QString(version).section(' ', 0, 0)) {
upgrade = true;
}
if (initialGroup.readEntry("version") == "0.7") {
//Add new settings from 0.7.1
if (KdenliveSettings::defaultprojectfolder().isEmpty()) {
QDir dir(QDir::homePath());
if (!dir.mkdir("kdenlive")) {
qDebug() << "/// ERROR CREATING PROJECT FOLDER: ";
} else {
dir.cd("kdenlive");
KdenliveSettings::setDefaultprojectfolder(dir.path());
}
}
}
}
if (KdenliveSettings::ffmpegpath().isEmpty() || KdenliveSettings::ffplaypath().isEmpty()) {
upgrade = true;
if (KdenliveSettings::defaultprojectfolder().isEmpty()) {
QDir dir(QDir::homePath());
if (!dir.mkdir("kdenlive")) {
qDebug() << "/// ERROR CREATING PROJECT FOLDER: ";
} else {
dir.cd("kdenlive");
KdenliveSettings::setDefaultprojectfolder(dir.path());
}
}
if (!initialGroup.exists() || upgrade) {
KConfigGroup initialGroup(config, "version");
if (!initialGroup.exists() || KdenliveSettings::ffmpegpath().isEmpty() || KdenliveSettings::ffplaypath().isEmpty()) {
// this is our first run, show Wizard
QPointer<Wizard> w = new Wizard(upgrade, this);
QPointer<Wizard> w = new Wizard(false, this);
if (w->exec() == QDialog::Accepted && w->isOk()) {
w->adjustSettings();
initialGroup.writeEntry("version", version);
delete w;
} else {
delete w;
::exit(1);
}
}
initialGroup.writeEntry("version", version);
}
void MainWindow::slotRunWizard()
......
......@@ -1103,7 +1103,7 @@ void CustomTrackView::mousePressEvent(QMouseEvent * event)
m_selectionGroup->setProperty("locked_tracks", lockedTracks);
}
m_selectionMutex.unlock();
if (m_dragItem) {
if (m_dragItem && m_dragItem->type() == AVWidget) {
ClipItem *clip = static_cast<ClipItem*>(m_dragItem);
updateClipTypeActions(dragGroup == NULL ? clip : NULL);
m_pasteEffectsAction->setEnabled(m_copiedItems.count() == 1);
......
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