добавлены аватар и имя бота в Discord, мелкие фиксы

App.config

@@ -38,6 +38,12 @@
             <setting name="dwhEnabled" serializeAs="String">
                 <value>False</value>
             </setting>
+            <setting name="dwhBotname" serializeAs="String">
+                <value>Relauncher</value>
+            </setting>
+            <setting name="dwhAvatarURL" serializeAs="String">
+                <value>https://distribution.faceit-cdn.net/images/7240adfa-6bda-43a0-abd0-8c599f176686.jpeg</value>
+            </setting>
         </RelaunchProcess.Properties.Settings>
     </userSettings>
 <startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/></startup>

DiscordSettings.Designer.cs

@@ -30,15 +30,20 @@
         {
             this.btnOk = new System.Windows.Forms.Button();
             this.btnCancel = new System.Windows.Forms.Button();
-            this.chbxDiscordEnabled = new System.Windows.Forms.CheckBox();
-            this.textDwhURL = new System.Windows.Forms.TextBox();
             this.lblDwhURL = new System.Windows.Forms.Label();
             this.btnClearUrlField = new System.Windows.Forms.Button();
+            this.lblDwhBotname = new System.Windows.Forms.Label();
+            this.lblDwhAvatarUrl = new System.Windows.Forms.Label();
+            this.textDwhAvatarUrl = new System.Windows.Forms.TextBox();
+            this.textDwhBotName = new System.Windows.Forms.TextBox();
+            this.textDwhURL = new System.Windows.Forms.TextBox();
+            this.chbxDiscordEnabled = new System.Windows.Forms.CheckBox();
+            this.btnClearAvatarUrlField = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 
             // btnOk
             // 
-            this.btnOk.Location = new System.Drawing.Point(193, 89);
+            this.btnOk.Location = new System.Drawing.Point(215, 155);
             this.btnOk.Name = "btnOk";
             this.btnOk.Size = new System.Drawing.Size(75, 23);
             this.btnOk.TabIndex = 0;
@@ -49,7 +54,7 @@
             // btnCancel
             // 
             this.btnCancel.DialogResult = System.Windows.Forms.DialogResult.Cancel;
-            this.btnCancel.Location = new System.Drawing.Point(274, 89);
+            this.btnCancel.Location = new System.Drawing.Point(296, 155);
             this.btnCancel.Name = "btnCancel";
             this.btnCancel.Size = new System.Drawing.Size(75, 23);
             this.btnCancel.TabIndex = 1;
@@ -57,31 +62,10 @@
             this.btnCancel.UseVisualStyleBackColor = true;
             this.btnCancel.Click += new System.EventHandler(this.BtnCancel_Click);
             // 
-            // chbxDiscordEnabled
-            // 
-            this.chbxDiscordEnabled.AutoSize = true;
-            this.chbxDiscordEnabled.Checked = global::RelaunchProcess.Properties.Settings.Default.dwhEnabled;
-            this.chbxDiscordEnabled.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::RelaunchProcess.Properties.Settings.Default, "dwhEnabled", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.chbxDiscordEnabled.Location = new System.Drawing.Point(12, 63);
-            this.chbxDiscordEnabled.Name = "chbxDiscordEnabled";
-            this.chbxDiscordEnabled.Size = new System.Drawing.Size(232, 17);
-            this.chbxDiscordEnabled.TabIndex = 2;
-            this.chbxDiscordEnabled.Text = "Включить отправку сообщений в Discord";
-            this.chbxDiscordEnabled.UseVisualStyleBackColor = true;
-            // 
-            // textDwhURL
-            // 
-            this.textDwhURL.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::RelaunchProcess.Properties.Settings.Default, "dwhURL", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
-            this.textDwhURL.Location = new System.Drawing.Point(12, 37);
-            this.textDwhURL.Name = "textDwhURL";
-            this.textDwhURL.Size = new System.Drawing.Size(337, 20);
-            this.textDwhURL.TabIndex = 3;
-            this.textDwhURL.Text = global::RelaunchProcess.Properties.Settings.Default.dwhURL;
-            // 
             // lblDwhURL
             // 
             this.lblDwhURL.AutoSize = true;
-            this.lblDwhURL.Location = new System.Drawing.Point(9, 9);
+            this.lblDwhURL.Location = new System.Drawing.Point(9, 87);
             this.lblDwhURL.Name = "lblDwhURL";
             this.lblDwhURL.Size = new System.Drawing.Size(147, 13);
             this.lblDwhURL.TabIndex = 4;
@@ -90,13 +74,84 @@
             // btnClearUrlField
             // 
             this.btnClearUrlField.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
-            this.btnClearUrlField.Location = new System.Drawing.Point(351, 38);
+            this.btnClearUrlField.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+            this.btnClearUrlField.Location = new System.Drawing.Point(352, 103);
             this.btnClearUrlField.Name = "btnClearUrlField";
             this.btnClearUrlField.Size = new System.Drawing.Size(19, 19);
             this.btnClearUrlField.TabIndex = 5;
             this.btnClearUrlField.Text = "X";
             this.btnClearUrlField.UseVisualStyleBackColor = true;
-            this.btnClearUrlField.Click += new System.EventHandler(this.BtnClearUrlField_Click);
+            this.btnClearUrlField.Click += new System.EventHandler(this.ClearUrl);
+            // 
+            // lblDwhBotname
+            // 
+            this.lblDwhBotname.AutoSize = true;
+            this.lblDwhBotname.Location = new System.Drawing.Point(9, 9);
+            this.lblDwhBotname.Name = "lblDwhBotname";
+            this.lblDwhBotname.Size = new System.Drawing.Size(127, 13);
+            this.lblDwhBotname.TabIndex = 6;
+            this.lblDwhBotname.Text = "Имя бота в сообщении:";
+            // 
+            // lblDwhAvatarUrl
+            // 
+            this.lblDwhAvatarUrl.AutoSize = true;
+            this.lblDwhAvatarUrl.Location = new System.Drawing.Point(9, 48);
+            this.lblDwhAvatarUrl.Name = "lblDwhAvatarUrl";
+            this.lblDwhAvatarUrl.Size = new System.Drawing.Size(102, 13);
+            this.lblDwhAvatarUrl.TabIndex = 6;
+            this.lblDwhAvatarUrl.Text = "URL аватара бота:";
+            // 
+            // textDwhAvatarUrl
+            // 
+            this.textDwhAvatarUrl.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::RelaunchProcess.Properties.Settings.Default, "dwhAvatarURL", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+            this.textDwhAvatarUrl.Location = new System.Drawing.Point(9, 64);
+            this.textDwhAvatarUrl.Name = "textDwhAvatarUrl";
+            this.textDwhAvatarUrl.Size = new System.Drawing.Size(337, 20);
+            this.textDwhAvatarUrl.TabIndex = 7;
+            this.textDwhAvatarUrl.Text = global::RelaunchProcess.Properties.Settings.Default.dwhAvatarURL;
+            // 
+            // textDwhBotName
+            // 
+            this.textDwhBotName.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::RelaunchProcess.Properties.Settings.Default, "dwhBotname", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+            this.textDwhBotName.Location = new System.Drawing.Point(9, 25);
+            this.textDwhBotName.MaxLength = 40;
+            this.textDwhBotName.Name = "textDwhBotName";
+            this.textDwhBotName.Size = new System.Drawing.Size(211, 20);
+            this.textDwhBotName.TabIndex = 7;
+            this.textDwhBotName.Text = global::RelaunchProcess.Properties.Settings.Default.dwhBotname;
+            // 
+            // textDwhURL
+            // 
+            this.textDwhURL.DataBindings.Add(new System.Windows.Forms.Binding("Text", global::RelaunchProcess.Properties.Settings.Default, "dwhURL", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+            this.textDwhURL.Location = new System.Drawing.Point(9, 103);
+            this.textDwhURL.Name = "textDwhURL";
+            this.textDwhURL.Size = new System.Drawing.Size(337, 20);
+            this.textDwhURL.TabIndex = 3;
+            this.textDwhURL.Text = global::RelaunchProcess.Properties.Settings.Default.dwhURL;
+            // 
+            // chbxDiscordEnabled
+            // 
+            this.chbxDiscordEnabled.AutoSize = true;
+            this.chbxDiscordEnabled.Checked = global::RelaunchProcess.Properties.Settings.Default.dwhEnabled;
+            this.chbxDiscordEnabled.DataBindings.Add(new System.Windows.Forms.Binding("Checked", global::RelaunchProcess.Properties.Settings.Default, "dwhEnabled", true, System.Windows.Forms.DataSourceUpdateMode.OnPropertyChanged));
+            this.chbxDiscordEnabled.Location = new System.Drawing.Point(9, 129);
+            this.chbxDiscordEnabled.Name = "chbxDiscordEnabled";
+            this.chbxDiscordEnabled.Size = new System.Drawing.Size(232, 17);
+            this.chbxDiscordEnabled.TabIndex = 2;
+            this.chbxDiscordEnabled.Text = "Включить отправку сообщений в Discord";
+            this.chbxDiscordEnabled.UseVisualStyleBackColor = true;
+            // 
+            // btnClearAvatarUrlField
+            // 
+            this.btnClearAvatarUrlField.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
+            this.btnClearAvatarUrlField.ForeColor = System.Drawing.Color.FromArgb(((int)(((byte)(192)))), ((int)(((byte)(0)))), ((int)(((byte)(0)))));
+            this.btnClearAvatarUrlField.Location = new System.Drawing.Point(352, 65);
+            this.btnClearAvatarUrlField.Name = "btnClearAvatarUrlField";
+            this.btnClearAvatarUrlField.Size = new System.Drawing.Size(19, 19);
+            this.btnClearAvatarUrlField.TabIndex = 5;
+            this.btnClearAvatarUrlField.Text = "X";
+            this.btnClearAvatarUrlField.UseVisualStyleBackColor = true;
+            this.btnClearAvatarUrlField.Click += new System.EventHandler(this.ClearUrl);
             // 
             // DiscordSettings
             // 
@@ -104,8 +159,13 @@
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.CancelButton = this.btnCancel;
-            this.ClientSize = new System.Drawing.Size(375, 128);
+            this.ClientSize = new System.Drawing.Size(387, 188);
             this.ControlBox = false;
+            this.Controls.Add(this.textDwhAvatarUrl);
+            this.Controls.Add(this.textDwhBotName);
+            this.Controls.Add(this.lblDwhAvatarUrl);
+            this.Controls.Add(this.lblDwhBotname);
+            this.Controls.Add(this.btnClearAvatarUrlField);
             this.Controls.Add(this.btnClearUrlField);
             this.Controls.Add(this.lblDwhURL);
             this.Controls.Add(this.textDwhURL);
@@ -132,5 +192,10 @@
         private System.Windows.Forms.TextBox textDwhURL;
         private System.Windows.Forms.Label lblDwhURL;
         private System.Windows.Forms.Button btnClearUrlField;
+        private System.Windows.Forms.Label lblDwhBotname;
+        private System.Windows.Forms.TextBox textDwhBotName;
+        private System.Windows.Forms.Label lblDwhAvatarUrl;
+        private System.Windows.Forms.TextBox textDwhAvatarUrl;
+        private System.Windows.Forms.Button btnClearAvatarUrlField;
     }
 }

DiscordSettings.cs

@@ -26,9 +26,12 @@ namespace RelaunchProcess
 
         private void BtnOk_Click(object sender, EventArgs e)
         {
-            if (Uri.IsWellFormedUriString(textDwhURL.Text, UriKind.Absolute)||textDwhURL.Text=="")
+            if ( (String.IsNullOrEmpty(textDwhURL.Text) ||
+                Uri.IsWellFormedUriString(textDwhURL.Text, UriKind.Absolute)) &&
+                (String.IsNullOrEmpty(textDwhAvatarUrl.Text) || 
+                Uri.IsWellFormedUriString(textDwhAvatarUrl.Text, UriKind.Absolute)) )
             {
-                if (textDwhURL.Text=="")
+                if (String.IsNullOrEmpty(textDwhURL.Text))
                 {
                     chbxDiscordEnabled.Checked = false;
                 }
@@ -38,15 +41,14 @@ namespace RelaunchProcess
             }
             else 
             {
-                //TODO обработать ситуацию с неверным УРЛом
+                MessageBox.Show("Неверный формат URL.\rОчистите или исправьте.", "URL", MessageBoxButtons.OK, MessageBoxIcon.Error);
-                textDwhURL.Text = "";
-                MessageBox.Show("Неверный формат URL.", "URL", MessageBoxButtons.OK, MessageBoxIcon.Error);
             }
         }
 
-        private void BtnClearUrlField_Click(object sender, EventArgs e)
+        private void ClearUrl(object sender, EventArgs e)
         {
-            textDwhURL.Text = "";
+            if ( (Button)sender == btnClearUrlField ) textDwhURL.Text = "";
+            if ( (Button)sender == btnClearAvatarUrlField ) textDwhAvatarUrl.Text = "";
         }
     }
 }

