Skip to content

Settings polish: keep Add New as the final custom endpoint row #856

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Yuandi (DDKinger) merged 9 commits into from
Sep 7, 2026
Merged

Settings polish: keep Add New as the final custom endpoint row #856

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
b50c8c2
Keep custom endpoint form in the expander
DDKinger Sep 5, 2026
7520ad9
Align custom endpoint header and rows
DDKinger Sep 5, 2026
22efad5
Reveal custom endpoint fields from Add New
DDKinger Sep 5, 2026
cc2d4b9
Center custom endpoint list actions
DDKinger Sep 5, 2026
68bc0de
Center custom endpoint row content
DDKinger Sep 5, 2026
f867b16
Use standard heights for endpoint rows
DDKinger Sep 5, 2026
5696a38
Remove extra expander row padding
DDKinger Sep 5, 2026
e4567f8
Remove redundant endpoint row sizing
DDKinger Sep 5, 2026
b2d8b05
Correct localized Add New labels
DDKinger Sep 5, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/cascadia/TerminalSettingsEditor/AIAgents.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,13 +52,9 @@ namespace winrt::Microsoft::Terminal::Settings::Editor::implementation
const auto customModelsHeader = RS_(L"AIAgents_CustomModels/Header");
const auto customModelsCaption = RS_(L"AIAgents_CustomModels/HelpText");
const auto customModelsLearnMore = RS_(L"AIAgents_CustomModelsLearnMore");
EmptyCustomModelsHeaderText().Text(customModelsHeader);
EmptyCustomModelsCaptionPrefix().Text(customModelsCaption);
EmptyCustomModelsCaptionLink().Text(customModelsLearnMore);
CustomModelsHeaderText().Text(customModelsHeader);
CustomModelsCaptionPrefix().Text(customModelsCaption);
CustomModelsCaptionLink().Text(customModelsLearnMore);
Automation::AutomationProperties::SetName(EmptyCustomModelProviders(), customModelsHeader);
Automation::AutomationProperties::SetName(CustomModelProvidersExpander(), customModelsHeader);

// Auto-error-detection caption + inline "supported shells" hyperlink.
Expand Down
62 changes: 6 additions & 56 deletions src/cascadia/TerminalSettingsEditor/AIAgents.xaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -189,58 +189,14 @@
</Grid>
</local:SettingContainer>

<Grid x:Name="EmptyCustomModelProviders"
Margin="0,4,0,0"
Padding="16,0,8,0"
HorizontalAlignment="Stretch"
Background="{ThemeResource ExpanderHeaderBackground}"
BorderBrush="{ThemeResource ExpanderHeaderBorderBrush}"
BorderThickness="{ThemeResource ExpanderHeaderBorderThickness}"
CornerRadius="{ThemeResource ControlCornerRadius}"
MaxWidth="1000"
MinHeight="64"
MinWidth="{ThemeResource FlyoutThemeMinWidth}"
Visibility="{x:Bind mtu:Converters.InvertedBooleanToVisibility(ViewModel.ShowCustomModelProvidersExpander), Mode=OneWay}">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0"
Padding="0,12,0,12"
VerticalAlignment="Center">
<TextBlock x:Name="EmptyCustomModelsHeaderText"
Style="{StaticResource SettingsPageItemHeaderStyle}" />
<TextBlock Style="{StaticResource CaptionTextBlockStyle}"
TextWrapping="Wrap">
<Run x:Name="EmptyCustomModelsCaptionPrefix"
Foreground="{ThemeResource TextFillColorSecondaryBrush}" /><Hyperlink NavigateUri="https://github.com/microsoft/intelligent-terminal#custom-providers-byok">
<Run x:Name="EmptyCustomModelsCaptionLink" />
</Hyperlink>
</TextBlock>
</StackPanel>
<Button Grid.Column="1"
x:Uid="AIAgents_CustomProviderAdd"
Margin="0,12,0,12"
HorizontalAlignment="Right"
VerticalAlignment="Center"
Click="{x:Bind ViewModel.AddCustomModelProvider}"
Style="{StaticResource AccentButtonStyle}" />
</Grid>

