Fix corruption when changing the project profile

[kdenlive] / src / trackview.cpp

diff --git a/src/trackview.cpp b/src/trackview.cpp
index aabf0e6ccca886474e060c63bf22b770dda78844..e790a4c1c0e3bf01690381651250980be004c682 100644 (file)
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@@ -62,27 +62,24 @@ TrackView::TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent) :
     m_view.ruler_frame->setLayout(layout);
     layout->addWidget(m_ruler);
 
-
     QHBoxLayout *sizeLayout = new QHBoxLayout;
     sizeLayout->setContentsMargins(0, 0, 0, 0);
     sizeLayout->setSpacing(0);
     m_view.size_frame->setLayout(sizeLayout);
 
-    QString style1 = "QToolButton {border-style: none;margin: 0px 3px;padding: 0px;} QToolButton:pressed:hover { background-color: rgba(224, 224, 0, 100); border-style: inset; border:1px solid #cc6666;border-radius: 3px;} QToolButton:hover { background-color: rgba(255, 255, 255, 100); border-style: inset; border:1px solid #cc6666;border-radius: 3px;}";
-
     QToolButton *butSmall = new QToolButton(this);
     butSmall->setIcon(KIcon("kdenlive-zoom-small"));
     butSmall->setToolTip(i18n("Smaller tracks"));
+    butSmall->setAutoRaise(true);
     connect(butSmall, SIGNAL(clicked()), this, SLOT(slotVerticalZoomDown()));
     sizeLayout->addWidget(butSmall);
 
     QToolButton *butLarge = new QToolButton(this);
     butLarge->setIcon(KIcon("kdenlive-zoom-large"));
     butLarge->setToolTip(i18n("Bigger tracks"));
+    butLarge->setAutoRaise(true);
     connect(butLarge, SIGNAL(clicked()), this, SLOT(slotVerticalZoomUp()));
     sizeLayout->addWidget(butLarge);
-    m_view.size_frame->setStyleSheet(style1);
-
 
     QHBoxLayout *tracksLayout = new QHBoxLayout;
     tracksLayout->setContentsMargins(0, 0, 0, 0);
@@ -91,16 +88,15 @@ TrackView::TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent) :
 
     m_view.headers_area->setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
     m_view.headers_area->setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
+    m_view.headers_area->setFixedWidth(70);
 
-    m_headersLayout = new QVBoxLayout;
-    m_headersLayout->setContentsMargins(0, m_trackview->frameWidth(), 0, 0);
-    m_headersLayout->setSpacing(0);
-    m_view.headers_container->setLayout(m_headersLayout);
-
+    QVBoxLayout *headersLayout = new QVBoxLayout;
+    headersLayout->setContentsMargins(0, m_trackview->frameWidth(), 0, 0);
+    headersLayout->setSpacing(0);
+    m_view.headers_container->setLayout(headersLayout);
     connect(m_view.headers_area->verticalScrollBar(), SIGNAL(valueChanged(int)), m_trackview->verticalScrollBar(), SLOT(setValue(int)));
 
     tracksLayout->addWidget(m_trackview);
-
     connect(m_trackview->verticalScrollBar(), SIGNAL(valueChanged(int)), m_view.headers_area->verticalScrollBar(), SLOT(setValue(int)));
     connect(m_trackview, SIGNAL(trackHeightChanged()), this, SLOT(slotRebuildTrackHeaders()));
 
