comparison main/MainWindow.cpp @ 65:77c083741589

* Rename the existing Panner to Overview (big duh!)
* Fixes to the new Panner.

 #include "layer/TimeRulerLayer.h"
 #include "layer/TimeInstantLayer.h"
 #include "layer/TimeValueLayer.h"
 #include "layer/Colour3DPlotLayer.h"
 #include "widgets/Fader.h"
-#include "view/Panner.h"
+#include "view/Overview.h"
 #include "widgets/PropertyBox.h"
 #include "widgets/PropertyStack.h"
 #include "widgets/AudioDial.h"
 #include "widgets/LayerTree.h"
 #include "widgets/ListInputDialog.h"

 
 MainWindow::MainWindow(bool withAudioOutput) :
     m_document(0),
     m_paneStack(0),
     m_viewManager(0),
-    m_panner(0),
+    m_overview(0),
     m_timeRulerLayer(0),
     m_audioOutput(withAudioOutput),
     m_playSource(0),
     m_playTarget(0),
     m_recentFiles("RecentFiles"),

     connect(m_paneStack, SIGNAL(currentLayerChanged(Pane *, Layer *)),
 	    this, SLOT(currentLayerChanged(Pane *, Layer *)));
     connect(m_paneStack, SIGNAL(rightButtonMenuRequested(Pane *, QPoint)),
             this, SLOT(rightButtonMenuRequested(Pane *, QPoint)));
 
-    m_panner = new Panner(frame);
-    m_panner->setViewManager(m_viewManager);
-    m_panner->setFixedHeight(40);
+    m_overview = new Overview(frame);
+    m_overview->setViewManager(m_viewManager);
+    m_overview->setFixedHeight(40);
 
     m_panLayer = new WaveformLayer;
     m_panLayer->setChannelMode(WaveformLayer::MergeChannels);
 //    m_panLayer->setScale(WaveformLayer::MeterScale);
 //    m_panLayer->setAutoNormalize(true);
     m_panLayer->setBaseColour(Qt::darkGreen);
     m_panLayer->setAggressiveCacheing(true);
-    m_panner->addLayer(m_panLayer);
+    m_overview->addLayer(m_panLayer);
 
     m_playSource = new AudioCallbackPlaySource(m_viewManager);
 
     connect(m_playSource, SIGNAL(sampleRateMismatch(size_t, size_t, bool)),
 	    this,           SLOT(sampleRateMismatch(size_t, size_t, bool)));

     m_playSharpen->setChecked(settings.value("playsharpen", true).toBool());
     m_playMono->setChecked(settings.value("playmono", false).toBool());
     settings.endGroup();
 
     layout->addWidget(m_paneStack, 0, 0, 1, 5);
-    layout->addWidget(m_panner, 1, 0);
+    layout->addWidget(m_overview, 1, 0);
     layout->addWidget(m_fader, 1, 1);
     layout->addWidget(m_playSpeed, 1, 2);
     layout->addWidget(m_playSharpen, 1, 3);
     layout->addWidget(m_playMono, 1, 4);
 

     m_document->addLayerToView(pane, m_timeRulerLayer);
 
     Layer *waveform = m_document->createMainModelLayer(LayerFactory::Waveform);
     m_document->addLayerToView(pane, waveform);
 
-    m_panner->registerView(pane);
+    m_overview->registerView(pane);
 
     CommandHistory::getInstance()->clear();
     CommandHistory::getInstance()->documentSaved();
     documentRestored();
     updateMenuStates();

 	while (pane->getLayerCount() > 0) {
 	    m_document->removeLayerFromView
 		(pane, pane->getLayer(pane->getLayerCount() - 1));
 	}
 
-	m_panner->unregisterView(pane);
+	m_overview->unregisterView(pane);
 	m_paneStack->deletePane(pane);
     }
 
     while (m_paneStack->getHiddenPaneCount() > 0) {
 

 	while (pane->getLayerCount() > 0) {
 	    m_document->removeLayerFromView
 		(pane, pane->getLayer(pane->getLayerCount() - 1));
 	}
 
-	m_panner->unregisterView(pane);
+	m_overview->unregisterView(pane);
 	m_paneStack->deletePane(pane);
     }
 
     delete m_document;
     m_document = 0;

     } else {
 	m_mw->m_paneStack->showPane(m_pane);
     }
 
     m_mw->m_paneStack->setCurrentPane(m_pane);
-    m_mw->m_panner->registerView(m_pane);
+    m_mw->m_overview->registerView(m_pane);
     m_added = true;
 }
 
 void
 MainWindow::AddPaneCommand::unexecute()
 {
     m_mw->m_paneStack->hidePane(m_pane);
     m_mw->m_paneStack->setCurrentPane(m_prevCurrentPane);
-    m_mw->m_panner->unregisterView(m_pane); 
+    m_mw->m_overview->unregisterView(m_pane); 
     m_added = false;
 }
 
 MainWindow::RemovePaneCommand::RemovePaneCommand(MainWindow *mw, Pane *pane) :
     m_mw(mw),

 void
 MainWindow::RemovePaneCommand::execute()
 {
     m_prevCurrentPane = m_mw->m_paneStack->getCurrentPane();
     m_mw->m_paneStack->hidePane(m_pane);
-    m_mw->m_panner->unregisterView(m_pane);
+    m_mw->m_overview->unregisterView(m_pane);
     m_added = false;
 }
 
 void
 MainWindow::RemovePaneCommand::unexecute()
 {
     m_mw->m_paneStack->showPane(m_pane);
     m_mw->m_paneStack->setCurrentPane(m_prevCurrentPane);
-    m_mw->m_panner->registerView(m_pane);
+    m_mw->m_overview->registerView(m_pane);
     m_added = true;
 }
 
 void
 MainWindow::addLayer()