ui progess
This commit is contained in:
@@ -49,6 +49,7 @@ namespace JiraTimeBot.Ui
|
|||||||
var nav = _container.Resolve<IApplicationNavigator>();
|
var nav = _container.Resolve<IApplicationNavigator>();
|
||||||
|
|
||||||
nav.NavigateToSettings();
|
nav.NavigateToSettings();
|
||||||
|
mainWindow.ShowActivated = true;
|
||||||
mainWindow.Show();
|
mainWindow.Show();
|
||||||
base.OnStartup(e);
|
base.OnStartup(e);
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -73,6 +73,21 @@
|
|||||||
<Reference Include="WindowsBase" />
|
<Reference Include="WindowsBase" />
|
||||||
<Reference Include="PresentationCore" />
|
<Reference Include="PresentationCore" />
|
||||||
<Reference Include="PresentationFramework" />
|
<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>
|
||||||
<ItemGroup>
|
<ItemGroup>
|
||||||
<ApplicationDefinition Include="App.xaml">
|
<ApplicationDefinition Include="App.xaml">
|
||||||
|
|||||||
@@ -9,6 +9,7 @@
|
|||||||
Height="100"
|
Height="100"
|
||||||
Width="400"
|
Width="400"
|
||||||
d:DataContext="{d:DesignInstance viewModels:MainPageViewModel}" >
|
d:DataContext="{d:DesignInstance viewModels:MainPageViewModel}" >
|
||||||
|
|
||||||
<Grid>
|
<Grid>
|
||||||
<Grid.RowDefinitions>
|
<Grid.RowDefinitions>
|
||||||
<RowDefinition/>
|
<RowDefinition/>
|
||||||
|
|||||||
@@ -8,7 +8,9 @@
|
|||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
SizeToContent="WidthAndHeight"
|
SizeToContent="WidthAndHeight"
|
||||||
d:DataContext="{d:DesignInstance viewModels:ApplicationViewModel}"
|
d:DataContext="{d:DesignInstance viewModels:ApplicationViewModel}"
|
||||||
Title="ApplicationWindow">
|
Title="ApplicationWindow"
|
||||||
|
ShowInTaskbar="True" d:DesignWidth="517.579" d:DesignHeight="260.977"
|
||||||
|
>
|
||||||
<Window.Resources>
|
<Window.Resources>
|
||||||
<DataTemplate DataType="{x:Type viewModels:MainPageViewModel}">
|
<DataTemplate DataType="{x:Type viewModels:MainPageViewModel}">
|
||||||
<ui:MainPage/>
|
<ui:MainPage/>
|
||||||
|
|||||||
@@ -5,10 +5,84 @@
|
|||||||
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
|
||||||
xmlns:local="clr-namespace:JiraTimeBot.Ui"
|
xmlns:local="clr-namespace:JiraTimeBot.Ui"
|
||||||
mc:Ignorable="d"
|
mc:Ignorable="d"
|
||||||
d:DesignHeight="450" d:DesignWidth="800"
|
|
||||||
>
|
>
|
||||||
|
|
||||||
<Grid>
|
<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>
|
</Grid>
|
||||||
</UserControl>
|
</UserControl>
|
||||||
|
|||||||
@@ -3,4 +3,5 @@
|
|||||||
<package id="Autofac" version="4.9.1" targetFramework="net472" />
|
<package id="Autofac" version="4.9.1" targetFramework="net472" />
|
||||||
<package id="Autofac.Extras.AggregateService" version="4.1.0" 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="Castle.Core" version="4.0.0" targetFramework="net472" />
|
||||||
|
<package id="Extended.Wpf.Toolkit" version="3.5.0" targetFramework="net472" />
|
||||||
</packages>
|
</packages>
|
||||||
Reference in New Issue
Block a user