diff --git a/Source/AppScaffolding/LibationScaffolding.cs b/Source/AppScaffolding/LibationScaffolding.cs index 50d59ffd..1f08aedd 100644 --- a/Source/AppScaffolding/LibationScaffolding.cs +++ b/Source/AppScaffolding/LibationScaffolding.cs @@ -5,6 +5,7 @@ using System.Linq; using System.Reflection; using ApplicationServices; using AudibleUtilities; +using Dinah.Core.Collections.Generic; using Dinah.Core.IO; using Dinah.Core.Logging; using LibationFileManager; @@ -23,6 +24,9 @@ namespace AppScaffolding MacOSAvalonia } + // I know I'm taking the wine metaphor a bit far by naming this "Variety", but I don't know what else to call it + public enum VarietyType { None, Classic, Chardonnay } + public static class LibationScaffolding { public static bool IsWindows { get; } = OperatingSystem.IsWindows(); @@ -30,6 +34,10 @@ namespace AppScaffolding public static bool IsMacOs { get; } = OperatingSystem.IsMacOS(); public static ReleaseIdentifier ReleaseIdentifier { get; private set; } + public static VarietyType Variety + => ReleaseIdentifier == ReleaseIdentifier.WindowsClassic ? VarietyType.Classic + : ReleaseIdentifier.In(ReleaseIdentifier.WindowsAvalonia, ReleaseIdentifier.LinuxAvalonia, ReleaseIdentifier.MacOSAvalonia) ? VarietyType.Chardonnay + : VarietyType.None; public static void SetReleaseIdentifier(ReleaseIdentifier releaseID) => ReleaseIdentifier = releaseID; diff --git a/Source/LibationAvalonia/Views/MainWindow/MainWindow.Settings.axaml.cs b/Source/LibationAvalonia/Views/MainWindow/MainWindow.Settings.axaml.cs index 1b707922..296def23 100644 --- a/Source/LibationAvalonia/Views/MainWindow/MainWindow.Settings.axaml.cs +++ b/Source/LibationAvalonia/Views/MainWindow/MainWindow.Settings.axaml.cs @@ -15,6 +15,6 @@ namespace LibationAvalonia.Views => await new Dialogs.SettingsDialog().ShowDialog(this); public async void aboutToolStripMenuItem_Click(object sender, Avalonia.Interactivity.RoutedEventArgs e) - => await MessageBox.Show($"Running Libation version {AppScaffolding.LibationScaffolding.BuildVersion}", $"Libation v{AppScaffolding.LibationScaffolding.BuildVersion}"); + => await MessageBox.Show($"Libation {AppScaffolding.LibationScaffolding.Variety}{Environment.NewLine}Version {AppScaffolding.LibationScaffolding.BuildVersion}", $"Libation v{AppScaffolding.LibationScaffolding.BuildVersion}"); } } diff --git a/Source/LibationWinForms/Form1.Settings.cs b/Source/LibationWinForms/Form1.Settings.cs index 9bee9b4c..7b453008 100644 --- a/Source/LibationWinForms/Form1.Settings.cs +++ b/Source/LibationWinForms/Form1.Settings.cs @@ -13,6 +13,6 @@ namespace LibationWinForms private void basicSettingsToolStripMenuItem_Click(object sender, EventArgs e) => new SettingsDialog().ShowDialog(); private void aboutToolStripMenuItem_Click(object sender, EventArgs e) - => MessageBox.Show($"Running Libation version {AppScaffolding.LibationScaffolding.BuildVersion}", $"Libation v{AppScaffolding.LibationScaffolding.BuildVersion}"); + => MessageBox.Show($"Libation {AppScaffolding.LibationScaffolding.Variety}{Environment.NewLine}Version {AppScaffolding.LibationScaffolding.BuildVersion}", $"Libation v{AppScaffolding.LibationScaffolding.BuildVersion}"); } }