X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fdvdwizard.cpp;h=820d02fbb6228a8ab64046329ce5727be15d3563;hb=5bac38471d4c90a8a520d6ec32b90913b6f0dbcb;hp=ceba71c1f74ce3d555a0d56b4f46a6c580ce3369;hpb=7f741e1076a7639e684200ed8fd6b7dd40b15d35;p=kdenlive
diff --git a/src/dvdwizard.cpp b/src/dvdwizard.cpp
index ceba71c1..820d02fb 100644
--- a/src/dvdwizard.cpp
+++ b/src/dvdwizard.cpp
@@ -66,6 +66,7 @@ DvdWizard::DvdWizard(const QString &url, const QString &profile, QWidget *parent
page4->setTitle(i18n("Creating DVD Image"));
m_status.setupUi(page4);
m_status.error_box->setHidden(true);
+ m_status.error_box->setTabBarHidden(true);
m_status.tmp_folder->setUrl(KUrl(KdenliveSettings::currenttmpfolder()));
m_status.tmp_folder->setMode(KFile::Directory | KFile::ExistingOnly);
m_status.iso_image->setUrl(KUrl(QDir::homePath() + "/untitled.iso"));
@@ -153,6 +154,10 @@ void DvdWizard::slotPageChanged(int page)
void DvdWizard::generateDvd()
{
m_status.error_box->setHidden(true);
+ m_status.error_box->setCurrentIndex(0);
+ m_status.error_box->setTabBarHidden(true);
+ m_status.menu_file->clear();
+ m_status.dvd_file->clear();
KTemporaryFile temp1;
temp1.setSuffix(".png");
//temp1.setAutoRemove(false);
@@ -249,7 +254,7 @@ void DvdWizard::generateDvd()
} else {
kDebug() << "/// RENDERING MENU vob timed out";
vobitem->setIcon(KIcon("dialog-close"));
- m_status.error_log->append("
" + i18n("Rendering job timed out"));
+ m_status.error_log->append("
" + i18n("Rendering job timed out"));
m_status.error_log->scrollToAnchor("result");
m_status.error_box->setHidden(false);
m_status.button_start->setEnabled(true);
@@ -330,6 +335,9 @@ void DvdWizard::generateDvd()
spuitem->setIcon(KIcon("dialog-close"));
m_status.error_log->append(result);
m_status.error_box->setHidden(false);
+ m_status.error_box->setTabBarHidden(false);
+ m_status.menu_file->setPlainText(m_menuFile.readAll());
+ m_status.dvd_file->setPlainText(m_authorFile.readAll());
m_status.button_start->setEnabled(true);
kDebug() << "/// RENDERING SPUMUX MENU crashed";
return;
@@ -337,9 +345,12 @@ void DvdWizard::generateDvd()
} else {
kDebug() << "/// RENDERING SPUMUX MENU timed out";
spuitem->setIcon(KIcon("dialog-close"));
- m_status.error_log->append("
" + i18n("Menu job timed out"));
+ m_status.error_log->append("
" + i18n("Menu job timed out"));
m_status.error_log->scrollToAnchor("result");
m_status.error_box->setHidden(false);
+ m_status.error_box->setTabBarHidden(false);
+ m_status.menu_file->setPlainText(m_menuFile.readAll());
+ m_status.dvd_file->setPlainText(m_authorFile.readAll());
m_status.button_start->setEnabled(true);
return;
}
@@ -494,11 +505,14 @@ void DvdWizard::slotRenderFinished(int exitCode, QProcess::ExitStatus status)
QListWidgetItem *authitem = m_status.job_progress->item(3);
if (status == QProcess::CrashExit || exitCode != 0) {
QString result(m_dvdauthor->readAllStandardError());
- result.append("
");
- result.append(i18n("DVDAuthor process crashed."));
+ result.append("
");
+ result.append(i18n("DVDAuthor process crashed.
"));
m_status.error_log->append(result);
m_status.error_log->scrollToAnchor("result");
m_status.error_box->setHidden(false);
+ m_status.error_box->setTabBarHidden(false);
+ m_status.menu_file->setPlainText(m_menuFile.readAll());
+ m_status.dvd_file->setPlainText(m_authorFile.readAll());
kDebug() << "DVDAuthor process crashed";
authitem->setIcon(KIcon("dialog-close"));
m_dvdauthor->close();
@@ -520,6 +534,9 @@ void DvdWizard::slotRenderFinished(int exitCode, QProcess::ExitStatus status)
m_status.error_log->append(m_creationLog + "
" + i18n("DVD structure broken"));
m_status.error_log->scrollToAnchor("result");
m_status.error_box->setHidden(false);
+ m_status.error_box->setTabBarHidden(false);
+ m_status.menu_file->setPlainText(m_menuFile.readAll());
+ m_status.dvd_file->setPlainText(m_authorFile.readAll());
kDebug() << "DVDAuthor process crashed";
authitem->setIcon(KIcon("dialog-close"));
m_status.button_start->setEnabled(true);
@@ -569,6 +586,9 @@ void DvdWizard::slotIsoFinished(int exitCode, QProcess::ExitStatus status)
m_status.error_log->append(result);
m_status.error_log->scrollToAnchor("result");
m_status.error_box->setHidden(false);
+ m_status.error_box->setTabBarHidden(false);
+ m_status.menu_file->setPlainText(m_menuFile.readAll());
+ m_status.dvd_file->setPlainText(m_authorFile.readAll());
m_mkiso->close();
delete m_mkiso;
m_mkiso = NULL;
@@ -595,6 +615,9 @@ void DvdWizard::slotIsoFinished(int exitCode, QProcess::ExitStatus status)
m_status.error_log->append(m_creationLog + "
" + i18n("DVD ISO is broken") + "");
m_status.error_log->scrollToAnchor("result");
m_status.error_box->setHidden(false);
+ m_status.error_box->setTabBarHidden(false);
+ m_status.menu_file->setPlainText(m_menuFile.readAll());
+ m_status.dvd_file->setPlainText(m_authorFile.readAll());
isoitem->setIcon(KIcon("dialog-close"));
cleanup();
return;
@@ -648,7 +671,7 @@ void DvdWizard::slotGenerate()
m_status.job_progress->item(i)->setIcon(KIcon());
QString warnMessage;
if (KIO::NetAccess::exists(KUrl(m_status.tmp_folder->url().path(KUrl::AddTrailingSlash) + "DVD"), KIO::NetAccess::SourceSide, this))
- warnMessage.append(i18n("Folder %1 already exists. Overwrite?" + '\n', m_status.tmp_folder->url().path(KUrl::AddTrailingSlash) + "DVD"));
+ warnMessage.append(i18n("Folder %1 already exists. Overwrite?\n", m_status.tmp_folder->url().path(KUrl::AddTrailingSlash) + "DVD"));
if (KIO::NetAccess::exists(KUrl(m_status.iso_image->url().path()), KIO::NetAccess::SourceSide, this))
warnMessage.append(i18n("Image file %1 already exists. Overwrite?", m_status.iso_image->url().path()));