Skip to content

Commit ccb8bd4

Browse files
authored
Change "Close others" to "Close other tabs" (#8066)
1 parent 42339b1 commit ccb8bd4

File tree

5 files changed

+11
-11
lines changed

5 files changed

+11
-11
lines changed

src/Files/Helpers/MultitaskingTabsHelpers.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ public static void CloseTabsToTheRight(TabItem clickedTab, IMultitaskingControl
3232
}
3333
}
3434

35-
public static void CloseOthers(TabItem clickedTab, IMultitaskingControl multitaskingControl)
35+
public static void CloseOtherTabs(TabItem clickedTab, IMultitaskingControl multitaskingControl)
3636
{
3737
if (multitaskingControl is not null)
3838
{

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2741,7 +2741,7 @@ We use App Center to track which settings are being used, find bugs, and fix cra
27412741
<data name="CloseTabsToTheRight" xml:space="preserve">
27422742
<value>Close tabs to the right</value>
27432743
</data>
2744-
<data name="CloseOthers" xml:space="preserve">
2745-
<value>Close others</value>
2744+
<data name="CloseOtherTabs" xml:space="preserve">
2745+
<value>Close other tabs</value>
27462746
</data>
27472747
</root>

src/Files/UserControls/MultitaskingControl/BaseMultitaskingControl.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -107,8 +107,8 @@ public void CloseTabsToTheLeft(object sender, RoutedEventArgs e)
107107
public void CloseTabsToTheRight(object sender, RoutedEventArgs e)
108108
=> MultitaskingTabsHelpers.CloseTabsToTheRight(((FrameworkElement)sender).DataContext as TabItem, this);
109109

110-
public void CloseOthers(object sender, RoutedEventArgs e)
111-
=> MultitaskingTabsHelpers.CloseOthers(((FrameworkElement)sender).DataContext as TabItem, this);
110+
public void CloseOtherTabs(object sender, RoutedEventArgs e)
111+
=> MultitaskingTabsHelpers.CloseOtherTabs(((FrameworkElement)sender).DataContext as TabItem, this);
112112

113113
public async void ReopenClosedTab(object sender, RoutedEventArgs e)
114114
{

src/Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -64,10 +64,10 @@
6464
DataContextChanged="MenuItemCloseTabsToTheRight_DataContextChanged"
6565
Text="{helpers:ResourceString Name=CloseTabsToTheRight}" />
6666
<MenuFlyoutItem
67-
x:Name="MenuItemCloseOthers"
68-
Click="CloseOthers"
69-
DataContextChanged="MenuItemCloseOthers_DataContextChanged"
70-
Text="{helpers:ResourceString Name=CloseOthers}" />
67+
x:Name="MenuItemCloseOtherTabs"
68+
Click="CloseOtherTabs"
69+
DataContextChanged="MenuItemCloseOtherTabs_DataContextChanged"
70+
Text="{helpers:ResourceString Name=CloseOtherTabs}" />
7171
<MenuFlyoutItem
7272
x:Name="MenuItemReopenClosedTab"
7373
x:Uid="HorizontalMultitaskingControlReopenClosedTab"

src/Files/UserControls/MultitaskingControl/HorizontalMultitaskingControl.xaml.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -201,10 +201,10 @@ private void MenuItemCloseTabsToTheRight_DataContextChanged(FrameworkElement sen
201201
MenuItemCloseTabsToTheRight.IsEnabled = MainPageViewModel.AppInstances.IndexOf(tabItem) < MainPageViewModel.AppInstances.Count - 1;
202202
}
203203

204-
private void MenuItemCloseOthers_DataContextChanged(FrameworkElement sender, DataContextChangedEventArgs args)
204+
private void MenuItemCloseOtherTabs_DataContextChanged(FrameworkElement sender, DataContextChangedEventArgs args)
205205
{
206206
TabItem tabItem = args.NewValue as TabItem;
207-
MenuItemCloseOthers.IsEnabled = MainPageViewModel.AppInstances.Count > 1;
207+
MenuItemCloseOtherTabs.IsEnabled = MainPageViewModel.AppInstances.Count > 1;
208208
}
209209

210210
public override DependencyObject ContainerFromItem(ITabItem item) => HorizontalTabView.ContainerFromItem(item);

0 commit comments

Comments
 (0)