Changeset 8

Timestamp:

Aug 12, 2019, 12:33:47 PM (5 years ago)

Author:

chronos

Message:

• Modified: Updated files.
• Added: ExtTools class for external program and compare tool execution.

Location:

Common

Files:

• Database.cs (modified) (5 diffs)
• ExtTools.cs (added)
• Prompt.cs (modified) (2 diffs)
• Registry.cs (modified) (2 diffs)

Common/Database.cs

@@ -28 +28 @@
         public delegate void LogMessageHandler(string text);
         public static event LogMessageHandler LogMessage;
-        public static string connectionString = "";
         public static string databaseName = "";
         public static string serverName = "";
@@ -40 +39 @@
 
             // Connect to server
-            if (type == DatabaseType.MsSql)
-            {
-                connectionString = "server=" + serverName + "; Trusted_Connection=yes; database=" + databaseName + "; connection timeout=5";
-            } else 
             if (type == DatabaseType.SQLite)
             {
                 Directory.CreateDirectory(Path.GetDirectoryName(sqliteFileName));
-                connectionString = "Data Source=" + sqliteFileName + "; Version=3";
                 databaseName = null;
             }
@@ -62 +56 @@
                     {
                         // database does not exist, try to create it
-                        connectionString = "server=" + serverName + "; Trusted_Connection=yes; connection timeout=5";
                         ExecuteNonQuery("CREATE DATABASE " + databaseName);
 
                         // Need to wait for the new DB startup in order to continue and be sure it can be accessed
                         if (connection is SqlConnection) SqlConnection.ClearAllPools();
-
-                        connectionString = "server=" + serverName + "; Trusted_Connection=yes; database=" + databaseName + "; connection timeout=5";
                     }
                     else
@@ -87 +78 @@
 
             return result;
+        }
+
+        public static string GetConnectionString()
+        {
+            string connectionString = "";
+            if (type == DatabaseType.MsSql)
+            {
+                connectionString = "server=" + serverName + "; Trusted_Connection=yes; database=" + databaseName + "; connection timeout=5";
+            }
+            else
+            if (type == DatabaseType.SQLite)
+            {
+                connectionString = "Data Source=" + sqliteFileName + "; Version=3";
+            }
+            return connectionString;
         }
 
@@ -105 +111 @@
         {
             DbConnection connection = GetFactory().CreateConnection();
-            connection.ConnectionString = connectionString;
+            connection.ConnectionString = GetConnectionString();
             return connection;
         }

Common/Prompt.cs

@@ -21 +21 @@
                 StartPosition = FormStartPosition.CenterScreen,
             };
-            Label textLabel = new Label() { Left = 50, Top = 20, Text = text };
+            Label textLabel = new Label() { Left = 50, Top = 20, AutoSize = true, Text = text };
             TextBox textBox = new TextBox() { Left = 50, Top = 44, Width = 400, Text = initialValue };
             textBox.SelectAll();
@@ -216 +216 @@
                 StartPosition = FormStartPosition.CenterScreen,
             };
-            Label textLabel = new Label() { Left = 50, Top = 20, Text = text };
+            Label textLabel = new Label() { Left = 50, Top = 20, AutoSize = true, Text = text };
             RichTextBox textBox = new RichTextBox() { Left = 50, Top = 44, Width = 400, Height = dataSize, Text = initialValue };
             textBox.SelectAll();

Common/Registry.cs

@@ -35 +35 @@
         }
 
+        public static float GetValueFloat(this RegistryKey regKey, string name, float defaultValue)
+        {
+            object value = regKey.GetValue(name, defaultValue);
+            float num;
+            if (float.TryParse((string)value, out num))
+                return num;
+            else return defaultValue;
+        }
+
         public static void SetValueBool(this RegistryKey regKey, string name, bool value)
         {
@@ -50 +59 @@
             regKey.SetValue(name, value);
         }
+
+        public static void SetValueFloat(this RegistryKey regKey, string name, float value)
+        {
+            regKey.SetValue(name, value);
+        }
     }
 }