comparison 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)

     connect(m_paneStack, SIGNAL(doubleClickSelectInvoked(int)),
             this, SLOT(doubleClickSelectInvoked(int)));
     scroll->setWidget(m_paneStack);
 
     m_overview = new Overview(frame);
+    m_overview->setPlaybackFollow(PlaybackScrollPage);
     m_overview->setViewManager(m_viewManager);
     m_overview->setFixedHeight(40);
 #ifndef _WIN32
     // For some reason, the contents of the overview never appear if we
     // make this setting on Windows.  I have no inclination at the moment

     closeSession();
     createDocument();
     m_document->setAutoAlignment(true);
 
     Pane *pane = m_paneStack->addPane();
+    pane->setPlaybackFollow(PlaybackScrollPage);
 
     connect(pane, SIGNAL(contextHelpChanged(const QString &)),
             this, SLOT(contextHelpChanged(const QString &)));
 
 //    Layer *waveform = m_document->createMainModelLayer(LayerFactory::Waveform);

     } else {
         m_myStatusMessage = tr("Visible: %1 to %2 (duration %3)")
             .arg(startStr).arg(endStr).arg(durationStr);
     }
     
-    statusBar()->showMessage(m_myStatusMessage);
+    getStatusLabel()->setText(m_myStatusMessage);
 }
 
 void
 MainWindow::updatePositionStatusDisplays() const
 {

     } else {
         pane = m_paneStack->getPane(0);
         selectionStrip = m_paneStack->getPane(1);
     }
 
+    pane->setPlaybackFollow(PlaybackScrollPage);
+
     if (selectionStrip) {
+        selectionStrip->setPlaybackFollow(PlaybackScrollPage);
         selectionStrip->setFixedHeight(26);
         m_paneStack->sizePanesEqually();
         m_viewManager->clearToolModeOverrides();
         m_viewManager->setToolModeFor(selectionStrip,
                                       ViewManager::SelectMode);