Mercurial > hg > tony
changeset 390:09aaceb76251
Experimentally make select tool the default, instead of navigate. People are reporting problems working out how to select things, we need to address that.
| author | Chris Cannam |
|---|---|
| date | Mon, 10 Nov 2014 09:54:51 +0000 |
| parents | 8352f3930f9c |
| children | 54676e2449b8 |
| files | .hgsubstate src/MainWindow.cpp src/MainWindow.h |
| diffstat | 3 files changed, 25 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgsubstate Mon Nov 10 09:36:45 2014 +0000 +++ b/.hgsubstate Mon Nov 10 09:54:51 2014 +0000 @@ -4,4 +4,4 @@ 553a5f65ef64811747a6613f759622d655db63c1 sv-dependency-builds d62a622a0e4077252c7d5e786986df8ca59e83ad svapp ba404199345fa3948e7c5aa33aaf7cdbd8904cd6 svcore -6c08e99ca0f3019133f88c82c4df6d7468e85e69 svgui +0cdaf382f21eb4c743f71c7fad3fe9573aeefbe7 svgui
--- a/src/MainWindow.cpp Mon Nov 10 09:36:45 2014 +0000 +++ b/src/MainWindow.cpp Mon Nov 10 09:54:51 2014 +0000 @@ -159,7 +159,7 @@ m_viewManager->setAlignMode(false); m_viewManager->setPlaySoloMode(false); - m_viewManager->setToolMode(ViewManager::NavigateMode); + m_viewManager->setToolMode(ViewManager::SelectMode); m_viewManager->setZoomWheelsEnabled(false); m_viewManager->setIlluminateLocalFeatures(true); m_viewManager->setShowWorkTitle(false); @@ -580,6 +580,20 @@ 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); @@ -603,7 +617,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")); @@ -1344,6 +1358,13 @@ } void +MainWindow::toolSelectSelected() +{ + m_viewManager->setToolMode(ViewManager::SelectMode); + m_intelligentActionOn = true; +} + +void MainWindow::toolEditSelected() { cerr << "MainWindow::toolEditSelected" << endl;