Git-Mirrors/keepassxc
1
0
Fork 0
mirror of https://github.com/keepassxreboot/keepassxc.git synced 2024-10-01 01:26:01 -04:00
Code Issues Packages Projects Releases Wiki Activity

Pressing escape quits search

Browse Source
This commit is contained in:
Akinori MUSHA 2017-01-26 00:30:16 +09:00 committed by Jonathan White
parent bb70edfdb3
commit 6ccae6cc37
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/gui/SearchWidget.cpp
View File

@ -41,6 +41,7 @@ SearchWidget::SearchWidget(QWidget *parent)
connect(this, SIGNAL(escapePressed()), m_ui->searchEdit, SLOT(clear())); connect(this, SIGNAL(escapePressed()), m_ui->searchEdit, SLOT(clear()));
new QShortcut(Qt::CTRL + Qt::Key_F, this, SLOT(searchFocus()), nullptr, Qt::ApplicationShortcut); new QShortcut(Qt::CTRL + Qt::Key_F, this, SLOT(searchFocus()), nullptr, Qt::ApplicationShortcut);
new QShortcut(Qt::Key_Escape, m_ui->searchEdit, SLOT(clear()), nullptr, Qt::ApplicationShortcut);
m_ui->searchEdit->installEventFilter(this); m_ui->searchEdit->installEventFilter(this);

3
tests/gui/TestGui.cpp
View File

@ -481,8 +481,7 @@ void TestGui::testSearch()
QCOMPARE(entry->title(), origTitle.append("_edited")); QCOMPARE(entry->title(), origTitle.append("_edited"));
// Cancel search, should return to normal view // Cancel search, should return to normal view
QTest::mouseClick(searchTextEdit, Qt::LeftButton); QTest::keyClick(m_mainWindow, Qt::Key_Escape);
QTest::keyClick(searchTextEdit, Qt::Key_Escape);
QTRY_COMPARE(m_dbWidget->currentMode(), DatabaseWidget::ViewMode); QTRY_COMPARE(m_dbWidget->currentMode(), DatabaseWidget::ViewMode);
} }