diff --git a/Bloxstrap/ViewModels/BehaviourViewModel.cs b/Bloxstrap/ViewModels/BehaviourViewModel.cs index be4812e..86bb853 100644 --- a/Bloxstrap/ViewModels/BehaviourViewModel.cs +++ b/Bloxstrap/ViewModels/BehaviourViewModel.cs @@ -1,9 +1,4 @@ -using System.Collections.Generic; -using System.Linq; - -using Bloxstrap.Enums; - -namespace Bloxstrap.ViewModels +namespace Bloxstrap.ViewModels { public class BehaviourViewModel { @@ -24,19 +19,5 @@ namespace Bloxstrap.ViewModels get => App.Settings.Prop.MultiInstanceLaunching; set => App.Settings.Prop.MultiInstanceLaunching = value; } - - // todo - move to enum attributes? - public IReadOnlyDictionary ChannelChangeModes => new Dictionary - { - { "Change automatically", ChannelChangeMode.Automatic }, - { "Always prompt", ChannelChangeMode.Prompt }, - { "Never change", ChannelChangeMode.Ignore }, - }; - - public string SelectedChannelChangeMode - { - get => ChannelChangeModes.FirstOrDefault(x => x.Value == App.Settings.Prop.ChannelChangeMode).Key; - set => App.Settings.Prop.ChannelChangeMode = ChannelChangeModes[value]; - } } } diff --git a/Bloxstrap/ViewModels/InstallationViewModel.cs b/Bloxstrap/ViewModels/InstallationViewModel.cs index 7eca88e..d64607b 100644 --- a/Bloxstrap/ViewModels/InstallationViewModel.cs +++ b/Bloxstrap/ViewModels/InstallationViewModel.cs @@ -10,6 +10,7 @@ using System.Windows.Input; using CommunityToolkit.Mvvm.Input; +using Bloxstrap.Enums; using Bloxstrap.Models; namespace Bloxstrap.ViewModels @@ -117,5 +118,19 @@ namespace Bloxstrap.ViewModels // cant use data bindings so i have to do whatever tf this is public Visibility ChannelComboBoxVisibility => ManualChannelEntry ? Visibility.Collapsed : Visibility.Visible; public Visibility ChannelTextBoxVisibility => ManualChannelEntry ? Visibility.Visible : Visibility.Collapsed; + + // todo - move to enum attributes? + public IReadOnlyDictionary ChannelChangeModes => new Dictionary + { + { "Change automatically", ChannelChangeMode.Automatic }, + { "Always prompt", ChannelChangeMode.Prompt }, + { "Never change", ChannelChangeMode.Ignore }, + }; + + public string SelectedChannelChangeMode + { + get => ChannelChangeModes.FirstOrDefault(x => x.Value == App.Settings.Prop.ChannelChangeMode).Key; + set => App.Settings.Prop.ChannelChangeMode = ChannelChangeModes[value]; + } } } diff --git a/Bloxstrap/Views/Pages/BehaviourPage.xaml b/Bloxstrap/Views/Pages/BehaviourPage.xaml index 0ed442b..daaa9fe 100644 --- a/Bloxstrap/Views/Pages/BehaviourPage.xaml +++ b/Bloxstrap/Views/Pages/BehaviourPage.xaml @@ -40,14 +40,5 @@ - - - - - - - - - diff --git a/Bloxstrap/Views/Pages/InstallationPage.xaml b/Bloxstrap/Views/Pages/InstallationPage.xaml index ca4dc89..007f021 100644 --- a/Bloxstrap/Views/Pages/InstallationPage.xaml +++ b/Bloxstrap/Views/Pages/InstallationPage.xaml @@ -122,5 +122,14 @@ + + + + + + + + +