From 9b6fbeecc6d1f53e1c15fa5410ccd6aa5c9351f7 Mon Sep 17 00:00:00 2001 From: wyf Date: Wed, 23 Jul 2025 08:59:34 +0000 Subject: [PATCH] SVN r885 SVN-Revision: r885 --- .../Control/GroupControl.Designer.cs | 24 ++++---- 插件库/Lskj.Main/Control/GroupControl.cs | Bin 901 -> 901 bytes .../Control/MainPanelControlEx.Designer.cs | 38 ++++++------ .../Lskj.Main/Control/MainPanelControlEx.cs | 37 ++++++++++- .../Control/Menu_ItemNew.Designer.cs | 2 +- 插件库/Lskj.Main/Control/Menu_ItemNew.cs | 4 +- .../Control/SimpleControl.Designer.cs | 58 +++++++----------- 插件库/Lskj.Main/Control/SimpleControl.cs | Bin 721 -> 1001 bytes 8 files changed, 89 insertions(+), 74 deletions(-) diff --git a/插件库/Lskj.Main/Control/GroupControl.Designer.cs b/插件库/Lskj.Main/Control/GroupControl.Designer.cs index f1c92c1..613b675 100644 --- a/插件库/Lskj.Main/Control/GroupControl.Designer.cs +++ b/插件库/Lskj.Main/Control/GroupControl.Designer.cs @@ -31,8 +31,8 @@ namespace Lskj.Main.Control { this.topTipsPanel = new System.Windows.Forms.Panel(); this.tipsLab = new System.Windows.Forms.Label(); - this.whiteLab = new System.Windows.Forms.Label(); this.menuMainPanel = new System.Windows.Forms.Panel(); + this.whiteLab = new System.Windows.Forms.Label(); this.topTipsPanel.SuspendLayout(); this.SuspendLayout(); // @@ -52,24 +52,24 @@ namespace Lskj.Main.Control this.tipsLab.BackColor = System.Drawing.Color.White; this.tipsLab.Dock = System.Windows.Forms.DockStyle.Fill; this.tipsLab.Font = new System.Drawing.Font("Microsoft YaHei UI", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.tipsLab.Location = new System.Drawing.Point(10, 0); + this.tipsLab.Location = new System.Drawing.Point(20, 0); this.tipsLab.Name = "tipsLab"; - this.tipsLab.Size = new System.Drawing.Size(747, 26); + this.tipsLab.Size = new System.Drawing.Size(737, 26); this.tipsLab.TabIndex = 3; this.tipsLab.Text = "默认分组"; this.tipsLab.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; // + // menuMainPanel + // + this.menuMainPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.menuMainPanel.Location = new System.Drawing.Point(0, 42); + this.menuMainPanel.Name = "menuMainPanel"; + this.menuMainPanel.Size = new System.Drawing.Size(757, 281); + this.menuMainPanel.TabIndex = 4; + // // whiteLab // this.whiteLab.BackColor = System.Drawing.Color.White; this.whiteLab.Dock = System.Windows.Forms.DockStyle.Left; this.whiteLab.Location = new System.Drawing.Point(0, 0); - this.whiteLab.Name = "whiteLab"; - this.whiteLab.Size = new System.Drawing.Size(10, 26); - this.whiteLab.TabIndex = 1; - // - // menuMainPanel - // - this.menuMainPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.menuMainPanel.Location = new System.Drawing.Point(0, 42); - this.menuMainPanel.Name = "menuMainPane \ No newline at end of file + this.whiteLab.Nam \ No newline at end of file diff --git a/插件库/Lskj.Main/Control/GroupControl.cs b/插件库/Lskj.Main/Control/GroupControl.cs index c4da5d1ee74aa8749b0479c2780a3a571577b661..7d8282643d4e99db91aa013db557d8744808164d 100644 GIT binary patch delta 707 zcmV;!0zCbN2ZaZaG=JqqjBQXGcCsj1U{pmYl|6YUuEu z=k&k7CsQ`fZ-QMZ;og*`AwowBF$iEth!D?L_4Z>L@1xjFR)4WNy2koQVtFha*Uj1_ zZYjVT zjWtrReys+uZM{Kg)$u{Ig+s4$5sw70=xsYTs=y9ACN-!$$`Ef0!GmB6#X^gx(XyYc z?ABe8QBbgL;eUE437{d%Rn^QrZ|JIoH?q}moF)SC1+78Bjln@+CRDPkZ67DnDz4(t z$yG!PajPD&@!Ifk^lRFtFg*;-%$57!MN z&)tojFYX_lS@JIq38K32Xb!~Kn!s2aO%1wBQ>!)CYb zNg-4ECK}T*pQJfb4d_5RtA2j#4-~FQ0W-9kNV;vI6)Z#|gMp5G&gZ*LVq#U;z@djq zYzQG=sejw3SN9w)zi>f8k}C0SzgQ#iU$mwxt<~}i>(o0bo(K;tH7rj)LVpEcl;76} z6|?&?C7b`l{J8=?qd^z3mT(R9(0yPI60Tn~<*aPmBo07G*YD;N2V(h9t~}#UX$MZC z!sKR`Zps{7Y2U2T(Y5peSs16FlH=I;lF;)s*)?)^C6~24)!6d&f#fUGxRzCY98R;Z pCszFF@1>(rpp>!I1r9sa^VyvGL1#(-OG5THhPDQi@dA{R0}b;OS?d4* delta 707 zcmV;!0zCbN2ZaZaG=FM(X->b@EEmQOrB$v9+*nOKEP*ZT9YH=aws^_6Ro^(X@|yjt zu1^qdm2HB1)U14LmYBTVNvhwEYz^h{X(*!d%H@6|6fY@hx0wHHMtvf?aQD`FpIcHe z$+A)Ph6;;^i|TqYnm0*vsEV5VMyNnbwO?jYq6hkcL z)ZB&=0$5qxD|0Zlw@KIno-|pl4I?_o_&18+2+HKDnO5!7T#$B4TqWRL}CAhB=;D!(;=|rNbyO{ z;g=Cp_>yvBC;JYe@p{e*_)o7I%fp9ZaBYJ|qz5>w$tZm?V`w_MYYVXugY8eHLMqc( zl?d>JIDc#^dSR7~G{-$7DYA|~Y|C94c+Mt?tKF2pZ7YQ@Qeh|Fiep3mGrxp;$LJ?z zjiDWWT$<+hU-nIh;yq|&R~;%XJZXW|y3XT?Rmi=4TY73;3p)PUGCNL3AeDQ^Yq$j8Ct0s{BK3N?y2I94I0Kj7f5;y_1PUfP5Ot>Z`!HTgtDK@dA{R0}U!)U>5)Y diff --git a/插件库/Lskj.Main/Control/MainPanelControlEx.Designer.cs b/插件库/Lskj.Main/Control/MainPanelControlEx.Designer.cs index 8a4da58..c9eacd9 100644 --- a/插件库/Lskj.Main/Control/MainPanelControlEx.Designer.cs +++ b/插件库/Lskj.Main/Control/MainPanelControlEx.Designer.cs @@ -352,7 +352,7 @@ this.pl_center_main_middle.Location = new System.Drawing.Point(0, 0); this.pl_center_main_middle.Margin = new System.Windows.Forms.Padding(0); this.pl_center_main_middle.Name = "pl_center_main_middle"; - this.pl_center_main_middle.Padding = new System.Windows.Forms.Padding(15); + this.pl_center_main_middle.Padding = new System.Windows.Forms.Padding(10); this.pl_center_main_middle.Size = new System.Drawing.Size(896, 584); this.pl_center_main_middle.TabIndex = 1; // @@ -361,10 +361,10 @@ this.allPanel.Controls.Add(this.allMenuPanel); this.allPanel.Controls.Add(this.botTipsPanel); this.allPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.allPanel.Location = new System.Drawing.Point(15, 242); + this.allPanel.Location = new System.Drawing.Point(10, 237); this.allPanel.Margin = new System.Windows.Forms.Padding(0); this.allPanel.Name = "allPanel"; - this.allPanel.Size = new System.Drawing.Size(866, 327); + this.allPanel.Size = new System.Drawing.Size(876, 337); this.allPanel.TabIndex = 9; // // allMenuPanel @@ -374,7 +374,7 @@ this.allMenuPanel.Location = new System.Drawing.Point(0, 26); this.allMenuPanel.Margin = new System.Windows.Forms.Padding(0); this.allMenuPanel.Name = "allMenuPanel"; - this.allMenuPanel.Size = new System.Drawing.Size(866, 301); + this.allMenuPanel.Size = new System.Drawing.Size(876, 311); this.allMenuPanel.TabIndex = 6; // // botTipsPanel @@ -385,7 +385,7 @@ this.botTipsPanel.Dock = System.Windows.Forms.DockStyle.Top; this.botTipsPanel.Location = new System.Drawing.Point(0, 0); this.botTipsPanel.Name = "botTipsPanel"; - this.botTipsPanel.Size = new System.Drawing.Size(866, 26); + this.botTipsPanel.Size = new System.Drawing.Size(876, 26); this.botTipsPanel.TabIndex = 5; // // allTipsLab @@ -393,9 +393,9 @@ this.allTipsLab.BackColor = System.Drawing.Color.White; this.allTipsLab.Dock = System.Windows.Forms.DockStyle.Fill; this.allTipsLab.Font = new System.Drawing.Font("Microsoft YaHei UI", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.allTipsLab.Location = new System.Drawing.Point(8, 0); + this.allTipsLab.Location = new System.Drawing.Point(20, 0); this.allTipsLab.Name = "allTipsLab"; - this.allTipsLab.Size = new System.Drawing.Size(858, 26); + this.allTipsLab.Size = new System.Drawing.Size(856, 26); this.allTipsLab.TabIndex = 3; this.allTipsLab.Text = "全部应用"; this.allTipsLab.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -406,7 +406,7 @@ this.label4.Dock = System.Windows.Forms.DockStyle.Left; this.label4.Location = new System.Drawing.Point(0, 0); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(8, 26); + this.label4.Size = new System.Drawing.Size(20, 26); this.label4.TabIndex = 1; // // panelSplit @@ -414,11 +414,11 @@ this.panelSplit.Controls.Add(this.labelSplit); this.panelSplit.Controls.Add(this.labelSplitTop); this.panelSplit.Dock = System.Windows.Forms.DockStyle.Top; - this.panelSplit.Location = new System.Drawing.Point(15, 235); + this.panelSplit.Location = new System.Drawing.Point(10, 230); this.panelSplit.Margin = new System.Windows.Forms.Padding(0); this.panelSplit.Name = "panelSplit"; this.panelSplit.Padding = new System.Windows.Forms.Padding(13, 0, 13, 0); - this.panelSplit.Size = new System.Drawing.Size(866, 7); + this.panelSplit.Size = new System.Drawing.Size(876, 7); this.panelSplit.TabIndex = 7; // // labelSplit @@ -429,7 +429,7 @@ this.labelSplit.ForeColor = System.Drawing.Color.Black; this.labelSplit.Location = new System.Drawing.Point(13, 3); this.labelSplit.Name = "labelSplit"; - this.labelSplit.Size = new System.Drawing.Size(840, 1); + this.labelSplit.Size = new System.Drawing.Size(850, 1); this.labelSplit.TabIndex = 0; // // labelSplitTop @@ -437,7 +437,7 @@ this.labelSplitTop.Dock = System.Windows.Forms.DockStyle.Top; this.labelSplitTop.Location = new System.Drawing.Point(13, 0); this.labelSplitTop.Name = "labelSplitTop"; - this.labelSplitTop.Size = new System.Drawing.Size(840, 3); + this.labelSplitTop.Size = new System.Drawing.Size(850, 3); this.labelSplitTop.TabIndex = 1; // // collectPanel @@ -445,10 +445,10 @@ this.collectPanel.Controls.Add(this.collectMenuPanel); this.collectPanel.Controls.Add(this.topTipsPanel); this.collectPanel.Dock = System.Windows.Forms.DockStyle.Top; - this.collectPanel.Location = new System.Drawing.Point(15, 15); + this.collectPanel.Location = new System.Drawing.Point(10, 10); this.collectPanel.Margin = new System.Windows.Forms.Padding(0); this.collectPanel.Name = "collectPanel"; - this.collectPanel.Size = new System.Drawing.Size(866, 220); + this.collectPanel.Size = new System.Drawing.Size(876, 220); this.collectPanel.TabIndex = 8; // // collectMenuPanel @@ -458,7 +458,7 @@ this.collectMenuPanel.Location = new System.Drawing.Point(0, 26); this.collectMenuPanel.Margin = new System.Windows.Forms.Padding(0); this.collectMenuPanel.Name = "collectMenuPanel"; - this.collectMenuPanel.Size = new System.Drawing.Size(866, 194); + this.collectMenuPanel.Size = new System.Drawing.Size(876, 194); this.collectMenuPanel.TabIndex = 7; // // topTipsPanel @@ -469,7 +469,7 @@ this.topTipsPanel.Dock = System.Windows.Forms.DockStyle.Top; this.topTipsPanel.Location = new System.Drawing.Point(0, 0); this.topTipsPanel.Name = "topTipsPanel"; - this.topTipsPanel.Size = new System.Drawing.Size(866, 26); + this.topTipsPanel.Size = new System.Drawing.Size(876, 26); this.topTipsPanel.TabIndex = 5; // // collectTipsLab @@ -477,9 +477,9 @@ this.collectTipsLab.BackColor = System.Drawing.Color.White; this.collectTipsLab.Dock = System.Windows.Forms.DockStyle.Fill; this.collectTipsLab.Font = new System.Drawing.Font("Microsoft YaHei UI", 10.5F, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, ((byte)(134))); - this.collectTipsLab.Location = new System.Drawing.Point(8, 0); + this.collectTipsLab.Location = new System.Drawing.Point(20, 0); this.collectTipsLab.Name = "collectTipsLab"; - this.collectTipsLab.Size = new System.Drawing.Size(858, 26); + this.collectTipsLab.Size = new System.Drawing.Size(856, 26); this.collectTipsLab.TabIndex = 3; this.collectTipsLab.Text = "我的收藏"; this.collectTipsLab.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; @@ -490,7 +490,7 @@ this.whiteLab.Dock = System.Windows.Forms.DockStyle.Left; this.whiteLab.Location = new System.Drawing.Point(0, 0); this.whiteLab.Name = "whiteLab"; - this.whiteLab.Size = new System.Drawing.Size(8, 26); + this.whiteLab.Size = new System.Drawing.Size(20, 26); this.whiteLab.TabIndex = 1; // // pl_center_main_middle_FlowLayout diff --git a/插件库/Lskj.Main/Control/MainPanelControlEx.cs b/插件库/Lskj.Main/Control/MainPanelControlEx.cs index 34feb9b..86c2796 100644 --- a/插件库/Lskj.Main/Control/MainPanelControlEx.cs +++ b/插件库/Lskj.Main/Control/MainPanelControlEx.cs @@ -167,7 +167,7 @@ namespace Lskj.Main.Control /// /// 快捷窗口圆角 /// - private Dictionary _quickPageHeaders = new Dictionary(); + private Dictionary _quickPageHeaders = new Dictionary(); /// /// 默认模块(右上角)圆角 /// @@ -651,6 +651,12 @@ namespace Lskj.Main.Control /// private void SetMenus() { + FontFamily fontFamily = FontUtil.Fonts.Families.Where(n => n.Name.Equals("MiSans")).FirstOrDefault(); + if (fontFamily != null) + { + collectTipsLab.Font = new Font(fontFamily, 10.5f, FontStyle.Regular); + allTipsLab.Font = new Font(fontFamily, 10.5f, FontStyle.Regular); + } string[] menuFiles = null; if (Directory.Exists(PubUtil.ModuleDefaultPath)) { @@ -697,8 +703,16 @@ namespace Lskj.Main.Control { GroupControl baseGroupControl = new GroupControl(); baseGroupControl.TipsLabel.ForeColor = Color.DimGray; + if (fontFamily != null) + { + baseGroupControl.TipsLabel.Font = new Font(fontFamily, 10.5f, FontStyle.Regular); + } GroupControl reportGroupControl = new GroupControl(); reportGroupControl.TipsLabel.ForeColor = Color.DimGray; + if (fontFamily != null) + { + baseGroupControl.TipsLabel.Font = new Font(fontFamily, 10.5f, FontStyle.Regular); + } FlowLayoutPanel baseFlowPanel = new FlowLayoutPanel(); FlowLayoutPanel reportFlowPanel = new FlowLayoutPanel(); baseFlowPanel.Padding = new Padding(menuLeft, 0, 0, 0); @@ -717,6 +731,12 @@ namespace Lskj.Main.Control string hoverImg = PubUtil.MainMenuDefaultImage + dataRow["MouseOverImg1"] + ""; string[] menuTag = new string[] { dataRow["DllFileName"] + "", dataRow["PurviewId"] + "", dataRow["LMenuId"] + "", dataRow["UrlParams"] + "", dataRow["LSubSysId"] + "", dataRow["dllShowCaption"] + "" }; Menu_ItemNew menu = new Menu_ItemNew(); + if (fontFamily != null) + { + menu.GetLabelTitle().Font = new Font(fontFamily, 9.75f, FontStyle.Bold); + menu.GetLabelTitleSub().Font = new Font(fontFamily, 8.5f, FontStyle.Regular); + } + menu.GetLabelTitle().ForeColor = Color.FromArgb(71, 73, 79); menu.Margin = new Padding(0, 0, 20, 0); menu.Name = groupMenuId; menu.Size = new Size(menuWidth, menuHeight); @@ -766,6 +786,12 @@ namespace Lskj.Main.Control string hoverImg = PubUtil.MainMenuDefaultImage + dataRow["MouseOverImg1"] + ""; string[] menuTag = new string[] { dataRow["DllFileName"] + "", dataRow["PurviewId"] + "", dataRow["LMenuId"] + "", dataRow["UrlParams"] + "", dataRow["LSubSysId"] + "", dataRow["dllShowCaption"] + "" }; Menu_ItemNew menu = new Menu_ItemNew(); + if (fontFamily != null) + { + menu.GetLabelTitle().Font = new Font(fontFamily, 9.75f, FontStyle.Bold); + menu.GetLabelTitleSub().Font = new Font(fontFamily, 8.5f, FontStyle.Regular); + } + menu.GetLabelTitle().ForeColor = Color.FromArgb(71, 73, 79); menu.Margin = new Padding(0, 0, 20, 0); menu.Name = groupMenuId; menu.Size = new Size(menuWidth, menuHeight); @@ -1050,7 +1076,12 @@ namespace Lskj.Main.Control groupIndex = groupByDataRows.Where(n => !n.Key.Equals(99)).Count() > 0 ? groupByDataRows.Where(n => !n.Key.Equals(99)).Max(n => n.Key) + 1 : 1; } Menu_ItemNew menu = new Menu_ItemNew(); - menu.GetLabelTitle().ForeColor = Color.FromArgb(88, 85, 85); + if (fontFamily != null) + { + menu.GetLabelTitle().Font = new Font(fontFamily, 9.75f, FontStyle.Bold); + menu.GetLabelTitleSub().Font = new Font(fontFamily, 8.5f, FontStyle.Regular); + } + menu.GetLabelTitle().ForeColor = Color.FromArgb(71, 73, 79); menu.menuRow = dataRow.Table.Columns.Contains("menuRow") && !string.IsNullOrEmpty(dataRow["menuRow"] + "") ? Convert.ToInt32(dataRow["menuRow"] + "") : 1; menu.menuGroup = groupIndex; if ((menu.menuRow - minMenuRow + 1) > nowRowCount + 1) @@ -1833,7 +1864,7 @@ namespace Lskj.Main.Control { string groupMenuId = items["LMenuId"] + ""; Menu_ItemNew menuItem = this._menuItemList.Cast().FirstOrDefault(x => x.Name == groupMenuId); - CornerLab corLab = _quickPageHeaders[key]; + Lskj.Control.CircleButton corLab = _quickPageHeaders[key]; corLab.Visible = true; string number = items["amount"] + ""; diff --git a/插件库/Lskj.Main/Control/Menu_ItemNew.Designer.cs b/插件库/Lskj.Main/Control/Menu_ItemNew.Designer.cs index f306973..9ec7c77 100644 --- a/插件库/Lskj.Main/Control/Menu_ItemNew.Designer.cs +++ b/插件库/Lskj.Main/Control/Menu_ItemNew.Designer.cs @@ -59,7 +59,7 @@ this.lbl_sub.AutoSize = true; this.lbl_sub.Font = new System.Drawing.Font("Microsoft YaHei UI", 8.5F); this.lbl_sub.ForeColor = System.Drawing.Color.DimGray; - this.lbl_sub.Location = new System.Drawing.Point(78, 39); + this.lbl_sub.Location = new System.Drawing.Point(76, 39); this.lbl_sub.Name = "lbl_sub"; this.lbl_sub.Size = new System.Drawing.Size(91, 17); this.lbl_sub.TabIndex = 4; diff --git a/插件库/Lskj.Main/Control/Menu_ItemNew.cs b/插件库/Lskj.Main/Control/Menu_ItemNew.cs index 0a3e6d5..1344d36 100644 --- a/插件库/Lskj.Main/Control/Menu_ItemNew.cs +++ b/插件库/Lskj.Main/Control/Menu_ItemNew.cs @@ -111,10 +111,10 @@ namespace Lskj.Main.Control this.BackgroundImage = _imgBorderHover; } Cursor = Cursors.Hand; - Invalidate(); + //Invalidate(); } private void HoverLeave(object s, EventArgs e) { if (ClientRectangle.Contains(PointToClient(System.Windows.Forms.Control.MousePosition))) return; _isHover = false; - //BackCol \ No newline at end of file + //BackColor \ No newline at end of file diff --git a/插件库/Lskj.Main/Control/SimpleControl.Designer.cs b/插件库/Lskj.Main/Control/SimpleControl.Designer.cs index 9d44ae6..9ceae05 100644 --- a/插件库/Lskj.Main/Control/SimpleControl.Designer.cs +++ b/插件库/Lskj.Main/Control/SimpleControl.Designer.cs @@ -30,8 +30,8 @@ namespace Lskj.Main.Control private void InitializeComponent() { this.picBox = new System.Windows.Forms.PictureBox(); + this.circleButton = new Lskj.Control.CircleButton(); this.label = new System.Windows.Forms.Label(); - this.cornerLab = new Lskj.Main.Control.CornerLab(); ((System.ComponentModel.ISupportInitialize)(this.picBox)).BeginInit(); this.SuspendLayout(); // @@ -45,42 +45,26 @@ namespace Lskj.Main.Control this.picBox.TabIndex = 0; this.picBox.TabStop = false; // + // circleButton + // + this.circleButton.BackColor = System.Drawing.Color.Red; + this.circleButton.BorderColor = System.Drawing.Color.Transparent; + this.circleButton.BorderThickness = 1F; + this.circleButton.Dock = System.Windows.Forms.DockStyle.Right; + this.circleButton.FlatAppearance.BorderSize = 0; + this.circleButton.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.circleButton.ForeColor = System.Drawing.Color.White; + this.circleButton.ImageHover = null; + this.circleButton.ImageNormal = null; + this.circleButton.Location = new System.Drawing.Point(162, 0); + this.circleButton.Name = "circleButton"; + this.circleButton.Number = 0; + this.circleButton.Radius = 9; + this.circleButton.TabIndex = 4; + this.circleButton.Text = "circleButton1"; + this.circleButton.UseVisualStyleBackColor = false; + // // label // this.label.Dock = System.Windows.Forms.DockStyle.Fill; - this.label.Location = new System.Drawing.Point(41, 0); - this.label.Name = "label"; - this.label.Size = new System.Drawing.Size(139, 42); - this.label.TabIndex = 3; - this.label.TextAlign = System.Drawing.ContentAlignment.MiddleLeft; - // - // cornerLab - // - this.cornerLab.BackColor = System.Drawing.SystemColors.Control; - this.cornerLab.Dock = System.Windows.Forms.DockStyle.Right; - this.cornerLab.Location = new System.Drawing.Point(180, 0); - this.cornerLab.Name = "cornerLab"; - this.cornerLab.Size = new System.Drawing.Size(24, 42); - this.cornerLab.TabIndex = 2; - // - // SimpleControl - // - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; - this.AutoSize = true; - this.Controls.Add(this.label); - this.Controls.Add(this.cornerLab); - this.Controls.Add(this.picBox); - this.Name = "SimpleControl"; - this.Size = new System.Drawing.Size(204, 42); - ((System.ComponentModel.ISupportInitialize)(this.picBox)).EndInit(); - this.ResumeLayout(false); - - } - - #endregion - - private System.Windows.Forms.PictureBox picBox; - private CornerLab cornerLab; - private System.Windows.Forms.Label label; - } -} + thi \ No newline at end of file diff --git a/插件库/Lskj.Main/Control/SimpleControl.cs b/插件库/Lskj.Main/Control/SimpleControl.cs index 4ab2152fa9ec5f12aa644743952ac290e785de46..6198a208490d0dd7ec31241ad0ca591652fdde17 100644 GIT binary patch literal 1001 zcmb1;W|k5akgVa7*8H! zzWA-txcn(ek#XVtxY?(Fzt!SBRR3kesj6;^EZ);6`&aR1KHyvYAj0}FZ_(x(cNmJU ze4N0)rX_&UvPtp8j|EFqXL%nyU{E;8d(p9V7hc~I(*I|cyK??=t9J?Od&Oo++fFz* zCDYdD>FkC_vY*<0b(cr7f!!<5It*^zK(%A7qxjMd;Z-iTC$@txAaS46;d&EIiG> zl&AYq{FI;4kDQ#1V-lq-XIn@v)wwSJurEnT{z`{ItNVg4UsfMFXX~bLU|Ba`jfZm}*t zjL+dA@e6+xFeF($V$p1Pt@^1xJ)j|U%118SYnO9gfBx`6W;cgJ%<94=M+CGV_-4E_ zn)Nu}_Qs3+t)~6A`!`AS+?n2B8hNLwChMpNXWuNfJ|Qmkt$}-wuXvMiAzJ_OCjHvF z`+nzQ^V5!YO>9`M)!;R0{sFt!?(w{{HZQxho|RQR!RcJojPof9MLJUdN5TL90DSRh AtpET3 literal 721 zcma))!A`?442JJ{3Lm#iAAsH%0!``=(mI?32~|oral=59*I{V>AH3+Vp9bFRW6Qi+01HW`vw)}RRsyFxwscq4-xr@Y+6 za-(cP=6#fU#BCU*p2@82hO=AiE6#;5vO;!JAr$=fnk^)m*s%%TYOxa#kE=^f3Y_$T zqz0uWGc2ic8ap9e!4soD*pg{)J+hw|CexODDonSzp;UxEBf6W(WSaNlrjNR&9!Q1S zFfv4h(`PZn$y*k