Rewrote correct implementation of vertical timeline zoom

[kdenlive] / src / trackview.cpp

diff --git a/src/trackview.cpp b/src/trackview.cpp
index 1316483d26c4585a016438f6485b82399d1c38dc..f34077a69a39882c0e386adcea5b03f6101ee5a1 100644 (file)
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@@ -40,7 +40,8 @@ TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) :
         QWidget(parent),
         m_scale(1.0),
         m_projectTracks(0),
-        m_doc(doc)
+        m_doc(doc),
+        m_verticalZoom(1)
 {
 
     m_view.setupUi(this);
@@ -59,6 +60,26 @@ TrackView::TrackView(KdenliveDoc *doc, 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"));
+    connect(butSmall, SIGNAL(clicked()), this, SLOT(slotVerticalZoomDown()));
+    sizeLayout->addWidget(butSmall);
+
+    QToolButton *butLarge = new QToolButton(this);
+    butLarge->setIcon(KIcon("kdenlive-zoom-large"));
+    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);
     tracksLayout->setSpacing(0);
@@ -90,6 +111,11 @@ TrackView::TrackView(KdenliveDoc *doc, QWidget *parent) :
     slotSetZone(m_doc->zone());
 }
 
+TrackView::~TrackView()
+{
+    delete m_ruler;
+    delete m_trackview;
+}
 
 int TrackView::duration() const
 {
@@ -345,12 +371,12 @@ void TrackView::parseDocument(QDomDocument doc)
     m_trackview->loadGroups(groups);
     m_trackview->setDuration(duration);
     kDebug() << "///////////  TOTAL PROJECT DURATION: " << duration;
-    
+
     // Remove Kdenlive extra info from xml doc before sending it to MLT
     QDomElement mlt = doc.firstChildElement("mlt");
     QDomElement infoXml = mlt.firstChildElement("kdenlivedoc");
     mlt.removeChild(infoXml);
-    
+
     slotRebuildTrackHeaders();
     if (!m_documentErrors.isNull()) KMessageBox::sorry(this, m_documentErrors);
     //m_trackview->setCursorPos(cursorPos);
@@ -377,7 +403,7 @@ void TrackView::slotChangeZoom(int factor)
     m_doc->setZoom(factor);
     m_ruler->setPixelPerMark(factor);
     m_scale = (double) FRAME_SIZE / m_ruler->comboScale[factor]; // m_ruler->comboScale[m_currentZoom] /
-    m_trackview->setScale(m_scale);
+    m_trackview->setScale(m_scale, m_scene->scale().y());
 }
 
 int TrackView::fitZoom() const
@@ -401,14 +427,16 @@ void TrackView::refresh()
 
 void TrackView::slotRebuildTrackHeaders()
 {
+    // If the slot was triggered by a change in default track size, reset vertical zoom
     QList <TrackInfo> list = m_doc->tracksList();
     QLayoutItem *child;
     while ((child = m_headersLayout->takeAt(0)) != 0) {
         delete child;
     }
     int max = list.count();
+    int height = KdenliveSettings::trackheight() * m_scene->scale().y();
     for (int i = 0; i < max; i++) {
-        HeaderTrack *header = new HeaderTrack(i, list.at(max - i - 1), this);
+        HeaderTrack *header = new HeaderTrack(i, list.at(max - i - 1), height, this);
         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)));
@@ -418,7 +446,7 @@ void TrackView::slotRebuildTrackHeaders()
         connect(header, SIGNAL(changeTrack(int)), this, SIGNAL(changeTrack(int)));
         m_headersLayout->addWidget(header);
     }
-    m_view.headers_container->adjustSize();
+    //m_view.headers_container->adjustSize();
 }
 
 
@@ -731,5 +759,26 @@ void TrackView::slotChangeTrackLock(int ix, bool lock)
     widgets.at(ix)->setLock(lock);
 }
 
+void TrackView::slotVerticalZoomDown()
+{
+    if (m_verticalZoom == 0) return;
+    m_verticalZoom--;
+    if (m_verticalZoom == 0) m_trackview->setScale(m_scene->scale().x(), 0.5);
+    else m_trackview->setScale(m_scene->scale().x(), 1);
+    slotRebuildTrackHeaders();
+    /*KdenliveSettings::setTrackheight(KdenliveSettings::trackheight() / 2);
+    m_trackview->checkTrackHeight(false);*/
+}
+
+void TrackView::slotVerticalZoomUp()
+{
+    if (m_verticalZoom == 2) return;
+    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);
+    slotRebuildTrackHeaders();
+}
 
 #include "trackview.moc"