Merge branch 'WJC' into NewFilePath

wxr

2020-12-15 d7094fc4ff54ada4c39868c8be1907e0a1c25b32

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

@@ -35,8 +35,8 @@
            nameView.btnText.Height = Application.GetRealHeight(22);
            nameView.btnText.TextID = StringId.namelogic;
            nameView.btnIcon.Visible = false;
            nameView.btnNextIcon.Height = Application.GetMinRealAverage(28);
            nameView.btnNextIcon.Width = Application.GetMinRealAverage(28);
            nameView.btnNextIcon.Height = Application.GetRealWidth(28);
            nameView.btnNextIcon.Width = Application.GetRealWidth(28);
            nameView.btnNextIcon.UnSelectedImagePath = "LogicIcon/editname.png";
            viewLayout.AddChidren(nameView.FLayoutView());