Skip to content

Commit 7034ea8

Browse files
author
Console Service Bot
committed
Merge remote-tracking branch 'origin/main' into feature/llm
2 parents 899a156 + 3ae6bbf commit 7034ea8

34 files changed

Lines changed: 1295 additions & 356 deletions

‎src/cascadia/CascadiaPackage/ProfileIcons/{550ce7b8-d500-50ad-8a1a-c400c3262db3}.scale-100.png‎

-647 Bytes
Binary file not shown.

‎src/cascadia/CascadiaPackage/ProfileIcons/{550ce7b8-d500-50ad-8a1a-c400c3262db3}.scale-200.png‎

-787 Bytes
Binary file not shown.

‎src/cascadia/TerminalSettingsEditor/Extensions.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -500,6 +500,12 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
500500
{
501501
if (!extPkgVM.Package().DisplayName().empty())
502502
{
503+
// Check if the first char of the icon is in the Segoe MDL2 Icons list
504+
const auto ch = til::at(extPkgVM.Package().Icon(), 0);
505+
if (ch >= L'\uE700' && ch <= L'\uF8FF')
506+
{
507+
return ComplexTemplateWithFontIcon();
508+
}
503509
return ComplexTemplate();
504510
}
505511
return DefaultTemplate();

‎src/cascadia/TerminalSettingsEditor/Extensions.h‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,7 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
183183

184184
WINRT_PROPERTY(Windows::UI::Xaml::DataTemplate, DefaultTemplate, nullptr);
185185
WINRT_PROPERTY(Windows::UI::Xaml::DataTemplate, ComplexTemplate, nullptr);
186+
WINRT_PROPERTY(Windows::UI::Xaml::DataTemplate, ComplexTemplateWithFontIcon, nullptr);
186187
};
187188
};
188189

‎src/cascadia/TerminalSettingsEditor/Extensions.idl‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,5 +77,6 @@ namespace Microsoft.Terminal.Settings.Editor
7777

7878
Windows.UI.Xaml.DataTemplate DefaultTemplate;
7979
Windows.UI.Xaml.DataTemplate ComplexTemplate;
80+
Windows.UI.Xaml.DataTemplate ComplexTemplateWithFontIcon;
8081
}
8182
}

‎src/cascadia/TerminalSettingsEditor/Extensions.xaml‎

Lines changed: 55 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242

4343
<local:ExtensionPackageTemplateSelector x:Key="ExtensionPackageIdentifierTemplateSelector"
4444
ComplexTemplate="{StaticResource ComplexExtensionIdentifierTemplate}"
45+
ComplexTemplateWithFontIcon="{StaticResource ComplexExtensionIdentifierTemplateWithFontIcon}"
4546
DefaultTemplate="{StaticResource DefaultExtensionIdentifierTemplate}" />
4647

4748
<DataTemplate x:Key="DefaultExtensionIdentifierTemplate"
@@ -91,8 +92,37 @@
9192
</Grid>
9293
</DataTemplate>
9394

95+
<DataTemplate x:Key="ComplexExtensionIdentifierTemplateWithFontIcon"
96+
x:DataType="local:ExtensionPackageViewModel">
97+
<Grid>
98+
<Grid.ColumnDefinitions>
99+
<ColumnDefinition Width="Auto" />
100+
<ColumnDefinition Width="*" />
101+
</Grid.ColumnDefinitions>
102+
<Grid.RowDefinitions>
103+
<RowDefinition Height="Auto" />
104+
<RowDefinition Height="Auto" />
105+
</Grid.RowDefinitions>
106+
107+
<FontIcon Grid.Row="0"
108+
Grid.RowSpan="2"
109+
Grid.Column="0"
110+
Margin="0,0,8,0"
111+
FontSize="32"
112+
Glyph="{x:Bind Package.Icon}" />
113+
<TextBlock Grid.Row="0"
114+
Grid.Column="1"
115+
Text="{x:Bind Package.DisplayName}" />
116+
<TextBlock Grid.Row="1"
117+
Grid.Column="1"
118+
Style="{StaticResource SettingsPageItemDescriptionStyle}"
119+
Text="{x:Bind Package.Source}" />
120+
</Grid>
121+
</DataTemplate>
122+
94123
<local:ExtensionPackageTemplateSelector x:Key="ExtensionPackageNavigatorTemplateSelector"
95124
ComplexTemplate="{StaticResource ComplexExtensionNavigatorTemplate}"
125+
ComplexTemplateWithFontIcon="{StaticResource ComplexExtensionNavigatorTemplateWithFontIcon}"
96126
DefaultTemplate="{StaticResource DefaultExtensionNavigatorTemplate}" />
97127

