Skip to content

GitLab

Commit 558d1494 authored by Jean-Baptiste Mardelle's avatar Jean-Baptiste Mardelle
Browse files

Remove deprecated setting for automatic transitions 

Add warning if 0.9 project file cannot be read
parent 7d0c6bc0
Hide whitespace changes
Inline Side-by-side
src/doc/documentvalidator.cpp
View file @ 558d1494
......@@ -1268,6 +1268,10 @@ bool DocumentValidator::upgrade(double version, const double currentVersion)
}
}
}
if (playlist.isNull()) {
KMessageBox::sorry(QApplication::activeWindow(), i18n("Cannot recover this project file"));
return false;
}
// Migrate document notes
QDomNodeList notesList = m_doc.elementsByTagName(QStringLiteral("documentnotes"));
if (!notesList.isEmpty()) {
......
src/ui/configtimeline_ui.ui
View file @ 558d1494
......@@ -7,25 +7,11 @@
<x>0</x>
<y>0</y>
<width>575</width>
<height>570</height>
<height>532</height>
</rect>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="3" column="0" colspan="4">
<widget class="QCheckBox" name="kcfg_autoscroll">
<property name="text">
<string>Autoscroll while playing</string>
</property>
</widget>
</item>
<item row="1" column="0" colspan="4">
<widget class="QCheckBox" name="kcfg_ffmpegaudiothumbnails">
<property name="text">
<string>Use FFmpeg for audio thumbnails (faster)</string>
</property>
</widget>
</item>
<item row="8" column="0" colspan="4">
<item row="7" column="0" colspan="4">
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Raise properties pane when selecting in timeline</string>
......@@ -68,49 +54,18 @@
</layout>
</widget>
</item>
<item row="5" column="0" colspan="4">
<widget class="QCheckBox" name="kcfg_automatictransitions">
<property name="text">
<string>Create new transitions as automatic transitions</string>
<item row="9" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
</widget>
</item>
<item row="6" column="0" colspan="4">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Track height</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="kcfg_trackheight">
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>999</number>
</property>
<property name="value">
<number>10</number>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>23</height>
</size>
</property>
</spacer>
</item>
<item row="0" column="0" colspan="4">
<widget class="QGroupBox" name="groupBox">
......@@ -158,27 +113,7 @@
</layout>
</widget>
</item>
<item row="10" column="0">
<spacer name="verticalSpacer">
<property name="orientation">
<enum>Qt::Vertical</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>20</width>
<height>23</height>
</size>
</property>
</spacer>
</item>
<item row="4" column="0" colspan="3">
<widget class="QCheckBox" name="kcfg_verticalzoom">
<property name="text">
<string>Zoom using vertical drag in ruler</string>
</property>
</widget>
</item>
<item row="7" column="0" colspan="4">
<item row="6" column="0" colspan="4">
<widget class="QGroupBox" name="groupBox_3">
<property name="title">
<string>Multi stream audio clips</string>
......@@ -226,6 +161,64 @@
</layout>
</widget>
</item>
<item row="1" column="0" colspan="4">
<widget class="QCheckBox" name="kcfg_ffmpegaudiothumbnails">
<property name="text">
<string>Use FFmpeg for audio thumbnails (faster)</string>
</property>
</widget>
</item>
<item row="5" column="0" colspan="4">
<layout class="QHBoxLayout" name="horizontalLayout_2">
<item>
<widget class="QLabel" name="label">
<property name="text">
<string>Track height</string>
</property>
</widget>
</item>
<item>
<widget class="QSpinBox" name="kcfg_trackheight">
<property name="minimum">
<number>0</number>
</property>
<property name="maximum">
<number>999</number>
</property>
<property name="value">
<number>10</number>
</property>
</widget>
</item>
<item>
<spacer name="horizontalSpacer_2">
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>40</width>
<height>20</height>
</size>
</property>
</spacer>
</item>
</layout>
</item>
<item row="3" column="0" colspan="4">
<widget class="QCheckBox" name="kcfg_autoscroll">
<property name="text">
<string>Autoscroll while playing</string>
</property>
</widget>
</item>
<item row="4" column="0" colspan="3">
<widget class="QCheckBox" name="kcfg_verticalzoom">
<property name="text">
<string>Zoom using vertical drag in ruler</string>
</property>
</widget>
</item>
<item row="2" column="0" colspan="2">
<widget class="QCheckBox" name="kcfg_showmarkers">
<property name="text">
......@@ -240,7 +233,6 @@
<tabstop>kcfg_showmarkers</tabstop>
<tabstop>kcfg_autoscroll</tabstop>
<tabstop>kcfg_verticalzoom</tabstop>
<tabstop>kcfg_automatictransitions</tabstop>
<tabstop>kcfg_trackheight</tabstop>
</tabstops>
<resources/>
......
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