Skip to content

Commit 741f05c

Browse files
yaira2yaira2
committed
Test
1 parent 4bfed3c commit 741f05c

File tree

1 file changed

+21
-31
lines changed

1 file changed

+21
-31
lines changed

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

Lines changed: 21 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,6 @@
3838
<uc:ComboBoxEx
3939
x:Name="AppLanguagesComboBox"
4040
HorizontalAlignment="Left"
41-
AutomationProperties.Name="{helpers:ResourceString Name=Language}"
4241
ItemsSource="{x:Bind ViewModel.AppLanguages}"
4342
SelectedIndex="{x:Bind ViewModel.SelectedAppLanguageIndex, Mode=TwoWay}">
4443
<uc:ComboBoxEx.ItemTemplate>
@@ -60,7 +59,6 @@
6059
<uc:ComboBoxEx
6160
x:Name="DateFormatChooser"
6261
Grid.Column="1"
63-
AutomationProperties.Name="{helpers:ResourceString Name=DateFormat}"
6462
ItemsSource="{x:Bind ViewModel.DateFormats}"
6563
SelectedIndex="{x:Bind ViewModel.SelectedDateTimeFormatIndex, Mode=TwoWay}">
6664
<uc:ComboBoxEx.ItemTemplate>
@@ -88,7 +86,7 @@
8886
<wctcontrols:SettingsExpander.HeaderIcon>
8987
<FontIcon Glyph="&#xE7E8;" />
9088
</wctcontrols:SettingsExpander.HeaderIcon>
91-
<uc:ComboBoxEx AutomationProperties.Name="{helpers:ResourceString Name=StartupSettings}" SelectedIndex="{x:Bind ViewModel.SelectedStartupSettingIndex, Mode=OneWay}">
89+
<uc:ComboBoxEx SelectedIndex="{x:Bind ViewModel.SelectedStartupSettingIndex, Mode=OneWay}">
9290
<ComboBoxItem Content="{helpers:ResourceString Name=SettingsOnStartupOpenANewTab/Content}" IsSelected="{x:Bind ViewModel.OpenNewTabPageOnStartup, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
9391

9492
<ComboBoxItem Content="{helpers:ResourceString Name=SettingsOnStartupContinueWhereYouLeftOff/Content}" IsSelected="{x:Bind ViewModel.ContinueLastSessionOnStartUp, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}" />
@@ -158,7 +156,6 @@
158156
ToolTipService.ToolTip="{x:Bind Text}" />
159157
<Button
160158
HorizontalAlignment="Right"
161-
AutomationProperties.Name="{helpers:ResourceString Name=Remove}"
162159
Click="RemoveStartupPage"
163160
ToolTipService.ToolTip="{helpers:ResourceString Name=Remove}">
164161
<FontIcon FontSize="16" Glyph="&#xE74D;" />
@@ -170,7 +167,7 @@
170167
</Grid>
171168

172169
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=OpenTabInExistingInstance}">
173-
<ToggleSwitch AutomationProperties.Name="{helpers:ResourceString Name=OpenTabInExistingInstance}" IsOn="{x:Bind ViewModel.OpenTabInExistingInstance, Mode=TwoWay}" />
170+
<ToggleSwitch IsOn="{x:Bind ViewModel.OpenTabInExistingInstance, Mode=TwoWay}" />
174171
</wctcontrols:SettingsCard>
175172
</wctcontrols:SettingsExpander.Items>
176173
</wctcontrols:SettingsExpander>
@@ -180,13 +177,10 @@
180177
<wctcontrols:SettingsExpander.HeaderIcon>
181178
<FontIcon Glyph="&#xE89F;" />
182179
</wctcontrols:SettingsExpander.HeaderIcon>
183-
<ToggleSwitch AutomationProperties.Name="{helpers:ResourceString Name=SettingsMultitaskingAlwaysOpenDualPane}" IsOn="{x:Bind ViewModel.AlwaysOpenDualPaneInNewTab, Mode=TwoWay}" />
180+
<ToggleSwitch IsOn="{x:Bind ViewModel.AlwaysOpenDualPaneInNewTab, Mode=TwoWay}" />
184181
<wctcontrols:SettingsExpander.Items>
185182
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=DefaultPaneArrangement}">
186-
<uc:ComboBoxEx
187-
AutomationProperties.Name="{helpers:ResourceString Name=DefaultPaneArrangement}"
188-
ItemsSource="{x:Bind ViewModel.ShellPaneArrangementTypes.Values}"
189-
SelectedItem="{x:Bind ViewModel.SelectedShellPaneArrangementType, Mode=TwoWay}" />
183+
<uc:ComboBoxEx ItemsSource="{x:Bind ViewModel.ShellPaneArrangementTypes.Values}" SelectedItem="{x:Bind ViewModel.SelectedShellPaneArrangementType, Mode=TwoWay}" />
190184
</wctcontrols:SettingsCard>
191185
</wctcontrols:SettingsExpander.Items>
192186
</wctcontrols:SettingsExpander>
@@ -196,10 +190,7 @@
196190
<wctcontrols:SettingsCard.HeaderIcon>
197191
<FontIcon Glyph="&#xE8AB;" />
198192
</wctcontrols:SettingsCard.HeaderIcon>
199-
<ToggleSwitch
200-
x:Name="AlwaysSwitchToNewlyOpenedTab"
201-
AutomationProperties.Name="{helpers:ResourceString Name=AlwaysSwitchToNewlyOpenedTab}"
202-
IsOn="{x:Bind ViewModel.AlwaysSwitchToNewlyOpenedTab, Mode=TwoWay}" />
193+
<ToggleSwitch x:Name="AlwaysSwitchToNewlyOpenedTab" IsOn="{x:Bind ViewModel.AlwaysSwitchToNewlyOpenedTab, Mode=TwoWay}" />
203194
</wctcontrols:SettingsCard>
204195