98128
<DataTemplate x:Key="DefaultExtensionNavigatorTemplate"
@@ -146,6 +176,31 @@
146176
</Button>
147177
</DataTemplate>
148178

179+
<DataTemplate x:Key="ComplexExtensionNavigatorTemplateWithFontIcon"
180+
x:DataType="local:ExtensionPackageViewModel">
181+
<Button AutomationProperties.Name="{x:Bind AccessibleName}"
182+
Click="ExtensionNavigator_Click"
183+
Style="{StaticResource NavigatorButtonStyle}"
184+
Tag="{x:Bind}">
185+
<Grid>
186+
<Grid.ColumnDefinitions>
187+
<ColumnDefinition Width="*" />
188+
<ColumnDefinition Width="Auto" />
189+
</Grid.ColumnDefinitions>
190+
191+
<ContentPresenter Content="{x:Bind}"
192+
ContentTemplate="{StaticResource ComplexExtensionIdentifierTemplateWithFontIcon}" />
193+
194+
<ToggleSwitch Grid.Column="1"
195+
HorizontalAlignment="Right"
196+
VerticalAlignment="Center"
197+
AutomationProperties.Name="{x:Bind AccessibleName}"
198+
IsOn="{x:Bind Enabled, Mode=TwoWay}"
199+
Style="{StaticResource ToggleSwitchInExpanderStyle}" />
200+
</Grid>
201+
</Button>
202+
</DataTemplate>
203+
149204
<DataTemplate x:Key="FragmentProfileViewModelTemplate"
150205
x:DataType="local:FragmentProfileViewModel">
151206
<muxc:Expander AutomationProperties.Name="{x:Bind AccessibleName}"

‎src/cascadia/TerminalSettingsEditor/Resources/de-DE/Resources.resw‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -684,6 +684,10 @@
684684
<value>Aktionen</value>
685685
<comment>Header for the "actions" menu item. This navigates to a page that lets you see and modify commands, key bindings, and actions that can be done in the app.</comment>
686686
</data>
687+
<data name="Nav_Extensions.Content" xml:space="preserve">
688+
<value>Erweiterungen</value>
689+
<comment>Header for the "extensions" menu item. This navigates to a page that lets you see and modify extensions for the app.</comment>
690+
</data>
687691
<data name="Profile_OpacitySlider.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
688692
<value>Hintergrunddeckkraft</value>
689693
<comment>Name for a control to determine the level of opacity for the background of the control. The user can choose to make the background of the app more or less opaque.</comment>
@@ -2340,6 +2344,49 @@
23402344
<value>Diese Option wird durch eine Unternehmensrichtlinie verwaltet und kann hier nicht geändert werden.</value>
23412345
<comment>This is displayed in concordance with Globals_StartOnUserLogin if the enterprise administrator has taken control of this setting.</comment>
23422346
</data>
2347+
<data name="Extensions_ActiveExtensionsHeader.Text" xml:space="preserve">
2348+
<value>Aktive Erweiterungen</value>
2349+
</data>
2350+
<data name="Extensions_ModifiedProfilesHeader.Text" xml:space="preserve">
2351+
<value>Geänderte Profile</value>
2352+
</data>
2353+
<data name="Extensions_AddedProfilesHeader.Text" xml:space="preserve">
2354+
<value>Hinzugefügte Profile</value>
2355+
</data>
2356+
<data name="Extensions_AddedColorSchemesHeader.Text" xml:space="preserve">
2357+
<value>Hinzugefügte Farbschemas</value>
2358+
</data>
2359+
<data name="Extensions_DisclaimerHyperlink.Content" xml:space="preserve">
2360+
<value>Weitere Informationen zu Erweiterungen</value>
2361+
</data>
2362+
<data name="Extensions_NavigateToProfileButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
2363+
<value>Zum Profil navigieren</value>
2364+
</data>
2365+
<data name="Extensions_NavigateToProfileButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
2366+
<value>Zum Profil navigieren</value>
2367+
</data>
2368+
<data name="Extensions_NavigateToColorSchemeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
2369+
<value>Zum Farbschema navigieren</value>
2370+
</data>
2371+
<data name="Extensions_NavigateToColorSchemeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
2372+
<value>Zum Farbschema navigieren</value>
2373+
</data>
2374+
<data name="Extensions_ScopeUser" xml:space="preserve">
2375+
<value>Aktueller Benutzer</value>
2376+
<comment>Label for the installation scope of an extension.</comment>
2377+
</data>
2378+
<data name="Extensions_ScopeSystem" xml:space="preserve">
2379+
<value>Alle Benutzer</value>
2380+
<comment>Label for the installation scope of an extension</comment>
2381+
</data>
2382+
<data name="Extensions_Scope.Header" xml:space="preserve">
2383+
<value>Bereich</value>
2384+
<comment>Header for the installation scope of the extension</comment>
2385+
</data>
2386+
<data name="NewInfoBadgeTextBlock.Text" xml:space="preserve">
2387+
<value>NEU</value>
2388+
<comment>Text is used on an info badge for new navigation items. Must be all caps.</comment>
2389+
</data>
23432390
<data name="NewTabMenu_AddMatchProfiles_Help.Content" xml:space="preserve">
23442391
<value>Weitere Informationen zu regulären Ausdrücken</value>
23452392
</data>

