# HG changeset patch
# User Chris Cannam
# Date 1385736826 0
# Node ID 896b89e67f3ccb93aa11ae911db90ad798471675
# Parent  170c334c54b90b1adaf8997e2923d71aae99f93f# Parent  df8784695584151284836b689ffc098f51aa426f
Merge

diff -r df8784695584 -r 896b89e67f3c .hgsubstate
--- a/.hgsubstate	Fri Nov 29 14:35:39 2013 +0000
+++ b/.hgsubstate	Fri Nov 29 14:53:46 2013 +0000
@@ -1,4 +1,4 @@
 236814e07bd07473958c1ff89103124536a0c3c8 dataquay
 14b1768e54069b9b6ff386546cacd75d65d8f5a8 svapp
 2d53205f70cd8985126b491673b419a8c0f00d67 svcore
-f46da276b21cd00116a9004afb4665b30eb58523 svgui
+212644efa523f61316450bc6ee92f3f5158f68f3 svgui
diff -r df8784695584 -r 896b89e67f3c src/MainWindow.cpp
--- a/src/MainWindow.cpp	Fri Nov 29 14:35:39 2013 +0000
+++ b/src/MainWindow.cpp	Fri Nov 29 14:53:46 2013 +0000
@@ -661,7 +661,7 @@
 void
 MainWindow::toolEditSelected()
 {
-    m_viewManager->setToolMode(ViewManager::EditMode);
+    m_viewManager->setToolMode(ViewManager::NoteEditMode);
     m_intelligentActionOn = true;
     m_analyser->setIntelligentActions(m_intelligentActionOn);
 }
@@ -669,7 +669,7 @@
 void
 MainWindow::toolFreeEditSelected()
 {
-    m_viewManager->setToolMode(ViewManager::EditMode);
+    m_viewManager->setToolMode(ViewManager::NoteEditMode);
     m_intelligentActionOn = false;
     m_analyser->setIntelligentActions(m_intelligentActionOn);
 }
@@ -1457,15 +1457,17 @@
             Pane *pane = m_paneStack->getCurrentPane();
             if (!pane) {
                 pane = m_paneStack->addPane();
-/*
+
+                //!!! ugly. a waveform "shadow layer" might be nicer
                 Pane *p2 = m_paneStack->addPane();
+                p2->setFixedHeight(60);
                 m_document->addLayerToView
                     (p2,
                      m_document->createMainModelLayer(LayerFactory::TimeRuler));
                 m_document->addLayerToView
                     (p2,
                      m_document->createMainModelLayer(LayerFactory::Waveform));
-*/
+                m_paneStack->sizePanesEqually();
             }
             if (pane) {
                 m_analyser->newFileLoaded