205196
<!-- Widgets -->
@@ -209,23 +200,23 @@
209200
</wctcontrols:SettingsExpander.HeaderIcon>
210201
<wctcontrols:SettingsExpander.Items>
211202
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=QuickAccess}">
212-
<ToggleSwitch AutomationProperties.Name="{helpers:ResourceString Name=QuickAccess}" IsOn="{x:Bind ViewModel.ShowQuickAccessWidget, Mode=TwoWay}" />
203+
<ToggleSwitch IsOn="{x:Bind ViewModel.ShowQuickAccessWidget, Mode=TwoWay}" />
213204
</wctcontrols:SettingsCard>
214205

215206
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=Drives}">
216-
<ToggleSwitch AutomationProperties.Name="{helpers:ResourceString Name=Drives}" IsOn="{x:Bind ViewModel.ShowDrivesWidget, Mode=TwoWay}" />
207+
<ToggleSwitch IsOn="{x:Bind ViewModel.ShowDrivesWidget, Mode=TwoWay}" />
217208
</wctcontrols:SettingsCard>
218209

219210
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=NetworkLocations}">
220-
<ToggleSwitch AutomationProperties.Name="{helpers:ResourceString Name=NetworkLocations}" IsOn="{x:Bind ViewModel.ShowNetworkLocationsWidget, Mode=TwoWay}" />
211+
<ToggleSwitch IsOn="{x:Bind ViewModel.ShowNetworkLocationsWidget, Mode=TwoWay}" />
221212
</wctcontrols:SettingsCard>
222213

223214
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=FileTags}">
224-
<ToggleSwitch AutomationProperties.Name="{helpers:ResourceString Name=FileTags}" IsOn="{x:Bind ViewModel.ShowFileTagsWidget, Mode=TwoWay}" />
215+
<ToggleSwitch IsOn="{x:Bind ViewModel.ShowFileTagsWidget, Mode=TwoWay}" />
225216
</wctcontrols:SettingsCard>
226217

227218
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=RecentFiles}">
228-
<ToggleSwitch AutomationProperties.Name="{helpers:ResourceString Name=RecentFiles}" IsOn="{x:Bind ViewModel.ShowRecentFilesWidget, Mode=TwoWay}" />
219+
<ToggleSwitch IsOn="{x:Bind ViewModel.ShowRecentFilesWidget, Mode=TwoWay}" />
229220
</wctcontrols:SettingsCard>
230221
</wctcontrols:SettingsExpander.Items>
231222
</wctcontrols:SettingsExpander>
@@ -246,61 +237,60 @@
246237
<wctcontrols:SettingsExpander.Items>
247238
<!-- Open in new tab -->
248239
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=ShowOpenInNewTab}">
249-
<ToggleSwitch AutomationProperties.Name="{helpers:ResourceString Name=ShowOpenInNewTab}" IsOn="{x:Bind ViewModel.ShowOpenInNewTab, Mode=TwoWay}" />
240+
<ToggleSwitch IsOn="{x:Bind ViewModel.ShowOpenInNewTab, Mode=TwoWay}" />
250241
</wctcontrols:SettingsCard>
251242

252243
<!-- Open in new window -->
253244
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=ShowOpenInNewWindow}">
254-
<ToggleSwitch AutomationProperties.Name="{helpers:ResourceString Name=ShowOpenInNewWindow}" IsOn="{x:Bind ViewModel.ShowOpenInNewWindow, Mode=TwoWay}" />
245+
<ToggleSwitch IsOn="{x:Bind ViewModel.ShowOpenInNewWindow, Mode=TwoWay}" />
255246
</wctcontrols:SettingsCard>
256247

257248
<!-- Open in new pane -->
258249
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=ShowOpenInNewPane}">
259-
<ToggleSwitch AutomationProperties.Name="{helpers:ResourceString Name=ShowOpenInNewPane}" IsOn="{x:Bind ViewModel.ShowOpenInNewPane, Mode=TwoWay}" />
250+
<ToggleSwitch IsOn="{x:Bind ViewModel.ShowOpenInNewPane, Mode=TwoWay}" />
260251
</wctcontrols:SettingsCard>
261252

