X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=src%2Ftrackview.cpp;h=b8110fb7deb5d0d149d8381162bc52a3f9a5bb76;hb=d765a3894844444da2fc9902b55e16d433a72f4a;hp=c3c568de1a380d199b9a8c41e2af6abc9d65698b;hpb=07f908f3c4fbfef99ff99b174b8fb628badc9e9c;p=kdenlive

diff --git a/src/trackview.cpp b/src/trackview.cpp
index c3c568de..b8110fb7 100644
--- a/src/trackview.cpp
+++ b/src/trackview.cpp
@@ -31,6 +31,7 @@
 #include "customtrackview.h"
 #include "initeffects.h"
 #include "profilesdialog.h"
+#include "configtrackscommand.h"
 
 #include <KDebug>
 #include <KMessageBox>
@@ -110,6 +111,7 @@ TrackView::TrackView(KdenliveDoc *doc, bool *ok, QWidget *parent) :
     else *ok = true;
     connect(m_trackview, SIGNAL(cursorMoved(int, int)), m_ruler, SLOT(slotCursorMoved(int, int)));
     connect(m_trackview->horizontalScrollBar(), SIGNAL(valueChanged(int)), m_ruler, SLOT(slotMoveRuler(int)));
+    connect(m_trackview->horizontalScrollBar(), SIGNAL(rangeChanged(int, int)), this, SLOT(slotUpdateVerticalScroll(int, int)));
     connect(m_trackview, SIGNAL(mousePosition(int)), this, SIGNAL(mousePosition(int)));
     connect(m_trackview, SIGNAL(doTrackLock(int, bool)), this, SLOT(slotChangeTrackLock(int, bool)));
 
@@ -429,8 +431,10 @@ void TrackView::parseDocument(QDomDocument doc)
             ct++;
             backupFile = baseFile + "_backup" + QString::number(ct) + ".kdenlive";
         }
-        if (KIO::NetAccess::file_copy(m_doc->url(), KUrl(backupFile), this)) KMessageBox::information(this, i18n("Your project file was upgraded to the latest Kdenlive document version.\n To make sure you don't lose data, a backup copy called %1 was created.", backupFile));
-        else KMessageBox::information(this, i18n("Your project file was upgraded to the latest Kdenlive document version, it was not possible to create a backup copy.", backupFile));
+        if (KIO::NetAccess::file_copy(m_doc->url(), KUrl(backupFile), this))
+            KMessageBox::information(this, i18n("Your project file was upgraded to the latest Kdenlive document version.\nTo make sure you don't lose data, a backup copy called %1 was created.", backupFile));
+        else
+            KMessageBox::information(this, i18n("Your project file was upgraded to the latest Kdenlive document version, but it was not possible to create a backup copy.", backupFile));
     }
     //m_trackview->setCursorPos(cursorPos);
     //m_scrollBox->setGeometry(0, 0, 300 * zoomFactor(), m_scrollArea->height());
@@ -462,8 +466,10 @@ void TrackView::slotChangeZoom(int horizontal, int vertical)
         m_trackview->setScale(m_scale, m_scene->scale().y());
     } else {
         m_verticalZoom = vertical;
-        if (m_verticalZoom == 0) m_trackview->setScale(m_scale, 0.5);
-        else m_trackview->setScale(m_scale, m_verticalZoom);
+        if (m_verticalZoom == 0)
+            m_trackview->setScale(m_scale, 0.5);
+        else
+            m_trackview->setScale(m_scale, m_verticalZoom);
         adjustTrackHeaders();
     }
 }
@@ -534,8 +540,8 @@ void TrackView::slotRebuildTrackHeaders()
         connect(header, SIGNAL(selectTrack(int)), m_trackview, SLOT(slotSelectTrack(int)));
         connect(header, SIGNAL(deleteTrack(int)), this, SIGNAL(deleteTrack(int)));
         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)));
+        connect(header, SIGNAL(renameTrack(int, QString)), this, SLOT(slotRenameTrack(int, QString)));
+        connect(header, SIGNAL(configTrack(int)), this, SIGNAL(configTrack(int)));
         headers_container->layout()->addWidget(header);
     }
     frame = new QFrame(this);
@@ -906,8 +912,10 @@ void TrackView::slotVerticalZoomDown()
     if (m_verticalZoom == 0) return;
     m_verticalZoom--;
     m_doc->setZoom(m_doc->zoom().x(), m_verticalZoom);
-    if (m_verticalZoom == 0) m_trackview->setScale(m_scene->scale().x(), 0.5);
-    else m_trackview->setScale(m_scene->scale().x(), 1);
+    if (m_verticalZoom == 0)
+        m_trackview->setScale(m_scene->scale().x(), 0.5);
+    else
+        m_trackview->setScale(m_scene->scale().x(), 1);
     adjustTrackHeaders();
     m_trackview->verticalScrollBar()->setValue(headers_area->verticalScrollBar()->value());
 }
@@ -917,8 +925,10 @@ void TrackView::slotVerticalZoomUp()
     if (m_verticalZoom == 2) return;
     m_verticalZoom++;
     m_doc->setZoom(m_doc->zoom().x(), m_verticalZoom);
-    if (m_verticalZoom == 2) m_trackview->setScale(m_scene->scale().x(), 2);
-    else m_trackview->setScale(m_scene->scale().x(), 1);
+    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(headers_area->verticalScrollBar()->value());
 }
@@ -929,19 +939,26 @@ void TrackView::updateProjectFps()
     m_trackview->updateProjectFps();
 }
 
-void TrackView::slotRenameTrack(int ix)
+void TrackView::slotRenameTrack(int ix, QString name)
 {
     int tracknumber = m_doc->tracksCount() - ix;
-    TrackInfo info = m_doc->trackInfoAt(tracknumber - 1);
-    bool ok;
-    QString newName = QInputDialog::getText(this, i18n("New Track Name"), i18n("Enter new name"), QLineEdit::Normal, info.trackName, &ok);
-    if (ok) {
-        info.trackName = newName;
-        m_doc->setTrackType(tracknumber - 1, info);
-        QTimer::singleShot(300, this, SLOT(slotReloadTracks()));
-        m_doc->setModified(true);
-    }
+    QList <TrackInfo> tracks = m_doc->tracksList();
+    tracks[tracknumber - 1].trackName = name;
+    ConfigTracksCommand *configTracks = new ConfigTracksCommand(m_trackview, m_doc->tracksList(), tracks);
+    m_doc->commandStack()->push(configTracks);
+    m_doc->setModified(true);
+}
+
+void TrackView::slotUpdateVerticalScroll(int /*min*/, int max)
+{
+    int height = 0;
+    if (max > 0) height = m_trackview->horizontalScrollBar()->height() - 1;
+    headers_container->layout()->setContentsMargins(0, m_trackview->frameWidth(), 0, height);
 }
 
+void TrackView::updateRuler()
+{
+    m_ruler->update();
+}
 
 #include "trackview.moc"