Skip to content

Portable Tool for an Ideal Windows Setup

-sorting

Greedeks3cbbc842ce90
diff --git a/.Source/GTweak/App.xaml b/.Source/GTweak/App.xaml
index 47b547b3..16a47d95 100644
--- a/.Source/GTweak/App.xaml
+++ b/.Source/GTweak/App.xaml
@@ -7,13 +7,13 @@
<Application.Resources>
<ResourceDictionary>
<ResourceDictionary.MergedDictionaries>
- <ResourceDictionary Source="Language/Lang.xaml" />
+ <ResourceDictionary Source="Languages/en/Lang.xaml" />
<ResourceDictionary Source="Core/DataTemplate.xaml" />
<ResourceDictionary Source="Assets/Font/Font.xaml" />
- <ResourceDictionary Source="Assets/DrawingImage/Other.xaml" />
- <ResourceDictionary Source="Assets/DrawingImage/AppsInstalled.xaml" />
- <ResourceDictionary Source="Assets/DrawingImage/AppsDeleted.xaml" />
- <ResourceDictionary Source="Styles/Theme/Colors.xaml" />
+ <ResourceDictionary Source="Assets/DrawingImages/Deleted/Applications.xaml" />
+ <ResourceDictionary Source="Assets/DrawingImages/Installed/Applications.xaml" />
+ <ResourceDictionary Source="Assets/DrawingImages/Other.xaml" />
+ <ResourceDictionary Source="Styles/Themes/Dark/Colors.xaml" />
<ResourceDictionary Source="Styles/Buttons.xaml" />
<ResourceDictionary Source="Styles/ScrollBar.xaml" />
<ResourceDictionary Source="Styles/Slider.xaml" />
diff --git a/.Source/GTweak/App.xaml.cs b/.Source/GTweak/App.xaml.cs
index 21e504d1..932af006 100644
--- a/.Source/GTweak/App.xaml.cs
+++ b/.Source/GTweak/App.xaml.cs
@@ -12,12 +12,13 @@ namespace GTweak
internal static event EventHandler LanguageChanged;
internal static event EventHandler ThemeChanged;
internal static event EventHandler ImportTweaksUpdate;
+
public App()
{
InitializeComponent();
}
- internal static void UpdateImport() => ImportTweaksUpdate?.Invoke(null, EventArgs.Empty);
+ internal static void UpdateImport() => ImportTweaksUpdate?.Invoke(default, EventArgs.Empty);
internal static void ViewingSettings()
{
@@ -35,13 +36,13 @@ namespace GTweak
{
Source = value switch
{
- "ru" => new Uri($"Language/Lang.RU.xaml", UriKind.Relative),
- _ => new Uri("Language/Lang.xaml", UriKind.Relative),
+ "ru" => new Uri($"Languages/ru/Lang.xaml", UriKind.Relative),
+ _ => new Uri("Languages/en/Lang.xaml", UriKind.Relative),
}
};
ResourceDictionary oldDictionary = (from dict in Current.Resources.MergedDictionaries
- where dict.Source != null && dict.Source.OriginalString.StartsWith("Language/Lang.")
+ where dict.Source != null && dict.Source.OriginalString.StartsWith($"Languages/")
select dict).First();
if (oldDictionary != null)
{
@@ -49,9 +50,9 @@ namespace GTweak
Current.Resources.MergedDictionaries.Remove(oldDictionary);
Current.Resources.MergedDictionaries.Insert(ind, dictionary);
}
- else {Current.Resources.MergedDictionaries.Add(dictionary); }
+ else { Current.Resources.MergedDictionaries.Add(dictionary); }
- LanguageChanged?.Invoke(null, EventArgs.Empty);
+ LanguageChanged?.Invoke(default, EventArgs.Empty);
}
}
@@ -65,14 +66,14 @@ namespace GTweak
{
Source = value switch
{
- "Light" => new Uri($"Styles/Theme/Colors.Light.xaml", UriKind.Relative),
- "Dark" => new Uri($"Styles/Theme/Colors.xaml", UriKind.Relative),
- _ => Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize")?.GetValue("AppsUseLightTheme")?.ToString()! == "0" ? new Uri("Styles/Theme/Colors.xaml", UriKind.Relative) : new Uri($"Styles/Theme/Colors.Light.xaml", UriKind.Relative),
+ "Light" => new Uri($"Styles/Themes/Light/Colors.xaml", UriKind.Relative),
+ "Dark" => new Uri($"Styles/Themes/Dark/Colors.xaml", UriKind.Relative),
+ _ => Registry.CurrentUser.OpenSubKey(@"Software\Microsoft\Windows\CurrentVersion\Themes\Personalize")?.GetValue("AppsUseLightTheme")?.ToString()! == "0" ? new Uri("Styles/Themes/Dark/Colors.xaml", UriKind.Relative) : new Uri($"Styles/Themes/Light/Colors.xaml", UriKind.Relative),
}
};
ResourceDictionary oldDictionary = (from dict in Current.Resources.MergedDictionaries
- where dict.Source != null && dict.Source.OriginalString.StartsWith("Styles/Theme/Colors.")
+ where dict.Source != null && dict.Source.OriginalString.StartsWith("Styles/Themes/")
select dict).First();
if (oldDictionary != null)
{
@@ -82,7 +83,7 @@ namespace GTweak
}
else { Current.Resources.MergedDictionaries.Add(dictionary); }
- ThemeChanged?.Invoke(null, EventArgs.Empty);
+ ThemeChanged?.Invoke(default, EventArgs.Empty);
}
}
}
diff --git a/.Source/GTweak/Assets/DrawingImage/AppsDeleted.xaml b/.Source/GTweak/Assets/DrawingImages/Deleted/Applications.xaml
similarity index 100%
rename from .Source/GTweak/Assets/DrawingImage/AppsDeleted.xaml
rename to .Source/GTweak/Assets/DrawingImages/Deleted/Applications.xaml
diff --git a/.Source/GTweak/Assets/DrawingImage/AppsInstalled.xaml b/.Source/GTweak/Assets/DrawingImages/Installed/Applications.xaml
similarity index 100%
rename from .Source/GTweak/Assets/DrawingImage/AppsInstalled.xaml
rename to .Source/GTweak/Assets/DrawingImages/Installed/Applications.xaml
diff --git a/.Source/GTweak/Assets/DrawingImage/Other.xaml b/.Source/GTweak/Assets/DrawingImages/Other.xaml
similarity index 100%
rename from .Source/GTweak/Assets/DrawingImage/Other.xaml
rename to .Source/GTweak/Assets/DrawingImages/Other.xaml
diff --git a/.Source/GTweak/GTweak.csproj b/.Source/GTweak/GTweak.csproj
index ca1cc875..39d0635f 100644
--- a/.Source/GTweak/GTweak.csproj
+++ b/.Source/GTweak/GTweak.csproj
@@ -278,11 +278,11 @@
<Compile Include="Windows\WaitingWindow.xaml.cs">
<DependentUpon>WaitingWindow.xaml</DependentUpon>
</Compile>
- <Page Include="Assets\DrawingImage\AppsDeleted.xaml">
+ <Page Include="Assets\DrawingImages\Deleted\Applications.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
- <Page Include="Assets\DrawingImage\AppsInstalled.xaml">
+ <Page Include="Assets\DrawingImages\Installed\Applications.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
@@ -290,7 +290,7 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
- <Page Include="Assets\DrawingImage\Other.xaml">
+ <Page Include="Assets\DrawingImages\Other.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
@@ -298,11 +298,11 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
- <Page Include="Language\Lang.RU.xaml">
+ <Page Include="Languages\ru\Lang.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
- <Page Include="Language\Lang.xaml">
+ <Page Include="Languages\en\Lang.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
@@ -342,11 +342,11 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
- <Page Include="Styles\Theme\Colors.Light.xaml">
+ <Page Include="Styles\Themes\Light\Colors.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
- <Page Include="Styles\Theme\Colors.xaml">
+ <Page Include="Styles\Themes\Dark\Colors.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
diff --git a/.Source/GTweak/Language/lang.xaml b/.Source/GTweak/Languages/en/Lang.xaml
similarity index 100%
rename from .Source/GTweak/Language/lang.xaml
rename to .Source/GTweak/Languages/en/Lang.xaml
diff --git a/.Source/GTweak/Language/lang.ru.xaml b/.Source/GTweak/Languages/ru/Lang.xaml
similarity index 100%
rename from .Source/GTweak/Language/lang.ru.xaml
rename to .Source/GTweak/Languages/ru/Lang.xaml
diff --git a/.Source/GTweak/Styles/Theme/Colors.xaml b/.Source/GTweak/Styles/Themes/Dark/Colors.xaml
similarity index 100%
rename from .Source/GTweak/Styles/Theme/Colors.xaml
rename to .Source/GTweak/Styles/Themes/Dark/Colors.xaml
diff --git a/.Source/GTweak/Styles/Theme/Colors.Light.xaml b/.Source/GTweak/Styles/Themes/Light/Colors.xaml
similarity index 100%
rename from .Source/GTweak/Styles/Theme/Colors.Light.xaml
rename to .Source/GTweak/Styles/Themes/Light/Colors.xaml
diff --git a/.Source/GTweak/View/ApplicationsView.xaml b/.Source/GTweak/View/ApplicationsView.xaml
index 854086fb..010dee6f 100644
--- a/.Source/GTweak/View/ApplicationsView.xaml
+++ b/.Source/GTweak/View/ApplicationsView.xaml
@@ -27,85 +27,319 @@
<Grid HorizontalAlignment="Center" VerticalAlignment="Center" Width="Auto" Height="Auto" Margin="0,-20,0,0">
<StackPanel Orientation="Vertical" Margin="92,50,884,0" VerticalAlignment="Top">
- <Image x:Name="MicrosoftStore" Style="{DynamicResource Apps}" Source="{DynamicResource A_DI_MicrosoftStore}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="Xbox" Style="{StaticResource Apps}" Source="{StaticResource A_DI_Xbox}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="OneNote" Style="{StaticResource Apps}" Source="{StaticResource A_DI_OneNote}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="Outlook" Style="{StaticResource Apps}" Source="{StaticResource A_DI_Outlook}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
+ <Image x:Name="MicrosoftStore" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_MicrosoftStore}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="Xbox" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_Xbox}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="OneNote" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_OneNote}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="Outlook" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_Outlook}"/>
+ </Style>
+ </Image.Style>
+ </Image>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="172,95,804,0" VerticalAlignment="Top">
- <Image x:Name="MicrosoftOfficeHub" Style="{StaticResource Apps}" Source="{StaticResource A_DI_MicrosoftOfficeHub}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="MicrosoftSolitaireCollection" Style="{StaticResource Apps}" Source="{StaticResource A_DI_MicrosoftSolitaireCollection}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="MixedReality" Style="{StaticResource Apps}" Source="{StaticResource A_DI_MixedReality}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
+ <Image x:Name="MicrosoftOfficeHub" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_MicrosoftOfficeHub}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="MicrosoftSolitaireCollection" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_MicrosoftSolitaireCollection}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="MixedReality" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_MixedReality}"/>
+ </Style>
+ </Image.Style>
+ </Image>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="252,50,724,0" VerticalAlignment="Top">
- <Image x:Name="BingWeather" Style="{StaticResource Apps}" Source="{StaticResource A_DI_BingWeather}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="Microsoft3D" Style="{StaticResource Apps}" Source="{StaticResource A_DI_Microsoft3D}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="SkypeApp" Style="{StaticResource Apps}" Source="{StaticResource A_DI_SkypeApp}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="BingSports" Style="{StaticResource Apps}" Source="{StaticResource A_DI_BingSports}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
+ <Image x:Name="BingWeather" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_BingWeather}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="Microsoft3D" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_Microsoft3D}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="SkypeApp" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_SkypeApp}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="BingSports" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_BingSports}"/>
+ </Style>
+ </Image.Style>
+ </Image>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="332,95,644,0" VerticalAlignment="Top">
- <Image x:Name="OneDrive" Style="{StaticResource Apps}" Source="{StaticResource A_DI_OneDrive}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="Cortana" Style="{StaticResource Apps}" Source="{StaticResource A_DI_Cortana}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="MicrosoftTeams" Style="{StaticResource Apps}" Source="{StaticResource A_DI_MicrosoftTeams}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
+ <Image x:Name="OneDrive" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_OneDrive}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="Cortana" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_Cortana}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="MicrosoftTeams" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_MicrosoftTeams}"/>
+ </Style>
+ </Image.Style>
+ </Image>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="412,50,564,0" VerticalAlignment="Top">
- <Image x:Name="Music" Style="{StaticResource Apps}" Source="{StaticResource A_DI_Music}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="Video" Style="{StaticResource Apps}" Source="{StaticResource A_DI_Video}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="SoundRecorder" Style="{StaticResource Apps}" Source="{StaticResource A_DI_SoundRecorder}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="BingFinance" Style="{StaticResource Apps}" Source="{StaticResource A_DI_BingFinance}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
+ <Image x:Name="Music" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_Music}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="Video" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_Video}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="SoundRecorder" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_SoundRecorder}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="BingFinance" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_BingFinance}"/>
+ </Style>
+ </Image.Style>
+ </Image>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="492,95,484,0" VerticalAlignment="Top">
- <Image x:Name="FeedbackHub" Style="{StaticResource Apps}" Source="{StaticResource A_DI_FeedbackHub}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="Mail" Style="{StaticResource Apps}" Source="{StaticResource A_DI_Mail}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="Widgets" Style="{StaticResource Apps}" Source="{StaticResource A_DI_Widgets}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
+ <Image x:Name="FeedbackHub" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_FeedbackHub}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="Mail" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_Mail}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="Widgets" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_Widgets}"/>
+ </Style>
+ </Image.Style>
+ </Image>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="572,50,404,0" VerticalAlignment="Top">
- <Image x:Name="Photos" Style="{StaticResource Apps}" Source="{StaticResource A_DI_Photos}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="ScreenSketch" Style="{StaticResource Apps}" Source="{StaticResource A_DI_ScreenSketch}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="ClipChamp" Style="{StaticResource Apps}" Source="{StaticResource A_DI_ClipChamp}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="YandexMusic" Style="{StaticResource Apps}" Source="{StaticResource A_DI_YandexMusic}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
+ <Image x:Name="Photos" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_Photos}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="ScreenSketch" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_ScreenSketch}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="ClipChamp" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_ClipChamp}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="YandexMusic" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_YandexMusic}"/>
+ </Style>
+ </Image.Style>
+ </Image>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="652,95,324,0" VerticalAlignment="Top">
- <Image x:Name="GetStarted" Style="{StaticResource Apps}" Source="{StaticResource A_DI_GetStarted}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="GetHelp" Style="{StaticResource Apps}" Source="{StaticResource A_DI_GetHelp}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="MicrosoftStickyNotes" Style="{StaticResource Apps}" Source="{StaticResource A_DI_MicrosoftStickyNotes}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
+ <Image x:Name="GetStarted" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_GetStarted}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="GetHelp" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_GetHelp}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="MicrosoftStickyNotes" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_MicrosoftStickyNotes}"/>
+ </Style>
+ </Image.Style>
+ </Image>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="732,50,244,0" VerticalAlignment="Top">
- <Image x:Name="Maps" Style="{StaticResource Apps}" Source="{StaticResource A_DI_Maps}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="Camera" Style="{StaticResource Apps}" Source="{StaticResource A_DI_Camera}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="Paint3D" Style="{StaticResource Apps}" Source="{StaticResource A_DI_Paint3D}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="Netflix" Style="{StaticResource Apps}" Source="{StaticResource A_DI_Netflix}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
+ <Image x:Name="Maps" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_Maps}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="Camera" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_Camera}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="Paint3D" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_Paint3D}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="Netflix" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_Netflix}"/>
+ </Style>
+ </Image.Style>
+ </Image>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="812,95,164,0" VerticalAlignment="Top">
- <Image x:Name="PowerAutomateDesktop" Style="{StaticResource Apps}" Source="{StaticResource A_DI_PowerAutomateDesktop}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="People" Style="{StaticResource Apps}" Source="{StaticResource A_DI_People}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="BingNews" Style="{StaticResource Apps}" Source="{StaticResource A_DI_BingNews}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
+ <Image x:Name="PowerAutomateDesktop" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_PowerAutomateDesktop}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="People" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_People}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="BingNews" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_BingNews}"/>
+ </Style>
+ </Image.Style>
+ </Image>
</StackPanel>
<StackPanel Orientation="Vertical" Margin="892,50,84,0" VerticalAlignment="Top">
- <Image x:Name="Todos" Style="{StaticResource Apps}" Source="{StaticResource A_DI_Todos}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="Alarms" Style="{StaticResource Apps}" Source="{StaticResource A_DI_Alarms}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="Phone" Style="{StaticResource Apps}" Source="{StaticResource A_DI_Phone}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
- <Image x:Name="QuickAssist" Style="{StaticResource Apps}" Source="{StaticResource A_DI_QuickAssist}" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave"/>
+ <Image x:Name="Todos" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_Todos}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="Alarms" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_Alarms}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="Phone" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_Phone}"/>
+ </Style>
+ </Image.Style>
+ </Image>
+ <Image x:Name="QuickAssist" PreviewMouseDown="ClickApp_PreviewMouseDown" MouseEnter="Apps_MouseEnter" MouseLeave="Apps_MouseLeave">
+ <Image.Style>
+ <Style TargetType="{x:Type Image}" BasedOn="{StaticResource Apps}">
+ <Setter Property="Source" Value="{StaticResource A_DI_QuickAssist}"/>
+ </Style>
+ </Image.Style>
+ </Image>
</StackPanel>
</Grid>
diff --git a/.Source/GTweak/Windows/MainWindow.xaml b/.Source/GTweak/Windows/MainWindow.xaml
index 2ad254d5..de81bd20 100644
--- a/.Source/GTweak/Windows/MainWindow.xaml
+++ b/.Source/GTweak/Windows/MainWindow.xaml
@@ -153,7 +153,7 @@
</TextBlock.Effect>
</TextBlock>
- <Border Background="{DynamicResource Color_Accent}" Height="1.2" Width="330" VerticalAlignment="Bottom" CornerRadius="10 10 0 0"/>
+ <Border Background="{StaticResource Color_Accent}" Height="1.2" Width="330" VerticalAlignment="Bottom" CornerRadius="10 10 0 0"/>
</Grid>
<Grid Grid.Row="1">
@@ -187,7 +187,7 @@
</ComboBox>
</StackPanel>
- <Border Background="{DynamicResource Color_Accent}" Height="1.2" Width="330" VerticalAlignment="Bottom" Margin="0,20,0,0" CornerRadius="10 10 0 0"/>
+ <Border Background="{DynamicResource Color_Accent}" Height="1.2" Width="330" VerticalAlignment="Bottom" Margin="0,10,0,0" CornerRadius="10 10 0 0"/>
<StackPanel Orientation="Horizontal" Margin="40,20,0,0">
<TextBlock Style="{StaticResource Text_In}" Foreground="{StaticResource Color_Highlighted}" Margin="0,4,0,0" Text="{DynamicResource text_saveconfig}"/>