[Kdenlive-svn] SF.net SVN: kdenlive:[2486] branches/KDE4/src

[<j-...@us...>]

Revision: 2486
          http://kdenlive.svn.sourceforge.net/kdenlive/?rev=2486&view=rev
Author:   j-b-m
Date:     2008-10-18 22:58:34 +0000 (Sat, 18 Oct 2008)

Log Message:
-----------
Be more careful when closing a document, may solve some of the crashes reported in issue:
http://www.kdenlive.org:80/mantis/view.php?id=221

Modified Paths:
--------------
    branches/KDE4/src/clipitem.cpp
    branches/KDE4/src/effectstackview.cpp
    branches/KDE4/src/mainwindow.cpp
    branches/KDE4/src/projectlist.cpp

Modified: branches/KDE4/src/clipitem.cpp
===================================================================
--- branches/KDE4/src/clipitem.cpp	2008-10-18 22:09:25 UTC (rev 2485)
+++ branches/KDE4/src/clipitem.cpp	2008-10-18 22:58:34 UTC (rev 2486)
@@ -609,11 +609,9 @@
 
     // draw transition handles on hover
     if (m_hover && itemWidth * scale > 40) {
-        QPainterPath transitionHandle;
-        const int handle_size = 4;
         QPointF p1 = painter->matrix().map(QPointF(0, itemHeight / 2)) + QPointF(10, 0);
         painter->drawPixmap(p1, projectScene()->m_transitionPixmap);
-        p1 = painter->matrix().map(QPointF(itemWidth, itemHeight / 2)) - QPointF(10 + handle_size * 3, 0);
+        p1 = painter->matrix().map(QPointF(itemWidth, itemHeight / 2)) - QPointF(22, 0);
         painter->drawPixmap(p1, projectScene()->m_transitionPixmap);
     }
 
@@ -718,7 +716,6 @@
 }
 
 void ClipItem::slotPrepareAudioThumb(double pixelForOneFrame, int startpixel, int endpixel, int channels) {
-
     QRectF re =  sceneBoundingRect();
     if (m_clipType == AV) re.setTop(re.y() + re.height() / 2);
 

Modified: branches/KDE4/src/effectstackview.cpp
===================================================================
--- branches/KDE4/src/effectstackview.cpp	2008-10-18 22:09:25 UTC (rev 2485)
+++ branches/KDE4/src/effectstackview.cpp	2008-10-18 22:58:34 UTC (rev 2486)
@@ -264,6 +264,7 @@
     ui.buttonReset->setEnabled(false);
     ui.buttonUp->setEnabled(false);
     ui.buttonDown->setEnabled(false);
+    effectedit->transferParamDesc(QDomElement(), 0, 0);
 }
 
 #include "effectstackview.moc"

Modified: branches/KDE4/src/mainwindow.cpp
===================================================================
--- branches/KDE4/src/mainwindow.cpp	2008-10-18 22:09:25 UTC (rev 2485)
+++ branches/KDE4/src/mainwindow.cpp	2008-10-18 22:58:34 UTC (rev 2486)
@@ -895,7 +895,11 @@
     if (m_timelineArea->count() == 1) m_timelineArea->setTabBarHidden(true);
     delete docToClose;
     delete w;
-    if (m_timelineArea->count() == 0) m_activeDocument = NULL;
+    if (m_timelineArea->count() == 0) {
+        m_activeDocument = NULL;
+        effectStack->clear();
+        transitionConfig->slotTransitionItemSelected(NULL);
+    }
 }
 
 void MainWindow::saveFileAs(const QString &outputFileName) {

Modified: branches/KDE4/src/projectlist.cpp
===================================================================
--- branches/KDE4/src/projectlist.cpp	2008-10-18 22:09:25 UTC (rev 2485)
+++ branches/KDE4/src/projectlist.cpp	2008-10-18 22:58:34 UTC (rev 2486)
@@ -511,12 +511,12 @@
 }
 
 void ProjectList::setDocument(KdenliveDoc *doc) {
+    listView->blockSignals(true);
     listView->clear();
     m_thumbnailQueue.clear();
     m_infoQueue.clear();
     m_refreshed = false;
     QList <DocClipBase*> list = doc->clipManager()->documentClipList();
-    listView->blockSignals(true);
     for (int i = 0; i < list.count(); i++) {
         slotAddClip(list.at(i), false);
     }


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