‎src/cascadia/TerminalSettingsEditor/Resources/es-ES/Resources.resw‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -684,6 +684,10 @@
684684
<value>Acciones</value>
685685
<comment>Header for the "actions" menu item. This navigates to a page that lets you see and modify commands, key bindings, and actions that can be done in the app.</comment>
686686
</data>
687+
<data name="Nav_Extensions.Content" xml:space="preserve">
688+
<value>Extensiones</value>
689+
<comment>Header for the "extensions" menu item. This navigates to a page that lets you see and modify extensions for the app.</comment>
690+
</data>
687691
<data name="Profile_OpacitySlider.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
688692
<value>Opacidad del fondo</value>
689693
<comment>Name for a control to determine the level of opacity for the background of the control. The user can choose to make the background of the app more or less opaque.</comment>
@@ -2340,6 +2344,49 @@
23402344
<value>Esta opción está administrada por una directiva de empresa y no se puede cambiar aquí.</value>
23412345
<comment>This is displayed in concordance with Globals_StartOnUserLogin if the enterprise administrator has taken control of this setting.</comment>
23422346
</data>
2347+
<data name="Extensions_ActiveExtensionsHeader.Text" xml:space="preserve">
2348+
<value>Extensiones activas</value>
2349+
</data>
2350+
<data name="Extensions_ModifiedProfilesHeader.Text" xml:space="preserve">
2351+
<value>Perfiles modificados</value>
2352+
</data>
2353+
<data name="Extensions_AddedProfilesHeader.Text" xml:space="preserve">
2354+
<value>Perfiles agregados</value>
2355+
</data>
2356+
<data name="Extensions_AddedColorSchemesHeader.Text" xml:space="preserve">
2357+
<value>Combinaciones de colores agregadas</value>
2358+
</data>
2359+
<data name="Extensions_DisclaimerHyperlink.Content" xml:space="preserve">
2360+
<value>Más información acerca de las extensiones</value>
2361+
</data>
2362+
<data name="Extensions_NavigateToProfileButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
2363+
<value>Navegar al perfil</value>
2364+
</data>
2365+
<data name="Extensions_NavigateToProfileButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
2366+
<value>Navegar al perfil</value>
2367+
</data>
2368+
<data name="Extensions_NavigateToColorSchemeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
2369+
<value>Ir a la combinación de colores</value>
2370+
</data>
2371+
<data name="Extensions_NavigateToColorSchemeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
2372+
<value>Ir a la combinación de colores</value>
2373+
</data>
2374+
<data name="Extensions_ScopeUser" xml:space="preserve">
2375+
<value>Usuario actual</value>
2376+
<comment>Label for the installation scope of an extension.</comment>
2377+
</data>
2378+
<data name="Extensions_ScopeSystem" xml:space="preserve">
2379+
<value>Todos los usuarios</value>
2380+
<comment>Label for the installation scope of an extension</comment>
2381+
</data>
2382+
<data name="Extensions_Scope.Header" xml:space="preserve">
2383+
<value>Ámbito</value>
2384+
<comment>Header for the installation scope of the extension</comment>
2385+
</data>
2386+
<data name="NewInfoBadgeTextBlock.Text" xml:space="preserve">
2387+
<value>NUEVO</value>
2388+
<comment>Text is used on an info badge for new navigation items. Must be all caps.</comment>
2389+
</data>
23432390
<data name="NewTabMenu_AddMatchProfiles_Help.Content" xml:space="preserve">
23442391
<value>Más información sobre las expresiones regulares</value>
23452392
</data>

