Add search help pop-up

* Support ! modifier (same as '-') * Create reusable PopupHelpWidget as self-contained popup that can be positioned around a parent widget and will follow the movement and sizing of the window * Eliminated KEEPASSXC_MAIN_WINDOW macro and replaced with getMainWindow() function * Add tests to cover search help show/hide
hifi · Nov 17, 2018 · 880c3ae · 880c3ae
1 parent d6ffee5
commit 880c3ae
Show file tree

Hide file tree

Showing 20 changed files with 671 additions and 36 deletions.
diff --git a/share/icons/application/16x16/actions/system-help.png b/share/icons/application/16x16/actions/system-help.png
diff --git a/share/icons/application/22x22/actions/system-help.png b/share/icons/application/22x22/actions/system-help.png
diff --git a/share/icons/application/32x32/actions/system-help.png b/share/icons/application/32x32/actions/system-help.png
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -126,7 +126,6 @@ set(keepassx_SOURCES
         gui/UnlockDatabaseWidget.cpp
         gui/UnlockDatabaseDialog.cpp
         gui/WelcomeWidget.cpp
-        gui/widgets/ElidedLabel.cpp
         gui/csvImport/CsvImportWidget.cpp
         gui/csvImport/CsvImportWizard.cpp
         gui/csvImport/CsvParserModel.cpp
@@ -154,6 +153,8 @@ set(keepassx_SOURCES
         gui/dbsettings/DatabaseSettingsWidgetEncryption.cpp
         gui/dbsettings/DatabaseSettingsWidgetMasterKey.cpp
         gui/settings/SettingsWidget.cpp
+        gui/widgets/ElidedLabel.cpp
+        gui/widgets/PopupHelpWidget.cpp
         gui/wizard/NewDatabaseWizard.cpp
         gui/wizard/NewDatabaseWizardPage.cpp
         gui/wizard/NewDatabaseWizardPageMetaData.cpp

diff --git a/src/browser/BrowserService.cpp b/src/browser/BrowserService.cpp
@@ -88,7 +88,7 @@ bool BrowserService::openDatabase(bool triggerUnlock)
     }
 
     if (triggerUnlock) {
-        KEEPASSXC_MAIN_WINDOW->bringToFront();
+        getMainWindow()->bringToFront();
         m_bringToFrontRequested = true;
     }
 
@@ -901,7 +901,7 @@ void BrowserService::databaseUnlocked(DatabaseWidget* dbWidget)
 {
     if (dbWidget) {
         if (m_bringToFrontRequested) {
-            KEEPASSXC_MAIN_WINDOW->lower();
+            getMainWindow()->lower();
             m_bringToFrontRequested = false;
         }
         emit databaseUnlocked();

diff --git a/src/core/EntrySearcher.cpp b/src/core/EntrySearcher.cpp
@@ -96,6 +96,7 @@ bool EntrySearcher::searchEntryImpl(const QString& searchString, Entry* entry)
             found = !attachments.filter(term->regex).empty();
             break;
         default:
+            // Terms without a specific field try to match title, username, url, and notes
             found = term->regex.match(entry->resolvePlaceholder(entry->title())).hasMatch() ||
                     term->regex.match(entry->resolvePlaceholder(entry->username())).hasMatch() ||
                     term->regex.match(entry->resolvePlaceholder(entry->url())).hasMatch() ||
@@ -139,7 +140,7 @@ QList<QSharedPointer<EntrySearcher::SearchTerm> > EntrySearcher::parseSearchTerm
         term->regex = Tools::convertToRegex(term->word, !mods.contains("*"), mods.contains("+"), m_caseSensitive);
 
         // Exclude modifier
-        term->exclude = mods.contains("-");
+        term->exclude = mods.contains("-") || mods.contains("!");
 
         // Determine the field to search
         QString field = result.captured(2);

diff --git a/src/gui/Application.cpp b/src/gui/Application.cpp
@@ -49,7 +49,6 @@ namespace
 
 Application::Application(int& argc, char** argv)
     : QApplication(argc, argv)
-    , m_mainWindow(nullptr)
 #ifdef Q_OS_UNIX
     , m_unixSignalNotifier(nullptr)
 #endif
@@ -143,16 +142,6 @@ Application::~Application()
     }
 }
 
-QWidget* Application::mainWindow() const
-{
-    return m_mainWindow;
-}
-
-void Application::setMainWindow(QWidget* mainWindow)
-{
-    m_mainWindow = mainWindow;
-}
-
 bool Application::event(QEvent* event)
 {
     // Handle Apple QFileOpenEvent from finder (double click on .kdbx file)

diff --git a/src/gui/Application.h b/src/gui/Application.h
@@ -37,9 +37,7 @@ class Application : public QApplication
 
 public:
     Application(int& argc, char** argv);
-    QWidget* mainWindow() const;
     ~Application() override;
-    void setMainWindow(QWidget* mainWindow);
 
     bool event(QEvent* event) override;
     bool isAlreadyRunning() const;
@@ -60,8 +58,6 @@ private slots:
     void socketReadyRead();
 
 private:
-    QWidget* m_mainWindow;
-
 #if defined(Q_OS_UNIX)
     /**
      * Register Unix signals such as SIGINT and SIGTERM for clean shutdown.

diff --git a/src/gui/MainWindow.cpp b/src/gui/MainWindow.cpp
@@ -109,12 +109,17 @@ class BrowserPlugin : public ISettingsPage
 
 const QString MainWindow::BaseWindowTitle = "KeePassXC";
 
+MainWindow* g_MainWindow = nullptr;
+MainWindow* getMainWindow() { return g_MainWindow; }
+
 MainWindow::MainWindow()
     : m_ui(new Ui::MainWindow())
     , m_trayIcon(nullptr)
     , m_appExitCalled(false)
     , m_appExiting(false)
 {
+    g_MainWindow = this;
+
     m_ui->setupUi(this);
 
 #if defined(Q_OS_UNIX) && !defined(Q_OS_MACOS) && !defined(QT_NO_DBUS)

diff --git a/src/gui/MainWindow.h b/src/gui/MainWindow.h
@@ -148,8 +148,12 @@ private slots:
     bool m_appExiting;
 };
 
-#define KEEPASSXC_MAIN_WINDOW                                                                                          \
-    (qobject_cast<Application*>(qApp) ? qobject_cast<MainWindow*>(qobject_cast<Application*>(qApp)->mainWindow())      \
-                                      : nullptr)
+/**
+ * Return instance of MainWindow created on app load
+ * non-gui instances will return nullptr
+ *
+ * @return MainWindow instance or nullptr
+ */
+MainWindow* getMainWindow();
 
 #endif // KEEPASSX_MAINWINDOW_H