Skip to content

Commit e2d70fb

Browse files
lukeblevinslukeblevins
committed
Sync with latest design changes
2 parents 6cadc38 + 8573f0b commit e2d70fb

12 files changed

+370
-153
lines changed

‎Files/Controls/RibbonArea.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1440,7 +1440,7 @@
14401440
CornerRadius="2"
14411441
Icon="Add"
14421442
IsEnabled="{x:Bind parentPage.AlwaysPresentCommands.isEnabled, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
1443-
Label="New Item"
1443+
Label="New"
14441444
LabelPosition="{x:Bind RibbonViewModel.ItemLabelPosition, Mode=OneWay}"
14451445
Style="{StaticResource AppBarButtonRevealStyle}" />
14461446
<AppBarSeparator
@@ -1850,7 +1850,7 @@
18501850
Padding="2.5,0,0,0"
18511851
HorizontalAlignment="Stretch"
18521852
VerticalAlignment="Stretch"
1853-
BorderBrush="{ThemeResource CustomInputFieldBorderBrush}"
1853+
BorderBrush="{ThemeResource TextBoxBorderThemeBrush}"
18541854
BorderThickness="1"
18551855
CornerRadius="2"
18561856
PointerPressed="ManualPathEntryItem_Click">
@@ -1936,8 +1936,8 @@
19361936
PlaceholderText="Search"
19371937
QueryIcon="Find">
19381938
<AutoSuggestBox.Resources>
1939-
<StaticResource x:Key="TextControlBorderBrush" ResourceKey="CustomInputFieldBorderBrush" />
1940-
<StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="CustomInputFieldBorderBrush" />
1939+
<StaticResource x:Key="TextControlBorderBrush" ResourceKey="TextBoxBorderThemeBrush" />
1940+
<StaticResource x:Key="TextControlBorderBrushPointerOver" ResourceKey="TextBoxBorderThemeBrush" />
19411941
</AutoSuggestBox.Resources>
19421942
<AutoSuggestBox.KeyboardAccelerators>
19431943
<KeyboardAccelerator

‎Files/Files.csproj

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -220,8 +220,14 @@
220220
<Compile Include="SettingsPages\About.xaml.cs">
221221
<DependentUpon>About.xaml</DependentUpon>
222222
</Compile>
223-
<Compile Include="SettingsPages\Personalization.xaml.cs">
224-
<DependentUpon>Personalization.xaml</DependentUpon>
223+
<Compile Include="SettingsPages\OnStartup.xaml.cs">
224+
<DependentUpon>OnStartup.xaml</DependentUpon>
225+
</Compile>
226+
<Compile Include="SettingsPages\FilesAndFolders.xaml.cs">
227+
<DependentUpon>FilesAndFolders.xaml</DependentUpon>
228+
</Compile>
229+
<Compile Include="SettingsPages\Appearance.xaml.cs">
230+
<DependentUpon>Appearance.xaml</DependentUpon>
225231
</Compile>
226232
<Compile Include="SettingsPages\Preferences.xaml.cs">
227233
<DependentUpon>Preferences.xaml</DependentUpon>
@@ -341,7 +347,15 @@
341347
<SubType>Designer</SubType>
342348
<Generator>MSBuild:Compile</Generator>
343349
</Page>
344-
<Page Include="SettingsPages\Personalization.xaml">
350+
<Page Include="SettingsPages\OnStartup.xaml">
351+
<Generator>MSBuild:Compile</Generator>
352+
<SubType>Designer</SubType>
353+
</Page>
354+
<Page Include="SettingsPages\FilesAndFolders.xaml">
355+
<Generator>MSBuild:Compile</Generator>
356+
<SubType>Designer</SubType>
357+
</Page>
358+
<Page Include="SettingsPages\Appearance.xaml">
345359
<SubType>Designer</SubType>
346360
<Generator>MSBuild:Compile</Generator>
347361
</Page>

‎Files/ProHome.xaml.cs

Lines changed: 109 additions & 120 deletions
Large diffs are not rendered by default.

‎Files/Settings.xaml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,11 +29,16 @@
2929
</muxc:NavigationView.AutoSuggestBox>
3030

3131
<muxc:NavigationView.MenuItems>
32-
<muxc:NavigationViewItem Content="Personalization" IsSelected="True">
32+
<muxc:NavigationViewItem Content="Appearance" IsSelected="True">
3333
<muxc:NavigationViewItem.Icon>
3434
<FontIcon Glyph="&#xE790;" />
3535
</muxc:NavigationViewItem.Icon>
3636
</muxc:NavigationViewItem>
37+
<muxc:NavigationViewItem Content="On Startup" IsSelected="True">
38+
<muxc:NavigationViewItem.Icon>
39+
<FontIcon Glyph="&#xE7E8;" />
40+
</muxc:NavigationViewItem.Icon>
41+
</muxc:NavigationViewItem>
3742
<muxc:NavigationViewItem Content="Page Layouts" Visibility="Collapsed">
3843
<muxc:NavigationViewItem.Icon>
3944
<FontIcon Glyph="&#xE737;" />
@@ -44,6 +49,11 @@
4449
<FontIcon Glyph="&#xE713;" />
4550
</muxc:NavigationViewItem.Icon>
4651
</muxc:NavigationViewItem>
52+
<muxc:NavigationViewItem Content="Files and Folders">
53+
<muxc:NavigationViewItem.Icon>
54+
<FontIcon Glyph="&#xEC50;" />
55+
</muxc:NavigationViewItem.Icon>
56+
</muxc:NavigationViewItem>
4757
<muxc:NavigationViewItem Content="About">
4858
<muxc:NavigationViewItem.Icon>
4959
<FontIcon Glyph="&#xE946;" />

