Add tournament window

This commit is contained in:
2019-05-27 23:18:27 +02:00
parent c88465c083
commit 80893e55de
6 changed files with 84 additions and 4 deletions

View File

@@ -112,6 +112,7 @@
<Compile Include="Utils\WpfUtil.cs" /> <Compile Include="Utils\WpfUtil.cs" />
<Compile Include="ViewModels\ShellViewModel.cs" /> <Compile Include="ViewModels\ShellViewModel.cs" />
<Compile Include="ViewModels\GameViewModel.cs" /> <Compile Include="ViewModels\GameViewModel.cs" />
<Compile Include="ViewModels\TournamentResultViewModel.cs" />
<Compile Include="ViewModels\WebNavigationViewModel.cs" /> <Compile Include="ViewModels\WebNavigationViewModel.cs" />
<Compile Include="ViewModels\WordPressViewModel.cs" /> <Compile Include="ViewModels\WordPressViewModel.cs" />
<Compile Include="Views\WebNavigationView.xaml.cs"> <Compile Include="Views\WebNavigationView.xaml.cs">
@@ -123,6 +124,9 @@
<Compile Include="Views\GameView.xaml.cs"> <Compile Include="Views\GameView.xaml.cs">
<DependentUpon>GameView.xaml</DependentUpon> <DependentUpon>GameView.xaml</DependentUpon>
</Compile> </Compile>
<Compile Include="Views\TournamentResultView.xaml.cs">
<DependentUpon>TournamentResultView.xaml</DependentUpon>
</Compile>
<Compile Include="Views\WordPressView.xaml.cs"> <Compile Include="Views\WordPressView.xaml.cs">
<DependentUpon>WordPressView.xaml</DependentUpon> <DependentUpon>WordPressView.xaml</DependentUpon>
</Compile> </Compile>
@@ -150,6 +154,10 @@
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType> <SubType>Designer</SubType>
</Page> </Page>
<Page Include="Views\TournamentResultView.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Views\WordPressView.xaml"> <Page Include="Views\WordPressView.xaml">
<SubType>Designer</SubType> <SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator> <Generator>MSBuild:Compile</Generator>

View File

@@ -62,9 +62,9 @@ namespace LaDOSE.DesktopApp.ViewModels
ActivateItem(new GameViewModel(IoC.Get<RestService>())); ActivateItem(new GameViewModel(IoC.Get<RestService>()));
} }
public void OpenWeb() public void TournamentResult()
{ {
ActivateItem(new WebNavigationViewModel("www.google.com")); ActivateItem(new TournamentResultViewModel());
} }
} }
} }

View File

@@ -0,0 +1,11 @@
using Caliburn.Micro;
namespace LaDOSE.DesktopApp.ViewModels
{
public class TournamentResultViewModel : Screen
{
public override string DisplayName => "Tournament Result";
}
}

View File

@@ -39,10 +39,10 @@
</i:EventTrigger> </i:EventTrigger>
</i:Interaction.Triggers> </i:Interaction.Triggers>
</MenuItem> </MenuItem>
<MenuItem Header="_Web"> <MenuItem Header="_Tournament">
<i:Interaction.Triggers> <i:Interaction.Triggers>
<i:EventTrigger EventName="Click"> <i:EventTrigger EventName="Click">
<cal:ActionMessage MethodName="OpenWeb"> <cal:ActionMessage MethodName="TournamentResult">
</cal:ActionMessage> </cal:ActionMessage>
</i:EventTrigger> </i:EventTrigger>
</i:Interaction.Triggers> </i:Interaction.Triggers>

View File

@@ -0,0 +1,25 @@
<UserControl x:Class="LaDOSE.DesktopApp.Views.TournamentResultView"
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:LaDOSE.DesktopApp.Views"
xmlns:userControls="clr-namespace:LaDOSE.DesktopApp.UserControls"
xmlns:cal="http://www.caliburnproject.org"
xmlns:i="http://schemas.microsoft.com/expression/2010/interactivity"
xmlns:behaviors="clr-namespace:LaDOSE.DesktopApp.Behaviors"
mc:Ignorable="d"
d:DesignHeight="450" d:DesignWidth="800">
<Grid Row="2" Column="1">
<Grid.RowDefinitions>
<RowDefinition Height="*" />
<RowDefinition Height="2*" />
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
</Grid.ColumnDefinitions>
</Grid>
</UserControl>

View File

@@ -0,0 +1,36 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Data;
using System.Windows.Documents;
using System.Windows.Forms;
using System.Windows.Input;
using System.Windows.Media;
using System.Windows.Media.Imaging;
using System.Windows.Navigation;
using System.Windows.Shapes;
using LaDOSE.DTO;
using Clipboard = System.Windows.Clipboard;
using KeyEventArgs = System.Windows.Input.KeyEventArgs;
using ListViewItem = System.Windows.Controls.ListViewItem;
using UserControl = System.Windows.Controls.UserControl;
namespace LaDOSE.DesktopApp.Views
{
/// <summary>
/// Interaction logic for ShellView.xaml
/// </summary>
public partial class TournamentResultView : UserControl
{
public TournamentResultView()
{
InitializeComponent();
}
}
}