Add option to use the entry title for auto-type window matching.

5 files changed, 43 insertions, 23 deletions

diff --git a/src/autotype/AutoType.cpp b/src/autotype/AutoType.cpp
index 80b810821..92aae5cd7 100644
--- a/src/autotype/AutoType.cpp
+++ b/src/autotype/AutoType.cpp
@@ -503,6 +503,12 @@ QString AutoType::autoTypeSequence(const Entry* entry, const QString& windowTitl
             }
         }
 
+        if (!match && config()->get("AutoTypeEntryTitleMatch").toBool() && !entry->title().isEmpty()
+                && windowTitle.contains(entry->title(), Qt::CaseInsensitive)) {
+            sequence = entry->defaultAutoTypeSequence();
+            match = true;
+        }
+
         if (!match) {
             return QString();
         }
diff --git a/src/core/Config.cpp b/src/core/Config.cpp
index c48bc9553..133a03a9e 100644
--- a/src/core/Config.cpp
+++ b/src/core/Config.cpp
@@ -95,6 +95,7 @@ void Config::init(const QString& fileName)
     m_defaults.insert("ShowToolbar", true);
     m_defaults.insert("MinimizeOnCopy", false);
     m_defaults.insert("UseGroupIconOnEntryCreation", false);
+    m_defaults.insert("AutoTypeEntryTitleMatch", false);
     m_defaults.insert("security/clearclipboard", true);
     m_defaults.insert("security/clearclipboardtimeout", 10);
     m_defaults.insert("security/lockdatabaseidle", false);
@@ -112,7 +113,7 @@ Config* Config::instance()
     return m_instance;
 }
 
-void Config::createConfigFromFile(QString file)
+void Config::createConfigFromFile(const QString& file)
 {
     Q_ASSERT(!m_instance);
     m_instance = new Config(file, qApp);
diff --git a/src/core/Config.h b/src/core/Config.h
index ee3082685..ca0f74cb5 100644
--- a/src/core/Config.h
+++ b/src/core/Config.h
@@ -36,7 +36,7 @@ public:
     void set(const QString& key, const QVariant& value);
 
     static Config* instance();
-    static void createConfigFromFile(QString file);
+    static void createConfigFromFile(const QString& file);
     static void createTempFileInstance();
 
 private:
diff --git a/src/gui/SettingsWidget.cpp b/src/gui/SettingsWidget.cpp
index d09805939..2aea2636e 100644
--- a/src/gui/SettingsWidget.cpp
+++ b/src/gui/SettingsWidget.cpp
@@ -67,6 +67,7 @@ void SettingsWidget::loadSettings()
     m_generalUi->autoSaveOnExitCheckBox->setChecked(config()->get("AutoSaveOnExit").toBool());
     m_generalUi->minimizeOnCopyCheckBox->setChecked(config()->get("MinimizeOnCopy").toBool());
     m_generalUi->useGroupIconOnEntryCreationCheckBox->setChecked(config()->get("UseGroupIconOnEntryCreation").toBool());
+    m_generalUi->autoTypeEntryTitleMatchCheckBox->setChecked(config()->get("AutoTypeEntryTitleMatch").toBool());
 
     if (autoType()->isAvailable()) {
         m_globalAutoTypeKey = static_cast<Qt::Key>(config()->get("GlobalAutoTypeKey").toInt());
@@ -102,6 +103,8 @@ void SettingsWidget::saveSettings()
     config()->set("MinimizeOnCopy", m_generalUi->minimizeOnCopyCheckBox->isChecked());
     config()->set("UseGroupIconOnEntryCreation",
                   m_generalUi->useGroupIconOnEntryCreationCheckBox->isChecked());
+    config()->set("AutoTypeEntryTitleMatch",
+                  m_generalUi->autoTypeEntryTitleMatchCheckBox->isChecked());
     if (autoType()->isAvailable()) {
         config()->set("GlobalAutoTypeKey", m_generalUi->autoTypeShortcutWidget->key());
         config()->set("GlobalAutoTypeModifiers",
diff --git a/src/gui/SettingsWidgetGeneral.ui b/src/gui/SettingsWidgetGeneral.ui
index f9aa8b680..3d89c68e8 100644
--- a/src/gui/SettingsWidgetGeneral.ui
+++ b/src/gui/SettingsWidgetGeneral.ui
@@ -7,10 +7,13 @@
     <x>0</x>
     <y>0</y>
     <width>456</width>
-    <height>185</height>
+    <height>230</height>
    </rect>
   </property>
   <layout class="QFormLayout" name="formLayout">
+   <property name="fieldGrowthPolicy">
+    <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+   </property>
    <item row="0" column="0">
     <widget class="QCheckBox" name="rememberLastDatabasesCheckBox">
      <property name="text">
@@ -21,6 +24,13 @@
      </property>
     </widget>
    </item>
+   <item row="1" column="0">
+    <widget class="QCheckBox" name="openPreviousDatabasesOnStartupCheckBox">
+     <property name="text">
+      <string>Open previous databases on startup</string>
+     </property>
+    </widget>
+   </item>
    <item row="2" column="0">
     <widget class="QCheckBox" name="modifiedExpandedChangedCheckBox">
      <property name="text">
@@ -31,13 +41,6 @@
      </property>
     </widget>
    </item>
-   <item row="4" column="0">
-    <widget class="QCheckBox" name="autoSaveAfterEveryChangeCheckBox">
-     <property name="text">
-      <string>Automatically save after every change</string>
-     </property>
-    </widget>
-   </item>
    <item row="3" column="0">
     <widget class="QCheckBox" name="autoSaveOnExitCheckBox">
      <property name="text">
@@ -45,20 +48,10 @@
      </property>
     </widget>
    </item>
-   <item row="7" column="0">
-    <widget class="QLabel" name="autoTypeShortcutLabel">
-     <property name="text">
-      <string>Global Auto-Type shortcut</string>
-     </property>
-    </widget>
-   </item>
-   <item row="7" column="1">
-    <widget class="ShortcutWidget" name="autoTypeShortcutWidget"/>
-   </item>
-   <item row="1" column="0">
-    <widget class="QCheckBox" name="openPreviousDatabasesOnStartupCheckBox">
+   <item row="4" column="0">
+    <widget class="QCheckBox" name="autoSaveAfterEveryChangeCheckBox">
      <property name="text">
-      <string>Open previous databases on startup</string>
+      <string>Automatically save after every change</string>
      </property>
     </widget>
    </item>
@@ -76,6 +69,23 @@
      </property>
     </widget>
    </item>
+   <item row="7" column="0">
+    <widget class="QLabel" name="autoTypeShortcutLabel">
+     <property name="text">
+      <string>Global Auto-Type shortcut</string>
+     </property>
+    </widget>
+   </item>
+   <item row="7" column="1">
+    <widget class="ShortcutWidget" name="autoTypeShortcutWidget"/>
+   </item>
+   <item row="8" column="0">
+    <widget class="QCheckBox" name="autoTypeEntryTitleMatchCheckBox">
+     <property name="text">
+      <string>Use entry title to match windows for global auto-type</string>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <customwidgets>