‎Files/Settings.xaml.cs

Lines changed: 11 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ public sealed partial class Settings : Page
1414
public Settings()
1515
{
1616
this.InitializeComponent();
17+
1718
var CoreTitleBar = CoreApplication.GetCurrentView().TitleBar;
1819
CoreTitleBar.ExtendViewIntoTitleBar = true;
1920
var titleBar = ApplicationView.GetForCurrentView().TitleBar;
@@ -45,31 +46,23 @@ public Settings()
4546
titleBar.ButtonHoverBackgroundColor = Color.FromArgb(75, 155, 155, 155);
4647
titleBar.BackgroundColor = Colors.Transparent;
4748
}
48-
SettingsContentFrame.Navigate(typeof(Personalization));
49+
SettingsContentFrame.Navigate(typeof(Appearance));
4950
}
5051

5152
private void NavigationView_ItemInvoked(Microsoft.UI.Xaml.Controls.NavigationView sender, Microsoft.UI.Xaml.Controls.NavigationViewItemInvokedEventArgs args)
5253
{
5354
var item = args.InvokedItem;
54-
if (item.ToString() == "Personalization")
55-
{
56-
SettingsContentFrame.Navigate(typeof(Personalization));
5755

58-
}
59-
else if (item.ToString() == "Preferences")
60-
{
61-
SettingsContentFrame.Navigate(typeof(Preferences));
62-
}
63-
else if (item.ToString() == "About")
56+
_= args.InvokedItem.ToString() switch
6457
{
65-
SettingsContentFrame.Navigate(typeof(About));
66-
}
67-
else if (item.ToString() == "Page Layouts")
68-
{
69-
SettingsContentFrame.Navigate(typeof(StartPageWidgets));
70-
}
71-
58+
"Appearance" => SettingsContentFrame.Navigate(typeof(Appearance)),
59+
"On Startup" => SettingsContentFrame.Navigate(typeof(OnStartup)),
60+
"Preferences" => SettingsContentFrame.Navigate(typeof(Preferences)),
61+
"Files and Folders" => SettingsContentFrame.Navigate(typeof(FilesAndFolders)),
62+
"Page Layouts" => SettingsContentFrame.Navigate(typeof(StartPageWidgets)),
63+
"About" => SettingsContentFrame.Navigate(typeof(About)),
64+
_ => SettingsContentFrame.Navigate(typeof(Appearance))
65+
};
7266
}
73-
7467
}
7568
}

‎Files/SettingsPages/About.xaml

Lines changed: 13 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,9 +9,10 @@
99
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
1010
mc:Ignorable="d">
1111

12-
<Grid >
13-
<ScrollViewer >
14-
<StackPanel Margin="12,12,8,8"
12+
<Grid>
13+
<ScrollViewer>
14+
<StackPanel
15+
Margin="12,12,8,8"
1516
HorizontalAlignment="Stretch"
1617
VerticalAlignment="Stretch"
1718
Orientation="Vertical"
@@ -37,7 +38,7 @@
3738
Padding="0,4"
3839
FontSize="14"
3940
Opacity=".5"
40-
Text="Version: 0.5.0" />
41+
Text="Version number" />
4142
</StackPanel>
4243
</StackPanel>
4344

@@ -76,7 +77,14 @@
7677
<TextBlock
7778
Margin="0,16,0,0"
7879
FontSize="18"
79-
Text="Third Party Licenses" />
80+
Text="Third Party Licenses">
81+
<TextBlock.Transitions>
82+
<TransitionCollection>
83+
<RepositionThemeTransition />
84+
<ReorderThemeTransition />
85+
</TransitionCollection>
86+
</TextBlock.Transitions>
87+
</TextBlock>
8088

8189
<StackPanel Orientation="Horizontal">
8290
<BitmapIcon

‎Files/SettingsPages/Personalization.xaml renamed to ‎Files/SettingsPages/Appearance.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<Page
2-
x:Class="Files.SettingsPages.Personalization"
2+
x:Class="Files.SettingsPages.Appearance"
33
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
44
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
55
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
@@ -21,7 +21,7 @@
2121
</TransitionCollection>
2222
</StackPanel.ChildrenTransitions>
2323

