Skip to content

Commit a74890f

Browse files
yaira2yaira2
committed
Update GeneralPage.xaml
1 parent 9547078 commit a74890f

File tree

1 file changed

+25
-24
lines changed

1 file changed

+25
-24
lines changed

‎src/Files.App/Views/Settings/GeneralPage.xaml‎

Lines changed: 25 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@
3838
<uc:ComboBoxEx
3939
x:Name="AppLanguagesComboBox"
4040
HorizontalAlignment="Left"
41-
AutomationProperties.AutomationControlType="CheckBox"
41+
AutomationProperties.AutomationControlType="ComboBox"
4242
AutomationProperties.Name="{helpers:ResourceString Name=Language}"
4343
ItemsSource="{x:Bind ViewModel.AppLanguages}"
4444
SelectedIndex="{x:Bind ViewModel.SelectedAppLanguageIndex, Mode=TwoWay}">
@@ -61,7 +61,7 @@
6161
<uc:ComboBoxEx
6262
x:Name="DateFormatChooser"
6363
Grid.Column="1"
64-
AutomationProperties.AutomationControlType="CheckBox"
64+
AutomationProperties.AutomationControlType="ComboBox"
6565
AutomationProperties.Name="{helpers:ResourceString Name=DateFormat}"
6666
ItemsSource="{x:Bind ViewModel.DateFormats}"
6767
SelectedIndex="{x:Bind ViewModel.SelectedDateTimeFormatIndex, Mode=TwoWay}">
@@ -91,7 +91,7 @@
9191
<FontIcon Glyph="&#xE7E8;" />
9292
</wctcontrols:SettingsExpander.HeaderIcon>
9393
<uc:ComboBoxEx
94-
AutomationProperties.AutomationControlType="CheckBox"
94+
AutomationProperties.AutomationControlType="ComboBox"
9595
AutomationProperties.Name="{helpers:ResourceString Name=StartupSettings}"
9696
SelectedIndex="{x:Bind ViewModel.SelectedStartupSettingIndex, Mode=OneWay}">
9797
<ComboBoxItem Content="{helpers:ResourceString Name=SettingsOnStartupOpenANewTab/Content}" IsSelected="{x:Bind ViewModel.OpenNewTabPageOnStartup, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
@@ -163,7 +163,7 @@
163163
ToolTipService.ToolTip="{x:Bind Text}" />
164164
<Button
165165
HorizontalAlignment="Right"
166-
AutomationProperties.AutomationControlType="CheckBox"
166+
AutomationProperties.AutomationControlType="Button"
167167
AutomationProperties.Name="{helpers:ResourceString Name=Remove}"
168168
Click="RemoveStartupPage"
169169
ToolTipService.ToolTip="{helpers:ResourceString Name=Remove}">
@@ -177,7 +177,7 @@
177177

178178
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=OpenTabInExistingInstance}">
179179
<ToggleSwitch
180-
AutomationProperties.AutomationControlType="CheckBox"
180+
AutomationProperties.AutomationControlType="Custom"
181181
AutomationProperties.Name="{helpers:ResourceString Name=OpenTabInExistingInstance}"
182182
IsOn="{x:Bind ViewModel.OpenTabInExistingInstance, Mode=TwoWay}" />
183183
</wctcontrols:SettingsCard>
@@ -190,13 +190,13 @@
190190
<FontIcon Glyph="&#xE89F;" />
191191
</wctcontrols:SettingsExpander.HeaderIcon>
192192
<ToggleSwitch
193-
AutomationProperties.AutomationControlType="CheckBox"
193+
AutomationProperties.AutomationControlType="Thumb"
194194
AutomationProperties.Name="{helpers:ResourceString Name=SettingsMultitaskingAlwaysOpenDualPane}"
195195
IsOn="{x:Bind ViewModel.AlwaysOpenDualPaneInNewTab, Mode=TwoWay}" />
196196
<wctcontrols:SettingsExpander.Items>
197197
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=DefaultPaneArrangement}">
198198
<uc:ComboBoxEx
199-
AutomationProperties.AutomationControlType="CheckBox"
199+
AutomationProperties.AutomationControlType="ComboBox"
200200
AutomationProperties.Name="{helpers:ResourceString Name=DefaultPaneArrangement}"
201201
ItemsSource="{x:Bind ViewModel.ShellPaneArrangementTypes.Values}"
202202
SelectedItem="{x:Bind ViewModel.SelectedShellPaneArrangementType, Mode=TwoWay}" />
@@ -224,35 +224,35 @@
224224
<wctcontrols:SettingsExpander.Items>
225225
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=QuickAccess}">
226226
<ToggleSwitch
227-
AutomationProperties.AutomationControlType="CheckBox"
227+
AutomationProperties.AutomationControlType="Custom"
228228
AutomationProperties.Name="{helpers:ResourceString Name=QuickAccess}"
229229
IsOn="{x:Bind ViewModel.ShowQuickAccessWidget, Mode=TwoWay}" />
230230
</wctcontrols:SettingsCard>
231231

