From 373d83949711e80cde13872a3220f6c5125c8223 Mon Sep 17 00:00:00 2001
From: Le Tan <tamlokveer@gmail.com>
Date: Tue, 3 Apr 2018 19:38:12 +0800
Subject: [PATCH] UniversalEntry: refinement

---
 src/vhelpue.cpp         |  9 ++++++++-
 src/vsearcher.cpp       |  1 -
 src/vuniversalentry.cpp | 14 ++++++++++++++
 3 files changed, 22 insertions(+), 2 deletions(-)

diff --git a/src/vhelpue.cpp b/src/vhelpue.cpp
index 967306d3..d0de9aaa 100644
--- a/src/vhelpue.cpp
+++ b/src/vhelpue.cpp
@@ -60,9 +60,11 @@ void VHelpUE::clear(int p_id)
 bool VHelpUE::initListWidget()
 {
     if (m_listWidget->count() == 0) {
-        m_listWidget->addItem(tr("Esc/Ctrl+[: Hide Universal Entry"));
+        m_listWidget->addItem(tr("Esc or Ctrl+[: Hide Universal Entry"));
         m_listWidget->addItem(tr("Ctrl+U: Clear the command input"));
         m_listWidget->addItem(tr("Ctrl+E: Clear the command input except the entry key"));
+        m_listWidget->addItem(tr("Ctrl+F: Select the entry key to change"));
+        m_listWidget->addItem(tr("Ctrl+D: Cancel the command"));
         m_listWidget->addItem(tr("Ctrl+J: Go to next item"));
         m_listWidget->addItem(tr("Ctrl+K: Go to previous item"));
         m_listWidget->addItem(tr("Ctrl+R: Go to current item's parent item"));
@@ -70,6 +72,11 @@ bool VHelpUE::initListWidget()
         m_listWidget->addItem(tr("Ctrl+S: Sort items"));
         m_listWidget->addItem(tr("Enter: Activate current item"));
         m_listWidget->addItem(tr("Ctrl+M: Browse current item folder or the folder containing current item"));
+        m_listWidget->addItem(tr("Magic Switches:"));
+        m_listWidget->addItem(tr("\\c or \\C: Case insensitive or sensitive"));
+        m_listWidget->addItem(tr("\\r or \\R: Disable or enable regular expression"));
+        m_listWidget->addItem(tr("\\f or \\F: Disable or enable fuzzy search"));
+        m_listWidget->addItem(tr("\\w or \\W: Disable or enable whole word only"));
 
         return true;
     }
diff --git a/src/vsearcher.cpp b/src/vsearcher.cpp
index 875f70e3..d5df6609 100644
--- a/src/vsearcher.cpp
+++ b/src/vsearcher.cpp
@@ -250,7 +250,6 @@ void VSearcher::initUIFields()
     VSearchConfig config = VSearchConfig::fromConfig(g_config->getSearchOptions());
 
     // Scope.
-    m_searchScopeCB->addItem(tr("Current Note"), VSearchConfig::CurrentNote);
     m_searchScopeCB->addItem(tr("Opened Notes"), VSearchConfig::OpenedNotes);
     m_searchScopeCB->addItem(tr("Current Folder"), VSearchConfig::CurrentFolder);
     m_searchScopeCB->addItem(tr("Current Notebook"), VSearchConfig::CurrentNotebook);
diff --git a/src/vuniversalentry.cpp b/src/vuniversalentry.cpp
index f2bcb11a..72635f13 100644
--- a/src/vuniversalentry.cpp
+++ b/src/vuniversalentry.cpp
@@ -325,6 +325,20 @@ void VUniversalEntry::keyPressEvent(QKeyEvent *p_event)
 
         break;
 
+    case Qt::Key_F:
+        if (VUtils::isControlModifierForVim(modifiers)) {
+            // Ctrl+F to select the command key.
+            QString cmd = m_cmdEdit->getEvaluatedText();
+            if (!cmd.isEmpty()) {
+                m_cmdTimer->stop();
+                m_cmdEdit->setSelection(0, 1);
+            }
+
+            return;
+        }
+
+        break;
+
     case Qt::Key_D:
         if (VUtils::isControlModifierForVim(modifiers)) {
             // Ctrl+D to cancel current command.