Skip to content

Commit 04ac868

Browse files
authored
Fix weird open in terminal label (#8008)
1 parent ebf6473 commit 04ac868

File tree

3 files changed

+11
-2
lines changed

3 files changed

+11
-2
lines changed

src/Files/Helpers/ContextFlyoutItemHelper.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseLayoutMenuItems(Curren
503503
},
504504
new ContextMenuFlyoutItemViewModel()
505505
{
506-
Text = "OpenIn".GetLocalized() + " " + App.TerminalController.Model.GetDefaultTerminal().Name,
506+
Text = $"{"OpenIn".GetLocalized()} {App.TerminalController.Model.GetDefaultTerminal()?.Name}",
507507
Glyph = "\uE756",
508508
Command = commandsViewModel.OpenDirectoryInDefaultTerminalCommand,
509509
},

src/Files/UserControls/InnerNavigationToolbar.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -923,7 +923,7 @@
923923
x:Load="{x:Bind ViewModel.InstanceViewModel.IsPageTypeNotHome, Mode=OneWay}"
924924
Command="{x:Bind ViewModel.OpenDirectoryInDefaultTerminalCommand, Mode=OneWay}"
925925
IsEnabled="{x:Bind ViewModel.InstanceViewModel.CanOpenTerminalInPage, Mode=OneWay}"
926-
Label="{helpers:ResourceString Name=OpenInTerminal}">
926+
Label="{x:Bind ViewModel.OpenInTerminal, Mode=OneWay}">
927927
<AppBarButton.Icon>
928928
<FontIcon Glyph="&#xE756;" />
929929
</AppBarButton.Icon>

src/Files/ViewModels/NavToolbarViewModel.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -331,6 +331,7 @@ public NavToolbarViewModel()
331331
dragOverTimer = DispatcherQueue.GetForCurrentThread().CreateTimer();
332332
SearchBox.Escaped += SearchRegion_Escaped;
333333
UserSettingsService.OnSettingChangedEvent += UserSettingsService_OnSettingChangedEvent;
334+
App.TerminalController.ModelChanged += OnTerminalsChanged;
334335
}
335336

336337
private void UserSettingsService_OnSettingChangedEvent(object sender, EventArguments.SettingChangedEventArgs e)
@@ -1157,10 +1158,18 @@ public List<ListedItem> SelectedItems
11571158
public bool IsInfFile => SelectedItems is not null && SelectedItems.Count == 1 && FileExtensionHelpers.IsInfFile(SelectedItems.First().FileExtension);
11581159
public bool IsFont => SelectedItems is not null && SelectedItems.Any() && SelectedItems.All(x => FileExtensionHelpers.IsFontFile(x.FileExtension));
11591160

1161+
public string OpenInTerminal => $"{"OpenIn".GetLocalized()} {App.TerminalController.Model.GetDefaultTerminal()?.Name}";
1162+
1163+
private void OnTerminalsChanged(object _)
1164+
{
1165+
OnPropertyChanged(nameof(OpenInTerminal));
1166+
}
1167+
11601168
public void Dispose()
11611169
{
11621170
SearchBox.Escaped -= SearchRegion_Escaped;
11631171
UserSettingsService.OnSettingChangedEvent -= UserSettingsService_OnSettingChangedEvent;
1172+
App.TerminalController.ModelChanged -= OnTerminalsChanged;
11641173

11651174
InstanceViewModel.FolderSettings.SortDirectionPreferenceUpdated -= FolderSettings_SortDirectionPreferenceUpdated;
11661175
InstanceViewModel.FolderSettings.SortOptionPreferenceUpdated -= FolderSettings_SortOptionPreferenceUpdated;

0 commit comments

Comments
 (0)