232232
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=Drives}">
233233
<ToggleSwitch
234-
AutomationProperties.AutomationControlType="CheckBox"
234+
AutomationProperties.AutomationControlType="Custom"
235235
AutomationProperties.Name="{helpers:ResourceString Name=Drives}"
236236
IsOn="{x:Bind ViewModel.ShowDrivesWidget, Mode=TwoWay}" />
237237
</wctcontrols:SettingsCard>
238238

239239
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=NetworkLocations}">
240240
<ToggleSwitch
241-
AutomationProperties.AutomationControlType="CheckBox"
241+
AutomationProperties.AutomationControlType="Custom"
242242
AutomationProperties.Name="{helpers:ResourceString Name=NetworkLocations}"
243243
IsOn="{x:Bind ViewModel.ShowNetworkLocationsWidget, Mode=TwoWay}" />
244244
</wctcontrols:SettingsCard>
245245

246246
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=FileTags}">
247247
<ToggleSwitch
248-
AutomationProperties.AutomationControlType="CheckBox"
248+
AutomationProperties.AutomationControlType="Custom"
249249
AutomationProperties.Name="{helpers:ResourceString Name=FileTags}"
250250
IsOn="{x:Bind ViewModel.ShowFileTagsWidget, Mode=TwoWay}" />
251251
</wctcontrols:SettingsCard>
252252

253253
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=RecentFiles}">
254254
<ToggleSwitch
255-
AutomationProperties.AutomationControlType="CheckBox"
255+
AutomationProperties.AutomationControlType="Custom"
256256
AutomationProperties.Name="{helpers:ResourceString Name=RecentFiles}"
257257
IsOn="{x:Bind ViewModel.ShowRecentFilesWidget, Mode=TwoWay}" />
258258
</wctcontrols:SettingsCard>
@@ -276,63 +276,63 @@
276276
<!-- Open in new tab -->
277277
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=ShowOpenInNewTab}">
278278
<ToggleSwitch
279-
AutomationProperties.AutomationControlType="CheckBox"
279+
AutomationProperties.AutomationControlType="Custom"
280280
AutomationProperties.Name="{helpers:ResourceString Name=ShowOpenInNewTab}"
281281
IsOn="{x:Bind ViewModel.ShowOpenInNewTab, Mode=TwoWay}" />
282282
</wctcontrols:SettingsCard>
283283

284284
<!-- Open in new window -->
285285
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=ShowOpenInNewWindow}">
286286
<ToggleSwitch
287-
AutomationProperties.AutomationControlType="CheckBox"
287+
AutomationProperties.AutomationControlType="Custom"
288288
AutomationProperties.Name="{helpers:ResourceString Name=ShowOpenInNewWindow}"
289289
IsOn="{x:Bind ViewModel.ShowOpenInNewWindow, Mode=TwoWay}" />
290290
</wctcontrols:SettingsCard>
291291

292292
<!-- Open in new pane -->
293293
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=ShowOpenInNewPane}">
294294
<ToggleSwitch
295-
AutomationProperties.AutomationControlType="CheckBox"
295+
AutomationProperties.AutomationControlType="Custom"
296296
AutomationProperties.Name="{helpers:ResourceString Name=ShowOpenInNewPane}"
297297
IsOn="{x:Bind ViewModel.ShowOpenInNewPane, Mode=TwoWay}" />
298298
</wctcontrols:SettingsCard>
299299

300300
<!-- Copy path -->
301301
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=ShowCopyPath}">
302302
<ToggleSwitch
303-
AutomationProperties.AutomationControlType="CheckBox"
303+
AutomationProperties.AutomationControlType="Custom"
304304
AutomationProperties.Name="{helpers:ResourceString Name=ShowCopyPath}"
305305
IsOn="{x:Bind ViewModel.ShowCopyPath, Mode=TwoWay}" />
306306
</wctcontrols:SettingsCard>
307307

