From dfc801776629b83ee43b475c5c43126e88f4446c Mon Sep 17 00:00:00 2001
From: Anton Volkov <whirlwind432@gmail.com>
Date: Wed, 27 Mar 2019 15:46:38 +0300
Subject: [PATCH] ui progess

---
 src/JiraTimeBot.Ui/App.xaml.cs             |  1 +
 src/JiraTimeBot.Ui/JiraTimeBot.Ui.csproj   | 15 +++++
 src/JiraTimeBot.Ui/Views/MainPage.xaml     |  1 +
 src/JiraTimeBot.Ui/Views/MainWindow.xaml   |  4 +-
 src/JiraTimeBot.Ui/Views/SettingsPage.xaml | 78 +++++++++++++++++++++-
 src/JiraTimeBot.Ui/packages.config         |  1 +
 6 files changed, 97 insertions(+), 3 deletions(-)

diff --git a/src/JiraTimeBot.Ui/App.xaml.cs b/src/JiraTimeBot.Ui/App.xaml.cs
index cafa44d..bd57ab2 100644
--- a/src/JiraTimeBot.Ui/App.xaml.cs
+++ b/src/JiraTimeBot.Ui/App.xaml.cs
@@ -49,6 +49,7 @@ namespace JiraTimeBot.Ui
             var nav = _container.Resolve<IApplicationNavigator>();
             
             nav.NavigateToSettings();
+            mainWindow.ShowActivated = true;
             mainWindow.Show();
             base.OnStartup(e);
         }
diff --git a/src/JiraTimeBot.Ui/JiraTimeBot.Ui.csproj b/src/JiraTimeBot.Ui/JiraTimeBot.Ui.csproj
index 952b4e3..5223644 100644
--- a/src/JiraTimeBot.Ui/JiraTimeBot.Ui.csproj
+++ b/src/JiraTimeBot.Ui/JiraTimeBot.Ui.csproj
@@ -73,6 +73,21 @@
     <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">
diff --git a/src/JiraTimeBot.Ui/Views/MainPage.xaml b/src/JiraTimeBot.Ui/Views/MainPage.xaml
index ec1c23c..4f61e97 100644
--- a/src/JiraTimeBot.Ui/Views/MainPage.xaml
+++ b/src/JiraTimeBot.Ui/Views/MainPage.xaml
@@ -9,6 +9,7 @@
       Height="100"
       Width="400"
       d:DataContext="{d:DesignInstance viewModels:MainPageViewModel}" >
+    
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition/>
diff --git a/src/JiraTimeBot.Ui/Views/MainWindow.xaml b/src/JiraTimeBot.Ui/Views/MainWindow.xaml
index bc95dfb..5cca4e0 100644
--- a/src/JiraTimeBot.Ui/Views/MainWindow.xaml
+++ b/src/JiraTimeBot.Ui/Views/MainWindow.xaml
@@ -8,7 +8,9 @@
         mc:Ignorable="d"
         SizeToContent="WidthAndHeight"
         d:DataContext="{d:DesignInstance viewModels:ApplicationViewModel}"
-        Title="ApplicationWindow">
+        Title="ApplicationWindow"
+        ShowInTaskbar="True" d:DesignWidth="517.579" d:DesignHeight="260.977"
+        >
     <Window.Resources>
         <DataTemplate DataType="{x:Type viewModels:MainPageViewModel}">
             <ui:MainPage/>
diff --git a/src/JiraTimeBot.Ui/Views/SettingsPage.xaml b/src/JiraTimeBot.Ui/Views/SettingsPage.xaml
index 7ef4124..938c088 100644
--- a/src/JiraTimeBot.Ui/Views/SettingsPage.xaml
+++ b/src/JiraTimeBot.Ui/Views/SettingsPage.xaml
@@ -5,10 +5,84 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:JiraTimeBot.Ui"
       mc:Ignorable="d" 
-      d:DesignHeight="450" d:DesignWidth="800"
       >
 
     <Grid>
-        <TextBlock Text="Settings"></TextBlock>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition />
+        </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">
+        </ComboBox>
+
+        <TextBlock Grid.Row="1" Grid.Column="0"
+                   Text="Путь до репо" />
+        
+        <TextBox Grid.Row="1" Grid.Column="1" />
+
+        <TextBlock Grid.Row="2" Grid.Column="0"
+                   Text="Логин Jira" />
+        
+        <TextBox Grid.Row="2" Grid.Column="1" />
+
+        <TextBlock Grid.Row="3" Grid.Column="0"
+                   Text="Пароль Jira" />
+
+        <PasswordBox 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="Время запуска" />
+        
+        <DatePicker Grid.Row="8" Grid.Column="1"/>
+        <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" 
+                Content="Сохранить"/>
+
+
     </Grid>
 </UserControl>
diff --git a/src/JiraTimeBot.Ui/packages.config b/src/JiraTimeBot.Ui/packages.config
index d6686b1..7e346f1 100644
--- a/src/JiraTimeBot.Ui/packages.config
+++ b/src/JiraTimeBot.Ui/packages.config
@@ -3,4 +3,5 @@
   <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>
\ No newline at end of file