Use the new profile selection combobox for project proxy settings

[kdenlive] / src / dvdwizard.cpp

diff --git a/src/dvdwizard.cpp b/src/dvdwizard.cpp
index fe6833c6fe4146d8f63a2304433e2a7554971428..fe997c0a9293bd4c07293a9031a7de9caa8e55bd 100644 (file)
--- a/src/dvdwizard.cpp
+++ b/src/dvdwizard.cpp
@@ -301,11 +301,13 @@ void DvdWizard::generateDvd()
             //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());
             but.setAttribute("x0", QString::number(r.x()));
-            but.setAttribute("y0", QString::number(r.y()));
+            but.setAttribute("y0", QString::number(2 * (r.y() / 2)));
             but.setAttribute("x1", QString::number(r.right()));
-            but.setAttribute("y1", QString::number(r.bottom()));
+            but.setAttribute("y1", QString::number(2 * (r.bottom() / 2)));
             spu.appendChild(but);
             i++;
         }
@@ -324,6 +326,16 @@ void DvdWizard::generateDvd()
 
         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());
@@ -456,7 +468,7 @@ void DvdWizard::generateDvd()
                 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);
@@ -486,9 +498,15 @@ void DvdWizard::generateDvd()
     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);