# HG changeset patch
# User Chris Cannam
# Date 1404325325 -3600
# Node ID ca53880fa3ca1d08f8708fa219a0ec13a713372a
# Parent  aa576f9213bfb87ca4fbc204aabff887b4788da6
Merge from default branch, and update to make sure we retain the DAW-style scrolling (page without moving playhead on scroll)

diff -r aa576f9213bf -r ca53880fa3ca .hgsubstate
--- a/.hgsubstate	Thu Jun 19 14:52:37 2014 +0100
+++ b/.hgsubstate	Wed Jul 02 19:22:05 2014 +0100
@@ -2,6 +2,6 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 e637cf9160029c6d429bf89fedca157619ca8da8 pyin
 553a5f65ef64811747a6613f759622d655db63c1 sv-dependency-builds
-1162c93e76880751100f7bf42969fa9b5176e13c svapp
-f960d67ce84237be28902f24d5c757a72dc8004b svcore
-b68af2be4545adf04eec58c50d8419dc574b8642 svgui
+d8bde801ebd40d722df379eee3b40729d3b78380 svapp
+178ffa964096f32ace219b21e0fb2e7e71bde1a2 svcore
+24f18a7dd26d0cb175adfa807b606ace84795327 svgui
diff -r aa576f9213bf -r ca53880fa3ca src/MainWindow.cpp
--- 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();
diff -r aa576f9213bf -r ca53880fa3ca src/main.cpp
--- a/src/main.cpp	Thu Jun 19 14:52:37 2014 +0100
+++ b/src/main.cpp	Wed Jul 02 19:22:05 2014 +0100
@@ -290,7 +290,7 @@
 
     if (path.endsWith("ton")) {
         if (!haveSession) {
-            status = m_mainWindow->openSessionFile(path);
+            status = m_mainWindow->openSessionPath(path);
             if (status == MainWindow::FileOpenSucceeded) {
                 haveSession = true;
                 haveMainModel = true;