From 3508bec024f864f3c5b1b00091b0a02169854452 Mon Sep 17 00:00:00 2001
From: Anton Volkov <whirlwind432@gmail.com>
Date: Thu, 28 Mar 2019 15:43:02 +0300
Subject: [PATCH] progress

---
 src/JiraTimeBot.Ui/App.xaml.cs             | 17 ++++++++++++++++-
 src/JiraTimeBot.Ui/JiraTimeBot.Ui.csproj   |  6 ++++++
 src/JiraTimeBot.Ui/Views/SettingsPage.xaml | 15 +++++++++++++--
 src/JiraTimeBot/Program.cs                 |  2 +-
 src/JiraTimeBot/UI/Tray/SingleInstance.cs  |  2 +-
 5 files changed, 37 insertions(+), 5 deletions(-)

diff --git a/src/JiraTimeBot.Ui/App.xaml.cs b/src/JiraTimeBot.Ui/App.xaml.cs
index bd57ab2..b08f11b 100644
--- a/src/JiraTimeBot.Ui/App.xaml.cs
+++ b/src/JiraTimeBot.Ui/App.xaml.cs
@@ -2,6 +2,9 @@
 using Autofac.Extras.AggregateService;
 using JiraTimeBot.Ui.Models;
 using JiraTimeBot.Ui.ViewModels;
+using JiraTimeBot.UI.Tray;
+using System;
+using System.Threading;
 using System.Windows;
 
 namespace JiraTimeBot.Ui
@@ -12,16 +15,28 @@ namespace JiraTimeBot.Ui
     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))
+            {
+                Mutex.ReleaseMutex();
+            }
+            else
+            {
+                SingleInstance.ShowFirstInstance();
+                this.Shutdown();
+            }
+
         }
 
         protected override void OnStartup(StartupEventArgs e)
         {
             var builder = new ContainerBuilder();
 
-            builder.Register<MainWindow>(c =>
+            builder.Register(c =>
             {
                 var result = new MainWindow();
                 result.DataContext = c.Resolve<ApplicationViewModel>();
diff --git a/src/JiraTimeBot.Ui/JiraTimeBot.Ui.csproj b/src/JiraTimeBot.Ui/JiraTimeBot.Ui.csproj
index 205f17c..5233891 100644
--- a/src/JiraTimeBot.Ui/JiraTimeBot.Ui.csproj
+++ b/src/JiraTimeBot.Ui/JiraTimeBot.Ui.csproj
@@ -181,5 +181,11 @@
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\JiraTimeBot\JiraTimeBot.csproj">
+      <Project>{f3b89316-c38c-4ce6-9d88-0b1373cfba1a}</Project>
+      <Name>JiraTimeBot</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/src/JiraTimeBot.Ui/Views/SettingsPage.xaml b/src/JiraTimeBot.Ui/Views/SettingsPage.xaml
index 938c088..a102c24 100644
--- a/src/JiraTimeBot.Ui/Views/SettingsPage.xaml
+++ b/src/JiraTimeBot.Ui/Views/SettingsPage.xaml
@@ -4,7 +4,10 @@
       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"
       mc:Ignorable="d" 
+      d:DesignWidth="250"
+      d:DesignHeight="300"
       >
 
     <Grid>
@@ -68,9 +71,17 @@
         <TextBox Grid.Row="7" Grid.Column="1" />
 
         <TextBlock Grid.Row="8" Grid.Column="0"
-                   Text="Время запуска" />
+                   Text="Время запуска" 
+                   
+                   />
         
-        <DatePicker Grid.Row="8" Grid.Column="1"/>
+        <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"
diff --git a/src/JiraTimeBot/Program.cs b/src/JiraTimeBot/Program.cs
index 820cec9..ccaa42a 100644
--- a/src/JiraTimeBot/Program.cs
+++ b/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
 {
diff --git a/src/JiraTimeBot/UI/Tray/SingleInstance.cs b/src/JiraTimeBot/UI/Tray/SingleInstance.cs
index 8a4f6f3..ac6553b 100644
--- a/src/JiraTimeBot/UI/Tray/SingleInstance.cs
+++ b/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}");