From 1498516cb98d75e8f0dcbbfe232f2a0f1ff00c9b Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期二, 29 十月 2024 12:45:21 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs | 60 ++++++++++++++++++++++++------------------------------------
1 files changed, 24 insertions(+), 36 deletions(-)
diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
index 5ab4030..f125d5a 100644
--- a/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
+++ b/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
@@ -28,53 +28,43 @@
/// </summary>
private void InitializeComponent()
{
- this.label2 = new System.Windows.Forms.Label();
this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
- this.ucLookCk1 = new Gs.DevApp.UserControl.UcLookCk();
- this.ucLookSupplier1 = new Gs.DevApp.UserControl.UcLookSupplier();
+ this.richTextBox1 = new System.Windows.Forms.RichTextBox();
+ this.xtraUserControl11 = new Gs.DevApp.UserControl.XtraUserControl1();
this.simpleButton2 = new DevExpress.XtraEditors.SimpleButton();
this.SuspendLayout();
//
- // label2
- //
- this.label2.AutoSize = true;
- this.label2.Location = new System.Drawing.Point(179, 134);
- this.label2.Name = "label2";
- this.label2.Size = new System.Drawing.Size(38, 18);
- this.label2.TabIndex = 8;
- this.label2.Text = "浠撳簱";
- //
// simpleButton1
//
- this.simpleButton1.Location = new System.Drawing.Point(169, 184);
+ this.simpleButton1.Location = new System.Drawing.Point(327, 203);
this.simpleButton1.Name = "simpleButton1";
this.simpleButton1.Size = new System.Drawing.Size(94, 29);
- this.simpleButton1.TabIndex = 9;
+ this.simpleButton1.TabIndex = 0;
this.simpleButton1.Text = "simpleButton1";
- this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click);
+ this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click_1);
//
- // ucLookCk1
+ // richTextBox1
//
- this.ucLookCk1.Location = new System.Drawing.Point(182, 87);
- this.ucLookCk1.Margin = new System.Windows.Forms.Padding(0);
- this.ucLookCk1.Name = "ucLookCk1";
- this.ucLookCk1.Size = new System.Drawing.Size(219, 30);
- this.ucLookCk1.TabIndex = 7;
+ this.richTextBox1.Location = new System.Drawing.Point(247, 37);
+ this.richTextBox1.Name = "richTextBox1";
+ this.richTextBox1.Size = new System.Drawing.Size(250, 96);
+ this.richTextBox1.TabIndex = 1;
+ this.richTextBox1.Text = "";
//
- // ucLookSupplier1
+ // xtraUserControl11
//
- this.ucLookSupplier1.Location = new System.Drawing.Point(604, 114);
- this.ucLookSupplier1.Margin = new System.Windows.Forms.Padding(0);
- this.ucLookSupplier1.Name = "ucLookSupplier1";
- this.ucLookSupplier1.Size = new System.Drawing.Size(228, 30);
- this.ucLookSupplier1.TabIndex = 10;
+ this.xtraUserControl11.Location = new System.Drawing.Point(59, 82);
+ this.xtraUserControl11.Name = "xtraUserControl11";
+ this.xtraUserControl11.Size = new System.Drawing.Size(150, 150);
+ this.xtraUserControl11.TabIndex = 2;
//
// simpleButton2
//
- this.simpleButton2.Location = new System.Drawing.Point(661, 183);
+ this.simpleButton2.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.sortandfilter_16x16;
+ this.simpleButton2.Location = new System.Drawing.Point(590, 203);
this.simpleButton2.Name = "simpleButton2";
this.simpleButton2.Size = new System.Drawing.Size(94, 29);
- this.simpleButton2.TabIndex = 11;
+ this.simpleButton2.TabIndex = 3;
this.simpleButton2.Text = "simpleButton2";
this.simpleButton2.Click += new System.EventHandler(this.simpleButton2_Click);
//
@@ -84,22 +74,20 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(890, 396);
this.Controls.Add(this.simpleButton2);
- this.Controls.Add(this.ucLookSupplier1);
+ this.Controls.Add(this.xtraUserControl11);
+ this.Controls.Add(this.richTextBox1);
this.Controls.Add(this.simpleButton1);
- this.Controls.Add(this.label2);
- this.Controls.Add(this.ucLookCk1);
this.Name = "XtraForm1";
this.Text = "XtraForm1";
this.ResumeLayout(false);
- this.PerformLayout();
}
#endregion
- private UserControl.UcLookCk ucLookCk1;
- private System.Windows.Forms.Label label2;
+
private DevExpress.XtraEditors.SimpleButton simpleButton1;
- private UserControl.UcLookSupplier ucLookSupplier1;
+ private System.Windows.Forms.RichTextBox richTextBox1;
+ private UserControl.XtraUserControl1 xtraUserControl11;
private DevExpress.XtraEditors.SimpleButton simpleButton2;
}
}
\ No newline at end of file
--
Gitblit v1.9.3