microsoft/terminal
1
0
Fork 0
mirror of https://github.com/microsoft/terminal.git synced 2025-12-10 18:43:54 -06:00
Code Issues Packages Projects Releases 138 Wiki Activity

new info badge

Browse Source
This commit is contained in:
Pankaj Bhojwani 2025-06-20 14:39:12 -07:00
parent 4311a2b51c
commit ac0eb51259
7 changed files with 25 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cascadia/TerminalSettingsEditor/Actions.cpp
View File

@ -23,6 +23,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
{
_ViewModel = e.Parameter().as<Editor::ActionsViewModel>();
_ViewModel.CurrentPage(ActionsSubPage::Base);
auto vmImpl = get_self<ActionsViewModel>(_ViewModel);
vmImpl->MarkAsVisited();
}
void Actions::AddNew_Click(const IInspectable& /*sender*/, const RoutedEventArgs& /*eventArgs*/)

13
src/cascadia/TerminalSettingsEditor/ActionsViewModel.cpp
View File

@ -193,6 +193,8 @@ inline const std::set<winrt::Microsoft::Terminal::Settings::Model::ShortcutActio
namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
{
static constexpr std::wstring_view ActionsPageId{ L"page.actions" };
CommandViewModel::CommandViewModel(Command cmd, std::vector<Control::KeyChord> keyChordList, const Editor::ActionsViewModel actionsPageVM) :
_command{ cmd },
_keyChordList{ keyChordList },
@ -1067,6 +1069,17 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
}
}
void ActionsViewModel::MarkAsVisited()
{
Model::ApplicationState::SharedInstance().DismissBadge(ActionsPageId);
_NotifyChanges(L"DisplayBadge");
}
bool ActionsViewModel::DisplayBadge() const noexcept
{
return !Model::ApplicationState::SharedInstance().BadgeDismissed(ActionsPageId);
}
void ActionsViewModel::_MakeCommandVMsHelper()
{
const auto& allCommands{ _Settings.ActionMap().AllCommands() };

2
src/cascadia/TerminalSettingsEditor/ActionsViewModel.h
View File

@ -256,6 +256,8 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
public:
ActionsViewModel(Model::CascadiaSettings settings);
void UpdateSettings(const Model::CascadiaSettings& settings);
void MarkAsVisited();
bool DisplayBadge() const noexcept;
void AddNewCommand();

1
src/cascadia/TerminalSettingsEditor/ActionsViewModel.idl
View File

@ -144,6 +144,7 @@ namespace Microsoft.Terminal.Settings.Editor
ActionsSubPage CurrentPage;
CommandViewModel CurrentCommand;
Boolean DisplayBadge { get; };
void AttemptAddOrModifyKeyChord(KeyChordViewModel senderVM, String commandID, Microsoft.Terminal.Control.KeyChord newKeys, Microsoft.Terminal.Control.KeyChord oldKeys);
void AttemptDeleteKeyChord(Microsoft.Terminal.Control.KeyChord keys);

1
src/cascadia/TerminalSettingsEditor/MainPage.h
View File

@ -44,6 +44,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
Windows::Foundation::Collections::IObservableVector<IInspectable> Breadcrumbs() noexcept;
Editor::ExtensionsViewModel ExtensionsVM() const noexcept { return _extensionsVM; }
Editor::ActionsViewModel ActionsVM() const noexcept { return _actionsVM; }
til::typed_event<Windows::Foundation::IInspectable, Model::SettingsTarget> OpenJson;

2
src/cascadia/TerminalSettingsEditor/MainPage.idl
View File

@ -2,6 +2,7 @@
// Licensed under the MIT license.
import "Extensions.idl";
import "ActionsViewModel.idl";
namespace Microsoft.Terminal.Settings.Editor
{
@ -47,6 +48,7 @@ namespace Microsoft.Terminal.Settings.Editor
Windows.Foundation.Collections.IObservableVector<IInspectable> Breadcrumbs { get; };
ExtensionsViewModel ExtensionsVM { get; };
ActionsViewModel ActionsVM { get; };
Windows.UI.Xaml.Media.Brush BackgroundBrush { get; };
}

4
src/cascadia/TerminalSettingsEditor/MainPage.xaml
View File

@ -147,6 +147,10 @@
<muxc:NavigationViewItem.Icon>
<FontIcon Glyph="&#xE765;" />
</muxc:NavigationViewItem.Icon>
<muxc:NavigationViewItem.InfoBadge>
<muxc:InfoBadge Style="{StaticResource NewInfoBadge}"
Visibility="{x:Bind ActionsVM.DisplayBadge, Mode=OneWay}" />
</muxc:NavigationViewItem.InfoBadge>
</muxc:NavigationViewItem>
<muxc:NavigationViewItem x:Uid="Nav_NewTabMenu"