Auto-Type entry selection: Auto-Submit when clicking password column

Author: Rookiestyle

src/AlternateAutoType.cs

@@ -548,8 +548,11 @@ private void CellClick(object sender, MouseEventArgs e)
 			string column = (sender as ListView).Columns[col].Text;
 			string sequence = string.Empty;
 			if (column == KeePass.Resources.KPRes.UserName) sequence = "{USERNAME}";
-			else if (column == KeePass.Resources.KPRes.Password) sequence = "{PASSWORD}";
-			else if (column == Config.PWColumnHeader) sequence = "{PASSWORD}";
+			else if (column == KeePass.Resources.KPRes.Password || column == Config.PWColumnHeader)
+			{
+				sequence = "{PASSWORD}";
+				if (Config.SpecialColumnsRespectPWEnter && Config.PWEnter) sequence += "{ENTER}";
+			}
 			else return;
 			AutoTypeCtx ctx = info.Item.Tag as AutoTypeCtx;
 			if (ctx == null) return;
@@ -591,6 +594,7 @@ private void OptionsFormShown(object sender, Tools.OptionsFormsEventArgs e)
 			options.cbColumnsRememberSort.Checked = Config.ColumnsRememberSorting;
 			options.cbDBColumn.Checked = Config.AddDBColumn;
 			options.cbSpecialColumns.Checked = Config.SpecialColumns;
+			options.cbSpecialColumnsRespectPWEnter.Checked = Config.SpecialColumnsRespectPWEnter;
 			options.cbKeepATOpen.Checked = Config.KeepATOpen;
 			options.cbExcludeExpiredGroups.Checked = Config.ExcludeExpiredGroups;
 			e.form.Shown += options.OptionsForm_Shown;
@@ -616,6 +620,7 @@ private void OptionsForm_Closed(object sender, Tools.OptionsFormsEventArgs e)
 			Config.ColumnsRememberSorting = options.cbColumnsRememberSort.Checked;
 			Config.AddDBColumn = options.cbDBColumn.Checked;
 			Config.SpecialColumns = options.cbSpecialColumns.Checked;
+			Config.SpecialColumnsRespectPWEnter = options.cbSpecialColumnsRespectPWEnter.Checked;
 			Config.KeepATOpen = options.cbKeepATOpen.Checked;
 			Config.ExcludeExpiredGroups = options.cbExcludeExpiredGroups.Checked;
 

src/Config.cs

@@ -93,6 +93,21 @@ public static bool KeepATOpen
 				Program.Config.CustomConfig.SetBool(m_KeepATOpenConfig, value);
 			}
 		}
+
+		public static bool SpecialColumnsRespectPWEnter
+		{
+			get
+			{
+				if (KeePassLib.Native.NativeLib.IsUnix()) return false;
+				return Program.Config.CustomConfig.GetBool(m_SpecialColumnsRespectPWEnter, true);
+			}
+			set
+			{
+				if (KeePassLib.Native.NativeLib.IsUnix()) return;
+				Program.Config.CustomConfig.SetBool(m_SpecialColumnsRespectPWEnter, value);
+			}
+		}
+
 		public static bool PWEnter
 		{
 			get { return Program.Config.CustomConfig.GetBool(m_PWEnterConfig, false); }
@@ -127,6 +142,7 @@ public static bool ExcludeExpiredGroups
 		private static string c_PWColumnHeader = KeePass.Resources.KPRes.Password + " (AAT)";
 		private static string m_SpecialColumnsConfig = "AlternateAutoType.SpecialColumns";
 		private static string m_KeepATOpenConfig = "AlternateAutoType.KeepATOpen";
+		private static string m_SpecialColumnsRespectPWEnter = "AlternateAutoType.SpecialColumnsRespectPWEnter";
 		private static string m_ExcludeExpiredGroups = "AlternateAutoType.ExcludeExpiredGroups";
 
 		private static void SetKey(string param, Keys value)

src/Options.Designer.cs

@@ -28,6 +28,7 @@ public Options()
 			cbDBColumn.Text = PluginTranslate.AddDBColumn;
 			cbSpecialColumns.Text = PluginTranslate.SpecialColumns;
 			cbKeepATOpen.Text = PluginTranslate.KeepATOpen;
+			cbSpecialColumnsRespectPWEnter.Text = KeePass.Resources.KPRes.Password + " = " + PluginTranslate.PasswordEnterHotKey;
 			cbExcludeExpiredGroups.Text = PluginTranslate.ExcludeExpiredGroups;
 			cbColumnsRememberSort.Text = PluginTranslate.ColumnsSortRemember;
 
@@ -74,11 +75,13 @@ private Keys GetHotKey(HotKeyControlEx hkBox)
 		private void cbSpecialColumns_CheckedChanged(object sender, System.EventArgs e)
 		{
 			cbKeepATOpen.Enabled = cbSpecialColumns.Checked;
+			cbSpecialColumnsRespectPWEnter.Enabled = cbSpecialColumns.Checked;
 		}
 
 		private void Options_Load(object sender, System.EventArgs e)
 		{
 			gHotkeys.Enabled = !KeePassLib.Native.NativeLib.IsUnix();
+			cbSpecialColumns_CheckedChanged(null, null);
 		}
 
 		internal void OptionsForm_Shown(object sender, EventArgs e)

src/Options.cs

@@ -27,7 +27,7 @@ KeePass types EITHER everything before OR everything after {AAT}.
 //
 // You can specify all the values or you can use the default the Revision and 
 // Build Numbers by using the '*' as shown below:
-[assembly: AssemblyVersion("1.16")]
-[assembly: AssemblyFileVersion("1.16")]
+[assembly: AssemblyVersion("1.17")]
+[assembly: AssemblyFileVersion("1.17")]
 [assembly: Guid("78C152F3-EAF8-4FFC-9BE3-F5DC0CD66E5D")]
 

src/Properties/AssemblyInfo.cs

@@ -1,5 +1,5 @@
 :
-AlternateAutoType:1.16
+AlternateAutoType:1.17
 AlternateAutoType!de:5
 AlternateAutoType!pt:1
 AlternateAutoType!ru:4