diff src/MainWindow.cpp @ 362:ca53880fa3ca

Merge from default branch, and update to make sure we retain the DAW-style scrolling (page without moving playhead on scroll)

--- a/src/MainWindow.cpp	Thu Jun 19 14:52:37 2014 +0100
+++ b/src/MainWindow.cpp	Wed Jul 02 19:22:05 2014 +0100
@@ -187,6 +187,7 @@
     scroll->setWidget(m_paneStack);
 
     m_overview = new Overview(frame);
+    m_overview->setPlaybackFollow(PlaybackScrollPage);
     m_overview->setViewManager(m_viewManager);
     m_overview->setFixedHeight(40);
 #ifndef _WIN32
@@ -1567,6 +1568,7 @@
     m_document->setAutoAlignment(true);
 
     Pane *pane = m_paneStack->addPane();
+    pane->setPlaybackFollow(PlaybackScrollPage);
 
     connect(pane, SIGNAL(contextHelpChanged(const QString &)),
             this, SLOT(contextHelpChanged(const QString &)));
@@ -2934,7 +2936,7 @@
             .arg(startStr).arg(endStr).arg(durationStr);
     }
     
-    statusBar()->showMessage(m_myStatusMessage);
+    getStatusLabel()->setText(m_myStatusMessage);
 }
 
 void
@@ -3075,7 +3077,10 @@
         selectionStrip = m_paneStack->getPane(1);
     }
 
+    pane->setPlaybackFollow(PlaybackScrollPage);
+
     if (selectionStrip) {
+        selectionStrip->setPlaybackFollow(PlaybackScrollPage);
         selectionStrip->setFixedHeight(26);
         m_paneStack->sizePanesEqually();
         m_viewManager->clearToolModeOverrides();