Changeset 2

Timestamp:

Feb 14, 2019, 5:29:40 PM (6 years ago)

Author:

chronos

Message:

• Added: Registry extension methods.
• Added: Search history in Find dialog.

Location:

Common

Files:

• Database.cs (modified) (3 diffs)
• FormFind.Designer.cs (modified) (9 diffs)
• FormFind.cs (modified) (7 diffs)
• FormProgress.cs (modified) (4 diffs)
• Registry.cs (added)

Common/Database.cs

@@ -94 +94 @@
         }
 
-        private static DbConnection GetConnection()
+        public static DbConnection GetConnection()
         {
             DbConnection connection = GetFactory().CreateConnection();
@@ -529 +529 @@
         public void ExecuteQueries()
         {
-#if SSS
+#if NO_TRANSACTION
             foreach (Query item in queries)
             {
                 Database.ExecuteNonQuery(item.query, item.parameters);
             }
-#endif
+#else
             lock (threadQueries)
             {
@@ -540 +540 @@
                 Monitor.Pulse(threadQueries);
             }
+#endif
             queries.Clear();
         }

Common/FormFind.Designer.cs

@@ -31 +31 @@
             this.buttonFindNext = new System.Windows.Forms.Button();
             this.buttonCancel = new System.Windows.Forms.Button();
-            this.textBoxWhat = new System.Windows.Forms.TextBox();
             this.label1 = new System.Windows.Forms.Label();
             this.checkBoxMatchWholeWordOnly = new System.Windows.Forms.CheckBox();
             this.checkBoxMatchCase = new System.Windows.Forms.CheckBox();
             this.buttonFindPrevious = new System.Windows.Forms.Button();
+            this.comboBoxWhat = new System.Windows.Forms.ComboBox();
             this.SuspendLayout();
             // 
@@ -41 +41 @@
             // 
             this.buttonFindNext.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonFindNext.Location = new System.Drawing.Point(304, 12);
+            this.buttonFindNext.Location = new System.Drawing.Point(405, 15);
+            this.buttonFindNext.Margin = new System.Windows.Forms.Padding(4);
             this.buttonFindNext.Name = "buttonFindNext";
-            this.buttonFindNext.Size = new System.Drawing.Size(88, 23);
+            this.buttonFindNext.Size = new System.Drawing.Size(117, 28);
             this.buttonFindNext.TabIndex = 4;
             this.buttonFindNext.Text = "Find next";
@@ -53 +54 @@
             this.buttonCancel.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
             this.buttonCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.buttonCancel.Location = new System.Drawing.Point(304, 70);
+            this.buttonCancel.Location = new System.Drawing.Point(405, 86);
+            this.buttonCancel.Margin = new System.Windows.Forms.Padding(4);
             this.buttonCancel.Name = "buttonCancel";
-            this.buttonCancel.Size = new System.Drawing.Size(87, 23);
+            this.buttonCancel.Size = new System.Drawing.Size(116, 28);
             this.buttonCancel.TabIndex = 6;
             this.buttonCancel.Text = "Cancel";
@@ -61 +63 @@
             this.buttonCancel.Click += new System.EventHandler(this.buttonCancel_Click);
             // 
-            // textBoxWhat
-            // 
-            this.textBoxWhat.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
-            | System.Windows.Forms.AnchorStyles.Right)));
-            this.textBoxWhat.Location = new System.Drawing.Point(74, 14);
-            this.textBoxWhat.Name = "textBoxWhat";
-            this.textBoxWhat.Size = new System.Drawing.Size(224, 20);
-            this.textBoxWhat.TabIndex = 1;
-            this.textBoxWhat.TextChanged += new System.EventHandler(this.textBoxWhat_TextChanged);
-            this.textBoxWhat.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBoxWhat_KeyPress);
-            // 
             // label1
             // 
             this.label1.AutoSize = true;
