Skip to content

Commit d71901b

Browse files
lukeblevinslukeblevins
committed
Merge branch 'develop' of https://github.com/duke7553/files-uwp into develop
2 parents 7e7902f + 4de1932 commit d71901b

File tree

3 files changed

+37
-41
lines changed

3 files changed

+37
-41
lines changed

‎Files/SettingsPages/Appearance.xaml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@
2828

2929
<Grid HorizontalAlignment="Stretch">
3030
<Grid.ColumnDefinitions>
31-
<ColumnDefinition Width="120" />
32-
<ColumnDefinition Width="*" MaxWidth="400" />
31+
<ColumnDefinition Width="160" />
32+
<ColumnDefinition Width="*" MaxWidth="360" />
3333
<ColumnDefinition Width="200" />
3434
</Grid.ColumnDefinitions>
3535
<Grid.ChildrenTransitions>
@@ -54,8 +54,8 @@
5454

5555
<Grid HorizontalAlignment="Stretch">
5656
<Grid.ColumnDefinitions>
57-
<ColumnDefinition Width="120" />
58-
<ColumnDefinition Width="*" MaxWidth="400" />
57+
<ColumnDefinition Width="160" />
58+
<ColumnDefinition Width="*" MaxWidth="360" />
5959
<ColumnDefinition Width="200" />
6060
</Grid.ColumnDefinitions>
6161
<Grid.ChildrenTransitions>
@@ -80,8 +80,8 @@
8080

8181
<Grid HorizontalAlignment="Stretch">
8282
<Grid.ColumnDefinitions>
83-
<ColumnDefinition Width="120" />
84-
<ColumnDefinition Width="*" MaxWidth="400" />
83+
<ColumnDefinition Width="160" />
84+
<ColumnDefinition Width="*" MaxWidth="360" />
8585
<ColumnDefinition Width="200" />
8686
</Grid.ColumnDefinitions>
8787
<Grid.ChildrenTransitions>

‎Files/SettingsPages/FilesAndFolders.xaml

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,7 @@
2828

2929
<Grid HorizontalAlignment="Stretch">
3030
<Grid.ColumnDefinitions>
31-
<ColumnDefinition Width="320" />
32-
<ColumnDefinition Width="*" MaxWidth="300" />
31+
<ColumnDefinition Width="*" MaxWidth="620" />
3332
<ColumnDefinition Width="100" />
3433
</Grid.ColumnDefinitions>
3534
<Grid.ChildrenTransitions>
@@ -46,7 +45,7 @@
4645
Text="Show hidden files, folders, and drives" />
4746

4847
<ToggleSwitch
49-
Grid.Column="2"
48+
Grid.Column="1"
5049
Width="40"
5150
HorizontalAlignment="Right"
5251
IsEnabled="False"
@@ -56,8 +55,7 @@
5655

5756
<Grid HorizontalAlignment="Stretch">
5857
<Grid.ColumnDefinitions>
59-
<ColumnDefinition Width="320" />
60-
<ColumnDefinition Width="*" MaxWidth="300" />
58+
<ColumnDefinition Width="*" MaxWidth="620" />
6159
<ColumnDefinition Width="100" />
6260
</Grid.ColumnDefinitions>
6361
<Grid.ChildrenTransitions>
@@ -74,7 +72,7 @@
7472
Text="Show extensions for known file types" />
7573

7674
<ToggleSwitch
77-
Grid.Column="2"
75+
Grid.Column="1"
7876
Width="40"
7977
HorizontalAlignment="Right"
8078
IsEnabled="False"
@@ -84,8 +82,7 @@
8482

8583
<Grid HorizontalAlignment="Stretch">
8684
<Grid.ColumnDefinitions>
87-
<ColumnDefinition Width="320" />
88-
<ColumnDefinition Width="*" MaxWidth="300" />
85+
<ColumnDefinition Width="*" MaxWidth="620" />
8986
<ColumnDefinition Width="100" />
9087
</Grid.ColumnDefinitions>
9188
<Grid.ChildrenTransitions>
@@ -102,15 +99,14 @@
10299
Text="Show drive letters" />
103100

104101
<ToggleSwitch
105-
Grid.Column="2"
102+
Grid.Column="1"
106103
Width="40"
107104
HorizontalAlignment="Right"
108105
IsEnabled="False"
109106
OffContent=""
110107
OnContent="" />
111108
</Grid>
112109

113-
114110
</StackPanel>
115111
</ScrollViewer>
116112

‎Files/SettingsPages/Preferences.xaml

Lines changed: 25 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -31,8 +31,8 @@
3131

3232
<Grid HorizontalAlignment="Stretch">
3333
<Grid.ColumnDefinitions>
34-
<ColumnDefinition Width="260" />
35-
<ColumnDefinition Width="*" MaxWidth="470" />
34+
<ColumnDefinition Width="280" />
35+
<ColumnDefinition Width="*" MaxWidth="450" />
3636
</Grid.ColumnDefinitions>
3737
<Grid.ChildrenTransitions>
3838
<TransitionCollection>
@@ -48,15 +48,15 @@
4848
Text="Pin OneDrive to the sidebar" />
4949

