Skip to content

Improved the settings dialog #5166

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 6 commits into from
Jun 10, 2021
Merged

Improved the settings dialog #5166

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
5a39553
- Fixed restart control
yaira2 Jun 8, 2021
3bdfec1
Updated about page
yaira2 Jun 8, 2021
51beb66
Added sidebar settings page
yaira2 Jun 8, 2021
b5b6932
Updated multitasking settings
yaira2 Jun 8, 2021
1ae87e6
Updated regions
yaira2 Jun 9, 2021
743f306
Fixed view model
yaira2 Jun 9, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 27 additions & 9 deletions Files/Dialogs/SettingsDialog.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
Closing="ContentDialog_Closing"
CornerRadius="{StaticResource OverlayCornerRadius}"
RequestedTheme="{x:Bind RootAppElement.RequestedTheme, Mode=OneWay}"
Style="{StaticResource DefaultContentDialogStyle}"
mc:Ignorable="d">
<ContentDialog.Resources>
<ResourceDictionary>
Expand Down Expand Up @@ -54,60 +53,79 @@
x:Uid="SettingsNavAppearance"
AccessKey="A"
Content="Appearance"
IsSelected="True">
IsSelected="True"
Tag="0">
<muxc:NavigationViewItem.Icon>
<FontIcon HorizontalAlignment="Left" Glyph="&#xE790;" />
</muxc:NavigationViewItem.Icon>
</muxc:NavigationViewItem>
<muxc:NavigationViewItem
x:Uid="SettingsNavOnStartup"
AccessKey="O"
Content="On Startup">
Content="On Startup"
Tag="1">
<muxc:NavigationViewItem.Icon>
<FontIcon Glyph="&#xE7E8;" />
</muxc:NavigationViewItem.Icon>
</muxc:NavigationViewItem>
<muxc:NavigationViewItem
x:Uid="SettingsNavPreferences"
AccessKey="P"
Content="Preferences">
Content="Preferences"
Tag="2">
<muxc:NavigationViewItem.Icon>
<FontIcon FontFamily="{StaticResource CustomGlyph}" Glyph="&#xF116;" />
</muxc:NavigationViewItem.Icon>
</muxc:NavigationViewItem>
<muxc:NavigationViewItem
x:Uid="SettingsNavSidebar"
AccessKey="S"
Content="Sidebar"
Tag="3">
<muxc:NavigationViewItem.Icon>
<FontIcon Glyph="&#xE700;" />
</muxc:NavigationViewItem.Icon>
</muxc:NavigationViewItem>
<muxc:NavigationViewItem
x:Uid="SettingsNavMultitasking"
AccessKey="M"
Content="Multitasking">
Content="Multitasking"
Tag="4">
<muxc:NavigationViewItem.Icon>
<FontIcon FontSize="16" Glyph="&#xEE40;" />
</muxc:NavigationViewItem.Icon>
</muxc:NavigationViewItem>
<muxc:NavigationViewItem
x:Uid="SettingsNavFilesAndFolders"
AccessKey="F"
Content="Files and Folders">
Content="Files and Folders"
Tag="5">
<muxc:NavigationViewItem.Icon>
<FontIcon Glyph="&#xE8B7;" />
</muxc:NavigationViewItem.Icon>
</muxc:NavigationViewItem>
<muxc:NavigationViewItem
x:Uid="SettingsNavExperimental"
AccessKey="E"
Content="Experimental">
Content="Experimental"
Tag="6">
<muxc:NavigationViewItem.Icon>
<FontIcon Glyph="&#xF1AD;" />
</muxc:NavigationViewItem.Icon>
</muxc:NavigationViewItem>
</muxc:NavigationView.MenuItems>

<muxc:NavigationView.FooterMenuItems>
<muxc:NavigationViewItem
x:Uid="SettingsNavAbout"
AccessKey="B"
Content="About">
Content="About"
Tag="7">
<muxc:NavigationViewItem.Icon>
<FontIcon FontSize="16" Glyph="&#xE946;" />
</muxc:NavigationViewItem.Icon>
</muxc:NavigationViewItem>
</muxc:NavigationView.MenuItems>
</muxc:NavigationView.FooterMenuItems>

<ScrollViewer
Margin="20,4,4,4"
Expand Down
15 changes: 10 additions & 5 deletions Files/Dialogs/SettingsDialog.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using Files.Helpers;
using Files.SettingsPages;
using Files.ViewModels;
using System;
using Windows.UI.Core;
using Windows.UI.Xaml;
using Windows.UI.Xaml.Controls;
Expand Down Expand Up @@ -35,15 +36,19 @@ private void Current_SizeChanged(object sender, WindowSizeChangedEventArgs e)