308308
<!-- Create folder with selection -->
309309
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=ShowCreateFolderWithSelection}">
310310
<ToggleSwitch
311-
AutomationProperties.AutomationControlType="CheckBox"
311+
AutomationProperties.AutomationControlType="Custom"
312312
AutomationProperties.Name="{helpers:ResourceString Name=ShowCreateFolderWithSelection}"
313313
IsOn="{x:Bind ViewModel.ShowCreateFolderWithSelection, Mode=TwoWay}" />
314314
</wctcontrols:SettingsCard>
315315

316316
<!-- Create alternate data stream -->
317317
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=ShowCreateAlternateDataStream}">
318318
<ToggleSwitch
319-
AutomationProperties.AutomationControlType="CheckBox"
319+
AutomationProperties.AutomationControlType="Custom"
320320
AutomationProperties.Name="{helpers:ResourceString Name=ShowCreateAlternateDataStream}"
321321
IsOn="{x:Bind ViewModel.ShowCreateAlternateDataStream, Mode=TwoWay}" />
322322
</wctcontrols:SettingsCard>
323323

324324
<!-- Create shortcut -->
325325
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=ShowCreateShortcut}">
326326
<ToggleSwitch
327-
AutomationProperties.AutomationControlType="CheckBox"
327+
AutomationProperties.AutomationControlType="Custom"
328328
AutomationProperties.Name="{helpers:ResourceString Name=ShowCreateShortcut}"
329329
IsOn="{x:Bind ViewModel.ShowCreateShortcut, Mode=TwoWay}" />
330330
</wctcontrols:SettingsCard>
331331

332332
<!-- Compression options -->
333333
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=ShowCompressionOptions}">
334334
<ToggleSwitch
335-
AutomationProperties.AutomationControlType="CheckBox"
335+
AutomationProperties.AutomationControlType="Custom"
336336
AutomationProperties.Name="{helpers:ResourceString Name=ShowCompressionOptions}"
337337
IsOn="{x:Bind ViewModel.ShowCompressionOptions, Mode=TwoWay}" />
338338
</wctcontrols:SettingsCard>
@@ -341,23 +341,24 @@
341341
<!-- TODO uncomment code when feature is marked as stable -->
342342
<!--<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=ShowFlattenOptions}">
343343
<ToggleSwitch
344-
AutomationProperties.AutomationControlType="CheckBox" AutomationProperties.Name="{helpers:ResourceString Name=ShowFlattenOptions}"
344+
AutomationProperties.AutomationControlType="Custom"
345+
AutomationProperties.Name="{helpers:ResourceString Name=ShowFlattenOptions}"
345346
IsOn="{x:Bind ViewModel.ShowFlattenOptions, Mode=TwoWay}"
346347
/>
347348
</wctcontrols:SettingsCard>-->
348349

349350
<!-- Send To -->
350351
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=ShowSendToMenu}">
351352
<ToggleSwitch
352-
AutomationProperties.AutomationControlType="CheckBox"
353+
AutomationProperties.AutomationControlType="Custom"
353354
AutomationProperties.Name="{helpers:ResourceString Name=ShowSendToMenu}"
354355
IsOn="{x:Bind ViewModel.ShowSendToMenu, Mode=TwoWay}" />
355356
</wctcontrols:SettingsCard>
356357

357358
<!-- Edit tags -->
358359
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=ShowEditTagsMenu}">
359360
<ToggleSwitch
360-
AutomationProperties.AutomationControlType="CheckBox"
361+
AutomationProperties.AutomationControlType="Custom"
361362
AutomationProperties.Name="{helpers:ResourceString Name=ShowEditTagsMenu}"
362363
IsOn="{x:Bind ViewModel.ShowEditTagsMenu, Mode=TwoWay}" />
363364
</wctcontrols:SettingsCard>
@@ -371,7 +372,7 @@
371372
<FontIcon Glyph="&#xE712;" />
372373
</wctcontrols:SettingsCard.HeaderIcon>
373374
<ToggleSwitch
374-
AutomationProperties.AutomationControlType="CheckBox"
375+
AutomationProperties.AutomationControlType="Custom"
375376
AutomationProperties.Name="{helpers:ResourceString Name=SettingsContextMenuOverflow}"
376377
IsOn="{x:Bind ViewModel.MoveShellExtensionsToSubMenu, Mode=TwoWay}" />
377378
</wctcontrols:SettingsCard>

0 commit comments

Comments
 (0)