Skip to content

Commit ce6a837

Browse files
authored
Feature: Reorganized advanced options for better access (#10958)
1 parent 4bf420b commit ce6a837

File tree

11 files changed

+557
-504
lines changed

11 files changed

+557
-504
lines changed

src/Files.App/Constants.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -198,11 +198,11 @@ public static class Filesystem
198198

199199
public static class GitHub
200200
{
201-
public const string ContributorsUrl = @"https://github.com/files-community/Files/graphs/contributors";
201+
public const string GitHubRepoUrl = @"https://github.com/files-community/Files";
202202
public const string DocumentationUrl = @"https://files.community/docs";
203-
public const string FeedbackUrl = @"https://github.com/files-community/Files/issues/new/choose";
203+
public const string FeatureRequestUrl = @"https://github.com/files-community/Files/issues/new?assignees=&labels=feature+request&template=feature_request.yml";
204+
public const string BugReportUrl = @"https://github.com/files-community/Files/issues/new?assignees=&labels=bug&template=bug_report.yml";
204205
public const string PrivacyPolicyUrl = @"https://github.com/files-community/Files/blob/main/Privacy.md";
205-
public const string ReleaseNotesUrl = @"https://github.com/files-community/Files/releases";
206206
public const string SupportUsUrl = @"https://github.com/sponsors/yaira2";
207207
}
208208
}

src/Files.App/Dialogs/SettingsDialog.xaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,8 @@
6969
</NavigationViewItem>
7070
<NavigationViewItem
7171
AccessKey="E"
72-
AutomationProperties.AutomationId="SettingsItemExperimental"
73-
Content="{helpers:ResourceString Name=SettingsNavExperimental/Content}"
72+
AutomationProperties.AutomationId="SettingsItemAdvanced"
73+
Content="{helpers:ResourceString Name=Advanced}"
7474
CornerRadius="0"
7575
Tag="3">
7676
<NavigationViewItem.Icon>

src/Files.App/Dialogs/SettingsDialog.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ private void SettingsPane_SelectionChanged(NavigationView sender, NavigationView
5050
0 => SettingsContentFrame.Navigate(typeof(Appearance)),
5151
1 => SettingsContentFrame.Navigate(typeof(Preferences)),
5252
2 => SettingsContentFrame.Navigate(typeof(Folders)),
53-
3 => SettingsContentFrame.Navigate(typeof(Experimental)),
53+
3 => SettingsContentFrame.Navigate(typeof(Advanced)),
5454
4 => SettingsContentFrame.Navigate(typeof(About)),
5555
_ => SettingsContentFrame.Navigate(typeof(Appearance))
5656
};

src/Files.App/MainWindow.xaml.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -147,7 +147,7 @@ public async Task InitializeApplication(object activatedEventArgs)
147147
case IToastNotificationActivatedEventArgs eventArgsForNotification:
148148
if (eventArgsForNotification.Argument == "report")
149149
{
150-
await Windows.System.Launcher.LaunchUriAsync(new Uri(Constants.GitHub.FeedbackUrl));
150+
await Windows.System.Launcher.LaunchUriAsync(new Uri(Constants.GitHub.BugReportUrl));
151151
}
152152
break;
153153

src/Files.App/Strings/en-US/Resources.resw

Lines changed: 59 additions & 69 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,17 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<root>
3-
<!--
4-
Microsoft ResX Schema
5-
3+
<!--
4+
Microsoft ResX Schema
5+
66
Version 2.0
7-
8-
The primary goals of this format is to allow a simple XML format
9-
that is mostly human readable. The generation and parsing of the
10-
various data types are done through the TypeConverter classes
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
1111
associated with the data types.
12+
1213
Example:
14+
1315
... ado.net/XML headers & schema ...
1416
<resheader name="resmimetype">text/microsoft-resx</resheader>
1517
<resheader name="version">2.0</resheader>
@@ -24,33 +26,36 @@
2426
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
2527
<comment>This is a comment</comment>
2628
</data>
27-
There are any number of "resheader" rows that contain simple
29+
30+
There are any number of "resheader" rows that contain simple
2831
name/value pairs.
29-
30-
Each data row contains a name, and value. The row also contains a
31-
type or mimetype. Type corresponds to a .NET class that support
32-
text/value conversion through the TypeConverter architecture.
33-
Classes that don't support this are serialized and stored with the
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
3437
mimetype set.
35-
36-
The mimetype is used for serialized objects, and tells the
37-
ResXResourceReader how to depersist the object. This is currently not
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
3841
extensible. For a given mimetype the value must be set accordingly:
39-
40-
Note - application/x-microsoft.net.object.binary.base64 is the format
41-
that the ResXResourceWriter will generate, however the reader can
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
4245
read any of the formats listed below.
46+
4347
mimetype: application/x-microsoft.net.object.binary.base64
44-
value : The object must be serialized with
48+
value : The object must be serialized with
4549
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
4650
: and then encoded with base64 encoding.
51+
4752
mimetype: application/x-microsoft.net.object.soap.base64
48-
value : The object must be serialized with
53+
value : The object must be serialized with
4954
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
5055
: and then encoded with base64 encoding.
5156
5257
mimetype: application/x-microsoft.net.object.bytearray.base64
53-
value : The object must be serialized into a byte array
58+
value : The object must be serialized into a byte array
5459
: using a System.ComponentModel.TypeConverter
5560
: and then encoded with base64 encoding.
5661
-->
@@ -205,15 +210,15 @@
205210
<data name="RecentItemRemove.Text" xml:space="preserve">
206211
<value>Remove this item</value>
207212
</data>
208-
<data name="SettingsUsefulLinks.Title" xml:space="preserve">
209-
<value>Useful links</value>
210-
</data>
211-
<data name="SettingsAboutSubmitFeedback.Text" xml:space="preserve">
212-
<value>Submit feedback</value>
213+
<data name="OpenGitHubRepo" xml:space="preserve">
214+
<value>GitHub respository</value>
213215
</data>
214216
<data name="About" xml:space="preserve">
215217
<value>About</value>
216218
</data>
219+
<data name="OpenSource" xml:space="preserve">
220+
<value>Open source</value>
221+
</data>
217222
<data name="DateFormat" xml:space="preserve">
218223
<value>Date format</value>
219224
</data>
@@ -229,24 +234,18 @@
229234
<data name="ShowDotFiles" xml:space="preserve">
230235
<value>Show dot files</value>
231236
</data>
232-
<data name="SettingsExperimentalTitle.Text" xml:space="preserve">
233-
<value>Experimental</value>
234-
</data>
235237
<data name="Appearance" xml:space="preserve">
236238
<value>Appearance</value>
237239
</data>
238240
<data name="Background" xml:space="preserve">
239241
<value>Background</value>
240242
</data>
241-
<data name="SettingsNavExperimental.Content" xml:space="preserve">
242-
<value>Experimental</value>
243+
<data name="Advanced" xml:space="preserve">
244+
<value>Advanced</value>
243245
</data>
244246
<data name="SettingsNavPreferences.Content" xml:space="preserve">
245247
<value>Preferences</value>
246248
</data>
247-
<data name="SettingsExperimentalDescription.Text" xml:space="preserve">
248-
<value>WARNING: EXPERIMENTAL FEATURES AHEAD!</value>
249-
</data>
250249
<data name="SettingsOnStartupContinueWhereYouLeftOff.Content" xml:space="preserve">
251250
<value>Continue where you left off</value>
252251
</data>
@@ -691,12 +690,6 @@
691690
<data name="ExceptionNotificationReportButton" xml:space="preserve">
692691
<value>Report this issue</value>
693692
</data>
694-
<data name="SettingsAboutContributors.Text" xml:space="preserve">
695-
<value>Contributors</value>
696-
</data>
697-
<data name="SettingsAboutReleaseNotes.Text" xml:space="preserve">
698-
<value>Release notes</value>
699-
</data>
700693
<data name="InvalidItemDialogContent" xml:space="preserve">
701694
<value>The item referenced is either invalid or inaccessible.{0}Error message:{0}{1}</value>
702695
</data>
@@ -745,8 +738,8 @@
745738
<data name="RestartNotificationText.Text" xml:space="preserve">
746739
<value>The application needs to be restarted in order to apply these settings, would you like to restart the app?</value>
747740
</data>
748-
<data name="SettingsAboutSupportUs.Text" xml:space="preserve">
749-
<value>Support us</value>
741+
<data name="SponsorUsOnGitHub" xml:space="preserve">
742+
<value>Sponsor us on GitHub</value>
750743
</data>
751744
<data name="AccessDeniedCreateDialog.Text" xml:space="preserve">
752745
<value>We weren't able to create this item</value>
@@ -1186,15 +1179,6 @@
11861179
<data name="SearchTabHeaderText" xml:space="preserve">
11871180
<value>Search results</value>
11881181
</data>
1189-
<data name="SettingsAboutContributorsListViewItem.AutomationProperties.Name" xml:space="preserve">
1190-
<value>See who contributed to Files</value>
1191-
</data>
1192-
<data name="SettingsAboutReleaseNotesListViewItem.AutomationProperties.Name" xml:space="preserve">
1193-
<value>Find out what's new in Files</value>
1194-
</data>
1195-
<data name="SettingsAboutSubmitFeedbackListViewItem.AutomationProperties.Name" xml:space="preserve">
1196-
<value>Send the developers an issue report with more information</value>
1197-
</data>
11981182
<data name="SettingsAboutSupportUsListViewItem.AutomationProperties.Name" xml:space="preserve">
11991183
<value>Support us on GitHub</value>
12001184
</data>
@@ -1399,18 +1383,18 @@
13991383
<data name="SelectedFilePreviewPane.AutomationProperties.Name" xml:space="preserve">
14001384
<value>Selected file preview pane</value>
14011385
</data>
1402-
<data name="SettingsAboutDocumentation.Text" xml:space="preserve">
1403-
<value>Documentation</value>
1404-
</data>
1405-
<data name="SettingsAboutDocumentationListViewItem.AutomationProperties.Name" xml:space="preserve">
1406-
<value>Visit the Files documentation website</value>
1386+
<data name="Feedback" xml:space="preserve">
1387+
<value>Feedback</value>
14071388
</data>
14081389
<data name="OngoingTasksFlyout.AutomationProperties.Name" xml:space="preserve">
14091390
<value>Ongoing tasks flyout</value>
14101391
</data>
14111392
<data name="CloudDriveSyncStatus_Online" xml:space="preserve">
14121393
<value>Available when online</value>
14131394
</data>
1395+
<data name="Documentation" xml:space="preserve">
1396+
<value>Documentation</value>
1397+
</data>
14141398
<data name="CloudDriveSyncStatus_Offline" xml:space="preserve">
14151399
<value>Available offline</value>
14161400
</data>
@@ -1801,15 +1785,12 @@
18011785
<data name="HorizontalMultitaskingControlReopenClosedTab.Text" xml:space="preserve">
18021786
<value>Reopen closed tab</value>
18031787
</data>
1804-
<data name="SettingsAboutPrivacyPolicy.Text" xml:space="preserve">
1805-
<value>Privacy policy</value>
1806-
</data>
1807-
<data name="SettingsAboutPrivacyPolicyListViewItem.AutomationProperties.Name" xml:space="preserve">
1808-
<value>View Files privacy policy</value>
1809-
</data>
18101788
<data name="RenameFileDialogTitle" xml:space="preserve">
18111789
<value>Rename</value>
18121790
</data>
1791+
<data name="Privacy" xml:space="preserve">
1792+
<value>Privacy</value>
1793+
</data>
18131794
<data name="StatusMoveCanceled" xml:space="preserve">
18141795
<value>Move canceled</value>
18151796
</data>
@@ -2371,8 +2352,17 @@
23712352
<data name="DetailsViewHeaderFlyout_ShowItemSize.Text" xml:space="preserve">
23722353
<value>Item size column</value>
23732354
</data>
2374-
<data name="SettingsDefaultFilesManager" xml:space="preserve">
2375-
<value>Default file manager</value>
2355+
<data name="ExperimentalFeatureFlags" xml:space="preserve">
2356+
<value>Experimental feature flags</value>
2357+
</data>
2358+
<data name="HelpAndSupport" xml:space="preserve">
2359+
<value>Help and support</value>
2360+
</data>
2361+
<data name="SubmitFeatureRequest" xml:space="preserve">
2362+
<value>Submit feature request</value>
2363+
</data>
2364+
<data name="SubmitBugReport" xml:space="preserve">
2365+
<value>Submit bug report</value>
23762366
</data>
23772367
<data name="SettingsSetAsDefaultFileManager" xml:space="preserve">
23782368
<value>Set Files as the default file manager</value>
@@ -2396,7 +2386,7 @@
23962386
<value>Import Settings</value>
23972387
</data>
23982388
<data name="ManageSettings" xml:space="preserve">
2399-
<value>Manage Settings</value>
2389+
<value>Manage settings</value>
24002390
</data>
24012391
<data name="SettingsImportErrorDescription" xml:space="preserve">
24022392
<value>Couldn't import settings. The settings file is corrupted.</value>
@@ -2653,9 +2643,6 @@
26532643
<data name="SizeAllColumnsToFit" xml:space="preserve">
26542644
<value>Size All Columns to Fit</value>
26552645
</data>
2656-
<data name="Contributors" xml:space="preserve">
2657-
<value>Contributors</value>
2658-
</data>
26592646
<data name="Adaptive" xml:space="preserve">
26602647
<value>Adaptive</value>
26612648
</data>
@@ -2881,4 +2868,7 @@
28812868
<data name="RecentFilesDisabledOnWindowsWarning" xml:space="preserve">
28822869
<value>Recently used files is currently disabled in Windows File Explorer.</value>
28832870
</data>
2871+
<data name="EditSettingsFile" xml:space="preserve">
2872+
<value>Edit Settings File</value>
2873+
</data>
28842874
</root>

0 commit comments

Comments
 (0)