This commit is contained in:
Anton Volkov
2019-03-28 15:43:02 +03:00
parent 8ae3b98391
commit 3508bec024
5 changed files with 37 additions and 5 deletions
+16 -1
View File
@@ -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
@@ -13,15 +16,27 @@ namespace JiraTimeBot.Ui
{
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>();
+6
View File
@@ -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>
+13 -2
View File
@@ -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"
+1 -1
View File
@@ -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
{
+1 -1
View File
@@ -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}");