private void SettingsPane_SelectionChanged(Microsoft.UI.Xaml.Controls.NavigationView sender, Microsoft.UI.Xaml.Controls.NavigationViewSelectionChangedEventArgs args)
{
_ = SettingsPane.MenuItems.IndexOf(SettingsPane.SelectedItem) switch
var selectedItem = (Microsoft.UI.Xaml.Controls.NavigationViewItem)args.SelectedItem;
int selectedItemTag = Convert.ToInt32(selectedItem.Tag);

_ = selectedItemTag switch
{
0 => SettingsContentFrame.Navigate(typeof(Appearance)),
1 => SettingsContentFrame.Navigate(typeof(OnStartup)),
2 => SettingsContentFrame.Navigate(typeof(Preferences)),
3 => SettingsContentFrame.Navigate(typeof(Multitasking)),
4 => SettingsContentFrame.Navigate(typeof(FilesAndFolders)),
5 => SettingsContentFrame.Navigate(typeof(Experimental)),
6 => SettingsContentFrame.Navigate(typeof(About)),
3 => SettingsContentFrame.Navigate(typeof(Sidebar)),
4 => SettingsContentFrame.Navigate(typeof(Multitasking)),
5 => SettingsContentFrame.Navigate(typeof(FilesAndFolders)),
6 => SettingsContentFrame.Navigate(typeof(Experimental)),
7 => SettingsContentFrame.Navigate(typeof(About)),
_ => SettingsContentFrame.Navigate(typeof(Appearance))
};
}
Expand Down
8 changes: 8 additions & 0 deletions Files/Files.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -334,6 +334,7 @@
</Compile>
<Compile Include="ViewModels\Previews\CodePreviewViewModel.cs" />
<Compile Include="ViewModels\Properties\FileSystemProperties.cs" />
<Compile Include="ViewModels\SettingsViewModels\SidebarViewModel.cs" />
<Compile Include="ViewModels\SidebarViewModel.cs" />
<Compile Include="ViewModels\BaseJsonSettingsViewModel.cs" />
<Compile Include="ViewModels\ColumnsViewModel.cs" />
Expand Down Expand Up @@ -572,6 +573,9 @@
<Compile Include="Views\SettingsPages\Multitasking.xaml.cs">
<DependentUpon>Multitasking.xaml</DependentUpon>
</Compile>
<Compile Include="Views\SettingsPages\Sidebar.xaml.cs">
<DependentUpon>Sidebar.xaml</DependentUpon>
</Compile>
<Compile Include="Views\SettingsPages\Preferences.xaml.cs">
<DependentUpon>Preferences.xaml</DependentUpon>
</Compile>
Expand Down Expand Up @@ -1064,6 +1068,10 @@
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Views\SettingsPages\Sidebar.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
</Page>
<Page Include="Views\SettingsPages\Preferences.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
Expand Down
46 changes: 17 additions & 29 deletions Files/MultilingualResources/Files.ar.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
<source>Acrylic sidebar</source>
<target state="translated">Acrylic الشريط الجانبي</target>
</trans-unit>
<trans-unit id="SettingsAppearanceDateFormat.Header" translate="yes" xml:space="preserve">
<trans-unit id="SettingsDateFormat.Header" translate="yes" xml:space="preserve">
<source>Date format</source>
<target state="translated" state-qualifier="tm-suggestion">تنسيق التاريخ</target>
</trans-unit>
Expand Down Expand Up @@ -746,7 +746,7 @@
<source>Run as administrator</source>
<target state="translated" state-qualifier="tm-suggestion">تشغيل كمسؤول</target>
</trans-unit>
<trans-unit id="SettingsAppearanceDateFormatsTip.ToolTipService.ToolTip" translate="yes" xml:space="preserve">
<trans-unit id="SettingsDateFormatsTip.ToolTipService.ToolTip" translate="yes" xml:space="preserve">
<source>Learn more about date formats</source>
<target state="translated">تعلم المزيد عن صيغة التاريخ</target>
</trans-unit>
Expand Down Expand Up @@ -1070,34 +1070,10 @@
<source>Open tabs</source>
<target state="translated">فتح علامات التبويب</target>
</trans-unit>
<trans-unit id="SettingsMultitaskingAdaptive.Content" translate="yes" xml:space="preserve">
<source>Adaptive (Recommended)</source>
<target state="translated">التكيف (موصى به)</target>
</trans-unit>
<trans-unit id="SettingsMultitaskingAdaptiveDescription.Text" translate="yes" xml:space="preserve">
<source>Selects the best multitasking control based on how the app window is resized. When the window is small, you'll notice the horizontal tab strip is collapsed into a flyout on the navigation toolbar.</source>
<target state="translated">يحدد أفضل عنصر تحكم متعدد المهام بناءً على كيفية تغيير حجم نافذة التطبيق. عندما تكون النافذة صغيرة ، ستلاحظ طي شريط علامات التبويب الأفقي في قائمة منبثقة على شريط أدوات التنقل</target>
</trans-unit>
<trans-unit id="SettingsMultitaskingHorizontal.Content" translate="yes" xml:space="preserve">
<source>Horizontal</source>
<target state="translated" state-qualifier="tm-suggestion">أفقي</target>
</trans-unit>
<trans-unit id="SettingsMultitaskingHorizontalDescription.Text" translate="yes" xml:space="preserve">
<source>Always hides the vertical multitasking flyout from the navigation toolbar, and shows the traditional horizontal tabstrip on the app window. This is suited for users who need to keep track of every open app instance at all times.</source>
<target state="translated">يخفي دائمًا قائمة المهام المتعددة الرأسية المنبثقة من شريط أدوات التنقل ، ويعرض شريط التبويب الأفقي التقليدي في نافذة التطبيق. يناسب هذا المستخدمين الذين يحتاجون إلى تتبع كل مثيل تطبيق مفتوح في جميع الأوقات</target>
</trans-unit>
<trans-unit id="SettingsMultitaskingTitle.Text" translate="yes" xml:space="preserve">
<source>Multitasking</source>
<target state="translated" state-qualifier="tm-suggestion">معالجة متعددة</target>
</trans-unit>
<trans-unit id="SettingsMultitaskingVertical.Content" translate="yes" xml:space="preserve">
<source>Vertical</source>
<target state="translated" state-qualifier="tm-suggestion">عمودي</target>
</trans-unit>
<trans-unit id="SettingsMultitaskingVerticalDescription.Text" translate="yes" xml:space="preserve">
<source>Collapses the horizontal list of app instances into a vertical flyout on the navigation toolbar, designed for users who want a clean app interface with on-demand access to a multitasking experience.</source>
<target state="translated">لطي القائمة الأفقية لمثيلات التطبيق في قائمة منبثقة عمودية على شريط أدوات التنقل ، مصممة للمستخدمين الذين يريدون واجهة تطبيق نظيفة مع وصول عند الطلب إلى تجربة تعدد المهام</target>
</trans-unit>
<trans-unit id="SettingsNavMultitasking.Content" translate="yes" xml:space="preserve">
<source>Multitasking</source>
<target state="translated" state-qualifier="tm-suggestion">تعدد المهام</target>
Expand Down Expand Up @@ -1187,7 +1163,7 @@
<source>Move overflow items into a sub menu</source>
<target state="translated">نقل العناصر الفائضة إلى قائمة فرعية</target>
</trans-unit>
<trans-unit id="SettingsPreferencesRecycleBinSwitch.Header" translate="yes" xml:space="preserve">
<trans-unit id="SettingsRecycleBinSwitch.Header" translate="yes" xml:space="preserve">
<source>Pin Recycle Bin to the sidebar</source>
<target state="translated">قم بتثبيت سلة المحذوفات في الشريط الجانبي</target>
</trans-unit>
Expand Down Expand Up @@ -1684,7 +1660,7 @@
<source>Status Center</source>
<target state="translated">مركز الحالات</target>
</trans-unit>
<trans-unit id="SettingsAppearanceDateFormatsTip.AutomationProperties.Name" translate="yes" xml:space="preserve">
<trans-unit id="SettingsDateFormatsTip.AutomationProperties.Name" translate="yes" xml:space="preserve">
<source>Learn more about date formats</source>
<target state="translated">تعرف على المزيد حول تنسيقات التاريخ</target>
</trans-unit>
Expand Down Expand Up @@ -2204,7 +2180,7 @@
<source>Arguments</source>
<target state="needs-review-translation" state-qualifier="tm-suggestion">‏‏الوسيطات</target>
</trans-unit>
<trans-unit id="SettingsPreferencesShowLibrarySection.Header" translate="yes" xml:space="preserve">
<trans-unit id="SettingsShowLibrarySection.Header" translate="yes" xml:space="preserve">
<source>Show library section on the sidebar</source>
<target state="new">Show library section on the sidebar</target>
</trans-unit>
Expand Down Expand Up @@ -3096,6 +3072,18 @@
<source>Unknown owner</source>
<target state="new">Unknown owner</target>
</trans-unit>
<trans-unit id="SettingsNavSidebar.Content" translate="yes" xml:space="preserve">
<source>Sidebar</source>
<target state="new">Sidebar</target>
</trans-unit>
<trans-unit id="SettingsSidebarTitle.Text" translate="yes" xml:space="preserve">
<source>Sidebar</source>
<target state="new">Sidebar</target>
</trans-unit>
<trans-unit id="SettingsVerticalTabFlyoutSwitch.Header" translate="yes" xml:space="preserve">
<source>Display vertical tab flyout on the title bar</source>
<target state="new">Display vertical tab flyout on the title bar</target>
</trans-unit>
</group>
</body>
</file>
Expand Down
Loading