Form1.Designer.cs

@@ -166,7 +166,7 @@ namespace Process_Auto_Relaunch
             this.buttonSetProgramStart.TabIndex = 1;
             this.buttonSetProgramStart.Text = "Обзор";
             this.buttonSetProgramStart.UseVisualStyleBackColor = true;
-            this.buttonSetProgramStart.Click += new System.EventHandler(this.buttonSetProgramStart_Click);
+            this.buttonSetProgramStart.Click += new System.EventHandler(this.ButtonSetProgramStart_Click);
             // 
             // groupBoxProgramStart
             // 

Form1.cs

@@ -40,7 +40,7 @@ namespace Process_Auto_Relaunch
             this.updateLogDelegate += this.HistoryLog;
             myBackgroundWorker.WorkerSupportsCancellation = true;
             dwhHook = new DiscordWebhook();
-            if ( Uri.IsWellFormedUriString(Settings.Default.dwhURL,UriKind.Absolute) && Settings.Default.dwhEnabled && Settings.Default.dwhURL!="") 
+            /*if ( Uri.IsWellFormedUriString(Settings.Default.dwhURL,UriKind.Absolute) && Settings.Default.dwhEnabled && Settings.Default.dwhURL!="") 
             {
                 dwhHook.Url = Settings.Default.dwhURL;
             }
@@ -49,7 +49,7 @@ namespace Process_Auto_Relaunch
                 HistoryLog($"Îøèáêà â URL âåá-õóêà ({Settings.Default.dwhURL}). Âûâîä â Discord îòêëþ÷åí.");
                 Settings.Default.dwhEnabled = false;
                 Settings.Default.Save();
-            }
+            }*/
 
         }
 
