diff src/MainWindow.cpp @ 392:836afacacd92

Back out earlier experimental switch to select tool for default

--- a/src/MainWindow.cpp	Mon Nov 10 10:07:07 2014 +0000
+++ b/src/MainWindow.cpp	Mon Nov 10 14:41:00 2014 +0000
@@ -159,7 +159,7 @@
 
     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);
@@ -580,20 +580,6 @@
     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);
@@ -617,7 +603,7 @@
     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"));
@@ -1358,13 +1344,6 @@
 }
 
 void
-MainWindow::toolSelectSelected()
-{
-    m_viewManager->setToolMode(ViewManager::SelectMode);
-    m_intelligentActionOn = true;
-}
-
-void
 MainWindow::toolEditSelected()
 {
     cerr << "MainWindow::toolEditSelected" << endl;