Skip to content

Commit

Permalink
Updated resources and styles (#348)
Browse files Browse the repository at this point in the history
  • Loading branch information
@Leo-Peyronnet
Leo-Peyronnet committed Aug 13, 2022
1 parent 74c6e8c commit 9d94dc3
Show file tree
Hide file tree
Showing 7 changed files with 109 additions and 33 deletions.
99 changes: 66 additions & 33 deletions InternetTest/InternetTest/App.xaml
View file
Expand Up @@ -8,40 +8,40 @@
<ResourceDictionary.MergedDictionaries>
<ResourceDictionary Source="/Themes/Light.xaml"/>
</ResourceDictionary.MergedDictionaries>
<Style x:Key="PrimaryButton" TargetType="{x:Type Button}">
<Setter Property="Cursor" Value="Hand"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Border x:Name="border" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true" CornerRadius="5">
<ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsDefaulted" Value="true">
<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
</Trigger>
<Trigger Property="IsMouseOver" Value="true">
<Setter Property="Background" TargetName="border" Value="{Binding Source={StaticResource AccentColor}}"/>
<Setter Property="BorderBrush" TargetName="border" Value="Transparent"/>
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="White"/>
<Style x:Key="PrimaryButton" TargetType="{x:Type Button}">
<Setter Property="Cursor" Value="Hand"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Border x:Name="border" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true" CornerRadius="5">
<ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsDefaulted" Value="true">
<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
</Trigger>
<Trigger Property="IsMouseOver" Value="true">
<Setter Property="Background" TargetName="border" Value="{Binding Source={StaticResource AccentColor}}"/>
<Setter Property="BorderBrush" TargetName="border" Value="Transparent"/>
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="White"/>

</Trigger>
<Trigger Property="IsPressed" Value="true">
<Setter Property="Background" TargetName="border" Value="{Binding Source={StaticResource AccentColor}}"/>
<Setter Property="BorderBrush" TargetName="border" Value="Transparent"/>
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="White"/>
</Trigger>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Background" TargetName="border" Value="Transparent"/>
<Setter Property="BorderBrush" TargetName="border" Value="Transparent"/>
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{Binding Source={StaticResource Gray}}"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="StandardButton" TargetType="{x:Type Button}">
</Trigger>
<Trigger Property="IsPressed" Value="true">
<Setter Property="Background" TargetName="border" Value="{Binding Source={StaticResource AccentColor}}"/>
<Setter Property="BorderBrush" TargetName="border" Value="Transparent"/>
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="White"/>
</Trigger>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Background" TargetName="border" Value="Transparent"/>
<Setter Property="BorderBrush" TargetName="border" Value="Transparent"/>
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{Binding Source={StaticResource Gray}}"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
<Style x:Key="StandardButton" TargetType="{x:Type Button}">
<Setter Property="Cursor" Value="Hand"/>
<Setter Property="Template">
<Setter.Value>
Expand Down Expand Up @@ -106,6 +106,39 @@
</Setter.Value>
</Setter>
</Style>

<Style x:Key="ToolButton" TargetType="{x:Type Button}">
<Setter Property="Cursor" Value="Hand"/>
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Border x:Name="border" Background="{TemplateBinding Background}" BorderThickness="{TemplateBinding BorderThickness}" SnapsToDevicePixels="true" CornerRadius="5">
<ContentPresenter x:Name="contentPresenter" Focusable="False" HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}" Margin="{TemplateBinding Padding}" RecognizesAccessKey="True" SnapsToDevicePixels="{TemplateBinding SnapsToDevicePixels}" VerticalAlignment="{TemplateBinding VerticalContentAlignment}"/>
</Border>
<ControlTemplate.Triggers>
<Trigger Property="IsDefaulted" Value="true">
<Setter Property="BorderBrush" TargetName="border" Value="{DynamicResource {x:Static SystemColors.HighlightBrushKey}}"/>
</Trigger>
<Trigger Property="IsMouseOver" Value="true">
<Setter Property="Background" TargetName="border" Value="{Binding Source={StaticResource Background2}}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{Binding Source={StaticResource Background2}}"/>
<!--<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="White"/>-->
</Trigger>
<Trigger Property="IsPressed" Value="true">
<Setter Property="Background" TargetName="border" Value="{Binding Source={StaticResource Background2}}"/>
<Setter Property="BorderBrush" TargetName="border" Value="{Binding Source={StaticResource Background2}}"/>
<!--<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="White"/>-->
</Trigger>
<Trigger Property="IsEnabled" Value="false">
<Setter Property="Background" TargetName="border" Value="Transparent"/>
<Setter Property="BorderBrush" TargetName="border" Value="Transparent"/>
<Setter Property="TextElement.Foreground" TargetName="contentPresenter" Value="{Binding Source={StaticResource Gray}}"/>
</Trigger>
</ControlTemplate.Triggers>
</ControlTemplate>
</Setter.Value>
</Setter>
</Style>
</ResourceDictionary>
</Application.Resources>
</Application>
18 changes: 18 additions & 0 deletions InternetTest/InternetTest/Properties/Resources.Designer.cs
View file

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions InternetTest/InternetTest/Properties/Resources.en-US.resx
View file
Expand Up @@ -219,4 +219,10 @@
<data name="TestConnection" xml:space="preserve">
<value>Test your connection</value>
</data>
<data name="WebsiteAvailable" xml:space="preserve">
<value>The website is available</value>
</data>
<data name="WebsiteDown" xml:space="preserve">
<value>The website is down</value>
</data>
</root>
6 changes: 6 additions & 0 deletions InternetTest/InternetTest/Properties/Resources.fr-FR.resx
View file
Expand Up @@ -219,4 +219,10 @@
<data name="TestConnection" xml:space="preserve">
<value>Tester votre connection</value>
</data>
<data name="WebsiteAvailable" xml:space="preserve">
<value>Le site est disponible</value>
</data>
<data name="WebsiteDown" xml:space="preserve">
<value>Le site n'est pas disponible</value>
</data>
</root>
6 changes: 6 additions & 0 deletions InternetTest/InternetTest/Properties/Resources.resx
View file
Expand Up @@ -219,4 +219,10 @@
<data name="TestConnection" xml:space="preserve">
<value>Test your connection</value>
</data>
<data name="WebsiteAvailable" xml:space="preserve">
<value>The website is available</value>
</data>
<data name="WebsiteDown" xml:space="preserve">
<value>The website is down</value>
</data>
</root>
6 changes: 6 additions & 0 deletions InternetTest/InternetTest/Properties/Resources.zh-CN.resx
View file
Expand Up @@ -219,4 +219,10 @@
<data name="TestConnection" xml:space="preserve">
<value>Test your connection</value>
</data>
<data name="WebsiteAvailable" xml:space="preserve">
<value>该网站已上线</value>
</data>
<data name="WebsiteDown" xml:space="preserve">
<value>该网站已关闭</value>
</data>
</root>
1 change: 1 addition & 0 deletions InternetTest/InternetTest/Themes/Light.xaml
View file
Expand Up @@ -4,6 +4,7 @@
xmlns:sys="clr-namespace:System;assembly=mscorlib">

<sys:String x:Key="Background1">#ffffff</sys:String>
<sys:String x:Key="Background2">#e6e6e6</sys:String>
<sys:String x:Key="CardBackground">#ffffff</sys:String>
<sys:String x:Key="Foreground1">#000000</sys:String>
<sys:String x:Key="BackgroundImg">/Images/LightBackground.png</sys:String>
Expand Down

0 comments on commit 9d94dc3

Please sign in to comment.