From fd2c5643ffa2c1daf1cafb21572336a2e075f018 Mon Sep 17 00:00:00 2001 From: nosami Date: Thu, 14 Nov 2019 19:38:18 +0000 Subject: Add placeholder text. Fixes VSTS #1021728 --- .../MonoDevelop.AspNetCore.Scaffolding/Fields/ComboField.cs | 4 +++- .../ScaffolderTemplateConfigurePage.cs | 2 ++ .../MonoDevelop.AspNetCore.Scaffolding/Scaffolders/ScaffolderBase.cs | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) (limited to 'main/src/addins') diff --git a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/Fields/ComboField.cs b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/Fields/ComboField.cs index e6b50b72db..90a481f141 100644 --- a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/Fields/ComboField.cs +++ b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/Fields/ComboField.cs @@ -31,13 +31,15 @@ namespace MonoDevelop.AspNetCore.Scaffolding { class ComboField : ScaffolderField { - public ComboField (string commandLineName, string displayName, Task> options, bool isEditable = false) : base (commandLineName, displayName) + public ComboField (string commandLineName, string displayName, Task> options, bool isEditable = false, string placeholderText = null) : base (commandLineName, displayName) { Options = options; IsEditable = isEditable; + PlaceholderText = placeholderText; } public bool IsEditable { get; } + public string PlaceholderText { get; } public Task> Options { get; } } } diff --git a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/ScaffolderTemplateConfigurePage.cs b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/ScaffolderTemplateConfigurePage.cs index ce8bec093a..7f094443b5 100644 --- a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/ScaffolderTemplateConfigurePage.cs +++ b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/ScaffolderTemplateConfigurePage.cs @@ -69,6 +69,8 @@ namespace MonoDevelop.AspNetCore.Scaffolding if (comboField.IsEditable) { var comboBoxEntry = new ComboBoxEntry (); comboBoxEntry.TextEntry.Changed += (sender, args) => comboField.SelectedValue = comboBoxEntry.TextEntry.Text; + if(comboField.PlaceholderText != null) + comboBoxEntry.TextEntry.PlaceholderText = comboField.PlaceholderText; comboBoxEntry.Items.Add (""); comboBox = comboBoxEntry; } else { diff --git a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/Scaffolders/ScaffolderBase.cs b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/Scaffolders/ScaffolderBase.cs index 597997b8d4..ef06fe0a78 100644 --- a/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/Scaffolders/ScaffolderBase.cs +++ b/main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/Scaffolders/ScaffolderBase.cs @@ -49,7 +49,7 @@ namespace MonoDevelop.AspNetCore.Scaffolding protected ComboField GetDbContextField (ScaffolderArgs args) { - return new ComboField ("--dataContext", "DbContext class to use:", GetDbContextClassesAsync(args.Project, args.CancellationToken), isEditable: true); + return new ComboField ("--dataContext", "DbContext class to use:", GetDbContextClassesAsync(args.Project, args.CancellationToken), isEditable: true, placeholderText: "Select or type DbContext class name"); } protected ComboField GetModelField (ScaffolderArgs args) -- cgit v1.2.3