cleanup and formatting

This commit is contained in:
Jack Baron 2020-02-17 01:57:58 +00:00
parent 2826ca6002
commit 719f98d5f1
No known key found for this signature in database
GPG key ID: CD10BCEEC646C064
20 changed files with 214 additions and 220 deletions

View file

@ -5,8 +5,6 @@ using System.Windows;
using System.IO;
using System.Windows.Media;
using ModAssistant.Pages;
using System.Xml;
using System.Windows.Markup;
using System.Reflection;
using Microsoft.Win32;
@ -183,7 +181,7 @@ namespace ModAssistant
{
dictionary.Source = uri;
}
catch(Exception ex)
catch (Exception ex)
{
MessageBox.Show($"Could not load {name}.\n\n{ex.Message}\n\nIgnoring...");
return null;

View file

@ -11,66 +11,66 @@
Title="{DynamicResource About:Title}">
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
</Grid.RowDefinitions>
</Grid.RowDefinitions>
<TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" FontSize="24" Margin="0" Text="{DynamicResource About:PageTitle}" />
<TextBlock Grid.Row="1" TextWrapping="Wrap" Margin="0,5" FontSize="16" Text="{DynamicResource About:List:Header}" >
<TextBlock VerticalAlignment="Top" HorizontalAlignment="Left" FontSize="24" Margin="0" Text="{DynamicResource About:PageTitle}" />
<TextBlock Grid.Row="1" TextWrapping="Wrap" Margin="0,5" FontSize="16" Text="{DynamicResource About:List:Header}" >
</TextBlock>
<TextBlock Grid.Row="2" Margin="15,5" FontSize="16">
</TextBlock>
<TextBlock Grid.Row="2" Margin="15,5" FontSize="16">
• <TextBlock Text="{DynamicResource About:List:Item1}" />
</TextBlock>
<TextBlock Grid.Row="3" Margin="15,5" FontSize="16">
<TextBlock Grid.Row="3" Margin="15,5" FontSize="16">
• <TextBlock Text="{DynamicResource About:List:Item2}" />
</TextBlock>
<TextBlock Grid.Row="4" Margin="15,5" FontSize="16">
<TextBlock Grid.Row="4" Margin="15,5" FontSize="16">
• <TextBlock Text="{DynamicResource About:List:Item3}" />
</TextBlock>
<TextBlock Grid.Row="5" Margin="15,5" FontSize="16">
<TextBlock Grid.Row="5" Margin="15,5" FontSize="16">
• <TextBlock Text="{DynamicResource About:List:Item4}" />
</TextBlock>
<TextBlock TextWrapping="Wrap" Grid.Row="6" Margin="30,5,5,5" FontSize="16">
<TextBlock TextWrapping="Wrap" Grid.Row="6" Margin="30,5,5,5" FontSize="16">
<StaticResource ResourceKey="About:SupportAssistant" />
</TextBlock>
</TextBlock>
<TextBlock Grid.Row="7" Margin="0,10,5,5" FontSize="20" Text="{DynamicResource About:SpecialThanks}" />
<TextBlock Grid.Row="7" Margin="0,10,5,5" FontSize="20" Text="{DynamicResource About:SpecialThanks}" />
<StackPanel Grid.Row="8" Orientation="Horizontal" HorizontalAlignment="Center">
<StackPanel Margin="5" Orientation="Vertical">
<TextBlock FontSize="20" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center">
<StackPanel Grid.Row="8" Orientation="Horizontal" HorizontalAlignment="Center">
<StackPanel Margin="5" Orientation="Vertical">
<TextBlock FontSize="20" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center">
<Hyperlink NavigateUri="https://www.vanzeben.ca/" RequestNavigate="Hyperlink_RequestNavigate">
vanZeben
</Hyperlink>
</TextBlock>
<TextBlock FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center">Creating BeatMods</TextBlock>
<TextBlock FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center">The current Mod repository</TextBlock>
<TextBlock FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center">Used by this Installer</TextBlock>
</TextBlock>
<TextBlock FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center">Creating BeatMods</TextBlock>
<TextBlock FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center">The current Mod repository</TextBlock>
<TextBlock FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center">Used by this Installer</TextBlock>
</StackPanel>
</StackPanel>
<StackPanel Margin="5" Orientation="Vertical">
<TextBlock FontSize="20" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center">
<StackPanel Margin="5" Orientation="Vertical">
<TextBlock FontSize="20" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center">
<Hyperlink NavigateUri="https://linkkle.com/umbranoxus" RequestNavigate="Hyperlink_RequestNavigate">
Umbranox
</Hyperlink>
</TextBlock>
<TextBlock FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center">Inspiration</TextBlock>
<TextBlock FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center">Creating the Mod Manager</TextBlock>
</TextBlock>
<TextBlock FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center">Inspiration</TextBlock>
<TextBlock FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center">Creating the Mod Manager</TextBlock>
<TextBlock FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center">
<Hyperlink NavigateUri="https://www.patreon.com/scoresaber" local:HyperlinkExtensions.IsExternal="True">
<TextBlock Text="{DynamicResource About:Donate}" />
@ -78,24 +78,24 @@
</TextBlock>
</StackPanel>
<StackPanel Margin="5" Orientation="Vertical">
<TextBlock FontSize="20" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center">
<StackPanel Margin="5" Orientation="Vertical">
<TextBlock FontSize="20" FontWeight="Bold" HorizontalAlignment="Center" VerticalAlignment="Center">
<Hyperlink NavigateUri="https://www.jackbaron.com/" local:HyperlinkExtensions.IsExternal="True">
lolPants
</Hyperlink>
</TextBlock>
<TextBlock FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center">Inspiration</TextBlock>
<TextBlock FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center">Creating ModSaber</TextBlock>
<TextBlock FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center">The first Mod repository</TextBlock>
<TextBlock FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center">
</TextBlock>
<TextBlock FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center">Inspiration</TextBlock>
<TextBlock FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center">Creating ModSaber</TextBlock>
<TextBlock FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center">The first Mod repository</TextBlock>
<TextBlock FontSize="16" VerticalAlignment="Center" HorizontalAlignment="Center">
<Hyperlink NavigateUri="https://www.paypal.me/jackbarondev" RequestNavigate="Hyperlink_RequestNavigate">
<TextBlock Text="{DynamicResource About:Donate}" />
</Hyperlink>
</TextBlock>
</StackPanel>
</StackPanel>
</StackPanel>
</StackPanel>
<StackPanel Grid.Row="9" Margin="5" Orientation="Horizontal" HorizontalAlignment="Center">
<Button x:Name="PatButton" x:FieldModifier="public" Height="30" Width="80" Margin="0,0,5,0" Content="{DynamicResource About:HeadpatsButton}" Click="HeadpatsButton_Click"/>
<Button x:Name="HugButton" x:FieldModifier="public" Height="30" Width="80" Margin="5,0,0,0" Content="{DynamicResource About:HugsButton}" Click="HugsButton_Click"/>

View file

@ -9,62 +9,62 @@
Title="DynamicResource Intro:Title">
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
</Grid.RowDefinitions>
</Grid.RowDefinitions>
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="48" Margin="0" Text="{DynamicResource Intro:PageTitle}" />
<TextBlock Grid.Row="1" FontWeight="Bold" Text="{DynamicResource Intro:Terms:Header}" Margin="0" FontSize="28" />
<TextBlock Grid.Row="2" Margin="0,5" FontSize="16" TextWrapping="Wrap">
<TextBlock VerticalAlignment="Center" HorizontalAlignment="Left" FontSize="48" Margin="0" Text="{DynamicResource Intro:PageTitle}" />
<TextBlock Grid.Row="1" FontWeight="Bold" Text="{DynamicResource Intro:Terms:Header}" Margin="0" FontSize="28" />
<TextBlock Grid.Row="2" Margin="0,5" FontSize="16" TextWrapping="Wrap">
<StaticResource ResourceKey="Intro:Terms:Line1" />
</TextBlock>
</TextBlock>
<TextBlock Grid.Row="3" Margin="0,5" FontSize="16" TextWrapping="Wrap">
<TextBlock Grid.Row="3" Margin="0,5" FontSize="16" TextWrapping="Wrap">
<StaticResource ResourceKey="Intro:Terms:Line2" />
</TextBlock>
</TextBlock>
<TextBlock Grid.Row="4" Margin="15,5" FontSize="16" TextWrapping="Wrap">
<TextBlock Grid.Row="4" Margin="15,5" FontSize="16" TextWrapping="Wrap">
<StaticResource ResourceKey="Intro:Terms:Term1" />
</TextBlock>
</TextBlock>
<TextBlock Grid.Row="5" Margin="15,5" FontSize="16" TextWrapping="Wrap">
<TextBlock Grid.Row="5" Margin="15,5" FontSize="16" TextWrapping="Wrap">
<StaticResource ResourceKey="Intro:Terms:Term2" />
</TextBlock>
</TextBlock>
<TextBlock Grid.Row="6" Margin="15,5" FontSize="16" TextWrapping="Wrap">
<TextBlock Grid.Row="6" Margin="15,5" FontSize="16" TextWrapping="Wrap">
<StaticResource ResourceKey="Intro:Terms:Term3" />
</TextBlock>
</TextBlock>
<TextBlock Grid.Row="7" Margin="0,5" FontSize="16" TextWrapping="Wrap">
<TextBlock Grid.Row="7" Margin="0,5" FontSize="16" TextWrapping="Wrap">
<StaticResource ResourceKey="Intro:ReviewsBeatGamesFault" />
</TextBlock>
</TextBlock>
<TextBlock Grid.Row="8" Margin="0,5" FontSize="16" TextWrapping="Wrap">
<TextBlock Grid.Row="8" Margin="0,5" FontSize="16" TextWrapping="Wrap">
<StaticResource ResourceKey="Intro:ReviewsRustySpoon" />
</TextBlock>
</TextBlock>
<TextBlock Grid.Row="9" Margin="0,5" FontSize="16" TextWrapping="Wrap">
<TextBlock Grid.Row="9" Margin="0,5" FontSize="16" TextWrapping="Wrap">
<StaticResource ResourceKey="Intro:WikiGuide" />
</TextBlock>
</TextBlock>
<StackPanel Margin="10" Grid.Row="10" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<Button Margin="0,0,10,0" Name="Agree" Height="35" Width="100" VerticalAlignment="Center" HorizontalAlignment="Center" Click="Agree_Click">
<StackPanel Margin="10" Grid.Row="10" Orientation="Horizontal" HorizontalAlignment="Center" VerticalAlignment="Center">
<Button Margin="0,0,10,0" Name="Agree" Height="35" Width="100" VerticalAlignment="Center" HorizontalAlignment="Center" Click="Agree_Click">
<TextBlock FontSize="18" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{DynamicResource Intro:AgreeButton}" />
</Button>
<Button Margin="10,0,0,0" Name="Disagree" Height="35" Width="100" VerticalAlignment="Center" HorizontalAlignment="Center" Click="Disagree_Click">
<Button Margin="10,0,0,0" Name="Disagree" Height="35" Width="100" VerticalAlignment="Center" HorizontalAlignment="Center" Click="Disagree_Click">
<TextBlock FontSize="18" HorizontalAlignment="Center" VerticalAlignment="Center" Text="{DynamicResource Intro:DisagreeButton}" />
</Button>
</StackPanel>
</Grid>
</StackPanel>
</Grid>
</Page>

View file

@ -8,50 +8,50 @@
d:DesignHeight="629" d:DesignWidth="1182"
Title="{DynamicResource Invalid:Title}">
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
</Grid.RowDefinitions>
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<TextBlock VerticalAlignment="Center" Grid.ColumnSpan="2" HorizontalAlignment="Left" FontSize="48" Margin="0" Text="{DynamicResource Invalid:PageTitle}" />
<TextBlock Grid.Row="1" Grid.ColumnSpan="2" FontWeight="Bold" Margin="0" FontSize="28" Text="{DynamicResource Invalid:PageSubtitle}" />
<TextBlock Grid.Row="2" Grid.ColumnSpan="2" Margin="0,5" FontSize="16" TextWrapping="Wrap" Text="{DynamicResource Invalid:List:Header}" />
<TextBlock VerticalAlignment="Center" Grid.ColumnSpan="2" HorizontalAlignment="Left" FontSize="48" Margin="0" Text="{DynamicResource Invalid:PageTitle}" />
<TextBlock Grid.Row="1" Grid.ColumnSpan="2" FontWeight="Bold" Margin="0" FontSize="28" Text="{DynamicResource Invalid:PageSubtitle}" />
<TextBlock Grid.Row="2" Grid.ColumnSpan="2" Margin="0,5" FontSize="16" TextWrapping="Wrap" Text="{DynamicResource Invalid:List:Header}" />
<TextBlock Grid.Row="3" Grid.ColumnSpan="2" Margin="15,5" FontSize="16" TextWrapping="Wrap">
<TextBlock Grid.Row="3" Grid.ColumnSpan="2" Margin="15,5" FontSize="16" TextWrapping="Wrap">
<StaticResource ResourceKey="Invalid:List:Line1" />
</TextBlock>
</TextBlock>
<TextBlock Grid.Row="4" Grid.ColumnSpan="2" Margin="15,5" FontSize="16" TextWrapping="Wrap">
<TextBlock Grid.Row="4" Grid.ColumnSpan="2" Margin="15,5" FontSize="16" TextWrapping="Wrap">
<StaticResource ResourceKey="Invalid:List:Line2" />
</TextBlock>
</TextBlock>
<TextBlock Grid.Row="5" Grid.ColumnSpan="2" Margin="15,5" FontSize="16" TextWrapping="Wrap">
<TextBlock Grid.Row="5" Grid.ColumnSpan="2" Margin="15,5" FontSize="16" TextWrapping="Wrap">
<StaticResource ResourceKey="Invalid:List:Line3" />
</TextBlock>
</TextBlock>
<TextBlock Grid.Row="6" Grid.ColumnSpan="2" FontWeight="Bold" Margin="0" FontSize="28" />
<TextBlock Grid.Row="7" Grid.ColumnSpan="2" FontWeight="Bold" Margin="0" FontSize="20">
<TextBlock Grid.Row="6" Grid.ColumnSpan="2" FontWeight="Bold" Margin="0" FontSize="28" />
<TextBlock Grid.Row="7" Grid.ColumnSpan="2" FontWeight="Bold" Margin="0" FontSize="20">
<TextBlock Text="{DynamicResource Invalid:BoughtGame1}" />:
</TextBlock>
<Border Grid.Row="8" Background="LightGray" Height="30" MinWidth="650" >
<TextBlock Name="DirectoryTextBlock" Margin="5" Text="{Binding InstallDirectory}" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="16"/>
</Border>
<Button Grid.Row="8" Grid.Column="2" Margin="3" Height="30" Width="80" Content="{DynamicResource Invalid:SelectFolderButton}" Click="SelectDirButton_Click"/>
<TextBlock Grid.Row="9" Grid.ColumnSpan="2" FontWeight="Bold" Margin="0" FontSize="20">
<Border Grid.Row="8" Background="LightGray" Height="30" MinWidth="650" >
<TextBlock Name="DirectoryTextBlock" Margin="5" Text="{Binding InstallDirectory}" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="16"/>
</Border>
<Button Grid.Row="8" Grid.Column="2" Margin="3" Height="30" Width="80" Content="{DynamicResource Invalid:SelectFolderButton}" Click="SelectDirButton_Click"/>
<TextBlock Grid.Row="9" Grid.ColumnSpan="2" FontWeight="Bold" Margin="0" FontSize="20">
<TextBlock Text="{DynamicResource Invalid:BoughtGame2}" />.
</TextBlock>
</Grid>

View file

@ -9,63 +9,63 @@
Title="{DynamicResource Mods:Title}">
<Grid>
<ListView Name="ModsListView" Grid.Column="1" SelectionMode="Single" SelectionChanged="ModsListView_SelectionChanged">
<ListView.View>
<GridView>
<GridView.Columns>
<GridViewColumn Width="30">
<GridViewColumn.CellTemplate>
<DataTemplate>
<CheckBox Name="ModCheckBox" IsEnabled="{Binding IsEnabled}" Tag="{Binding ModInfo}" IsChecked="{Binding Path=IsSelected, Mode=TwoWay}" Checked="ModCheckBox_Checked" Unchecked="ModCheckBox_Unchecked"/>
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
<GridViewColumn Header="{DynamicResource Mods:Header:Name}" DisplayMemberBinding="{Binding ModName}" />
<ListView Name="ModsListView" Grid.Column="1" SelectionMode="Single" SelectionChanged="ModsListView_SelectionChanged">
<ListView.View>
<GridView>
<GridView.Columns>
<GridViewColumn Width="30">
<GridViewColumn.CellTemplate>
<DataTemplate>
<CheckBox Name="ModCheckBox" IsEnabled="{Binding IsEnabled}" Tag="{Binding ModInfo}" IsChecked="{Binding Path=IsSelected, Mode=TwoWay}" Checked="ModCheckBox_Checked" Unchecked="ModCheckBox_Unchecked"/>
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
<GridViewColumn Header="{DynamicResource Mods:Header:Name}" DisplayMemberBinding="{Binding ModName}" />
<GridViewColumn x:Name="InstalledColumn" Header="{DynamicResource Mods:Header:Installed}">
<GridViewColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding InstalledVersion}" Foreground="{Binding GetVersionColor}" TextDecorations="{Binding GetVersionDecoration}" />
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
<GridViewColumn x:Name="InstalledColumn" Header="{DynamicResource Mods:Header:Installed}">
<GridViewColumn.CellTemplate>
<DataTemplate>
<TextBlock Text="{Binding InstalledVersion}" Foreground="{Binding GetVersionColor}" TextDecorations="{Binding GetVersionDecoration}" />
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
<GridViewColumn Header="{DynamicResource Mods:Header:Latest}" DisplayMemberBinding="{Binding ModVersion}" />
<GridViewColumn x:Name="DescriptionColumn" Header="{DynamicResource Mods:Header:Description}" Width="750" >
<GridViewColumn.CellTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
<TextBlock Margin="{Binding PromotionMargin}">
<GridViewColumn Header="{DynamicResource Mods:Header:Latest}" DisplayMemberBinding="{Binding ModVersion}" />
<GridViewColumn x:Name="DescriptionColumn" Header="{DynamicResource Mods:Header:Description}" Width="750" >
<GridViewColumn.CellTemplate>
<DataTemplate>
<StackPanel Orientation="Horizontal">
<TextBlock Margin="{Binding PromotionMargin}">
<Hyperlink NavigateUri="{Binding PromotionLink}" RequestNavigate="Hyperlink_RequestNavigate">
<TextBlock Text="{Binding PromotionText}" />
</Hyperlink>
</TextBlock>
<TextBlock Text="{Binding ModDescription}" />
</StackPanel>
</DataTemplate>
<TextBlock Text="{Binding ModDescription}" />
</StackPanel>
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
</GridViewColumn.CellTemplate>
</GridViewColumn>
<GridViewColumn x:Name="UninstallColumn" Header="{DynamicResource Mods:Header:Uninstall}" Width="70">
<GridViewColumn.CellTemplate>
<DataTemplate>
<Button Name="Uninstall" Content="{DynamicResource Mods:UninstallButton}" Visibility="{Binding CanSeeDelete}" IsEnabled="{Binding CanDelete}" Foreground="Red" Tag="{Binding ModInfo}" Click="Uninstall_Click"/>
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
</GridView.Columns>
</GridView>
</ListView.View>
<ListView.GroupStyle>
<GroupStyle>
<GroupStyle.HeaderTemplate>
<DataTemplate>
<TextBlock FontWeight="Bold" FontSize="14" Padding="6,0,0,0" Text="{Binding Name}"/>
</DataTemplate>
</GroupStyle.HeaderTemplate>
</GroupStyle>
</ListView.GroupStyle>
</ListView>
</Grid>
<GridViewColumn x:Name="UninstallColumn" Header="{DynamicResource Mods:Header:Uninstall}" Width="70">
<GridViewColumn.CellTemplate>
<DataTemplate>
<Button Name="Uninstall" Content="{DynamicResource Mods:UninstallButton}" Visibility="{Binding CanSeeDelete}" IsEnabled="{Binding CanDelete}" Foreground="Red" Tag="{Binding ModInfo}" Click="Uninstall_Click"/>
</DataTemplate>
</GridViewColumn.CellTemplate>
</GridViewColumn>
</GridView.Columns>
</GridView>
</ListView.View>
<ListView.GroupStyle>
<GroupStyle>
<GroupStyle.HeaderTemplate>
<DataTemplate>
<TextBlock FontWeight="Bold" FontSize="14" Padding="6,0,0,0" Text="{Binding Name}"/>
</DataTemplate>
</GroupStyle.HeaderTemplate>
</GroupStyle>
</ListView.GroupStyle>
</ListView>
</Grid>
</Page>

