浏览代码

Merge branch 'Release2.7' of http://36.129.163.148:30080/gogsadmin/OTS into Release2.7

gsp 2 年之前
父节点
当前提交
7e167d8e7b

+ 12 - 20
OTSIncAReportApp/1-UI/Control_Grids/ParticlesGridDevidePage.Designer.cs

@@ -443,89 +443,81 @@
             this.ToolStripMenuItemDelete_Particle,
             this.ImportSTDDb});
             this.contextMenuStrip1.Name = "contextMenuStrip1";
-            this.contextMenuStrip1.Size = new System.Drawing.Size(219, 310);
+            this.contextMenuStrip1.Size = new System.Drawing.Size(211, 252);
             // 
             // ToolStripMenuItem1
             // 
-            this.ToolStripMenuItem1.Image = global::OTSIncAReportApp.Properties.Resources.复制;
             this.ToolStripMenuItem1.Name = "ToolStripMenuItem1";
-            this.ToolStripMenuItem1.Size = new System.Drawing.Size(218, 30);
+            this.ToolStripMenuItem1.Size = new System.Drawing.Size(210, 22);
             this.ToolStripMenuItem1.Text = "复制整个表";
             this.ToolStripMenuItem1.Click += new System.EventHandler(this.ToolStripMenuItem1_Click);
             // 
             // ToolStripMenuItem2
             // 
-            this.ToolStripMenuItem2.Image = global::OTSIncAReportApp.Properties.Resources.复制全部;
             this.ToolStripMenuItem2.Name = "ToolStripMenuItem2";
-            this.ToolStripMenuItem2.Size = new System.Drawing.Size(218, 30);
+            this.ToolStripMenuItem2.Size = new System.Drawing.Size(210, 22);
             this.ToolStripMenuItem2.Text = "复制选择区域";
             this.ToolStripMenuItem2.Click += new System.EventHandler(this.ToolStripMenuItem2_Click);
             // 
             // toolStripMenuItem4
             // 
-            this.toolStripMenuItem4.Image = global::OTSIncAReportApp.Properties.Resources.复制图像;
             this.toolStripMenuItem4.Name = "toolStripMenuItem4";
-            this.toolStripMenuItem4.Size = new System.Drawing.Size(218, 30);
+            this.toolStripMenuItem4.Size = new System.Drawing.Size(210, 22);
             this.toolStripMenuItem4.Text = "复制图像";
             this.toolStripMenuItem4.Click += new System.EventHandler(this.toolStripMenuItem4_Click);
             // 
             // toolStripSeparator1
             // 
             this.toolStripSeparator1.Name = "toolStripSeparator1";
-            this.toolStripSeparator1.Size = new System.Drawing.Size(215, 6);
+            this.toolStripSeparator1.Size = new System.Drawing.Size(207, 6);
             // 
             // ToolStripMenuItem3
             // 
-            this.ToolStripMenuItem3.Image = global::OTSIncAReportApp.Properties.Resources.恢复;
             this.ToolStripMenuItem3.Name = "ToolStripMenuItem3";
-            this.ToolStripMenuItem3.Size = new System.Drawing.Size(218, 30);
+            this.ToolStripMenuItem3.Size = new System.Drawing.Size(210, 22);
             this.ToolStripMenuItem3.Text = "恢复至初始状态";
             this.ToolStripMenuItem3.Click += new System.EventHandler(this.ToolStripMenuItem3_Click);
             // 
             // ToolStripMenuItem5
             // 
-            this.ToolStripMenuItem5.Image = global::OTSIncAReportApp.Properties.Resources.移动SEM到当前位置;
             this.ToolStripMenuItem5.Name = "ToolStripMenuItem5";
-            this.ToolStripMenuItem5.Size = new System.Drawing.Size(218, 30);
+            this.ToolStripMenuItem5.Size = new System.Drawing.Size(210, 22);
             this.ToolStripMenuItem5.Text = "移动SEM到颗粒视域位置";
             this.ToolStripMenuItem5.Click += new System.EventHandler(this.ToolStripMenuItem5_Click);
             // 
             // ToolStripMenuItem_exportimagefile
             // 
