#include <QTimer>
#include <QDomDocument>
#include <QMenu>
+#include <QGridLayout>
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"));
m_status.iso_image->setMode(KFile::File);
m_status.iso_image->fileDialog()->setOperationMode(KFileDialog::Saving);
+#if KDE_IS_VERSION(4,7,0)
+ m_isoMessage = new KMessageWidget;
+ QGridLayout *s = static_cast <QGridLayout*> (page4->layout());
+ s->addWidget(m_isoMessage, 5, 0, 1, -1);
+ m_isoMessage->hide();
+#endif
+
addPage(page4);
connect(this, SIGNAL(currentIdChanged(int)), this, SLOT(slotPageChanged(int)));
{
m_authorFile.remove();
m_menuFile.remove();
+ m_menuVobFile.remove();
blockSignals(true);
delete m_burnMenu;
if (m_dvdauthor) {
m_pageChapters->setVobFiles(m_pageVob->isPal(), m_pageVob->isWide(), m_pageVob->selectedUrls(), m_pageVob->durations(), m_pageVob->chapters());
} else if (page == 2) {
m_pageChapters->stopMonitor();
+ m_pageVob->updateChapters(m_pageChapters->chaptersData());
m_pageMenu->setTargets(m_pageChapters->selectedTitles(), m_pageChapters->selectedTargets());
m_pageMenu->changeProfile(m_pageVob->isPal());
}
void DvdWizard::generateDvd()
{
+#if KDE_IS_VERSION(4,7,0)
+ m_isoMessage->animatedHide();
+#endif
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);
//temp5.setAutoRemove(false);
temp5.open();
- KTemporaryFile temp6;
- temp6.setSuffix(".xml");
- //temp6.setAutoRemove(false);
- temp6.open();
-
m_menuFile.close();
- m_menuFile.setSuffix(".mpg");
+ m_menuFile.setSuffix(".xml");
m_menuFile.setAutoRemove(false);
m_menuFile.open();
+ m_menuVobFile.close();
+ m_menuVobFile.setSuffix(".mpg");
+ m_menuVobFile.setAutoRemove(false);
+ m_menuVobFile.open();
+
m_authorFile.close();
m_authorFile.setSuffix(".xml");
m_authorFile.setAutoRemove(false);
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 <QString, QRect> buttons = m_pageMenu->buttonsInfo();
if (m_pageMenu->createMenu()) {
m_pageMenu->createButtonImages(temp1.fileName(), temp2.fileName(), temp3.fileName());
- m_pageMenu->createBackgroundImage(temp4.fileName());
+ m_pageMenu->createBackgroundImage(temp1.fileName(), temp4.fileName());
images->setIcon(KIcon("dialog-ok"));
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");
args << "-consumer" << "avformat:" + temp5.fileName();
if (m_pageMenu->isPalMenu()) {
- args << "f=dvd" << "vcodec=mpeg2video" << "acodec=ac3" << "b=5000k" << "maxrate=8000k" << "minrate=0" << "bufsize=1835008" << "mux_packet_s=2048" << "mux_rate=10080000" << "ab=192k" << "ar=48000" << "s=720x576" << "g=15" << "me_range=63" << "trellis=1" << "profile=dv_pal";
+ args << "f=dvd" << "acodec=ac3" << "ab=192k" << "ar=48000" << "vcodec=mpeg2video" << "vb=5000k" << "maxrate=8000k" << "minrate=0" << "bufsize=1835008" << "mux_packet_s=2048" << "mux_rate=10080000" << "s=720x576" << "g=15" << "me_range=63" << "trellis=1";
} else {
- args << "f=dvd" << "vcodec=mpeg2video" << "acodec=ac3" << "b=6000k" << "maxrate=9000k" << "minrate=0" << "bufsize=1835008" << "mux_packet_s=2048" << "mux_rate=10080000" << "ab=192k" << "ar=48000" << "s=720x480" << "g=18" << "me_range=63" << "trellis=1" << "profile=dv_ntsc";
+ args << "f=dvd" << "acodec=ac3" << "ab=192k" << "ar=48000" << "vcodec=mpeg2video" << "vb=6000k" << "maxrate=9000k" << "minrate=0" << "bufsize=1835008" << "mux_packet_s=2048" << "mux_rate=10080000" << "s=720x480" << "g=18" << "me_range=63" << "trellis=1";
}
kDebug() << "MLT ARGS: " << args;
if (renderbg.waitForFinished()) {
if (renderbg.exitStatus() == QProcess::CrashExit) {
kDebug() << "/// RENDERING MENU vob crashed";
+ errorMessage(i18n("Rendering menu crashed"));
QByteArray result = renderbg.readAllStandardError();
vobitem->setIcon(KIcon("dialog-close"));
m_status.error_log->append(result);
}
} else {
kDebug() << "/// RENDERING MENU vob timed out";
+ errorMessage(i18n("Rendering job timed out"));
vobitem->setIcon(KIcon("dialog-close"));
- m_status.error_log->append("<a name=\"result\" /><br><strong>" + i18n("Rendering job timed out"));
+ m_status.error_log->append("<a name=\"result\" /><br /><strong>" + i18n("Rendering job timed out"));
m_status.error_log->scrollToAnchor("result");
m_status.error_box->setHidden(false);
m_status.button_start->setEnabled(true);
// 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;
spu.setAttribute("force", "yes");
spu.setAttribute("start", "00:00:00.00");
spu.setAttribute("image", temp1.fileName());
- spu.setAttribute("select", temp2.fileName());
+ spu.setAttribute("select", temp2.fileName());
spu.setAttribute("highlight", temp3.fileName());
- /*spu.setAttribute("autooutline", "infer");
- spu.setAttribute("outlinewidth", "12");
- spu.setAttribute("autoorder", "rows");*/
+ /*spu.setAttribute("autoorder", "rows");*/
int max = buttons.count() - 1;
int i = 0;
//int target = it.key();
// TODO: solve play all button
//if (target == 0) target = 1;
+
+ // We need to make sure that the y coordinate is a multiple of 2, otherwise button may not be displayed
buttonsTarget.append(it.key());
+ int y0 = r.y() - 2;
+ if (y0 % 2 == 1) y0++;
+ int y1 = r.bottom() + 2;
+ if (y1 % 2 == 1) y1++;
but.setAttribute("x0", QString::number(r.x()));
- but.setAttribute("y0", QString::number(r.y()));
+ but.setAttribute("y0", QString::number(y0));
but.setAttribute("x1", QString::number(r.right()));
- but.setAttribute("y1", QString::number(r.bottom()));
+ but.setAttribute("y1", QString::number(y1));
spu.appendChild(but);
i++;
}
- QFile data(temp6.fileName());
+ QFile data(m_menuFile.fileName());
if (data.open(QFile::WriteOnly)) {
data.write(doc.toString().toUtf8());
}
kDebug() << " SPUMUX DATA: " << doc.toString();
QStringList args;
- args.append(temp6.fileName());
- kDebug() << "SPM ARGS: " << args << temp5.fileName() << m_menuFile.fileName();
+ args.append(m_menuFile.fileName());
+ kDebug() << "SPM ARGS: " << args << temp5.fileName() << m_menuVobFile.fileName();
QProcess spumux;
+#if QT_VERSION >= 0x040600
+ QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+ env.insert("VIDEO_FORMAT", m_pageVob->isPal() ? "PAL" : "NTSC");
+ spumux.setProcessEnvironment(env);
+#else
+ QStringList env = QProcess::systemEnvironment();
+ env << QString("VIDEO_FORMAT=") + QString(m_pageVob->isPal() ? "PAL" : "NTSC");
+ spumux.setEnvironment(env);
+#endif
+
if (m_pageMenu->menuMovie()) spumux.setStandardInputFile(m_pageMenu->menuMoviePath());
else spumux.setStandardInputFile(temp5.fileName());
- spumux.setStandardOutputFile(m_menuFile.fileName());
+ spumux.setStandardOutputFile(m_menuVobFile.fileName());
spumux.start("spumux", args);
if (spumux.waitForFinished()) {
m_status.error_log->append(spumux.readAllStandardError());
if (spumux.exitStatus() == QProcess::CrashExit) {
+ //TODO: inform user via messagewidget after string freeze
QByteArray result = spumux.readAllStandardError();
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";
+ errorMessage(i18n("Rendering job timed out"));
spuitem->setIcon(KIcon("dialog-close"));
- m_status.error_log->append("<a name=\"result\" /><br><strong>" + i18n("Menu job timed out"));
+ 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;
}
spuitem->setIcon(KIcon("dialog-ok"));
- kDebug() << "/// DONE: " << m_menuFile.fileName();
+ kDebug() << "/// DONE: " << m_menuVobFile.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);
pgc.appendChild(pre);
QDomText nametext = dvddoc.createTextNode("{g1 = 0;}");
pre.appendChild(nametext);
+ QDomElement menuvob = dvddoc.createElement("vob");
+ menuvob.setAttribute("file", m_menuVobFile.fileName());
+ pgc.appendChild(menuvob);
for (int i = 0; i < buttons.count(); i++) {
QDomElement button = dvddoc.createElement("button");
button.setAttribute("name", 'b' + QString::number(i));
button.appendChild(nametext);
pgc.appendChild(button);
}
- QDomElement menuvob = dvddoc.createElement("vob");
- menuvob.setAttribute("file", m_menuFile.fileName());
- menuvob.setAttribute("pause", "inf");
- 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");
QDomText call;
if (i == voburls.count() - 1) call = dvddoc.createTextNode("{g1 = 0; call menu;}");
else {
- call = dvddoc.createTextNode("{if ( g1 eq 999 ) { call menu; } jump title " + QString::number(i + 2) + ";}");
+ call = dvddoc.createTextNode("{if ( g1 eq 999 ) { call menu; } jump title " + QString::number(i + 2).rightJustified(2, '0') + ";}");
}
post.appendChild(call);
pgc2.appendChild(post);
}
m_creationLog.clear();
m_dvdauthor = new QProcess(this);
+ // Set VIDEO_FORMAT variable (required by dvdauthor 0.7)
+#if QT_VERSION >= 0x040600
+ QProcessEnvironment env = QProcessEnvironment::systemEnvironment();
+ env.insert("VIDEO_FORMAT", m_pageVob->isPal() ? "PAL" : "NTSC");
+ m_dvdauthor->setProcessEnvironment(env);
+#else
+ QStringList env = QProcess::systemEnvironment();
+ env << QString("VIDEO_FORMAT=") + QString(m_pageVob->isPal() ? "PAL" : "NTSC");
+ m_dvdauthor->setEnvironment(env);
+#endif
connect(m_dvdauthor, SIGNAL(finished(int , QProcess::ExitStatus)), this, SLOT(slotRenderFinished(int, QProcess::ExitStatus)));
connect(m_dvdauthor, SIGNAL(readyReadStandardOutput()), this, SLOT(slotShowRenderInfo()));
m_dvdauthor->setProcessChannelMode(QProcess::MergedChannels);
m_status.error_box->setHidden(false);
}
+void DvdWizard::errorMessage(const QString &text) {
+#if KDE_IS_VERSION(4,7,0)
+ m_isoMessage->setText(text);
+ m_isoMessage->setMessageType(KMessageWidget::Error);
+ m_isoMessage->animatedShow();
+#endif
+}
+
+void DvdWizard::infoMessage(const QString &text) {
+#if KDE_IS_VERSION(4,7,0)
+ m_isoMessage->setText(text);
+ m_isoMessage->setMessageType(KMessageWidget::Positive);
+ m_isoMessage->animatedShow();
+#endif
+}
+
void DvdWizard::slotRenderFinished(int exitCode, QProcess::ExitStatus status)
{
QListWidgetItem *authitem = m_status.job_progress->item(3);
if (status == QProcess::CrashExit || exitCode != 0) {
+ errorMessage(i18n("DVDAuthor process crashed"));
QString result(m_dvdauthor->readAllStandardError());
- result.append("<a name=\"result\" /><br><strong>");
- result.append(i18n("DVDAuthor process crashed."));
+ result.append("<a name=\"result\" /><br /><strong>");
+ 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();
// Check if DVD structure has the necessary infos
if (!QFile::exists(m_status.tmp_folder->url().path() + "/DVD/VIDEO_TS/VIDEO_TS.IFO")) {
+ errorMessage(i18n("DVD structure broken"));
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);
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);
button(QWizard::FinishButton)->setEnabled(true);
QListWidgetItem *isoitem = m_status.job_progress->item(4);
if (status == QProcess::CrashExit || exitCode != 0) {
+ errorMessage(i18n("ISO creation process crashed."));
QString result(m_mkiso->readAllStandardError());
result.append("<a name=\"result\" /><br /><strong>");
result.append(i18n("ISO creation 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());
m_mkiso->close();
delete m_mkiso;
m_mkiso = NULL;
if (iso.exists()) {
KIO::NetAccess::del(m_status.iso_image->url(), this);
}
+ errorMessage(i18n("DVD ISO is broken"));
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;
kDebug() << "ISO IMAGE " << m_status.iso_image->url().path() << " Successfully created";
cleanup();
kDebug() << m_creationLog;
+ infoMessage(i18n("DVD ISO image %1 successfully created.", m_status.iso_image->url().path()));
m_status.error_log->append("<a name=\"result\" /><strong>" + i18n("DVD ISO image %1 successfully created.", m_status.iso_image->url().path()) + "</strong>");
m_status.error_log->scrollToAnchor("result");
void DvdWizard::slotPreview()
{
- QString programName("xine");
- QString exec = KStandardDirs::findExe(programName);
- if (exec.isEmpty()) KMessageBox::sorry(this, i18n("You need program <b>%1</b> to perform this action", programName));
+ QStringList programNames;
+ programNames << "xine" << "vlc";
+ QString exec;
+ foreach(const QString &prog, programNames) {
+ exec = KStandardDirs::findExe(prog);
+ if (!exec.isEmpty()) {
+ break;
+ }
+ }
+ if (exec.isEmpty()) {
+ KMessageBox::sorry(this, i18n("Previewing requires one of these applications (%1)", programNames.join(",")));
+ }
else QProcess::startDetached(exec, QStringList() << "dvd://" + m_status.iso_image->url().path());
}
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()));
projects / kdenlive / blobdiff