diff --git a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/BackgroundViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/BackgroundViewModel.cs index c0b9ea84..f83ccda7 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/BackgroundViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/BackgroundViewModel.cs @@ -8,12 +8,12 @@ namespace AideDeJeu.ViewModels.PlayerCharacter public class BackgroundViewModel : BaseViewModel { private BackgroundItem _Background = null; - public BackgroundItem Background { get { return _Background; } set { SetProperty(ref _Background, value); OnPropertyChanged(nameof(SelectedBackground)); } } + public BackgroundItem Background { get { return _Background; } set { SetProperty(ref _Background, value); OnPropertyChanged(nameof(BackgroundOrSubBackground)); } } private SubBackgroundItem _SubBackground = null; - public SubBackgroundItem SubBackground { get { return _SubBackground; } set { SetProperty(ref _SubBackground, value); OnPropertyChanged(nameof(SelectedBackground)); } } + public SubBackgroundItem SubBackground { get { return _SubBackground; } set { SetProperty(ref _SubBackground, value); OnPropertyChanged(nameof(BackgroundOrSubBackground)); } } - public BackgroundItem SelectedBackground + public BackgroundItem BackgroundOrSubBackground { get { diff --git a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs index 598d3605..298b8a63 100644 --- a/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs +++ b/AideDeJeu/AideDeJeu/ViewModels/PlayerCharacter/PlayerCharacterEditorViewModel.cs @@ -27,10 +27,10 @@ namespace AideDeJeu.ViewModels.PlayerCharacter Backgrounds = new NotifyTaskCompletion>(Task.Run(() => LoadBackgroundsAsync())); SelectedBackground = null; - NotifySelectedBackground = new NotifyTaskCompletion(null); + //NotifySelectedBackground = new NotifyTaskCompletion(null); SubBackgrounds = null; SelectedSubBackground = null; - NotifySelectedSubBackground = new NotifyTaskCompletion(null); + //NotifySelectedSubBackground = new NotifyTaskCompletion(null); PersonalityTraits = null; PersonalityIdeals = null; PersonalityLinks = null; @@ -75,43 +75,6 @@ namespace AideDeJeu.ViewModels.PlayerCharacter } } - private int _AlignmentSelectedIndex = -1; - public int AlignmentSelectedIndex - { - get - { - return _AlignmentSelectedIndex; - } - set - { - SetProperty(ref _AlignmentSelectedIndex, value); - if (0 <= _AlignmentSelectedIndex && _AlignmentSelectedIndex < Alignments.Result.Count) - { - SelectedAlignment = Alignments.Result[_AlignmentSelectedIndex]; - } - else - { - SelectedAlignment = null; - } - } - } - private AlignmentItem _SelectedAlignment = null; - public AlignmentItem SelectedAlignment - { - get - { - return _SelectedAlignment; - } - set - { - SetProperty(ref _SelectedAlignment, value); - //if (0 <= _AlignmentSelectedIndex && _AlignmentSelectedIndex < Alignments.Result.Count) - //{ - SelectedPlayerCharacter.Alignment = SelectedAlignment; - //} - } - } - public async Task> LoadAlignmentsAsync(string alignment = null) { using (var context = await StoreViewModel.GetLibraryContextAsync()) @@ -222,21 +185,21 @@ namespace AideDeJeu.ViewModels.PlayerCharacter { SetProperty(ref _SelectedBackground, value); OnPropertyChanged(nameof(PreferedBackground)); - NotifySelectedBackground = new NotifyTaskCompletion(Task.Run(() => LoadBackgroundAsync(_SelectedBackground))); - } - } - private NotifyTaskCompletion _NotifySelectedBackground = null; - public NotifyTaskCompletion NotifySelectedBackground - { - get - { - return _NotifySelectedBackground; - } - private set - { - SetProperty(ref _NotifySelectedBackground, value); + //NotifySelectedBackground = new NotifyTaskCompletion(Task.Run(() => LoadBackgroundAsync(_SelectedBackground))); } } + //private NotifyTaskCompletion _NotifySelectedBackground = null; + //public NotifyTaskCompletion NotifySelectedBackground + //{ + // get + // { + // return _NotifySelectedBackground; + // } + // private set + // { + // SetProperty(ref _NotifySelectedBackground, value); + // } + //} private async Task LoadBackgroundAsync(BackgroundItem background) { @@ -252,7 +215,7 @@ namespace AideDeJeu.ViewModels.PlayerCharacter { SubBackgrounds = await LoadSubBackgroundsAsync(background); SelectedSubBackground = null; - NotifySelectedSubBackground = new NotifyTaskCompletion(null); + //NotifySelectedSubBackground = new NotifyTaskCompletion(null); PersonalityTraits = await LoadPersonalityTraitsAsync(background); PersonalityIdeals = await LoadPersonalityIdealsAsync(background); PersonalityLinks = await LoadPersonalityLinksAsync(background); @@ -318,21 +281,21 @@ namespace AideDeJeu.ViewModels.PlayerCharacter { SetProperty(ref _SelectedSubBackground, value); OnPropertyChanged(nameof(PreferedBackground)); - NotifySelectedSubBackground = new NotifyTaskCompletion(Task.Run(() => LoadSubBackgroundAsync(SelectedSubBackground))); - } - } - private NotifyTaskCompletion _NotifySelectedSubBackground = null; - public NotifyTaskCompletion NotifySelectedSubBackground - { - get - { - return _NotifySelectedSubBackground; - } - private set - { - SetProperty(ref _NotifySelectedSubBackground, value); + //NotifySelectedSubBackground = new NotifyTaskCompletion(Task.Run(() => LoadSubBackgroundAsync(SelectedSubBackground))); } } + //private NotifyTaskCompletion _NotifySelectedSubBackground = null; + //public NotifyTaskCompletion NotifySelectedSubBackground + //{ + // get + // { + // return _NotifySelectedSubBackground; + // } + // private set + // { + // SetProperty(ref _NotifySelectedSubBackground, value); + // } + //} private async Task LoadSubBackgroundAsync(SubBackgroundItem subbackground) { diff --git a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml index e4b40306..b37f922d 100644 --- a/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml +++ b/AideDeJeu/AideDeJeu/Views/PlayerCharacter/PlayerCharacterEditorPage.xaml @@ -153,27 +153,27 @@ - + - + - + - + - + @@ -188,13 +188,13 @@ - + - + - + - + @@ -225,7 +225,7 @@ - +