Skip to content

Commit

Permalink
Removed vertical tab flyout (#9786)
Browse files Browse the repository at this point in the history
  • Loading branch information
yaira2 committed Aug 21, 2022
1 parent a8d48f0 commit 3cf5671
Show file tree
Hide file tree
Showing 13 changed files with 451 additions and 1,665 deletions.
Expand Up @@ -4,10 +4,6 @@ namespace Files.Backend.Services.Settings
{
public interface IMultitaskingSettingsService : IBaseSettingsService, INotifyPropertyChanged
{
/// <summary>
/// Gets or sets a value indicating whether or not to enable the vertical tab flyout.
/// </summary>
bool IsVerticalTabFlyoutEnabled { get; set; }

/// <summary>
/// Gets or sets a value indicating whether or not to enable dual pane feature.
Expand Down
15 changes: 0 additions & 15 deletions src/Files.Uwp/Files.Uwp.csproj
Expand Up @@ -542,9 +542,6 @@
<DependentUpon>OngoingTasksFlyout.xaml</DependentUpon>
</Compile>
<Compile Include="UserControls\MultitaskingControl\TabItem\TabItem.cs" />
<Compile Include="UserControls\MultitaskingControl\VerticalTabViewControl.xaml.cs">
<DependentUpon>VerticalTabViewControl.xaml</DependentUpon>
</Compile>
<Compile Include="UserControls\Widgets\DrivesWidget.xaml.cs">
<DependentUpon>DrivesWidget.xaml</DependentUpon>
</Compile>
Expand Down Expand Up @@ -1241,14 +1238,6 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ResourceDictionaries\TabViewItem_shared.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ResourceDictionaries\TabView_vertical.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="ResourceDictionaries\RightAlignedToggleSwitchStyle.xaml">
<Generator>MSBuild:Compile</Generator>
<SubType>Designer</SubType>
Expand Down Expand Up @@ -1397,10 +1386,6 @@
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UserControls\MultitaskingControl\VerticalTabViewControl.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
</Page>
<Page Include="UserControls\Widgets\BundlesWidget.xaml">
<SubType>Designer</SubType>
<Generator>MSBuild:Compile</Generator>
Expand Down
465 changes: 0 additions & 465 deletions src/Files.Uwp/ResourceDictionaries/TabViewItem_shared.xaml

This file was deleted.

309 changes: 0 additions & 309 deletions src/Files.Uwp/ResourceDictionaries/TabView_vertical.xaml

This file was deleted.

Expand Up @@ -13,12 +13,6 @@ public MultitaskingSettingsService(ISettingsSharingContext settingsSharingContex
RegisterSettingsContext(settingsSharingContext);
}

public bool IsVerticalTabFlyoutEnabled
{
get => Get(true);
set => Set(value);
}

public bool IsDualPaneEnabled
{
get => Get(false);
Expand All @@ -35,7 +29,6 @@ protected override void RaiseOnSettingChangedEvent(object sender, SettingChanged
{
switch (e.SettingName)
{
case nameof(IsVerticalTabFlyoutEnabled):
case nameof(IsDualPaneEnabled):
case nameof(AlwaysOpenDualPaneInNewTab):
Analytics.TrackEvent($"{e.SettingName} {e.NewValue}");
Expand All @@ -47,7 +40,6 @@ protected override void RaiseOnSettingChangedEvent(object sender, SettingChanged

public void ReportToAppCenter()
{
Analytics.TrackEvent($"{nameof(IsVerticalTabFlyoutEnabled)}, {IsVerticalTabFlyoutEnabled}");
Analytics.TrackEvent($"{nameof(IsDualPaneEnabled)}, {IsDualPaneEnabled}");
Analytics.TrackEvent($"{nameof(AlwaysOpenDualPaneInNewTab)}, {AlwaysOpenDualPaneInNewTab}");
}
Expand Down
9 changes: 0 additions & 9 deletions src/Files.Uwp/Strings/en-US/Resources.resw
Expand Up @@ -810,12 +810,6 @@
<data name="NavUpButton.AutomationProperties.Name" xml:space="preserve">
<value>Go up one directory</value>
</data>
<data name="VerticalTabFlyout.AutomationProperties.Name" xml:space="preserve">
<value>Vertical tab flyout</value>
</data>
<data name="VerticalTabFlyout.ToolTipService.ToolTip" xml:space="preserve">
<value>Vertical tab flyout</value>
</data>
<data name="SettingsPreferencesAppLanguage.Title" xml:space="preserve">
<value>Language</value>
</data>
Expand Down Expand Up @@ -2013,9 +2007,6 @@
<data name="SecurityUnknownOwnerText.Text" xml:space="preserve">
<value>Unknown owner</value>
</data>
<data name="SettingsVerticalTabFlyout" xml:space="preserve">
<value>Display the vertical tab flyout on the title bar</value>
</data>
<data name="SettingsThemesLearnMoreButton.AutomationProperties.Name" xml:space="preserve">
<value>Learn more about custom themes</value>
</data>
Expand Down
@@ -1,18 +1,18 @@
<UserControl
x:Class="Files.Uwp.UserControls.MultitaskingControl.TabItemControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:Files.Uwp.UserControls.MultitaskingControl"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="300"
d:DesignWidth="400"
mc:Ignorable="d">
x:Class="Files.Uwp.UserControls.MultitaskingControl.TabItemControl"
xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
xmlns:local="using:Files.Uwp.UserControls.MultitaskingControl"
xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
d:DesignHeight="300"
d:DesignWidth="400"
mc:Ignorable="d">

<Frame
x:Name="ContentFrame"
Background="Transparent"
CacheSize="0"
IsNavigationStackEnabled="False"
Navigated="ContentFrame_Navigated" />
<Frame
x:Name="ContentFrame"
Background="Transparent"
CacheSize="0"
IsNavigationStackEnabled="False"
Navigated="ContentFrame_Navigated" />
</UserControl>

This file was deleted.

0 comments on commit 3cf5671

Please sign in to comment.