comparison src/MainWindow.cpp @ 392:836afacacd92

Back out earlier experimental switch to select tool for default

                       .arg(int(WaveformLayer::MixChannels)));
     settings.endGroup();
 
     m_viewManager->setAlignMode(false);
     m_viewManager->setPlaySoloMode(false);
-    m_viewManager->setToolMode(ViewManager::SelectMode);
+    m_viewManager->setToolMode(ViewManager::NavigateMode);
     m_viewManager->setZoomWheelsEnabled(false);
     m_viewManager->setIlluminateLocalFeatures(true);
     m_viewManager->setShowWorkTitle(false);
     m_viewManager->setShowCentreLine(false);
     m_viewManager->setShowDuration(false);

     QActionGroup *group = new QActionGroup(this);
 
     IconLoader il;
 
     m_keyReference->setCategory(tr("Tool Selection"));
-
-    QAction *action = toolbar->addAction(il.load("select"),
-                                         tr("Select"));
-    action->setCheckable(true);
-    action->setChecked(true);
-    action->setShortcut(tr("1"));
-    action->setStatusTip(tr("Select"));
-    connect(action, SIGNAL(triggered()), this, SLOT(toolSelectSelected()));
-    connect(this, SIGNAL(replacedDocument()), action, SLOT(trigger()));
-    group->addAction(action);
-    menu->addAction(action);
-    m_keyReference->registerShortcut(action);
-
-/*
     QAction *action = toolbar->addAction(il.load("navigate"),
                                          tr("Navigate"));
     action->setCheckable(true);
     action->setChecked(true);
     action->setShortcut(tr("1"));

         (tr("Re-Analyse Area"), tr("Shift+Left"), 
          tr("Shift-click left button and drag to define a specific pitch and time range to re-analyse"));
     m_keyReference->registerShortcut
         (tr("Edit"), tr("Double-Click Left"), 
          tr("Double-click left button on an item to edit it"));
-    */
+
     m_keyReference->setCategory(tr("Tool Selection"));
     action = toolbar->addAction(il.load("move"),
 				tr("Edit"));
     action->setCheckable(true);
     action->setShortcut(tr("2"));

 
 void
 MainWindow::toolNavigateSelected()
 {
     m_viewManager->setToolMode(ViewManager::NavigateMode);
-    m_intelligentActionOn = true;
-}
-
-void
-MainWindow::toolSelectSelected()
-{
-    m_viewManager->setToolMode(ViewManager::SelectMode);
     m_intelligentActionOn = true;
 }
 
 void
 MainWindow::toolEditSelected()