@@ -143,43 +143,59 @@ namespace Process_Auto_Relaunch
         /// <summary>
         /// Îáíîâëåíèå ñòàòóñà â ïðîãðàììå
         /// </summary>
-        /// <param name="text">Òåêñò äëÿ îòîáðàæåíèÿ</param>
+        /// <param name="text">Òåêñò äëÿ îòîáðàæåíèÿ/îòïðàâêè </param>
-        /// <param name="add_history">Ñîõðàíåíèå òåêñòà â îêíî èñòîðèè</param>
+        /// <param name="level">Ôëàãè äëÿ íàçíà÷åíèÿ îòïðàâêè</param>
         public void UpdateStatus( string text, NotifyLevel level )
         {
             if (!level.HasFlag(NotifyLevel.logAlways) && !level.HasFlag(NotifyLevel.logUpdateStatus)) return;
             labelStatus.Text = text;
         }
 
-        private void HistoryLog( string text, NotifyLevel level = NotifyLevel.logUpdateStatus )
+        /// <summary>
+        /// Äîáàâëåíèå ñòðîêè â Èñòîðèè Çàïóñêîâ
+        /// </summary>
+        /// <param name="text">Òåêñò äëÿ îòîáðàæåíèÿ/îòïðàâêè </param>
+        /// <param name="level">Ôëàãè äëÿ íàçíà÷åíèÿ îòïðàâêè</param>
+        private void HistoryLog( string text, NotifyLevel level )
         {
             if (!level.HasFlag(NotifyLevel.logAlways) && !level.HasFlag(NotifyLevel.logHistory)) return;
             richTextBoxHistory.Text += DateTime.Now.ToString() + ": " + text + "\n";
         }
 
