From e38677bb27cacf755493a0f61857e759c52a466d Mon Sep 17 00:00:00 2001
From: Danil Kislov <Kislov@aeroclub.ru>
Date: Mon, 18 Mar 2019 13:54:58 +0300
Subject: [PATCH] =?UTF-8?q?=D0=9C=D0=B5=D0=BB=D0=BA=D0=B8=D0=B5=20=D1=84?=
 =?UTF-8?q?=D0=B8=D0=BA=D1=81=D1=8B=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE?=
 =?UTF-8?q?=D0=B5=D0=BA=20=D0=B8=20WorkMode?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 JiraTimeBotForm/JiraIntegration/JiraApi.cs | 1 -
 JiraTimeBotForm/UI/frmMain.cs              | 8 +++++++-
 JiraTimeBotForm/UI/frmSettings.Designer.cs | 9 +++++----
 JiraTimeBotForm/UI/frmSettings.resx        | 3 +++
 4 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/JiraTimeBotForm/JiraIntegration/JiraApi.cs b/JiraTimeBotForm/JiraIntegration/JiraApi.cs
index 63c054c..d88c3a4 100644
--- a/JiraTimeBotForm/JiraIntegration/JiraApi.cs
+++ b/JiraTimeBotForm/JiraIntegration/JiraApi.cs
@@ -40,7 +40,6 @@ namespace JiraTimeBotForm.JiraIntegration
             date = date.GetValueOrDefault(DateTime.Now.Date);
 
             var userName = settings.JiraUserName;
-            //userName = "Zoya.Aleksandridi";
 
             var jql = $"status changed by '{userName}' during (\"{date.Value:yyyy-MM-dd}\",\"{date.Value:yyyy-MM-dd}\")";
             var affectedIssues = jira.Issues.GetIssuesFromJqlAsync(jql, 50, 0, cancellationToken).Result.ToList();
diff --git a/JiraTimeBotForm/UI/frmMain.cs b/JiraTimeBotForm/UI/frmMain.cs
index 26f8a6d..e26a426 100644
--- a/JiraTimeBotForm/UI/frmMain.cs
+++ b/JiraTimeBotForm/UI/frmMain.cs
@@ -90,9 +90,13 @@ namespace JiraTimeBotForm.UI
 
         private void Form1_Load(object sender, EventArgs e)
         {
-            _settings = Settings.LoadAndCheck(_settingsWindowShow, _settingsErrorReporter);
             tmrStart.Enabled = true;
+            PrintStartMessage();
+        }
 
+        private void PrintStartMessage()
+        {
+            _settings = Settings.LoadAndCheck(_settingsWindowShow, _settingsErrorReporter);
             _log.Info($"Загружен бот для {_settings.JiraUserName}, Режим: {_settings.WorkType.ToString()}, работаем в {_settings.RepositoryPath}");
         }
 
@@ -175,6 +179,8 @@ namespace JiraTimeBotForm.UI
         {
             var frm = new frmSettings();
             frm.ShowDialog();
+
+            PrintStartMessage();
         }
     }
 }
diff --git a/JiraTimeBotForm/UI/frmSettings.Designer.cs b/JiraTimeBotForm/UI/frmSettings.Designer.cs
index 95ba561..4addc97 100644
--- a/JiraTimeBotForm/UI/frmSettings.Designer.cs
+++ b/JiraTimeBotForm/UI/frmSettings.Designer.cs
@@ -167,10 +167,11 @@
             // 
             // cboWorkType
             // 
+            this.cboWorkType.DropDownStyle = System.Windows.Forms.ComboBoxStyle.DropDownList;
             this.cboWorkType.FormattingEnabled = true;
             this.cboWorkType.Items.AddRange(new object[] {
             "Mercurial",
-            "Jira Updates"});
+            "Обновления Jira-задачь"});
             this.cboWorkType.Location = new System.Drawing.Point(109, 18);
             this.cboWorkType.Name = "cboWorkType";
             this.cboWorkType.Size = new System.Drawing.Size(99, 21);
@@ -179,11 +180,11 @@
             // label6
             // 
             this.label6.AutoSize = true;
-            this.label6.Location = new System.Drawing.Point(27, 21);
+            this.label6.Location = new System.Drawing.Point(18, 21);
             this.label6.Name = "label6";
-            this.label6.Size = new System.Drawing.Size(75, 13);
+            this.label6.Size = new System.Drawing.Size(85, 13);
             this.label6.TabIndex = 35;
-            this.label6.Text = "Работаем на:";
+            this.label6.Text = "Режим работы:";
             // 
             // frmSettings
             // 
diff --git a/JiraTimeBotForm/UI/frmSettings.resx b/JiraTimeBotForm/UI/frmSettings.resx
index 1af7de1..fe1cf21 100644
--- a/JiraTimeBotForm/UI/frmSettings.resx
+++ b/JiraTimeBotForm/UI/frmSettings.resx
@@ -117,4 +117,7 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <metadata name="cboWorkType.Locked" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+    <value>True</value>
+  </metadata>
 </root>
\ No newline at end of file