diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/LaDOSE.DesktopApp.csproj b/LaDOSE.Src/LaDOSE.DesktopApp/LaDOSE.DesktopApp.csproj index b6a044e..1dcb326 100644 --- a/LaDOSE.Src/LaDOSE.DesktopApp/LaDOSE.DesktopApp.csproj +++ b/LaDOSE.Src/LaDOSE.DesktopApp/LaDOSE.DesktopApp.csproj @@ -112,6 +112,7 @@ + @@ -123,6 +124,9 @@ GameView.xaml + + TournamentResultView.xaml + WordPressView.xaml @@ -150,6 +154,10 @@ MSBuild:Compile Designer + + MSBuild:Compile + Designer + Designer MSBuild:Compile diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/ShellViewModel.cs b/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/ShellViewModel.cs index 19b8148..be92ad8 100644 --- a/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/ShellViewModel.cs +++ b/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/ShellViewModel.cs @@ -62,9 +62,9 @@ namespace LaDOSE.DesktopApp.ViewModels ActivateItem(new GameViewModel(IoC.Get())); } - public void OpenWeb() + public void TournamentResult() { - ActivateItem(new WebNavigationViewModel("www.google.com")); + ActivateItem(new TournamentResultViewModel()); } } } \ No newline at end of file diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/TournamentResultViewModel.cs b/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/TournamentResultViewModel.cs new file mode 100644 index 0000000..45ff786 --- /dev/null +++ b/LaDOSE.Src/LaDOSE.DesktopApp/ViewModels/TournamentResultViewModel.cs @@ -0,0 +1,11 @@ +using Caliburn.Micro; + +namespace LaDOSE.DesktopApp.ViewModels +{ + + + public class TournamentResultViewModel : Screen + { + public override string DisplayName => "Tournament Result"; + } +} \ No newline at end of file diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/Views/ShellView.xaml b/LaDOSE.Src/LaDOSE.DesktopApp/Views/ShellView.xaml index 52533b3..0ac4764 100644 --- a/LaDOSE.Src/LaDOSE.DesktopApp/Views/ShellView.xaml +++ b/LaDOSE.Src/LaDOSE.DesktopApp/Views/ShellView.xaml @@ -39,10 +39,10 @@ - + - + diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/Views/TournamentResultView.xaml b/LaDOSE.Src/LaDOSE.DesktopApp/Views/TournamentResultView.xaml new file mode 100644 index 0000000..ec08a76 --- /dev/null +++ b/LaDOSE.Src/LaDOSE.DesktopApp/Views/TournamentResultView.xaml @@ -0,0 +1,25 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/LaDOSE.Src/LaDOSE.DesktopApp/Views/TournamentResultView.xaml.cs b/LaDOSE.Src/LaDOSE.DesktopApp/Views/TournamentResultView.xaml.cs new file mode 100644 index 0000000..97269cb --- /dev/null +++ b/LaDOSE.Src/LaDOSE.DesktopApp/Views/TournamentResultView.xaml.cs @@ -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 +{ + /// + /// Interaction logic for ShellView.xaml + /// + public partial class TournamentResultView : UserControl + { + public TournamentResultView() + { + + InitializeComponent(); + } + + + + } +}