Mercurial > hg > tony

changeset 80:ce44317dd055

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
merge
author matthiasm
date Fri, 29 Nov 2013 14:55:25 +0000
parents f2c853101aeb (current diff) 896b89e67f3c (diff)
children f3ab20d784ff
files
diffstat 2 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Fri Nov 29 14:54:36 2013 +0000
+++ b/.hgsubstate	Fri Nov 29 14:55:25 2013 +0000
@@ -1,4 +1,4 @@
 236814e07bd07473958c1ff89103124536a0c3c8 dataquay
 14b1768e54069b9b6ff386546cacd75d65d8f5a8 svapp
 2d53205f70cd8985126b491673b419a8c0f00d67 svcore
-f46da276b21cd00116a9004afb4665b30eb58523 svgui
+212644efa523f61316450bc6ee92f3f5158f68f3 svgui
--- a/src/MainWindow.cpp	Fri Nov 29 14:54:36 2013 +0000
+++ b/src/MainWindow.cpp	Fri Nov 29 14:55:25 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