Merge branch 'WJC' into temp-wxr

wxr

2021-03-25 4975f3d6beb81e3967b1018d629be9c3410b9ea3

 HDL_ON/UI/UI2/3-Intelligence/Automation/Set.cs

@@ -61,12 +61,13 @@
                    list.Add(logic.name);
                }

                new LogicView.TipPopView().InputBox(StringId.editName, Logic.currlogic.name, StringId.nameNull, StringId.NameAlreadyExists, list, (logicName) =>
                new LogicView.TipPopView().InputBox(StringId.editName, Logic.currlogic.name, StringId.nameNull, StringId.NameAlreadyExists, list, (logicName,view
                    ) =>
                {
                    btnAutomationName.Text = logicName;
                    Logic.currlogic.name = logicName;

                });
                },()=> { });
            };
            nameView.btnClick.MouseUpEventHandler += editClick;
            btnAutomationName.MouseUpEventHandler += editClick;