Skip to content

Feature: Removed sidebar toggles from settings dialog #11302

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 1 commit into from
Feb 14, 2023
Merged

Feature: Removed sidebar toggles from settings dialog #11302

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
99 changes: 0 additions & 99 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 @@ -528,105 +528,6 @@ public bool ShowRecentFilesWidget
}
}

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

OnPropertyChanged();
}
}
}

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

OnPropertyChanged();
}
}
}

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

OnPropertyChanged();
}
}
}

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

OnPropertyChanged();
}
}
}

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

OnPropertyChanged();
}
}
}

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

OnPropertyChanged();
}
}
}

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

OnPropertyChanged();
}
}
}


public bool MoveShellExtensionsToSubMenu
{
get => UserSettingsService.PreferencesSettingsService.MoveShellExtensionsToSubMenu;
Expand Down
58 changes: 0 additions & 58 deletions src/Files.App/Views/SettingsPages/Preferences.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -254,64 +254,6 @@
</local:SettingsBlockControl.ExpandableContent>
</local:SettingsBlockControl>

<local:SettingsBlockControl Title="{helpers:ResourceString Name=Sidebar}" HorizontalAlignment="Stretch">
<local:SettingsBlockControl.Icon>
<FontIcon Glyph="&#xE145;" />
</local:SettingsBlockControl.Icon>
<local:SettingsBlockControl.ExpandableContent>
<StackPanel>
<local:SettingsBlockControl Title="{helpers:ResourceString Name=SidebarFavorites}" HorizontalAlignment="Stretch">
<ToggleSwitch
AutomationProperties.Name="{helpers:ResourceString Name=SidebarFavorites}"
IsOn="{x:Bind ViewModel.ShowFavoritesSection, Mode=TwoWay}"
Style="{StaticResource RightAlignedToggleSwitchStyle}" />
</local:SettingsBlockControl>

<local:SettingsBlockControl Title="{helpers:ResourceString Name=SidebarLibraries}" HorizontalAlignment="Stretch">
<ToggleSwitch
AutomationProperties.Name="{helpers:ResourceString Name=SidebarLibraries}"
IsOn="{x:Bind ViewModel.ShowLibrarySection, Mode=TwoWay}"
Style="{StaticResource RightAlignedToggleSwitchStyle}" />
</local:SettingsBlockControl>

<local:SettingsBlockControl Title="{helpers:ResourceString Name=Drives}" HorizontalAlignment="Stretch">
<ToggleSwitch
AutomationProperties.Name="{helpers:ResourceString Name=Drives}"
IsOn="{x:Bind ViewModel.ShowDrivesSection, Mode=TwoWay}"
Style="{StaticResource RightAlignedToggleSwitchStyle}" />
</local:SettingsBlockControl>

<local:SettingsBlockControl Title="{helpers:ResourceString Name=SidebarCloudDrives}" HorizontalAlignment="Stretch">
<ToggleSwitch
AutomationProperties.Name="{helpers:ResourceString Name=SidebarCloudDrives}"
IsOn="{x:Bind ViewModel.ShowCloudDrivesSection, Mode=TwoWay}"
Style="{StaticResource RightAlignedToggleSwitchStyle}" />
</local:SettingsBlockControl>

<local:SettingsBlockControl Title="{helpers:ResourceString Name=SidebarNetworkDrives}" HorizontalAlignment="Stretch">
<ToggleSwitch
AutomationProperties.Name="{helpers:ResourceString Name=SidebarNetworkDrives}"
IsOn="{x:Bind ViewModel.ShowNetworkDrivesSection, Mode=TwoWay}"
Style="{StaticResource RightAlignedToggleSwitchStyle}" />
</local:SettingsBlockControl>

<local:SettingsBlockControl Title="{helpers:ResourceString Name=WSL}" HorizontalAlignment="Stretch">
<ToggleSwitch
AutomationProperties.Name="{helpers:ResourceString Name=WSL}"
IsOn="{x:Bind ViewModel.ShowWslSection, Mode=TwoWay}"
Style="{StaticResource RightAlignedToggleSwitchStyle}" />
</local:SettingsBlockControl>

<local:SettingsBlockControl Title="{helpers:ResourceString Name=FileTags}" HorizontalAlignment="Stretch">
<ToggleSwitch
AutomationProperties.Name="{helpers:ResourceString Name=FileTags}"
IsOn="{x:Bind ViewModel.ShowFileTagsSection, Mode=TwoWay}"
Style="{StaticResource RightAlignedToggleSwitchStyle}" />
</local:SettingsBlockControl>
</StackPanel>
</local:SettingsBlockControl.ExpandableContent>
</local:SettingsBlockControl>


<!-- Right Click Menu -->
<TextBlock
Expand Down