Save chapters now works in DVD Wizard

[kdenlive] / src / dvdwizard.cpp

diff --git a/src/dvdwizard.cpp b/src/dvdwizard.cpp
index 7d83c589bb4fd0dd67ff9b4e258f7cfa3195c617..b2e23c87281b8c79d4967883270b2c851aad0ef9 100644 (file)
--- a/src/dvdwizard.cpp
+++ b/src/dvdwizard.cpp
@@ -21,6 +21,8 @@
 #include "dvdwizard.h"
 #include "kdenlivesettings.h"
 #include "profilesdialog.h"
+#include "timecode.h"
+#include "monitormanager.h"
 
 #include <KStandardDirs>
 #include <KLocale>
@@ -47,9 +49,15 @@ DvdWizard::DvdWizard(const QString &url, const QString &profile, QWidget *parent
     m_pageVob = new DvdWizardVob(profile, this);
     m_pageVob->setTitle(i18n("Select Files For Your DVD"));
     addPage(m_pageVob);
-
     if (!url.isEmpty()) m_pageVob->setUrl(url);
 
+
+    m_pageChapters = new DvdWizardChapters(m_pageVob->isPal(), this);
+    m_pageChapters->setTitle(i18n("DVD Chapters"));
+    addPage(m_pageChapters);
+
+
+
     m_pageMenu = new DvdWizardMenu(profile, this);
     m_pageMenu->setTitle(i18n("Create DVD Menu"));
     addPage(m_pageMenu);
@@ -113,13 +121,15 @@ DvdWizard::~DvdWizard()
 
 void DvdWizard::slotPageChanged(int page)
 {
-    kDebug() << "// PAGE CHGD: " << page;
+    //kDebug() << "// PAGE CHGD: " << page << ", ID: " << visitedPages();
     if (page == 1) {
-        m_pageMenu->setTargets(m_pageVob->selectedTitles(), m_pageVob->selectedTargets());
-        m_pageMenu->changeProfile(m_pageVob->isPal());
+        m_pageChapters->setVobFiles(m_pageVob->isPal(), m_pageVob->selectedUrls(), m_pageVob->durations());
     } else if (page == 2) {
-        //m_pageMenu->buttonsInfo();
+        m_pageMenu->setTargets(m_pageChapters->selectedTitles(), m_pageChapters->selectedTargets());
+        m_pageMenu->changeProfile(m_pageVob->isPal());
     } else if (page == 3) {
+        //m_pageMenu->buttonsInfo();
+    } else if (page == 4) {
         // clear job icons
         for (int i = 0; i < m_status.job_progress->count(); i++)
             m_status.job_progress->item(i)->setIcon(KIcon());
@@ -221,7 +231,7 @@ void DvdWizard::generateDvd()
             renderbg.start(KdenliveSettings::rendererpath(), args);
             if (renderbg.waitForFinished()) {
                 if (renderbg.exitStatus() == QProcess::CrashExit) {
-                    kDebug() << "/// RENDERING MENU vob crashed";
+                    kDebug() << "/// RENDERING MENU vob crashed";
                     QByteArray result = renderbg.readAllStandardError();
                     vobitem->setIcon(KIcon("dialog-close"));
                     m_status.error_log->setText(result);
@@ -229,7 +239,7 @@ void DvdWizard::generateDvd()
                     return;
                 }
             } else {
-                kDebug() << "/// RENDERING MENU vob timed out";
+                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);
@@ -272,7 +282,7 @@ void DvdWizard::generateDvd()
             else but.setAttribute("up", 'b' + QString::number(max));
             QRect r = it.value();
             //int target = it.key();
-            // TODO: solve play all button
+            // TODO: solve play all button
             //if (target == 0) target = 1;
             buttonsTarget.append(it.key());
             but.setAttribute("x0", QString::number(r.x()));
@@ -396,11 +406,10 @@ void DvdWizard::generateDvd()
             titles.appendChild(pgc2);
             QDomElement vob = dvddoc.createElement("vob");
             vob.setAttribute("file", voburls.at(i));
-            if (m_pageVob->useChapters()) {
-                // Add chapters
-                QStringList chaptersList = m_pageVob->chapter(i);
-                if (!chaptersList.isEmpty()) vob.setAttribute("chapters", chaptersList.join(","));
-            }
+            // Add chapters
+            QStringList chaptersList = m_pageChapters->chapters(i);
+            if (!chaptersList.isEmpty()) vob.setAttribute("chapters", chaptersList.join(","));
+
             pgc2.appendChild(vob);
             if (m_pageMenu->createMenu()) {
                 QDomElement post = dvddoc.createElement("post");
@@ -461,7 +470,7 @@ void DvdWizard::slotRenderFinished(int /*exitCode*/, QProcess::ExitStatus status
     delete m_dvdauthor;
     m_dvdauthor = NULL;
 
-    // Check if DVD structure has the necessary infos
+    // 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);
@@ -509,7 +518,7 @@ void DvdWizard::slotIsoFinished(int /*exitCode*/, QProcess::ExitStatus status)
     delete m_mkiso;
     m_mkiso = NULL;
 
-    // Check if DVD iso is ok
+    // Check if DVD iso is ok
     QFile iso(m_iso.iso_image->url().path());
     if (!iso.exists() || iso.size() == 0) {
         if (iso.exists()) {
@@ -564,3 +573,9 @@ void DvdWizard::slotBurn()
 
 
 
+
+
+
+
+
+