Merge branch 'host' into prompt
This commit is contained in:
commit
f2bff487b7
@ -113,7 +113,13 @@
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</EmbeddedResource>
|
||||
<None Remove="resource\prompt\ContinuePrompt.txt" />
|
||||
<EmbeddedResource Include="resource\prompt\ContinuePrompt.txt" />
|
||||
<EmbeddedResource Include="resource\prompt\ContinuePrompt.txt">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</EmbeddedResource>
|
||||
<None Remove="resource\prompt\ErrorPrompt.txt" />
|
||||
<EmbeddedResource Include="resource\prompt\ErrorPrompt.txt">
|
||||
<CopyToOutputDirectory>Always</CopyToOutputDirectory>
|
||||
</EmbeddedResource>
|
||||
</ItemGroup>
|
||||
<Import Project="C:\Program Files\ArcGIS\Pro\bin\Esri.ProApp.SDK.Desktop.targets" Condition="Exists('C:\Program Files\ArcGIS\Pro\bin\Esri.ProApp.SDK.Desktop.targets') AND !Exists('Esri.ArcGISPro.Extensions.targets')" />
|
||||
</Project>
|
||||
|
||||
@ -229,16 +229,12 @@ namespace LinkToolAddin.ui.dockpane
|
||||
idList.Add(id);
|
||||
messageDict.TryAdd(msg.id, msg);
|
||||
}
|
||||
Application.Current.Dispatcher.Invoke(() =>
|
||||
{
|
||||
ReplyTextBox.Clear();
|
||||
});
|
||||
try
|
||||
{
|
||||
StringBuilder builder = new StringBuilder();
|
||||
foreach (KeyValuePair<string,MessageListItem> pair in messageDict)
|
||||
foreach (string idStr in idList)
|
||||
{
|
||||
MessageListItem msgItem = pair.Value;
|
||||
MessageListItem msgItem = messageDict[idStr];
|
||||
string content = msgItem.content;
|
||||
if (msgItem.type == MessageType.REASON_MESSAGE)
|
||||
{
|
||||
@ -249,6 +245,7 @@ namespace LinkToolAddin.ui.dockpane
|
||||
}
|
||||
Application.Current.Dispatcher.Invoke(() =>
|
||||
{
|
||||
ReplyTextBox.Clear();
|
||||
ReplyTextBox.Text = builder.ToString();
|
||||
ReplyTextBox.ScrollToEnd();
|
||||
});
|
||||
|
||||
Loading…
Reference in New Issue
Block a user