Mercurial > hg > tony

changeset 392:836afacacd92

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Back out earlier experimental switch to select tool for default
author Chris Cannam
date Mon, 10 Nov 2014 14:41:00 +0000
parents 54676e2449b8
children bed6493c3042
files .hgsubstate src/MainWindow.cpp src/MainWindow.h
diffstat 3 files changed, 3 insertions(+), 25 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Mon Nov 10 10:07:07 2014 +0000
+++ b/.hgsubstate	Mon Nov 10 14:41:00 2014 +0000
@@ -4,4 +4,4 @@
 553a5f65ef64811747a6613f759622d655db63c1 sv-dependency-builds
 d62a622a0e4077252c7d5e786986df8ca59e83ad svapp
 ba404199345fa3948e7c5aa33aaf7cdbd8904cd6 svcore
-0cdaf382f21eb4c743f71c7fad3fe9573aeefbe7 svgui
+6c08e99ca0f3019133f88c82c4df6d7468e85e69 svgui
--- 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;
--- a/src/MainWindow.h	Mon Nov 10 10:07:07 2014 +0000
+++ b/src/MainWindow.h	Mon Nov 10 14:41:00 2014 +0000
@@ -55,7 +55,6 @@
     virtual void closeSession();
 
     virtual void toolNavigateSelected();
-    virtual void toolSelectSelected();
     virtual void toolEditSelected();
     virtual void toolFreeEditSelected();