changeset 96:291381b0340c

Use non-SV-preferred export types, set layer type setting for flexi note, temporarily (?) remove third tool

--- a/.hgsubstate	Wed Dec 04 18:31:39 2013 +0000
+++ b/.hgsubstate	Wed Dec 04 19:30:42 2013 +0000
@@ -1,4 +1,4 @@
 236814e07bd07473958c1ff89103124536a0c3c8 dataquay
 febd49356ef308ee10f07257b239cf66742bfedc svapp
-cc3f78e89df010bf6e87c735688738b980f51385 svcore
+13803edd513db44070abe2046e31ce3f176abbc4 svcore
 cc6b219762614a33cf00614c4a6e200c0da8efe6 svgui

--- a/src/MainWindow.cpp	Wed Dec 04 18:31:39 2013 +0000
+++ b/src/MainWindow.cpp	Wed Dec 04 19:30:42 2013 +0000
@@ -124,6 +124,10 @@
     settings.setValue("showstatusbar", false);
     settings.endGroup();
 
+    settings.beginGroup("Transformer");
+    settings.setValue("use-flexi-note-model", true);
+    settings.endGroup();
+
     settings.beginGroup("LayerDefaults");
     settings.setValue("waveform",
                       QString("<layer scale=\"%1\" channelMode=\"%2\"/>")
@@ -639,6 +643,8 @@
     group->addAction(action);
     m_keyReference->registerShortcut(action);
 
+/* Remove for now...
+
     action = toolbar->addAction(il.load("notes"),
 				tr("Free Edit"));
     action->setCheckable(true);
@@ -648,28 +654,7 @@
     connect(this, SIGNAL(canEditLayer(bool)), action, SLOT(setEnabled(bool)));
     group->addAction(action);
     m_keyReference->registerShortcut(action);
-
-
-    /*
-    toolbar = addToolBar(tr("Test actions toolbar")); // GF: temporary toolbar for triggering actions manually
-    
-    // GF: TEMP : this created a menu item
-    m_editSelectAction = toolbar->addAction(il.load("move"), tr("Edit"));
-    m_editSelectAction->setShortcut(tr("Home"));
-    m_editSelectAction->setStatusTip(tr("Edit Notes"));
-    m_editSelectAction->setEnabled(true);
-    // connect(test, SIGNAL(triggered()), this, SLOT(about()));
-    // connect(test, SIGNAL(triggered()), m_analyser, SLOT(resizeLayer()));
-    connect(m_editSelectAction, SIGNAL(triggered()), this, SLOT(selectNoteEditMode())); 
-    // connect(this, SIGNAL(canPlay(bool)), test, SLOT(setEnabled(bool)));
-    menu->addAction(m_editSelectAction);
-    
-    m_toggleIntelligenceAction = toolbar->addAction(il.load("notes"), tr("EditMode"));
-    // m_toggleIntelligenceAction->setShortcut(tr("Home"));
-    m_toggleIntelligenceAction->setStatusTip(tr("Toggle note edit boundary constraints and automation"));
-    m_toggleIntelligenceAction->setEnabled(true);
-    connect(m_toggleIntelligenceAction, SIGNAL(triggered()), this, SLOT(toggleNoteEditIntelligence()));
-    */
+*/
     Pane::registerShortcuts(*m_keyReference);
 }
 
@@ -696,37 +681,6 @@
     m_analyser->setIntelligentActions(m_intelligentActionOn);
 }
 
-/*
-void
-MainWindow::selectNoteEditMode()   
-{
-    IconLoader il;
-    if (m_viewManager->getToolMode() == ViewManager::NoteEditMode) {
-        m_viewManager->setToolMode(ViewManager::NavigateMode);
-        m_editSelectAction->setIcon(il.load("move"));
-    } else {
-        cerr << "NoteEdit mode selected" << endl;
-        m_viewManager->setToolMode(ViewManager::NoteEditMode);
-        m_editSelectAction->setIcon(il.load("navigate"));
-    }
-}
-
-void
-MainWindow::toggleNoteEditIntelligence()
-{
-    IconLoader il;
-    if (m_intelligentActionOn == true) {
-        m_toggleIntelligenceAction->setIcon(il.load("values"));
-        m_intelligentActionOn = false;
-        m_analyser->setIntelligentActions(false);
-    } else {
-        m_toggleIntelligenceAction->setIcon(il.load("notes"));
-        m_intelligentActionOn = true;
-        m_analyser->setIntelligentActions(true);
-    }
-}
-*/
-
 void
 MainWindow::updateMenuStates()
 {
@@ -1198,7 +1152,7 @@
         qobject_cast<SparseTimeValueModel *>(layer->getModel());
     if (!model) return;
 
-    FileFinder::FileType type = FileFinder::LayerFileNoMidi;
+    FileFinder::FileType type = FileFinder::LayerFileNoMidiNonSV;
 
     QString path = getSaveFileName(type);
 
@@ -1259,7 +1213,7 @@
     FlexiNoteModel *model = qobject_cast<FlexiNoteModel *>(layer->getModel());
     if (!model) return;
 
-    FileFinder::FileType type = FileFinder::LayerFile;
+    FileFinder::FileType type = FileFinder::LayerFileNonSV;
 
     QString path = getSaveFileName(type);