diff --git a/OwlCore.Wpf/AbstractUI/Controls/AbstractUIGroupItemTemplateSelector.cs b/OwlCore.Wpf/AbstractUI/Controls/AbstractUIGroupItemTemplateSelector.cs index 68b8759..4b8a9b1 100644 --- a/OwlCore.Wpf/AbstractUI/Controls/AbstractUIGroupItemTemplateSelector.cs +++ b/OwlCore.Wpf/AbstractUI/Controls/AbstractUIGroupItemTemplateSelector.cs @@ -1,7 +1,7 @@ using System.Windows; using System.Windows.Controls; using OwlCore.AbstractUI.ViewModels; -using Microsoft.Toolkit.Diagnostics; +using CommunityToolkit.Diagnostics; using OwlCore.AbstractUI.Models; using OwlCore.Wpf.Extensions; diff --git a/OwlCore.Wpf/AbstractUI/Themes/AbstractBooleanStyle.xaml b/OwlCore.Wpf/AbstractUI/Themes/AbstractBooleanStyle.xaml index 52b8052..7f6f7e1 100644 --- a/OwlCore.Wpf/AbstractUI/Themes/AbstractBooleanStyle.xaml +++ b/OwlCore.Wpf/AbstractUI/Themes/AbstractBooleanStyle.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Class="OwlCore.Wpf.AbstractUI.Themes.AbstractBooleanStyle" xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors" - xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore" + xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore.AbstractUI" xmlns:convertvis="clr-namespace:OwlCore.Wpf.Converters.Bools.Visible" xmlns:controls="clr-namespace:OwlCore.Wpf.AbstractUI.Controls"> diff --git a/OwlCore.Wpf/AbstractUI/Themes/AbstractButtonStyle.xaml b/OwlCore.Wpf/AbstractUI/Themes/AbstractButtonStyle.xaml index 5937971..9d518f0 100644 --- a/OwlCore.Wpf/AbstractUI/Themes/AbstractButtonStyle.xaml +++ b/OwlCore.Wpf/AbstractUI/Themes/AbstractButtonStyle.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Class="OwlCore.Wpf.AbstractUI.Themes.AbstractButtonStyle" xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors" - xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore" + xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore.AbstractUI" xmlns:convertvis="clr-namespace:OwlCore.Wpf.Converters.Bools.Visible" xmlns:controls="clr-namespace:OwlCore.Wpf.AbstractUI.Controls" xmlns:local="clr-namespace:OwlCore.Wpf.AbstractUI.Themes"> diff --git a/OwlCore.Wpf/AbstractUI/Themes/AbstractButtonTemplateSelector.cs b/OwlCore.Wpf/AbstractUI/Themes/AbstractButtonTemplateSelector.cs index 4e3fa01..82b80cc 100644 --- a/OwlCore.Wpf/AbstractUI/Themes/AbstractButtonTemplateSelector.cs +++ b/OwlCore.Wpf/AbstractUI/Themes/AbstractButtonTemplateSelector.cs @@ -1,12 +1,8 @@ using System; -using System.Collections.Generic; -using System.Text; using System.Windows; -using System.Windows.Controls; using OwlCore.AbstractUI.Models; using OwlCore.AbstractUI.ViewModels; -using Microsoft.Toolkit.Diagnostics; -using OwlCore.Wpf.AbstractUI.Controls; +using CommunityToolkit.Diagnostics; using System.Windows.Data; using System.Globalization; diff --git a/OwlCore.Wpf/AbstractUI/Themes/AbstractDataListStyle.xaml b/OwlCore.Wpf/AbstractUI/Themes/AbstractDataListStyle.xaml index b24b881..b5acc37 100644 --- a/OwlCore.Wpf/AbstractUI/Themes/AbstractDataListStyle.xaml +++ b/OwlCore.Wpf/AbstractUI/Themes/AbstractDataListStyle.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Class="OwlCore.Wpf.AbstractUI.Themes.AbstractDataListStyle" xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors" - xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore" + xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore.AbstractUI" xmlns:convertvis="clr-namespace:OwlCore.Wpf.Converters.Bools.Visible" xmlns:themes="clr-namespace:OwlCore.Wpf.AbstractUI.Themes" xmlns:controls="clr-namespace:OwlCore.Wpf.AbstractUI.Controls" diff --git a/OwlCore.Wpf/AbstractUI/Themes/AbstractDataListTypeTemplateSelector.cs b/OwlCore.Wpf/AbstractUI/Themes/AbstractDataListTypeTemplateSelector.cs index e4c983c..fb7e9d1 100644 --- a/OwlCore.Wpf/AbstractUI/Themes/AbstractDataListTypeTemplateSelector.cs +++ b/OwlCore.Wpf/AbstractUI/Themes/AbstractDataListTypeTemplateSelector.cs @@ -2,7 +2,7 @@ using System.Windows; using System.Windows.Controls; using OwlCore.AbstractUI.ViewModels; -using Microsoft.Toolkit.Diagnostics; +using CommunityToolkit.Diagnostics; using OwlCore.AbstractUI.Models; namespace OwlCore.Wpf.AbstractUI.Themes diff --git a/OwlCore.Wpf/AbstractUI/Themes/AbstractMultiChoiceTypeTemplateSelector.cs b/OwlCore.Wpf/AbstractUI/Themes/AbstractMultiChoiceTypeTemplateSelector.cs index 776b747..89b402c 100644 --- a/OwlCore.Wpf/AbstractUI/Themes/AbstractMultiChoiceTypeTemplateSelector.cs +++ b/OwlCore.Wpf/AbstractUI/Themes/AbstractMultiChoiceTypeTemplateSelector.cs @@ -2,7 +2,7 @@ using System.Windows; using System.Windows.Controls; using OwlCore.AbstractUI.ViewModels; -using Microsoft.Toolkit.Diagnostics; +using CommunityToolkit.Diagnostics; using OwlCore.AbstractUI.Models; namespace OwlCore.Wpf.AbstractUI.Themes diff --git a/OwlCore.Wpf/AbstractUI/Themes/AbstractMultiChoiceUIElementStyle.xaml b/OwlCore.Wpf/AbstractUI/Themes/AbstractMultiChoiceUIElementStyle.xaml index 92c5161..4acb958 100644 --- a/OwlCore.Wpf/AbstractUI/Themes/AbstractMultiChoiceUIElementStyle.xaml +++ b/OwlCore.Wpf/AbstractUI/Themes/AbstractMultiChoiceUIElementStyle.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Class="OwlCore.Wpf.AbstractUI.Themes.AbstractMultiChoiceUIElementStyle" xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors" - xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore" + xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore.AbstractUI" xmlns:convertvis="clr-namespace:OwlCore.Wpf.Converters.Bools.Visible" xmlns:controls="clr-namespace:OwlCore.Wpf.AbstractUI.Controls" xmlns:themes="clr-namespace:OwlCore.Wpf.AbstractUI.Themes"> diff --git a/OwlCore.Wpf/AbstractUI/Themes/AbstractProgressUIElementStyle.xaml b/OwlCore.Wpf/AbstractUI/Themes/AbstractProgressUIElementStyle.xaml index fbecf02..75833dd 100644 --- a/OwlCore.Wpf/AbstractUI/Themes/AbstractProgressUIElementStyle.xaml +++ b/OwlCore.Wpf/AbstractUI/Themes/AbstractProgressUIElementStyle.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Class="OwlCore.Wpf.AbstractUI.Themes.AbstractProgressUIElementStyle" xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors" - xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore" + xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore.AbstractUI" xmlns:convertvis="clr-namespace:OwlCore.Wpf.Converters.Bools.Visible" xmlns:controls="clr-namespace:OwlCore.Wpf.AbstractUI.Controls"> diff --git a/OwlCore.Wpf/AbstractUI/Themes/AbstractRichTextBlockStyle.xaml b/OwlCore.Wpf/AbstractUI/Themes/AbstractRichTextBlockStyle.xaml index b3a2701..4b1360a 100644 --- a/OwlCore.Wpf/AbstractUI/Themes/AbstractRichTextBlockStyle.xaml +++ b/OwlCore.Wpf/AbstractUI/Themes/AbstractRichTextBlockStyle.xaml @@ -2,7 +2,7 @@ xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Class="OwlCore.Wpf.AbstractUI.Themes.AbstractRichTextBlockStyle" - xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore" + xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore.AbstractUI" xmlns:controls="clr-namespace:OwlCore.Wpf.AbstractUI.Controls"> diff --git a/OwlCore.Wpf/AbstractUI/Themes/AbstractTextBoxStyle.xaml b/OwlCore.Wpf/AbstractUI/Themes/AbstractTextBoxStyle.xaml index 1d01f59..66151f7 100644 --- a/OwlCore.Wpf/AbstractUI/Themes/AbstractTextBoxStyle.xaml +++ b/OwlCore.Wpf/AbstractUI/Themes/AbstractTextBoxStyle.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Class="OwlCore.Wpf.AbstractUI.Themes.AbstractTextBoxStyle" xmlns:behaviors="http://schemas.microsoft.com/xaml/behaviors" - xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore" + xmlns:abstractUI="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore.AbstractUI" xmlns:convertvis="clr-namespace:OwlCore.Wpf.Converters.Bools.Visible" xmlns:controls="clr-namespace:OwlCore.Wpf.AbstractUI.Controls"> diff --git a/OwlCore.Wpf/AbstractUI/Themes/AbstractUIGroupPresenterStyle.xaml b/OwlCore.Wpf/AbstractUI/Themes/AbstractUIGroupPresenterStyle.xaml index dcb65fa..34d27c0 100644 --- a/OwlCore.Wpf/AbstractUI/Themes/AbstractUIGroupPresenterStyle.xaml +++ b/OwlCore.Wpf/AbstractUI/Themes/AbstractUIGroupPresenterStyle.xaml @@ -3,7 +3,7 @@ xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Class="OwlCore.Wpf.AbstractUI.Themes.AbstractUIGroupPresenterStyle" xmlns:controls="clr-namespace:OwlCore.Wpf.AbstractUI.Controls" - xmlns:abstractUIVm="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore" + xmlns:abstractUIVm="clr-namespace:OwlCore.AbstractUI.ViewModels;assembly=OwlCore.AbstractUI" xmlns:themes="clr-namespace:OwlCore.Wpf.AbstractUI.Themes" xmlns:convertvis="clr-namespace:OwlCore.Wpf.Converters.Bools.Visible"> diff --git a/OwlCore.Wpf/OwlCore.Wpf.csproj b/OwlCore.Wpf/OwlCore.Wpf.csproj index c555fad..682e9ce 100644 --- a/OwlCore.Wpf/OwlCore.Wpf.csproj +++ b/OwlCore.Wpf/OwlCore.Wpf.csproj @@ -7,13 +7,14 @@ - - - + + + + - + diff --git a/ZuneModCore/Mods/BackgroundImageMod.cs b/ZuneModCore/Mods/BackgroundImageMod.cs index e8df83d..fe37011 100644 --- a/ZuneModCore/Mods/BackgroundImageMod.cs +++ b/ZuneModCore/Mods/BackgroundImageMod.cs @@ -3,7 +3,6 @@ using System; using System.Collections.Generic; using System.Diagnostics; using System.IO; -using System.Reflection; using System.Threading.Tasks; using Vestris.ResourceLib; using ZuneModCore.Win32; @@ -22,21 +21,19 @@ namespace ZuneModCore.Mods public override AbstractUICollection? GetDefaultOptionsUI() { - return new(nameof(BackgroundImageMod)) + AbstractUICollection optionsUi = new(nameof(BackgroundImageMod)) { - Title = "Select background image:", - Items = new List - { - new AbstractTextBox("fileBox", Environment.GetFolderPath(Environment.SpecialFolder.MyPictures)), - } + new AbstractTextBox("fileBox", Environment.GetFolderPath(Environment.SpecialFolder.MyPictures)), }; + optionsUi.Title = "Select background image:"; + return optionsUi; } public override IReadOnlyList? DependentMods => null; public override async Task Apply() { - string bgimgPath = ((AbstractTextBox)OptionsUI!.Items[0]).Value; + string bgimgPath = ((AbstractTextBox)OptionsUI![0]).Value; FileInfo bgimgInfo = new(bgimgPath); if (!bgimgInfo.Exists) { diff --git a/ZuneModCore/Mods/FeaturesOverrideMod.cs b/ZuneModCore/Mods/FeaturesOverrideMod.cs index 72e5542..293d37a 100644 --- a/ZuneModCore/Mods/FeaturesOverrideMod.cs +++ b/ZuneModCore/Mods/FeaturesOverrideMod.cs @@ -21,46 +21,44 @@ namespace ZuneModCore.Mods public override AbstractUICollection? GetDefaultOptionsUI() { - return new(nameof(FeaturesOverrideMod)) + AbstractUICollection optionsUi = new(nameof(FeaturesOverrideMod)) { - Title = "Select features:", - Items = new List - { - // We don't know what some of these overrides do exactly, so hide them from the user. - // The ID is the name of the registry key, the label is the display name + // We don't know what some of these overrides do exactly, so hide them from the user. + // The ID is the name of the registry key, the label is the display name - new AbstractBoolean("Apps", "Apps"), - new AbstractBoolean("Art", "Art"), - new AbstractBoolean("Channels", "Channels"), - new AbstractBoolean("FirstLaunchIntroVideo", "First Launch Intro Video"), - new AbstractBoolean("Games", "Games"), - new AbstractBoolean("Marketplace", "Marketplace"), - new AbstractBoolean("MBRPreview", "[Marketplace] Media Preview"), - new AbstractBoolean("MBRPurchase", "[Marketplace] Media Purchase"), - new AbstractBoolean("MBRRental", "[Marketplace] Media Rental"), - new AbstractBoolean("Music", "Music"), - new AbstractBoolean("MusicVideos", "Music Videos"), - new AbstractBoolean("Nowplaying", "Now Playing"), - new AbstractBoolean("NowplayingArt", "Now Playing Art"), - new AbstractBoolean("Picks", "Picks"), - new AbstractBoolean("Podcasts", "Podcasts"), - new AbstractBoolean("QuickMixLocal", "Quick Mix (Local)"), - new AbstractBoolean("QuickMixZMP", "Quick Mix (ZMP)"), - new AbstractBoolean("Quickplay", "Quickplay"), - new AbstractBoolean("Sign In Available", "Sign In"), - new AbstractBoolean("Social", "Social"), - new AbstractBoolean("SocialMarketplace", "Social Marketplace"), - new AbstractBoolean("SubscriptionFreeTracks", "Subscription Free Tracks"), - new AbstractBoolean("Videos", "Videos"), - } + new AbstractBoolean("Apps", "Apps"), + new AbstractBoolean("Art", "Art"), + new AbstractBoolean("Channels", "Channels"), + new AbstractBoolean("FirstLaunchIntroVideo", "First Launch Intro Video"), + new AbstractBoolean("Games", "Games"), + new AbstractBoolean("Marketplace", "Marketplace"), + new AbstractBoolean("MBRPreview", "[Marketplace] Media Preview"), + new AbstractBoolean("MBRPurchase", "[Marketplace] Media Purchase"), + new AbstractBoolean("MBRRental", "[Marketplace] Media Rental"), + new AbstractBoolean("Music", "Music"), + new AbstractBoolean("MusicVideos", "Music Videos"), + new AbstractBoolean("Nowplaying", "Now Playing"), + new AbstractBoolean("NowplayingArt", "Now Playing Art"), + new AbstractBoolean("Picks", "Picks"), + new AbstractBoolean("Podcasts", "Podcasts"), + new AbstractBoolean("QuickMixLocal", "Quick Mix (Local)"), + new AbstractBoolean("QuickMixZMP", "Quick Mix (ZMP)"), + new AbstractBoolean("Quickplay", "Quickplay"), + new AbstractBoolean("Sign In Available", "Sign In"), + new AbstractBoolean("Social", "Social"), + new AbstractBoolean("SocialMarketplace", "Social Marketplace"), + new AbstractBoolean("SubscriptionFreeTracks", "Subscription Free Tracks"), + new AbstractBoolean("Videos", "Videos"), }; + optionsUi.Title = "Select features:"; + return optionsUi; } public override IReadOnlyList? DependentMods => null; public override Task Init() { - foreach (AbstractUIElement uiElem in OptionsUI.Items) + foreach (AbstractUIElement uiElem in OptionsUI!) { if (uiElem is AbstractBoolean boolElem) { @@ -77,7 +75,7 @@ namespace ZuneModCore.Mods public async Task Apply(bool applyAll = false) { // Use user choices from AbstractUI - foreach (AbstractUIElement uiElem in OptionsUI!.Items) + foreach (AbstractUIElement uiElem in OptionsUI!) { if (uiElem is AbstractBoolean boolElem && (boolElem.State || applyAll)) { diff --git a/ZuneModCore/Mods/MbidLocatorMod.cs b/ZuneModCore/Mods/MbidLocatorMod.cs index 4717e26..630b2e6 100644 --- a/ZuneModCore/Mods/MbidLocatorMod.cs +++ b/ZuneModCore/Mods/MbidLocatorMod.cs @@ -31,15 +31,13 @@ namespace ZuneModCore.Mods public override AbstractUICollection? GetDefaultOptionsUI() { - return new(nameof(MbidLocatorMod)) + AbstractUICollection optionsUi = new(nameof(MbidLocatorMod)) { - Title = "Select music folder:", - Items = new List - { - new AbstractTextBox("folderBox", Environment.GetFolderPath(Environment.SpecialFolder.MyMusic)), - new AbstractBoolean("recursiveBox", "Search recursively") - } + new AbstractTextBox("folderBox", Environment.GetFolderPath(Environment.SpecialFolder.MyMusic)), + new AbstractBoolean("recursiveBox", "Search recursively") }; + optionsUi.Title = "Select music folder:"; + return optionsUi; } public override IReadOnlyList? DependentMods => null; @@ -47,8 +45,8 @@ namespace ZuneModCore.Mods public override async Task Apply() { // Use user choices from AbstractUI - string folderPath = ((AbstractTextBox)OptionsUI!.Items[0]).Value; - bool recursive = ((AbstractBoolean)OptionsUI.Items[1]).State; + string folderPath = ((AbstractTextBox)OptionsUI![0]).Value; + bool recursive = ((AbstractBoolean)OptionsUI[1]).State; string errorString = string.Empty; // Verify that the folder exists diff --git a/ZuneModCore/Mods/WebservicesMod.cs b/ZuneModCore/Mods/WebservicesMod.cs index 4513915..ace7e6c 100644 --- a/ZuneModCore/Mods/WebservicesMod.cs +++ b/ZuneModCore/Mods/WebservicesMod.cs @@ -1,5 +1,4 @@ -using OwlCore; -using OwlCore.AbstractUI.Models; +using OwlCore.AbstractUI.Models; using System; using System.Collections.Generic; using System.IO; @@ -32,39 +31,37 @@ namespace ZuneModCore.Mods public override AbstractUICollection? GetDefaultOptionsUI() { - return new(nameof(FeaturesOverrideMod)) + AbstractUICollection optionsUi = new(nameof(FeaturesOverrideMod)) { - Title = string.Empty, - Items = new List + new AbstractTextBox("hostBox", string.Empty, "zune.net") { - new AbstractTextBox("hostBox", string.Empty, "zune.net") + Title = "Host", + TooltipText = "The host where the replacement servers are located. Must be the same length as \"zune.net\"." + }, + new AbstractDataList("hostsTest", new List() { - Title = "Host", - TooltipText = "The host where the replacement servers are located. Must be the same length as \"zune.net\"." - }, - new AbstractDataList("hostsTest", new List() - { - GetWebserviceAvailabilityUI("Main website", "www"), - GetWebserviceAvailabilityUI("Social website", "social"), - GetWebserviceAvailabilityUI("Catalog", "catalog"), - GetWebserviceAvailabilityUI("Image catalog", "image.catalog"), - GetWebserviceAvailabilityUI("Social", "socialapi"), - GetWebserviceAvailabilityUI("Social [Comments]", "comments"), - GetWebserviceAvailabilityUI("Social [Inbox]", "inbox"), - GetWebserviceAvailabilityUI("Commerce [Sign in]", "commerce"), - GetWebserviceAvailabilityUI("Mix", "mix"), - GetWebserviceAvailabilityUI("Resources [Firmware]", "resources"), - GetWebserviceAvailabilityUI("Statistics", "stats"), - } - ) - { - Title = "Availability", - Subtitle = "Tests availability of each known web service on the new host.", - IsUserEditingEnabled = false, - PreferredDisplayMode = AbstractDataListPreferredDisplayMode.Grid, + GetWebserviceAvailabilityUI("Main website", "www"), + GetWebserviceAvailabilityUI("Social website", "social"), + GetWebserviceAvailabilityUI("Catalog", "catalog"), + GetWebserviceAvailabilityUI("Image catalog", "image.catalog"), + GetWebserviceAvailabilityUI("Social", "socialapi"), + GetWebserviceAvailabilityUI("Social [Comments]", "comments"), + GetWebserviceAvailabilityUI("Social [Inbox]", "inbox"), + GetWebserviceAvailabilityUI("Commerce [Sign in]", "commerce"), + GetWebserviceAvailabilityUI("Mix", "mix"), + GetWebserviceAvailabilityUI("Resources [Firmware]", "resources"), + GetWebserviceAvailabilityUI("Statistics", "stats"), } + ) + { + Title = "Availability", + Subtitle = "Tests availability of each known web service on the new host.", + IsUserEditingEnabled = false, + PreferredDisplayMode = AbstractDataListPreferredDisplayMode.Grid, } }; + optionsUi.Title = string.Empty; + return optionsUi; } private static AbstractUIMetadata GetWebserviceAvailabilityUI(string name, string subDomain) @@ -80,7 +77,7 @@ namespace ZuneModCore.Mods public override Task Init() { - AbstractTextBox newHostBox = (AbstractTextBox)OptionsUI!.Items[0]; + AbstractTextBox newHostBox = (AbstractTextBox)OptionsUI![0]; newHostBox.ValueChanged += OnHostChanged; newHostBox.Value = "zunes.me"; @@ -120,7 +117,7 @@ namespace ZuneModCore.Mods // Get and validate replacement host string oldHost = "zune.net"; - string newHost = ((AbstractTextBox)OptionsUI!.Items[0]).Value; + string newHost = ((AbstractTextBox)OptionsUI![0]).Value; if (newHost.Length != oldHost.Length) { return $"The new host (\"{newHost}\") must have the same length as \"{oldHost}\"."; @@ -225,7 +222,7 @@ namespace ZuneModCore.Mods async void OnHostChanged(object? sender, string newHost) { - AbstractDataList list = (AbstractDataList)OptionsUI!.Items[1]; + AbstractDataList list = (AbstractDataList)OptionsUI![1]; // Reset all statuses foreach (AbstractUIMetadata metadata in list.Items) diff --git a/ZuneModCore/ZuneModCore.csproj b/ZuneModCore/ZuneModCore.csproj index c68bc17..e30c125 100644 --- a/ZuneModCore/ZuneModCore.csproj +++ b/ZuneModCore/ZuneModCore.csproj @@ -10,11 +10,12 @@ - + + - - - + + + diff --git a/ZuneModdingHelper/ZuneModdingHelper.csproj b/ZuneModdingHelper/ZuneModdingHelper.csproj index 4652d03..602a52c 100644 --- a/ZuneModdingHelper/ZuneModdingHelper.csproj +++ b/ZuneModdingHelper/ZuneModdingHelper.csproj @@ -20,14 +20,14 @@ - - - - - - - - + + + + + + + +