From: <j-...@us...> - 2009-03-11 20:42:37
|
Revision: 3139 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3139&view=rev Author: j-b-m Date: 2009-03-11 20:42:34 +0000 (Wed, 11 Mar 2009) Log Message: ----------- small fix from previous commit Modified Paths: -------------- trunk/kdenlive/src/dvdwizard.cpp Modified: trunk/kdenlive/src/dvdwizard.cpp =================================================================== --- trunk/kdenlive/src/dvdwizard.cpp 2009-03-11 20:41:33 UTC (rev 3138) +++ trunk/kdenlive/src/dvdwizard.cpp 2009-03-11 20:42:34 UTC (rev 3139) @@ -417,7 +417,7 @@ } -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(); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-05-11 20:31:02
|
Revision: 3374 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3374&view=rev Author: j-b-m Date: 2009-05-11 20:30:47 +0000 (Mon, 11 May 2009) Log Message: ----------- Use stored renderer path when we can Modified Paths: -------------- trunk/kdenlive/src/dvdwizard.cpp Modified: trunk/kdenlive/src/dvdwizard.cpp =================================================================== --- trunk/kdenlive/src/dvdwizard.cpp 2009-05-11 15:18:49 UTC (rev 3373) +++ trunk/kdenlive/src/dvdwizard.cpp 2009-05-11 20:30:47 UTC (rev 3374) @@ -191,7 +191,7 @@ kDebug() << "MLT ARGS: " << args; QProcess renderbg; - renderbg.start("inigo", args); + renderbg.start(KdenliveSettings::rendererpath(), args); if (renderbg.waitForFinished()) { if (renderbg.exitStatus() == QProcess::CrashExit) { kDebug() << "/// RENDERING MENU vob crashed"; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-05-14 10:58:13
|
Revision: 3384 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3384&view=rev Author: j-b-m Date: 2009-05-14 10:57:57 +0000 (Thu, 14 May 2009) Log Message: ----------- Compile fix (i18n argument) Modified Paths: -------------- trunk/kdenlive/src/dvdwizard.cpp Modified: trunk/kdenlive/src/dvdwizard.cpp =================================================================== --- trunk/kdenlive/src/dvdwizard.cpp 2009-05-13 09:55:59 UTC (rev 3383) +++ trunk/kdenlive/src/dvdwizard.cpp 2009-05-14 10:57:57 UTC (rev 3384) @@ -74,16 +74,18 @@ connect(m_status.button_preview, SIGNAL(clicked()), this, SLOT(slotPreview())); - QString exec = KStandardDirs::findExe("k3b"); + QString programName("k3b"); + QString exec = KStandardDirs::findExe(programName); if (!exec.isEmpty()) { //Add K3b action - QAction *k3b = m_burnMenu->addAction(KIcon("k3b"), i18n("Burn with %1", "K3b"), this, SLOT(slotBurn())); + QAction *k3b = m_burnMenu->addAction(KIcon(programName), i18n("Burn with %1", programName), this, SLOT(slotBurn())); k3b->setData(exec); } - exec = KStandardDirs::findExe("brasero"); + programName = "brasero"; + exec = KStandardDirs::findExe(programName); if (!exec.isEmpty()) { //Add Brasero action - QAction *brasero = m_burnMenu->addAction(KIcon("brasero"), i18n("Burn with %1", "Brasero"), this, SLOT(slotBurn())); + QAction *brasero = m_burnMenu->addAction(KIcon(programName), i18n("Burn with %1", programName), this, SLOT(slotBurn())); brasero->setData(exec); } if (m_burnMenu->isEmpty()) m_burnMenu->addAction(i18n("No burning program found (K3b, Brasero)")); @@ -565,8 +567,9 @@ void DvdWizard::slotPreview() { - QString exec = KStandardDirs::findExe("xine"); - if (exec.isEmpty()) KMessageBox::sorry(this, i18n("You need program <b>%1</b> to perform this action", "xine")); + 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)); else QProcess::startDetached(exec, QStringList() << "dvd://" + m_iso.iso_image->url().path()); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-05-18 23:01:41
|
Revision: 3395 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3395&view=rev Author: j-b-m Date: 2009-05-18 23:01:31 +0000 (Mon, 18 May 2009) Log Message: ----------- Fix crash when pressing cancel in DVD Wizard monitor http://www.kdenlive.org/mantis/view.php?id=833 Modified Paths: -------------- trunk/kdenlive/src/dvdwizard.cpp Modified: trunk/kdenlive/src/dvdwizard.cpp =================================================================== --- trunk/kdenlive/src/dvdwizard.cpp 2009-05-18 22:44:29 UTC (rev 3394) +++ trunk/kdenlive/src/dvdwizard.cpp 2009-05-18 23:01:31 UTC (rev 3395) @@ -109,10 +109,12 @@ // m_menuFile.remove(); delete m_burnMenu; if (m_dvdauthor) { + m_dvdauthor->blockSignals(true); m_dvdauthor->close(); delete m_dvdauthor; } if (m_mkiso) { + m_mkiso->blockSignals(true); m_mkiso->close(); delete m_mkiso; } @@ -438,6 +440,7 @@ args << "-x" << m_authorFile.fileName(); kDebug() << "// DVDAUTH ARGS: " << args; if (m_dvdauthor) { + m_dvdauthor->blockSignals(true); m_dvdauthor->close(); delete m_dvdauthor; m_dvdauthor = NULL; @@ -485,6 +488,7 @@ args << "-dvd-video" << "-v" << "-o" << m_iso.iso_image->url().path() << m_iso.tmp_folder->url().path() + "/DVD"; if (m_mkiso) { + m_mkiso->blockSignals(true); m_mkiso->close(); delete m_mkiso; m_mkiso = NULL; This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-05-25 21:48:32
|
Revision: 3421 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3421&view=rev Author: j-b-m Date: 2009-05-25 21:48:27 +0000 (Mon, 25 May 2009) Log Message: ----------- Fix url handling in DVD wizard: http://www.kdenlive.org/mantis/view.php?id=860 Modified Paths: -------------- trunk/kdenlive/src/dvdwizard.cpp Modified: trunk/kdenlive/src/dvdwizard.cpp =================================================================== --- trunk/kdenlive/src/dvdwizard.cpp 2009-05-25 21:39:59 UTC (rev 3420) +++ trunk/kdenlive/src/dvdwizard.cpp 2009-05-25 21:48:27 UTC (rev 3421) @@ -67,8 +67,10 @@ m_status.setupUi(page4); m_status.error_box->setHidden(true); m_status.tmp_folder->setPath(KdenliveSettings::currenttmpfolder()); + m_status.tmp_folder->setMode(KFile::Directory | KFile::ExistingOnly); m_status.iso_image->setPath(QDir::homePath() + "/untitled.iso"); m_status.iso_image->setFilter("*.iso"); + m_status.iso_image->setMode(KFile::File); m_status.iso_image->fileDialog()->setOperationMode(KFileDialog::Saving); addPage(page4); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-06-02 21:31:23
|
Revision: 3485 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3485&view=rev Author: j-b-m Date: 2009-06-02 21:31:21 +0000 (Tue, 02 Jun 2009) Log Message: ----------- Fix compilation against KDE 4.1.x Modified Paths: -------------- trunk/kdenlive/src/dvdwizard.cpp Modified: trunk/kdenlive/src/dvdwizard.cpp =================================================================== --- trunk/kdenlive/src/dvdwizard.cpp 2009-06-02 21:25:13 UTC (rev 3484) +++ trunk/kdenlive/src/dvdwizard.cpp 2009-06-02 21:31:21 UTC (rev 3485) @@ -658,8 +658,8 @@ if (m_pageVob->isWide()) profile.append("_wide"); dvdproject.setAttribute("profile", profile); - dvdproject.setAttribute("tmp_folder", m_status.tmp_folder->text()); - dvdproject.setAttribute("iso_image", m_status.iso_image->text()); + dvdproject.setAttribute("tmp_folder", m_status.tmp_folder->url().path()); + dvdproject.setAttribute("iso_image", m_status.iso_image->url().path()); dvdproject.setAttribute("intro_movie", m_pageVob->introMovie()); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-06-24 20:58:34
|
Revision: 3648 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3648&view=rev Author: j-b-m Date: 2009-06-24 20:58:27 +0000 (Wed, 24 Jun 2009) Log Message: ----------- Show full log if there is a problem with dvd creation Modified Paths: -------------- trunk/kdenlive/src/dvdwizard.cpp Modified: trunk/kdenlive/src/dvdwizard.cpp =================================================================== --- trunk/kdenlive/src/dvdwizard.cpp 2009-06-24 20:32:51 UTC (rev 3647) +++ trunk/kdenlive/src/dvdwizard.cpp 2009-06-24 20:58:27 UTC (rev 3648) @@ -103,9 +103,8 @@ m_status.button_burn->setToolButtonStyle(Qt::ToolButtonTextBesideIcon); m_status.button_preview->setIcon(KIcon("media-playback-start")); - // TODO: uncomment after 0.7.4 release (i18n change) - /*setButtonText(QWizard::CustomButton1, i19n("Load")); - setButtonText(QWizard::CustomButton2, i19n("Save"));*/ + setButtonText(QWizard::CustomButton1, i18n("Load")); + setButtonText(QWizard::CustomButton2, i18n("Save")); button(QWizard::CustomButton1)->setIcon(KIcon("document-open")); button(QWizard::CustomButton2)->setIcon(KIcon("document-save")); connect(button(QWizard::CustomButton1), SIGNAL(clicked()), this, SLOT(slotLoad())); @@ -196,6 +195,9 @@ qApp->processEvents(); QMap <QString, QRect> buttons = m_pageMenu->buttonsInfo(); QStringList buttonsTarget; + m_status.error_log->clear(); + // initialize html content + m_status.error_log->setText("<html></html>"); if (m_pageMenu->createMenu()) { m_pageMenu->createButtonImages(temp1.fileName(), temp2.fileName(), temp3.fileName()); @@ -233,14 +235,15 @@ kDebug() << "/// RENDERING MENU vob crashed"; QByteArray result = renderbg.readAllStandardError(); vobitem->setIcon(KIcon("dialog-close")); - m_status.error_log->setText(result); + m_status.error_log->append(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_log->append("<a name=\"result\" /><br><strong>" + i18n("Rendering job timed out")); + m_status.error_log->scrollToAnchor("result"); m_status.error_box->setHidden(false); return; } @@ -310,13 +313,12 @@ else spumux.setStandardInputFile(temp5.fileName()); spumux.setStandardOutputFile(m_menuFile.fileName()); spumux.start("spumux", args); - spumux.setProcessChannelMode(QProcess::MergedChannels); if (spumux.waitForFinished()) { - kDebug() << QString(spumux.readAll()).simplified(); + m_status.error_log->append(spumux.readAllStandardError()); if (spumux.exitStatus() == QProcess::CrashExit) { QByteArray result = spumux.readAllStandardError(); spuitem->setIcon(KIcon("dialog-close")); - m_status.error_log->setText(result); + m_status.error_log->append(result); m_status.error_box->setHidden(false); kDebug() << "/// RENDERING SPUMUX MENU crashed"; return; @@ -324,7 +326,8 @@ } 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_log->append("<a name=\"result\" /><br><strong>" + i18n("Menu job timed out")); + m_status.error_log->scrollToAnchor("result"); m_status.error_box->setHidden(false); return; } @@ -462,7 +465,7 @@ void DvdWizard::slotShowRenderInfo() { QString log = QString(m_dvdauthor->readAll()); - m_status.error_log->setText(log); + m_status.error_log->append(log); m_status.error_box->setHidden(false); } @@ -471,11 +474,10 @@ QListWidgetItem *authitem = m_status.job_progress->item(3); if (status == QProcess::CrashExit || exitCode != 0) { QString result(m_dvdauthor->readAllStandardError()); - result.append("<br><b>"); - - //TODO: uncomment after 0.7.4 release (i18n change) - //result.append(i19n("DVDAuthor process crashed.")); - m_status.error_log->setText(result); + result.append("<a name=\"result\" /><br><strong>"); + result.append(i18n("DVDAuthor process crashed.")); + m_status.error_log->append(result); + m_status.error_log->scrollToAnchor("result"); m_status.error_box->setHidden(false); kDebug() << "DVDAuthor process crashed"; authitem->setIcon(KIcon("dialog-close")); @@ -495,7 +497,8 @@ // Check if DVD structure has the necessary infos if (!QFile::exists(m_status.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_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); kDebug() << "DVDAuthor process crashed"; authitem->setIcon(KIcon("dialog-close")); @@ -529,7 +532,7 @@ void DvdWizard::slotShowIsoInfo() { QString log = QString(m_mkiso->readAll()); - m_status.error_log->setText(log); + m_status.error_log->append(log); m_status.error_box->setHidden(false); } @@ -539,10 +542,10 @@ QListWidgetItem *isoitem = m_status.job_progress->item(4); if (status == QProcess::CrashExit || exitCode != 0) { QString result(m_mkiso->readAllStandardError()); - result.append("<br><b>"); - //TODO: uncomment after 0.7.4 release (i18n change) - // result.append(i19n("ISO creation process crashed.")); - m_status.error_log->setText(result); + 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_mkiso->close(); delete m_mkiso; @@ -567,7 +570,8 @@ if (iso.exists()) { KIO::NetAccess::del(m_status.iso_image->url(), this); } - m_status.error_log->setText(m_creationLog + '\n' + 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); isoitem->setIcon(KIcon("dialog-close")); cleanup(); @@ -579,7 +583,8 @@ cleanup(); kDebug() << m_creationLog; - m_status.error_log->setText(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"); m_status.button_preview->setEnabled(true); m_status.button_burn->setEnabled(true); m_status.error_box->setHidden(false); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2009-12-21 19:14:03
|
Revision: 4187 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=4187&view=rev Author: j-b-m Date: 2009-12-21 19:13:49 +0000 (Mon, 21 Dec 2009) Log Message: ----------- re-enable "create iso image" in dvd wizard if rendering fails Modified Paths: -------------- trunk/kdenlive/src/dvdwizard.cpp Modified: trunk/kdenlive/src/dvdwizard.cpp =================================================================== --- trunk/kdenlive/src/dvdwizard.cpp 2009-12-21 17:29:48 UTC (rev 4186) +++ trunk/kdenlive/src/dvdwizard.cpp 2009-12-21 19:13:49 UTC (rev 4187) @@ -237,6 +237,8 @@ vobitem->setIcon(KIcon("dialog-close")); m_status.error_log->append(result); m_status.error_box->setHidden(false); + m_status.button_start->setEnabled(true); + m_status.button_abort->setEnabled(false); return; } } else { @@ -245,6 +247,8 @@ 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); + m_status.button_abort->setEnabled(false); return; } vobitem->setIcon(KIcon("dialog-ok")); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2010-01-30 14:48:42
|
Revision: 4255 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=4255&view=rev Author: j-b-m Date: 2010-01-30 14:48:36 +0000 (Sat, 30 Jan 2010) Log Message: ----------- small gui improvement Modified Paths: -------------- trunk/kdenlive/src/dvdwizard.cpp Modified: trunk/kdenlive/src/dvdwizard.cpp =================================================================== --- trunk/kdenlive/src/dvdwizard.cpp 2010-01-30 14:34:37 UTC (rev 4254) +++ trunk/kdenlive/src/dvdwizard.cpp 2010-01-30 14:48:36 UTC (rev 4255) @@ -194,6 +194,7 @@ 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(); @@ -213,6 +214,7 @@ 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(); @@ -260,6 +262,7 @@ // 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; @@ -345,6 +348,7 @@ // 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); @@ -531,6 +535,7 @@ 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); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2010-03-24 09:50:45
|
Revision: 4355 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=4355&view=rev Author: j-b-m Date: 2010-03-24 09:50:39 +0000 (Wed, 24 Mar 2010) Log Message: ----------- Fix error reported by cppcheck: http://www.kdenlive.org/mantis/view.php?id=1528 Modified Paths: -------------- trunk/kdenlive/src/dvdwizard.cpp Modified: trunk/kdenlive/src/dvdwizard.cpp =================================================================== --- trunk/kdenlive/src/dvdwizard.cpp 2010-03-24 08:09:17 UTC (rev 4354) +++ trunk/kdenlive/src/dvdwizard.cpp 2010-03-24 09:50:39 UTC (rev 4355) @@ -648,7 +648,7 @@ 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())); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2010-12-12 11:11:11
|
Revision: 5163 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5163&view=rev Author: j-b-m Date: 2010-12-12 11:11:04 +0000 (Sun, 12 Dec 2010) Log Message: ----------- Fix compatibility with dvdauthor 0.7 Modified Paths: -------------- trunk/kdenlive/src/dvdwizard.cpp Modified: trunk/kdenlive/src/dvdwizard.cpp =================================================================== --- trunk/kdenlive/src/dvdwizard.cpp 2010-12-12 03:42:34 UTC (rev 5162) +++ trunk/kdenlive/src/dvdwizard.cpp 2010-12-12 11:11:04 UTC (rev 5163) @@ -485,6 +485,10 @@ } m_creationLog.clear(); m_dvdauthor = new QProcess(this); + // Set VIDEO_FORMAT variable (required by dvdauthor 0.7) + QProcessEnvironment env = QProcessEnvironment::systemEnvironment(); + env.insert("VIDEO_FORMAT", m_pageVob->isPal() ? "PAL" : "NTSC"); + m_dvdauthor->setProcessEnvironment(env); 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); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tt...@us...> - 2011-01-03 13:50:22
|
Revision: 5246 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5246&view=rev Author: ttill Date: 2011-01-03 13:50:16 +0000 (Mon, 03 Jan 2011) Log Message: ----------- Fix build with Qt < 4.6: http://kdenlive.org/mantis/view.php?id=1958 Modified Paths: -------------- trunk/kdenlive/src/dvdwizard.cpp Modified: trunk/kdenlive/src/dvdwizard.cpp =================================================================== --- trunk/kdenlive/src/dvdwizard.cpp 2011-01-02 22:56:42 UTC (rev 5245) +++ trunk/kdenlive/src/dvdwizard.cpp 2011-01-03 13:50:16 UTC (rev 5246) @@ -486,9 +486,15 @@ 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 << "VIDEO_FORMAT=" + (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); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <tt...@us...> - 2011-01-03 17:43:00
|
Revision: 5248 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5248&view=rev Author: ttill Date: 2011-01-03 17:42:53 +0000 (Mon, 03 Jan 2011) Log Message: ----------- Fix compilation with Qt < 4.6 Modified Paths: -------------- trunk/kdenlive/src/dvdwizard.cpp Modified: trunk/kdenlive/src/dvdwizard.cpp =================================================================== --- trunk/kdenlive/src/dvdwizard.cpp 2011-01-03 14:23:08 UTC (rev 5247) +++ trunk/kdenlive/src/dvdwizard.cpp 2011-01-03 17:42:53 UTC (rev 5248) @@ -492,7 +492,7 @@ m_dvdauthor->setProcessEnvironment(env); #else QStringList env = QProcess::systemEnvironment(); - env << "VIDEO_FORMAT=" + (m_pageVob->isPal() ? "PAL" : "NTSC"); + 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))); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |
From: <j-...@us...> - 2011-09-08 07:58:52
|
Revision: 5863 http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5863&view=rev Author: j-b-m Date: 2011-09-08 07:58:45 +0000 (Thu, 08 Sep 2011) Log Message: ----------- DVD wizard: don't lose chapters data when switching to menu page Modified Paths: -------------- trunk/kdenlive/src/dvdwizard.cpp Modified: trunk/kdenlive/src/dvdwizard.cpp =================================================================== --- trunk/kdenlive/src/dvdwizard.cpp 2011-09-07 16:18:02 UTC (rev 5862) +++ trunk/kdenlive/src/dvdwizard.cpp 2011-09-08 07:58:45 UTC (rev 5863) @@ -144,6 +144,7 @@ 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()); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |