CodeMirror/VRCMelonAssistant
1
0
Fork 0
mirror of https://github.com/knah/VRCMelonAssistant.git synced 2024-09-28 07:11:25 +12:00
Code Issues Projects Releases Wiki Activity

refactoring theme engine

Browse source
This commit is contained in:
Jack Baron 2020-02-14 04:44:51 +00:00
parent 82815a4bea
commit 26991f4dd4
No known key found for this signature in database
GPG key ID: CD10BCEEC646C064
5 changed files with 118 additions and 101 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
ModAssistant/MainWindow.xaml
View file

@ -80,7 +80,9 @@
<ColumnDefinition Width="115" />
</Grid.ColumnDefinitions>
<TextBlock Name="MainTextBlock" Padding="5" Height="40" VerticalAlignment="Bottom" Background="{DynamicResource BottomStatusBarBackground}" FontSize="20" />
<Border BorderThickness="1" Height="40" VerticalAlignment="Bottom" BorderBrush="{DynamicResource BottomStatusBarOutline}">
<TextBlock Name="MainTextBlock" Padding="5" Background="{DynamicResource BottomStatusBarBackground}" FontSize="20" />
</Border>
<Button Grid.Column="1" Name="InfoButton" IsEnabled="False" Height="40" Width="100" HorizontalAlignment="Right" Margin="0,10,0,0" Click="InfoButton_Click">
<StackPanel>
<TextBlock HorizontalAlignment="Center" VerticalAlignment="Bottom">

6
ModAssistant/Pages/Options.xaml
View file

@ -39,7 +39,7 @@
<TextBlock Grid.Row="0" Margin="15,5,5,5" Text="Settings" FontSize="24" FontWeight="Bold" HorizontalAlignment="Left"/>
<TextBlock Grid.Row="1" Margin="5" Text="Install Folder" FontWeight="Bold" HorizontalAlignment="Left" FontSize="16"/>
<Border Grid.ColumnSpan="2" Grid.Row="2" Margin="5" Background="{DynamicResource DirectoryBackground}" Height="30" MinWidth="450" >
<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="Select Folder" Click="SelectDirButton_Click"/>
@ -85,7 +85,9 @@
<StackPanel Grid.Row="15" Margin="0" Orientation="Horizontal" HorizontalAlignment="Left">
<Button Margin="5" Height="30" Width="80" Content="Open Logs" Click="OpenLogsDirButton_Click"/>
<Button Margin="5" Height="30" x:Name="YeetBSIPA" Width="100" Content="Uninstall BSIPA" Click="YeetBSIPAButton_Click"/>
<Button Margin="5" Height="30" Width="110" Background="{DynamicResource ButtonDangerBackground}" Content="Remove All Mods" Click="YeetModsButton_Click"/>
<Button Margin="5" Height="30" Width="110" Background="{DynamicResource ButtonDangerBackground}" Click="YeetModsButton_Click">
<TextBlock Foreground="White">Remove All Mods</TextBlock>
</Button>
</StackPanel>
</Grid>

2
ModAssistant/Styles/CheckBox.xaml
View file

@ -17,7 +17,7 @@
Margin="1"
HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
BorderThickness="{TemplateBinding BorderThickness}"
BorderThickness="0"
Background="{DynamicResource CheckboxDefaultBackground}"
BorderBrush="{TemplateBinding BorderBrush}">
<Grid Name="markGrid">

105
ModAssistant/Themes/Dark.xaml
View file

@ -1,61 +1,68 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!--ModAssistant Black Theme by Caeden117-->
<!-- ModAssistant Dark Theme by Caeden117 and lolPants -->
<!--Default text-->
<SolidColorBrush x:Key="TextColor" Color="LightGray" />
<!-- Standard Styles -->
<Color x:Key="StandardContent">#E0E0E0</Color>
<Color x:Key="StandardPrimary">#2E2E2E</Color>
<Color x:Key="StandardSecondary">#0F0F0F</Color>
<Color x:Key="StandardBorder">#696969</Color>
<Color x:Key="StandardHighlight">#454545</Color>
<Color x:Key="StandardActive">#696969</Color>
<Color x:Key="StandardIcon">#AEAEAE</Color>
<!-- Default Text -->
<SolidColorBrush x:Key="TextColor" Color="{StaticResource ResourceKey=StandardContent}" />
<SolidColorBrush x:Key="TextHighlighted" Color="White" />
<!--Buttons (Info/Mods/About/Options as well as More Info and Install/Update)-->
<SolidColorBrush x:Key="ButtonBackground" Color="#2E2E2E" />
<SolidColorBrush x:Key="ButtonOutline" Color="#696969" />
<SolidColorBrush x:Key="ButtonHighlightedBackground" Color="#454545" />
<SolidColorBrush x:Key="ButtonClickedBackground" Color="#696969" />
<SolidColorBrush x:Key="ButtonDisabledBackground" Color="#1a1a1a" />
<SolidColorBrush x:Key="ButtonDangerBackground" Color="#ed172f" />
<!-- Buttons (Info/Mods/About/Options as well as More Info and Install/Update) -->
<SolidColorBrush x:Key="ButtonBackground" Color="{DynamicResource ResourceKey=StandardPrimary}" />
<SolidColorBrush x:Key="ButtonOutline" Color="{DynamicResource ResourceKey=StandardBorder}" />
<SolidColorBrush x:Key="ButtonHighlightedBackground" Color="{DynamicResource ResourceKey=StandardHighlight}" />
<SolidColorBrush x:Key="ButtonClickedBackground" Color="{DynamicResource ResourceKey=StandardActive}" />
<SolidColorBrush x:Key="ButtonDisabledBackground" Color="{DynamicResource ResourceKey=StandardSecondary}" />
<SolidColorBrush x:Key="ButtonDangerBackground" Color="#ED172F" />
<!--Mod List-->
<SolidColorBrush x:Key="ModColumnBackground" Color="#1B1B1B"/>
<SolidColorBrush x:Key="ModColumnBorderBrush" Color="LightGray"/>
<SolidColorBrush x:Key="ModColumnHeaderHighlighted" Color="#454545"/>
<SolidColorBrush x:Key="ModListBackground" Color="#FF1B1B1B" />
<SolidColorBrush x:Key="ModListBorderBrush" Color="#696969" />
<SolidColorBrush x:Key="ModListItemHighlighted" Color="#454545"/>
<SolidColorBrush x:Key="ModListItemSelected" Color="#696969"/>
<!-- Mod List -->
<SolidColorBrush x:Key="ModColumnBackground" Color="{DynamicResource ResourceKey=StandardPrimary}" />
<SolidColorBrush x:Key="ModColumnBorderBrush" Color="{DynamicResource ResourceKey=StandardBorder}" />
<SolidColorBrush x:Key="ModColumnHeaderHighlighted" Color="{DynamicResource ResourceKey=StandardHighlight}" />
<SolidColorBrush x:Key="ModListBackground" Color="#10FFFFFF" />
<SolidColorBrush x:Key="ModListBorderBrush" Color="{DynamicResource ResourceKey=StandardBorder}" />
<SolidColorBrush x:Key="ModListItemHighlighted" Color="Transparent" />
<SolidColorBrush x:Key="ModListItemSelected" Color="{DynamicResource ResourceKey=StandardActive}" />
<!--Combo Box (Version select)-->
<SolidColorBrush x:Key="ComboBoxBackground" Color="#2E2E2E"/>
<SolidColorBrush x:Key="ComboBoxOutline" Color="#696969"/>
<SolidColorBrush x:Key="ComboBoxHighlighted" Color="#454545"/>
<SolidColorBrush x:Key="ComboBoxSelected" Color="#696969"/>
<SolidColorBrush x:Key="ComboBoxClicked" Color="#A2A2A2"/>
<SolidColorBrush x:Key="ComboBoxArrow" Color="White"/>
<!-- Combo Box (Version select) -->
<SolidColorBrush x:Key="ComboBoxBackground" Color="{DynamicResource ResourceKey=StandardPrimary}" />
<SolidColorBrush x:Key="ComboBoxOutline" Color="{DynamicResource ResourceKey=StandardBorder}" />
<SolidColorBrush x:Key="ComboBoxHighlighted" Color="{DynamicResource ResourceKey=StandardHighlight}" />
<SolidColorBrush x:Key="ComboBoxSelected" Color="{DynamicResource ResourceKey=StandardActive}" />
<SolidColorBrush x:Key="ComboBoxClicked" Color="#A2A2A2" />
<SolidColorBrush x:Key="ComboBoxArrow" Color="White" />
<!--Checkboxes (Mod List and Options)-->
<SolidColorBrush x:Key="CheckboxDefaultBackground" Color="#454545"/>
<SolidColorBrush x:Key="CheckboxDefaultOutlineColor" Color="LightGray"/>
<SolidColorBrush x:Key="CheckboxDisabledBackground" Color="#1a1a1a"/>
<SolidColorBrush x:Key="CheckboxDisabledOutlineColor" Color="#2a2a2a"/>
<SolidColorBrush x:Key="CheckboxDisabledTickColor" Color="#FFB0B0B0"/>
<SolidColorBrush x:Key="CheckboxHoveredBackground" Color="#696969"/>
<SolidColorBrush x:Key="CheckboxHoveredTickColor" Color="White"/>
<SolidColorBrush x:Key="CheckboxTickColor" Color="White"/>
<SolidColorBrush x:Key="CheckboxPressedBackground" Color="#FFBFBFBF"/>
<!-- Checkboxes (Mod List and Options) -->
<SolidColorBrush x:Key="CheckboxDefaultBackground" Color="{DynamicResource ResourceKey=StandardPrimary}" />
<SolidColorBrush x:Key="CheckboxDefaultOutlineColor" Color="{DynamicResource ResourceKey=StandardBorder}" />
<SolidColorBrush x:Key="CheckboxDisabledBackground" Color="#1A1A1A" />
<SolidColorBrush x:Key="CheckboxDisabledOutlineColor" Color="#2A2A2A" />
<SolidColorBrush x:Key="CheckboxDisabledTickColor" Color="#66FFFFFF" />
<SolidColorBrush x:Key="CheckboxHoveredBackground" Color="#696969" />
<SolidColorBrush x:Key="CheckboxHoveredTickColor" Color="White" />
<SolidColorBrush x:Key="CheckboxTickColor" Color="{StaticResource ResourceKey=StandardContent}" />
<SolidColorBrush x:Key="CheckboxPressedBackground" Color="#FFBFBFBF" />
<!--Various important elements that need to be controlled independently-->
<SolidColorBrush x:Key="ModAssistantBackground" Color="#0f0f0f"/>
<SolidColorBrush x:Key="BottomStatusBarBackground" Color="#2E2E2E"/>
<SolidColorBrush x:Key="DirectoryBackground" Color="#696969"/>
<!-- Various important elements that need to be controlled independently -->
<SolidColorBrush x:Key="ModAssistantBackground" Color="{DynamicResource ResourceKey=StandardSecondary}" />
<SolidColorBrush x:Key="BottomStatusBarBackground" Color="{DynamicResource ResourceKey=StandardPrimary}" />
<SolidColorBrush x:Key="BottomStatusBarOutline" Color="{DynamicResource ResourceKey=StandardBorder}" />
<SolidColorBrush x:Key="DirectoryBackground" Color="{DynamicResource ResourceKey=StandardPrimary}" />
<SolidColorBrush x:Key="DirectoryOutline" Color="{DynamicResource ResourceKey=StandardBorder}" />
<!--Colors for the corresponding icons.-->
<!--Info Default: #0DCAC8-->
<SolidColorBrush x:Key="InfoIconColor" Color="#AEAEAE"/>
<!--Mods Default: #833BCE-->
<SolidColorBrush x:Key="ModsIconColor" Color="#AEAEAE"/>
<!--About Default: #FF0000-->
<SolidColorBrush x:Key="AboutIconColor" Color="#AEAEAE"/>
<!--Options Default: #4E3BCE-->
<SolidColorBrush x:Key="OptionsIconColor" Color="#AEAEAE"/>
<!-- Colors for the corresponding icons -->
<SolidColorBrush x:Key="InfoIconColor" Color="{DynamicResource ResourceKey=StandardIcon}" />
<SolidColorBrush x:Key="ModsIconColor" Color="{DynamicResource ResourceKey=StandardIcon}" />
<SolidColorBrush x:Key="AboutIconColor" Color="{DynamicResource ResourceKey=StandardIcon}" />
<SolidColorBrush x:Key="OptionsIconColor" Color="{DynamicResource ResourceKey=StandardIcon}" />
</ResourceDictionary>
</ResourceDictionary>

