From e1bffab406129835d3bb0affe16dcd845293152d Mon Sep 17 00:00:00 2001 From: Jean-Baptiste Mardelle Date: Fri, 26 Mar 2010 11:15:48 +0000 Subject: [PATCH] If DVD creation failed, display the content of the Spumux and Dvdauthor project files for easier debugging svn path=/trunk/kdenlive/; revision=4356 --- src/dvdwizard.cpp | 25 +++- src/widgets/dvdwizardstatus_ui.ui | 224 ++++++++++++++++-------------- 2 files changed, 147 insertions(+), 102 deletions(-) diff --git a/src/dvdwizard.cpp b/src/dvdwizard.cpp index e087e520..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); @@ -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; @@ -340,6 +348,9 @@ void DvdWizard::generateDvd() 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; } @@ -495,10 +506,13 @@ void DvdWizard::slotRenderFinished(int exitCode, QProcess::ExitStatus status) if (status == QProcess::CrashExit || exitCode != 0) { QString result(m_dvdauthor->readAllStandardError()); result.append("
"); - result.append(i18n("DVDAuthor process crashed.")); + 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; diff --git a/src/widgets/dvdwizardstatus_ui.ui b/src/widgets/dvdwizardstatus_ui.ui index 0d989968..4028a6c6 100644 --- a/src/widgets/dvdwizardstatus_ui.ui +++ b/src/widgets/dvdwizardstatus_ui.ui @@ -6,12 +6,32 @@ 0 0 - 440 - 344 + 333 + 313 - + + + + Temporary data folder + + + + + + + + + + DVD ISO image + + + + + + + false @@ -46,74 +66,6 @@ - - - - - 0 - 0 - - - - - - - - - - Status - - - - - - - Qt::Horizontal - - - - 116 - 20 - - - - - - - - false - - - Preview - - - - - - - Burn - - - QToolButton::InstantPopup - - - - - - - - 0 - 0 - - - - true - - - - - - @@ -121,6 +73,16 @@ + + + + false + + + Abort + + + @@ -134,36 +96,95 @@ - - - - false - - - Abort - - - - - - - Temporary data folder - - - - - - - - - - DVD ISO image + + + + 0 + + + Log + + + + + + Status + + + + + + + Qt::Horizontal + + + + 116 + 20 + + + + + + + + false + + + Preview + + + + + + + Burn + + + QToolButton::InstantPopup + + + + + + + true + + + + + + + + Menu File + + + + + + true + + + + + + + + Dvdauthor File + + + + + + true + + + + + - - - @@ -173,9 +194,10 @@
kurlrequester.h
- KTextEdit - QTextEdit -
ktextedit.h
+ KTabWidget + QTabWidget +
ktabwidget.h
+ 1 -- 2.39.2