X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Fdvdwizard.cpp;h=820d02fbb6228a8ab64046329ce5727be15d3563;hb=4e56ce77c4559c6ae42dab27fe70f725dca3eb3e;hp=a4543972bfeaeb87ef9fe78f66e54ddb25989cb6;hpb=756fce84e028985fbbbfde1ecd4bf776162dde9e;p=kdenlive diff --git a/src/dvdwizard.cpp b/src/dvdwizard.cpp index a4543972..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")); @@ -116,6 +117,7 @@ DvdWizard::DvdWizard(const QString &url, const QString &profile, QWidget *parent DvdWizard::~DvdWizard() { m_authorFile.remove(); + m_menuFile.remove(); blockSignals(true); delete m_burnMenu; if (m_dvdauthor) { @@ -152,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); @@ -182,9 +188,10 @@ void DvdWizard::generateDvd() //temp6.setAutoRemove(false); temp6.open(); - KTemporaryFile menuFile; - menuFile.setSuffix(".mpg"); - menuFile.open(); + m_menuFile.close(); + m_menuFile.setSuffix(".mpg"); + m_menuFile.setAutoRemove(false); + m_menuFile.open(); m_authorFile.close(); m_authorFile.setSuffix(".xml"); @@ -192,6 +199,7 @@ void DvdWizard::generateDvd() m_authorFile.open(); QListWidgetItem *images = m_status.job_progress->item(0); + m_status.job_progress->setCurrentRow(0); images->setIcon(KIcon("system-run")); qApp->processEvents(); QMap buttons = m_pageMenu->buttonsInfo(); @@ -211,13 +219,14 @@ void DvdWizard::generateDvd() if (!m_pageMenu->menuMovie()) { // create menu vob file QListWidgetItem *vobitem = m_status.job_progress->item(1); + m_status.job_progress->setCurrentRow(1); vobitem->setIcon(KIcon("system-run")); qApp->processEvents(); QStringList args; args.append("-profile"); if (m_pageMenu->isPalMenu()) args.append("dv_pal"); - else args.append("dv_ntsc"); + else args.append("dv_ntsc"); args.append(temp4.fileName()); args.append("in=0"); args.append("out=100"); @@ -245,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); @@ -258,6 +267,7 @@ void DvdWizard::generateDvd() // create xml spumux file QListWidgetItem *spuitem = m_status.job_progress->item(2); + m_status.job_progress->setCurrentRow(2); spuitem->setIcon(KIcon("system-run")); qApp->processEvents(); QDomDocument doc; @@ -310,13 +320,13 @@ void DvdWizard::generateDvd() QStringList args; args.append(temp6.fileName()); - kDebug() << "SPM ARGS: " << args << temp5.fileName() << menuFile.fileName(); + kDebug() << "SPM ARGS: " << args << temp5.fileName() << m_menuFile.fileName(); QProcess spumux; if (m_pageMenu->menuMovie()) spumux.setStandardInputFile(m_pageMenu->menuMoviePath()); else spumux.setStandardInputFile(temp5.fileName()); - spumux.setStandardOutputFile(menuFile.fileName()); + spumux.setStandardOutputFile(m_menuFile.fileName()); spumux.start("spumux", args); if (spumux.waitForFinished()) { m_status.error_log->append(spumux.readAllStandardError()); @@ -325,24 +335,33 @@ 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; } } 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; } spuitem->setIcon(KIcon("dialog-ok")); - kDebug() << "/// DONE: " << menuFile.fileName(); + kDebug() << "/// DONE: " << m_menuFile.fileName(); } // create dvdauthor xml QListWidgetItem *authitem = m_status.job_progress->item(3); + m_status.job_progress->setCurrentRow(3); authitem->setIcon(KIcon("system-run")); qApp->processEvents(); KIO::NetAccess::mkdir(KUrl(m_status.tmp_folder->url().path(KUrl::AddTrailingSlash) + "DVD"), this); @@ -392,9 +411,16 @@ void DvdWizard::generateDvd() pgc.appendChild(button); } QDomElement menuvob = dvddoc.createElement("vob"); - menuvob.setAttribute("file", menuFile.fileName()); - menuvob.setAttribute("pause", "inf"); + menuvob.setAttribute("file", m_menuFile.fileName()); pgc.appendChild(menuvob); + + if (m_pageMenu->loopMovie()) { + QDomElement menuloop = dvddoc.createElement("post"); + nametext = dvddoc.createTextNode("jump titleset 1 menu;"); + menuloop.appendChild(nametext); + pgc.appendChild(menuloop); + } else menuvob.setAttribute("pause", "inf"); + } QDomElement titles = dvddoc.createElement("titles"); @@ -479,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(); @@ -505,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); @@ -529,6 +561,7 @@ void DvdWizard::slotRenderFinished(int exitCode, QProcess::ExitStatus status) connect(m_mkiso, SIGNAL(readyReadStandardOutput()), this, SLOT(slotShowIsoInfo())); m_mkiso->setProcessChannelMode(QProcess::MergedChannels); QListWidgetItem *isoitem = m_status.job_progress->item(4); + m_status.job_progress->setCurrentRow(4); isoitem->setIcon(KIcon("system-run")); if (!KStandardDirs::findExe("genisoimage").isEmpty()) m_mkiso->start("genisoimage", args); else m_mkiso->start("mkisofs", args); @@ -553,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; @@ -579,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; @@ -632,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()));