From 2f49e85227fc7046d0fcc29607428e9caf3acf8e Mon Sep 17 00:00:00 2001 From: Glen M Date: Thu, 6 Dec 2018 10:15:46 -0500 Subject: [PATCH] Add a DisableDropSound indicator. (#118) * Add a DisableDropSound indicator. * Improve the DisableDropSound indicator tooltip. --- .../DisabledDefaultSoundConverter.cs | 31 +++++++++ .../DisabledDefaultSoundTooltipConverter.cs | 38 +++++++++++ Filtration/Filtration.csproj | 5 +- Filtration/Resources/Icons/sound.png | Bin 0 -> 3512 bytes Filtration/Resources/Icons/sound_dds.png | Bin 0 -> 3747 bytes .../DesignTimeItemFilterBlockViewModel.cs | 1 + .../ViewModels/ItemFilterBlockViewModel.cs | 3 + Filtration/Views/IconsDictionary.xaml | 3 +- Filtration/Views/ItemFilterBlockView.xaml | 59 +++++++++++------- 9 files changed, 116 insertions(+), 24 deletions(-) create mode 100644 Filtration/Converters/DisabledDefaultSoundConverter.cs create mode 100644 Filtration/Converters/DisabledDefaultSoundTooltipConverter.cs create mode 100644 Filtration/Resources/Icons/sound.png create mode 100644 Filtration/Resources/Icons/sound_dds.png diff --git a/Filtration/Converters/DisabledDefaultSoundConverter.cs b/Filtration/Converters/DisabledDefaultSoundConverter.cs new file mode 100644 index 0000000..e530c86 --- /dev/null +++ b/Filtration/Converters/DisabledDefaultSoundConverter.cs @@ -0,0 +1,31 @@ +using System; +using System.Globalization; +using System.Windows.Data; +using System.Windows.Media.Imaging; + +namespace Filtration.Converters +{ + public class DisabledDefaultSoundConverter : IValueConverter + { + private static readonly BitmapImage _soundIcon; + private static readonly BitmapImage _soundDDSIcon; + + static DisabledDefaultSoundConverter() + { + var soundUri = new Uri("pack://application:,,,/Filtration;component/Resources/Icons/sound.png", UriKind.Absolute); + var soundDDSUri = new Uri("pack://application:,,,/Filtration;component/Resources/Icons/sound_dds.png", UriKind.Absolute); + _soundIcon = new BitmapImage(soundUri); + _soundDDSIcon = new BitmapImage(soundDDSUri); + } + + public object Convert(object value, Type targetType, object parameter, CultureInfo culture) + { + return (bool)value ? _soundDDSIcon : _soundIcon; + } + + public object ConvertBack(object value, Type targetType, object parameter, CultureInfo culture) + { + return ReferenceEquals(value, _soundDDSIcon); + } + } +} diff --git a/Filtration/Converters/DisabledDefaultSoundTooltipConverter.cs b/Filtration/Converters/DisabledDefaultSoundTooltipConverter.cs new file mode 100644 index 0000000..caf72a4 --- /dev/null +++ b/Filtration/Converters/DisabledDefaultSoundTooltipConverter.cs @@ -0,0 +1,38 @@ +using System; +using System.Globalization; +using System.Windows; +using System.Windows.Data; + +namespace Filtration.Converters +{ + class DisabledDefaultSoundTooltipConverter : IMultiValueConverter + { + private static readonly string appendage = "\nNote: the default drop sound is disabled for this block."; + + public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture) + { + if (values[0] == DependencyProperty.UnsetValue || + values[1] == DependencyProperty.UnsetValue) + { + return string.Empty; + } + + var baseText = (string)(values[0]); + var hasDisabledDefaultSound = (bool)(values[1]); + + if (hasDisabledDefaultSound) + { + return $"{baseText}{appendage}"; + } + else + { + return baseText; + } + } + + public object[] ConvertBack(object value, Type[] targetType, object parameter, CultureInfo culture) + { + throw new NotImplementedException(); + } + } +} diff --git a/Filtration/Filtration.csproj b/Filtration/Filtration.csproj index 0a74b8a..3b30c9d 100644 --- a/Filtration/Filtration.csproj +++ b/Filtration/Filtration.csproj @@ -210,6 +210,8 @@ + + @@ -460,6 +462,7 @@ Settings.settings True + @@ -504,7 +507,7 @@ - + diff --git a/Filtration/Resources/Icons/sound.png b/Filtration/Resources/Icons/sound.png new file mode 100644 index 0000000000000000000000000000000000000000..53959cbf75b669f1f06397ebb459d3a2bc96a51d GIT binary patch literal 3512 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 N002ovPDHLkV1mB!1snhX literal 0 HcmV?d00001 diff --git a/Filtration/ViewModels/DesignTime/DesignTimeItemFilterBlockViewModel.cs b/Filtration/ViewModels/DesignTime/DesignTimeItemFilterBlockViewModel.cs index 5b6ff39..817a01d 100644 --- a/Filtration/ViewModels/DesignTime/DesignTimeItemFilterBlockViewModel.cs +++ b/Filtration/ViewModels/DesignTime/DesignTimeItemFilterBlockViewModel.cs @@ -150,6 +150,7 @@ namespace Filtration.ViewModels.DesignTime public bool HasSound { get; } public bool HasPositionalSound { get; } public bool HasCustomSound { get; } + public bool HasDisabledDefaultSound { get; } public bool HasAudioVisualBlockItems { get; } public void RefreshBlockPreview() { diff --git a/Filtration/ViewModels/ItemFilterBlockViewModel.cs b/Filtration/ViewModels/ItemFilterBlockViewModel.cs index 5403e5f..7fb9983 100644 --- a/Filtration/ViewModels/ItemFilterBlockViewModel.cs +++ b/Filtration/ViewModels/ItemFilterBlockViewModel.cs @@ -65,6 +65,7 @@ namespace Filtration.ViewModels bool HasSound { get; } bool HasPositionalSound { get; } bool HasCustomSound { get; } + bool HasDisabledDefaultSound { get; } bool HasAudioVisualBlockItems { get; } void RefreshBlockPreview(); } @@ -287,6 +288,7 @@ namespace Filtration.ViewModels public bool HasSound => Block.HasBlockItemOfType(); public bool HasPositionalSound => Block.HasBlockItemOfType(); public bool HasCustomSound => Block.HasBlockItemOfType(); + public bool HasDisabledDefaultSound => Block.HasBlockItemOfType(); public bool HasAudioVisualBlockItems => AudioVisualBlockItems.Any(); @@ -526,6 +528,7 @@ namespace Filtration.ViewModels RaisePropertyChanged(nameof(HasSound)); RaisePropertyChanged(nameof(HasPositionalSound)); RaisePropertyChanged(nameof(HasCustomSound)); + RaisePropertyChanged(nameof(HasDisabledDefaultSound)); } private void OnBlockItemsCollectionChanged(object sender, NotifyCollectionChangedEventArgs e) diff --git a/Filtration/Views/IconsDictionary.xaml b/Filtration/Views/IconsDictionary.xaml index 99b4398..1f678e0 100644 --- a/Filtration/Views/IconsDictionary.xaml +++ b/Filtration/Views/IconsDictionary.xaml @@ -11,7 +11,6 @@ - @@ -37,4 +36,4 @@ - \ No newline at end of file + diff --git a/Filtration/Views/ItemFilterBlockView.xaml b/Filtration/Views/ItemFilterBlockView.xaml index 5b84db6..ab0bdb4 100644 --- a/Filtration/Views/ItemFilterBlockView.xaml +++ b/Filtration/Views/ItemFilterBlockView.xaml @@ -1,7 +1,7 @@  @@ -18,6 +18,8 @@ + +