Что то там напилил

.semver.txt

@@ -1 +1 @@
-1.0.37
+1.0.42

src/JiraTimeBot.Core/Configuration/ISettingsManager.cs

@@ -0,0 +1,13 @@
+using System;
+
+namespace JiraTimeBot.Core.Configuration
+{
+    public interface ISettingsManager
+    {
+        Settings Load();
+        Settings LoadAndCheck(Action settingsSource, Action<string> errorMessageReporter);
+
+        void Save(Settings settings);
+        bool SettingsIsValid(Settings settings, out string message);
+    }
+}

src/JiraTimeBot.Core/Configuration/Settings.cs

@@ -0,0 +1,31 @@
+using System;
+
+namespace JiraTimeBot.Core.Configuration
+{
+    public class Settings
+    {
+        public string JiraUrl = "https://myteam.aeroclub.ru";
+
+        public int MinuterPerWorkDay = 8 * 60;
+        
+        public TimeSpan ActivationTime { get; set; }
+        
+        public bool AddCommentsToWorklog { get; set; }
+        
+        public string JiraPassword { get; set; }
+        
+        public string JiraQuery { get; set; }
+        
+        public string JiraUserName { get; set; }
+        
+        public string MercurialAuthorEmail { get; set; }
+        
+        public string RepositoryPath { get; set; }
+        
+        public int RoundToMinutes { get; set; }
+        
+        public string TimeControlTask { get; set; }
+        
+        public WorkType WorkType { get; set; }
+    }
+}

src/JiraTimeBot.Core/Configuration/SettingsManager.cs

@@ -3,28 +3,48 @@ using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Windows.Forms;
+using JiraTimeBot.Core.Encryption;
 using Newtonsoft.Json;
 
