feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

Fix issues with "Select All" (search results)

Browse Source 
- the shortcut Alt+Return conflicts with "Trigger Refactoring Action"
- display the shortcut in find toolbar button's tooltip
- no need to repeat the default shortcut (it's the same Command)

Change-Id: Ifd1e56ba091806901241bdca66c42a332574bc0c
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
Eike Ziller
2022-01-25 14:17:55 +01:00
parent 3a9ce46928
commit a4b3085acb
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/plugins/coreplugin/find/findtoolbar.cpp
View File

@@ -224,12 +224,12 @@ FindToolBar::FindToolBar(CurrentDocumentFind *currentDocumentFind)
m_selectAllAction = new QAction(tr("Select All"), this); m_selectAllAction = new QAction(tr("Select All"), this);
cmd = ActionManager::registerAction(m_selectAllAction, Constants::FIND_SELECT_ALL); cmd = ActionManager::registerAction(m_selectAllAction, Constants::FIND_SELECT_ALL);
cmd->setDefaultKeySequence(QKeySequence(tr("Alt+Return"))); cmd->setDefaultKeySequence(QKeySequence(tr("Ctrl+Alt+Return")));
mfind->addAction(cmd, Constants::G_FIND_ACTIONS); mfind->addAction(cmd, Constants::G_FIND_ACTIONS);
connect(m_selectAllAction, &QAction::triggered, this, &FindToolBar::selectAll); connect(m_selectAllAction, &QAction::triggered, this, &FindToolBar::selectAll);
m_localSelectAllAction = new QAction(m_selectAllAction->text(), this); m_localSelectAllAction = new QAction(m_selectAllAction->text(), this);
cmd = ActionManager::registerAction(m_localSelectAllAction, Constants::FIND_SELECT_ALL, findcontext); cmd = ActionManager::registerAction(m_localSelectAllAction, Constants::FIND_SELECT_ALL, findcontext);
cmd->setDefaultKeySequence(QKeySequence(tr("Alt+Return"))); cmd->augmentActionWithShortcutToolTip(m_localSelectAllAction);
connect(m_localSelectAllAction, &QAction::triggered, this, &FindToolBar::selectAll); connect(m_localSelectAllAction, &QAction::triggered, this, &FindToolBar::selectAll);
m_ui.selectAllButton->setDefaultAction(m_localSelectAllAction); m_ui.selectAllButton->setDefaultAction(m_localSelectAllAction);