Mercurial > hg > tony

changeset 73:3bab1fc3e877

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Nothing very successful
author Chris Cannam
date Thu, 28 Nov 2013 16:49:45 +0000
parents 081202998535
children 1d1b58751948
files .hgsubstate src/MainWindow.cpp
diffstat 2 files changed, 18 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Thu Nov 28 15:13:56 2013 +0000
+++ b/.hgsubstate	Thu Nov 28 16:49:45 2013 +0000
@@ -1,4 +1,4 @@
 236814e07bd07473958c1ff89103124536a0c3c8 dataquay
 14b1768e54069b9b6ff386546cacd75d65d8f5a8 svapp
 2d53205f70cd8985126b491673b419a8c0f00d67 svcore
-917039d333bb3b70a66cb8257dc6c1c958f5f5dd svgui
+f46da276b21cd00116a9004afb4665b30eb58523 svgui
--- a/src/MainWindow.cpp	Thu Nov 28 15:13:56 2013 +0000
+++ b/src/MainWindow.cpp	Thu Nov 28 16:49:45 2013 +0000
@@ -122,6 +122,13 @@
     settings.setValue("showstatusbar", false);
     settings.endGroup();
 
+    settings.beginGroup("LayerDefaults");
+    settings.setValue("waveform",
+                      QString("<layer scale=\"%1\" channelMode=\"%2\"/>")
+                      .arg(int(WaveformLayer::LinearScale))
+                      .arg(int(WaveformLayer::MixChannels)));
+    settings.endGroup();
+
     m_viewManager->setAlignMode(false);
     m_viewManager->setPlaySoloMode(false);
     m_viewManager->setToolMode(ViewManager::NavigateMode);
@@ -616,6 +623,7 @@
     action->setShortcut(tr("3"));
     action->setStatusTip(tr("Free Edit"));
     connect(action, SIGNAL(triggered()), this, SLOT(toolFreeEditSelected()));
+    connect(this, SIGNAL(canEditLayer(bool)), action, SLOT(setEnabled(bool)));
     group->addAction(action);
     m_keyReference->registerShortcut(action);
 
@@ -1449,6 +1457,15 @@
             Pane *pane = m_paneStack->getCurrentPane();
             if (!pane) {
                 pane = m_paneStack->addPane();
+/*
+                Pane *p2 = m_paneStack->addPane();
+                m_document->addLayerToView
+                    (p2,
+                     m_document->createMainModelLayer(LayerFactory::TimeRuler));
+                m_document->addLayerToView
+                    (p2,
+                     m_document->createMainModelLayer(LayerFactory::Waveform));
+*/
             }
             if (pane) {
                 m_analyser->newFileLoaded