* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
***************************************************************************/
-#include <QLabel>
-#include <QFile>
-#include <QXmlStreamWriter>
-#include <QApplication>
-#include <QTimer>
-#include <QGraphicsView>
-#include <QDomDocument>
+
+#include "dvdwizard.h"
+#include "kdenlivesettings.h"
+#include "profilesdialog.h"
#include <KStandardDirs>
#include <KLocale>
#include <KIO/NetAccess>
#include <KMessageBox>
-#include "kdenlivesettings.h"
-#include "profilesdialog.h"
-#include "dvdwizard.h"
+#include <QFile>
+#include <QApplication>
+#include <QTimer>
+#include <QDomDocument>
+
-DvdWizard::DvdWizard(const QString &url, const QString &profile, QWidget *parent): QWizard(parent), m_profile(profile) {
+DvdWizard::DvdWizard(const QString &url, const QString &profile, QWidget *parent): QWizard(parent), m_profile(profile), m_dvdauthor(NULL), m_mkiso(NULL) {
//setPixmap(QWizard::WatermarkPixmap, QPixmap(KStandardDirs::locate("appdata", "banner.png")));
setAttribute(Qt::WA_DeleteOnClose);
m_pageVob = new DvdWizardVob(this);
- m_pageVob->setTitle(i18n("Select Files For Your Dvd"));
+ m_pageVob->setTitle(i18n("Select Files For Your DVD"));
addPage(m_pageVob);
if (!url.isEmpty()) m_pageVob->setUrl(url);
m_pageMenu = new DvdWizardMenu(m_profile, this);
- m_pageMenu->setTitle(i18n("Create Dvd Menu"));
+ m_pageMenu->setTitle(i18n("Create DVD Menu"));
addPage(m_pageMenu);
QWizardPage *page3 = new QWizardPage;
- page3->setTitle(i18n("Dvd Image"));
+ page3->setTitle(i18n("DVD Image"));
m_iso.setupUi(page3);
m_iso.tmp_folder->setPath(KdenliveSettings::currenttmpfolder());
m_iso.iso_image->setPath(QDir::homePath() + "/untitled.iso");
addPage(page3);
QWizardPage *page4 = new QWizardPage;
- page4->setTitle(i18n("Creating Dvd Image"));
+ page4->setTitle(i18n("Creating DVD Image"));
m_status.setupUi(page4);
+ m_status.error_box->setHidden(true);
addPage(page4);
connect(this, SIGNAL(currentIdChanged(int)), this, SLOT(slotPageChanged(int)));
DvdWizard::~DvdWizard() {
// m_menuFile.remove();
+ if (m_dvdauthor) {
+ m_dvdauthor->close();
+ delete m_dvdauthor;
+ }
+ if (m_mkiso) {
+ m_mkiso->close();
+ delete m_mkiso;
+ }
}
} else if (page == 2) {
m_pageMenu->buttonsInfo();
} else if (page == 3) {
- KIO::NetAccess::del(KUrl(m_iso.tmp_folder->url().path() + "/DVD"), this);
- QTimer::singleShot(300, this, SLOT(generateDvd()));
+ // clear job icons
+ for (int i = 0; i < m_status.job_progress->count(); i++)
+ m_status.job_progress->item(i)->setIcon(KIcon());
+ QString warnMessage;
+ if (KIO::NetAccess::exists(KUrl(m_iso.tmp_folder->url().path() + "/DVD"), KIO::NetAccess::SourceSide, this))
+ warnMessage.append(i18n("Folder %1 already exists. Overwrite ?" + '\n', m_iso.tmp_folder->url().path() + "/DVD"));
+ if (KIO::NetAccess::exists(KUrl(m_iso.iso_image->url().path()), KIO::NetAccess::SourceSide, this))
+ warnMessage.append(i18n("Image file %1 already exists. Overwrite ?", m_iso.iso_image->url().path()));
+
+ if (!warnMessage.isEmpty() && KMessageBox::questionYesNo(this, warnMessage) == KMessageBox::No) {
+ back();
+ } else {
+ KIO::NetAccess::del(KUrl(m_iso.tmp_folder->url().path() + "/DVD"), this);
+ QTimer::singleShot(300, this, SLOT(generateDvd()));
+ }
}
}
if (renderbg.waitForFinished()) {
if (renderbg.exitStatus() == QProcess::CrashExit) {
kDebug() << "/// RENDERING MENU vob crashed";
+ QByteArray result = renderbg.readAllStandardError();
vobitem->setIcon(KIcon("dialog-close"));
+ m_status.error_log->setText(result);
+ m_status.error_box->setHidden(false);
return;
}
} else {
kDebug() << "/// RENDERING MENU vob timed out";
vobitem->setIcon(KIcon("dialog-close"));
+ m_status.error_log->setText(i18n("Rendering job timed out"));
+ m_status.error_box->setHidden(false);
return;
}
vobitem->setIcon(KIcon("dialog-ok"));
while (it.hasNext()) {
it.next();
QDomElement but = doc.createElement("button");
- but.setAttribute("name", "b" + QString::number(i));
- if (i < max) but.setAttribute("down", "b" + QString::number(i + 1));
+ but.setAttribute("name", 'b' + QString::number(i));
+ if (i < max) but.setAttribute("down", 'b' + QString::number(i + 1));
else but.setAttribute("down", "b0");
- if (i > 0) but.setAttribute("up", "b" + QString::number(i - 1));
- else but.setAttribute("up", "b" + QString::number(max));
+ if (i > 0) but.setAttribute("up", 'b' + QString::number(i - 1));
+ else but.setAttribute("up", 'b' + QString::number(max));
QRect r = it.value();
int target = it.key();
// TODO: solve play all button
if (spumux.waitForFinished()) {
kDebug() << QString(spumux.readAll()).simplified();
if (spumux.exitStatus() == QProcess::CrashExit) {
- kDebug() << "/// RENDERING SPUMUX MENU crashed";
+ QByteArray result = spumux.readAllStandardError();
spuitem->setIcon(KIcon("dialog-close"));
+ m_status.error_log->setText(result);
+ m_status.error_box->setHidden(false);
+ kDebug() << "/// RENDERING SPUMUX MENU crashed";
return;
}
} else {
kDebug() << "/// RENDERING SPUMUX MENU timed out";
spuitem->setIcon(KIcon("dialog-close"));
+ m_status.error_log->setText(i18n("Menu job timed out"));
+ m_status.error_box->setHidden(false);
return;
}
menus.appendChild(pgc);
for (int i = 0; i < buttons.count(); i++) {
QDomElement button = dvddoc.createElement("button");
- button.setAttribute("name", "b" + QString::number(i));
- QDomText nametext = dvddoc.createTextNode("jump title " + buttonsTarget.at(i) + ";");
+ button.setAttribute("name", 'b' + QString::number(i));
+ QDomText nametext = dvddoc.createTextNode("jump title " + buttonsTarget.at(i) + ';');
button.appendChild(nametext);
pgc.appendChild(button);
}
out << dvddoc.toString();
}
data2.close();
-
+ /*kDebug() << "------------------";
+ kDebug() << dvddoc.toString();
+ kDebug() << "------------------";*/
QStringList args;
args << "-x" << m_authorFile.fileName();
kDebug() << "// DVDAUTH ARGS: " << args;
- QProcess *dvdauth = new QProcess(this);
- connect(dvdauth, SIGNAL(finished(int , QProcess::ExitStatus)), this, SLOT(slotRenderFinished(int, QProcess::ExitStatus)));
- dvdauth->setProcessChannelMode(QProcess::MergedChannels);
- dvdauth->start("dvdauthor", args);
+ if (m_dvdauthor) {
+ m_dvdauthor->close();
+ delete m_dvdauthor;
+ m_dvdauthor = NULL;
+ }
+ m_creationLog.clear();
+ m_dvdauthor = new QProcess(this);
+ connect(m_dvdauthor, SIGNAL(finished(int , QProcess::ExitStatus)), this, SLOT(slotRenderFinished(int, QProcess::ExitStatus)));
+ m_dvdauthor->setProcessChannelMode(QProcess::MergedChannels);
+ m_dvdauthor->start("dvdauthor", args);
}
-void DvdWizard::slotRenderFinished(int exitCode, QProcess::ExitStatus status) {
+void DvdWizard::slotRenderFinished(int /*exitCode*/, QProcess::ExitStatus status) {
QListWidgetItem *authitem = m_status.job_progress->item(3);
if (status == QProcess::CrashExit) {
+ QByteArray result = m_dvdauthor->readAllStandardError();
+ m_status.error_log->setText(result);
+ m_status.error_box->setHidden(false);
+ kDebug() << "DVDAuthor process crashed";
+ authitem->setIcon(KIcon("dialog-close"));
+ m_dvdauthor->close();
+ delete m_dvdauthor;
+ m_dvdauthor = NULL;
+ cleanup();
+ return;
+ }
+ m_creationLog.append(m_dvdauthor->readAllStandardError());
+ m_dvdauthor->close();
+ delete m_dvdauthor;
+ m_dvdauthor = NULL;
+
+ // Check if DVD structure has the necessary infos
+ if (!QFile::exists(m_iso.tmp_folder->url().path() + "/DVD/VIDEO_TS/VIDEO_TS.IFO")) {
+ m_status.error_log->setText(m_creationLog + '\n' + i18n("DVD structure broken"));
+ m_status.error_box->setHidden(false);
kDebug() << "DVDAuthor process crashed";
authitem->setIcon(KIcon("dialog-close"));
+ cleanup();
return;
}
authitem->setIcon(KIcon("dialog-ok"));
qApp->processEvents();
QStringList args;
args << "-dvd-video" << "-v" << "-o" << m_iso.iso_image->url().path() << m_iso.tmp_folder->url().path() + "/DVD";
- QProcess *mkiso = new QProcess(this);
- connect(mkiso, SIGNAL(finished(int , QProcess::ExitStatus)), this, SLOT(slotIsoFinished(int, QProcess::ExitStatus)));
- mkiso->setProcessChannelMode(QProcess::MergedChannels);
+
+ if (m_mkiso) {
+ m_mkiso->close();
+ delete m_mkiso;
+ m_mkiso = NULL;
+ }
+ m_mkiso = new QProcess(this);
+ connect(m_mkiso, SIGNAL(finished(int , QProcess::ExitStatus)), this, SLOT(slotIsoFinished(int, QProcess::ExitStatus)));
+ m_mkiso->setProcessChannelMode(QProcess::MergedChannels);
QListWidgetItem *isoitem = m_status.job_progress->item(4);
isoitem->setIcon(KIcon("system-run"));
- mkiso->start("mkisofs", args);
+ m_mkiso->start("mkisofs", args);
}
-void DvdWizard::slotIsoFinished(int exitCode, QProcess::ExitStatus status) {
+void DvdWizard::slotIsoFinished(int /*exitCode*/, QProcess::ExitStatus status) {
QListWidgetItem *isoitem = m_status.job_progress->item(4);
if (status == QProcess::CrashExit) {
- //m_authorFile.remove();
- //m_menuFile.remove();
- KIO::NetAccess::del(KUrl(m_iso.tmp_folder->url().path() + "/DVD"), this);
+ QByteArray result = m_mkiso->readAllStandardError();
+ m_status.error_log->setText(result);
+ m_status.error_box->setHidden(false);
+ m_mkiso->close();
+ delete m_mkiso;
+ m_mkiso = NULL;
+ cleanup();
kDebug() << "Iso process crashed";
isoitem->setIcon(KIcon("dialog-close"));
return;
}
+
+ m_creationLog.append(m_mkiso->readAllStandardError());
+ delete m_mkiso;
+ m_mkiso = NULL;
+
+ // Check if DVD iso is ok
+ QFile iso(m_iso.iso_image->url().path());
+ if (!iso.exists() || iso.size() == 0) {
+ if (iso.exists()) {
+ KIO::NetAccess::del(m_iso.iso_image->url(), this);
+ }
+ m_status.error_log->setText(m_creationLog + '\n' + i18n("DVD ISO is broken"));
+ m_status.error_box->setHidden(false);
+ isoitem->setIcon(KIcon("dialog-close"));
+ cleanup();
+ return;
+ }
+
isoitem->setIcon(KIcon("dialog-ok"));
kDebug() << "ISO IMAGE " << m_iso.iso_image->url().path() << " Successfully created";
- //m_authorFile.remove();
- //m_menuFile.remove();
- KIO::NetAccess::del(KUrl(m_iso.tmp_folder->url().path() + "/DVD"), this);
- KMessageBox::information(this, i18n("Dvd iso image %1 successfully created.", m_iso.iso_image->url().path()));
+ cleanup();
+ kDebug() << m_creationLog;
+ KMessageBox::information(this, i18n("DVD ISO image %1 successfully created.", m_iso.iso_image->url().path()));
}
+void DvdWizard::cleanup() {
+ m_authorFile.remove();
+ m_menuFile.remove();
+ KIO::NetAccess::del(KUrl(m_iso.tmp_folder->url().path() + "/DVD"), this);
+}
+
projects / kdenlive / blobdiff