Skip to content

Portable Tool for an Ideal Windows Setup

-added modified style for button

Greedeks9892953c82bf
diff --git a/.Source/GTweak/Assets/DrawingImages/Other.xaml b/.Source/GTweak/Assets/DrawingImages/Other.xaml
index d81197a2..fc82174d 100644
--- a/.Source/GTweak/Assets/DrawingImages/Other.xaml
+++ b/.Source/GTweak/Assets/DrawingImages/Other.xaml
@@ -80,9 +80,9 @@
<DrawingImage.Drawing>
<DrawingGroup ClipGeometry="M0,0 V96 H96 V0 H0 Z">
<DrawingGroup Opacity="1">
- <GeometryDrawing Brush="{DynamicResource Color_Background_Dark}" Geometry="F1 M96,96z M0,0z M83.9,71.3L75.3,71.3C75.2,71.4 75.2,71.4 75.1,71.4 75.1,71.6 75,71.8 75,72 73.4,74.1 72.5,74.9 69.9,75.4 69.9,75.4 69.8,75.4 69.8,75.4 69,75.4 68.1,75.4 67.3,75.4 65.8,75.4 65.8,75.4 64.4,75.4 63.3,75.4 62.3,75.4 61.3,75.4 59.1,75.4 57,75.4 54.8,75.4 51.4,75.4 48,75.4 44.5,75.4 42.3,75.4 40,75.4 37.8,75.4 36.7,75.4 35.7,75.4 34.6,75.4 33.5,75.4 32.5,75.4 31.5,75.4 30.5,75.4 29.6,75.4 28.6,75.4 26.2,75.5 26.1,75.5 24.1,75 24,75 23.9,74.9 23.8,74.9 22.2,73.7 21.5,73 21.1,71.7 21,71.4 20.8,71.3 20.5,71.3L12.3,71.3C11.9,71.3 11.6,71.6 11.6,72 11.9,75.4 12.7,78.7 15.1,81.5 15.1,81.5 15.2,81.6 15.2,81.6 18.8,84.5 18.9,84.5 28.4,84.5 29.7,84.5 30.9,84.5 32.1,84.4 36.1,84.4 40,84.4 44,84.3 46.8,84.3 49.5,84.2 52.3,84.2 57.5,84.2 62.8,84.1 68,84.1 69.2,84.1 70.3,84.1 71.5,84.1 76.4,84 78,83.9 81.5,80.4 81.5,80.4 81.6,80.3 81.6,80.3 83.8,77.6 84.4,75.2 84.5,71.9 84.6,71.6 84.3,71.3 83.9,71.3z" />
+ <GeometryDrawing Brush="{DynamicResource Color_Highlighted}" Geometry="F1 M96,96z M0,0z M83.9,71.3L75.3,71.3C75.2,71.4 75.2,71.4 75.1,71.4 75.1,71.6 75,71.8 75,72 73.4,74.1 72.5,74.9 69.9,75.4 69.9,75.4 69.8,75.4 69.8,75.4 69,75.4 68.1,75.4 67.3,75.4 65.8,75.4 65.8,75.4 64.4,75.4 63.3,75.4 62.3,75.4 61.3,75.4 59.1,75.4 57,75.4 54.8,75.4 51.4,75.4 48,75.4 44.5,75.4 42.3,75.4 40,75.4 37.8,75.4 36.7,75.4 35.7,75.4 34.6,75.4 33.5,75.4 32.5,75.4 31.5,75.4 30.5,75.4 29.6,75.4 28.6,75.4 26.2,75.5 26.1,75.5 24.1,75 24,75 23.9,74.9 23.8,74.9 22.2,73.7 21.5,73 21.1,71.7 21,71.4 20.8,71.3 20.5,71.3L12.3,71.3C11.9,71.3 11.6,71.6 11.6,72 11.9,75.4 12.7,78.7 15.1,81.5 15.1,81.5 15.2,81.6 15.2,81.6 18.8,84.5 18.9,84.5 28.4,84.5 29.7,84.5 30.9,84.5 32.1,84.4 36.1,84.4 40,84.4 44,84.3 46.8,84.3 49.5,84.2 52.3,84.2 57.5,84.2 62.8,84.1 68,84.1 69.2,84.1 70.3,84.1 71.5,84.1 76.4,84 78,83.9 81.5,80.4 81.5,80.4 81.6,80.3 81.6,80.3 83.8,77.6 84.4,75.2 84.5,71.9 84.6,71.6 84.3,71.3 83.9,71.3z" />
</DrawingGroup>
- <GeometryDrawing Brush="{DynamicResource Color_Background_Dark}" Geometry="F1 M96,96z M0,0z M47,15.3C48.7,16 50.3,16.6 52,17.3 52.3,30.2 52.7,43 53,56.3 55,54.6 57,53 59,51.3 61.4,52.1 61.4,52.1 64,53.3 64.8,55.1 64.8,55.1 65,57.3 63.8,59.2 63.8,59.2 62,61.1 61.4,61.8 60.7,62.5 60,63.2 59.3,63.9 58.7,64.6 58,65.3 57.1,66.3 57.1,66.3 56.2,67.4 55.6,68 55,68.7 54.5,69.3 54,69.9 53.5,70.5 52.9,71.1 50,73 48.4,72.9 45,72.3 42.4,70.5 40.3,68.3 38.2,66.1 37.6,65.5 37,64.9 36.4,64.3 31.4,59.1 31.4,59.1 31,55.3 32.9,53.1 32.9,53.1 35,51.3 38.4,52.5 40.5,53.7 43,56.3 43,55.1 43,54 43,52.8 43.1,48.5 43.1,44.1 43.2,39.8 43.2,37.9 43.3,36 43.3,34.2 43.3,31.5 43.4,28.8 43.4,26.1 43.4,24.8 43.4,24.8 43.4,23.5 43.5,21.1 43.5,21.1 43.9,17.3 45,16.6 46,16 47,15.3z" />
+ <GeometryDrawing Brush="{DynamicResource Color_Highlighted}" Geometry="F1 M96,96z M0,0z M47,15.3C48.7,16 50.3,16.6 52,17.3 52.3,30.2 52.7,43 53,56.3 55,54.6 57,53 59,51.3 61.4,52.1 61.4,52.1 64,53.3 64.8,55.1 64.8,55.1 65,57.3 63.8,59.2 63.8,59.2 62,61.1 61.4,61.8 60.7,62.5 60,63.2 59.3,63.9 58.7,64.6 58,65.3 57.1,66.3 57.1,66.3 56.2,67.4 55.6,68 55,68.7 54.5,69.3 54,69.9 53.5,70.5 52.9,71.1 50,73 48.4,72.9 45,72.3 42.4,70.5 40.3,68.3 38.2,66.1 37.6,65.5 37,64.9 36.4,64.3 31.4,59.1 31.4,59.1 31,55.3 32.9,53.1 32.9,53.1 35,51.3 38.4,52.5 40.5,53.7 43,56.3 43,55.1 43,54 43,52.8 43.1,48.5 43.1,44.1 43.2,39.8 43.2,37.9 43.3,36 43.3,34.2 43.3,31.5 43.4,28.8 43.4,26.1 43.4,24.8 43.4,24.8 43.4,23.5 43.5,21.1 43.5,21.1 43.9,17.3 45,16.6 46,16 47,15.3z" />
</DrawingGroup>
</DrawingImage.Drawing>
</DrawingImage>
diff --git a/.Source/GTweak/Styles/Buttons.xaml b/.Source/GTweak/Styles/Buttons.xaml
index 1d57d7f9..5e1b2504 100644
--- a/.Source/GTweak/Styles/Buttons.xaml
+++ b/.Source/GTweak/Styles/Buttons.xaml
@@ -88,7 +88,7 @@
<Setter Property="Template">
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
- <Border CornerRadius="5" Background="{TemplateBinding Background}">
+ <Border CornerRadius="7" Background="{TemplateBinding Background}">
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
</Border>
</ControlTemplate>
@@ -103,7 +103,7 @@
<Setter.Value>
<ControlTemplate TargetType="{x:Type Button}">
<Grid>
- <Border CornerRadius="5" Background="{TemplateBinding Background}">
+ <Border CornerRadius="7" Background="{TemplateBinding Background}">
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
<Border.Style>
<Style TargetType="Border">
@@ -123,7 +123,7 @@
</Style>
</Border.Style>
</Border>
- <Border CornerRadius="5" Background="{TemplateBinding Background}">
+ <Border CornerRadius="7" Background="{TemplateBinding Background}">
<ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
</Border>
</Grid>
@@ -157,4 +157,86 @@
</Style.Triggers>
</Style>
+ <Style TargetType="{x:Type Button}" x:Key="BtnDefaultM">
+ <Setter Property="Foreground" Value="{StaticResource Color_Highlighted}"/>
+ <Setter Property="Background" Value="{StaticResource Color_MButton}"/>
+ <Setter Property="FontFamily" Value="{StaticResource Jura}"/>
+ <Setter Property="FontWeight" Value="Normal"/>
+ <Setter Property="FontSize" Value="13.5px"/>
+ <Setter Property="IsTabStop" Value="False"/>
+ <Setter Property="Cursor" Value="Hand"/>
+ <Setter Property="FocusVisualStyle" Value="{x:Null}" />
+ <Setter Property="RenderTransformOrigin" Value=".5,.5"/>
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="{x:Type Button}">
+ <Border CornerRadius="7" Background="{TemplateBinding Background}">
+ <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+ </Border>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ <Setter Property="RenderTransform">
+ <Setter.Value>
+ <ScaleTransform x:Name="ImageScale" ScaleX="1" ScaleY="1"/>
+ </Setter.Value>
+ </Setter>
+ <Setter Property="Template">
+ <Setter.Value>
+ <ControlTemplate TargetType="{x:Type Button}">
+ <Grid>
+ <Border CornerRadius="7" Background="{TemplateBinding Background}">
+ <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+ <Border.Style>
+ <Style TargetType="Border">
+ <Setter Property="Visibility" Value="Hidden"/>
+ <Style.Triggers>
+ <DataTrigger Binding="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Button}}, Path = IsMouseOver}" Value="true">
+ <DataTrigger.Setters>
+ <Setter Property="Effect">
+ <Setter.Value>
+ <BlurEffect Radius="5"/>
+ </Setter.Value>
+ </Setter>
+ <Setter Property="Visibility" Value="Visible"/>
+ </DataTrigger.Setters>
+ </DataTrigger>
+ </Style.Triggers>
+ </Style>
+ </Border.Style>
+ </Border>
+ <Border CornerRadius="7" Background="{TemplateBinding Background}">
+ <ContentPresenter HorizontalAlignment="Center" VerticalAlignment="Center"/>
+ </Border>
+ </Grid>
+ </ControlTemplate>
+ </Setter.Value>
+ </Setter>
+ <Style.Triggers>
+ <Trigger Property="IsMouseOver" Value="True">
+ <Setter Property="Background" Value="{StaticResource Color_MButtonOver}"/>
+ </Trigger>
+ <EventTrigger RoutedEvent="Button.MouseEnter">
+ <EventTrigger.Actions>
+ <BeginStoryboard>
+ <Storyboard Timeline.DesiredFrameRate="400">
+ <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleX" From="1" To="1.02" Duration="0:0:1.0" SpeedRatio="10"/>
+ <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleY" From="1" To="1.02" Duration="0:0:1.0" SpeedRatio="10"/>
+ </Storyboard>
+ </BeginStoryboard>
+ </EventTrigger.Actions>
+ </EventTrigger>
+ <EventTrigger RoutedEvent="Button.MouseLeave">
+ <EventTrigger.Actions>
+ <BeginStoryboard>
+ <Storyboard Timeline.DesiredFrameRate="400">
+ <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleX" From="1.02" To="1" Duration="0:0:1.0" SpeedRatio="11"/>
+ <DoubleAnimation Storyboard.TargetProperty="RenderTransform.ScaleY" From="1.02" To="1" Duration="0:0:1.0" SpeedRatio="11"/>
+ </Storyboard>
+ </BeginStoryboard>
+ </EventTrigger.Actions>
+ </EventTrigger>
+ </Style.Triggers>
+ </Style>
+
</ResourceDictionary>
\ No newline at end of file
diff --git a/.Source/GTweak/Styles/Themes/Dark/Colors.xaml b/.Source/GTweak/Styles/Themes/Dark/Colors.xaml
index b720956b..eb0aec7a 100644
--- a/.Source/GTweak/Styles/Themes/Dark/Colors.xaml
+++ b/.Source/GTweak/Styles/Themes/Dark/Colors.xaml
@@ -9,7 +9,9 @@
<SolidColorBrush x:Key="Color_Highlighted" Color="#FFFFFF"/>
<SolidColorBrush x:Key="Color_Over" Color="#6AECA3"/>
+ <SolidColorBrush x:Key="Color_MButton" Color="#FF292929"/>
<SolidColorBrush x:Key="Color_ButtonOver" Color="#60f0a8"/>
+ <SolidColorBrush x:Key="Color_MButtonOver" Color="#FF313131"/>
<SolidColorBrush x:Key="Color_ButtonOver_Navigation" Color="#212121"/>
<SolidColorBrush x:Key="Color_Border" Color="#00D65E"/>
diff --git a/.Source/GTweak/Styles/Themes/Light/Colors.xaml b/.Source/GTweak/Styles/Themes/Light/Colors.xaml
index aad30f7c..5f29afa2 100644
--- a/.Source/GTweak/Styles/Themes/Light/Colors.xaml
+++ b/.Source/GTweak/Styles/Themes/Light/Colors.xaml
@@ -9,8 +9,10 @@
<SolidColorBrush x:Key="Color_Highlighted" Color="#111111"/>
<SolidColorBrush x:Key="Color_Over" Color="#4CA874"/>
+ <SolidColorBrush x:Key="Color_MButton" Color="#d6d6d6"/>
<SolidColorBrush x:Key="Color_ButtonOver" Color="#45AB77"/>
<SolidColorBrush x:Key="Color_ButtonOver_Navigation" Color="#E1E1E1"/>
+ <SolidColorBrush x:Key="Color_MButtonOver" Color="#d8d8d8"/>
<SolidColorBrush x:Key="Color_Border" Color="#009843"/>
<SolidColorBrush x:Key="Color_ComboBoxOver" Color="#E1E1E1"/>
diff --git a/.Source/GTweak/Windows/MainWindow.xaml b/.Source/GTweak/Windows/MainWindow.xaml
index 992bd4fd..a34de81d 100644
--- a/.Source/GTweak/Windows/MainWindow.xaml
+++ b/.Source/GTweak/Windows/MainWindow.xaml
@@ -217,13 +217,13 @@
<StackPanel Orientation="Horizontal" Margin="40,15,0,0">
<TextBlock Style="{StaticResource Text_In}" Foreground="{StaticResource Color_Highlighted}" Margin="0,4,0,0" Text="{DynamicResource text_saveconfig}"/>
- <Button x:Name="BtnExport" FontSize="10pt" Style="{StaticResource BtnDefault}" Width="96" Height="26" Margin="10,0,0,0" Cursor="Hand" PreviewMouseDown="BtnExport_PreviewMouseDown">
+ <Button x:Name="BtnExport" FontSize="10pt" Style="{StaticResource BtnDefault}" Width="106" Height="26" Margin="10,0,0,0" Cursor="Hand" PreviewMouseDown="BtnExport_PreviewMouseDown">
<StackPanel Orientation="Horizontal">
<TextBlock Text="{DynamicResource btn_export}" Margin="0,2,0,0"/>
<Image Source="{DynamicResource DI_Export}" Margin="5,0,0,0" Width="20" Height="20"/>
</StackPanel>
</Button>
- <Button x:Name="BtnImport" FontSize="10pt" Style="{StaticResource BtnDefault}" Width="96" Height="26" Margin="10,0,0,0" Cursor="Hand" PreviewMouseDown="BtnImport_PreviewMouseDown">
+ <Button x:Name="BtnImport" FontSize="10pt" Style="{StaticResource BtnDefaultM}" Width="106" Height="26" Margin="10,0,0,0" Cursor="Hand" PreviewMouseDown="BtnImport_PreviewMouseDown">
<StackPanel Orientation="Horizontal">
<TextBlock Text="{DynamicResource btn_import}" Margin="0,2,0,0"/>
<Image Source="{DynamicResource DI_Import}" Margin="5,0,0,0" Width="20" Height="20"/>