<muxc:Expander x:Name="CustomModelProvidersExpander"
Margin="0,4,0,0"
HorizontalAlignment="Stretch"
HorizontalContentAlignment="Stretch"
IsExpanded="{x:Bind ViewModel.IsCustomModelProvidersExpanded, Mode=TwoWay}"
Visibility="{x:Bind ViewModel.ShowCustomModelProvidersExpander, Mode=OneWay}">
IsExpanded="{x:Bind ViewModel.IsCustomModelProvidersExpanded, Mode=TwoWay}">
Comment thread
DDKinger marked this conversation as resolved.
<muxc:Expander.Header>
<Grid MinHeight="64">
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*" />
<ColumnDefinition Width="Auto" />
</Grid.ColumnDefinitions>
<StackPanel Grid.Column="0"
VerticalAlignment="Center">
<StackPanel VerticalAlignment="Center">
<TextBlock x:Name="CustomModelsHeaderText"
Style="{StaticResource SettingsPageItemHeaderStyle}" />
<TextBlock Style="{StaticResource CaptionTextBlockStyle}"
Expand All @@ -251,11 +207,6 @@
</Hyperlink>
</TextBlock>
</StackPanel>
<Button Grid.Column="1"
x:Uid="AIAgents_CustomProviderAdd"
VerticalAlignment="Center"
Click="{x:Bind ViewModel.AddCustomModelProvider}"
Style="{StaticResource AccentButtonStyle}" />
</Grid>
</muxc:Expander.Header>
<StackPanel>
Expand All @@ -267,7 +218,9 @@
<ItemsControl ItemsSource="{x:Bind ViewModel.CustomModelProviders, Mode=OneWay}">
<ItemsControl.ItemTemplate>
<DataTemplate x:DataType="local:CustomModelProviderEntry">
<Border Padding="0,4">
<Border Padding="0,4"
BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
BorderThickness="0,0,0,1">
<Grid>
<Grid.RowDefinitions>
<RowDefinition Height="Auto" />
Expand Down Expand Up @@ -315,8 +268,7 @@
</ItemsControl.ItemTemplate>
</ItemsControl>

