Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/mono/monodevelop.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornosami <jasonimison@gmail.com>2019-11-14 22:38:18 +0300
committermonojenkins <jo.shields+jenkins@xamarin.com>2019-11-15 00:59:00 +0300
commitfd2c5643ffa2c1daf1cafb21572336a2e075f018 (patch)
tree3c0cde4796d7951a511dc790cebf7399fb59f36d /main/src/addins
parent4d304b165d0abbfe0617db23c63c8aa6afc41d6c (diff)
Add placeholder text. Fixes VSTS #1021728
Diffstat (limited to 'main/src/addins')
-rw-r--r--main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/Fields/ComboField.cs4
-rw-r--r--main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/ScaffolderTemplateConfigurePage.cs2
-rw-r--r--main/src/addins/MonoDevelop.AspNetCore/MonoDevelop.AspNetCore.Scaffolding/Scaffolders/ScaffolderBase.cs2
3 files changed, 6 insertions, 2 deletions
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<IEnumerable<string>> options, bool isEditable = false) : base (commandLineName, displayName)
+ public ComboField (string commandLineName, string displayName, Task<IEnumerable<string>> 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<IEnumerable<string>> 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)