Merge branch 'develop' into feature/allow-disable-app-bundle

src/autotype/AutoType.cpp

@@ -574,8 +574,9 @@ QString AutoType::autoTypeSequence(const Entry* entry, const QString& windowTitl
             }
         }
 
-        if (!match && config()->get("AutoTypeEntryTitleMatch").toBool() && !entry->resolvePlaceholder(entry->title()).isEmpty()
-                && windowTitle.contains(entry->resolvePlaceholder(entry->title()), Qt::CaseInsensitive)) {
+        if (!match && config()->get("AutoTypeEntryTitleMatch").toBool() 
+                && (windowMatchesTitle(windowTitle, entry->resolvePlaceholder(entry->title()))
+                || windowMatchesUrl(windowTitle, entry->resolvePlaceholder(entry->url())))) {
             sequence = entry->defaultAutoTypeSequence();
             match = true;
         }
@@ -631,3 +632,22 @@ bool AutoType::windowMatches(const QString& windowTitle, const QString& windowPa
         return WildcardMatcher(windowTitle).match(windowPattern);
     }
 }
+
+bool AutoType::windowMatchesTitle(const QString& windowTitle, const QString& resolvedTitle)
+{
+    return !resolvedTitle.isEmpty() && windowTitle.contains(resolvedTitle, Qt::CaseInsensitive);
+}
+
+bool AutoType::windowMatchesUrl(const QString& windowTitle, const QString& resolvedUrl)
+{
+    if (!resolvedUrl.isEmpty() && windowTitle.contains(resolvedUrl, Qt::CaseInsensitive)) {
+        return true;
+    }
+
+    QUrl url(resolvedUrl);
+    if (url.isValid() && !url.host().isEmpty()) {
+        return windowTitle.contains(url.host(), Qt::CaseInsensitive);
+    }
+
+    return false;
+}

src/autotype/AutoType.h

@@ -66,6 +66,8 @@ private:
     bool parseActions(const QString& sequence, const Entry* entry, QList<AutoTypeAction*>& actions);
     QList<AutoTypeAction*> createActionFromTemplate(const QString& tmpl, const Entry* entry);
     QString autoTypeSequence(const Entry* entry, const QString& windowTitle = QString());
+    bool windowMatchesTitle(const QString& windowTitle, const QString& resolvedTitle);
+    bool windowMatchesUrl(const QString& windowTitle, const QString& resolvedUrl);
     bool windowMatches(const QString& windowTitle, const QString& windowPattern);
 
     bool m_inAutoType;

src/core/FilePath.cpp

@@ -101,7 +101,7 @@ QIcon FilePath::trayIconLocked()
 
 QIcon FilePath::trayIconUnlocked()
 {
-    return applicationIcon();
+    return icon("apps", "keepassxc-unlocked");
 }
 
 QIcon FilePath::icon(const QString& category, const QString& name, bool fromTheme)

src/gui/SearchWidget.cpp

@@ -25,7 +25,7 @@
 
 #include "core/FilePath.h"
 
