zune/ZuneModdingHelper
0
0
Fork 0
mirror of https://github.com/ZuneDev/ZuneModdingHelper.git synced 2026-07-27 13:12:21 -07:00
Code Issues Packages Projects Releases Wiki Activity

Update packages

Browse Source
This commit is contained in:
Yoshi Askharoun
2024-03-12 17:06:06 -05:00
parent dafecd86da
commit f1d3b58682
19 changed files with 101 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OwlCore.Wpf/AbstractUI/Controls/AbstractUIGroupItemTemplateSelector.cs
+1 -1
View File
@@ -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;
OwlCore.Wpf/AbstractUI/Themes/AbstractBooleanStyle.xaml
+1 -1
View File
@@ -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">
OwlCore.Wpf/AbstractUI/Themes/AbstractButtonStyle.xaml
+1 -1
View File
@@ -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">
OwlCore.Wpf/AbstractUI/Themes/AbstractButtonTemplateSelector.cs
+1 -5
View File
@@ -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;
OwlCore.Wpf/AbstractUI/Themes/AbstractDataListStyle.xaml
+1 -1
View File
@@ -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"
OwlCore.Wpf/AbstractUI/Themes/AbstractDataListTypeTemplateSelector.cs
+1 -1
View File
@@ -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
OwlCore.Wpf/AbstractUI/Themes/AbstractMultiChoiceTypeTemplateSelector.cs
+1 -1
View File
@@ -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
OwlCore.Wpf/AbstractUI/Themes/AbstractMultiChoiceUIElementStyle.xaml
+1 -1
View File
@@ -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">
OwlCore.Wpf/AbstractUI/Themes/AbstractProgressUIElementStyle.xaml
+1 -1
View File
@@ -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">
OwlCore.Wpf/AbstractUI/Themes/AbstractRichTextBlockStyle.xaml
+1 -1
View File
@@ -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">
<ResourceDictionary.MergedDictionaries>
OwlCore.Wpf/AbstractUI/Themes/AbstractTextBoxStyle.xaml
+1 -1
View File
@@ -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">
OwlCore.Wpf/AbstractUI/Themes/AbstractUIGroupPresenterStyle.xaml
+1 -1
View File
@@ -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">
OwlCore.Wpf/OwlCore.Wpf.csproj
+4 -3
View File
@@ -7,9 +7,10 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="CommunityToolkit.Diagnostics" Version="7.1.2" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
<PackageReference Include="OwlCore" Version="0.0.43" />
<PackageReference Include="CommunityToolkit.Diagnostics" Version="8.2.2" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
<PackageReference Include="OwlCore" Version="0.4.1" />
<PackageReference Include="OwlCore.AbstractUI" Version="0.0.0" />
</ItemGroup>
<ItemGroup>
ZuneModCore/Mods/BackgroundImageMod.cs
+4 -7
View File
@@ -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))
{
Title = "Select background image:",
Items = new List<AbstractUIElement>
AbstractUICollection optionsUi = new(nameof(BackgroundImageMod))
{
new AbstractTextBox("fileBox", Environment.GetFolderPath(Environment.SpecialFolder.MyPictures)),
}
};
optionsUi.Title = "Select background image:";
return optionsUi;
}
public override IReadOnlyList<Type>? DependentMods => null;
public override async Task<string?> Apply()
{
string bgimgPath = ((AbstractTextBox)OptionsUI!.Items[0]).Value;
string bgimgPath = ((AbstractTextBox)OptionsUI![0]).Value;
FileInfo bgimgInfo = new(bgimgPath);
if (!bgimgInfo.Exists)
{
ZuneModCore/Mods/FeaturesOverrideMod.cs
+5 -7
View File
@@ -21,10 +21,7 @@ namespace ZuneModCore.Mods
public override AbstractUICollection? GetDefaultOptionsUI()
{
return new(nameof(FeaturesOverrideMod))
{
Title = "Select features:",
Items = new List<AbstractUIElement>
AbstractUICollection optionsUi = new(nameof(FeaturesOverrideMod))
{
// 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
@@ -52,15 +49,16 @@ namespace ZuneModCore.Mods
new AbstractBoolean("SocialMarketplace", "Social Marketplace"),
new AbstractBoolean("SubscriptionFreeTracks", "Subscription Free Tracks"),
new AbstractBoolean("Videos", "Videos"),
}
};
optionsUi.Title = "Select features:";
return optionsUi;
}
public override IReadOnlyList<Type>? 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<string?> 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))
{
ZuneModCore/Mods/MbidLocatorMod.cs
+5 -7
View File
@@ -31,15 +31,13 @@ namespace ZuneModCore.Mods
public override AbstractUICollection? GetDefaultOptionsUI()
{
return new(nameof(MbidLocatorMod))
{
Title = "Select music folder:",
Items = new List<AbstractUIElement>
AbstractUICollection optionsUi = new(nameof(MbidLocatorMod))
{
new AbstractTextBox("folderBox", Environment.GetFolderPath(Environment.SpecialFolder.MyMusic)),
new AbstractBoolean("recursiveBox", "Search recursively")
}
};
optionsUi.Title = "Select music folder:";
return optionsUi;
}
public override IReadOnlyList<Type>? DependentMods => null;
@@ -47,8 +45,8 @@ namespace ZuneModCore.Mods
public override async Task<string?> 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
ZuneModCore/Mods/WebservicesMod.cs
+7 -10
View File
@@ -1,5 +1,4 @@
using OwlCore;
using OwlCore.AbstractUI.Models;
using OwlCore.AbstractUI.Models;
using System;
using System.Collections.Generic;
using System.IO;
@@ -32,10 +31,7 @@ namespace ZuneModCore.Mods
public override AbstractUICollection? GetDefaultOptionsUI()
{
return new(nameof(FeaturesOverrideMod))
{
Title = string.Empty,
Items = new List<AbstractUIElement>
AbstractUICollection optionsUi = new(nameof(FeaturesOverrideMod))
{
new AbstractTextBox("hostBox", string.Empty, "zune.net")
{
@@ -63,8 +59,9 @@ namespace ZuneModCore.Mods
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)
ZuneModCore/ZuneModCore.csproj
+5 -4
View File
@@ -10,11 +10,12 @@
<ItemGroup>
<PackageReference Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageReference Include="OwlCore" Version="0.0.43" />
<PackageReference Include="OwlCore" Version="0.4.1" />
<PackageReference Include="OwlCore.AbstractUI" Version="0.0.0" />
<PackageReference Include="System.IO.FileSystem.AccessControl" Version="5.0.0" />
<PackageReference Include="TagLibSharp" Version="2.2.0" />
<PackageReference Include="Vanara.PInvoke.Kernel32" Version="3.4.6" />
<PackageReference Include="Vanara.PInvoke.Security" Version="3.4.6" />
<PackageReference Include="TagLibSharp" Version="2.3.0" />
<PackageReference Include="Vanara.PInvoke.Kernel32" Version="3.4.17" />
<PackageReference Include="Vanara.PInvoke.Security" Version="3.4.17" />
<PackageReference Include="Vestris.ResourceLib" Version="2.1.0" />
</ItemGroup>
ZuneModdingHelper/ZuneModdingHelper.csproj
+8 -8
View File
@@ -20,14 +20,14 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Flurl.Http" Version="3.2.0" />
<PackageReference Include="MahApps.Metro" Version="2.4.9" />
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="4.4.0" />
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="4.4.0" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.39" />
<PackageReference Include="OwlCore" Version="0.0.43" />
<PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.4" />
<PackageReference Include="Syroot.Windows.IO.KnownFolders" Version="1.2.3" />
<PackageReference Include="Flurl.Http" Version="4.0.2" />
<PackageReference Include="MahApps.Metro" Version="2.4.10" />
<PackageReference Include="Microsoft.AppCenter.Analytics" Version="5.0.3" />
<PackageReference Include="Microsoft.AppCenter.Crashes" Version="5.0.3" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
<PackageReference Include="OwlCore" Version="0.4.1" />
<PackageReference Include="Microsoft-WindowsAPICodePack-Shell" Version="1.1.5" />
<PackageReference Include="Syroot.Windows.IO.KnownFolders" Version="1.3.0" />
</ItemGroup>
<ItemGroup>