Kdenlive - KDE Non Linear Video Editor

Revision: 3447
          http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3447&view=rev
Author:   freefrag
Date:     2009-05-29 19:13:05 +0000 (Fri, 29 May 2009)

Log Message:
-----------
Fix missing header for QHeaderView

Modified Paths:
--------------
    trunk/kdenlive/src/dvdwizardvob.cpp

Modified: trunk/kdenlive/src/dvdwizardvob.cpp
===================================================================
--- trunk/kdenlive/src/dvdwizardvob.cpp	2009-05-29 17:31:27 UTC (rev 3446)
+++ trunk/kdenlive/src/dvdwizardvob.cpp	2009-05-29 19:13:05 UTC (rev 3447)
@@ -32,6 +32,7 @@
 #include <QHBoxLayout>
 #include <QDomDocument>
 #include <QTreeWidgetItem>
+#include <QHeaderView>
 
 DvdWizardVob::DvdWizardVob(const QString &profile, QWidget *parent) :
         QWizardPage(parent)
@@ -354,4 +355,4 @@
 void DvdWizardVob::clear()
 {
     m_view.vobs_list->clear();
-}
\ No newline at end of file
+}


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 3543
          http://kdenlive.svn.sourceforge.net/kdenlive/?rev=3543&view=rev
Author:   xzhayon
Date:     2009-06-15 23:05:17 +0000 (Mon, 15 Jun 2009)

Log Message:
-----------
block the user from inserting another chapter at 00:00:00:00 (thanks to Ben Klopfenstein)

Modified Paths:
--------------
    trunk/kdenlive/src/dvdwizardvob.cpp

Modified: trunk/kdenlive/src/dvdwizardvob.cpp
===================================================================
--- trunk/kdenlive/src/dvdwizardvob.cpp	2009-06-15 19:54:49 UTC (rev 3542)
+++ trunk/kdenlive/src/dvdwizardvob.cpp	2009-06-15 23:05:17 UTC (rev 3543)
@@ -133,9 +133,9 @@
     }
     delete producer;
 
-    if (chapters.isEmpty() == false) {
+    if (chapters.isEmpty() == false)
         item->setData(1, Qt::UserRole + 1, chapters);
-    } else if (QFile::exists(url.path() + ".dvdchapter")) {
+    else if (QFile::exists(url.path() + ".dvdchapter")) {
         // insert chapters as children
         QFile file(url.path() + ".dvdchapter");
         if (file.open(QIODevice::ReadOnly)) {
@@ -149,7 +149,8 @@
             }
             item->setData(1, Qt::UserRole + 1, chaptersList.join(";"));
         }
-    }
+    } else // Explicitly add a chapter at 00:00:00:00
+        item->setData(1, Qt::UserRole + 1, "0");
 
     slotCheckVobList();
 }


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.

Revision: 5935
          http://kdenlive.svn.sourceforge.net/kdenlive/?rev=5935&view=rev
Author:   j-b-m
Date:     2011-10-01 07:00:56 +0000 (Sat, 01 Oct 2011)
Log Message:
-----------
Fix dvd chapters discarded when opening from render dialog:
http://kdenlive.org/mantis/view.php?id=2335

Modified Paths:
--------------
    trunk/kdenlive/src/dvdwizardvob.cpp

Modified: trunk/kdenlive/src/dvdwizardvob.cpp
===================================================================
--- trunk/kdenlive/src/dvdwizardvob.cpp	2011-10-01 06:25:23 UTC (rev 5934)
+++ trunk/kdenlive/src/dvdwizardvob.cpp	2011-10-01 07:00:56 UTC (rev 5935)
@@ -129,8 +129,9 @@
     }
     delete producer;
 
-    if (chapters.isEmpty() == false)
+    if (chapters.isEmpty() == false) {
         item->setData(1, Qt::UserRole + 1, chapters);
+    }
     else if (QFile::exists(url.path() + ".dvdchapter")) {
         // insert chapters as children
         QFile file(url.path() + ".dvdchapter");
@@ -246,7 +247,9 @@
     int max = m_view.vobs_list->topLevelItemCount();
     for (int i = 0; i < max; i++) {
         QTreeWidgetItem *item = m_view.vobs_list->topLevelItem(i);
-        if (item) result.append(item->data(1, Qt::UserRole + 1).toString());
+        if (item) {
+            result.append(item->data(1, Qt::UserRole + 1).toString());
+        }
     }
     return result;
 }
@@ -256,7 +259,7 @@
     int max = m_view.vobs_list->topLevelItemCount();
     for (int i = 0; i < max; i++) {
         QTreeWidgetItem *item = m_view.vobs_list->topLevelItem(i);
-        item->setData(1, Qt::UserRole + 1, chaptersdata.value(item->text(0)));
+        if (chaptersdata.contains(item->text(0))) item->setData(1, Qt::UserRole + 1, chaptersdata.value(item->text(0)));
     }
 }
 

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.