‎src/cascadia/TerminalSettingsEditor/Resources/fr-FR/Resources.resw‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -684,6 +684,10 @@
684684
<value>Actions</value>
685685
<comment>Header for the "actions" menu item. This navigates to a page that lets you see and modify commands, key bindings, and actions that can be done in the app.</comment>
686686
</data>
687+
<data name="Nav_Extensions.Content" xml:space="preserve">
688+
<value>Extensions</value>
689+
<comment>Header for the "extensions" menu item. This navigates to a page that lets you see and modify extensions for the app.</comment>
690+
</data>
687691
<data name="Profile_OpacitySlider.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
688692
<value>Opacité de l’arrière-plan</value>
689693
<comment>Name for a control to determine the level of opacity for the background of the control. The user can choose to make the background of the app more or less opaque.</comment>
@@ -2340,6 +2344,49 @@
23402344
<value>Cette option est gérée par la stratégie d’entreprise et ne peut pas être modifiée ici.</value>
23412345
<comment>This is displayed in concordance with Globals_StartOnUserLogin if the enterprise administrator has taken control of this setting.</comment>
23422346
</data>
2347+
<data name="Extensions_ActiveExtensionsHeader.Text" xml:space="preserve">
2348+
<value>Extensions actives</value>
2349+
</data>
2350+
<data name="Extensions_ModifiedProfilesHeader.Text" xml:space="preserve">
2351+
<value>Profils modifiés</value>
2352+
</data>
2353+
<data name="Extensions_AddedProfilesHeader.Text" xml:space="preserve">
2354+
<value>Profils ajoutés</value>
2355+
</data>
2356+
<data name="Extensions_AddedColorSchemesHeader.Text" xml:space="preserve">
2357+
<value>Ajout de modèles de couleurs</value>
2358+
</data>
2359+
<data name="Extensions_DisclaimerHyperlink.Content" xml:space="preserve">
2360+
<value>En savoir plus sur les extensions</value>
2361+
</data>
2362+
<data name="Extensions_NavigateToProfileButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
2363+
<value>Accéder au profil</value>
2364+
</data>
2365+
<data name="Extensions_NavigateToProfileButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
2366+
<value>Accéder au profil</value>
2367+
</data>
2368+
<data name="Extensions_NavigateToColorSchemeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
2369+
<value>Accéder au modèle de couleurs</value>
2370+
</data>
2371+
<data name="Extensions_NavigateToColorSchemeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
2372+
<value>Accéder au modèle de couleurs</value>
2373+
</data>
2374+
<data name="Extensions_ScopeUser" xml:space="preserve">
2375+
<value>Utilisateur actuel</value>
2376+
<comment>Label for the installation scope of an extension.</comment>
2377+
</data>
2378+
<data name="Extensions_ScopeSystem" xml:space="preserve">
2379+
<value>All Users</value>
2380+
<comment>Label for the installation scope of an extension</comment>
2381+
</data>
2382+
<data name="Extensions_Scope.Header" xml:space="preserve">
2383+
<value>Étendue</value>
2384+
<comment>Header for the installation scope of the extension</comment>
2385+
</data>
2386+
<data name="NewInfoBadgeTextBlock.Text" xml:space="preserve">
2387+
<value>NOUVEAU</value>
2388+
<comment>Text is used on an info badge for new navigation items. Must be all caps.</comment>
2389+
</data>
23432390
<data name="NewTabMenu_AddMatchProfiles_Help.Content" xml:space="preserve">
23442391
<value>En savoir plus sur les expressions régulières</value>
23452392
</data>