5050
<ToggleSwitch
51-
Grid.Column="2"
52-
Width="40"
53-
HorizontalAlignment="Right"
54-
IsEnabled="True"
55-
OffContent=""
56-
OnContent=""
57-
x:Name="OneDrivePin"
58-
Toggled="OneDrivePin_Toggled"
59-
IsOn="{x:Bind local2:App.AppSettings.PinOneDriveToSideBar, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"/>
51+
x:Name="OneDrivePin"
52+
Grid.Column="2"
53+
Width="40"
54+
HorizontalAlignment="Right"
55+
IsEnabled="True"
56+
IsOn="{x:Bind local2:App.AppSettings.PinOneDriveToSideBar, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
57+
OffContent=""
58+
OnContent=""
59+
Toggled="OneDrivePin_Toggled" />
6060
</Grid>
6161

6262
<StackPanel>
@@ -68,8 +68,8 @@
6868

6969
<Grid HorizontalAlignment="Stretch">
7070
<Grid.ColumnDefinitions>
71-
<ColumnDefinition Width="260" />
72-
<ColumnDefinition Width="*" MaxWidth="470" />
71+
<ColumnDefinition Width="280" />
72+
<ColumnDefinition Width="*" MaxWidth="450" />
7373
</Grid.ColumnDefinitions>
7474
<Grid.ChildrenTransitions>
7575
<TransitionCollection>
@@ -96,8 +96,8 @@
9696

9797
<Grid x:Name="aaaa" HorizontalAlignment="Stretch">
9898
<Grid.ColumnDefinitions>
99-
<ColumnDefinition Width="260" />
100-
<ColumnDefinition Width="*" MaxWidth="470" />
99+
<ColumnDefinition Width="300" />
100+
<ColumnDefinition Width="*" MaxWidth="430" />
101101
</Grid.ColumnDefinitions>
102102
<Grid.RowDefinitions>
103103
<RowDefinition Height="44" />
@@ -120,7 +120,7 @@
120120
Grid.Row="0"
121121
Grid.Column="0"
122122
VerticalAlignment="Center"
123-
FontSize="16"
123+
FontSize="14"
124124
Text="Desktop" />
125125
<TextBox
126126
x:Name="DesktopL"
@@ -137,7 +137,7 @@
137137
Grid.Row="1"
138138
Grid.Column="0"
139139
VerticalAlignment="Center"
140-
FontSize="16"
140+
FontSize="14"
141141
Text="Downloads" />
142142
<TextBox
143143
x:Name="DownloadsL"
@@ -154,7 +154,7 @@
154154
Grid.Row="2"
155155
Grid.Column="0"
156156
VerticalAlignment="Center"
157-
FontSize="16"
157+
FontSize="14"
158158
Text="Documents" />
159159
<TextBox
160160
x:Name="DocumentsL"
@@ -171,7 +171,7 @@
171171
Grid.Row="3"
172172
Grid.Column="0"
173173
VerticalAlignment="Center"
174-
FontSize="16"
174+
FontSize="14"
175175
Text="Pictures" />
176176
<TextBox
177177
x:Name="PictureL"
@@ -188,7 +188,7 @@
188188
Grid.Row="4"
189189
Grid.Column="0"
190190
VerticalAlignment="Center"
191-
FontSize="16"
191+
FontSize="14"
192192
Text="Music" />
193193
<TextBox
194194
x:Name="MusicL"
@@ -204,7 +204,7 @@
204204
Grid.Row="5"
205205
Grid.Column="0"
206206
VerticalAlignment="Center"
207-
FontSize="16"
207+
FontSize="14"
208208
Text="Video" />
209209
<TextBox
210210
x:Name="VideosL"
@@ -221,7 +221,7 @@
221221
Grid.Row="6"
222222
Grid.Column="0"
223223
VerticalAlignment="Center"
224-
FontSize="16"
224+
FontSize="14"
225225
Text="OneDrive" />
226226
<TextBox
227227
x:Name="OneDriveL"
@@ -248,8 +248,8 @@
248248

249249
<Grid HorizontalAlignment="Stretch">
250250
<Grid.ColumnDefinitions>
251-
<ColumnDefinition Width="200" />
252-
<ColumnDefinition Width="*" MaxWidth="530" />
251+
<ColumnDefinition Width="220" />
252+
<ColumnDefinition Width="*" MaxWidth="510" />
253253
</Grid.ColumnDefinitions>
254254
<Grid.ChildrenTransitions>
255255
<TransitionCollection>
@@ -277,7 +277,7 @@
277277

278278
<ComboBox
279279
x:Name="TerminalApplicationsComboBox"
280-
Width="130"
280+
Width="120"
281281
ItemsSource="{x:Bind local2:App.AppSettings.Terminals}"
282282
SelectionChanged="TerminalApp_SelectionChanged">
283283
<ComboBox.ItemTemplate>

0 commit comments

Comments
 (0)