262253
<!-- Copy path -->
263254
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=ShowCopyPath}">
264-
<ToggleSwitch AutomationProperties.Name="{helpers:ResourceString Name=ShowCopyPath}" IsOn="{x:Bind ViewModel.ShowCopyPath, Mode=TwoWay}" />
255+
<ToggleSwitch IsOn="{x:Bind ViewModel.ShowCopyPath, Mode=TwoWay}" />
265256
</wctcontrols:SettingsCard>
266257

267258
<!-- Create folder with selection -->
268259
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=ShowCreateFolderWithSelection}">
269-
<ToggleSwitch AutomationProperties.Name="{helpers:ResourceString Name=ShowCreateFolderWithSelection}" IsOn="{x:Bind ViewModel.ShowCreateFolderWithSelection, Mode=TwoWay}" />
260+
<ToggleSwitch IsOn="{x:Bind ViewModel.ShowCreateFolderWithSelection, Mode=TwoWay}" />
270261
</wctcontrols:SettingsCard>
271262

272263
<!-- Create alternate data stream -->
273264
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=ShowCreateAlternateDataStream}">
274-
<ToggleSwitch AutomationProperties.Name="{helpers:ResourceString Name=ShowCreateAlternateDataStream}" IsOn="{x:Bind ViewModel.ShowCreateAlternateDataStream, Mode=TwoWay}" />
265+
<ToggleSwitch IsOn="{x:Bind ViewModel.ShowCreateAlternateDataStream, Mode=TwoWay}" />
275266
</wctcontrols:SettingsCard>
276267

277268
<!-- Create shortcut -->
278269
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=ShowCreateShortcut}">
279-
<ToggleSwitch AutomationProperties.Name="{helpers:ResourceString Name=ShowCreateShortcut}" IsOn="{x:Bind ViewModel.ShowCreateShortcut, Mode=TwoWay}" />
270+
<ToggleSwitch IsOn="{x:Bind ViewModel.ShowCreateShortcut, Mode=TwoWay}" />
280271
</wctcontrols:SettingsCard>
281272

282273
<!-- Compression options -->
283274
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=ShowCompressionOptions}">
284-
<ToggleSwitch AutomationProperties.Name="{helpers:ResourceString Name=ShowCompressionOptions}" IsOn="{x:Bind ViewModel.ShowCompressionOptions, Mode=TwoWay}" />
275+
<ToggleSwitch IsOn="{x:Bind ViewModel.ShowCompressionOptions, Mode=TwoWay}" />
285276
</wctcontrols:SettingsCard>
286277

287278
<!-- Flatten options -->
288279
<!-- TODO uncomment code when feature is marked as stable -->
289280
<!--<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=ShowFlattenOptions}">
290281
<ToggleSwitch
291-
AutomationProperties.Name="{helpers:ResourceString Name=ShowFlattenOptions}"
292282
IsOn="{x:Bind ViewModel.ShowFlattenOptions, Mode=TwoWay}"
293283
/>
294284
</wctcontrols:SettingsCard>-->
295285

296286
<!-- Send To -->
297287
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=ShowSendToMenu}">
298-
<ToggleSwitch AutomationProperties.Name="{helpers:ResourceString Name=ShowSendToMenu}" IsOn="{x:Bind ViewModel.ShowSendToMenu, Mode=TwoWay}" />
288+
<ToggleSwitch IsOn="{x:Bind ViewModel.ShowSendToMenu, Mode=TwoWay}" />
299289
</wctcontrols:SettingsCard>
300290

301291
<!-- Edit tags -->
302292
<wctcontrols:SettingsCard Header="{helpers:ResourceString Name=ShowEditTagsMenu}">
303-
<ToggleSwitch AutomationProperties.Name="{helpers:ResourceString Name=ShowEditTagsMenu}" IsOn="{x:Bind ViewModel.ShowEditTagsMenu, Mode=TwoWay}" />
293+
<ToggleSwitch IsOn="{x:Bind ViewModel.ShowEditTagsMenu, Mode=TwoWay}" />
304294
</wctcontrols:SettingsCard>
305295
</wctcontrols:SettingsExpander.Items>
306296
</wctcontrols:SettingsExpander>
@@ -311,7 +301,7 @@
311301
<wctcontrols:SettingsCard.HeaderIcon>
312302
<FontIcon Glyph="&#xE712;" />
313303
</wctcontrols:SettingsCard.HeaderIcon>
314-
<ToggleSwitch AutomationProperties.Name="{helpers:ResourceString Name=SettingsContextMenuOverflow}" IsOn="{x:Bind ViewModel.MoveShellExtensionsToSubMenu, Mode=TwoWay}" />
304+
<ToggleSwitch IsOn="{x:Bind ViewModel.MoveShellExtensionsToSubMenu, Mode=TwoWay}" />
315305
</wctcontrols:SettingsCard>
316306
</StackPanel>
317307

0 commit comments

Comments
 (0)