‎src/cascadia/TerminalSettingsEditor/Resources/it-IT/Resources.resw‎

Lines changed: 47 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -684,6 +684,10 @@
684684
<value>Azioni</value>
685685
<comment>Header for the "actions" menu item. This navigates to a page that lets you see and modify commands, key bindings, and actions that can be done in the app.</comment>
686686
</data>
687+
<data name="Nav_Extensions.Content" xml:space="preserve">
688+
<value>Estensioni</value>
689+
<comment>Header for the "extensions" menu item. This navigates to a page that lets you see and modify extensions for the app.</comment>
690+
</data>
687691
<data name="Profile_OpacitySlider.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
688692
<value>Opacità sfondo</value>
689693
<comment>Name for a control to determine the level of opacity for the background of the control. The user can choose to make the background of the app more or less opaque.</comment>
@@ -2340,6 +2344,49 @@
23402344
<value>Questa opzione è gestita da criteri aziendali e non può essere modificata qui.</value>
23412345
<comment>This is displayed in concordance with Globals_StartOnUserLogin if the enterprise administrator has taken control of this setting.</comment>
23422346
</data>
2347+
<data name="Extensions_ActiveExtensionsHeader.Text" xml:space="preserve">
2348+
<value>Estensioni attive</value>
2349+
</data>
2350+
<data name="Extensions_ModifiedProfilesHeader.Text" xml:space="preserve">
2351+
<value>Profili modificati</value>
2352+
</data>
2353+
<data name="Extensions_AddedProfilesHeader.Text" xml:space="preserve">
2354+
<value>Profili aggiunti</value>
2355+
</data>
2356+
<data name="Extensions_AddedColorSchemesHeader.Text" xml:space="preserve">
2357+
<value>Combinazioni colori aggiunte</value>
2358+
</data>
2359+
<data name="Extensions_DisclaimerHyperlink.Content" xml:space="preserve">
2360+
<value>Altre informazioni sulle estensioni</value>
2361+
</data>
2362+
<data name="Extensions_NavigateToProfileButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
2363+
<value>Passa al profilo</value>
2364+
</data>
2365+
<data name="Extensions_NavigateToProfileButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
2366+
<value>Passa al profilo</value>
2367+
</data>
2368+
<data name="Extensions_NavigateToColorSchemeButton.[using:Windows.UI.Xaml.Controls]ToolTipService.ToolTip" xml:space="preserve">
2369+
<value>Passa alla combinazione colori</value>
2370+
</data>
2371+
<data name="Extensions_NavigateToColorSchemeButton.[using:Windows.UI.Xaml.Automation]AutomationProperties.Name" xml:space="preserve">
2372+
<value>Passa alla combinazione colori</value>
2373+
</data>
2374+
<data name="Extensions_ScopeUser" xml:space="preserve">
2375+
<value>Utente corrente</value>
2376+
<comment>Label for the installation scope of an extension.</comment>
2377+
</data>
2378+
<data name="Extensions_ScopeSystem" xml:space="preserve">
2379+
<value>All Users</value>
2380+
<comment>Label for the installation scope of an extension</comment>
2381+
</data>
2382+
<data name="Extensions_Scope.Header" xml:space="preserve">
2383+
<value>Ambito</value>
2384+
<comment>Header for the installation scope of the extension</comment>
2385+
</data>
2386+
<data name="NewInfoBadgeTextBlock.Text" xml:space="preserve">
2387+
<value>NUOVO</value>
2388+
<comment>Text is used on an info badge for new navigation items. Must be all caps.</comment>
2389+
</data>
23432390
<data name="NewTabMenu_AddMatchProfiles_Help.Content" xml:space="preserve">
23442391
<value>Scopri di più sulle espressioni regolari</value>
23452392
</data>

0 commit comments

Comments
 (0)