From: <j-...@us...> - 2010-03-26 11:15:59
|
Revision: 4356 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=4356&view=rev Author: j-b-m Date: 2010-03-26 11:15:48 +0000 (Fri, 26 Mar 2010) Log Message: ----------- If DVD creation failed, display the content of the Spumux and Dvdauthor project files for easier debugging Modified Paths: -------------- trunk/kdenlive/src/dvdwizard.cpp trunk/kdenlive/src/widgets/dvdwizardstatus_ui.ui Modified: trunk/kdenlive/src/dvdwizard.cpp =================================================================== --- trunk/kdenlive/src/dvdwizard.cpp 2010-03-24 09:50:39 UTC (rev 4355) +++ trunk/kdenlive/src/dvdwizard.cpp 2010-03-26 11:15:48 UTC (rev 4356) @@ -66,6 +66,7 @@ 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::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 @@ 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 @@ m_status.error_log->append("<a name=\"result\" /><br /><strong>" + 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 @@ if (status == QProcess::CrashExit || exitCode != 0) { QString result(m_dvdauthor->readAllStandardError()); result.append("<a name=\"result\" /><br /><strong>"); - result.append(i18n("DVDAuthor process crashed.")); + result.append(i18n("DVDAuthor process crashed.</strong><br />")); 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 @@ m_status.error_log->append(m_creationLog + "<a name=\"result\" /><br /><strong>" + 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 @@ 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 @@ m_status.error_log->append(m_creationLog + "<br /><a name=\"result\" /><strong>" + i18n("DVD ISO is broken") + "</strong>"); 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; Modified: trunk/kdenlive/src/widgets/dvdwizardstatus_ui.ui =================================================================== --- trunk/kdenlive/src/widgets/dvdwizardstatus_ui.ui 2010-03-24 09:50:39 UTC (rev 4355) +++ trunk/kdenlive/src/widgets/dvdwizardstatus_ui.ui 2010-03-26 11:15:48 UTC (rev 4356) @@ -6,12 +6,32 @@ <rect> <x>0</x> <y>0</y> - <width>440</width> - <height>344</height> + <width>333</width> + <height>313</height> </rect> </property> <layout class="QGridLayout" name="gridLayout_2"> - <item row="2" column="0" colspan="4"> + <item row="0" column="0"> + <widget class="QLabel" name="label"> + <property name="text"> + <string>Temporary data folder</string> + </property> + </widget> + </item> + <item row="0" column="1" colspan="2"> + <widget class="KUrlRequester" name="tmp_folder"/> + </item> + <item row="1" column="0"> + <widget class="QLabel" name="label_2"> + <property name="text"> + <string>DVD ISO image</string> + </property> + </widget> + </item> + <item row="1" column="1" colspan="2"> + <widget class="KUrlRequester" name="iso_image"/> + </item> + <item row="2" column="0" colspan="3"> <widget class="QListWidget" name="job_progress"> <property name="enabled"> <bool>false</bool> @@ -46,74 +66,6 @@ </item> </widget> </item> - <item row="4" column="0" colspan="4"> - <widget class="QGroupBox" name="error_box"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Preferred" vsizetype="Maximum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="title"> - <string/> - </property> - <layout class="QGridLayout" name="gridLayout"> - <item row="0" column="0"> - <widget class="QLabel" name="label_7"> - <property name="text"> - <string>Status</string> - </property> - </widget> - </item> - <item row="0" column="1"> - <spacer name="horizontalSpacer"> - <property name="orientation"> - <enum>Qt::Horizontal</enum> - </property> - <property name="sizeHint" stdset="0"> - <size> - <width>116</width> - <height>20</height> - </size> - </property> - </spacer> - </item> - <item row="0" column="2"> - <widget class="QPushButton" name="button_preview"> - <property name="enabled"> - <bool>false</bool> - </property> - <property name="text"> - <string>Preview</string> - </property> - </widget> - </item> - <item row="0" column="3"> - <widget class="QToolButton" name="button_burn"> - <property name="text"> - <string>Burn</string> - </property> - <property name="popupMode"> - <enum>QToolButton::InstantPopup</enum> - </property> - </widget> - </item> - <item row="1" column="0" colspan="4"> - <widget class="KTextEdit" name="error_log"> - <property name="sizePolicy"> - <sizepolicy hsizetype="Expanding" vsizetype="Maximum"> - <horstretch>0</horstretch> - <verstretch>0</verstretch> - </sizepolicy> - </property> - <property name="readOnly"> - <bool>true</bool> - </property> - </widget> - </item> - </layout> - </widget> - </item> <item row="3" column="0"> <widget class="QPushButton" name="button_start"> <property name="text"> @@ -121,6 +73,16 @@ </property> </widget> </item> + <item row="3" column="1"> + <widget class="QPushButton" name="button_abort"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Abort</string> + </property> + </widget> + </item> <item row="3" column="2"> <spacer name="horizontalSpacer_2"> <property name="orientation"> @@ -134,36 +96,95 @@ </property> </spacer> </item> - <item row="3" column="1"> - <widget class="QPushButton" name="button_abort"> - <property name="enabled"> - <bool>false</bool> + <item row="4" column="0" colspan="3"> + <widget class="KTabWidget" name="error_box"> + <property name="currentIndex"> + <number>0</number> </property> - <property name="text"> - <string>Abort</string> - </property> + <widget class="QWidget" name="tab_2"> + <attribute name="title"> + <string>Log</string> + </attribute> + <layout class="QGridLayout" name="gridLayout"> + <item row="0" column="0"> + <widget class="QLabel" name="label_7"> + <property name="text"> + <string>Status</string> + </property> + </widget> + </item> + <item row="0" column="1"> + <spacer name="horizontalSpacer"> + <property name="orientation"> + <enum>Qt::Horizontal</enum> + </property> + <property name="sizeHint" stdset="0"> + <size> + <width>116</width> + <height>20</height> + </size> + </property> + </spacer> + </item> + <item row="0" column="2"> + <widget class="QPushButton" name="button_preview"> + <property name="enabled"> + <bool>false</bool> + </property> + <property name="text"> + <string>Preview</string> + </property> + </widget> + </item> + <item row="0" column="3"> + <widget class="QToolButton" name="button_burn"> + <property name="text"> + <string>Burn</string> + </property> + <property name="popupMode"> + <enum>QToolButton::InstantPopup</enum> + </property> + </widget> + </item> + <item row="1" column="0" colspan="4"> + <widget class="QTextEdit" name="error_log"> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + <widget class="QWidget" name="tab"> + <attribute name="title"> + <string>Menu File</string> + </attribute> + <layout class="QGridLayout" name="gridLayout_3"> + <item row="0" column="0"> + <widget class="QPlainTextEdit" name="menu_file"> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> + <widget class="QWidget" name="tab_3"> + <attribute name="title"> + <string>Dvdauthor File</string> + </attribute> + <layout class="QGridLayout" name="gridLayout_4"> + <item row="0" column="0"> + <widget class="QPlainTextEdit" name="dvd_file"> + <property name="readOnly"> + <bool>true</bool> + </property> + </widget> + </item> + </layout> + </widget> </widget> </item> - <item row="0" column="0"> - <widget class="QLabel" name="label"> - <property name="text"> - <string>Temporary data folder</string> - </property> - </widget> - </item> - <item row="0" column="1" colspan="2"> - <widget class="KUrlRequester" name="tmp_folder"/> - </item> - <item row="1" column="0"> - <widget class="QLabel" name="label_2"> - <property name="text"> - <string>DVD ISO image</string> - </property> - </widget> - </item> - <item row="1" column="1" colspan="2"> - <widget class="KUrlRequester" name="iso_image"/> - </item> </layout> </widget> <customwidgets> @@ -173,9 +194,10 @@ <header>kurlrequester.h</header> </customwidget> <customwidget> - <class>KTextEdit</class> - <extends>QTextEdit</extends> - <header>ktextedit.h</header> + <class>KTabWidget</class> + <extends>QTabWidget</extends> + <header>ktabwidget.h</header> + <container>1</container> </customwidget> </customwidgets> <resources/> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |