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

Allow more AbsUI theming

Browse Source
This commit is contained in:
Yoshi Askharoun
2024-05-17 20:53:11 -05:00
parent 215e413a7d
commit 1e39cbfeca
8 changed files with 55 additions and 58 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OwlCore.Wpf/AbstractUI/Themes/AbstractBooleanStyle.xaml
+2 -4
View File
@@ -14,14 +14,12 @@
<DataTemplate x:Key="DefaultAbstractBooleanTemplate" DataType="abstractUI:AbstractBooleanViewModel"> <DataTemplate x:Key="DefaultAbstractBooleanTemplate" DataType="abstractUI:AbstractBooleanViewModel">
<StackPanel Margin="0,4,0,0"> <StackPanel Margin="0,4,0,0">
<TextBlock Text="{Binding Title, Mode=OneWay}" <TextBlock Text="{Binding Title, Mode=OneWay}"
FontSize="{StaticResource DefaultAbstractUITitleFontSize}" Style="{DynamicResource AbstractUICollectionTitleStyle}"
ToolTipService.ToolTip="{Binding TooltipText, Mode=OneWay}" ToolTipService.ToolTip="{Binding TooltipText, Mode=OneWay}"
Visibility="{Binding Title, TargetNullValue=Collapsed, Mode=OneWay}" /> Visibility="{Binding Title, TargetNullValue=Collapsed, Mode=OneWay}" />
<TextBlock Text="{Binding Subtitle, Mode=OneWay}" <TextBlock Text="{Binding Subtitle, Mode=OneWay}"
FontSize="{StaticResource DefaultAbstractUISubtitleFontSize}" Style="{DynamicResource AbstractUICollectionSubtitleStyle}"
FontWeight="{StaticResource DefaultAbstractUISubtitleFontWeight}"
Opacity="{StaticResource DefaultAbstractUISubtitleOpacity}"
Visibility="{Binding Subtitle, TargetNullValue=Collapsed}"/> Visibility="{Binding Subtitle, TargetNullValue=Collapsed}"/>
<CheckBox ToolTipService.ToolTip="{Binding TooltipText, Mode=OneWay}" <CheckBox ToolTipService.ToolTip="{Binding TooltipText, Mode=OneWay}"
OwlCore.Wpf/AbstractUI/Themes/AbstractButtonStyle.xaml
+5 -5
View File
@@ -34,12 +34,12 @@
<DataTemplate x:Key="DefaultAbstractButtonTemplate" DataType="abstractUI:AbstractButtonViewModel"> <DataTemplate x:Key="DefaultAbstractButtonTemplate" DataType="abstractUI:AbstractButtonViewModel">
<StackPanel> <StackPanel>
<TextBlock Text="{Binding Title, Mode=OneWay}" FontSize="{StaticResource DefaultAbstractUITitleFontSize}" ToolTipService.ToolTip="{Binding TooltipText, Mode=OneWay}" /> <TextBlock Text="{Binding Title, Mode=OneWay}" ToolTipService.ToolTip="{Binding TooltipText, Mode=OneWay}"
Style="{DynamicResource AbstractUICollectionTitleStyle}"/>
<TextBlock Text="{Binding Subtitle, Mode=OneWay}" FontSize="{StaticResource DefaultAbstractUISubtitleFontSize}" <TextBlock Text="{Binding Subtitle, Mode=OneWay}"
FontWeight="{StaticResource DefaultAbstractUISubtitleFontWeight}" Visibility="{Binding Path=Subtitle, TargetNullValue=Collapsed, Mode=OneWay}"
Opacity="{StaticResource DefaultAbstractUISubtitleOpacity}" Style="{DynamicResource AbstractUICollectionSubtitleStyle}" />
Visibility="{Binding Path=Subtitle, TargetNullValue=Collapsed, Mode=OneWay}"/>
<Button Style="{Binding Type, Converter={StaticResource ButtonStyleSelector}, Mode=OneWay}" Command="{Binding ClickCommand}"> <Button Style="{Binding Type, Converter={StaticResource ButtonStyleSelector}, Mode=OneWay}" Command="{Binding ClickCommand}">
<Grid> <Grid>
OwlCore.Wpf/AbstractUI/Themes/AbstractDataListStyle.xaml
+22 -17
View File
@@ -18,7 +18,11 @@
<convertvis:NotNullOrEmptyToVisibilityConverter x:Key="NotNullOrEmptyToVisibilityConverter"/> <convertvis:NotNullOrEmptyToVisibilityConverter x:Key="NotNullOrEmptyToVisibilityConverter"/>
<converters:SelectionChangedEventArgsToClickedItemConverter x:Key="SelectionChangedEventArgsToClickedItemConverter" /> <converters:SelectionChangedEventArgsToClickedItemConverter x:Key="SelectionChangedEventArgsToClickedItemConverter" />
<SolidColorBrush x:Key="AbstractDataListItemBorderBrush" Color="Gray" /> <Style x:Key="AbstractDataListGridItemBorderStyle" TargetType="Border">
<Setter Property="BorderBrush" Value="Gray"/>
<Setter Property="BorderThickness" Value="1"/>
</Style>
<SolidColorBrush x:Key="AbstractDataListGridForegroundBrush" Color="Black" />
<DataTemplate x:Key="DefaultAbstractDataListListTemplate" DataType="abstractUI:AbstractDataListViewModel"> <DataTemplate x:Key="DefaultAbstractDataListListTemplate" DataType="abstractUI:AbstractDataListViewModel">
<ListView x:Name="PrimaryListView" ItemsSource="{Binding Items}" SelectionMode="Single" Margin="10"> <ListView x:Name="PrimaryListView" ItemsSource="{Binding Items}" SelectionMode="Single" Margin="10">
@@ -93,10 +97,10 @@
Visibility="{Binding Path=Title, TargetNullValue=Collapsed, Mode=OneWay}"/> Visibility="{Binding Path=Title, TargetNullValue=Collapsed, Mode=OneWay}"/>
<TextBlock x:Name="SubtitleTextBlock" Grid.Column="2" Grid.Row="1" <TextBlock x:Name="SubtitleTextBlock" Grid.Column="2" Grid.Row="1"
VerticalAlignment="Center" VerticalAlignment="Center"
Visibility="{Binding Path=Subtitle, TargetNullValue=Collapsed, Mode=OneWay}" Visibility="{Binding Path=Subtitle, TargetNullValue=Collapsed, Mode=OneWay}"
Text="{Binding Subtitle, Mode=OneWay}" Text="{Binding Subtitle, Mode=OneWay}"
FontSize="16" FontWeight="Light" Opacity="0.75" /> Style="{DynamicResource AbstractUICollectionSubtitleStyle}"/>
</Grid> </Grid>
</DataTemplate> </DataTemplate>
</ListView.ItemTemplate> </ListView.ItemTemplate>
@@ -105,7 +109,7 @@
<DataTemplate x:Key="DefaultAbstractDataListGridTemplate" DataType="abstractUI:AbstractDataListViewModel"> <DataTemplate x:Key="DefaultAbstractDataListGridTemplate" DataType="abstractUI:AbstractDataListViewModel">
<ListView SelectionMode="Single" ItemsSource="{Binding Items}" <ListView SelectionMode="Single" ItemsSource="{Binding Items}"
Background="Transparent" Foreground="{DynamicResource ZuneMediumTextBrush}" Background="Transparent" Foreground="{DynamicResource AbstractDataListGridForegroundBrush}"
BorderThickness="0"> BorderThickness="0">
<behaviors:Interaction.Triggers> <behaviors:Interaction.Triggers>
<behaviors:EventTrigger EventName="SelectionChanged"> <behaviors:EventTrigger EventName="SelectionChanged">
@@ -144,11 +148,12 @@
<ColumnDefinition Width="Auto" /> <ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions> </Grid.ColumnDefinitions>
<Border BorderBrush="{DynamicResource AbstractDataListItemBorderBrush}" BorderThickness="1"> <Border Style="{DynamicResource AbstractDataListGridItemBorderStyle}">
<Grid Height="150" Width="150" Grid.ColumnSpan="2"> <Grid Height="150" Width="150">
<TextBlock Text="{Binding IconCode}" FontFamily="Segoe MDL2 Assets" FontSize="34" <TextBlock Text="{Binding IconCode}" FontFamily="Segoe MDL2 Assets" FontSize="34"
VerticalAlignment="Center" HorizontalAlignment="Center"/> VerticalAlignment="Center" HorizontalAlignment="Center"/>
<TextBlock Visibility="{Binding IsAddItem, Converter={StaticResource BoolToVisibilityConverter}}" Text="&#xE710;" FontFamily="Segoe MDL2 Assets" FontSize="34" /> <TextBlock Visibility="{Binding IsAddItem, Converter={StaticResource BoolToVisibilityConverter}}"
Text="&#xE710;" FontFamily="Segoe MDL2 Assets" FontSize="34" />
<Image Source="{Binding ImageSource, Mode=OneWay}"/> <Image Source="{Binding ImageSource, Mode=OneWay}"/>
</Grid> </Grid>
</Border> </Border>
@@ -168,9 +173,9 @@
</Button> </Button>
</Border> </Border>
<TextBlock x:Name="SubtitleTextBlock" Grid.Row="2" Grid.ColumnSpan="2" <TextBlock x:Name="SubtitleTextBlock" Grid.Row="2" Grid.ColumnSpan="2"
Text="{Binding Subtitle}" Text="{Binding Subtitle}" Style="{DynamicResource AbstractUICollectionSubtitleStyle}"
FontSize="12" FontWeight="Light" Opacity="0.5" TextTrimming="CharacterEllipsis" /> TextTrimming="CharacterEllipsis" />
</Grid> </Grid>
</DataTemplate> </DataTemplate>
</ListView.ItemTemplate> </ListView.ItemTemplate>
@@ -179,12 +184,12 @@
<DataTemplate x:Key="DefaultAbstractDataListTemplate" DataType="abstractUI:AbstractDataListViewModel"> <DataTemplate x:Key="DefaultAbstractDataListTemplate" DataType="abstractUI:AbstractDataListViewModel">
<StackPanel> <StackPanel>
<TextBlock Text="{Binding Title, Mode=OneWay}" FontSize="{StaticResource DefaultAbstractUITitleFontSize}" ToolTipService.ToolTip="{Binding TooltipText, Mode=OneWay}" /> <TextBlock Text="{Binding Title, Mode=OneWay}" ToolTipService.ToolTip="{Binding TooltipText, Mode=OneWay}"
Style="{DynamicResource AbstractUICollectionTitleStyle}" />
<TextBlock Text="{Binding Subtitle, Mode=OneWay}" FontSize="{StaticResource DefaultAbstractUISubtitleFontSize}" <TextBlock Text="{Binding Subtitle, Mode=OneWay}"
FontWeight="{StaticResource DefaultAbstractUISubtitleFontWeight}" Visibility="{Binding Path=Subtitle, TargetNullValue=Collapsed, Mode=OneWay, Converter={StaticResource NotNullOrEmptyToVisibilityConverter}}"
Opacity="{StaticResource DefaultAbstractUISubtitleOpacity}" Style="{DynamicResource AbstractUICollectionSubtitleStyle}" />
Visibility="{Binding Path=Subtitle, TargetNullValue=Collapsed, Mode=OneWay, Converter={StaticResource NotNullOrEmptyToVisibilityConverter}}"/>
<ContentControl Content="{Binding}"> <ContentControl Content="{Binding}">
<ContentControl.ContentTemplateSelector> <ContentControl.ContentTemplateSelector>
OwlCore.Wpf/AbstractUI/Themes/AbstractMultiChoiceUIElementStyle.xaml
+5 -5
View File
@@ -44,12 +44,12 @@
<DataTemplate x:Key="DefaultAbstractMultipleChoiceTemplate" DataType="abstractUI:AbstractMultiChoiceUIElementViewModel"> <DataTemplate x:Key="DefaultAbstractMultipleChoiceTemplate" DataType="abstractUI:AbstractMultiChoiceUIElementViewModel">
<StackPanel> <StackPanel>
<TextBlock Text="{Binding Title}" FontSize="{StaticResource DefaultAbstractUITitleFontSize}" ToolTipService.ToolTip="{Binding TooltipText}" /> <TextBlock Text="{Binding Title}" ToolTipService.ToolTip="{Binding TooltipText}"
Style="{DynamicResource AbstractUICollectionTitleStyle}" />
<TextBlock Text="{Binding Subtitle}" FontSize="{StaticResource DefaultAbstractUISubtitleFontSize}" <TextBlock Text="{Binding Subtitle}"
FontWeight="{StaticResource DefaultAbstractUISubtitleFontWeight}" Visibility="{Binding Path=Subtitle, TargetNullValue=Collapsed}"
Opacity="{StaticResource DefaultAbstractUISubtitleOpacity}" Style="{DynamicResource AbstractUICollectionSubtitleStyle}" />
Visibility="{Binding Path=Subtitle, TargetNullValue=Collapsed}"/>
<ContentControl Content="{Binding}" Margin="0,5,0,0"> <ContentControl Content="{Binding}" Margin="0,5,0,0">
<ContentControl.ContentTemplateSelector> <ContentControl.ContentTemplateSelector>
OwlCore.Wpf/AbstractUI/Themes/AbstractProgressUIElementStyle.xaml
+5 -5
View File
@@ -13,12 +13,12 @@
<DataTemplate x:Key="DefaultAbstractProgressUIElementTemplate" DataType="abstractUI:AbstractProgressIndicatorViewModel"> <DataTemplate x:Key="DefaultAbstractProgressUIElementTemplate" DataType="abstractUI:AbstractProgressIndicatorViewModel">
<StackPanel> <StackPanel>
<TextBlock Text="{Binding Title, Mode=OneWay}" FontSize="{StaticResource DefaultAbstractUITitleFontSize}" ToolTipService.ToolTip="{Binding TooltipText, Mode=OneWay}" /> <TextBlock Text="{Binding Title, Mode=OneWay}" ToolTipService.ToolTip="{Binding TooltipText, Mode=OneWay}"
Style="{DynamicResource AbstractUICollectionTitleStyle}" />
<TextBlock Text="{Binding Subtitle, Mode=OneWay}" FontSize="{StaticResource DefaultAbstractUISubtitleFontSize}" <TextBlock Text="{Binding Subtitle, Mode=OneWay}"
FontWeight="{StaticResource DefaultAbstractUISubtitleFontWeight}" Visibility="{Binding Path=Subtitle, TargetNullValue=Collapsed, Mode=OneWay}"
Opacity="{StaticResource DefaultAbstractUISubtitleOpacity}" Style="{DynamicResource AbstractUICollectionSubtitleStyle}" />
Visibility="{Binding Path=Subtitle, TargetNullValue=Collapsed, Mode=OneWay}"/>
<ProgressBar Value="{Binding Value, Mode=OneWay}" Minimum="{Binding Minimum, Mode=OneWay}" Maximum="{Binding Maximum, Mode=OneWay}" IsIndeterminate="{Binding IsIndeterminate, Mode=OneWay}"/> <ProgressBar Value="{Binding Value, Mode=OneWay}" Minimum="{Binding Minimum, Mode=OneWay}" Maximum="{Binding Maximum, Mode=OneWay}" IsIndeterminate="{Binding IsIndeterminate, Mode=OneWay}"/>
</StackPanel> </StackPanel>
OwlCore.Wpf/AbstractUI/Themes/AbstractRichTextBlockStyle.xaml
+6 -5
View File
@@ -11,15 +11,16 @@
<DataTemplate x:Key="DefaultAbstractRichTextBlockTemplate" DataType="abstractUI:AbstractRichTextBlockViewModel"> <DataTemplate x:Key="DefaultAbstractRichTextBlockTemplate" DataType="abstractUI:AbstractRichTextBlockViewModel">
<StackPanel> <StackPanel>
<TextBlock Text="{Binding Title, Mode=OneWay}" FontSize="{StaticResource DefaultAbstractUITitleFontSize}" ToolTipService.ToolTip="{Binding TooltipText, Mode=OneWay}" /> <TextBlock Text="{Binding Title, Mode=OneWay}" ToolTipService.ToolTip="{Binding TooltipText, Mode=OneWay}"
Style="{DynamicResource AbstractUICollectionTitleStyle}" />
<TextBlock Text="{Binding Subtitle, Mode=OneWay}" FontSize="{StaticResource DefaultAbstractUISubtitleFontSize}" <TextBlock Text="{Binding Subtitle, Mode=OneWay}"
FontWeight="{StaticResource DefaultAbstractUISubtitleFontWeight}" Visibility="{Binding Path=Subtitle, TargetNullValue=Collapsed, Mode=OneWay}"
Opacity="{StaticResource DefaultAbstractUISubtitleOpacity}" Style="{DynamicResource AbstractUICollectionSubtitleStyle}" />
Visibility="{Binding Path=Subtitle, TargetNullValue=Collapsed, Mode=OneWay}"/>
<!-- TODO: Marddown text block for WPF? --> <!-- TODO: Marddown text block for WPF? -->
<!--<controls:MarkdownTextBlock Text="{Binding RichText}"/>--> <!--<controls:MarkdownTextBlock Text="{Binding RichText}"/>-->
<TextBlock Text="{Binding RichText}"/>
</StackPanel> </StackPanel>
</DataTemplate> </DataTemplate>
OwlCore.Wpf/AbstractUI/Themes/AbstractTextBoxStyle.xaml
+5 -5
View File
@@ -13,12 +13,12 @@
<DataTemplate x:Key="DefaultAbstractTextBoxTemplate" DataType="abstractUI:AbstractTextBoxViewModel"> <DataTemplate x:Key="DefaultAbstractTextBoxTemplate" DataType="abstractUI:AbstractTextBoxViewModel">
<StackPanel> <StackPanel>
<TextBlock Text="{Binding Title, Mode=OneWay}" FontSize="{StaticResource DefaultAbstractUITitleFontSize}" ToolTipService.ToolTip="{Binding TooltipText, Mode=OneWay}" /> <TextBlock Text="{Binding Title, Mode=OneWay}" ToolTipService.ToolTip="{Binding TooltipText, Mode=OneWay}"
Style="{DynamicResource AbstractUICollectionTitleStyle}" />
<TextBlock Text="{Binding Subtitle, Mode=OneWay}" FontSize="{StaticResource DefaultAbstractUISubtitleFontSize}" <TextBlock Text="{Binding Subtitle, Mode=OneWay}"
FontWeight="{StaticResource DefaultAbstractUISubtitleFontWeight}" Visibility="{Binding Path=Subtitle, TargetNullValue=Collapsed, Mode=OneWay}"
Opacity="{StaticResource DefaultAbstractUISubtitleOpacity}" Style="{DynamicResource AbstractUICollectionSubtitleStyle}" />
Visibility="{Binding Path=Subtitle, TargetNullValue=Collapsed, Mode=OneWay}"/>
<TextBox Text="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" <TextBox Text="{Binding Value, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
Margin="0,5,0,0" Margin="0,5,0,0"
OwlCore.Wpf/AbstractUI/Themes/AbstractUIResources.xaml
+5 -12
View File
@@ -1,22 +1,15 @@
<ResourceDictionary <ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation" xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
xmlns:core="clr-namespace:System;assembly=System.Runtime">
<core:Double x:Key="DefaultAbstractUITitleFontSize">24</core:Double>
<core:Double x:Key="DefaultAbstractUISubtitleFontSize">18</core:Double>
<FontWeight x:Key="DefaultAbstractUISubtitleFontWeight">Light</FontWeight>
<core:Double x:Key="DefaultAbstractUISubtitleOpacity">0.5</core:Double>
<Style x:Key="AbstractUICollectionTitleStyle" TargetType="TextBlock"> <Style x:Key="AbstractUICollectionTitleStyle" TargetType="TextBlock">
<Setter Property="FontSize" Value="{DynamicResource DefaultAbstractUITitleFontSize}"/> <Setter Property="FontSize" Value="24"/>
</Style> </Style>
<Style x:Key="AbstractUICollectionSubtitleStyle" TargetType="TextBlock"> <Style x:Key="AbstractUICollectionSubtitleStyle" TargetType="TextBlock">
<Setter Property="FontSize" Value="{StaticResource DefaultAbstractUISubtitleFontSize}"/> <Setter Property="FontSize" Value="18"/>
<Setter Property="FontWeight" Value="{StaticResource DefaultAbstractUISubtitleFontWeight}"/> <Setter Property="FontWeight" Value="Light"/>
<Setter Property="Opacity" Value="{StaticResource DefaultAbstractUISubtitleOpacity}"/> <Setter Property="Opacity" Value="0.5"/>
</Style> </Style>
</ResourceDictionary> </ResourceDictionary>