102
ModAssistant/Themes/Light.xaml
View file

@ -1,61 +1,67 @@
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!--ModAssistant Light Theme by Caeden117-->
<!-- ModAssistant Light Theme by Caeden117 and lolPants -->
<!--Default text-->
<!-- Standard Styles -->
<Color x:Key="StandardContent">#101010</Color>
<Color x:Key="StandardPrimary">#C8C8C8</Color>
<Color x:Key="StandardSecondary">#F3F3F3</Color>
<Color x:Key="StandardBorder">Gray</Color>
<Color x:Key="StandardHighlight">#AEAEAE</Color>
<Color x:Key="StandardActive">#C0C0C0</Color>
<!-- Default Text -->
<SolidColorBrush x:Key="TextColor" Color="#101010" />
<SolidColorBrush x:Key="TextHighlighted" Color="Black" />
<!--Buttons (Info/Mods/About/Options as well as More Info and Install/Update)-->
<SolidColorBrush x:Key="ButtonBackground" Color="#EAEAEA" />
<SolidColorBrush x:Key="ButtonOutline" Color="Gray" />
<SolidColorBrush x:Key="ButtonHighlightedBackground" Color="#BBB" />
<SolidColorBrush x:Key="ButtonClickedBackground" Color="#C0C0C0" />
<SolidColorBrush x:Key="ButtonDisabledBackground" Color="#B0B0B0" />
<SolidColorBrush x:Key="ButtonDangerBackground" Color="#ed172f" />
<!-- Buttons (Info/Mods/About/Options as well as More Info and Install/Update) -->
<SolidColorBrush x:Key="ButtonBackground" Color="{DynamicResource ResourceKey=StandardPrimary}" />
<SolidColorBrush x:Key="ButtonOutline" Color="{DynamicResource ResourceKey=StandardBorder}" />
<SolidColorBrush x:Key="ButtonHighlightedBackground" Color="{DynamicResource ResourceKey=StandardHighlight}" />
<SolidColorBrush x:Key="ButtonClickedBackground" Color="{DynamicResource ResourceKey=StandardActive}" />
<SolidColorBrush x:Key="ButtonDisabledBackground" Color="{DynamicResource ResourceKey=StandardSecondary}" />
<SolidColorBrush x:Key="ButtonDangerBackground" Color="#ED172F" />
<!--Mod List-->
<SolidColorBrush x:Key="ModColumnBackground" Color="#EEEEEE"/>
<SolidColorBrush x:Key="ModColumnBorderBrush" Color="Gray"/>
<SolidColorBrush x:Key="ModColumnHeaderHighlighted" Color="LightGray"/>
<SolidColorBrush x:Key="ModListBackground" Color="#E0E0E0" />
<SolidColorBrush x:Key="ModListBorderBrush" Color="#AAA" />
<SolidColorBrush x:Key="ModListItemHighlighted" Color="#BBBBBB"/>
<SolidColorBrush x:Key="ModListItemSelected" Color="White"/>
<!-- Mod List -->
<SolidColorBrush x:Key="ModColumnBackground" Color="{DynamicResource ResourceKey=StandardPrimary}" />
<SolidColorBrush x:Key="ModColumnBorderBrush" Color="{DynamicResource ResourceKey=StandardBorder}" />
<SolidColorBrush x:Key="ModColumnHeaderHighlighted" Color="{DynamicResource ResourceKey=StandardHighlight}" />
<SolidColorBrush x:Key="ModListBackground" Color="#09000000" />
<SolidColorBrush x:Key="ModListBorderBrush" Color="{DynamicResource ResourceKey=StandardBorder}" />
<SolidColorBrush x:Key="ModListItemHighlighted" Color="#BBBBBB" />
<SolidColorBrush x:Key="ModListItemSelected" Color="{DynamicResource ResourceKey=StandardActive}" />
<!--Combo Box (Version select)-->
<SolidColorBrush x:Key="ComboBoxBackground" Color="#DDDDDD"/>
<SolidColorBrush x:Key="ComboBoxOutline" Color="Black"/>
<SolidColorBrush x:Key="ComboBoxHighlighted" Color="#808080"/>
<SolidColorBrush x:Key="ComboBoxSelected" Color="White"/>
<SolidColorBrush x:Key="ComboBoxClicked" Color="#AAAAAA"/>
<SolidColorBrush x:Key="ComboBoxArrow" Color="Black"/>
<!-- Combo Box (Version select) -->
<SolidColorBrush x:Key="ComboBoxBackground" Color="{DynamicResource ResourceKey=StandardPrimary}" />
<SolidColorBrush x:Key="ComboBoxOutline" Color="{DynamicResource ResourceKey=StandardBorder}" />
<SolidColorBrush x:Key="ComboBoxHighlighted" Color="{DynamicResource ResourceKey=StandardHighlight}" />
<SolidColorBrush x:Key="ComboBoxSelected" Color="{DynamicResource ResourceKey=StandardActive}" />
<SolidColorBrush x:Key="ComboBoxClicked" Color="#AAAAAA" />
<SolidColorBrush x:Key="ComboBoxArrow" Color="Black" />
<!--Checkboxes (Mod List and Options)-->
<SolidColorBrush x:Key="CheckboxDefaultBackground" Color="#707070"/>
<SolidColorBrush x:Key="CheckboxDefaultOutlineColor" Color="LightGray"/>
<SolidColorBrush x:Key="CheckboxDisabledBackground" Color="#5A5A5A"/>
<SolidColorBrush x:Key="CheckboxDisabledOutlineColor" Color="#4a4a4a"/>
<SolidColorBrush x:Key="CheckboxDisabledTickColor" Color="#DDD"/>
<SolidColorBrush x:Key="CheckboxHoveredBackground" Color="#909090"/>
<SolidColorBrush x:Key="CheckboxHoveredTickColor" Color="White"/>
<SolidColorBrush x:Key="CheckboxTickColor" Color="White"/>
<SolidColorBrush x:Key="CheckboxPressedBackground" Color="#FFBFBFBF"/>
<!-- Checkboxes (Mod List and Options) -->
<SolidColorBrush x:Key="CheckboxDefaultBackground" Color="{DynamicResource ResourceKey=StandardPrimary}" />
<SolidColorBrush x:Key="CheckboxDefaultOutlineColor" Color="{DynamicResource ResourceKey=StandardBorder}" />
<SolidColorBrush x:Key="CheckboxDisabledBackground" Color="#5A5A5A" />
<SolidColorBrush x:Key="CheckboxDisabledOutlineColor" Color="#4a4a4a" />
<SolidColorBrush x:Key="CheckboxDisabledTickColor" Color="#DDD" />
<SolidColorBrush x:Key="CheckboxHoveredBackground" Color="#909090" />
<SolidColorBrush x:Key="CheckboxHoveredTickColor" Color="White" />
<SolidColorBrush x:Key="CheckboxTickColor" Color="{StaticResource ResourceKey=StandardContent}" />
<SolidColorBrush x:Key="CheckboxPressedBackground" Color="#FFBFBFBF" />
<!--Various important elements that need to be controlled independently-->
<SolidColorBrush x:Key="ModAssistantBackground" Color="#EFEFEF"/>
<SolidColorBrush x:Key="BottomStatusBarBackground" Color="#D5D5D5"/>
<SolidColorBrush x:Key="DirectoryBackground" Color="LightGray"/>
<!-- Various important elements that need to be controlled independently -->
<SolidColorBrush x:Key="ModAssistantBackground" Color="{DynamicResource ResourceKey=StandardSecondary}" />
<SolidColorBrush x:Key="BottomStatusBarBackground" Color="{DynamicResource ResourceKey=StandardPrimary}" />
<SolidColorBrush x:Key="BottomStatusBarOutline" Color="{DynamicResource ResourceKey=StandardBorder}" />
<SolidColorBrush x:Key="DirectoryBackground" Color="{DynamicResource ResourceKey=StandardPrimary}" />
<SolidColorBrush x:Key="DirectoryOutline" Color="{DynamicResource ResourceKey=StandardBorder}" />
<!--Colors for the corresponding icons.-->
<!--Info Default: #0DCAC8-->
<SolidColorBrush x:Key="InfoIconColor" Color="#0DCAC8"/>
<!--Mods Default: #833BCE-->
<SolidColorBrush x:Key="ModsIconColor" Color="#833BCE"/>
<!--About Default: #FF0000-->
<SolidColorBrush x:Key="AboutIconColor" Color="#FF0000"/>
<!--Options Default: #4E3BCE-->
<SolidColorBrush x:Key="OptionsIconColor" Color="#4E3BCE"/>
<!-- Colors for page buttons -->
<SolidColorBrush x:Key="InfoIconColor" Color="#0DCAC8" />
<SolidColorBrush x:Key="ModsIconColor" Color="#833BCE" />
<SolidColorBrush x:Key="AboutIconColor" Color="#FF0000" />
<SolidColorBrush x:Key="OptionsIconColor" Color="#4E3BCE" />
</ResourceDictionary>
</ResourceDictionary>