-namespace JiraTimeBot.Configuration
+namespace JiraTimeBot.Core.Configuration
 {
-    public class Settings
+    public class SettingsManager : ISettingsManager
     {
-        public int MinuterPerWorkDay = 8 * 60;
-        public int RountToMinutes { get; set; }
+        private static string _settingsFileName = "settings.json";
 
-        public string JiraUrl = "https://myteam.aeroclub.ru";
+        public Settings Load()
+        {
+            var configDir = Application.UserAppDataPath.Replace(Application.ProductVersion, "");
+            var settingsPath = Path.Combine(configDir, _settingsFileName);
+            if (!File.Exists(settingsPath))
+            {
+                return null;
+            }
 
-        public string RepositoryPath { get; set; }
-        public string MercurialAuthorEmail { get; set; }
-        public string JiraUserName { get; set; }
-        public string JiraPassword { get; set; }
-        public TimeSpan ActivationTime { get; set; }
-        public bool AddCommentsToWorklog { get; set; }
-        public WorkType WorkType { get; set; }
-        public string JiraQuery { get; set; }
-        public string TimeControlTask { get; set; }
+            var settingsText = File.ReadAllText(settingsPath);
 
-        public static Settings LoadAndCheck(Action settingsSource, Action<string> errorMessageReporter)
+            Settings settings;
+
+            try
+            {
+                settings = JsonConvert.DeserializeObject<Settings>(settingsText);
+                if (settings == null)
+                {
+                    return null;
+                }
+                var password = new PasswordEncryptionClass().Decrypt(settings.JiraUserName, settings.JiraPassword, settings.JiraUrl);
+                settings.JiraPassword = password;
+            }
+            catch (JsonReaderException)
+            {
+                return null;
+            }
+
+            return settings;
+        }
+
+
+        public Settings LoadAndCheck(Action settingsSource, Action<string> errorMessageReporter)
         {
             Settings settings;
             bool settingsValid;
@@ -49,7 +69,17 @@ namespace JiraTimeBot.Configuration
             return settings;
         }
 
-        private static bool SettingsIsValid(Settings settings, out string message)
+        public void Save(Settings settings)
+        {
+            var password = new PasswordEncryptionClass().Encrypt(settings.JiraUserName, settings.JiraPassword, settings.JiraUrl);
+            settings.JiraPassword = password;
+
+            var configDir = Application.UserAppDataPath.Replace(Application.ProductVersion, "");
+            var settingsPath = Path.Combine(configDir, _settingsFileName);
+            var settingsString = JsonConvert.SerializeObject(settings);
+            File.WriteAllText(settingsPath, settingsString);
+        }
+        public bool SettingsIsValid(Settings settings, out string message)
         {
             if (settings == null)
             {
@@ -60,7 +90,7 @@ namespace JiraTimeBot.Configuration
             var errors = new List<string>();
             message = null;
 
-            if (settings.RountToMinutes == default(int))
+            if (settings.RoundToMinutes == default(int))
             {
                 errors.Add("Укажите округление времени, например, 10 (минут)");
             }
@@ -94,54 +124,5 @@ namespace JiraTimeBot.Configuration
             return !hasErrors;
         }
 
-        public static Settings Load()
-        {
-            var configDir = Application.UserAppDataPath.Replace(Application.ProductVersion, "");
-            var settingsPath = Path.Combine(configDir, _settingsFileName);
-            if (!File.Exists(settingsPath))
-            {
-                return null;
-            }
-
-            var settingsText = File.ReadAllText(settingsPath);
-
-            Settings settings;
-
-            try
-            {
-                settings = JsonConvert.DeserializeObject<Settings>(settingsText);
-                if (settings == null)
-                {
-                    return null;
-                }
-                var password = new PasswordEncryptionClass().Decrypt(settings.JiraUserName, settings.JiraPassword, settings.JiraUrl);
-                settings.JiraPassword = password;
-            }
-            catch (JsonReaderException)
-            {
-                return null;
-            }
-
-            return settings;
-        }
-
-        public void Save()
-        {
-            var password = new PasswordEncryptionClass().Encrypt(this.JiraUserName, this.JiraPassword, this.JiraUrl);
-            this.JiraPassword = password;
-
-            var configDir = Application.UserAppDataPath.Replace(Application.ProductVersion, "");
-            var settingsPath = Path.Combine(configDir, _settingsFileName);
-            var settingsString = JsonConvert.SerializeObject(this);
-            File.WriteAllText(settingsPath, settingsString);
-        }
-
-        private static string _settingsFileName = "settings.json";
-    }
-
-    public enum WorkType
-    {
-        Mercurial = 0,
-        JiraLogs = 1,
     }
 }

src/JiraTimeBot.Core/Configuration/WorkType.cs

@@ -0,0 +1,8 @@
+namespace JiraTimeBot.Core.Configuration
+{
+    public enum WorkType
+    {
+        Mercurial = 0,
+        JiraLogs = 1,
+    }
+}

src/JiraTimeBot.Core/Encryption/PasswordEncryptionClass.cs

@@ -2,7 +2,7 @@
 using System.Security.Cryptography;
 using System.Text;
 
-namespace JiraTimeBot.Configuration
+namespace JiraTimeBot.Core.Encryption
 {
     public class PasswordEncryptionClass
     {

src/JiraTimeBot.Core/ILog.cs

@@ -0,0 +1,12 @@
+using System.ComponentModel;
+
+namespace JiraTimeBot.Core
+{
+    public interface ILog
+    {
+        void Info([Localizable(false)] string message);
+        void Trace([Localizable(false)] string message);
+        void Warn([Localizable(false)] string message);
+        void Error([Localizable(false)] string message);
+    }
+}

src/JiraTimeBot.Core/JiraIntegration/Comments/IJiraDescriptionSource.cs

@@ -1,7 +1,7 @@
-using JiraTimeBot.Configuration;
-using JiraTimeBot.TaskTime.Objects;
+using JiraTimeBot.Core.Configuration;
+using JiraTimeBot.Core.TaskTime.Objects;
 
-namespace JiraTimeBot.JiraIntegration.Comments
+namespace JiraTimeBot.Core.JiraIntegration.Comments
 {
     public interface IJiraDescriptionSource
     {

src/JiraTimeBot.Core/JiraIntegration/Comments/JiraDescriptionSource.cs

@@ -1,17 +1,23 @@
-using JiraTimeBot.Configuration;
-using JiraTimeBot.TaskTime.Objects;
-using System;
+using System;
 using System.Collections.Generic;
 using System.Linq;
+using JiraTimeBot.Core.Configuration;
+using JiraTimeBot.Core.TaskTime.Objects;
 
-namespace JiraTimeBot.JiraIntegration.Comments
+namespace JiraTimeBot.Core.JiraIntegration.Comments
 {
     public class JiraDescriptionSource : IJiraDescriptionSource
     {
         private readonly List<string> _dummyComments = new List<string>
         {
-            "Написание кода", "написание кода", "программирование", "реализация задачи", "кодинг", "код + тесты", 
-            "кодинг", "написание кода и тестов"
+            "Написание кода", 
+            "написание кода", 
+            "программирование", 
+            "реализация задачи", 
+            "кодинг", 
+            "код + тесты", 
+            "кодинг", 
+            "написание кода и тестов"
         };
 
         public string GetDescription(TaskTimeItem taskTimeItem, bool addCommentsToWorklog, Settings settings)

src/JiraTimeBot.Core/JiraIntegration/JiraApi.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using Atlassian.Jira;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.JiraIntegration.Comments;
-using JiraTimeBot.TaskTime.Objects;
+using JiraTimeBot.Core.Configuration;
+using JiraTimeBot.Core.JiraIntegration.Comments;
+using JiraTimeBot.Core.TaskTime.Objects;
 
-namespace JiraTimeBot.JiraIntegration
+namespace JiraTimeBot.Core.JiraIntegration
 {
     public class JiraApi
     {
@@ -123,21 +123,26 @@ namespace JiraTimeBot.JiraIntegration
                 var userWorklogs = workLogs.Where(w =>
                     w.StartDate.GetValueOrDefault().Date == date && w.Author.Equals(settings.JiraUserName,
                         StringComparison.InvariantCultureIgnoreCase)).ToList();
+                var comment = _descriptionSource.GetDescription(taskTimeItem, addCommentsToWorklog, settings);
 
                 foreach (var workLog in userWorklogs)
                 {
                     var timeSpent = TimeSpan.FromSeconds(workLog.TimeSpentInSeconds);
                     var timeDiff = Math.Abs((timeSpent - taskTimeItem.Time).TotalMinutes);
-                    if (timeDiff > 1 || userWorklogs.Count > 1)
+                    if (timeDiff > 1 || userWorklogs.Count > 1 || userWorklogs.First().Comment != comment)
                     {
                         if (timeDiff > 1)
                         {
                             _log.Trace($"Время отличается на {timeDiff} минут, удаляю worklog: {taskTimeItem.Branch} {workLog.Author} {workLog.CreateDate}: {workLog.TimeSpent}");
                         }
-                        else
+                        else if (userWorklogs.Count > 1)
                         {
                             _log.Trace($"Найдено более одного ворклога на задачу, удаляю worklog: {taskTimeItem.Branch} {workLog.Author} {workLog.CreateDate}: {workLog.TimeSpent}");
                         }
+                        else
+                        {
+                            _log.Trace($"Описание отличается, удаляю worklog: {taskTimeItem.Branch} {workLog.Author} {workLog.CreateDate}: {workLog.TimeSpent}");
+                        }
                         if (!dummy)
                         {
                             issue.DeleteWorklogAsync(workLog, token: cancellationToken);
@@ -155,8 +160,6 @@ namespace JiraTimeBot.JiraIntegration
                 {
                     var timeSpentJira = $"{taskTimeItem.Time.TotalMinutes}m";
 
-                    var comment = _descriptionSource.GetDescription(taskTimeItem, addCommentsToWorklog, settings);
-
                     Worklog workLogToAdd = new Worklog(timeSpentJira, date.Value, comment);
                     if (!dummy)
                     {

src/JiraTimeBot.Core/JiraIntegration/JiraCommitEmulator.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using Atlassian.Jira;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.Mercurial;
-using JiraTimeBot.Mercurial.Objects;
+using JiraTimeBot.Core.Configuration;
+using JiraTimeBot.Core.Mercurial;
+using JiraTimeBot.Core.Mercurial.Objects;
 
-namespace JiraTimeBot.JiraIntegration
+namespace JiraTimeBot.Core.JiraIntegration
 {
     public class JiraCommitEmulator : IMercurialLog
     {

src/JiraTimeBot.Core/JiraTimeBot.Core.csproj

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+  <PropertyGroup>
+    <TargetFramework>net472</TargetFramework>
+  </PropertyGroup>
+  <PropertyGroup>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+  </PropertyGroup>
+  <ItemGroup>
+    <PackageReference Include="Atlassian.SDK" Version="10.4.0" />
+    <PackageReference Include="Mercurial.Net" Version="1.1.1.607" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+  </ItemGroup>
+  <ItemGroup>
+    <Reference Include="System.IO.Compression" />
+    <Reference Include="System.Security" />
+    <Reference Include="System.Windows.Forms" />
+  </ItemGroup>
+</Project>

src/JiraTimeBot.Core/Job.cs

@@ -3,22 +3,24 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
 using System.Threading.Tasks;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.Mercurial;
-using JiraTimeBot.Mercurial.Objects;
-using JiraTimeBot.TasksProcessors;
-using JiraTimeBot.TaskTime;
-using JiraTimeBot.TaskTime.Objects;
+using JiraTimeBot.Core.Configuration;
+using JiraTimeBot.Core.Mercurial;
+using JiraTimeBot.Core.Mercurial.Objects;
+using JiraTimeBot.Core.TasksProcessors;
+using JiraTimeBot.Core.TaskTime;
+using JiraTimeBot.Core.TaskTime.Objects;
 
-namespace JiraTimeBot
+namespace JiraTimeBot.Core
 {
-    class Job
+    public class Job
     {
         private readonly IAllMercurialProviders _mercurialProviders;
         private readonly ITaskTimeCalculator _taskTimeDiscoverer;
         private readonly ILog _log;
 
-        public Job(IAllMercurialProviders mercurialProviders, ITaskTimeCalculator taskTimeDiscoverer, ILog log)
+        public Job(IAllMercurialProviders mercurialProviders, 
+                   ITaskTimeCalculator taskTimeDiscoverer, 
+                   ILog log)
         {
             _mercurialProviders = mercurialProviders;
             _taskTimeDiscoverer = taskTimeDiscoverer;

src/JiraTimeBot.Core/Mercurial/IAllMercurialProviders.cs

@@ -1,6 +1,6 @@
-using JiraTimeBot.JiraIntegration;
+using JiraTimeBot.Core.JiraIntegration;
 
-namespace JiraTimeBot.Mercurial
+namespace JiraTimeBot.Core.Mercurial
 {
     public interface IAllMercurialProviders
     {

src/JiraTimeBot.Core/Mercurial/IMercurialLog.cs

@@ -1,10 +1,10 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.Mercurial.Objects;
+using JiraTimeBot.Core.Configuration;
+using JiraTimeBot.Core.Mercurial.Objects;
 
-namespace JiraTimeBot.Mercurial
+namespace JiraTimeBot.Core.Mercurial
 {
     public interface IMercurialLog
     {

src/JiraTimeBot.Core/Mercurial/MercurialLog.cs

@@ -4,12 +4,12 @@ using System.IO;
 using System.Linq;
 using System.Text;
 using System.Threading;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.Mercurial.Modifiers;
-using JiraTimeBot.Mercurial.Objects;
+using JiraTimeBot.Core.Configuration;
+using JiraTimeBot.Core.Mercurial.Modifiers;
+using JiraTimeBot.Core.Mercurial.Objects;
 using Mercurial;
 
-namespace JiraTimeBot.Mercurial
+namespace JiraTimeBot.Core.Mercurial
 {
     public class MercurialLog: IMercurialLog
     {

src/JiraTimeBot.Core/Mercurial/Modifiers/CommitSkipper.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace JiraTimeBot.Mercurial.Modifiers
+namespace JiraTimeBot.Core.Mercurial.Modifiers
 {
     public class CommitSkipper : ICommitSkipper
     {

src/JiraTimeBot.Core/Mercurial/Modifiers/ICommitSkipper.cs

@@ -1,4 +1,4 @@
-namespace JiraTimeBot.Mercurial.Modifiers
+namespace JiraTimeBot.Core.Mercurial.Modifiers
 {
     public interface ICommitSkipper
     {

src/JiraTimeBot.Core/Mercurial/Modifiers/ITechnicalInfoSkipper.cs

@@ -1,4 +1,4 @@
-namespace JiraTimeBot.Mercurial.Modifiers
+namespace JiraTimeBot.Core.Mercurial.Modifiers
 {
     public interface ITechnicalInfoSkipper
     {

src/JiraTimeBot.Core/Mercurial/Modifiers/TechnicalInfoSkipper.cs

@@ -1,6 +1,6 @@
 using System.Text;
 
-namespace JiraTimeBot.Mercurial.Modifiers
+namespace JiraTimeBot.Core.Mercurial.Modifiers
 {
     public class TechnicalInfoSkipper : ITechnicalInfoSkipper
     {

src/JiraTimeBot.Core/Mercurial/Objects/MercurialCommitItem.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace JiraTimeBot.Mercurial.Objects
+namespace JiraTimeBot.Core.Mercurial.Objects
 {
     public class MercurialCommitItem
     {

src/JiraTimeBot.Core/StartUp/AutoStartUp.cs

@@ -1,7 +1,7 @@
 using System.Windows.Forms;
 using Microsoft.Win32;
 
-namespace JiraTimeBot.UI.Startup
+namespace JiraTimeBot.Core.StartUp
 {
     public class AutoStartUp
     {

src/JiraTimeBot.Core/TaskTime/ITaskTimeCalculator.cs

@@ -0,0 +1,15 @@
+using System.Collections.Generic;
+using System.Threading;
+using JiraTimeBot.Core.Configuration;
+using JiraTimeBot.Core.Mercurial.Objects;
+using JiraTimeBot.Core.TaskTime.Objects;
+
+namespace JiraTimeBot.Core.TaskTime
+{
+    public interface ITaskTimeCalculator
+    {
+        List<TaskTimeItem> CalculateTaskTime(List<MercurialCommitItem> commitItems, 
+                                             Settings settings, 
+                                             CancellationToken cancellationToken = default);
+    }
+}

src/JiraTimeBot.Core/TaskTime/Objects/TaskTimeItem.cs

@@ -1,6 +1,6 @@
 using System;
 
-namespace JiraTimeBot.TaskTime.Objects
+namespace JiraTimeBot.Core.TaskTime.Objects
 {
     public class TaskTimeItem
     {
@@ -8,7 +8,6 @@ namespace JiraTimeBot.TaskTime.Objects
         public string Branch { get; set; }
         public TimeSpan Time { get; set; }
         public int Commits { get; set; }
-
         public DateTime StartTime { get; set; }
         public DateTime EndTime { get; set; }
     }

src/JiraTimeBot.Core/TaskTime/TaskTimeByCommitsCalculator.cs

@@ -3,11 +3,11 @@ using System.Collections.Generic;
 using System.Linq;
 using System.Text;
 using System.Threading;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.Mercurial.Objects;
-using JiraTimeBot.TaskTime.Objects;
+using JiraTimeBot.Core.Configuration;
+using JiraTimeBot.Core.Mercurial.Objects;
+using JiraTimeBot.Core.TaskTime.Objects;
 
-namespace JiraTimeBot.TaskTime
+namespace JiraTimeBot.Core.TaskTime
 {
     public class TaskTimeByCommitsCalculator: ITaskTimeCalculator
     {
@@ -18,7 +18,9 @@ namespace JiraTimeBot.TaskTime
             _log = log;
         }
 
-        public List<TaskTimeItem> CalculateTaskTime(List<MercurialCommitItem> commits, Settings settings, CancellationToken cancellationToken = default(CancellationToken))
+        public List<TaskTimeItem> CalculateTaskTime(List<MercurialCommitItem> commits,
+                                                    Settings settings,
+                                                    CancellationToken cancellationToken = default)
         {
             int minutesPerWorkDay = settings.MinuterPerWorkDay;
             int remainMinutes = settings.MinuterPerWorkDay;
@@ -30,11 +32,11 @@ namespace JiraTimeBot.TaskTime
             }
 
             //если кол-во коммитов более чем кол-во интервалов - то уменьшим интервал вдвое.
-            while (totalCommitsCount > (8 * (60.0 / settings.RountToMinutes)))
+            while (totalCommitsCount > (8 * (60.0 / settings.RoundToMinutes)))
             {
-                settings.RountToMinutes = (int)RoundTo((decimal)(settings.RountToMinutes / 2.0), 5);
-                _log.Info($"Слишком много задач - уменьшаю интервал до {settings.RountToMinutes}.");
-                if (settings.RountToMinutes == 5)
+                settings.RoundToMinutes = (int)RoundTo((decimal)(settings.RoundToMinutes / 2.0), 5);
+                _log.Info($"Слишком много задач - уменьшаю интервал до {settings.RoundToMinutes}.");
+                if (settings.RoundToMinutes == 5)
                 {
                     break;
                 }
@@ -64,7 +66,7 @@ namespace JiraTimeBot.TaskTime
                 }
 
                 int currentTaskCommits = taskGroup.Count();
-                int currentTaskTime = (int)RoundTo(minutesPerWorkDay / totalCommitsCount * currentTaskCommits, settings.RountToMinutes);
+                int currentTaskTime = (int)RoundTo(minutesPerWorkDay / totalCommitsCount * currentTaskCommits, settings.RoundToMinutes);
                 remainMinutes = remainMinutes - currentTaskTime;
 
                 var orderedTasks = taskGroup.OrderBy(f => f.Time).ToArray();
@@ -100,7 +102,7 @@ namespace JiraTimeBot.TaskTime
 
             if (workTimeItems.First().Time.TotalMinutes > Math.Abs(remainMinutes) && remainMinutes < 0)
             {
-                //если переборщили или не достаточно добавили до 8 часов - скореектируем остаток в первой задаче (она самая трудозатратная).
+                //если переборщили или не достаточно добавили до 8 часов - скорректируем остаток в первой задаче (она самая трудозатратная).
                 workTimeItems.First().Time += TimeSpan.FromMinutes(remainMinutes);
             }
 
@@ -124,9 +126,14 @@ namespace JiraTimeBot.TaskTime
         private decimal RoundTo(decimal value, decimal to = 15, bool up = true)
         {
             if ((value % to) == 0)
+            {
                 return value;
+            }
+
             if (up)
+            {
                 return (value - (value % to) + to);
+            }
 
             return (value - (value % to));
         }

src/JiraTimeBot.Core/TasksProcessors/IAllTasksProcessors.cs

@@ -1,4 +1,4 @@
-namespace JiraTimeBot.TasksProcessors
+namespace JiraTimeBot.Core.TasksProcessors
 {
     public interface IAllTasksProcessors
     {

src/JiraTimeBot.Core/TasksProcessors/ITasksProcessor.cs

@@ -1,12 +1,12 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.TaskTime.Objects;
+using JiraTimeBot.Core.Configuration;
+using JiraTimeBot.Core.TaskTime.Objects;
 
-namespace JiraTimeBot.TasksProcessors
+namespace JiraTimeBot.Core.TasksProcessors
 {
-    interface ITasksProcessor
+    public interface ITasksProcessor
     {
         void Process(DateTime setForDate, DateTime realDate, List<TaskTimeItem> taskTimes, Settings settings, bool dummyMode, CancellationToken cancellationToken = default(CancellationToken));
     }

src/JiraTimeBot.Core/TasksProcessors/MeetingProcessor.cs

@@ -2,11 +2,11 @@
 using System.Collections.Generic;
 using System.Linq;
 using System.Threading;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.JiraIntegration;
-using JiraTimeBot.TaskTime.Objects;
+using JiraTimeBot.Core.Configuration;
+using JiraTimeBot.Core.JiraIntegration;
+using JiraTimeBot.Core.TaskTime.Objects;
 
-namespace JiraTimeBot.TasksProcessors
+namespace JiraTimeBot.Core.TasksProcessors
 {
     public class MeetingProcessor : ITasksProcessor
     {

src/JiraTimeBot.Core/TasksProcessors/WorkLogTasksProcessor.cs

@@ -1,11 +1,11 @@
 using System;
 using System.Collections.Generic;
 using System.Threading;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.JiraIntegration;
-using JiraTimeBot.TaskTime.Objects;
+using JiraTimeBot.Core.Configuration;
+using JiraTimeBot.Core.JiraIntegration;
+using JiraTimeBot.Core.TaskTime.Objects;
 
-namespace JiraTimeBot.TasksProcessors
+namespace JiraTimeBot.Core.TasksProcessors
 {
     public class WorkLogTasksProcessor : ITasksProcessor
     {

src/JiraTimeBot.Core/Update/GitHubDataObjects.cs

@@ -1,7 +1,7 @@
 using System;
 using Newtonsoft.Json;
 
-namespace JiraTimeBot.Update
+namespace JiraTimeBot.Core.Update.Update
 {
     public partial class GitHubReleaseResponse
     {

src/JiraTimeBot.Core/Update/IUpdater.cs

@@ -0,0 +1,7 @@
+namespace JiraTimeBot.Core.Update
+{
+    public interface IUpdater
+    {
+        bool UpdateToNewVersion(bool firstTime);
+    }
+}

src/JiraTimeBot.Core/Update/Updater.cs

@@ -6,7 +6,7 @@ using System.Net;
 using System.Windows.Forms;
 using Newtonsoft.Json;
 
-namespace JiraTimeBot.Update
+namespace JiraTimeBot.Core.Update.Update
 {
     public class Updater : IUpdater
     {
@@ -111,7 +111,7 @@ namespace JiraTimeBot.Update
                             System.IO.File.Move(zipEntryFile.FullName, bkpDir + "\\" + zipEntryFile.Name);
                         }
 
-                        entry.ExtractToFile(zipEntryPath);
+                        ZipFileExtensions.ExtractToFile(entry, zipEntryPath);
                     }
                 }
 

src/JiraTimeBot.Ui/App.config

@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+    <startup> 
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2" />
+    </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.9.1.0" newVersion="4.9.1.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

src/JiraTimeBot.Ui/App.xaml

@@ -0,0 +1,8 @@
+<Application x:Class="JiraTimeBot.Ui.App"
+             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+             >
+    <Application.Resources>
+         
+    </Application.Resources>
+</Application>

src/JiraTimeBot.Ui/App.xaml.cs

@@ -0,0 +1,82 @@
+using Autofac;
+using JiraTimeBot.UI.Tray;
+using System;
+using System.Threading;
+using System.Windows;
+using System.Windows.Navigation;
+using JiraTimeBot.Core.Configuration;
+using JiraTimeBot.Ui.ViewModels;
+
+
+namespace JiraTimeBot.Ui
+{
+    /// <summary>
+    /// Interaction logic for App.xaml
+    /// </summary>
+    public partial class App : Application
+    {
+        private IContainer _container;
+        
+        private static readonly Mutex Mutex = new Mutex(true, "{5B245110-FD79-4EC9-AF86-A98F29792B9D}");
+
+        public App()
+        {
+            if (Mutex.WaitOne(TimeSpan.Zero, true))
+            {
+                Bootstrapper bootstrapper = new Bootstrapper();
+                _container = bootstrapper.Build();
+                Mutex.ReleaseMutex();
+            }
+            else
+            {
+                Mutex.Dispose();
+                SingleInstance.ShowFirstInstance();
+                this.Shutdown();
+            }
+
+        }
+
+        protected override void OnStartup(StartupEventArgs e)
+        {
+            var settingsManager = _container.Resolve<ISettingsManager>();
+            var settings = settingsManager.Load();
+            var scope = _container.BeginLifetimeScope("Started",
+                                                      builder =>
+                                                      {
+                                                          if (settings != null)
+                                                          {
+                                                              builder.RegisterInstance(settings);
+                                                          }
+                                                          else
+                                                          {
+                                                              builder.RegisterInstance(new Settings());
+                                                          }
+                                                      });
+
+            var appViewModel = scope.Resolve<ApplicationViewModel>();
+            var mainWindow = scope.Resolve<MainWindow>();
+            if (settings == null)
+            {
+                var settingsViewModel = scope.Resolve<SettingsViewModel>();
+                appViewModel.CurrentViewModel = settingsViewModel;
+            }
+            else
+            {
+                var mainViewModel = scope.Resolve<MainPageViewModel>();
+                appViewModel.CurrentViewModel = mainViewModel;
+            }
+
+            
+
+            mainWindow.ShowActivated = true;
+            mainWindow.Show();
+            base.OnStartup(e);
+        }
+
+        /// <inheritdoc />
+        protected override void OnLoadCompleted(NavigationEventArgs e)
+        {
+            base.OnLoadCompleted(e);
+        }
+    }
+}

src/JiraTimeBot.Ui/ApplicationNavigator.cs

@@ -0,0 +1,34 @@
+using System;
+using JiraTimeBot.Ui.ViewModels;
+
+namespace JiraTimeBot.Ui
+{
+    public interface IRegisteredViewModels
+    {
+        Func<SettingsViewModel> Settings { get; set; }
+        Func<MainPageViewModel> MainPage { get; set; }
+    }
+
+    public class ApplicationNavigator : IApplicationNavigator
+    {
+        private readonly ApplicationViewModel _applicationViewModel;
+        private readonly IRegisteredViewModels _viewModels;
+
+        public ApplicationNavigator(ApplicationViewModel applicationViewModel, 
+                                    IRegisteredViewModels viewModels)
+        {
+            _applicationViewModel = applicationViewModel;
+            _viewModels = viewModels;
+        }
+
+        public void NavigateToMain()
+        {
+            _applicationViewModel.CurrentViewModel = _viewModels.MainPage();
+        }
+
+        public void NavigateToSettings()
+        {
+            _applicationViewModel.CurrentViewModel = _viewModels.Settings();
+        }
+    }
+}

src/JiraTimeBot.Ui/Bootstrapper.cs

@@ -0,0 +1,49 @@
+using Autofac;
+using Autofac.Extras.AggregateService;
+using JiraTimeBot.Core.Configuration;
+using JiraTimeBot.Ui.Models;
+using JiraTimeBot.Ui.ViewModels;
+
+namespace JiraTimeBot.Ui
+{
+    public class Bootstrapper
+    {
+        public IContainer Build()
+        {
+            var builder = new ContainerBuilder();
+
+            builder.Register(c =>
+            {
+                var result = new MainWindow();
+                result.DataContext = c.Resolve<ApplicationViewModel>();
+                return result;
+            }).InstancePerLifetimeScope();
+
+            builder.RegisterType<SettingsManager>().As<ISettingsManager>();
+            builder.RegisterType<ApplicationModel>().InstancePerLifetimeScope();
+            builder.RegisterType<SettingsModel>().InstancePerLifetimeScope();
+            builder.RegisterType<MainModel>().InstancePerLifetimeScope();
+
+            builder.RegisterType<ApplicationViewModel>().InstancePerLifetimeScope();
+            builder.RegisterType<MainPageViewModel>().InstancePerLifetimeScope();
+            builder.RegisterType<SettingsViewModel>()
+                   .InstancePerLifetimeScope();
+            
+            builder.RegisterType<MainPage>().InstancePerLifetimeScope();
+            builder.RegisterType<SettingsPage>()
+                   .AsSelf()
+                   .As<IHavePassword>()
+                   .InstancePerLifetimeScope();
+            
+            builder.RegisterAggregateService<IRegisteredViewModels>();
+
+            builder.RegisterType<ApplicationNavigator>()
+                   .As<IApplicationNavigator>()
+                   .InstancePerLifetimeScope();
+
+            var container = builder.Build();
+
+            return container;
+        }
+    }
+}

src/JiraTimeBot.Ui/Commands/RelayCommand'.cs

@@ -0,0 +1,77 @@
+using System;
+using System.Windows.Input;
+
+namespace Aeroclub.CL.ASIA.Application.UI.Wpf.Commands
+{
+    public sealed class RelayCommand<T> : ICommand
+    {
+        private readonly Action<T> _execute;
+
+        private readonly Func<T, bool> _canExecute;
+
+        public RelayCommand(Action<T> execute, Func<T, bool> canExecute = null)
+        {
+            _execute = execute ?? throw new ArgumentNullException(nameof(execute));
+
+            if (canExecute != null)
+            {
+                _canExecute = canExecute;
+            }
+        }
+
+        public event EventHandler CanExecuteChanged
+        {
+            add
+            {
+                if (_canExecute != null)
+                {
+                    CommandManager.RequerySuggested += value;
+                }
+            }
+
+            remove
+            {
+                if (_canExecute != null)
+                {
+                    CommandManager.RequerySuggested -= value;
+                }
+            }
+        }
+
+        public bool CanExecute(object parameter)
+        {
+            if (_canExecute == null)
+            {
+                return true;
+            }
+
+            switch (parameter)
+            {
+                case null:
+                    return _canExecute(default(T));
+                case T variable:
+                    return _canExecute(variable);
+            }
+
+            return false;
+        }
+
+        public void Execute(object parameter)
+        {
+            object val = parameter;
+
+            if (parameter != null && parameter.GetType() != typeof(T))
+            {
+                if (parameter is IConvertible)
+                {
+                    val = Convert.ChangeType(parameter, typeof(T), null);
+                }
+            }
+
+            if (CanExecute(val))
+            {
+                _execute?.Invoke((T) val);
+            }
+        }
+    }
+}

src/JiraTimeBot.Ui/Commands/RelayCommand.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Windows.Input;
+
+namespace Aeroclub.CL.ASIA.Application.UI.Wpf.Commands
+{
+    public sealed class RelayCommand : ICommand
+    {
+        private readonly Action _execute;
+
+        private readonly Func<object, bool> _canExecute;
+
+        public RelayCommand(Action execute, Func<object, bool> canExecute = null)
+        {
+            _execute = execute ?? throw new ArgumentNullException(nameof(execute));
+            _canExecute = canExecute;
+        }
+
+        public event EventHandler CanExecuteChanged
+        {
+            add
+            {
+                if (_canExecute != null)
+                {
+                    CommandManager.RequerySuggested += value;
+                }
+            }
+
+            remove
+            {
+                if (_canExecute != null)
+                {
+                    CommandManager.RequerySuggested -= value;
+                }
+            }
+        }
+
+        public void RaiseCanExecuteChanged()
+        {
+            CommandManager.InvalidateRequerySuggested();
+        }
+
+        public bool CanExecute(object parameter)
+        {
+            return _canExecute == null || _canExecute(parameter);
+        }
+
+        public void Execute(object parameter = default(object))
+        {
+            if (CanExecute(parameter))
+            {
+                _execute();
+            }
+        }
+    }
+}

src/JiraTimeBot.Ui/Commands/RelayCommandAsync'.cs

@@ -0,0 +1,24 @@
+using System;
+using System.Threading.Tasks;
+using System.Windows.Input;
+
+namespace Aeroclub.CL.ASIA.Application.UI.Wpf.Commands
+{
+    public class RelayCommandAsync<T> : ICommand
+    {
+        private readonly Func<T, Task> _executedMethod;
+        private readonly Func<T, bool> _canExecuteMethod;
+
+        public event EventHandler CanExecuteChanged;
+
+        public RelayCommandAsync(Func<T, Task> execute, Func<T, bool> canExecute = null)
+        {
+            _executedMethod = execute;
+            _canExecuteMethod = canExecute;
+        }
+
+        public bool CanExecute(object parameter) => _canExecuteMethod == null || _canExecuteMethod((T)parameter);
+        public async void Execute(object parameter) => await _executedMethod((T)parameter).ConfigureAwait(true);
+        public void OnCanExecuteChanged() => CanExecuteChanged?.Invoke(this, EventArgs.Empty);
+    }
+}

src/JiraTimeBot.Ui/IApplicationNavigator.cs

@@ -0,0 +1,8 @@
+namespace JiraTimeBot.Ui
+{
+    public interface IApplicationNavigator
+    {
+        void NavigateToMain();
+        void NavigateToSettings();
+    }
+}

src/JiraTimeBot.Ui/JiraTimeBot.Ui.csproj

@@ -0,0 +1,203 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{C3B7A833-B919-4299-A318-74B96544437E}</ProjectGuid>
+    <OutputType>WinExe</OutputType>
+    <RootNamespace>JiraTimeBot.Ui</RootNamespace>
+    <AssemblyName>JiraTimeBot.Ui</AssemblyName>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <ProjectTypeGuids>{60dc8134-eba5-43b8-bcc9-bb4bc16c2548};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
+    <WarningLevel>4</WarningLevel>
+    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <Deterministic>true</Deterministic>
+    <PublishUrl>publish\</PublishUrl>
+    <Install>true</Install>
+    <InstallFrom>Disk</InstallFrom>
+    <UpdateEnabled>false</UpdateEnabled>
+    <UpdateMode>Foreground</UpdateMode>
+    <UpdateInterval>7</UpdateInterval>
+    <UpdateIntervalUnits>Days</UpdateIntervalUnits>
+    <UpdatePeriodically>false</UpdatePeriodically>
+    <UpdateRequired>false</UpdateRequired>
+    <MapFileExtensions>true</MapFileExtensions>
+    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationVersion>1.0.0.%2a</ApplicationVersion>
+    <IsWebBootstrapper>false</IsWebBootstrapper>
+    <UseApplicationTrust>false</UseApplicationTrust>
+    <BootstrapperEnabled>true</BootstrapperEnabled>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\</OutputPath>
+    <DefineConstants>DEBUG;TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <PlatformTarget>AnyCPU</PlatformTarget>
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\</OutputPath>
+    <DefineConstants>TRACE</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="Autofac, Version=4.9.1.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.4.9.1\lib\net45\Autofac.dll</HintPath>
+    </Reference>
+    <Reference Include="Autofac.Extras.AggregateService, Version=4.1.0.0, Culture=neutral, PublicKeyToken=17863af14b0044da, processorArchitecture=MSIL">
+      <HintPath>..\packages\Autofac.Extras.AggregateService.4.1.0\lib\net45\Autofac.Extras.AggregateService.dll</HintPath>
+    </Reference>
+    <Reference Include="Castle.Core, Version=4.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
+      <HintPath>..\packages\Castle.Core.4.0.0\lib\net45\Castle.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Drawing" />
+    <Reference Include="System.Windows.Forms" />
+    <Reference Include="System.Xml" />
+    <Reference Include="Microsoft.CSharp" />
+    <Reference Include="System.Core" />
+    <Reference Include="System.Xml.Linq" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Net.Http" />
+    <Reference Include="System.Xaml">
+      <RequiredTargetFramework>4.0</RequiredTargetFramework>
+    </Reference>
+    <Reference Include="WindowsBase" />
+    <Reference Include="PresentationCore" />
+    <Reference Include="PresentationFramework" />
+    <Reference Include="Xceed.Wpf.AvalonDock, Version=3.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.AvalonDock.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Aero, Version=3.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Aero.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.Metro, Version=3.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.Metro.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.AvalonDock.Themes.VS2010, Version=3.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.AvalonDock.Themes.VS2010.dll</HintPath>
+    </Reference>
+    <Reference Include="Xceed.Wpf.Toolkit, Version=3.5.0.0, Culture=neutral, PublicKeyToken=3e4669d2f30244f4, processorArchitecture=MSIL">
+      <HintPath>..\packages\Extended.Wpf.Toolkit.3.5.0\lib\net40\Xceed.Wpf.Toolkit.dll</HintPath>
+    </Reference>
+  </ItemGroup>
+  <ItemGroup>
+    <ApplicationDefinition Include="App.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </ApplicationDefinition>
+    <Page Include="Styles.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\MainPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\MainWindow.xaml">
+      <Generator>MSBuild:Compile</Generator>
+      <SubType>Designer</SubType>
+    </Page>
+    <Compile Include="App.xaml.cs">
+      <DependentUpon>App.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="ApplicationNavigator.cs" />
+    <Compile Include="Bootstrapper.cs" />
+    <Compile Include="Commands\RelayCommand%27.cs" />
+    <Compile Include="Commands\RelayCommand.cs" />
+    <Compile Include="Commands\RelayCommandAsync%27.cs" />
+    <Compile Include="IApplicationNavigator.cs" />
+    <Compile Include="Models\ApplicationModel.cs" />
+    <Compile Include="Models\IModel.cs" />
+    <Compile Include="Models\MainModel.cs" />
+    <Compile Include="Models\SettingsModel.cs" />
+    <Compile Include="Properties\Annotations.cs" />
+    <Compile Include="ViewModels\ApplicationViewModel.cs" />
+    <Compile Include="ViewModels\MainPageViewModel.cs" />
+    <Compile Include="ViewModels\SettingsViewModel.cs" />
+    <Compile Include="ViewModels\ViewModelBase.cs" />
+    <Compile Include="Views\MainPage.xaml.cs">
+      <DependentUpon>MainPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\MainWindow.xaml.cs">
+      <DependentUpon>MainWindow.xaml</DependentUpon>
+      <SubType>Code</SubType>
+    </Compile>
+    <Page Include="Views\SettingsPage.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="Views\SettingsPage.xaml.cs">
+      <DependentUpon>SettingsPage.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\AssemblyInfo.cs">
+      <SubType>Code</SubType>
+    </Compile>
+    <Compile Include="Properties\Resources.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DesignTime>True</DesignTime>
+      <DependentUpon>Resources.resx</DependentUpon>
+    </Compile>
+    <Compile Include="Properties\Settings.Designer.cs">
+      <AutoGen>True</AutoGen>
+      <DependentUpon>Settings.settings</DependentUpon>
+      <DesignTimeSharedInput>True</DesignTimeSharedInput>
+    </Compile>
+    <EmbeddedResource Include="Properties\Resources.resx">
+      <Generator>ResXFileCodeGenerator</Generator>
+      <LastGenOutput>Resources.Designer.cs</LastGenOutput>
+    </EmbeddedResource>
+    <None Include="packages.config" />
+    <None Include="Properties\Settings.settings">
+      <Generator>SettingsSingleFileGenerator</Generator>
+      <LastGenOutput>Settings.Designer.cs</LastGenOutput>
+    </None>
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="App.config" />
+  </ItemGroup>
+  <ItemGroup>
+    <BootstrapperPackage Include=".NETFramework,Version=v4.7.2">
+      <Visible>False</Visible>
+      <ProductName>Microsoft .NET Framework 4.7.2 %28x86 and x64%29</ProductName>
+      <Install>true</Install>
+    </BootstrapperPackage>
+    <BootstrapperPackage Include="Microsoft.Net.Framework.3.5.SP1">
+      <Visible>False</Visible>
+      <ProductName>.NET Framework 3.5 SP1</ProductName>
+      <Install>false</Install>
+    </BootstrapperPackage>
+  </ItemGroup>
+  <ItemGroup>
+    <SplashScreen Include="Splash.png" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="app.ico">
+      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\JiraTimeBot.Core\JiraTimeBot.Core.csproj">
+      <Project>{35D8A11F-05F8-408D-A37D-0EECD96FA67A}</Project>
+      <Name>JiraTimeBot.Core</Name>
+    </ProjectReference>
+    <ProjectReference Include="..\JiraTimeBot\JiraTimeBot.csproj">
+      <Project>{f3b89316-c38c-4ce6-9d88-0b1373cfba1a}</Project>
+      <Name>JiraTimeBot</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+</Project>

src/JiraTimeBot.Ui/Models/ApplicationModel.cs

@@ -0,0 +1,10 @@
+namespace JiraTimeBot.Ui.Models
+{
+    public class ApplicationModel : IModel
+    {
+        /// <inheritdoc />
+        public ApplicationModel()
+        {
+        }
+    }
+}

src/JiraTimeBot.Ui/Models/IModel.cs

@@ -0,0 +1,27 @@
+using JiraTimeBot.Ui.Annotations;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace JiraTimeBot.Ui.Models
+{
+    public interface IModel
+    {
+        
+    }
+
+    public interface INotifyModel : IModel, INotifyPropertyChanged
+    {
+
+    }
+
+    public abstract class NotifyModelBase : INotifyModel
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        [NotifyPropertyChangedInvocator]
+        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+    }
+}

src/JiraTimeBot.Ui/Models/MainModel.cs

@@ -0,0 +1,7 @@
+namespace JiraTimeBot.Ui.Models
+{
+    public class MainModel : IModel
+    {
+        
+    }
+}

src/JiraTimeBot.Ui/Models/SettingsModel.cs

@@ -0,0 +1,91 @@
+using System;
+using JiraTimeBot.Core.Configuration;
+
+namespace JiraTimeBot.Ui.Models
+{
+    //Proxy model of settings
+    public class SettingsModel : IModel
+    {
+        private readonly Settings _settings;
+
+        /// <inheritdoc />
+        public SettingsModel(Settings settings)
+        {
+            _settings = settings;
+        }
+
+        public Settings Settings => _settings;
+
+        public string JiraUrl
+        {
+            get => _settings.JiraUrl;
+            set => _settings.JiraUrl = value;
+        }
+
+        public int MinuterPerWorkDay
+        {
+            get => _settings.MinuterPerWorkDay;
+            set => _settings.MinuterPerWorkDay = value;
+        }
+
+        public TimeSpan ActivationTime
+        {
+            get => _settings.ActivationTime;
+            set => _settings.ActivationTime = value;
+        }
+
+        public bool AddCommentsToWorklog
+        {
+            get => _settings.AddCommentsToWorklog;
+            set => _settings.AddCommentsToWorklog = value;
+        }
+
+        public string JiraPassword
+        {
+            get => _settings.JiraPassword;
+            set => _settings.JiraPassword = value;
+        }
+
+        public string JiraQuery
+        {
+            get => _settings.JiraPassword;
+            set => _settings.JiraQuery = value;
+        }
+
+        public string JiraUserName
+        {
+            get => _settings.JiraUserName;
+            set => _settings.JiraUserName = value;
+        }
+
+        public string MercurialAuthorEmail
+        {
+            get => _settings.MercurialAuthorEmail;
+            set => _settings.MercurialAuthorEmail = value;
+        }
+
+        public string RepositoryPath
+        {
+            get => _settings.RepositoryPath;
+            set => _settings.RepositoryPath = value;
+        }
+
+        public int RoundToMinutes
+        {
+            get => _settings.RoundToMinutes;
+            set => _settings.RoundToMinutes = value;
+        }
+
+        public string TimeControlTask
+        {
+            get => _settings.TimeControlTask;
+            set => _settings.TimeControlTask = value;
+        }
+
+        public WorkType WorkType
+        {
+            get => _settings.WorkType;
+            set => _settings.WorkType = value;
+        }
+    }
+}

src/JiraTimeBot.Ui/Properties/AssemblyInfo.cs

@@ -0,0 +1,55 @@
+using System.Reflection;
+using System.Resources;
+using System.Runtime.CompilerServices;
+using System.Runtime.InteropServices;
+using System.Windows;
+
+// General Information about an assembly is controlled through the following
+// set of attributes. Change these attribute values to modify the information
+// associated with an assembly.
+[assembly: AssemblyTitle("JiraTimeBot.Ui")]
+[assembly: AssemblyDescription("")]
+[assembly: AssemblyConfiguration("")]
+[assembly: AssemblyCompany("")]
+[assembly: AssemblyProduct("JiraTimeBot.Ui")]
+[assembly: AssemblyCopyright("Copyright ©  2019")]
+[assembly: AssemblyTrademark("")]
+[assembly: AssemblyCulture("")]
+
+// Setting ComVisible to false makes the types in this assembly not visible
+// to COM components.  If you need to access a type in this assembly from
+// COM, set the ComVisible attribute to true on that type.
+[assembly: ComVisible(false)]
+
+//In order to begin building localizable applications, set
+//<UICulture>CultureYouAreCodingWith</UICulture> in your .csproj file
+//inside a <PropertyGroup>.  For example, if you are using US english
+//in your source files, set the <UICulture> to en-US.  Then uncomment
+//the NeutralResourceLanguage attribute below.  Update the "en-US" in
+//the line below to match the UICulture setting in the project file.
+
+//[assembly: NeutralResourcesLanguage("en-US", UltimateResourceFallbackLocation.Satellite)]
+
+
+[assembly: ThemeInfo(
+    ResourceDictionaryLocation.None, //where theme specific resource dictionaries are located
+                                     //(used if a resource is not found in the page,
+                                     // or application resource dictionaries)
+    ResourceDictionaryLocation.SourceAssembly //where the generic resource dictionary is located
+                                              //(used if a resource is not found in the page,
+                                              // app, or any theme specific resource dictionaries)
+)]
+
+
+// Version information for an assembly consists of the following four values:
+//
+//      Major Version
+//      Minor Version
+//      Build Number
+//      Revision
+//
+// You can specify all the values or you can default the Build and Revision Numbers
+// by using the '*' as shown below:
+// [assembly: AssemblyVersion("1.0.*")]
+[assembly: AssemblyVersion("1.0.0.0")]
+[assembly: AssemblyFileVersion("1.0.0.0")]

src/JiraTimeBot.Ui/Properties/Resources.Designer.cs

@@ -0,0 +1,71 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace JiraTimeBot.Ui.Properties
+{
+
+
+    /// <summary>
+    ///   A strongly-typed resource class, for looking up localized strings, etc.
+    /// </summary>
+    // This class was auto-generated by the StronglyTypedResourceBuilder
+    // class via a tool like ResGen or Visual Studio.
+    // To add or remove a member, edit your .ResX file then rerun ResGen
+    // with the /str option, or rebuild your VS project.
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    internal class Resources
+    {
+
+        private static global::System.Resources.ResourceManager resourceMan;
+
+        private static global::System.Globalization.CultureInfo resourceCulture;
+
+        [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
+        internal Resources()
+        {
+        }
+
+        /// <summary>
+        ///   Returns the cached ResourceManager instance used by this class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Resources.ResourceManager ResourceManager
+        {
+            get
+            {
+                if ((resourceMan == null))
+                {
+                    global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("JiraTimeBot.Ui.Properties.Resources", typeof(Resources).Assembly);
+                    resourceMan = temp;
+                }
+                return resourceMan;
+            }
+        }
+
+        /// <summary>
+        ///   Overrides the current thread's CurrentUICulture property for all
+        ///   resource lookups using this strongly typed resource class.
+        /// </summary>
+        [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
+        internal static global::System.Globalization.CultureInfo Culture
+        {
+            get
+            {
+                return resourceCulture;
+            }
+            set
+            {
+                resourceCulture = value;
+            }
+        }
+    }
+}

src/JiraTimeBot.Ui/Properties/Resources.resx

@@ -0,0 +1,117 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+</root>

src/JiraTimeBot.Ui/Properties/Settings.Designer.cs

@@ -0,0 +1,30 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+//     This code was generated by a tool.
+//     Runtime Version:4.0.30319.42000
+//
+//     Changes to this file may cause incorrect behavior and will be lost if
+//     the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+
+namespace JiraTimeBot.Ui.Properties
+{
+
+
+    [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0")]
+    internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase
+    {
+
+        private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));
+
+        public static Settings Default
+        {
+            get
+            {
+                return defaultInstance;
+            }
+        }
+    }
+}

src/JiraTimeBot.Ui/Properties/Settings.settings

@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='utf-8'?>
+<SettingsFile xmlns="uri:settings" CurrentProfile="(Default)">
+  <Profiles>
+    <Profile Name="(Default)" />
+  </Profiles>
+  <Settings />
+</SettingsFile>

src/JiraTimeBot.Ui/Styles.xaml

@@ -0,0 +1,33 @@
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+                    xmlns:local="clr-namespace:JiraTimeBot.Ui"
+                    xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit">
+    <Style TargetType="Button">
+        <Setter Property="Margin" Value="5" />
+    </Style>
+
+    <Style TargetType="CheckBox">
+        <Setter Property="Margin" Value="5" />
+    </Style>
+
+    <Style TargetType="DatePicker">
+        <Setter Property="Margin" Value="5" />
+    </Style>
+    
+    <Style TargetType="TextBox">
+        <Setter Property="Margin" Value="5" />
+    </Style>
+
+    <Style TargetType="PasswordBox">
+        <Setter Property="Margin" Value="5" />
+    </Style>
+
+    <Style TargetType="xctk:DateTimePicker">
+        <Setter Property="Margin" Value="5" />
+    </Style>
+
+    <Style TargetType="ComboBox">
+        <Setter Property="Margin" Value="5" />
+    </Style>
+    
+</ResourceDictionary>

src/JiraTimeBot.Ui/ViewModels/ApplicationViewModel.cs

@@ -0,0 +1,23 @@
+using JiraTimeBot.Ui.Models;
+
+namespace JiraTimeBot.Ui.ViewModels
+{
+    public class ApplicationViewModel : ViewModelBase<ApplicationModel>
+    {
+        private ViewModelBase _currentViewModel;
+
+        public ApplicationViewModel(ApplicationModel model) : base(model)
+        {
+        }
+
+        public ViewModelBase CurrentViewModel
+        {
+            get => _currentViewModel;
+            set
+            {
+                _currentViewModel = value;
+                OnPropertyChanged();
+            }
+        }
+    }
+}

src/JiraTimeBot.Ui/ViewModels/MainPageViewModel.cs

@@ -0,0 +1,58 @@
+using Aeroclub.CL.ASIA.Application.UI.Wpf.Commands;
+using JiraTimeBot.Ui.Models;
+using System;
+
+namespace JiraTimeBot.Ui.ViewModels
+{
+    public class MainPageViewModel : ViewModelBase<MainModel>
+    {
+        private readonly IApplicationNavigator _navigator;
+        private DateTime _selectedDate;
+
+        public MainPageViewModel(MainModel model, IApplicationNavigator navigator) : base(model)
+        {
+            _navigator = navigator;
+            SelectedDate = DateTime.Today;
+            OpenSettingsCommand = new RelayCommand(NavigateToSettings);
+            SetTimeCommand = new RelayCommand(SetTime);
+            ShowMeetingInfoCommand = new RelayCommand(ShowMeeting);
+            CancelCommand = new RelayCommand(Cancel);
+        }
+
+        private void Cancel()
+        {
+        }
+
+        private void ShowMeeting()
+        {
+        }
+
+        private void SetTime()
+        {
+            
+        }
+
+        public RelayCommand OpenSettingsCommand { get; set; }
+
+        public DateTime SelectedDate
+        {
+            get => _selectedDate;
+            set
+            {
+                _selectedDate = value;
+                OnPropertyChanged();
+            }
+        }
+
+        public RelayCommand SetTimeCommand { get; set; }
+
+        public RelayCommand ShowMeetingInfoCommand { get; set; }
+
+        public RelayCommand CancelCommand { get; set; }
+
+        private void NavigateToSettings()
+        {
+            _navigator.NavigateToSettings();
+        }
+    }
+}

src/JiraTimeBot.Ui/ViewModels/SettingsViewModel.cs

@@ -0,0 +1,75 @@
+using Aeroclub.CL.ASIA.Application.UI.Wpf.Commands;
+using JiraTimeBot.Ui.Models;
+using System;
+using System.Collections.ObjectModel;
+using System.Linq;
+using JiraTimeBot.Core.Configuration;
+
+namespace JiraTimeBot.Ui.ViewModels
+{
+    public class SettingsViewModel : ViewModelBase<SettingsModel>
+    {
+        private readonly ISettingsManager _settingsManager;
+        private readonly IHavePassword _passwordAccessor;
+        private readonly IApplicationNavigator _navigator;
+
+        public SettingsViewModel(SettingsModel model, 
+                                 ISettingsManager settingsManager,
+                                 IHavePassword passwordAccessor,
+                                 IApplicationNavigator navigator) : base(model)
+        {
+            _settingsManager = settingsManager;
+            _passwordAccessor = passwordAccessor;
+            _navigator = navigator;
+            SaveSettingsCommand = new RelayCommand(SaveSettings);
+            var workModes = Enum.GetValues(typeof(WorkType));
+            WorkModes = new ObservableCollection<WorkType>(workModes.OfType<WorkType>());
+        }
+
+        public RelayCommand SaveSettingsCommand { get; set; }
+
+        public ObservableCollection<WorkType> WorkModes { get; set; }
+
+        public WorkType CurrentWorkType
+        {
+            get => Model.WorkType;
+            set
+            {
+                Model.WorkType = value;
+                OnPropertyChanged();
+            } 
+        }
+
+        public string RepositoryPath
+        {
+            get => Model.RepositoryPath;
+            set
+            {
+                Model.RepositoryPath = value;
+                OnPropertyChanged();
+            }
+        }
+
+        public string JiraLogin
+        {
+            get => Model.JiraUserName;
+            set
+            {
+                Model.JiraUserName = value;
+                OnPropertyChanged();
+            }
+        }
+
+        private void SaveSettings()
+        {
+            if(!_settingsManager.SettingsIsValid(Model.Settings, out string msg))
+            {
+                return;
+            }
+
+            Model.JiraPassword = _passwordAccessor.GetPassword();
+            _settingsManager.Save(Model.Settings);
+            _navigator.NavigateToMain();
+        }
+    }
+}

src/JiraTimeBot.Ui/ViewModels/ViewModelBase.cs

@@ -0,0 +1,29 @@
+using JiraTimeBot.Ui.Annotations;
+using JiraTimeBot.Ui.Models;
+using System.ComponentModel;
+using System.Runtime.CompilerServices;
+
+namespace JiraTimeBot.Ui.ViewModels
+{
+    public abstract class ViewModelBase : INotifyPropertyChanged
+    {
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        [NotifyPropertyChangedInvocator]
+        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
+    }
+
+    public abstract class ViewModelBase<T> : ViewModelBase where T : IModel
+    {
+        // ReSharper disable once MemberCanBePrivate.Global
+        protected T Model { get; }
+
+        protected ViewModelBase(T model)
+        {
+            Model = model;
+        }
+    }
+}

src/JiraTimeBot.Ui/Views/MainPage.xaml

@@ -0,0 +1,52 @@
+<UserControl x:Class="JiraTimeBot.Ui.MainPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:JiraTimeBot.Ui"
+      xmlns:viewModels="clr-namespace:JiraTimeBot.Ui.ViewModels"
+      xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+      mc:Ignorable="d" 
+      d:DataContext="{d:DesignInstance viewModels:MainPageViewModel}" >
+    <UserControl.Resources>
+        <ResourceDictionary Source="../Styles.xaml"/>
+    </UserControl.Resources>
+    <Grid Margin="5">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*"/>
+        </Grid.ColumnDefinitions>
+        <Grid Grid.Row="0" Grid.Column="0">
+            <Grid.RowDefinitions>
+                <RowDefinition Height="Auto"/>
+                <RowDefinition Height="*" />
+                <RowDefinition Height="Auto"/>
+            </Grid.RowDefinitions>
+            <StackPanel Grid.Row="0" 
+                        Orientation="Vertical">
+                <Button Content="Настройки" Command="{Binding Path=OpenSettingsCommand}" />
+                <xctk:DateTimePicker AutoCloseCalendar="True" 
+                                     Format="ShortDate"
+                                     Value="{Binding Path=SelectedDate}" 
+                                     Kind="Local"  />
+                <!--<DatePicker  IsTodayHighlighted="True" SelectedDate="{Binding Path=SelectedDate}" />-->
+                <Button>
+                    <TextBlock TextWrapping="Wrap" TextAlignment="Center" Text="Проставить на дату" />
+                </Button>
+            </StackPanel>
+            <StackPanel Grid.Row="2">
+                <CheckBox>Тестовый прогон</CheckBox>
+                <Button Content="Проставить время" Command="{Binding Path=SetTimeCommand}"/>
+                <Button Content="Митинг" Command="{Binding Path=ShowMeetingInfoCommand}"/>
+                <Button Content="Отменить" Command="{Binding Path=CancelCommand}"/>
+            </StackPanel>
+        </Grid>
+
+        <TextBox Grid.Row="0" Grid.Column="1"
+                 IsReadOnly="True"
+                 Width="400"
+                 Height="300"
+                 ></TextBox>
+
+    </Grid>
+</UserControl>

src/JiraTimeBot.Ui/Views/MainPage.xaml.cs

@@ -0,0 +1,13 @@
+namespace JiraTimeBot.Ui
+{
+    /// <summary>
+    /// Interaction logic for MainPage.xaml
+    /// </summary>
+    public partial class MainPage
+    {
+        public MainPage()
+        {
+            InitializeComponent();
+        }
+    }
+}

src/JiraTimeBot.Ui/Views/MainWindow.xaml

@@ -0,0 +1,29 @@
+<Window x:Class="JiraTimeBot.Ui.MainWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:viewModels="clr-namespace:JiraTimeBot.Ui.ViewModels"
+        xmlns:ui="clr-namespace:JiraTimeBot.Ui"
+        mc:Ignorable="d"
+        SizeToContent="WidthAndHeight"
+        d:DataContext="{d:DesignInstance viewModels:ApplicationViewModel}"
+        Title="ApplicationWindow"
+        Icon="../app.ico"
+        ShowInTaskbar="True" 
+        ResizeMode="NoResize"
+        d:DesignWidth="517.579" d:DesignHeight="260.977"
+        >
+    <Window.Resources>
+        <DataTemplate DataType="{x:Type viewModels:MainPageViewModel}">
+            <ui:MainPage />
+        </DataTemplate>
+        <DataTemplate DataType="{x:Type viewModels:SettingsViewModel}">
+            <ui:SettingsPage/>
+        </DataTemplate>
+    </Window.Resources>
+    <Grid>
+        <ContentControl Content="{Binding Path=CurrentViewModel}" />
+    </Grid>
+    
+</Window>

src/JiraTimeBot.Ui/Views/MainWindow.xaml.cs

@@ -0,0 +1,38 @@
+using System;
+using System.Drawing;
+using System.Windows;
+using System.Windows.Forms;
+
+namespace JiraTimeBot.Ui
+{
+    /// <summary>
+    /// Interaction logic for MainWindow.xaml
+    /// </summary>
+    public partial class MainWindow
+    {
+        public MainWindow()
+        {
+            InitializeComponent();
+
+            NotifyIcon trayIcon = new System.Windows.Forms.NotifyIcon();
+            trayIcon.Icon = new Icon("app.ico");
+            trayIcon.Visible = true;
+            trayIcon.DoubleClick += (sender, args) =>
+            {
+                Show();
+                ShowInTaskbar = true;
+                WindowState = WindowState.Normal;
+            };
+        }
+
+        protected override void OnStateChanged(EventArgs e)
+        {
+            if (WindowState == WindowState.Minimized)
+            {
+                ShowInTaskbar = false;
+                Hide();
+            }
+            base.OnStateChanged(e);
+        }
+    }
+}

src/JiraTimeBot.Ui/Views/SettingsPage.xaml

@@ -0,0 +1,120 @@
+<UserControl x:Class="JiraTimeBot.Ui.SettingsPage"
+      xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+      xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+      xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
+      xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
+      xmlns:local="clr-namespace:JiraTimeBot.Ui"
+      xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+      xmlns:viewModels="clr-namespace:JiraTimeBot.Ui.ViewModels"
+      mc:Ignorable="d" 
+      d:DataContext="{d:DesignInstance viewModels:SettingsViewModel}"
+      >
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary>
+                    <Style TargetType="TextBlock">
+                        <Setter Property="VerticalAlignment" Value="Center"></Setter>
+                    </Style>
+                </ResourceDictionary>
+                <ResourceDictionary Source="../Styles.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
+    <Grid Width="250" Margin="5">
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="Auto" />
+            <ColumnDefinition Width="*" />
+        </Grid.ColumnDefinitions>
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="20px"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <TextBlock Grid.Row="0" Grid.Column="0"
+                   Text="Режим работы" />
+
+        <ComboBox Grid.Row="0" Grid.Column="1" 
+                  ItemsSource="{Binding Path=WorkModes}"
+                  SelectedItem="{Binding Path=CurrentWorkType}"
+                  >
+        </ComboBox>
+
+        <TextBlock Grid.Row="1" Grid.Column="0"
+                   Text="Путь до репо" />
+        
+        <TextBox Grid.Row="1" Grid.Column="1" 
+                 Text="{Binding Path=RepositoryPath}"
+                 />
+
+        <TextBlock Grid.Row="2" Grid.Column="0"
+                   Text="Логин Jira" />
+        
+        <TextBox Grid.Row="2" Grid.Column="1"
+                 Text="{Binding Path=JiraLogin}"
+                 />
+
+        <TextBlock Grid.Row="3" Grid.Column="0"
+                   Text="Пароль Jira" />
+
+        <PasswordBox Name="PBox" Grid.Row="3" Grid.Column="1"
+                                          
+                     />
+
+        <TextBlock Grid.Row="4" Grid.Column="0"
+                   Text="Mercurial Name" />
+
+        <TextBox Grid.Row="4" Grid.Column="1" />
+
+        <TextBlock Grid.Row="5" Grid.Column="0"
+                   Text="Округл. Времени" />
+
+        <TextBox Grid.Row="5" Grid.Column="1" />
+
+        <TextBlock Grid.Row="6" Grid.Column="0"
+                   Text="JQL" />
+
+        <TextBox Grid.Row="6" Grid.Column="1" />
+
+        <TextBlock Grid.Row="7" Grid.Column="0"
+                   Text="Задача учета времени" />
+
+        <TextBox Grid.Row="7" Grid.Column="1" />
+
+        <TextBlock Grid.Row="8" Grid.Column="0"
+                   Text="Время запуска" 
+                   
+                   />
+        
+        <xctk:DateTimePicker Grid.Row="8" Grid.Column="1"
+                             Format="ShortTime"
+                             ShowDropDownButton="False"
+                             TimePickerAllowSpin="True"
+                             TimePickerShowButtonSpinner="True"
+                             TimePickerVisibility="Visible"
+                             />
+        <StackPanel Grid.Row="9" Grid.Column="0" Grid.ColumnSpan="2"
+                    HorizontalAlignment="Center"
+                    Orientation="Vertical"
+                    >
+
+            <CheckBox Content="Автозагрузка" />
+        
+            <CheckBox Content="Добавлять описание" />
+        </StackPanel>
+        <Button Grid.Row="11" Grid.Column="0" Grid.ColumnSpan="2" 
+                Command="{Binding Path=SaveSettingsCommand}"
+                Content="Сохранить"/>
+
+
+    </Grid>
+</UserControl>

src/JiraTimeBot.Ui/Views/SettingsPage.xaml.cs

@@ -0,0 +1,32 @@
+using System;
+using System.Windows.Controls;
+
+namespace JiraTimeBot.Ui
+{
+    public interface IHavePassword
+    {
+        string GetPassword();
+        void SetPassword(string password);
+    }
+    
+    /// <summary>
+    /// Interaction logic for SettingsPage.xaml
+    /// </summary>
+    public partial class SettingsPage : IHavePassword
+    {
+        public SettingsPage()
+        {
+            InitializeComponent();
+        }
+
+        public string GetPassword()
+        {
+            return PBox.Password;
+        }
+
+        public void SetPassword(string password)
+        {
+            PBox.Password = password;
+        }
+    }
+}

src/JiraTimeBot.Ui/packages.config

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<packages>
+  <package id="Autofac" version="4.9.1" targetFramework="net472" />
+  <package id="Autofac.Extras.AggregateService" version="4.1.0" targetFramework="net472" />
+  <package id="Castle.Core" version="4.0.0" targetFramework="net472" />
+  <package id="Extended.Wpf.Toolkit" version="3.5.0" targetFramework="net472" />
+</packages>

src/JiraTimeBot.sln

@@ -1,10 +1,14 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 15
-VisualStudioVersion = 15.0.28307.421
+# Visual Studio Version 16
+VisualStudioVersion = 16.0.28729.10
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiraTimeBot", "JiraTimeBot\JiraTimeBot.csproj", "{F3B89316-C38C-4CE6-9D88-0B1373CFBA1A}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiraTimeBot.Ui", "JiraTimeBot.Ui\JiraTimeBot.Ui.csproj", "{C3B7A833-B919-4299-A318-74B96544437E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "JiraTimeBot.Core", "JiraTimeBot.Core\JiraTimeBot.Core.csproj", "{35D8A11F-05F8-408D-A37D-0EECD96FA67A}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -15,6 +19,14 @@ Global
 		{F3B89316-C38C-4CE6-9D88-0B1373CFBA1A}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{F3B89316-C38C-4CE6-9D88-0B1373CFBA1A}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{F3B89316-C38C-4CE6-9D88-0B1373CFBA1A}.Release|Any CPU.Build.0 = Release|Any CPU
+		{C3B7A833-B919-4299-A318-74B96544437E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{C3B7A833-B919-4299-A318-74B96544437E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{C3B7A833-B919-4299-A318-74B96544437E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{C3B7A833-B919-4299-A318-74B96544437E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{35D8A11F-05F8-408D-A37D-0EECD96FA67A}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{35D8A11F-05F8-408D-A37D-0EECD96FA67A}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{35D8A11F-05F8-408D-A37D-0EECD96FA67A}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{35D8A11F-05F8-408D-A37D-0EECD96FA67A}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

src/JiraTimeBot.sln.DotSettings

@@ -0,0 +1,4 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/CodeInspection/CodeAnnotations/NamespacesWithAnnotations/=JiraTimeBot_002EUi_002EAnnotations/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Jira/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Worklog/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

src/JiraTimeBot.v3.ncrunchsolution

@@ -0,0 +1,6 @@
+<SolutionConfiguration>
+  <Settings>
+    <AllowParallelTestExecution>True</AllowParallelTestExecution>
+    <SolutionConfigured>True</SolutionConfigured>
+  </Settings>
+</SolutionConfiguration>

src/JiraTimeBot/App.config

@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup> 
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.7.2"/>
     </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0" />
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-12.0.0.0" newVersion="12.0.0.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="RestSharp" publicKeyToken="598062e77f915f75" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-106.6.9.0" newVersion="106.6.9.0" />
+        <assemblyIdentity name="RestSharp" publicKeyToken="598062e77f915f75" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-106.6.9.0" newVersion="106.6.9.0"/>
       </dependentAssembly>
       <dependentAssembly>
-        <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-4.9.1.0" newVersion="4.9.1.0" />
+        <assemblyIdentity name="Autofac" publicKeyToken="17863af14b0044da" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-4.9.1.0" newVersion="4.9.1.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>

src/JiraTimeBot/DI/ContainerBuilder.cs

@@ -1,17 +1,20 @@
 using Autofac;
 using Autofac.Extras.AggregateService;
-using JiraTimeBot.JiraIntegration;
-using JiraTimeBot.JiraIntegration.Comments;
-using JiraTimeBot.Mercurial;
-using JiraTimeBot.Mercurial.Modifiers;
-using JiraTimeBot.TasksProcessors;
-using JiraTimeBot.TaskTime;
 using JiraTimeBot.UI.Tray;
 using System;
 using System.Windows.Forms;
+using JiraTimeBot.Core;
+using JiraTimeBot.Core.Configuration;
+using JiraTimeBot.Core.JiraIntegration;
+using JiraTimeBot.Core.JiraIntegration.Comments;
+using JiraTimeBot.Core.Mercurial;
+using JiraTimeBot.Core.Mercurial.Modifiers;
+using JiraTimeBot.Core.StartUp;
+using JiraTimeBot.Core.TasksProcessors;
+using JiraTimeBot.Core.TaskTime;
+using JiraTimeBot.Core.Update;
+using JiraTimeBot.Core.Update.Update;
 using JiraTimeBot.UI;
-using JiraTimeBot.UI.Startup;
-using JiraTimeBot.Update;
 
 namespace JiraTimeBot.DI
 {
@@ -60,6 +63,7 @@ namespace JiraTimeBot.DI
 
             _builder.RegisterType<AutoStartUp>().AsSelf().AsImplementedInterfaces();
             _builder.RegisterType<frmSettings>().AsSelf().AsImplementedInterfaces();
+            _builder.RegisterType<SettingsManager>().AsSelf().AsImplementedInterfaces().SingleInstance();
 
             var container = _builder.Build();
             return container;

src/JiraTimeBot/JiraTimeBot.csproj

@@ -8,9 +8,10 @@
     <OutputType>WinExe</OutputType>
     <RootNamespace>JiraTimeBot</RootNamespace>
     <AssemblyName>JiraTimeBot</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.7.2</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -79,51 +80,25 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="DI\ContainerBuilder.cs" />
-    <Compile Include="JiraIntegration\Comments\IJiraDescriptionSource.cs" />
-    <Compile Include="JiraIntegration\Comments\JiraDescriptionSource.cs" />
-    <Compile Include="Job.cs" />
     <Compile Include="Logger.cs" />
-    <Compile Include="Configuration\Settings.cs" />
-    <Compile Include="JiraIntegration\JiraCommitEmulator.cs" />
-    <Compile Include="Mercurial\IAllMercurialProviders.cs" />
-    <Compile Include="Mercurial\Modifiers\ITechnicalInfoSkipper.cs" />
-    <Compile Include="Mercurial\Modifiers\CommitSkipper.cs" />
-    <Compile Include="Mercurial\Modifiers\ICommitSkipper.cs" />
-    <Compile Include="Mercurial\IMercurialLog.cs" />
-    <Compile Include="Mercurial\Modifiers\TechnicalInfoSkipper.cs" />
-    <Compile Include="TasksProcessors\IAllTasksProcessors.cs" />
     <Compile Include="UI\frmMain.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="UI\frmMain.Designer.cs">
       <DependentUpon>frmMain.cs</DependentUpon>
     </Compile>
-    <Compile Include="JiraIntegration\JiraApi.cs" />
-    <Compile Include="Mercurial\Objects\MercurialCommitItem.cs" />
-    <Compile Include="Mercurial\MercurialLog.cs" />
-    <Compile Include="Configuration\PasswordEncryptionClass.cs" />
     <Compile Include="Program.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
-    <Compile Include="TasksProcessors\ITasksProcessor.cs" />
-    <Compile Include="TasksProcessors\MeetingProcessor.cs" />
-    <Compile Include="TasksProcessors\WorkLogTasksProcessor.cs" />
-    <Compile Include="TaskTime\ITaskTimeCalculator.cs" />
-    <Compile Include="TaskTime\TaskTimeByCommitsCalculator.cs" />
-    <Compile Include="TaskTime\Objects\TaskTimeItem.cs" />
     <Compile Include="UI\frmSettings.cs">
       <SubType>Form</SubType>
     </Compile>
     <Compile Include="UI\frmSettings.Designer.cs">
       <DependentUpon>frmSettings.cs</DependentUpon>
     </Compile>
-    <Compile Include="UI\Startup\AutoStartUp.cs" />
     <Compile Include="UI\Tray\SingleInstance.cs" />
     <Compile Include="UI\Tray\ITrayMenu.cs" />
     <Compile Include="UI\Tray\RestoreFromTray.cs" />
     <Compile Include="UI\Tray\TrayMenu.cs" />
-    <Compile Include="Update\GitHubDataObjects.cs" />
-    <Compile Include="Update\IUpdater.cs" />
-    <Compile Include="Update\Updater.cs" />
     <EmbeddedResource Include="UI\frmMain.resx">
       <DependentUpon>frmMain.cs</DependentUpon>
     </EmbeddedResource>
@@ -157,5 +132,12 @@
   <ItemGroup>
     <Content Include="app.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\JiraTimeBot.Core\JiraTimeBot.Core.csproj">
+      <Project>{35D8A11F-05F8-408D-A37D-0EECD96FA67A}</Project>
+      <Name>JiraTimeBot.Core</Name>
+    </ProjectReference>
+  </ItemGroup>
+  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>

src/JiraTimeBot/Logger.cs

@@ -1,5 +1,6 @@
 using System;
 using System.ComponentModel;
+using JiraTimeBot.Core;
 
 namespace JiraTimeBot
 {
@@ -38,12 +39,4 @@ namespace JiraTimeBot
             AppendText(message);
         }
     }
-
-    public interface ILog
-    {
-        void Info([Localizable(false)] string message);
-        void Trace([Localizable(false)] string message);
-        void Warn([Localizable(false)] string message);
-        void Error([Localizable(false)] string message);
-    }
 }

src/JiraTimeBot/Program.cs

@@ -1,8 +1,8 @@
 using JiraTimeBot.UI;
+using JiraTimeBot.UI.Tray;
 using System;
 using System.Threading;
 using System.Windows.Forms;
-using JiraTimeBot.UI.Tray;
 
 namespace JiraTimeBot
 {

src/JiraTimeBot/Properties/AssemblyInfo.cs

@@ -26,6 +26,6 @@ using System.Runtime.InteropServices;
 //                                 
 // You can specify all the values or you can default the Build and Revision Numbers                                 
 // by using the '*' as shown below:                                 
-[assembly: AssemblyVersion("1.0.37")] 
-[assembly: AssemblyFileVersion("1.0.37")] 
-[assembly: AssemblyInformationalVersion("1.0.37")] 
+[assembly: AssemblyVersion("1.0.42")] 
+[assembly: AssemblyFileVersion("1.0.42")] 
+[assembly: AssemblyInformationalVersion("1.0.42")] 

src/JiraTimeBot/Properties/Resources.Designer.cs

@@ -19,7 +19,7 @@ namespace JiraTimeBot.Properties {
     // class via a tool like ResGen or Visual Studio.
     // To add or remove a member, edit your .ResX file then rerun ResGen
     // with the /str option, or rebuild your VS project.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {

src/JiraTimeBot/Properties/Settings.Designer.cs

@@ -12,7 +12,7 @@ namespace JiraTimeBot.Properties {
     
     
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.9.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.0.0.0")]
     internal sealed partial class Settings : global::System.Configuration.ApplicationSettingsBase {
         
         private static Settings defaultInstance = ((Settings)(global::System.Configuration.ApplicationSettingsBase.Synchronized(new Settings())));

src/JiraTimeBot/TaskTime/ITaskTimeCalculator.cs

@@ -1,13 +0,0 @@
-using System.Collections.Generic;
-using System.Threading;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.Mercurial.Objects;
-using JiraTimeBot.TaskTime.Objects;
-
-namespace JiraTimeBot.TaskTime
-{
-    public interface ITaskTimeCalculator
-    {
-        List<TaskTimeItem> CalculateTaskTime(List<MercurialCommitItem> commitItems, Settings settings, CancellationToken cancellationToken = default(CancellationToken));
-    }
-}

src/JiraTimeBot/UI/Tray/SingleInstance.cs

@@ -4,7 +4,7 @@ using System.Runtime.InteropServices;
 
 namespace JiraTimeBot.UI.Tray
 {
-    static class SingleInstance
+    public static class SingleInstance
     {
         public static readonly int WM_SHOWFIRSTINSTANCE = RegisterWindowMessage($"WM_SHOWFIRSTINSTANCE|{AssemblyGuid}");
         

src/JiraTimeBot/UI/frmMain.Designer.cs

@@ -30,39 +30,25 @@
         {
             this.components = new System.ComponentModel.Container();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(frmMain));
-            this.txtLog = new System.Windows.Forms.TextBox();
-            this.btnStart = new System.Windows.Forms.Button();
             this.ntfyIcon = new System.Windows.Forms.NotifyIcon(this.components);
             this.tmrStart = new System.Windows.Forms.Timer(this.components);
-            this.txtDummyMode = new System.Windows.Forms.CheckBox();
-            this.btnMeeting = new System.Windows.Forms.Button();
-            this.btnCancel = new System.Windows.Forms.Button();
-            this.btnSettings = new System.Windows.Forms.Button();
             this.tmrUpdate = new System.Windows.Forms.Timer(this.components);
-            this.dteForDay = new System.Windows.Forms.DateTimePicker();
+            this.tlpControls = new System.Windows.Forms.TableLayoutPanel();
+            this.txtLog = new System.Windows.Forms.TextBox();
+            this.panel2 = new System.Windows.Forms.Panel();
+            this.btnCancel = new System.Windows.Forms.Button();
+            this.btnMeeting = new System.Windows.Forms.Button();
+            this.txtDummyMode = new System.Windows.Forms.CheckBox();
+            this.btnStart = new System.Windows.Forms.Button();
+            this.pnlTopControls = new System.Windows.Forms.Panel();
             this.btnDoForDate = new System.Windows.Forms.Button();
+            this.dteForDay = new System.Windows.Forms.DateTimePicker();
+            this.btnSettings = new System.Windows.Forms.Button();
+            this.tlpControls.SuspendLayout();
+            this.panel2.SuspendLayout();
+            this.pnlTopControls.SuspendLayout();
             this.SuspendLayout();
             // 
-            // txtLog
-            // 
-            this.txtLog.Location = new System.Drawing.Point(132, 16);
-            this.txtLog.Multiline = true;
-            this.txtLog.Name = "txtLog";
-            this.txtLog.ReadOnly = true;
-            this.txtLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
-            this.txtLog.Size = new System.Drawing.Size(596, 294);
-            this.txtLog.TabIndex = 11;
-            // 
-            // btnStart
-            // 
-            this.btnStart.Location = new System.Drawing.Point(12, 229);
-            this.btnStart.Name = "btnStart";
-            this.btnStart.Size = new System.Drawing.Size(114, 23);
-            this.btnStart.TabIndex = 12;
-            this.btnStart.Text = "Проставить время";
-            this.btnStart.UseVisualStyleBackColor = true;
-            this.btnStart.Click += new System.EventHandler(this.btnStart_Click);
-            // 
             // ntfyIcon
             // 
             this.ntfyIcon.Text = "notifyIcon1";
@@ -73,111 +59,175 @@
             this.tmrStart.Interval = 1500;
             this.tmrStart.Tick += new System.EventHandler(this.tmrStart_Tick);
             // 
-            // txtDummyMode
-            // 
-            this.txtDummyMode.AutoSize = true;
-            this.txtDummyMode.Location = new System.Drawing.Point(12, 206);
-            this.txtDummyMode.Name = "txtDummyMode";
-            this.txtDummyMode.Size = new System.Drawing.Size(114, 17);
-            this.txtDummyMode.TabIndex = 13;
-            this.txtDummyMode.Text = "Тестовый прогон";
-            this.txtDummyMode.UseVisualStyleBackColor = true;
-            // 
-            // btnMeeting
-            // 
-            this.btnMeeting.Location = new System.Drawing.Point(12, 258);
-            this.btnMeeting.Name = "btnMeeting";
-            this.btnMeeting.Size = new System.Drawing.Size(114, 23);
-            this.btnMeeting.TabIndex = 14;
-            this.btnMeeting.Text = "Митинг";
-            this.btnMeeting.UseVisualStyleBackColor = true;
-            this.btnMeeting.Click += new System.EventHandler(this.btnMeeting_Click);
-            // 
-            // btnCancel
-            // 
-            this.btnCancel.Enabled = false;
-            this.btnCancel.Location = new System.Drawing.Point(12, 287);
-            this.btnCancel.Name = "btnCancel";
-            this.btnCancel.Size = new System.Drawing.Size(114, 23);
-            this.btnCancel.TabIndex = 15;
-            this.btnCancel.Text = "Отменить операцию";
-            this.btnCancel.UseVisualStyleBackColor = true;
-            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
-            // 
-            // btnSettings
-            // 
-            this.btnSettings.Location = new System.Drawing.Point(12, 16);
-            this.btnSettings.Name = "btnSettings";
-            this.btnSettings.Size = new System.Drawing.Size(114, 23);
-            this.btnSettings.TabIndex = 16;
-            this.btnSettings.Text = "Настройки";
-            this.btnSettings.UseVisualStyleBackColor = true;
-            this.btnSettings.Click += new System.EventHandler(this.btnSettings_Click);
-            // 
             // tmrUpdate
             // 
             this.tmrUpdate.Interval = 1000;
             this.tmrUpdate.Tick += new System.EventHandler(this.tmrUpdate_Tick);
             // 
+            // tlpControls
+            // 
+            this.tlpControls.ColumnCount = 2;
+            this.tlpControls.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Absolute, 150F));
+            this.tlpControls.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle());
+            this.tlpControls.Controls.Add(this.txtLog, 2, 0);
+            this.tlpControls.Controls.Add(this.panel2, 0, 1);
+            this.tlpControls.Controls.Add(this.pnlTopControls, 0, 0);
+            this.tlpControls.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.tlpControls.Location = new System.Drawing.Point(0, 0);
+            this.tlpControls.Name = "tlpControls";
+            this.tlpControls.RowCount = 2;
+            this.tlpControls.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F));
+            this.tlpControls.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 200F));
+            this.tlpControls.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F));
+            this.tlpControls.Size = new System.Drawing.Size(759, 416);
+            this.tlpControls.TabIndex = 19;
+            // 
+            // txtLog
+            // 
+            this.txtLog.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.txtLog.Location = new System.Drawing.Point(153, 3);
+            this.txtLog.Multiline = true;
+            this.txtLog.Name = "txtLog";
+            this.txtLog.ReadOnly = true;
+            this.tlpControls.SetRowSpan(this.txtLog, 2);
+            this.txtLog.ScrollBars = System.Windows.Forms.ScrollBars.Vertical;
+            this.txtLog.Size = new System.Drawing.Size(603, 410);
+            this.txtLog.TabIndex = 27;
+            // 
+            // panel2
+            // 
+            this.panel2.Controls.Add(this.btnCancel);
+            this.panel2.Controls.Add(this.btnMeeting);
+            this.panel2.Controls.Add(this.txtDummyMode);
+            this.panel2.Controls.Add(this.btnStart);
+            this.panel2.Dock = System.Windows.Forms.DockStyle.Bottom;
+            this.panel2.Location = new System.Drawing.Point(3, 288);
+            this.panel2.Name = "panel2";
+            this.panel2.Size = new System.Drawing.Size(144, 125);
+            this.panel2.TabIndex = 25;
+            // 
+            // btnCancel
+            // 
+            this.btnCancel.Enabled = false;
+            this.btnCancel.Location = new System.Drawing.Point(15, 91);
+            this.btnCancel.Name = "btnCancel";
+            this.btnCancel.Size = new System.Drawing.Size(114, 23);
+            this.btnCancel.TabIndex = 19;
+            this.btnCancel.Text = "Отменить операцию";
+            this.btnCancel.UseVisualStyleBackColor = true;
+            this.btnCancel.Click += new System.EventHandler(this.btnCancel_Click);
+            // 
+            // btnMeeting
+            // 
+            this.btnMeeting.Location = new System.Drawing.Point(15, 62);
+            this.btnMeeting.Name = "btnMeeting";
+            this.btnMeeting.Size = new System.Drawing.Size(114, 23);
+            this.btnMeeting.TabIndex = 18;
+            this.btnMeeting.Text = "Митинг";
+            this.btnMeeting.UseVisualStyleBackColor = true;
+            this.btnMeeting.Click += new System.EventHandler(this.btnMeeting_Click);
+            // 
+            // txtDummyMode
+            // 
+            this.txtDummyMode.AutoSize = true;
+            this.txtDummyMode.Location = new System.Drawing.Point(15, 10);
+            this.txtDummyMode.Name = "txtDummyMode";
+            this.txtDummyMode.Size = new System.Drawing.Size(114, 17);
+            this.txtDummyMode.TabIndex = 17;
+            this.txtDummyMode.Text = "Тестовый прогон";
+            this.txtDummyMode.UseVisualStyleBackColor = true;
+            // 
+            // btnStart
+            // 
+            this.btnStart.Location = new System.Drawing.Point(15, 33);
+            this.btnStart.Name = "btnStart";
+            this.btnStart.Size = new System.Drawing.Size(114, 23);
+            this.btnStart.TabIndex = 16;
+            this.btnStart.Text = "Проставить время";
+            this.btnStart.UseVisualStyleBackColor = true;
+            this.btnStart.Click += new System.EventHandler(this.btnStart_Click);
+            // 
+            // pnlTopControls
+            // 
+            this.pnlTopControls.Controls.Add(this.btnDoForDate);
+            this.pnlTopControls.Controls.Add(this.dteForDay);
+            this.pnlTopControls.Controls.Add(this.btnSettings);
+            this.pnlTopControls.Dock = System.Windows.Forms.DockStyle.Top;
+            this.pnlTopControls.Location = new System.Drawing.Point(3, 3);
+            this.pnlTopControls.Name = "pnlTopControls";
+            this.pnlTopControls.Size = new System.Drawing.Size(144, 125);
+            this.pnlTopControls.TabIndex = 24;
+            // 
+            // btnDoForDate
+            // 
+            this.btnDoForDate.Location = new System.Drawing.Point(15, 84);
+            this.btnDoForDate.Name = "btnDoForDate";
+            this.btnDoForDate.Size = new System.Drawing.Size(114, 36);
+            this.btnDoForDate.TabIndex = 25;
+            this.btnDoForDate.Text = "Проставить на дату";
+            this.btnDoForDate.UseVisualStyleBackColor = true;
+            this.btnDoForDate.Click += new System.EventHandler(this.btnDoForDate_Click);
+            // 
             // dteForDay
             // 
             this.dteForDay.CustomFormat = "dd.MM.yyyy";
             this.dteForDay.Format = System.Windows.Forms.DateTimePickerFormat.Short;
-            this.dteForDay.Location = new System.Drawing.Point(12, 69);
+            this.dteForDay.Location = new System.Drawing.Point(15, 57);
             this.dteForDay.MinDate = new System.DateTime(2019, 1, 1, 0, 0, 0, 0);
             this.dteForDay.Name = "dteForDay";
             this.dteForDay.ShowUpDown = true;
-            this.dteForDay.Size = new System.Drawing.Size(113, 20);
-            this.dteForDay.TabIndex = 17;
+            this.dteForDay.Size = new System.Drawing.Size(114, 20);
+            this.dteForDay.TabIndex = 24;
             // 
-            // btnDoForDate
+            // btnSettings
             // 
-            this.btnDoForDate.Location = new System.Drawing.Point(13, 96);
-            this.btnDoForDate.Name = "btnDoForDate";
-            this.btnDoForDate.Size = new System.Drawing.Size(112, 36);
-            this.btnDoForDate.TabIndex = 18;
-            this.btnDoForDate.Text = "Проставить на дату";
-            this.btnDoForDate.UseVisualStyleBackColor = true;
-            this.btnDoForDate.Click += new System.EventHandler(this.btnDoForDate_Click);
+            this.btnSettings.Location = new System.Drawing.Point(15, 4);
+            this.btnSettings.Name = "btnSettings";
+            this.btnSettings.Size = new System.Drawing.Size(114, 23);
+            this.btnSettings.TabIndex = 23;
+            this.btnSettings.Text = "Настройки";
+            this.btnSettings.UseVisualStyleBackColor = true;
+            this.btnSettings.Click += new System.EventHandler(this.btnSettings_Click);
             // 
             // frmMain
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(740, 320);
-            this.Controls.Add(this.btnDoForDate);
-            this.Controls.Add(this.dteForDay);
-            this.Controls.Add(this.btnSettings);
-            this.Controls.Add(this.btnCancel);
-            this.Controls.Add(this.btnMeeting);
-            this.Controls.Add(this.txtDummyMode);
-            this.Controls.Add(this.btnStart);
-            this.Controls.Add(this.txtLog);
+            this.ClientSize = new System.Drawing.Size(759, 416);
+            this.Controls.Add(this.tlpControls);
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.Margin = new System.Windows.Forms.Padding(2);
+            this.MinimumSize = new System.Drawing.Size(775, 455);
             this.Name = "frmMain";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen;
             this.Text = "Бот логирования времени";
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.frmMain_FormClosing);
             this.Load += new System.EventHandler(this.Form1_Load);
             this.Resize += new System.EventHandler(this.frmMain_Resize);
+            this.tlpControls.ResumeLayout(false);
+            this.tlpControls.PerformLayout();
+            this.panel2.ResumeLayout(false);
+            this.panel2.PerformLayout();
+            this.pnlTopControls.ResumeLayout(false);
             this.ResumeLayout(false);
-            this.PerformLayout();
 
         }
 
         #endregion
-        private System.Windows.Forms.TextBox txtLog;
-        private System.Windows.Forms.Button btnStart;
         private System.Windows.Forms.NotifyIcon ntfyIcon;
         private System.Windows.Forms.Timer tmrStart;
-        private System.Windows.Forms.CheckBox txtDummyMode;
-        private System.Windows.Forms.Button btnMeeting;
-        private System.Windows.Forms.Button btnCancel;
-        private System.Windows.Forms.Button btnSettings;
         private System.Windows.Forms.Timer tmrUpdate;
-        private System.Windows.Forms.DateTimePicker dteForDay;
+        private System.Windows.Forms.TableLayoutPanel tlpControls;
+        private System.Windows.Forms.Panel pnlTopControls;
         private System.Windows.Forms.Button btnDoForDate;
+        private System.Windows.Forms.DateTimePicker dteForDay;
+        private System.Windows.Forms.Button btnSettings;
+        private System.Windows.Forms.Panel panel2;
+        private System.Windows.Forms.Button btnCancel;
+        private System.Windows.Forms.Button btnMeeting;
+        private System.Windows.Forms.CheckBox txtDummyMode;
+        private System.Windows.Forms.Button btnStart;
+        private System.Windows.Forms.TextBox txtLog;
     }
 }
 

src/JiraTimeBot/UI/frmMain.cs

@@ -1,9 +1,6 @@
 using Autofac;
-using JiraTimeBot.Configuration;
 using JiraTimeBot.DI;
-using JiraTimeBot.TasksProcessors;
 using JiraTimeBot.UI.Tray;
-using JiraTimeBot.Update;
 using System;
 using System.Collections.Generic;
 using System.IO;
@@ -11,7 +8,12 @@ using System.IO.Compression;
 using System.Threading;
 using System.Threading.Tasks;
 using System.Windows.Forms;
-using JiraTimeBot.UI.Startup;
+using JiraTimeBot.Core;
+using JiraTimeBot.Core.Configuration;
+using JiraTimeBot.Core.StartUp;
+using JiraTimeBot.Core.TasksProcessors;
+using JiraTimeBot.Core.Update;
+using JiraTimeBot.Core.Update.Update;
 
 // This is the code for your desktop app.
 // Press Ctrl+F5 (or go to Debug > Start Without Debugging) to run your app.
@@ -66,11 +68,11 @@ namespace JiraTimeBot.UI
             _log = _container.Resolve<ILog>();
             _tasksProcessors = _container.Resolve<IAllTasksProcessors>();
 
-            _controls = new Control[] { txtDummyMode, btnStart, btnMeeting, btnSettings };
+            _controls = new Control[] { txtDummyMode, btnStart, btnMeeting, btnSettings, dteForDay, btnDoForDate };
 
             _settingsWindowShow = () =>
             {
-                var frmSettings = new frmSettings(_container.Resolve<AutoStartUp>());
+                var frmSettings = new frmSettings(_container.Resolve<AutoStartUp>(), _container.Resolve<ISettingsManager>());
                 frmSettings.ShowDialog(this);
             };
             _settingsErrorReporter = msg => MessageBox.Show(msg, "Загрузка настроек", MessageBoxButtons.OK, MessageBoxIcon.Exclamation);;
@@ -83,7 +85,9 @@ namespace JiraTimeBot.UI
 
         public Settings ReadSettingsAndLock()
         {
-            _settings = Settings.LoadAndCheck(_settingsWindowShow, _settingsErrorReporter);
+            var settingsManager = _container.Resolve<ISettingsManager>();
+
+            _settings = settingsManager.LoadAndCheck(_settingsWindowShow, _settingsErrorReporter);
             
             LockUnlock(false);
 
@@ -121,7 +125,8 @@ namespace JiraTimeBot.UI
 
         private void PrintStartMessage()
         {
-            _settings = Settings.LoadAndCheck(_settingsWindowShow, _settingsErrorReporter);
+            var settingsManager = _container.Resolve<ISettingsManager>();
+            _settings = settingsManager.LoadAndCheck(_settingsWindowShow, _settingsErrorReporter);
             _log.Info($"Загружен бот для {_settings.JiraUserName}, Режим: {_settings.WorkType.ToString()}, работаем в {_settings.RepositoryPath}");
         }
 

src/JiraTimeBot/UI/frmSettings.cs

@@ -1,23 +1,25 @@
 using System;
 using System.Windows.Forms;
-using JiraTimeBot.Configuration;
-using JiraTimeBot.UI.Startup;
+using JiraTimeBot.Core.Configuration;
+using JiraTimeBot.Core.StartUp;
 
 namespace JiraTimeBot.UI
 {
     public partial class frmSettings : Form
     {
         private readonly AutoStartUp _autoStart;
+        private readonly ISettingsManager _settingsManager;
 
-        public frmSettings(AutoStartUp autoStart)
+        public frmSettings(AutoStartUp autoStart, ISettingsManager settingsManager)
         {
             _autoStart = autoStart;
+            _settingsManager = settingsManager;
             InitializeComponent();
         }
 
         private void frmSettings_Load(object sender, EventArgs e)
         {
-            var settings = Settings.Load();
+            var settings = _settingsManager.Load();
             if (settings != null)
             {
                 SetSettings(settings);
@@ -34,11 +36,12 @@ namespace JiraTimeBot.UI
             txtRepoPath.Text = settings.RepositoryPath;
             actTime.Text = settings.ActivationTime.ToString("hh\\:mm\\:ss");
             chkAddComments.Checked = settings.AddCommentsToWorklog;
-            txtRoundTo.Text = settings.RountToMinutes.ToString();
+            txtRoundTo.Text = settings.RoundToMinutes.ToString();
             cboWorkType.SelectedIndex = (int) settings.WorkType;
             txtTimeControlTask.Text = settings.TimeControlTask;
             txtJQL.Text = settings.JiraQuery;
-            txtJQL.Enabled = settings.WorkType == WorkType.JiraLogs;
+
+            cboWorkType_SelectedIndexChanged(null, null);
         }
 
         public Settings ReadSettingsAndLock()
@@ -56,7 +59,7 @@ namespace JiraTimeBot.UI
                 ActivationTime = TimeSpan.Parse(actTime.Text),
                 RepositoryPath = txtRepoPath.Text,
                 AddCommentsToWorklog = chkAddComments.Checked,
-                RountToMinutes = roundTo,
+                RoundToMinutes = roundTo,
                 WorkType = (WorkType) cboWorkType.SelectedIndex,
                 JiraQuery = txtJQL.Text,
                 TimeControlTask = txtTimeControlTask.Text,
@@ -70,7 +73,7 @@ namespace JiraTimeBot.UI
         private void btnSave_Click(object sender, EventArgs e)
         {
             var settings = ReadSettingsAndLock();
-            settings.Save();
+            _settingsManager.Save(settings);
              _autoStart.Set(chkAutostart.Checked);
 
             MessageBox.Show("Настройки сохранены.");
@@ -87,6 +90,7 @@ namespace JiraTimeBot.UI
         private void cboWorkType_SelectedIndexChanged(object sender, EventArgs e)
         {
             txtJQL.Enabled = (cboWorkType.SelectedIndex == 1);
+            txtRepoPath.Enabled = (cboWorkType.SelectedIndex == 0);
         }
     }
 }

src/JiraTimeBot/Update/IUpdater.cs

@@ -1,9 +0,0 @@
-using System;
-
-namespace JiraTimeBot.Update
-{
-    internal interface IUpdater
-    {
-        bool UpdateToNewVersion(bool firstTime);
-    }
-}