Skip to content

Feature: Moved dual pane options to the preferences settings page #10928

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 2 commits into from
Jan 5, 2023
Merged

Feature: Moved dual pane options to the preferences settings page #10928

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2b3f0d4
Feature: Moved dual pane options to preferences settings page
yaira2 Jan 5, 2023
38e1c96
Increase dialog height
yaira2 Jan 5, 2023
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
1 change: 0 additions & 1 deletion src/Files.App/App.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,7 +105,6 @@ private IServiceProvider ConfigureServices()
// Base IUserSettingsService as parent settings store (to get ISettingsSharingContext from)
.AddSingleton<IUserSettingsService, UserSettingsService>()
// Children settings (from IUserSettingsService)
.AddSingleton<IMultitaskingSettingsService, MultitaskingSettingsService>((sp) => new MultitaskingSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
.AddSingleton<IAppearanceSettingsService, AppearanceSettingsService>((sp) => new AppearanceSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
.AddSingleton<IPreferencesSettingsService, PreferencesSettingsService>((sp) => new PreferencesSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
.AddSingleton<IFoldersSettingsService, FoldersSettingsService>((sp) => new FoldersSettingsService((sp.GetService<IUserSettingsService>() as UserSettingsService).GetSharingContext()))
Expand Down
16 changes: 3 additions & 13 deletions src/Files.App/Dialogs/SettingsDialog.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@

<Grid
x:Name="ContainerGrid"
MaxHeight="640"
MaxHeight="690"
HorizontalAlignment="Stretch"
VerticalAlignment="Stretch"
Background="{ThemeResource SolidBackgroundFillColorBase}">
Expand Down Expand Up @@ -67,22 +67,12 @@
<FontIcon Glyph="&#xE8B7;" />
</NavigationViewItem.Icon>
</NavigationViewItem>
<NavigationViewItem
AccessKey="M"
AutomationProperties.AutomationId="SettingsItemMultitasking"
Content="{helpers:ResourceString Name=SettingsNavMultitasking/Content}"
CornerRadius="0"
Tag="3">
<NavigationViewItem.Icon>
<FontIcon FontSize="16" Glyph="&#xEE40;" />
</NavigationViewItem.Icon>
</NavigationViewItem>
<NavigationViewItem
AccessKey="E"
AutomationProperties.AutomationId="SettingsItemExperimental"
Content="{helpers:ResourceString Name=SettingsNavExperimental/Content}"
CornerRadius="0"
Tag="4">
Tag="3">
<NavigationViewItem.Icon>
<FontIcon Glyph="&#xF1AD;" />
</NavigationViewItem.Icon>
Expand All @@ -92,7 +82,7 @@
AutomationProperties.AutomationId="SettingsItemAbout"
Content="{helpers:ResourceString Name=About}"
CornerRadius="0,4,4,0"
Tag="5">
Tag="4">
<NavigationViewItem.Icon>
<FontIcon FontSize="16" Glyph="&#xE946;" />
</NavigationViewItem.Icon>
Expand Down
7 changes: 3 additions & 4 deletions src/Files.App/Dialogs/SettingsDialog.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ private void Current_SizeChanged(object sender, WindowSizeChangedEventArgs e)

private void UpdateDialogLayout()
{
ContainerGrid.Height = App.Window.Bounds.Height <= 710 ? App.Window.Bounds.Height - 70 : 640;
ContainerGrid.Height = App.Window.Bounds.Height <= 760 ? App.Window.Bounds.Height - 70 : 690;
ContainerGrid.Width = App.Window.Bounds.Width <= 800 ? App.Window.Bounds.Width : 800;
}

Expand All @@ -50,9 +50,8 @@ private void SettingsPane_SelectionChanged(NavigationView sender, NavigationView
0 => SettingsContentFrame.Navigate(typeof(Appearance)),
1 => SettingsContentFrame.Navigate(typeof(Preferences)),
2 => SettingsContentFrame.Navigate(typeof(Folders)),
3 => SettingsContentFrame.Navigate(typeof(Multitasking)),
4 => SettingsContentFrame.Navigate(typeof(Experimental)),
5 => SettingsContentFrame.Navigate(typeof(About)),
3 => SettingsContentFrame.Navigate(typeof(Experimental)),
4 => SettingsContentFrame.Navigate(typeof(About)),
_ => SettingsContentFrame.Navigate(typeof(Appearance))
};
}
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/Helpers/ContextFlyoutItemHelper.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -691,7 +691,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(BaseLayo
Glyph = "\uE117",
GlyphFontFamilyName = "CustomGlyph",
Command = commandsViewModel.OpenDirectoryInNewPaneCommand,
ShowItem = userSettingsService.MultitaskingSettingsService.IsDualPaneEnabled && selectedItems.All(i => i.PrimaryItemAttribute == Windows.Storage.StorageItemTypes.Folder),
ShowItem = userSettingsService.PreferencesSettingsService.IsDualPaneEnabled && selectedItems.All(i => i.PrimaryItemAttribute == Windows.Storage.StorageItemTypes.Folder),
SingleItemOnly = true,
ShowInSearchPage = true,
ShowInFtpPage = true,
Expand Down
41 changes: 0 additions & 41 deletions src/Files.App/ServicesImplementation/Settings/MultitaskingSettingsService.cs
View file
Open in desktop

This file was deleted.

13 changes: 13 additions & 0 deletions src/Files.App/ServicesImplementation/Settings/PreferencesSettingsService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,17 @@ public DateTimeFormats DateTimeFormat
set => Set(value);
}

public bool IsDualPaneEnabled
{
get => Get(false);
set => Set(value);
}

public bool AlwaysOpenDualPaneInNewTab
{
get => Get(false);
set => Set(value);
}
protected override void RaiseOnSettingChangedEvent(object sender, SettingChangedEventArgs e)
{
switch (e.SettingName)
Expand All @@ -105,6 +116,8 @@ protected override void RaiseOnSettingChangedEvent(object sender, SettingChanged
case nameof(ContinueLastSessionOnStartUp):
case nameof(OpenNewTabOnStartup):
case nameof(AlwaysOpenNewInstance):
case nameof(IsDualPaneEnabled):
case nameof(AlwaysOpenDualPaneInNewTab):
Analytics.TrackEvent($"Set {e.SettingName} to {e.NewValue}");
break;
}
Expand Down
6 changes: 0 additions & 6 deletions src/Files.App/ServicesImplementation/Settings/UserSettingsService.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,12 +24,6 @@ public IFoldersSettingsService FoldersSettingsService
get => GetSettingsService(ref _FoldersSettingsService);
}

private IMultitaskingSettingsService _MultitaskingSettingsService;
public IMultitaskingSettingsService MultitaskingSettingsService
{
get => GetSettingsService(ref _MultitaskingSettingsService);
}

private IAppearanceSettingsService _AppearanceSettingsService;
public IAppearanceSettingsService AppearanceSettingsService
{
Expand Down
3 changes: 0 additions & 3 deletions src/Files.App/Strings/en-GB/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -763,9 +763,6 @@
<data name="SettingsMultitaskingTitle.Text" xml:space="preserve">
<value>Multi-tasking</value>
</data>
<data name="SettingsNavMultitasking.Content" xml:space="preserve">
<value>Multi-tasking</value>
</data>
<data name="BaseLayoutItemContextFlyoutSetAs.Text" xml:space="preserve">
<value>Set as</value>
</data>
Expand Down
5 changes: 1 addition & 4 deletions src/Files.App/Strings/en-US/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1247,7 +1247,7 @@
<value>Remove</value>
</data>
<data name="SettingsMultitaskingAlwaysOpenDualPane" xml:space="preserve">
<value>Always open new tabs in dual pane mode</value>
<value>Open tabs in dual pane mode</value>
</data>
<data name="SettingsMultitaskingEnableDualPane" xml:space="preserve">
<value>Enable dual pane view</value>
Expand All @@ -1261,9 +1261,6 @@
<data name="SideBarOpenInNewPane.Text" xml:space="preserve">
<value>Open in secondary pane</value>
</data>
<data name="SettingsDualPane.Text" xml:space="preserve">
<value>Dual pane</value>
</data>
<data name="Folders" xml:space="preserve">
<value>Folders</value>
</data>
Expand Down
37 changes: 0 additions & 37 deletions src/Files.App/ViewModels/SettingsViewModels/MultitaskingViewModel.cs
View file
Open in desktop

This file was deleted.

26 changes: 26 additions & 0 deletions src/Files.App/ViewModels/SettingsViewModels/PreferencesViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -268,6 +268,32 @@ public bool AlwaysOpenANewInstance
}
}

public bool IsDualPaneEnabled
{
get => UserSettingsService.PreferencesSettingsService.IsDualPaneEnabled;
set
{
if (value != UserSettingsService.PreferencesSettingsService.IsDualPaneEnabled)
{
UserSettingsService.PreferencesSettingsService.IsDualPaneEnabled = value;
OnPropertyChanged();
}
}
}

public bool AlwaysOpenDualPaneInNewTab
{
get => UserSettingsService.PreferencesSettingsService.AlwaysOpenDualPaneInNewTab;
set
{
if (value != UserSettingsService.PreferencesSettingsService.AlwaysOpenDualPaneInNewTab)
{
UserSettingsService.PreferencesSettingsService.AlwaysOpenDualPaneInNewTab = value;
OnPropertyChanged();
}
}
}

private async Task ChangePage()
{
var folderPicker = this.InitializeWithWindow(new FolderPicker());
Expand Down
2 changes: 1 addition & 1 deletion src/Files.App/ViewModels/Widgets/Bundles/BundleItemViewModel.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ public bool OpenInNewTabLoad

public bool OpenInNewPaneLoad
{
get => UserSettingsService.MultitaskingSettingsService.IsDualPaneEnabled && TargetType == FilesystemItemType.Directory;
get => UserSettingsService.PreferencesSettingsService.IsDualPaneEnabled && TargetType == FilesystemItemType.Directory;
}

#endregion Properties
Expand Down
12 changes: 6 additions & 6 deletions src/Files.App/Views/PaneHolderPage.xaml.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ private bool windowIsCompact

public bool IsMultiPaneEnabled
{
get => UserSettingsService.MultitaskingSettingsService.IsDualPaneEnabled && !(App.Window.Bounds.Width <= 750);
get => UserSettingsService.PreferencesSettingsService.IsDualPaneEnabled && !(App.Window.Bounds.Width <= 750);
}

private NavigationParams navParamsLeft;
Expand Down Expand Up @@ -198,7 +198,7 @@ public PaneHolderPage()
this.InitializeComponent();
App.Window.SizeChanged += Current_SizeChanged;
this.ActivePane = PaneLeft;
this.IsRightPaneVisible = IsMultiPaneEnabled && UserSettingsService.MultitaskingSettingsService.AlwaysOpenDualPaneInNewTab;
this.IsRightPaneVisible = IsMultiPaneEnabled && UserSettingsService.PreferencesSettingsService.AlwaysOpenDualPaneInNewTab;
UserSettingsService.OnSettingChangedEvent += UserSettingsService_OnSettingChangedEvent;

// TODO: fallback / error when failed to get NavigationViewCompactPaneLength value?
Expand All @@ -208,7 +208,7 @@ private void UserSettingsService_OnSettingChangedEvent(object sender, SettingCha
{
switch (e.SettingName)
{
case nameof(UserSettingsService.MultitaskingSettingsService.IsDualPaneEnabled):
case nameof(UserSettingsService.PreferencesSettingsService.IsDualPaneEnabled):
NotifyPropertyChanged(nameof(IsMultiPaneEnabled));
break;
}
Expand Down Expand Up @@ -298,14 +298,14 @@ private void KeyboardAccelerator_Invoked(KeyboardAccelerator sender, KeyboardAcc
switch (c: ctrl, s: shift, m: menu, k: args.KeyboardAccelerator.Key)
{
case (true, true, false, VirtualKey.Left): // ctrl + shift + "<-" select left pane
if (UserSettingsService.MultitaskingSettingsService.IsDualPaneEnabled)
if (UserSettingsService.PreferencesSettingsService.IsDualPaneEnabled)
{
ActivePane = PaneLeft;
}
break;

case (true, true, false, VirtualKey.Right): // ctrl + shift + "->" select right pane
if (UserSettingsService.MultitaskingSettingsService.IsDualPaneEnabled)
if (UserSettingsService.PreferencesSettingsService.IsDualPaneEnabled)
{
if (string.IsNullOrEmpty(NavParamsRight?.NavPath))
{
Expand All @@ -322,7 +322,7 @@ private void KeyboardAccelerator_Invoked(KeyboardAccelerator sender, KeyboardAcc

case (false, true, true, VirtualKey.Add): // alt + shift + "+" open pane
case (false, true, true, PlusKey):
if (UserSettingsService.MultitaskingSettingsService.IsDualPaneEnabled)
if (UserSettingsService.PreferencesSettingsService.IsDualPaneEnabled)
{
if (string.IsNullOrEmpty(NavParamsRight?.NavPath))
{
Expand Down
0 .../SettingsPages/Appearance/Appearance.xaml → ...s.App/Views/SettingsPages/Appearance.xaml
View file
Open in desktop
File renamed without changes.
0 ...ttingsPages/Appearance/Appearance.xaml.cs → ...pp/Views/SettingsPages/Appearance.xaml.cs
View file
Open in desktop
File renamed without changes.
53 changes: 0 additions & 53 deletions src/Files.App/Views/SettingsPages/Multitasking.xaml
View file
Open in desktop

This file was deleted.

15 changes: 0 additions & 15 deletions src/Files.App/Views/SettingsPages/Multitasking.xaml.cs
View file
Open in desktop

This file was deleted.

Loading