From 7cc494482f41292879200eb1314622a1a44f725c Mon Sep 17 00:00:00 2001
From: C3031 <shitiangui@lanpucloud.cn>
Date: 星期一, 05 一月 2026 08:43:07 +0800
Subject: [PATCH] Merge branch 'master' of http://lanpucloud.cn:1111/r/~zhengyabo/LB_TyreAppearanceInspectionSoftware
---
LB_VisionProcesses/Forms/GlobalVarForm.Designer.cs | 92 ++++++++++++++++++++++-----------------------
1 files changed, 45 insertions(+), 47 deletions(-)
diff --git a/LB_VisionProcesses/Forms/GlobalVarForm.Designer.cs b/LB_VisionProcesses/Forms/GlobalVarForm.Designer.cs
index 27631ef..c71f731 100644
--- a/LB_VisionProcesses/Forms/GlobalVarForm.Designer.cs
+++ b/LB_VisionProcesses/Forms/GlobalVarForm.Designer.cs
@@ -30,14 +30,13 @@
{
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(GlobalVarForm));
theme_GlobalVarForm = new ReaLTaiizor.Forms.ThemeForm();
- controlBox_GlobalVarForm = new ReaLTaiizor.Controls.ControlBox();
- controlsPanel = new ReaLTaiizor.Controls.Panel();
tlp_GlobalVarForm = new Sunny.UI.UITableLayoutPanel();
tlp_GlobalVarFormOperator = new Sunny.UI.UITableLayoutPanel();
btn_Delete = new ReaLTaiizor.Controls.Button();
btn_Add = new ReaLTaiizor.Controls.Button();
+ controlsPanel = new ReaLTaiizor.Controls.Panel();
+ controlBox_GlobalVarForm = new ReaLTaiizor.Controls.ControlBox();
theme_GlobalVarForm.SuspendLayout();
- controlsPanel.SuspendLayout();
tlp_GlobalVarForm.SuspendLayout();
tlp_GlobalVarFormOperator.SuspendLayout();
SuspendLayout();
@@ -45,8 +44,8 @@
// theme_GlobalVarForm
//
theme_GlobalVarForm.BackColor = Color.FromArgb(32, 41, 50);
+ theme_GlobalVarForm.Controls.Add(tlp_GlobalVarForm);
theme_GlobalVarForm.Controls.Add(controlBox_GlobalVarForm);
- theme_GlobalVarForm.Controls.Add(controlsPanel);
theme_GlobalVarForm.Dock = DockStyle.Fill;
theme_GlobalVarForm.Font = new Font("Microsoft Sans Serif", 9F);
theme_GlobalVarForm.Image = (Image)resources.GetObject("theme_GlobalVarForm.Image");
@@ -61,50 +60,19 @@
theme_GlobalVarForm.TabIndex = 0;
theme_GlobalVarForm.Text = "鍏ㄥ眬鍙橀噺";
//
- // controlBox_GlobalVarForm
- //
- controlBox_GlobalVarForm.Anchor = AnchorStyles.Top | AnchorStyles.Right;
- controlBox_GlobalVarForm.BackColor = Color.FromArgb(32, 34, 37);
- controlBox_GlobalVarForm.CloseHoverColor = Color.FromArgb(230, 17, 35);
- controlBox_GlobalVarForm.DefaultLocation = true;
- controlBox_GlobalVarForm.EnableHoverHighlight = true;
- controlBox_GlobalVarForm.EnableMaximizeButton = false;
- controlBox_GlobalVarForm.EnableMinimizeButton = false;
- controlBox_GlobalVarForm.ForeColor = Color.FromArgb(155, 155, 155);
- controlBox_GlobalVarForm.Location = new Point(700, 12);
- controlBox_GlobalVarForm.MaximizeHoverColor = Color.FromArgb(74, 74, 74);
- controlBox_GlobalVarForm.MinimizeHoverColor = Color.FromArgb(63, 63, 65);
- controlBox_GlobalVarForm.Name = "controlBox_GlobalVarForm";
- controlBox_GlobalVarForm.Size = new Size(90, 25);
- controlBox_GlobalVarForm.TabIndex = 1;
- //
- // controlsPanel
- //
- controlsPanel.BackColor = Color.FromArgb(39, 51, 63);
- controlsPanel.Controls.Add(tlp_GlobalVarForm);
- controlsPanel.Dock = DockStyle.Fill;
- controlsPanel.EdgeColor = Color.FromArgb(32, 41, 50);
- controlsPanel.Location = new Point(10, 70);
- controlsPanel.Name = "controlsPanel";
- controlsPanel.Padding = new Padding(5);
- controlsPanel.Size = new Size(780, 521);
- controlsPanel.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
- controlsPanel.TabIndex = 0;
- controlsPanel.Text = "panel1";
- controlsPanel.SizeChanged += controlsPanel_SizeChanged;
- //
// tlp_GlobalVarForm
//
tlp_GlobalVarForm.ColumnCount = 1;
tlp_GlobalVarForm.ColumnStyles.Add(new ColumnStyle(SizeType.Percent, 100F));
tlp_GlobalVarForm.Controls.Add(tlp_GlobalVarFormOperator, 0, 1);
+ tlp_GlobalVarForm.Controls.Add(controlsPanel, 0, 0);
tlp_GlobalVarForm.Dock = DockStyle.Fill;
- tlp_GlobalVarForm.Location = new Point(5, 5);
+ tlp_GlobalVarForm.Location = new Point(10, 70);
tlp_GlobalVarForm.Name = "tlp_GlobalVarForm";
tlp_GlobalVarForm.RowCount = 2;
tlp_GlobalVarForm.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
tlp_GlobalVarForm.RowStyles.Add(new RowStyle(SizeType.Absolute, 60F));
- tlp_GlobalVarForm.Size = new Size(770, 511);
+ tlp_GlobalVarForm.Size = new Size(780, 521);
tlp_GlobalVarForm.TabIndex = 0;
tlp_GlobalVarForm.TagString = null;
//
@@ -120,11 +88,11 @@
tlp_GlobalVarFormOperator.Controls.Add(btn_Delete, 4, 0);
tlp_GlobalVarFormOperator.Controls.Add(btn_Add, 5, 0);
tlp_GlobalVarFormOperator.Dock = DockStyle.Fill;
- tlp_GlobalVarFormOperator.Location = new Point(3, 454);
+ tlp_GlobalVarFormOperator.Location = new Point(3, 464);
tlp_GlobalVarFormOperator.Name = "tlp_GlobalVarFormOperator";
tlp_GlobalVarFormOperator.RowCount = 1;
tlp_GlobalVarFormOperator.RowStyles.Add(new RowStyle(SizeType.Percent, 100F));
- tlp_GlobalVarFormOperator.Size = new Size(764, 54);
+ tlp_GlobalVarFormOperator.Size = new Size(774, 54);
tlp_GlobalVarFormOperator.TabIndex = 0;
tlp_GlobalVarFormOperator.TagString = null;
//
@@ -139,11 +107,11 @@
btn_Delete.Image = null;
btn_Delete.ImageAlign = ContentAlignment.MiddleLeft;
btn_Delete.InactiveColor = Color.FromArgb(32, 34, 37);
- btn_Delete.Location = new Point(511, 3);
+ btn_Delete.Location = new Point(516, 3);
btn_Delete.Name = "btn_Delete";
btn_Delete.PressedBorderColor = Color.FromArgb(165, 37, 37);
btn_Delete.PressedColor = Color.FromArgb(165, 37, 37);
- btn_Delete.Size = new Size(121, 48);
+ btn_Delete.Size = new Size(122, 48);
btn_Delete.TabIndex = 0;
btn_Delete.Text = "绉婚櫎";
btn_Delete.TextAlignment = StringAlignment.Center;
@@ -160,20 +128,51 @@
btn_Add.Image = null;
btn_Add.ImageAlign = ContentAlignment.MiddleLeft;
btn_Add.InactiveColor = Color.FromArgb(32, 34, 37);
- btn_Add.Location = new Point(638, 3);
+ btn_Add.Location = new Point(644, 3);
btn_Add.Name = "btn_Add";
btn_Add.PressedBorderColor = Color.FromArgb(165, 37, 37);
btn_Add.PressedColor = Color.FromArgb(165, 37, 37);
- btn_Add.Size = new Size(123, 48);
+ btn_Add.Size = new Size(127, 48);
btn_Add.TabIndex = 1;
btn_Add.Text = "娣诲姞";
btn_Add.TextAlignment = StringAlignment.Center;
btn_Add.Click += btn_Add_Click;
//
+ // controlsPanel
+ //
+ controlsPanel.BackColor = Color.FromArgb(39, 51, 63);
+ controlsPanel.Dock = DockStyle.Fill;
+ controlsPanel.EdgeColor = Color.FromArgb(32, 41, 50);
+ controlsPanel.Location = new Point(3, 3);
+ controlsPanel.Name = "controlsPanel";
+ controlsPanel.Padding = new Padding(5);
+ controlsPanel.Size = new Size(774, 455);
+ controlsPanel.SmoothingType = System.Drawing.Drawing2D.SmoothingMode.HighQuality;
+ controlsPanel.TabIndex = 0;
+ controlsPanel.Text = "panel1";
+ controlsPanel.SizeChanged += controlsPanel_SizeChanged;
+ //
+ // controlBox_GlobalVarForm
+ //
+ controlBox_GlobalVarForm.Anchor = AnchorStyles.Top | AnchorStyles.Right;
+ controlBox_GlobalVarForm.BackColor = Color.FromArgb(32, 34, 37);
+ controlBox_GlobalVarForm.CloseHoverColor = Color.FromArgb(230, 17, 35);
+ controlBox_GlobalVarForm.DefaultLocation = true;
+ controlBox_GlobalVarForm.EnableHoverHighlight = true;
+ controlBox_GlobalVarForm.EnableMaximizeButton = false;
+ controlBox_GlobalVarForm.EnableMinimizeButton = false;
+ controlBox_GlobalVarForm.ForeColor = Color.FromArgb(155, 155, 155);
+ controlBox_GlobalVarForm.Location = new Point(700, 18);
+ controlBox_GlobalVarForm.MaximizeHoverColor = Color.FromArgb(74, 74, 74);
+ controlBox_GlobalVarForm.MinimizeHoverColor = Color.FromArgb(63, 63, 65);
+ controlBox_GlobalVarForm.Name = "controlBox_GlobalVarForm";
+ controlBox_GlobalVarForm.Size = new Size(90, 25);
+ controlBox_GlobalVarForm.TabIndex = 1;
+ //
// GlobalVarForm
//
- AutoScaleDimensions = new SizeF(7F, 17F);
- AutoScaleMode = AutoScaleMode.Font;
+ AutoScaleDimensions = new SizeF(96F, 96F);
+ AutoScaleMode = AutoScaleMode.Dpi;
ClientSize = new Size(800, 600);
Controls.Add(theme_GlobalVarForm);
FormBorderStyle = FormBorderStyle.None;
@@ -184,7 +183,6 @@
FormClosing += GlobalVarForm_FormClosing;
Load += GlobalVarForm_Load;
theme_GlobalVarForm.ResumeLayout(false);
- controlsPanel.ResumeLayout(false);
tlp_GlobalVarForm.ResumeLayout(false);
tlp_GlobalVarFormOperator.ResumeLayout(false);
ResumeLayout(false);
--
Gitblit v1.9.3