-SearchWidget::SearchWidget(QWidget *parent)
+SearchWidget::SearchWidget(QWidget* parent)
     : QWidget(parent)
     , m_ui(new Ui::SearchWidget())
 {
@@ -40,11 +40,11 @@ SearchWidget::SearchWidget(QWidget *parent)
     connect(this, SIGNAL(escapePressed()), m_ui->searchEdit, SLOT(clear()));
 
     new QShortcut(Qt::CTRL + Qt::Key_F, this, SLOT(searchFocus()), nullptr, Qt::ApplicationShortcut);
-	new QShortcut(Qt::Key_Escape, m_ui->searchEdit, SLOT(clear()), nullptr, Qt::ApplicationShortcut);
+    new QShortcut(Qt::Key_Escape, m_ui->searchEdit, SLOT(clear()), nullptr, Qt::ApplicationShortcut);
 
     m_ui->searchEdit->installEventFilter(this);
 
-    QMenu *searchMenu = new QMenu();
+    QMenu* searchMenu = new QMenu();
     m_actionCaseSensitive = searchMenu->addAction(tr("Case Sensitive"), this, SLOT(updateCaseSensitive()));
     m_actionCaseSensitive->setObjectName("actionSearchCaseSensitive");
     m_actionCaseSensitive->setCheckable(true);
@@ -58,39 +58,35 @@ SearchWidget::SearchWidget(QWidget *parent)
     m_ui->searchEdit->addAction(m_ui->clearIcon, QLineEdit::TrailingPosition);
 
     // Fix initial visibility of actions (bug in Qt)
-    for (QToolButton * toolButton: m_ui->searchEdit->findChildren<QToolButton *>()) {
+    for (QToolButton* toolButton : m_ui->searchEdit->findChildren<QToolButton*>()) {
         toolButton->setVisible(toolButton->defaultAction()->isVisible());
     }
 }
 
 SearchWidget::~SearchWidget()
 {
-
 }
 
-bool SearchWidget::eventFilter(QObject *obj, QEvent *event)
+bool SearchWidget::eventFilter(QObject* obj, QEvent* event)
 {
     if (event->type() == QEvent::KeyPress) {
-        QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
+        QKeyEvent* keyEvent = static_cast<QKeyEvent*>(event);
         if (keyEvent->key() == Qt::Key_Escape) {
             emit escapePressed();
             return true;
-        }
-        else if (keyEvent->matches(QKeySequence::Copy)) {
+        } else if (keyEvent->matches(QKeySequence::Copy)) {
             // If Control+C is pressed in the search edit when no text
             // is selected, copy the password of the current entry
             if (!m_ui->searchEdit->hasSelectedText()) {
                 emit copyPressed();
                 return true;
             }
-        }
-        else if (keyEvent->matches(QKeySequence::MoveToNextLine)) {
+        } else if (keyEvent->matches(QKeySequence::MoveToNextLine)) {
             if (m_ui->searchEdit->cursorPosition() == m_ui->searchEdit->text().length()) {
                 // If down is pressed at EOL, move the focus to the entry view
                 emit downPressed();
                 return true;
-            }
-            else {
+            } else {
                 // Otherwise move the cursor to EOL
                 m_ui->searchEdit->setCursorPosition(m_ui->searchEdit->text().length());
                 return true;
@@ -110,7 +106,7 @@ void SearchWidget::connectSignals(SignalMultiplexer& mx)
     mx.connect(m_ui->searchEdit, SIGNAL(returnPressed()), SLOT(switchToEntryEdit()));
 }
 
-void SearchWidget::databaseChanged(DatabaseWidget *dbWidget)
+void SearchWidget::databaseChanged(DatabaseWidget* dbWidget)
 {
     if (dbWidget != nullptr) {
         // Set current search text from this database

src/gui/SearchWidget.h

@@ -18,11 +18,11 @@
 #ifndef KEEPASSX_SEARCHWIDGET_H
 #define KEEPASSX_SEARCHWIDGET_H
 
-#include <QWidget>
 #include <QTimer>
+#include <QWidget>
 
-#include "gui/DatabaseWidget.h"
 #include "core/SignalMultiplexer.h"
+#include "gui/DatabaseWidget.h"
 
 namespace Ui {
     class SearchWidget;
@@ -33,17 +33,17 @@ class SearchWidget : public QWidget
     Q_OBJECT
 
 public:
-    explicit SearchWidget(QWidget *parent = 0);
+    explicit SearchWidget(QWidget* parent = 0);
     ~SearchWidget();
 
     void connectSignals(SignalMultiplexer& mx);
     void setCaseSensitive(bool state);
 
 protected:
-    bool eventFilter(QObject *obj, QEvent *event);
+    bool eventFilter(QObject* obj, QEvent* event);
 
 signals:
-    void search(const QString &text);
+    void search(const QString& text);
     void caseSensitiveChanged(bool state);
     void escapePressed();
     void copyPressed();
@@ -62,7 +62,7 @@ private slots:
 private:
     const QScopedPointer<Ui::SearchWidget> m_ui;
     QTimer* m_searchTimer;
-    QAction *m_actionCaseSensitive;
+    QAction* m_actionCaseSensitive;
 
     Q_DISABLE_COPY(SearchWidget)
 };

src/gui/SettingsWidgetGeneral.ui

@@ -303,7 +303,7 @@
        <item>
         <widget class="QCheckBox" name="autoTypeEntryTitleMatchCheckBox">
          <property name="text">
-          <string>Use entry title to match windows for global Auto-Type</string>
+          <string>Use entry title and URL to match windows for global Auto-Type</string>
          </property>
         </widget>
        </item>