View file

@ -7,49 +7,49 @@
mc:Ignorable="d"
d:DesignHeight="629" d:DesignWidth="1182"
Title="{DynamicResource Options:Title}">
<Page.Resources>
<Page.Resources>
</Page.Resources>
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
</Page.Resources>
<Grid HorizontalAlignment="Center" VerticalAlignment="Center">
<Grid.RowDefinitions>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
<RowDefinition Height="auto"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
<ColumnDefinition Width="auto"/>
</Grid.ColumnDefinitions>
<TextBlock Grid.Row="0" Margin="15,5,5,5" Text="{DynamicResource Options:PageTitle}" FontSize="24" FontWeight="Bold" HorizontalAlignment="Left"/>
<TextBlock Grid.Row="0" Margin="15,5,5,5" Text="{DynamicResource Options:PageTitle}" FontSize="24" FontWeight="Bold" HorizontalAlignment="Left"/>
<TextBlock Grid.Row="1" Margin="5" Text="{DynamicResource Options:InstallFolder}" FontWeight="Bold" HorizontalAlignment="Left" FontSize="16"/>
<Border Grid.ColumnSpan="2" Grid.Row="2" Margin="5" Background="{DynamicResource DirectoryBackground}" BorderBrush="{DynamicResource DirectoryOutline}" BorderThickness="1" Height="30" MinWidth="450" >
<TextBlock Name="DirectoryTextBlock" Margin="5" Text="{Binding InstallDirectory}" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="16"/>
</Border>
<Button Grid.Row="2" Grid.Column="2" Margin="3" Height="30" Width="93" Content="{DynamicResource Options:SelectFolderButton}" Click="SelectDirButton_Click"/>
<TextBlock Grid.Row="1" Margin="5" Text="{DynamicResource Options:InstallFolder}" FontWeight="Bold" HorizontalAlignment="Left" FontSize="16"/>
<Border Grid.ColumnSpan="2" Grid.Row="2" Margin="5" Background="{DynamicResource DirectoryBackground}" BorderBrush="{DynamicResource DirectoryOutline}" BorderThickness="1" Height="30" MinWidth="450" >
<TextBlock Name="DirectoryTextBlock" Margin="5" Text="{Binding InstallDirectory}" HorizontalAlignment="Left" VerticalAlignment="Center" FontSize="16"/>
</Border>
<Button Grid.Row="2" Grid.Column="2" Margin="3" Height="30" Width="93" Content="{DynamicResource Options:SelectFolderButton}" Click="SelectDirButton_Click"/>
<Button Grid.Row="2" Grid.Column="3" Margin="3" Height="30" Width="93" Content="{DynamicResource Options:OpenFolderButton}" Click="OpenDirButton_Click"/>
<TextBlock Grid.Row="3" Margin="5" Text="{DynamicResource Options:SaveSelectedMods}" FontWeight="Bold" HorizontalAlignment="Left" FontSize="16" />
<CheckBox Grid.Row="3" Grid.Column="1" Name="SaveSelected" VerticalAlignment="Center" HorizontalAlignment="Left" IsChecked="{Binding SaveSelection, Mode=TwoWay}" Checked="SaveSelected_Checked" Unchecked="SaveSelected_Unchecked"/>
<CheckBox Grid.Row="3" Grid.Column="1" Name="SaveSelected" VerticalAlignment="Center" HorizontalAlignment="Left" IsChecked="{Binding SaveSelection, Mode=TwoWay}" Checked="SaveSelected_Checked" Unchecked="SaveSelected_Unchecked"/>
<TextBlock Grid.Row="4" Margin="5" Text="{DynamicResource Options:CheckInstalledMods}" FontWeight="Bold" HorizontalAlignment="Left" FontSize="16" />
<CheckBox Grid.Row="4" Grid.Column="1" Name="CheckInstalled" VerticalAlignment="Center" HorizontalAlignment="Left" IsChecked="{Binding CheckInstalledMods, Mode=TwoWay}" Checked="CheckInstalled_Checked" Unchecked="CheckInstalled_Unchecked"/>
<CheckBox Grid.Row="4" Grid.Column="1" Name="CheckInstalled" VerticalAlignment="Center" HorizontalAlignment="Left" IsChecked="{Binding CheckInstalledMods, Mode=TwoWay}" Checked="CheckInstalled_Checked" Unchecked="CheckInstalled_Unchecked"/>
<TextBlock Grid.Row="5" Margin="50,5,5,5" Text="{DynamicResource Options:SelectInstalledMods}" FontWeight="Bold" HorizontalAlignment="Left" FontSize="16" />
<CheckBox Grid.Row="5" Grid.Column="1" Name="SelectInstalled" VerticalAlignment="Center" HorizontalAlignment="Left" IsChecked="{Binding SelectInstalledMods, Mode=TwoWay}" Checked="SelectInstalled_Checked" Unchecked="SelectInstalled_Unchecked"/>
@ -59,16 +59,16 @@
</TextBlock>
<TextBlock Grid.Row="7" Margin="50,5,5,5" Text="{DynamicResource Options:BeatSaver}" FontWeight="Bold" HorizontalAlignment="Left" FontSize="16" />
<CheckBox Grid.Row="7" Grid.Column="1" Name="BeatSaverProtocolHandler" VerticalAlignment="Center" HorizontalAlignment="Left" IsChecked="{Binding BeatSaverProtocolHandlerEnabled}" Checked="BeatSaverProtocolHandler_Checked" Unchecked="BeatSaverProtocolHandler_Unchecked"/>
<CheckBox Grid.Row="7" Grid.Column="1" Name="BeatSaverProtocolHandler" VerticalAlignment="Center" HorizontalAlignment="Left" IsChecked="{Binding BeatSaverProtocolHandlerEnabled}" Checked="BeatSaverProtocolHandler_Checked" Unchecked="BeatSaverProtocolHandler_Unchecked"/>
<TextBlock Grid.Row="8" Margin="50,5,5,5" Text="{DynamicResource Options:ModelSaber}" FontWeight="Bold" HorizontalAlignment="Left" FontSize="16" />
<CheckBox Grid.Row="8" Grid.Column="1" Name="ModelSaberProtocolHandler" VerticalAlignment="Center" HorizontalAlignment="Left" IsChecked="{Binding ModelSaberProtocolHandlerEnabled}" Checked="ModelSaberProtocolHandler_Checked" Unchecked="ModelSaberProtocolHandler_Unchecked"/>
<CheckBox Grid.Row="8" Grid.Column="1" Name="ModelSaberProtocolHandler" VerticalAlignment="Center" HorizontalAlignment="Left" IsChecked="{Binding ModelSaberProtocolHandlerEnabled}" Checked="ModelSaberProtocolHandler_Checked" Unchecked="ModelSaberProtocolHandler_Unchecked"/>
<StackPanel Grid.Row="12" Margin="5" Orientation="Horizontal" HorizontalAlignment="Left">
<TextBlock FontWeight="Bold" FontSize="16">
<StackPanel Grid.Row="12" Margin="5" Orientation="Horizontal" HorizontalAlignment="Left">
<TextBlock FontWeight="Bold" FontSize="16">
<TextBlock Text="{DynamicResource Options:GameType}" />:&#160;
</TextBlock>
<TextBlock Name="GameTypeTextBlock" Text="{Binding InstallType}" FontSize="16"/>
<TextBlock Name="GameTypeTextBlock" Text="{Binding InstallType}" FontSize="16"/>
</StackPanel>
<StackPanel Margin="5" Grid.Row="13" Grid.ColumnSpan="2" HorizontalAlignment="Stretch">

