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

Remove MahApps.Metro dependency

Browse Source
This commit is contained in:
Yoshi Askharoun
2024-05-16 21:11:35 -05:00
parent ecb6fb30a7
commit 2d11007aa5
3 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ZuneModdingHelper/AbstractUIGroupDialog.xaml
+19 -22
View File
@@ -1,14 +1,16 @@
<mah:MetroWindow x:Class="ZuneModdingHelper.AbstractUIGroupDialog"
<Window x:Class="ZuneModdingHelper.AbstractUIGroupDialog"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
xmlns:local="clr-namespace:ZuneModdingHelper"
xmlns:absui="clr-namespace:OwlCore.Wpf.AbstractUI.Controls;assembly=OwlCore.Wpf"
xmlns:mah="clr-namespace:MahApps.Metro.Controls;assembly=MahApps.Metro"
mc:Ignorable="d"
Title="Options" Height="450" Width="800"
WindowStyle="ToolWindow">
WindowStartupLocation="CenterOwner"
WindowStyle="ToolWindow"
Background="Black"
Foreground="White">
<Window.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
@@ -25,10 +27,10 @@
<ScrollViewer>
<absui:AbstractUIGroupPresenter x:Name="OptionsUIPresenter" ViewModel="{Binding}"
TemplateSelector="{StaticResource GroupTemplateSelector}"/>
TemplateSelector="{StaticResource GroupTemplateSelector}"/>
</ScrollViewer>
<Border Grid.Row="1" BorderThickness="0,1,0,0" BorderBrush="{StaticResource MahApps.Brushes.Control.Border}">
<Border Grid.Row="1" BorderThickness="0,1,0,0"><!--BorderBrush="{StaticResource MahApps.Brushes.Control.Border}"-->
<Grid>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
@@ -37,26 +39,21 @@
</Grid.ColumnDefinitions>
<Grid.Resources>
<Style x:Key="PrimaryButton" TargetType="Button" BasedOn="{StaticResource MahApps.Styles.Button.Dialogs.Accent}">
<Setter Property="Margin" Value="8"/>
<Style TargetType="Button" BasedOn="{StaticResource ActionButtonPinkStyle}">
<Setter Property="Margin" Value="0,12,14,12"/>
<Setter Property="Padding" Value="2"/>
<Setter Property="MinWidth" Value="75"/>
<Setter Property="HorizontalAlignment" Value="Right"/>
</Style>
<Style x:Key="SecondaryButton" TargetType="Button" BasedOn="{StaticResource MahApps.Styles.Button.Dialogs}">
<Setter Property="Margin" Value="8"/>
<Setter Property="Padding" Value="2"/>
<Setter Property="MinWidth" Value="75"/>
<Setter Property="MinWidth" Value="72"/>
<Setter Property="MinHeight" Value="24"/>
<Setter Property="HorizontalAlignment" Value="Right"/>
</Style>
</Grid.Resources>
<Button x:Name="OptionsUICancelButton" Content="Cancel" Click="OptionsUICancelButton_Click"
Grid.Column="1" Style="{StaticResource SecondaryButton}"/>
<Button x:Name="OptionsUINextButton" Content="Next" Click="OptionsUINextButton_Click"
Grid.Column="2" Style="{StaticResource PrimaryButton}"/>
<Button x:Name="OptionsUINextButton" Content="NEXT" Click="OptionsUINextButton_Click"
Grid.Column="1"/>
<Button x:Name="OptionsUICancelButton" Content="CANCEL" Click="OptionsUICancelButton_Click"
Grid.Column="2"/>
</Grid>
</Border>
</Grid>
</mah:MetroWindow>
</Window>
ZuneModdingHelper/AbstractUIGroupDialog.xaml.cs
+2 -4
View File
@@ -1,7 +1,5 @@
using MahApps.Metro.Controls;
using OwlCore.AbstractUI.Models;
using OwlCore.AbstractUI.Models;
using OwlCore.AbstractUI.ViewModels;
using OwlCore.Wpf.AbstractUI.Controls;
using System.Windows;
namespace ZuneModdingHelper
@@ -9,7 +7,7 @@ namespace ZuneModdingHelper
/// <summary>
/// Interaction logic for AbstractUIGroupDialog.xaml
/// </summary>
public partial class AbstractUIGroupDialog : MetroWindow
public partial class AbstractUIGroupDialog : Window
{
public AbstractUIGroupDialog(AbstractUICollectionViewModel viewModel)
{
ZuneModdingHelper/ZuneModdingHelper.csproj
-1
View File
@@ -21,7 +21,6 @@
<ItemGroup>
<PackageReference Include="Colourful" Version="3.2.0" />
<PackageReference Include="MahApps.Metro" Version="2.4.10" />
<PackageReference Include="Microsoft.Xaml.Behaviors.Wpf" Version="1.1.77" />
<PackageReference Include="Octokit" Version="11.0.1" />
<PackageReference Include="OwlCore" Version="0.4.1" />