HStation/XHS.V1.0.git

			@@ -1,4 +1,4 @@
			namespace HStation.WinFrmUI.Assets
			namespace HStation.WinFrmUI
			{
			partial class EditAssetsPressmeterSeriesDlg
			{
			@@ -28,81 +28,34 @@
			/// </summary>
			private void InitializeComponent()
			{
			components = new System.ComponentModel.Container();
			layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
			textEditParentList = new DevExpress.XtraEditors.TreeListLookUpEdit();
			treeListLookUpEdit1TreeList = new DevExpress.XtraTreeList.TreeList();
			components = new Container();
			treeListColumn1 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
			BtnOk = new DevExpress.XtraEditors.SimpleButton();
			btnCancel = new DevExpress.XtraEditors.SimpleButton();
			TagNameTextEdit = new DevExpress.XtraEditors.TextEdit();
			NameTextEdit = new DevExpress.XtraEditors.TextEdit();
			DescriptionTextEdit = new DevExpress.XtraEditors.MemoEdit();
			Root = new DevExpress.XtraLayout.LayoutControlGroup();
			layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
			layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
			layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
			emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
			layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
			layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
			layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
			dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
			((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
			layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
			generalOkAndCancelCtrl1 = new GeneralOkAndCancelCtrl();
			txtDescription = new DevExpress.XtraEditors.MemoEdit();
			txtTagName = new DevExpress.XtraEditors.TextEdit();
			setFlagsEditCtrl1 = new SetFlagsEditCtrl();
			txtName = new DevExpress.XtraEditors.TextEdit();
			Root = new DevExpress.XtraLayout.LayoutControlGroup();
			layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
			layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
			layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
			layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
			layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
			((ISupportInitialize)dxErrorProvider1).BeginInit();
			((ISupportInitialize)layoutControl1).BeginInit();
			layoutControl1.SuspendLayout();
			((System.ComponentModel.ISupportInitialize)textEditParentList.Properties).BeginInit();
			((System.ComponentModel.ISupportInitialize)treeListLookUpEdit1TreeList).BeginInit();
			((System.ComponentModel.ISupportInitialize)TagNameTextEdit.Properties).BeginInit();
			((System.ComponentModel.ISupportInitialize)NameTextEdit.Properties).BeginInit();
			((System.ComponentModel.ISupportInitialize)DescriptionTextEdit.Properties).BeginInit();
			((System.ComponentModel.ISupportInitialize)Root).BeginInit();
			((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
			((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
			((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
			((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
			((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
			((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
			((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
			((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
			((ISupportInitialize)txtDescription.Properties).BeginInit();
			((ISupportInitialize)txtTagName.Properties).BeginInit();
			((ISupportInitialize)txtName.Properties).BeginInit();
			((ISupportInitialize)Root).BeginInit();
			((ISupportInitialize)layoutControlItem1).BeginInit();
			((ISupportInitialize)layoutControlItem2).BeginInit();
			((ISupportInitialize)layoutControlItem3).BeginInit();
			((ISupportInitialize)layoutControlItem4).BeginInit();
			((ISupportInitialize)layoutControlItem5).BeginInit();
			SuspendLayout();
			//
			// layoutControl1
			//
			layoutControl1.Controls.Add(textEditParentList);
			layoutControl1.Controls.Add(BtnOk);
			layoutControl1.Controls.Add(btnCancel);
			layoutControl1.Controls.Add(TagNameTextEdit);
			layoutControl1.Controls.Add(NameTextEdit);
			layoutControl1.Controls.Add(DescriptionTextEdit);
			layoutControl1.Dock = DockStyle.Fill;
			layoutControl1.Location = new Point(0, 0);
			layoutControl1.Name = "layoutControl1";
			layoutControl1.Root = Root;
			layoutControl1.Size = new Size(511, 275);
			layoutControl1.TabIndex = 0;
			layoutControl1.Text = "layoutControl1";
			//
			// textEditParentList
			//
			textEditParentList.Location = new Point(55, 56);
			textEditParentList.Name = "textEditParentList";
			textEditParentList.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
			textEditParentList.Properties.DisplayMember = "Name";
			textEditParentList.Properties.NullText = "";
			textEditParentList.Properties.TreeList = treeListLookUpEdit1TreeList;
			textEditParentList.Properties.ValueMember = "ID";
			textEditParentList.Size = new Size(448, 20);
			textEditParentList.StyleController = layoutControl1;
			textEditParentList.TabIndex = 11;
			//
			// treeListLookUpEdit1TreeList
			//
			treeListLookUpEdit1TreeList.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { treeListColumn1 });
			treeListLookUpEdit1TreeList.Location = new Point(7, 37);
			treeListLookUpEdit1TreeList.Name = "treeListLookUpEdit1TreeList";
			treeListLookUpEdit1TreeList.OptionsView.ShowIndentAsRowStyle = true;
			treeListLookUpEdit1TreeList.Size = new Size(400, 200);
			treeListLookUpEdit1TreeList.TabIndex = 0;
			treeListLookUpEdit1TreeList.ViewStyle = DevExpress.XtraTreeList.TreeListViewStyle.TreeView;
			//
			// treeListColumn1
			//
			@@ -112,53 +65,66 @@
			treeListColumn1.Visible = true;
			treeListColumn1.VisibleIndex = 0;
			//
			// BtnOk
			// dxErrorProvider1
			//
			BtnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
			BtnOk.Appearance.Options.UseBackColor = true;
			BtnOk.Location = new Point(356, 245);
			BtnOk.Name = "BtnOk";
			BtnOk.Size = new Size(70, 22);
			BtnOk.StyleController = layoutControl1;
			BtnOk.TabIndex = 5;
			BtnOk.Text = "确定";
			BtnOk.Click += BtnOk_ClickAsync;
			dxErrorProvider1.ContainerControl = this;
			//
			// btnCancel
			// layoutControl1
			//
			btnCancel.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
			btnCancel.Appearance.Options.UseBackColor = true;
			btnCancel.DialogResult = DialogResult.Cancel;
			btnCancel.Location = new Point(430, 245);
			btnCancel.Name = "btnCancel";
			btnCancel.Size = new Size(73, 22);
			btnCancel.StyleController = layoutControl1;
			btnCancel.TabIndex = 6;
			btnCancel.Text = "取消";
			layoutControl1.Controls.Add(generalOkAndCancelCtrl1);
			layoutControl1.Controls.Add(txtDescription);
			layoutControl1.Controls.Add(txtTagName);
			layoutControl1.Controls.Add(setFlagsEditCtrl1);
			layoutControl1.Controls.Add(txtName);
			layoutControl1.Dock = DockStyle.Fill;
			layoutControl1.Location = new Point(0, 0);
			layoutControl1.Name = "layoutControl1";
			layoutControl1.Root = Root;
			layoutControl1.Size = new Size(420, 342);
			layoutControl1.TabIndex = 0;
			layoutControl1.Text = "layoutControl1";
			//
			// TagNameTextEdit
			// generalOkAndCancelCtrl1
			//
			TagNameTextEdit.Location = new Point(55, 32);
			TagNameTextEdit.Name = "TagNameTextEdit";
			TagNameTextEdit.Size = new Size(448, 20);
			TagNameTextEdit.StyleController = layoutControl1;
			TagNameTextEdit.TabIndex = 2;
			generalOkAndCancelCtrl1.ButtonCancelMaxSize = new Size(100, 26);
			generalOkAndCancelCtrl1.ButtonCancelMinSize = new Size(100, 26);
			generalOkAndCancelCtrl1.ButtonOkMaxSize = new Size(100, 26);
			generalOkAndCancelCtrl1.ButtonOkMinSize = new Size(100, 26);
			generalOkAndCancelCtrl1.Location = new Point(12, 304);
			generalOkAndCancelCtrl1.Name = "generalOkAndCancelCtrl1";
			generalOkAndCancelCtrl1.Size = new Size(396, 26);
			generalOkAndCancelCtrl1.TabIndex = 6;
			//
			// NameTextEdit
			// txtDescription
			//
			NameTextEdit.Location = new Point(55, 8);
			NameTextEdit.Name = "NameTextEdit";
			NameTextEdit.Size = new Size(448, 20);
			NameTextEdit.StyleController = layoutControl1;
			NameTextEdit.TabIndex = 0;
			txtDescription.Location = new Point(59, 84);
			txtDescription.Name = "txtDescription";
			txtDescription.Size = new Size(349, 216);
			txtDescription.StyleController = layoutControl1;
			txtDescription.TabIndex = 5;
			//
			// DescriptionTextEdit
			// txtTagName
			//
			DescriptionTextEdit.Location = new Point(55, 80);
			DescriptionTextEdit.Name = "DescriptionTextEdit";
			DescriptionTextEdit.Size = new Size(448, 161);
			DescriptionTextEdit.StyleController = layoutControl1;
			DescriptionTextEdit.TabIndex = 4;
			txtTagName.Location = new Point(59, 60);
			txtTagName.Name = "txtTagName";
			txtTagName.Size = new Size(349, 20);
			txtTagName.StyleController = layoutControl1;
			txtTagName.TabIndex = 4;
			//
			// setFlagsEditCtrl1
			//
			setFlagsEditCtrl1.Location = new Point(59, 36);
			setFlagsEditCtrl1.Name = "setFlagsEditCtrl1";
			setFlagsEditCtrl1.Size = new Size(349, 20);
			setFlagsEditCtrl1.TabIndex = 3;
			//
			// txtName
			//
			txtName.Location = new Point(59, 12);
			txtName.Name = "txtName";
			txtName.Size = new Size(349, 20);
			txtName.StyleController = layoutControl1;
			txtName.TabIndex = 0;
			//
			// Root
			//
			@@ -166,126 +132,95 @@
			Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
			Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
			Root.GroupBordersVisible = false;
			Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5, layoutControlItem1, layoutControlItem6, emptySpaceItem1, layoutControlItem4, layoutControlItem3, layoutControlItem2 });
			Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem3, layoutControlItem4, layoutControlItem5 });
			Root.Name = "Root";
			Root.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 6, 6);
			Root.Size = new Size(511, 275);
			Root.Size = new Size(420, 342);
			Root.TextVisible = false;
			//
			// layoutControlItem5
			//
			layoutControlItem5.Control = DescriptionTextEdit;
			layoutControlItem5.Location = new Point(0, 72);
			layoutControlItem5.Name = "layoutControlItem5";
			layoutControlItem5.Size = new Size(499, 165);
			layoutControlItem5.Text = "说明:";
			layoutControlItem5.TextSize = new Size(35, 14);
			//
			// layoutControlItem1
			//
			layoutControlItem1.AllowHtmlStringInCaption = true;
			layoutControlItem1.Control = NameTextEdit;
			layoutControlItem1.Control = txtName;
			layoutControlItem1.Location = new Point(0, 0);
			layoutControlItem1.Name = "layoutControlItem1";
			layoutControlItem1.Size = new Size(499, 24);
			layoutControlItem1.Size = new Size(400, 24);
			layoutControlItem1.Text = "<color=red>*</color>名称:";
			layoutControlItem1.TextSize = new Size(35, 14);
			//
			// layoutControlItem6
			// layoutControlItem2
			//
			layoutControlItem6.Control = btnCancel;
			layoutControlItem6.Location = new Point(422, 237);
			layoutControlItem6.Name = "layoutControlItem6";
			layoutControlItem6.Size = new Size(77, 26);
			layoutControlItem6.TextSize = new Size(0, 0);
			layoutControlItem6.TextVisible = false;
			//
			// emptySpaceItem1
			//
			emptySpaceItem1.AllowHotTrack = false;
			emptySpaceItem1.Location = new Point(0, 237);
			emptySpaceItem1.Name = "emptySpaceItem1";
			emptySpaceItem1.Size = new Size(348, 26);
			emptySpaceItem1.TextSize = new Size(0, 0);
			//
			// layoutControlItem4
			//
			layoutControlItem4.Control = BtnOk;
			layoutControlItem4.Location = new Point(348, 237);
			layoutControlItem4.Name = "layoutControlItem4";
			layoutControlItem4.Size = new Size(74, 26);
			layoutControlItem4.TextSize = new Size(0, 0);
			layoutControlItem4.TextVisible = false;
			layoutControlItem2.Control = setFlagsEditCtrl1;
			layoutControlItem2.Location = new Point(0, 24);
			layoutControlItem2.Name = "layoutControlItem2";
			layoutControlItem2.Size = new Size(400, 24);
			layoutControlItem2.Text = "标签:";
			layoutControlItem2.TextSize = new Size(35, 14);
			//
			// layoutControlItem3
			//
			layoutControlItem3.Control = TagNameTextEdit;
			layoutControlItem3.Location = new Point(0, 24);
			layoutControlItem3.Control = txtTagName;
			layoutControlItem3.Location = new Point(0, 48);
			layoutControlItem3.Name = "layoutControlItem3";
			layoutControlItem3.Size = new Size(499, 24);
			layoutControlItem3.Text = "标签:";
			layoutControlItem3.Size = new Size(400, 24);
			layoutControlItem3.Text = "标志:";
			layoutControlItem3.TextSize = new Size(35, 14);
			//
			// layoutControlItem2
			// layoutControlItem4
			//
			layoutControlItem2.Control = textEditParentList;
			layoutControlItem2.Location = new Point(0, 48);
			layoutControlItem2.Name = "layoutControlItem2";
			layoutControlItem2.Size = new Size(499, 24);
			layoutControlItem2.Text = "父级:";
			layoutControlItem2.TextSize = new Size(35, 14);
			layoutControlItem4.Control = txtDescription;
			layoutControlItem4.Location = new Point(0, 72);
			layoutControlItem4.Name = "layoutControlItem4";
			layoutControlItem4.Size = new Size(400, 220);
			layoutControlItem4.Text = "说明:";
			layoutControlItem4.TextSize = new Size(35, 14);
			//
			// dxErrorProvider1
			// layoutControlItem5
			//
			dxErrorProvider1.ContainerControl = this;
			layoutControlItem5.Control = generalOkAndCancelCtrl1;
			layoutControlItem5.Location = new Point(0, 292);
			layoutControlItem5.Name = "layoutControlItem5";
			layoutControlItem5.Size = new Size(400, 30);
			layoutControlItem5.TextSize = new Size(0, 0);
			layoutControlItem5.TextVisible = false;
			//
			// EditAssetsPressmeterSeriesDlg
			//
			AutoScaleDimensions = new SizeF(7F, 14F);
			AutoScaleMode = AutoScaleMode.Font;
			ClientSize = new Size(511, 275);
			ClientSize = new Size(420, 342);
			Controls.Add(layoutControl1);
			Name = "EditAssetsPressmeterSeriesDlg";
			StartPosition = FormStartPosition.CenterScreen;
			Text = "编辑系列";
			((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
			StartPosition = FormStartPosition.CenterParent;
			Text = "编辑";
			((ISupportInitialize)dxErrorProvider1).EndInit();
			((ISupportInitialize)layoutControl1).EndInit();
			layoutControl1.ResumeLayout(false);
			((System.ComponentModel.ISupportInitialize)textEditParentList.Properties).EndInit();
			((System.ComponentModel.ISupportInitialize)treeListLookUpEdit1TreeList).EndInit();
			((System.ComponentModel.ISupportInitialize)TagNameTextEdit.Properties).EndInit();
			((System.ComponentModel.ISupportInitialize)NameTextEdit.Properties).EndInit();
			((System.ComponentModel.ISupportInitialize)DescriptionTextEdit.Properties).EndInit();
			((System.ComponentModel.ISupportInitialize)Root).EndInit();
			((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
			((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
			((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
			((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
			((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
			((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
			((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
			((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
			((ISupportInitialize)txtDescription.Properties).EndInit();
			((ISupportInitialize)txtTagName.Properties).EndInit();
			((ISupportInitialize)txtName.Properties).EndInit();
			((ISupportInitialize)Root).EndInit();
			((ISupportInitialize)layoutControlItem1).EndInit();
			((ISupportInitialize)layoutControlItem2).EndInit();
			((ISupportInitialize)layoutControlItem3).EndInit();
			((ISupportInitialize)layoutControlItem4).EndInit();
			((ISupportInitialize)layoutControlItem5).EndInit();
			ResumeLayout(false);
			}

			#endregion

			private DevExpress.XtraLayout.LayoutControl layoutControl1;
			private DevExpress.XtraEditors.TextEdit NameTextEdit;
			private DevExpress.XtraLayout.LayoutControlGroup Root;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
			private DevExpress.XtraEditors.TextEdit TagNameTextEdit;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
			private DevExpress.XtraEditors.MemoEdit DescriptionTextEdit;
			private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
			private DevExpress.XtraEditors.SimpleButton BtnOk;
			private DevExpress.XtraEditors.SimpleButton btnCancel;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
			private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
			private DevExpress.XtraEditors.TreeListLookUpEdit textEditParentList;
			private DevExpress.XtraTreeList.TreeList treeListLookUpEdit1TreeList;
			private DevExpress.XtraTreeList.Columns.TreeListColumn treeListColumn1;
			private DevExpress.XtraLayout.LayoutControl layoutControl1;
			private DevExpress.XtraLayout.LayoutControlGroup Root;
			private DevExpress.XtraEditors.TextEdit txtName;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
			private GeneralOkAndCancelCtrl generalOkAndCancelCtrl1;
			private DevExpress.XtraEditors.MemoEdit txtDescription;
			private DevExpress.XtraEditors.TextEdit txtTagName;
			private SetFlagsEditCtrl setFlagsEditCtrl1;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
			}
			}