changeset 318:440190ed1450

merge

--- a/src/MainWindow.cpp	Fri Jun 13 12:56:31 2014 +0100
+++ b/src/MainWindow.cpp	Fri Jun 13 13:31:34 2014 +0100
@@ -415,6 +415,7 @@
     setupFileMenu();
     setupEditMenu();
     setupViewMenu();
+    setupAnalysisMenu();
 
     m_mainMenusCreated = true;
 }
@@ -802,6 +803,41 @@
 }
 
 void
+MainWindow::setupAnalysisMenu()
+{
+    if (m_mainMenusCreated) return;
+
+    IconLoader il;
+
+    QAction *action = 0;
+
+    QMenu *menu = menuBar()->addMenu(tr("&Analysis"));
+    menu->setTearOffEnabled(true);
+
+    m_keyReference->setCategory(tr("Analysis"));
+
+    action = new QAction(tr("&Analyse now"), this);
+    action->setShortcut(tr("Ctrl+P"));
+    action->setStatusTip(tr("Analyse audio now to extract pitches and notes. (This will delete all existing pitches and notes.)"));
+    menu->addAction(action);
+    m_keyReference->registerShortcut(action);
+
+    menu->addSeparator();
+
+    action = new QAction(tr("Automatically Analyse New Audio"), this);
+    action->setCheckable(true);
+    action->setChecked(true);
+    menu->addAction(action);
+
+    action = new QAction(tr("Analyse Without Frequency-dependent Timing Bias (slow)"), this);
+    action->setCheckable(true);
+    action->setChecked(false);
+    
+    menu->addAction(action);
+
+}
+
+void
 MainWindow::setupHelpMenu()
 {
     QMenu *menu = menuBar()->addMenu(tr("&Help"));

--- a/src/MainWindow.h	Fri Jun 13 12:56:31 2014 +0100
+++ b/src/MainWindow.h	Fri Jun 13 13:31:34 2014 +0100
@@ -235,6 +235,7 @@
     virtual void setupFileMenu();
     virtual void setupEditMenu();
     virtual void setupViewMenu();
+    virtual void setupAnalysisMenu();
     virtual void setupHelpMenu();
     virtual void setupToolbars();