-        public void SendDiscordMessage( string message, NotifyLevel level )
+        /// <summary>
+        /// Îòïðàâêà ñòàòóñà â Discord
+        /// </summary>
+        /// <param name="text">Òåêñò äëÿ îòîáðàæåíèÿ/îòïðàâêè </param>
+        /// <param name="level">Ôëàãè äëÿ íàçíà÷åíèÿ îòïðàâêè</param>
+        public void SendDiscordMessage( string text, NotifyLevel level )
         {
             if (!level.HasFlag(NotifyLevel.logAlways) && !level.HasFlag(NotifyLevel.logDiscord)) return;
             if (Settings.Default.dwhEnabled)
             {
                 dwhHook.Url = Settings.Default.dwhURL;
-                dwhMessage.Username = "Relaunch process";
+                dwhMessage.Username = Settings.Default.dwhBotname;
-                dwhMessage.Content = ":arrows_counterclockwise: " + message;
+                dwhMessage.AvatarUrl = Settings.Default.dwhAvatarURL;
+                dwhMessage.Content = ":arrows_counterclockwise: " + text;
                 try
                 {
                     dwhHook.Send(dwhMessage);
                 }
                 catch (Exception ex)
                 {
-                    HistoryLog($"Discord messaging error: {ex.Message}");
+                    Status($"Îøèáêà îòïðàâêè â äèñêîðä.",NotifyLevel.logHistory);
                     Debug.WriteLine($"Discord messaging error: {ex.Message}");
-                    Settings.Default.dwhEnabled = false;
+                    //Settings.Default.dwhEnabled = false;
-                    Settings.Default.Save();
+                    //Settings.Default.Save();
                 }
             }
         }
 
