From 2a8c7b4e3ebe5691fbbe84d8cf285be3f72b7c30 Mon Sep 17 00:00:00 2001
From: 啊鑫 <t2856754968@163.com>
Date: 星期一, 09 十二月 2024 13:38:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs | 93 +++++++++++++++++-----------------------------
1 files changed, 34 insertions(+), 59 deletions(-)
diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
index 4578fa6..d6f72fd 100644
--- a/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
+++ b/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
@@ -29,93 +29,68 @@
private void InitializeComponent()
{
this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
- this.richTextBox1 = new System.Windows.Forms.RichTextBox();
- this.xtraUserControl11 = new Gs.DevApp.UserControl.XtraUserControl1();
- this.simpleButton2 = new DevExpress.XtraEditors.SimpleButton();
- this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).BeginInit();
- this.splitContainerControl1.SuspendLayout();
+ this.ucLookSupplier1 = new Gs.DevApp.UserControl.UcLookSupplier();
+ this.ucLookItems1 = new Gs.DevApp.UserControl.UcLookItems();
+ this.txt_ItemId = new Gs.DevApp.UserControl.UcLookCk();
this.SuspendLayout();
//
// simpleButton1
//
- this.simpleButton1.Location = new System.Drawing.Point(327, 203);
+ this.simpleButton1.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.deletelist2_16x16;
+ this.simpleButton1.Location = new System.Drawing.Point(608, 78);
this.simpleButton1.Name = "simpleButton1";
this.simpleButton1.Size = new System.Drawing.Size(94, 29);
- this.simpleButton1.TabIndex = 0;
+ this.simpleButton1.TabIndex = 3;
this.simpleButton1.Text = "simpleButton1";
- this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click_1);
+ this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click);
//
- // richTextBox1
+ // ucLookSupplier1
//
- 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 = "";
+ this.ucLookSupplier1.IsReadly = false;
+ this.ucLookSupplier1.Location = new System.Drawing.Point(201, 231);
+ 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 = 2;
//
- // xtraUserControl11
+ // ucLookItems1
//
- 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;
+ this.ucLookItems1.IsReadly = false;
+ this.ucLookItems1.Location = new System.Drawing.Point(187, 119);
+ this.ucLookItems1.Name = "ucLookItems1";
+ this.ucLookItems1.Size = new System.Drawing.Size(266, 33);
+ this.ucLookItems1.TabIndex = 1;
+ this.ucLookItems1.Tag = "no";
//
- // simpleButton2
+ // txt_ItemId
//
- 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 = 3;
- this.simpleButton2.Text = "simpleButton2";
- this.simpleButton2.Click += new System.EventHandler(this.simpleButton2_Click);
- //
- // splitContainerControl1
- //
- this.splitContainerControl1.Horizontal = false;
- this.splitContainerControl1.Location = new System.Drawing.Point(247, 276);
- this.splitContainerControl1.Name = "splitContainerControl1";
- //
- // splitContainerControl1.Panel1
- //
- this.splitContainerControl1.Panel1.Text = "Panel1";
- //
- // splitContainerControl1.Panel2
- //
- this.splitContainerControl1.Panel2.Text = "Panel2";
- this.splitContainerControl1.Size = new System.Drawing.Size(200, 158);
- this.splitContainerControl1.SplitterPosition = 70;
- this.splitContainerControl1.TabIndex = 4;
+ this.txt_ItemId.IsReadly = false;
+ this.txt_ItemId.Location = new System.Drawing.Point(187, 54);
+ this.txt_ItemId.Margin = new System.Windows.Forms.Padding(0);
+ this.txt_ItemId.Name = "txt_ItemId";
+ this.txt_ItemId.Size = new System.Drawing.Size(219, 30);
+ this.txt_ItemId.TabIndex = 0;
//
// XtraForm1
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(1009, 612);
- this.Controls.Add(this.splitContainerControl1);
- this.Controls.Add(this.simpleButton2);
- this.Controls.Add(this.xtraUserControl11);
- this.Controls.Add(this.richTextBox1);
this.Controls.Add(this.simpleButton1);
+ this.Controls.Add(this.ucLookSupplier1);
+ this.Controls.Add(this.ucLookItems1);
+ this.Controls.Add(this.txt_ItemId);
this.Name = "XtraForm1";
this.Text = "XtraForm1";
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).EndInit();
- this.splitContainerControl1.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
+ private UserControl.UcLookCk txt_ItemId;
+ private UserControl.UcLookItems ucLookItems1;
+ private UserControl.UcLookSupplier ucLookSupplier1;
private DevExpress.XtraEditors.SimpleButton simpleButton1;
- private System.Windows.Forms.RichTextBox richTextBox1;
- private UserControl.XtraUserControl1 xtraUserControl11;
- private DevExpress.XtraEditors.SimpleButton simpleButton2;
- private DevExpress.XtraEditors.SplitContainerControl splitContainerControl1;
}
}
\ No newline at end of file
--
Gitblit v1.9.3