comparison src/MainWindow.cpp @ 77:170c334c54b9

Fix incorrect tool mode; add waveform to bottom (just to see how it looks, this isn't a very good way to do it)
author Chris Cannam
date Fri, 29 Nov 2013 14:52:13 +0000
parents 3bab1fc3e877
children ca570861c105
comparison
equal deleted inserted replaced
74:1d1b58751948 77:170c334c54b9
659 } 659 }
660 660
661 void 661 void
662 MainWindow::toolEditSelected() 662 MainWindow::toolEditSelected()
663 { 663 {
664 m_viewManager->setToolMode(ViewManager::EditMode); 664 m_viewManager->setToolMode(ViewManager::NoteEditMode);
665 m_intelligentActionOn = true; 665 m_intelligentActionOn = true;
666 m_analyser->setIntelligentActions(m_intelligentActionOn); 666 m_analyser->setIntelligentActions(m_intelligentActionOn);
667 } 667 }
668 668
669 void 669 void
670 MainWindow::toolFreeEditSelected() 670 MainWindow::toolFreeEditSelected()
671 { 671 {
672 m_viewManager->setToolMode(ViewManager::EditMode); 672 m_viewManager->setToolMode(ViewManager::NoteEditMode);
673 m_intelligentActionOn = false; 673 m_intelligentActionOn = false;
674 m_analyser->setIntelligentActions(m_intelligentActionOn); 674 m_analyser->setIntelligentActions(m_intelligentActionOn);
675 } 675 }
676 676
677 /* 677 /*
1455 if (model) { 1455 if (model) {
1456 if (m_paneStack) { 1456 if (m_paneStack) {
1457 Pane *pane = m_paneStack->getCurrentPane(); 1457 Pane *pane = m_paneStack->getCurrentPane();
1458 if (!pane) { 1458 if (!pane) {
1459 pane = m_paneStack->addPane(); 1459 pane = m_paneStack->addPane();
1460 /* 1460
1461 //!!! ugly. a waveform "shadow layer" might be nicer
1461 Pane *p2 = m_paneStack->addPane(); 1462 Pane *p2 = m_paneStack->addPane();
1463 p2->setFixedHeight(60);
1462 m_document->addLayerToView 1464 m_document->addLayerToView
1463 (p2, 1465 (p2,
1464 m_document->createMainModelLayer(LayerFactory::TimeRuler)); 1466 m_document->createMainModelLayer(LayerFactory::TimeRuler));
1465 m_document->addLayerToView 1467 m_document->addLayerToView
1466 (p2, 1468 (p2,
1467 m_document->createMainModelLayer(LayerFactory::Waveform)); 1469 m_document->createMainModelLayer(LayerFactory::Waveform));
1468 */ 1470 m_paneStack->sizePanesEqually();
1469 } 1471 }
1470 if (pane) { 1472 if (pane) {
1471 m_analyser->newFileLoaded 1473 m_analyser->newFileLoaded
1472 (m_document, getMainModel(), m_paneStack, pane); 1474 (m_document, getMainModel(), m_paneStack, pane);
1473 } 1475 }