-            this.label1.Location = new System.Drawing.Point(12, 17);
+            this.label1.Location = new System.Drawing.Point(16, 21);
+            this.label1.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.label1.Name = "label1";
-            this.label1.Size = new System.Drawing.Size(56, 13);
+            this.label1.Size = new System.Drawing.Size(72, 17);
             this.label1.TabIndex = 0;
             this.label1.Text = "Find what:";
@@ -84 +76 @@
             // 
             this.checkBoxMatchWholeWordOnly.AutoSize = true;
-            this.checkBoxMatchWholeWordOnly.Location = new System.Drawing.Point(15, 47);
+            this.checkBoxMatchWholeWordOnly.Location = new System.Drawing.Point(20, 58);
+            this.checkBoxMatchWholeWordOnly.Margin = new System.Windows.Forms.Padding(4);
             this.checkBoxMatchWholeWordOnly.Name = "checkBoxMatchWholeWordOnly";
-            this.checkBoxMatchWholeWordOnly.Size = new System.Drawing.Size(135, 17);
+            this.checkBoxMatchWholeWordOnly.Size = new System.Drawing.Size(172, 21);
             this.checkBoxMatchWholeWordOnly.TabIndex = 2;
             this.checkBoxMatchWholeWordOnly.Text = "Match whole word only";
@@ -94 +87 @@
             // 
             this.checkBoxMatchCase.AutoSize = true;
-            this.checkBoxMatchCase.Location = new System.Drawing.Point(15, 70);
+            this.checkBoxMatchCase.Location = new System.Drawing.Point(20, 86);
+            this.checkBoxMatchCase.Margin = new System.Windows.Forms.Padding(4);
             this.checkBoxMatchCase.Name = "checkBoxMatchCase";
-            this.checkBoxMatchCase.Size = new System.Drawing.Size(82, 17);
+            this.checkBoxMatchCase.Size = new System.Drawing.Size(102, 21);
             this.checkBoxMatchCase.TabIndex = 3;
             this.checkBoxMatchCase.Text = "Match case";
@@ -104 +98 @@
             // 
             this.buttonFindPrevious.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
-            this.buttonFindPrevious.Location = new System.Drawing.Point(304, 41);
+            this.buttonFindPrevious.Location = new System.Drawing.Point(405, 50);
+            this.buttonFindPrevious.Margin = new System.Windows.Forms.Padding(4);
             this.buttonFindPrevious.Name = "buttonFindPrevious";
-            this.buttonFindPrevious.Size = new System.Drawing.Size(87, 23);
+            this.buttonFindPrevious.Size = new System.Drawing.Size(116, 28);
             this.buttonFindPrevious.TabIndex = 5;
             this.buttonFindPrevious.Text = "Find previous";
@@ -112 +107 @@
             this.buttonFindPrevious.Click += new System.EventHandler(this.buttonFindPrevious_Click);
             // 
+            // comboBoxWhat
+            // 
+            this.comboBoxWhat.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) 
+            | System.Windows.Forms.AnchorStyles.Right)));
+            this.comboBoxWhat.FormattingEnabled = true;
+            this.comboBoxWhat.Location = new System.Drawing.Point(95, 18);
+            this.comboBoxWhat.Name = "comboBoxWhat";
+            this.comboBoxWhat.Size = new System.Drawing.Size(297, 24);
+            this.comboBoxWhat.TabIndex = 7;
+            this.comboBoxWhat.TextChanged += new System.EventHandler(this.textBoxWhat_TextChanged);
+            this.comboBoxWhat.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBoxWhat_KeyPress);
+            // 
             // FormFind
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 16F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(403, 102);
+            this.ClientSize = new System.Drawing.Size(537, 126);
+            this.Controls.Add(this.comboBoxWhat);
             this.Controls.Add(this.buttonFindPrevious);
             this.Controls.Add(this.checkBoxMatchCase);
             this.Controls.Add(this.checkBoxMatchWholeWordOnly);
             this.Controls.Add(this.label1);
