void CustomTrackView::slotUpdateAllThumbs()
{
+ if (!isEnabled()) return;
QList<QGraphicsItem *> itemList = items();
//if (itemList.isEmpty()) return;
ClipItem *item;
delete w;
}
-void MainWindow::newFile(bool showProjectSettings)
+void MainWindow::newFile(bool showProjectSettings, bool force)
{
- if (!m_timelineArea->isEnabled()) return;
+ if (!m_timelineArea->isEnabled() && !force) return;
m_fileRevert->setEnabled(false);
QString profileName;
KUrl projectFolder;
QPoint projectTracks(KdenliveSettings::videotracks(), KdenliveSettings::audiotracks());
- if (!showProjectSettings && m_timelineArea->count() == 0) {
+ if (!showProjectSettings) {
if (!KdenliveSettings::activatetabs()) closeCurrentDocument();
profileName = KdenliveSettings::default_profile();
projectFolder = KdenliveSettings::defaultprojectfolder();
projectTracks = w->tracks();
delete w;
}
+ m_timelineArea->setEnabled(true);
+ m_projectList->setEnabled(true);
KdenliveDoc *doc = new KdenliveDoc(KUrl(), projectFolder, m_commandStack, profileName, projectTracks, m_projectMonitor->render, this);
doc->m_autosave = new KAutoSaveFile(KUrl(), doc);
bool ok;
if (!ok) {
m_timelineArea->setEnabled(false);
m_projectList->setEnabled(false);
- m_monitorManager->slotBlockMonitors();
- slotPreferences(6);
+ KMessageBox::sorry(this, i18n("Cannot open file %1.\nProject is corrupted.", url.path()));
+ slotGotProgressInfo(QString(), -1);
+ newFile(false, true);
return;
}
m_timelineArea->setTabToolTip(m_timelineArea->currentIndex(), doc->url().path());
Q_SCRIPTABLE void setRenderingFinished(const QString &url, int status, const QString &error);
private slots:
- void newFile(bool showProjectSettings = true);
+ void newFile(bool showProjectSettings = true, bool force = false);
void queryQuit();
void activateDocument();
void connectDocument(TrackView*, KdenliveDoc*);
{
if (m_winid == -1) return -1;
m_isBlocked = true;
- int error;
+ int error = 0;
kDebug() << "////// RENDER, SET SCENE LIST: " << playlist;
if (!m_mltProducer || !m_mltProducer->is_valid()) {
kDebug() << " WARNING - - - - -INVALID PLAYLIST: " << tmp;
m_mltProducer = m_blackClip->cut(0, 50);
+ error = -1;
}
delete[] tmp;
}
kDebug() << "// NEW SCENE LIST DURATION SET TO: " << m_mltProducer->get_playtime();
- error = connectPlaylist();
+ if (error == 0) error = connectPlaylist();
+ else connectPlaylist();
fillSlowMotionProducers();
m_isBlocked = false;
connect(m_trackview, SIGNAL(updateTrackHeaders()), this, SLOT(slotRepaintTracks()));
parseDocument(m_doc->toXml());
- int error = m_doc->setSceneList();
- if (error == -1) *ok = false;
+ if (m_doc->setSceneList() == -1) *ok = false;
else *ok = true;
connect(m_trackview, SIGNAL(cursorMoved(int, int)), m_ruler, SLOT(slotCursorMoved(int, int)));
connect(m_trackview->horizontalScrollBar(), SIGNAL(valueChanged(int)), m_ruler, SLOT(slotMoveRuler(int)));