From b0e038e7891efbcab073ff66c72932aeb09cf687 Mon Sep 17 00:00:00 2001 From: Jonathan White Date: Wed, 7 Oct 2020 21:14:32 -0400 Subject: Improve default Qt widget icons * Include new icons for toolbar overflow to ensure they are tinted correctly and fit in with the rest of the UI. * Replace custom code for clearing line edits by including a proper icon for the default action. --- tests/gui/TestGui.cpp | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) (limited to 'tests') diff --git a/tests/gui/TestGui.cpp b/tests/gui/TestGui.cpp index d323744b6..060a29520 100644 --- a/tests/gui/TestGui.cpp +++ b/tests/gui/TestGui.cpp @@ -855,8 +855,7 @@ void TestGui::testSearch() auto* entryView = m_dbWidget->findChild("entryView"); QVERIFY(entryView->isVisible()); - auto* clearButton = searchWidget->findChild("clearIcon"); - QVERIFY(!clearButton->isVisible()); + QVERIFY(searchTextEdit->isClearButtonEnabled()); auto* helpButton = searchWidget->findChild("helpIcon"); auto* helpPanel = searchWidget->findChild("SearchHelpWidget"); @@ -866,7 +865,6 @@ void TestGui::testSearch() // Enter search QTest::mouseClick(searchTextEdit, Qt::LeftButton); QTRY_VERIFY(searchTextEdit->hasFocus()); - QTRY_VERIFY(!clearButton->isVisible()); // Show/Hide search help helpButton->trigger(); QTRY_VERIFY(helpPanel->isVisible()); @@ -877,14 +875,12 @@ void TestGui::testSearch() // Search for "ZZZ" QTest::keyClicks(searchTextEdit, "ZZZ"); QTRY_COMPARE(searchTextEdit->text(), QString("ZZZ")); - QTRY_VERIFY(clearButton->isVisible()); QTRY_VERIFY(m_dbWidget->isSearchActive()); QTRY_COMPARE(entryView->model()->rowCount(), 0); // Press the search clear button - clearButton->trigger(); + searchTextEdit->clear(); QTRY_VERIFY(searchTextEdit->text().isEmpty()); QTRY_VERIFY(searchTextEdit->hasFocus()); - QTRY_VERIFY(!clearButton->isVisible()); // Escape clears searchedit and retains focus QTest::keyClicks(searchTextEdit, "ZZZ"); QTest::keyClick(searchTextEdit, Qt::Key_Escape); -- cgit v1.2.3