From 2d8ba2b394e2988ca7b6b0115c4588bb9a213a06 Mon Sep 17 00:00:00 2001
From: Felix Geyer <debfx@fobos.de>
Date: Fri, 16 May 2014 12:33:29 +0200
Subject: [PATCH] Focus the search field instead of closing it when pressing
 the shortcut.

Closes #124
---
 src/gui/DatabaseWidget.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/gui/DatabaseWidget.cpp b/src/gui/DatabaseWidget.cpp
index fc533a3f3..c42dd5e07 100644
--- a/src/gui/DatabaseWidget.cpp
+++ b/src/gui/DatabaseWidget.cpp
@@ -681,8 +681,16 @@ void DatabaseWidget::switchToImportKeepass1(const QString& fileName)
 
 void DatabaseWidget::toggleSearch()
 {
-    if (m_entryView->inEntryListMode()) {
-        closeSearch();
+    if (isInSearchMode()) {
+        if (m_searchUi->searchEdit->hasFocus()) {
+            closeSearch();
+        }
+        else {
+            m_searchUi->searchEdit->selectAll();
+            m_searchUi->searchEdit->setFocus();
+            // make sure the search action is checked again
+            emitCurrentModeChanged();
+        }
     }
     else {
         showSearch();