24-
<TextBlock FontSize="22" Text="Personalization" />
24+
<TextBlock FontSize="22" Text="Appearance" />
2525

2626
<Grid HorizontalAlignment="Stretch">
2727
<Grid.ColumnDefinitions>

‎Files/SettingsPages/Personalization.xaml.cs renamed to ‎Files/SettingsPages/Appearance.xaml.cs

File renamed without changes.

‎Files/SettingsPages/FilesAndFolders.xaml

Lines changed: 112 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,112 @@
1+
<Page
2+
x:Class="Files.SettingsPages.FilesAndFolders"
3+
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
4+
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
5+
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
6+
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
7+
Background="{ThemeResource ApplicationPageBackgroundThemeBrush}"
8+
mc:Ignorable="d">
9+
10+
<Grid>
11+
12+
<ScrollViewer HorizontalAlignment="Stretch" VerticalAlignment="Stretch">
13+
<StackPanel
14+
Margin="12,12,8,8"
15+
Orientation="Vertical"
16+
Spacing="14">
17+
<StackPanel.ChildrenTransitions>
18+
<TransitionCollection>
19+
<RepositionThemeTransition />
20+
<ReorderThemeTransition />
21+
</TransitionCollection>
22+
</StackPanel.ChildrenTransitions>
23+
24+
<TextBlock FontSize="22" Text="Files and Folders" />
25+
26+
<Grid HorizontalAlignment="Stretch">
27+
<Grid.ColumnDefinitions>
28+
<ColumnDefinition Width="320" />
29+
<ColumnDefinition Width="*" MaxWidth="300" />
30+
<ColumnDefinition Width="100" />
31+
</Grid.ColumnDefinitions>
32+
<Grid.ChildrenTransitions>
33+
<TransitionCollection>
34+
<RepositionThemeTransition />
35+
</TransitionCollection>
36+
</Grid.ChildrenTransitions>
37+
38+
<TextBlock
39+
Grid.Column="0"
40+
VerticalAlignment="Center"
41+
FontSize="16"
42+
Text="Show hidden files, folders, and drives" />
43+
44+
<ToggleSwitch
45+
Grid.Column="2"
46+
Width="40"
47+
HorizontalAlignment="Right"
48+
IsEnabled="False"
49+
OffContent=""
50+
OnContent="" />
51+
</Grid>
52+
53+
<Grid HorizontalAlignment="Stretch">
54+
<Grid.ColumnDefinitions>
55+
<ColumnDefinition Width="320" />
56+
<ColumnDefinition Width="*" MaxWidth="300" />
57+
<ColumnDefinition Width="100" />
58+
</Grid.ColumnDefinitions>
59+
<Grid.ChildrenTransitions>
60+
<TransitionCollection>
61+
<RepositionThemeTransition />
62+
</TransitionCollection>
63+
</Grid.ChildrenTransitions>
64+
65+
<TextBlock
66+
Grid.Column="0"
67+
VerticalAlignment="Center"
68+
FontSize="16"
69+
Text="Show extensions for known file types" />
70+
71+
<ToggleSwitch
72+
Grid.Column="2"
73+
Width="40"
74+
HorizontalAlignment="Right"
75+
IsEnabled="False"
76+
OffContent=""
77+
OnContent="" />
78+
</Grid>
79+
80+
<Grid HorizontalAlignment="Stretch">
81+
<Grid.ColumnDefinitions>
82+
<ColumnDefinition Width="320" />
83+
<ColumnDefinition Width="*" MaxWidth="300" />
84+
<ColumnDefinition Width="100" />
85+
</Grid.ColumnDefinitions>
86+
<Grid.ChildrenTransitions>
87+
<TransitionCollection>
88+
<RepositionThemeTransition />
89+
</TransitionCollection>
90+
</Grid.ChildrenTransitions>
91+
92+
<TextBlock
93+
Grid.Column="0"
94+
VerticalAlignment="Center"
95+
FontSize="16"
96+
Text="Show drive letters" />
97+
98+
<ToggleSwitch
99+
Grid.Column="2"
100+
Width="40"
101+
HorizontalAlignment="Right"
102+
IsEnabled="False"
103+
OffContent=""
104+
OnContent="" />
105+
</Grid>
106+
107+
108+
</StackPanel>
109+
</ScrollViewer>
110+
111+
</Grid>
112+
</Page>

‎Files/SettingsPages/FilesAndFolders.xaml.cs

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
using Files.Enums;
2+
using Microsoft.Toolkit.Uwp.UI.Animations;
3+
using System;
4+
using System.ComponentModel;
5+
using System.Linq;
6+
using System.Runtime.CompilerServices;
7+
using Windows.UI.Xaml;
8+
using Windows.UI.Xaml.Controls;
9+
10+
11+
namespace Files.SettingsPages
12+
{
13+
public sealed partial class FilesAndFolders : Page
14+
{
15+
public FilesAndFolders()
16+
{
17+
InitializeComponent();
18+
}
19+
}
20+
}

0 commit comments

Comments
 (0)