mirror/PowerToys
1
0
Fork 0
mirror of https://github.com/microsoft/PowerToys.git synced 2024-11-24 04:12:32 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Clean up

Browse Source
This commit is contained in:
Niels Laute 2021-08-16 12:39:40 +02:00
parent 3113bf5352
commit 028e15fab6
9 changed files with 4 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/settings-ui/Microsoft.PowerToys.Settings.UI/App.xaml
View File

@ -9,6 +9,7 @@
<ResourceDictionary.MergedDictionaries>
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" ControlsResourcesVersion="Version2" />
<ResourceDictionary Source="/Controls/KeyVisual/KeyVisual.xaml" />
<ResourceDictionary Source="/Controls/SettingExpander/SettingExpanderStyles.xaml"/>
<ResourceDictionary Source="/Styles/_FontSizes.xaml" />
<ResourceDictionary Source="/Styles/_Thickness.xaml" />
<ResourceDictionary Source="/Styles/_Sizes.xaml" />
@ -16,7 +17,7 @@
<ResourceDictionary Source="/Styles/Button.xaml"/>
<ResourceDictionary Source="/Themes/Colors.xaml"/>
<ResourceDictionary Source="/Themes/SettingsExpanderStyles.xaml"/>
</ResourceDictionary.MergedDictionaries>
<Thickness x:Key="InfoBarIconMargin">6,16,16,16</Thickness>

0
src/settings-ui/Microsoft.PowerToys.Settings.UI/Themes/SettingsExpanderStyles.xaml → src/settings-ui/Microsoft.PowerToys.Settings.UI/Controls/SettingExpander/SettingExpanderStyles.xaml
View File

2
src/settings-ui/Microsoft.PowerToys.Settings.UI/Microsoft.PowerToys.Settings.UI.csproj
View File

@ -417,7 +417,7 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="Themes\SettingsExpanderStyles.xaml">
<Page Include="Controls\SettingExpander\SettingExpanderStyles.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>

11
src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml
View File

@ -53,17 +53,6 @@
IsBackButtonVisible="Collapsed"
MenuItemsSource="{x:Bind Modules, Mode=OneTime}"
MenuItemTemplate="{StaticResource NavigationViewMenuItem}">
<winui:NavigationView.PaneCustomContent>
<StackPanel Grid.Column="0" Margin="16"
Orientation="Vertical">
<TextBlock x:Uid="Oobe_GettingStarted"
TextWrapping="Wrap"
FontWeight="SemiBold"
AutomationProperties.HeadingLevel="Level1"
Style="{StaticResource PageTitleStyle}"
Margin="0,0,0,16" />
</StackPanel>
</winui:NavigationView.PaneCustomContent>
<winui:NavigationView.Content>
<Frame x:Name="NavigationFrame" />
</winui:NavigationView.Content>

2
src/settings-ui/Microsoft.PowerToys.Settings.UI/OOBE/Views/OobeShellPage.xaml.cs
View File

@ -59,7 +59,7 @@ namespace Microsoft.PowerToys.Settings.UI.OOBE.Views
Modules.Insert((int)PowerToysModulesEnum.Overview, new OobePowerToysModule()
{
ModuleName = loader.GetString("Oobe_Welcome"),
ModuleName = loader.GetString("Oobe_GettingStarted"),
Tag = "Overview",
IsNew = false,
Icon = "\uEF3C",

3
src/settings-ui/Microsoft.PowerToys.Settings.UI/Strings/en-us/Resources.resw
View File

@ -1322,9 +1322,6 @@ From there, simply click on a Markdown file or SVG icon in the File Explorer and
<value>Video Conference</value>
<comment>Do not localize this string</comment>
</data>
<data name="Oobe_Welcome" xml:space="preserve">
<value>Welcome</value>
</data>
<data name="OOBE_Settings.Content" xml:space="preserve">
<value>Open Settings</value>
</data>

9
src/settings-ui/Microsoft.PowerToys.Settings.UI/Styles/TextBlock.xaml
View File

@ -2,15 +2,6 @@
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!--Common texts-->
<Style x:Key="PageTitleStyle" TargetType="TextBlock">
<Setter Property="VerticalAlignment" Value="Center" />
<Setter Property="FontWeight" Value="SemiBold" />
<Setter Property="FontSize" Value="{StaticResource LargeFontSize}" />
<Setter Property="TextTrimming" Value="CharacterEllipsis" />
<Setter Property="TextWrapping" Value="NoWrap" />
</Style>
<Style x:Key="OobeSubtitleStyle" TargetType="TextBlock">
<Setter Property="Margin" Value="0,16,0,0" />
<Setter Property="Foreground" Value="{ThemeResource DefaultTextForegroundThemeBrush}" />

4
src/settings-ui/Microsoft.PowerToys.Settings.UI/Styles/_FontSizes.xaml
View File

@ -1,8 +1,4 @@
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<x:Double x:Key="LargeFontSize">24</x:Double>
<x:Double x:Key="MediumFontSize">16</x:Double>
</ResourceDictionary>

4
src/settings-ui/Microsoft.PowerToys.Settings.UI/Styles/_Thickness.xaml
View File

@ -1,8 +1,4 @@
<ResourceDictionary
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
<!-- OOBE -->
<Thickness x:Key="OobePageContentMargin">32, 24, 32, 24</Thickness>
</ResourceDictionary>