-        public void Status(string text, NotifyLevel level)
+        /// <summary>
+        /// Îáíîâëåíèå ñòàòóñà â ïðîãðàììå
+        /// </summary>
+        /// <param name="text">Òåêñò äëÿ îòîáðàæåíèÿ/îòïðàâêè </param>
+        /// <param name="level">Ôëàãè äëÿ íàçíà÷åíèÿ îòïðàâêè</param>
+        public void Status(string text, NotifyLevel level = NotifyLevel.logUpdateStatus)
         {
             updateLogDelegate.Invoke(text, level);
         }
@@ -204,7 +220,7 @@ namespace Process_Auto_Relaunch
         /// </summary>
         /// <param name="sender"></param>
         /// <param name="e"></param>
-        private void buttonSetProgramStart_Click(object sender, EventArgs e)
+        private void ButtonSetProgramStart_Click(object sender, EventArgs e)
         {
             OpenFileDialog openFile = new OpenFileDialog();
             openFile.Filter = "Èñïîëíÿåìûå ôàéëû (*.exe)|*.exe";
@@ -305,12 +321,12 @@ namespace Process_Auto_Relaunch
         {
             if (e.Cancelled)
             {
-                Status("Íàáëþäåíèå îòìåíåíî.",NotifyLevel.logUpdateStatus);
+                Status("Íàáëþäåíèå îòìåíåíî.",NotifyLevel.logUpdateStatus|NotifyLevel.logDiscord);
             }
             else if (e.Error != null)
             {
+                Status("Ïðîèçîøëà îøèáêà! Íàáëþäåíèå îñòàíîâëåíî.", NotifyLevel.logUpdateStatus | NotifyLevel.logDiscord);
                 MessageBox.Show("Error: " + e.Error.Message, "Îøèáêà", MessageBoxButtons.OK, MessageBoxIcon.Stop);
-                Status("Ïðîèçîøëà îøèáêà! Íàáëþäåíèå îñòàíîâëåíî.", NotifyLevel.logUpdateStatus|NotifyLevel.logDiscord);
                 radioButtonDisableWathing.Checked = true;
             }
             else

Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace RelaunchProcess.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.10.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
@@ -142,5 +142,30 @@ namespace RelaunchProcess.Properties {
                 this["dwhEnabled"] = value;
             }
         }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("Relauncher")]
+        public string dwhBotname {
+            get {
+                return ((string)(this["dwhBotname"]));
+            }
+            set {
+                this["dwhBotname"] = value;
+            }
+        }
+        
+        [global::System.Configuration.UserScopedSettingAttribute()]
+        [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+        [global::System.Configuration.DefaultSettingValueAttribute("https://distribution.faceit-cdn.net/images/7240adfa-6bda-43a0-abd0-8c599f176686.j" +
+            "peg")]
+        public string dwhAvatarURL {
+            get {
+                return ((string)(this["dwhAvatarURL"]));
+            }
+            set {
+                this["dwhAvatarURL"] = value;
+            }
+        }
     }
 }

Properties/Settings.settings

@@ -32,5 +32,11 @@
     <Setting Name="dwhEnabled" Type="System.Boolean" Scope="User">
       <Value Profile="(Default)">False</Value>
     </Setting>
+    <Setting Name="dwhBotname" Type="System.String" Scope="User">
+      <Value Profile="(Default)">Relauncher</Value>
+    </Setting>
+    <Setting Name="dwhAvatarURL" Type="System.String" Scope="User">
+      <Value Profile="(Default)">https://distribution.faceit-cdn.net/images/7240adfa-6bda-43a0-abd0-8c599f176686.jpeg</Value>
+    </Setting>
   </Settings>
 </SettingsFile>