-            this.ToolStripMenuItem_exportimagefile.Image = global::OTSIncAReportApp.Properties.Resources.导出;
             this.ToolStripMenuItem_exportimagefile.Name = "ToolStripMenuItem_exportimagefile";
-            this.ToolStripMenuItem_exportimagefile.Size = new System.Drawing.Size(218, 30);
+            this.ToolStripMenuItem_exportimagefile.Size = new System.Drawing.Size(210, 22);
             this.ToolStripMenuItem_exportimagefile.Text = "导出图像文件";
             this.ToolStripMenuItem_exportimagefile.Click += new System.EventHandler(this.ToolStripMenuItem_exportimagefile_Click);
             // 
             // testToolStripMenuItem
             // 
             this.testToolStripMenuItem.Name = "testToolStripMenuItem";
-            this.testToolStripMenuItem.Size = new System.Drawing.Size(218, 30);
+            this.testToolStripMenuItem.Size = new System.Drawing.Size(210, 22);
             this.testToolStripMenuItem.Text = "显示能谱数据";
             this.testToolStripMenuItem.Visible = false;
             this.testToolStripMenuItem.Click += new System.EventHandler(this.testToolStripMenuItem_Click);
             // 
             // EXCELToolStripMenuItem
             // 
-            this.EXCELToolStripMenuItem.Image = global::OTSIncAReportApp.Properties.Resources.导出所有数据到EXCEL321;
             this.EXCELToolStripMenuItem.Name = "EXCELToolStripMenuItem";
-            this.EXCELToolStripMenuItem.Size = new System.Drawing.Size(218, 30);
+            this.EXCELToolStripMenuItem.Size = new System.Drawing.Size(210, 22);
             this.EXCELToolStripMenuItem.Text = "导出EXCEL";
             this.EXCELToolStripMenuItem.Click += new System.EventHandler(this.EXCELToolStripMenuItem_Click);
             // 
             // ToolStripMenuItemDelete_Particle
             // 
             this.ToolStripMenuItemDelete_Particle.Name = "ToolStripMenuItemDelete_Particle";
-            this.ToolStripMenuItemDelete_Particle.Size = new System.Drawing.Size(218, 30);
+            this.ToolStripMenuItemDelete_Particle.Size = new System.Drawing.Size(210, 22);
             this.ToolStripMenuItemDelete_Particle.Text = "Delete particles";
             this.ToolStripMenuItemDelete_Particle.Click += new System.EventHandler(this.ToolStripMenuItem_Delete_Particle_Click);
             // 
             // ImportSTDDb
             // 
-            this.ImportSTDDb.Image = global::OTSIncAReportApp.Properties.Resources.复制32;
             this.ImportSTDDb.Name = "ImportSTDDb";
-            this.ImportSTDDb.Size = new System.Drawing.Size(218, 30);
+            this.ImportSTDDb.Size = new System.Drawing.Size(210, 22);
             this.ImportSTDDb.Text = "导入标准库";
             this.ImportSTDDb.Click += new System.EventHandler(this.ImportSTDDb_Click);
             // 

+ 1 - 0
OTSIncAReportApp/OTSIncAReportApp.csproj

@@ -770,6 +770,7 @@
     <EmbeddedResource Include="1-UI\OTSTemplateDesigner\OTSReport_TemplateDesignerRM.resx">
       <DependentUpon>OTSReport_TemplateDesignerRM.cs</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="Properties\licenses.licx" />
     <EmbeddedResource Include="ReportTemplate\GBReport.resx">
       <DependentUpon>GBReport.cs</DependentUpon>
     </EmbeddedResource>

+ 1 - 0
OTSIncAReportApp/Properties/licenses.licx

@@ -0,0 +1 @@
+DevExpress.XtraReports.UI.XtraReport, DevExpress.XtraReports.v20.1, Version=20.1.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a