<Border Padding="0,8,0,16"
Visibility="{x:Bind ViewModel.IsAddingCustomModelProvider, Mode=OneWay}">
<Border Padding="0,8,0,16">
<StackPanel Spacing="12">
<TextBlock x:Uid="AIAgents_CustomProviderAddHeader"
FontWeight="SemiBold"
Expand Down Expand Up @@ -367,8 +319,6 @@
IsEnabled="{x:Bind ViewModel.CanSaveCustomModelProvider, Mode=OneWay}"
Click="{x:Bind ViewModel.SaveCustomModelProvider}"
Style="{StaticResource AccentButtonStyle}" />
<Button x:Uid="AIAgents_CustomProviderCancel"
Click="{x:Bind ViewModel.CancelCustomModelProvider}" />
</StackPanel>
</StackPanel>
</StackPanel>
Expand Down
8 changes: 0 additions & 8 deletions src/cascadia/TerminalSettingsEditor/Resources/de-DE/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3007,10 +3007,6 @@
<value>Leer lassen, wenn Ihr Endpunkt keine Authentifizierung erfordert. In der Windows-Anmeldeinformationsverwaltung gespeichert.</value>
<comment>{Locked="API"} Hint below the optional custom provider credential input. Use the established localized product name for Windows Credential Manager.</comment>
</data>
<data name="AIAgents_CustomProviderAdd.Content" xml:space="preserve">
<value>Endpunkt hinzufügen</value>
<comment>Button that starts adding a custom model provider endpoint.</comment>
</data>
<data name="AIAgents_CustomProviderSave.Content" xml:space="preserve">
<value>Hinzufügen und auswählen</value>
<comment>Button that adds a custom provider model and selects it as the current model.</comment>
Expand All @@ -3019,10 +3015,6 @@
<value>Dadurch wird das Modell hinzugefügt und als aktuelles Modell ausgewählt</value>
<comment>Supporting text beside the button that adds and selects a custom provider model.</comment>
</data>
<data name="AIAgents_CustomProviderCancel.Content" xml:space="preserve">
<value>Abbrechen</value>
<comment>Button that cancels adding a provider.</comment>
</data>
<data name="AIAgents_BYOKModelDisplayName" xml:space="preserve">
<value>{} (BYOK)</value>
<comment>{Locked="{}","BYOK"} {} is replaced with the provider-specific model identifier.</comment>
Expand Down
8 changes: 0 additions & 8 deletions src/cascadia/TerminalSettingsEditor/Resources/en-US/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3119,10 +3119,6 @@ In this context, "agent" refers to an AI agent (e.g. Copilot, Claude, Gemini), n
<value>Leave blank if your endpoint does not need auth. Stored in Windows Credential Manager.</value>
<comment>{Locked="API"} Hint below the optional custom provider credential input. Use the established localized product name for Windows Credential Manager.</comment>
</data>
<data name="AIAgents_CustomProviderAdd.Content" xml:space="preserve">
<value>Add endpoint</value>
<comment>Button that starts adding a custom model provider endpoint.</comment>
</data>
<data name="AIAgents_CustomProviderSave.Content" xml:space="preserve">
<value>Add and Select</value>
<comment>Button that adds a custom provider model and selects it as the current model.</comment>
Expand All @@ -3131,10 +3127,6 @@ In this context, "agent" refers to an AI agent (e.g. Copilot, Claude, Gemini), n
<value>This will add the model and select it as the current model</value>
<comment>Supporting text beside the button that adds and selects a custom provider model.</comment>
</data>
<data name="AIAgents_CustomProviderCancel.Content" xml:space="preserve">
<value>Cancel</value>
<comment>Button that cancels adding a provider.</comment>
</data>
<data name="AIAgents_BYOKModelDisplayName" xml:space="preserve">
<value>{} (BYOK)</value>
<comment>{Locked="{}","BYOK"} {} is replaced with the provider-specific model identifier.</comment>
Expand Down
8 changes: 0 additions & 8 deletions src/cascadia/TerminalSettingsEditor/Resources/es-ES/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3007,10 +3007,6 @@
<value>Déjelo en blanco si su punto de conexión no necesita autenticación. Se almacena en el Administrador de credenciales de Windows.</value>
<comment>{Locked="API"} Hint below the optional custom provider credential input. Use the established localized product name for Windows Credential Manager.</comment>
</data>
<data name="AIAgents_CustomProviderAdd.Content" xml:space="preserve">
<value>Agregar punto de conexión</value>
<comment>Button that starts adding a custom model provider endpoint.</comment>
</data>
<data name="AIAgents_CustomProviderSave.Content" xml:space="preserve">
<value>Agregar y seleccionar</value>
<comment>Button that adds a custom provider model and selects it as the current model.</comment>
Expand All @@ -3019,10 +3015,6 @@
<value>Esto agregará el modelo y lo seleccionará como el modelo actual</value>
<comment>Supporting text beside the button that adds and selects a custom provider model.</comment>
</data>
<data name="AIAgents_CustomProviderCancel.Content" xml:space="preserve">
<value>Cancelar</value>
<comment>Button that cancels adding a provider.</comment>
</data>
<data name="AIAgents_BYOKModelDisplayName" xml:space="preserve">
<value>{} (BYOK)</value>
<comment>{Locked="{}","BYOK"} {} is replaced with the provider-specific model identifier.</comment>
Expand Down
8 changes: 0 additions & 8 deletions src/cascadia/TerminalSettingsEditor/Resources/fr-FR/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3008,10 +3008,6 @@
<value>Laissez vide si votre point de terminaison ne nécessite pas d’authentification. Stocké dans le Gestionnaire d’informations d’identification Windows.</value>
<comment>{Locked="API"} Hint below the optional custom provider credential input. Use the established localized product name for Windows Credential Manager.</comment>
</data>
<data name="AIAgents_CustomProviderAdd.Content" xml:space="preserve">
<value>Ajouter un point de terminaison</value>
<comment>Button that starts adding a custom model provider endpoint.</comment>
</data>
<data name="AIAgents_CustomProviderSave.Content" xml:space="preserve">
<value>Ajouter et sélectionner</value>
<comment>Button that adds a custom provider model and selects it as the current model.</comment>
Expand All @@ -3020,10 +3016,6 @@
<value>Cela ajoutera le modèle et le sélectionnera comme modèle actuel</value>
<comment>Supporting text beside the button that adds and selects a custom provider model.</comment>
</data>
<data name="AIAgents_CustomProviderCancel.Content" xml:space="preserve">
<value>Annuler</value>
<comment>Button that cancels adding a provider.</comment>
</data>
<data name="AIAgents_BYOKModelDisplayName" xml:space="preserve">
<value>{} (BYOK)</value>
<comment>{Locked="{}","BYOK"} {} is replaced with the provider-specific model identifier.</comment>
Expand Down
8 changes: 0 additions & 8 deletions src/cascadia/TerminalSettingsEditor/Resources/it-IT/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3007,10 +3007,6 @@
<value>Lascia vuoto se il tuo endpoint non richiede autenticazione. Salvata in Gestione credenziali di Windows.</value>
<comment>{Locked="API"} Hint below the optional custom provider credential input. Use the established localized product name for Windows Credential Manager.</comment>
</data>
<data name="AIAgents_CustomProviderAdd.Content" xml:space="preserve">
<value>Aggiungi endpoint</value>
<comment>Button that starts adding a custom model provider endpoint.</comment>
</data>
<data name="AIAgents_CustomProviderSave.Content" xml:space="preserve">
<value>Aggiungi e seleziona</value>
<comment>Button that adds a custom provider model and selects it as the current model.</comment>
Expand All @@ -3019,10 +3015,6 @@
<value>Questo aggiungerà il modello e lo selezionerà come modello corrente</value>
<comment>Supporting text beside the button that adds and selects a custom provider model.</comment>
</data>
<data name="AIAgents_CustomProviderCancel.Content" xml:space="preserve">
<value>Annulla</value>
<comment>Button that cancels adding a provider.</comment>
</data>
<data name="AIAgents_BYOKModelDisplayName" xml:space="preserve">
<value>{} (BYOK)</value>
<comment>{Locked="{}","BYOK"} {} is replaced with the provider-specific model identifier.</comment>
Expand Down
8 changes: 0 additions & 8 deletions src/cascadia/TerminalSettingsEditor/Resources/ja-JP/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3007,10 +3007,6 @@
<value>エンドポイントで認証が不要な場合は空白のままにします。Windows 資格情報マネージャーに保存されます。</value>
<comment>{Locked="API"} Hint below the optional custom provider credential input. Use the established localized product name for Windows Credential Manager.</comment>
</data>
<data name="AIAgents_CustomProviderAdd.Content" xml:space="preserve">
<value>エンドポイントの追加</value>
<comment>Button that starts adding a custom model provider endpoint.</comment>
</data>
<data name="AIAgents_CustomProviderSave.Content" xml:space="preserve">
<value>追加して選択</value>
<comment>Button that adds a custom provider model and selects it as the current model.</comment>
Expand All @@ -3019,10 +3015,6 @@
<value>これによりモデルが追加され、現在のモデルとして選択されます</value>
<comment>Supporting text beside the button that adds and selects a custom provider model.</comment>
</data>
<data name="AIAgents_CustomProviderCancel.Content" xml:space="preserve">
<value>キャンセル</value>
<comment>Button that cancels adding a provider.</comment>
</data>
<data name="AIAgents_BYOKModelDisplayName" xml:space="preserve">
<value>{} (BYOK)</value>
<comment>{Locked="{}","BYOK"} {} is replaced with the provider-specific model identifier.</comment>
Expand Down
8 changes: 0 additions & 8 deletions src/cascadia/TerminalSettingsEditor/Resources/ko-KR/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3067,10 +3067,6 @@
<value>엔드포인트에 인증이 필요하지 않은 경우 비워 둡니다. Windows 자격 증명 관리자에 저장됩니다.</value>
<comment>{Locked="API"} Hint below the optional custom provider credential input. Use the established localized product name for Windows Credential Manager.</comment>
</data>
<data name="AIAgents_CustomProviderAdd.Content" xml:space="preserve">
<value>엔드포인트 추가</value>
<comment>Button that starts adding a custom model provider endpoint.</comment>
</data>
<data name="AIAgents_CustomProviderSave.Content" xml:space="preserve">
<value>추가 및 선택</value>
<comment>Button that adds a custom provider model and selects it as the current model.</comment>
Expand All @@ -3079,10 +3075,6 @@
<value>이렇게 하면 모델이 추가되고 현재 모델로 선택됩니다</value>
<comment>Supporting text beside the button that adds and selects a custom provider model.</comment>
</data>
<data name="AIAgents_CustomProviderCancel.Content" xml:space="preserve">
<value>취소</value>
<comment>Button that cancels adding a provider.</comment>
</data>
<data name="AIAgents_BYOKModelDisplayName" xml:space="preserve">
<value>{} (BYOK)</value>
<comment>{Locked="{}","BYOK"} {} is replaced with the provider-specific model identifier.</comment>
Expand Down
8 changes: 0 additions & 8 deletions src/cascadia/TerminalSettingsEditor/Resources/pt-BR/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3050,10 +3050,6 @@
<value>Deixe em branco se seu ponto de extremidade não precisar de autenticação. Armazenado no Gerenciador de Credenciais do Windows.</value>
<comment>{Locked="API"} Hint below the optional custom provider credential input. Use the established localized product name for Windows Credential Manager.</comment>
</data>
<data name="AIAgents_CustomProviderAdd.Content" xml:space="preserve">
<value>Adicionar ponto de extremidade</value>
<comment>Button that starts adding a custom model provider endpoint.</comment>
</data>
<data name="AIAgents_CustomProviderSave.Content" xml:space="preserve">
<value>Adicionar e selecionar</value>
<comment>Button that adds a custom provider model and selects it as the current model.</comment>
Expand All @@ -3062,10 +3058,6 @@
<value>Isso adicionará o modelo e o selecionará como o modelo atual</value>
<comment>Supporting text beside the button that adds and selects a custom provider model.</comment>
</data>
<data name="AIAgents_CustomProviderCancel.Content" xml:space="preserve">
<value>Cancelar</value>
<comment>Button that cancels adding a provider.</comment>
</data>
<data name="AIAgents_BYOKModelDisplayName" xml:space="preserve">
<value>{} (BYOK)</value>
<comment>{Locked="{}","BYOK"} {} is replaced with the provider-specific model identifier.</comment>
Expand Down
8 changes: 0 additions & 8 deletions src/cascadia/TerminalSettingsEditor/Resources/qps-ploc/Resources.resw
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2998,10 +2998,6 @@
<value>Leave blank if your endpoint does not need auth. Stored in Windows Credential Manager.</value>
<comment>{Locked="API"} Hint below the optional custom provider credential input. Use the established localized product name for Windows Credential Manager.</comment>
</data>
<data name="AIAgents_CustomProviderAdd.Content" xml:space="preserve">
<value>Add endpoint</value>
<comment>Button that starts adding a custom model provider endpoint.</comment>
</data>
<data name="AIAgents_CustomProviderSave.Content" xml:space="preserve">
<value>Add and Select</value>
<comment>Button that adds a custom provider model and selects it as the current model.</comment>
Expand All @@ -3010,10 +3006,6 @@
<value>This will add the model and select it as the current model</value>
<comment>Supporting text beside the button that adds and selects a custom provider model.</comment>
</data>
<data name="AIAgents_CustomProviderCancel.Content" xml:space="preserve">
<value>Cancel</value>
<comment>Button that cancels adding a provider.</comment>
</data>
<data name="AIAgents_BYOKModelDisplayName" xml:space="preserve">
<value>{} (BYOK)</value>
<comment>{Locked="{}","BYOK"} {} is replaced with the provider-specific model identifier.</comment>
Expand Down
Loading
Loading