@@ -446,16 +442,26 @@ void TrackView::refresh()
 
 void TrackView::slotRebuildTrackHeaders()
 {
-    QList <TrackInfo> list = m_doc->tracksList();
+    const QList <TrackInfo> list = m_doc->tracksList();
     QLayoutItem *child;
-    while ((child = m_headersLayout->takeAt(0)) != 0) {
-        if (child->widget()) delete child->widget();
+    while ((child = m_view.headers_container->layout()->takeAt(0)) != 0) {
+        QWidget *wid = child->widget();
         delete child;
+        if (wid) wid->deleteLater();
     }
     int max = list.count();
-    int height = KdenliveSettings::trackheight() * m_scene->scale().y();
+    int height = KdenliveSettings::trackheight() * m_scene->scale().y() - 1;
+    HeaderTrack *header = NULL;
+    QFrame *frame = NULL;
     for (int i = 0; i < max; i++) {
-        HeaderTrack *header = new HeaderTrack(i, list.at(max - i - 1), height, this);
+        frame = new QFrame(m_view.headers_container);
+        frame->setFixedHeight(1);
+        frame->setFrameStyle(QFrame::Plain);
+        frame->setFrameShape(QFrame::Box);
+        frame->setLineWidth(1);
+        m_view.headers_container->layout()->addWidget(frame);
+        TrackInfo info = list.at(max - i - 1);
+        header = new HeaderTrack(i, info, height, m_view.headers_container);
         connect(header, SIGNAL(switchTrackVideo(int)), m_trackview, SLOT(slotSwitchTrackVideo(int)));
         connect(header, SIGNAL(switchTrackAudio(int)), m_trackview, SLOT(slotSwitchTrackAudio(int)));
         connect(header, SIGNAL(switchTrackLock(int)), m_trackview, SLOT(slotSwitchTrackLock(int)));
@@ -464,18 +470,24 @@ void TrackView::slotRebuildTrackHeaders()
         connect(header, SIGNAL(insertTrack(int)), this, SIGNAL(insertTrack(int)));
         connect(header, SIGNAL(changeTrack(int)), this, SIGNAL(changeTrack(int)));
         connect(header, SIGNAL(renameTrack(int)), this, SLOT(slotRenameTrack(int)));
-        m_headersLayout->addWidget(header);
+        m_view.headers_container->layout()->addWidget(header);
     }
+    frame = new QFrame(this);
+    frame->setFixedHeight(1);
+    frame->setFrameStyle(QFrame::Plain);
+    frame->setFrameShape(QFrame::Box);
+    frame->setLineWidth(1);
+    m_view.headers_container->layout()->addWidget(frame);
 }
 
 
 void TrackView::adjustTrackHeaders()
 {
-    int height = KdenliveSettings::trackheight() * m_scene->scale().y();
+    int height = KdenliveSettings::trackheight() * m_scene->scale().y() - 1;
     QLayoutItem *child;
-    for (int i = 0; i < m_headersLayout->count(); i++) {
-        child = m_headersLayout->itemAt(i);
-        if (child->widget())(static_cast <HeaderTrack *>(child->widget()))->adjustSize(height);
+    for (int i = 0; i < m_view.headers_container->layout()->count(); i++) {
+        child = m_view.headers_container->layout()->itemAt(i);
+        if (child->widget() && child->widget()->height() > 5)(static_cast <HeaderTrack *>(child->widget()))->adjustSize(height);
     }
 }
 
@@ -777,8 +789,10 @@ DocClipBase *TrackView::getMissingProducer(const QString id) const
     // prepend MLT XML document root if no path in clip resource and not a color clip
     if (!resource.startsWith('/') && !resource.startsWith("0x")) resource.prepend(docRoot);
     DocClipBase *missingClip = NULL;
-    if (!resource.isEmpty())
-        missingClip = m_doc->clipManager()->getClipByResource(resource);
+    if (!resource.isEmpty()) {
+        QList <DocClipBase *> list = m_doc->clipManager()->getClipByResource(resource);
+        if (!list.isEmpty()) missingClip = list.at(0);
+    }
     return missingClip;
 }
 
@@ -816,8 +830,7 @@ void TrackView::slotVerticalZoomDown()
     if (m_verticalZoom == 0) m_trackview->setScale(m_scene->scale().x(), 0.5);
     else m_trackview->setScale(m_scene->scale().x(), 1);
     adjustTrackHeaders();
-    /*KdenliveSettings::setTrackheight(KdenliveSettings::trackheight() / 2);
-    m_trackview->checkTrackHeight(false);*/
+    m_trackview->verticalScrollBar()->setValue(m_view.headers_area->verticalScrollBar()->value());
 }
 
 void TrackView::slotVerticalZoomUp()
@@ -825,16 +838,16 @@ void TrackView::slotVerticalZoomUp()
     if (m_verticalZoom == 2) return;
     m_verticalZoom++;
     m_doc->setZoom(m_doc->zoom().x(), m_verticalZoom);
-    /*KdenliveSettings::setTrackheight(KdenliveSettings::trackheight() * 2);
-    m_trackview->checkTrackHeight(false);*/
     if (m_verticalZoom == 2) m_trackview->setScale(m_scene->scale().x(), 2);
     else m_trackview->setScale(m_scene->scale().x(), 1);
     adjustTrackHeaders();
+    m_trackview->verticalScrollBar()->setValue(m_view.headers_area->verticalScrollBar()->value());
 }
 
 void TrackView::updateProjectFps()
 {
     m_ruler->updateProjectFps(m_doc->timecode());
+    m_trackview->updateProjectFps();
 }
 
 void TrackView::slotRenameTrack(int ix)
@@ -847,6 +860,7 @@ void TrackView::slotRenameTrack(int ix)
         info.trackName = newName;
         m_doc->setTrackType(tracknumber - 1, info);
         QTimer::singleShot(300, this, SLOT(slotRebuildTrackHeaders()));
+        m_doc->setModified(true);
     }
 }