-            this.Controls.Add(this.textBoxWhat);
             this.Controls.Add(this.buttonCancel);
             this.Controls.Add(this.buttonFindNext);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.MaximizeBox = false;
             this.MinimizeBox = false;
-            this.MinimumSize = new System.Drawing.Size(300, 140);
+            this.MinimumSize = new System.Drawing.Size(394, 162);
             this.Name = "FormFind";
             this.StartPosition = System.Windows.Forms.FormStartPosition.Manual;
@@ -142 +150 @@
         private System.Windows.Forms.Button buttonFindNext;
         private System.Windows.Forms.Button buttonCancel;
-        private System.Windows.Forms.TextBox textBoxWhat;
         private System.Windows.Forms.Label label1;
         private System.Windows.Forms.CheckBox checkBoxMatchWholeWordOnly;
         private System.Windows.Forms.CheckBox checkBoxMatchCase;
         private System.Windows.Forms.Button buttonFindPrevious;
+        private System.Windows.Forms.ComboBox comboBoxWhat;
     }
 }

Common/FormFind.cs

@@ -8 +8 @@
 using System.Threading.Tasks;
 using System.Windows.Forms;
+using Microsoft.Win32;
 
 namespace Common
@@ -14 +15 @@
     {
         public RichTextBoxEx richTextBox;
-        FormDimensions formDimensions;
+        public string regSubKey;
+        public int maxHistoryCount;
 
         public FormFind()
         {
             InitializeComponent();
-            formDimensions = new FormDimensions();
+            regSubKey = "Find";
+            maxHistoryCount = 20;
         }
 
@@ -57 +60 @@
         private void SearchText(bool reverse = false)
         {
+            if (comboBoxWhat.Text.Trim() != "")
+            {
+                string previousText = comboBoxWhat.Text;
+                int index = comboBoxWhat.Items.IndexOf(comboBoxWhat.Text);
+                if (index >= 0) comboBoxWhat.Items.RemoveAt(index);
+                comboBoxWhat.Text = previousText;
+                comboBoxWhat.Items.Insert(0, comboBoxWhat.Text);
+                
+                while (comboBoxWhat.Items.Count > maxHistoryCount)
+                    comboBoxWhat.Items.RemoveAt(comboBoxWhat.Items.Count - 1);
+            }
+
             while (true)
             {
-                int newPos = FindText(textBoxWhat.Text.Trim(), richTextBox.SelectionStart, richTextBox.SelectionLength, reverse);
+                int newPos = FindText(comboBoxWhat.Text.Trim(), richTextBox.SelectionStart, richTextBox.SelectionLength, reverse);
                 if (newPos >= 0)
                 {
                     richTextBox.SelectionColor = Color.Red;
-                    richTextBox.Select(newPos, textBoxWhat.Text.Length);
+                    richTextBox.Select(newPos, comboBoxWhat.Text.Length);
                     richTextBox.ScrollToCaret();
                 }
@@ -94 +109 @@
             DpiScaling.Apply(this);
             this.Icon = Icon.ExtractAssociatedIcon(Application.Execut‌​ablePath);
-            formDimensions.Load(this, Owner);
-            textBoxWhat.Focus();
+            new FormDimensions().Load(this, Owner);
+            comboBoxWhat.Focus();
+            LoadFromRegistry();
             UpdateInterface();
         }
@@ -106 +122 @@
         private void FormFind_FormClosing(object sender, FormClosingEventArgs e)
         {
+            SaveToRegistry();
             richTextBox.formFind = null;
-            formDimensions.Save(this, Owner);
+            new FormDimensions().Save(this, Owner);
         }
 
@@ -115 +132 @@
             {
                 buttonFindNext.PerformClick();
+            } else
+            if (e.KeyChar == 27)
+            {
+                Close();
             }
         }
@@ -120 +141 @@
         private void UpdateInterface()
         {
-            buttonFindNext.Enabled = textBoxWhat.Text.Length > 0;
-            buttonFindPrevious.Enabled = textBoxWhat.Text.Length > 0;
+            buttonFindNext.Enabled = comboBoxWhat.Text.Length > 0;
+            buttonFindPrevious.Enabled = comboBoxWhat.Text.Length > 0;
+        }
+
+        public void LoadFromRegistry()
+        {
+            RegistryKey regKey = Application.UserAppDataRegistry.OpenSubKey(regSubKey);
+            if (regKey == null) regKey = Application.UserAppDataRegistry.CreateSubKey(regSubKey);
+
+            checkBoxMatchWholeWordOnly.Checked = regKey.GetValueBool("MatchWholeWordOnly", false);
+            checkBoxMatchCase.Checked = regKey.GetValueBool("MatchCase", false);
+
+            regKey = Application.UserAppDataRegistry.OpenSubKey(regSubKey + "\\History");
+            if (regKey == null) regKey = Application.UserAppDataRegistry.CreateSubKey(regSubKey + "\\History");
+            int count = regKey.GetValueInt("Count", 0);
+            comboBoxWhat.BeginUpdate();
+            while (comboBoxWhat.Items.Count > count) comboBoxWhat.Items.RemoveAt(comboBoxWhat.Items.Count - 1);
+            while (comboBoxWhat.Items.Count < count) comboBoxWhat.Items.Add("");
+            for (int i = 0; i < count; i++)
+            {
+                comboBoxWhat.Items[i] = (string)regKey.GetValue(i.ToString(), "");
+            }
+            comboBoxWhat.EndUpdate();
+        }
+
+        public void SaveToRegistry()
+        {
+            RegistryKey regKey = Application.UserAppDataRegistry.OpenSubKey(regSubKey, true);
+            if (regKey == null) regKey = Application.UserAppDataRegistry.CreateSubKey(regSubKey);
+
+            regKey.SetValue("MatchWholeWordOnly", checkBoxMatchWholeWordOnly.Checked);
+            regKey.SetValue("MatchCase", checkBoxMatchCase.Checked);
+
+            regKey = Application.UserAppDataRegistry.OpenSubKey(regSubKey + "\\History", true);
+            if (regKey == null) regKey = Application.UserAppDataRegistry.CreateSubKey(regSubKey + "\\History");
+
+            int i = 0;
+            regKey.SetValue("Count", comboBoxWhat.Items.Count);
+            foreach (var item in comboBoxWhat.Items)
+            {
+                regKey.SetValue(i.ToString(), item);
+                i++;
+            }
+
+            while (true)
+            {
+                List<string> names = regKey.GetValueNames().ToList();
+                if (names.IndexOf(i.ToString()) != -1)
+                {
+                    regKey.DeleteValue(i.ToString());
+                }
+                else break;
+                i++;
+            }
         }
     }

Common/FormProgress.cs

@@ -77 +77 @@
         private void bg_DoWorkerCompleted(object sender, RunWorkerCompletedEventArgs e)
         {
+            if (e.Error != null)
+            {
+                currentTask.terminated = true;
+                MessageBox.Show(e.Error.Message, "Error in background task", MessageBoxButtons.OK, MessageBoxIcon.Error);
+            }
             if (!currentTask.terminated)
             {
@@ -91 +96 @@
             }
             else Close();
-            if (e.Error != null)
-            {
-                MessageBox.Show(e.Error.Message, "Error in background task", MessageBoxButtons.OK, MessageBoxIcon.Error);
-            }
         }
 
@@ -134 +135 @@
             foreach (var task in tasks)
             {
-                if (task.completed) completed += 1;                
+                if (task.completed) completed += 1;
             }
             return completed == tasks.Count;
@@ -154 +155 @@
         public int current;
         public bool terminated;
-        public bool completed; // If task was not terminated durring execution.
+        public bool completed; // If task was not terminated during execution.
         public string operation;
         public delegate void CallbackEventHandler(Progress progress);