Corrected search widget shortcut display on Mac

keepassxreboot · Oct 28, 2018 · 8a860c0 · 8a860c0
1 parent 5c504be
commit 8a860c0
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/src/gui/SearchWidget.cpp b/src/gui/SearchWidget.cpp
@@ -41,9 +41,11 @@ SearchWidget::SearchWidget(QWidget* parent)
     connect(m_searchTimer, SIGNAL(timeout()), this, SLOT(startSearch()));
     connect(this, SIGNAL(escapePressed()), m_ui->searchEdit, SLOT(clear()));
 
-    new QShortcut(Qt::CTRL + Qt::Key_F, this, SLOT(searchFocus()), nullptr, Qt::ApplicationShortcut);
+    new QShortcut(QKeySequence::Find, this, SLOT(searchFocus()), nullptr, Qt::ApplicationShortcut);
     new QShortcut(Qt::Key_Escape, m_ui->searchEdit, SLOT(clear()), nullptr, Qt::ApplicationShortcut);
 
+    m_ui->searchEdit->setPlaceholderText(tr("Search (%1)...", "Search placeholder text, %1 is the keyboard shortcut")
+                                            .arg(QKeySequence(QKeySequence::Find).toString()), QKeySequence::NativeText);
     m_ui->searchEdit->installEventFilter(this);
 
     QMenu* searchMenu = new QMenu();

diff --git a/src/gui/SearchWidget.ui b/src/gui/SearchWidget.ui
@@ -48,7 +48,7 @@
       <string notr="true">padding:3px</string>
      </property>
      <property name="placeholderText">
-      <string>Search (CTRL+F)...</string>
+      <string/>
      </property>
      <property name="clearButtonEnabled">
       <bool>false</bool>

diff --git a/tests/gui/TestGui.cpp b/tests/gui/TestGui.cpp
@@ -756,6 +756,10 @@ void TestGui::testTotp()
     QTest::mouseClick(setupTotpButtonBox->button(QDialogButtonBox::Ok), Qt::LeftButton);
     QTRY_VERIFY(!setupTotpButtonBox->isVisible());
 
+    // Make sure the entry is selected
+    clickIndex(item, entryView, Qt::LeftButton);
+    QApplication::processEvents();
+
     auto* entryEditAction = m_mainWindow->findChild<QAction*>("actionEntryEdit");
     QTRY_VERIFY(entryEditAction->isEnabled());
     QWidget* entryEditWidget = toolBar->widgetForAction(entryEditAction);