View file

@ -6,10 +6,6 @@ using System.Threading.Tasks;
using System.Windows;
using System.Windows.Controls;
using Path = System.IO.Path;
using System.Net;
using System.Web.Script.Serialization;
using System.Web;
using System.ComponentModel;
namespace ModAssistant.Pages
{

View file

@ -81,4 +81,4 @@
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
</ResourceDictionary>

View file

@ -73,4 +73,4 @@
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
</ResourceDictionary>

View file

@ -102,4 +102,4 @@
</Trigger>
</Style.Triggers>
</Style>
</ResourceDictionary>
</ResourceDictionary>

View file

@ -79,4 +79,4 @@
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
</ResourceDictionary>

View file

@ -49,4 +49,4 @@
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
</ResourceDictionary>

View file

@ -25,4 +25,4 @@
<Setter Property="TextOptions.TextFormattingMode"
Value="Display" />
</Style>
</ResourceDictionary>
</ResourceDictionary>

View file

@ -4,4 +4,4 @@
<Setter Property="ListView.BorderBrush" Value="{DynamicResource ModListBorderBrush}" />
<Setter Property="ListView.BorderThickness" Value="1,1.1,1,1" />
</Style>
</ResourceDictionary>
</ResourceDictionary>

View file

@ -39,4 +39,4 @@
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
</ResourceDictionary>

View file

@ -2,4 +2,4 @@
<Style TargetType="Rectangle">
<Setter Property="Fill" Value="{DynamicResource ModAssistantBackground}"/>
</Style>
</ResourceDictionary>
</ResourceDictionary>

View file

@ -4,4 +4,4 @@
<Setter Property="TextWrapping" Value="NoWrap"/>
<Setter Property="TextTrimming" Value="None"/>
</Style>
</ResourceDictionary>
</ResourceDictionary>

View file

@ -78,4 +78,4 @@
</Setter>
</Style>
</ResourceDictionary>
</ResourceDictionary>

View file

@ -64,4 +64,4 @@
<!--Options Default: #4E3BCE-->
<SolidColorBrush x:Key="OptionsIconColor" Color="White"/>
</ResourceDictionary>
</ResourceDictionary>

View file

@ -88,4 +88,4 @@
<!--Options Default: #4E3BCE-->
<SolidColorBrush x:Key="OptionsIconColor" Color="{DynamicResource ResourceKey=StandardIcon}"/>
</ResourceDictionary>
</ResourceDictionary>