Explorar el Código

Merge branch 'master' of http://139.155.15.221:3000/zoulei/XdCxRhDW

zoulei hace 1 año
padre
commit
2ab5562833

+ 6 - 6
XdCxRhDW.App/EditForms/X2D1DTOParamEditor.Designer.cs

@@ -154,7 +154,7 @@
             // txtSigTime
             // 
             this.txtSigTime.EditValue = null;
-            this.txtSigTime.Location = new System.Drawing.Point(323, 121);
+            this.txtSigTime.Location = new System.Drawing.Point(241, 121);
             this.txtSigTime.Name = "txtSigTime";
             this.txtSigTime.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -165,7 +165,7 @@
             this.txtSigTime.Properties.EditFormat.FormatString = "yyyy-MM-dd HH:mm:ss";
             this.txtSigTime.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
             this.txtSigTime.Properties.MaskSettings.Set("mask", "yyyy-MM-dd HH:mm:ss");
-            this.txtSigTime.Size = new System.Drawing.Size(305, 20);
+            this.txtSigTime.Size = new System.Drawing.Size(387, 20);
             this.txtSigTime.StyleController = this.layoutControl1;
             this.txtSigTime.TabIndex = 9;
             // 
@@ -211,7 +211,7 @@
             this.txtYbAdja.Name = "txtYbAdja";
             this.txtYbAdja.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "us", -1, false, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.txtYbAdja.Size = new System.Drawing.Size(307, 20);
+            this.txtYbAdja.Size = new System.Drawing.Size(225, 20);
             this.txtYbAdja.StyleController = this.layoutControl1;
             this.txtYbAdja.TabIndex = 6;
             // 
@@ -399,11 +399,11 @@
             // itemSigTime
             // 
             this.itemSigTime.Control = this.txtSigTime;
-            this.itemSigTime.Location = new System.Drawing.Point(311, 92);
+            this.itemSigTime.Location = new System.Drawing.Point(229, 92);
             this.itemSigTime.MaxSize = new System.Drawing.Size(0, 46);
             this.itemSigTime.MinSize = new System.Drawing.Size(76, 46);
             this.itemSigTime.Name = "itemSigTime";
-            this.itemSigTime.Size = new System.Drawing.Size(311, 46);
+            this.itemSigTime.Size = new System.Drawing.Size(393, 46);
             this.itemSigTime.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.itemSigTime.Spacing = new DevExpress.XtraLayout.Utils.Padding(0, 2, 0, 0);
             this.itemSigTime.Text = "信号时间";
@@ -436,7 +436,7 @@
             this.layoutControlItem8.MaxSize = new System.Drawing.Size(0, 46);
             this.layoutControlItem8.MinSize = new System.Drawing.Size(54, 46);
             this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.Size = new System.Drawing.Size(311, 46);
+            this.layoutControlItem8.Size = new System.Drawing.Size(229, 46);
             this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem8.Text = "样本邻星时差";
             this.layoutControlItem8.TextLocation = DevExpress.Utils.Locations.Top;

+ 1 - 0
XdCxRhDW.App/XdCxRhDW.App.csproj

@@ -508,6 +508,7 @@
     <EmbeddedResource Include="PopupControl\ShowCxCtrl.resx">
       <DependentUpon>ShowCxCtrl.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="Properties\Resources.resx">
       <Generator>ResXFileCodeGenerator</Generator>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>