From 727d4c7285b0294f56cd24edbdbdbd7fb822125b Mon Sep 17 00:00:00 2001
From: Natlinux <97396587+Natlinux81@users.noreply.github.com>
Date: Wed, 9 Nov 2022 23:46:10 +0100
Subject: [PATCH] combobox selcted image finish
---
Apollon.WPF/Apollon.WPF.csproj | 22 ++++++++++++++++
Apollon.WPF/Themes/ButtonTheme.xaml | 5 +++-
.../ViewModels/AddEditDetailsViewModel.cs | 25 ++++++++++++++++---
.../Views/Components/AddEditDetails.xaml | 16 ++++++++----
4 files changed, 58 insertions(+), 10 deletions(-)
diff --git a/Apollon.WPF/Apollon.WPF.csproj b/Apollon.WPF/Apollon.WPF.csproj
index 444d77c..0a50e86 100644
--- a/Apollon.WPF/Apollon.WPF.csproj
+++ b/Apollon.WPF/Apollon.WPF.csproj
@@ -7,6 +7,13 @@
true
+
+
+
+
+
+
+
@@ -22,4 +29,19 @@
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+ PreserveNewest
+
+
+
diff --git a/Apollon.WPF/Themes/ButtonTheme.xaml b/Apollon.WPF/Themes/ButtonTheme.xaml
index a9bd3d8..7ea78d7 100644
--- a/Apollon.WPF/Themes/ButtonTheme.xaml
+++ b/Apollon.WPF/Themes/ButtonTheme.xaml
@@ -27,7 +27,10 @@
-
+
+
+
+
diff --git a/Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs b/Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs
index 980acf2..8b52b10 100644
--- a/Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs
+++ b/Apollon.WPF/ViewModels/AddEditDetailsViewModel.cs
@@ -3,7 +3,9 @@ using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Collections.ObjectModel;
+using System.ComponentModel;
using System.Linq;
+using System.Reflection;
using System.Text;
using System.Threading.Tasks;
using System.Windows;
@@ -72,6 +74,21 @@ namespace Apollon.WPF.ViewModels
}
}
+ private Competition _currentCompetition;
+ public Competition CurrentCompetition
+ {
+ get
+ {
+ return _currentCompetition;
+ }
+ set
+ {
+ _currentCompetition = value;
+ CompetitionImage = _currentCompetition.CompetitionImage;
+ OnPropertyChanged(nameof(CurrentCompetition));
+ }
+ }
+
private DateTime _startDate = DateTime.Today;
public DateTime StartDate
{
@@ -179,23 +196,23 @@ namespace Apollon.WPF.ViewModels
new Competition
{
CompetitionName = "Halle",
- CompetitionImage = "targetHall.png"
+ CompetitionImage = @"\Images\targetHall.png"
},
new Competition
{
CompetitionName = "im Freien",
- CompetitionImage ="targetOutdoor.png"
+ CompetitionImage = @"\Images\targetOutdoor.png"
},
new Competition
{
CompetitionName = "Feld",
- CompetitionImage = "targetField.png"
+ CompetitionImage = @"\Images\targetField.png"
},
new Competition
{
CompetitionName = "3D",
- CompetitionImage = "3d.png"
+ CompetitionImage = @"\Images\3d.png"
}
};
diff --git a/Apollon.WPF/Views/Components/AddEditDetails.xaml b/Apollon.WPF/Views/Components/AddEditDetails.xaml
index e46e496..0fa0b96 100644
--- a/Apollon.WPF/Views/Components/AddEditDetails.xaml
+++ b/Apollon.WPF/Views/Components/AddEditDetails.xaml
@@ -8,8 +8,8 @@
xmlns:ViewModels="clr-namespace:Apollon.WPF.ViewModels" x:Class="Apollon.WPF.Views.Components.AddEditDetails"
mc:Ignorable="d">
-
-
+
+
@@ -81,7 +81,10 @@
VerticalContentAlignment="Center"
HorizontalAlignment="Left"
ItemsSource="{Binding CompetitionList}"
- DisplayMemberPath="CompetitionName">
+ DisplayMemberPath="CompetitionName"
+ SelectedValuePath="CompetitionName"
+ SelectedValue="{Binding CurrentCompetition.CompetitionName}"
+ SelectedItem="{Binding CurrentCompetition}">
+ Source="{Binding CompetitionImage, TargetNullValue={x:Null}}" />
+ IsEnabled="{Binding CanSubmit}"
+ ToolTip="Turniername muss angegeben werden!"
+ ToolTipService.ShowOnDisabled="True"
+ ToolTipService.BetweenShowDelay="1000"/>