# HG changeset patch
# User matthiasm
# Date 1405435366 -3600
# Node ID fec4dafd90939408025cad256ec89ba68ba39b68
# Parent  f5a4c4283b93430fd44bd94e173c4e41df878e40# Parent  ca53880fa3ca1d08f8708fa219a0ec13a713372a
mergewq

diff -r f5a4c4283b93 -r fec4dafd9093 .hgsubstate
--- a/.hgsubstate	Tue Jul 15 15:42:21 2014 +0100
+++ b/.hgsubstate	Tue Jul 15 15:42:46 2014 +0100
@@ -2,6 +2,6 @@
 d16f0fd6db6104d87882bc43788a3bb1b0f8c528 dataquay
 4cbbd87a8c7f95ccac8e7900eef4f08bbdbb032f pyin
 553a5f65ef64811747a6613f759622d655db63c1 sv-dependency-builds
-1162c93e76880751100f7bf42969fa9b5176e13c svapp
-f960d67ce84237be28902f24d5c757a72dc8004b svcore
-a9731b49745a3ab73b5c5597004e6bc25f14f4dc svgui
+d8bde801ebd40d722df379eee3b40729d3b78380 svapp
+178ffa964096f32ace219b21e0fb2e7e71bde1a2 svcore
+24f18a7dd26d0cb175adfa807b606ace84795327 svgui
diff -r f5a4c4283b93 -r fec4dafd9093 src/MainWindow.cpp
--- a/src/MainWindow.cpp	Tue Jul 15 15:42:21 2014 +0100
+++ b/src/MainWindow.cpp	Tue Jul 15 15:42:46 2014 +0100
@@ -189,6 +189,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
@@ -1569,6 +1570,7 @@
     m_document->setAutoAlignment(true);
 
     Pane *pane = m_paneStack->addPane();
+    pane->setPlaybackFollow(PlaybackScrollPage);
 
     connect(pane, SIGNAL(contextHelpChanged(const QString &)),
             this, SLOT(contextHelpChanged(const QString &)));
@@ -2936,7 +2938,7 @@
             .arg(startStr).arg(endStr).arg(durationStr);
     }
     
-    statusBar()->showMessage(m_myStatusMessage);
+    getStatusLabel()->setText(m_myStatusMessage);
 }
 
 void
@@ -3077,7 +3079,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 f5a4c4283b93 -r fec4dafd9093 src/main.cpp
--- a/src/main.cpp	Tue Jul 15 15:42:21 2014 +0100
+++ b/src/main.cpp	Tue Jul 15 15:42:46 2014 +0100
@@ -289,7 +289,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;