瀏覽代碼

更新资源文件

cxs 1 月之前
父節點
當前提交
7de41884f7

+ 4 - 3
Bin/x64/Debug/Resources/XMLData/AppResource_EN.xml

@@ -158,7 +158,7 @@
    <Name>frmReportApp</Name>
     <Controls>
       <Control name="dpbNew" text="New" />
-	  
+	  <Control name="rbOpenprj" text="Openprj"/>
 	  <Control name="rbClose" text="Close"/>
       <Control name="dpbOpen" text="Open" />
       <Control name="dpbSave" text="Save" />
@@ -186,7 +186,7 @@
 	  <Control name="rbOther" text="Other" />	
 	  <Control name="rbRecap" text="Reclassification" />
 	  <Control name="rbMenu" text="Menu" />
-	  <Control name="rbOpen" text="Open" />
+	  <Control name="rbopen" text="Openrst" />
 	  <Control name="rbStaff" text="Staff" />
 	  <Control name="ribbonPanel2" text="Graphic" />
 	  <Control name="rbFrame" text="FrameBorder" />
@@ -1136,7 +1136,7 @@ field of view(%)" />
 	  <Control name="rbSemFunction" text="SemControl" />
 	  <Control name="rbAddSample" text="Add" />
 	  <Control name="rbDeleteSample" text="Delete" />
-	  <Control name="ribInvers" text="InversSelect" />
+	  <Control name="ribreset" text="InversSelect" />
 	  <Control name="rbMeasureCircle" text="Circle" />
 	  <Control name="rbMeasureRectangle" text="Rectangle" />
 	  <Control name="ribCircle" text="Circle" />
@@ -1171,6 +1171,7 @@ field of view(%)" />
 	  <Control name="rbDisconnectHardware" text="DisConnectSem" />
 	  <Control name="rbAutoBeamOff" text="AutoBeamOff" />
 	  <Control name="rbinterrupt" text="Interrupt" />
+	  <Control name="rb_reclassify" text="Reclassify" />
 	  <Control name="language" text="EN" />
 	  <Control name="message1" text="No OTSIncA valid pass!" />
 	  <Control name="message2" text="Is the current file modified or saved?" />

+ 28 - 28
OTSIncAMeasureApp/OTSIncAMeasureAppForm.Designer.cs

@@ -86,7 +86,7 @@
             this.rbCheckParam = new System.Windows.Forms.RibbonButton();
             this.rbPReport = new System.Windows.Forms.RibbonPanel();
             this.rbReport = new System.Windows.Forms.RibbonButton();
-            this.ribbonButton2 = new System.Windows.Forms.RibbonButton();
+            this.rb_Reclassify = new System.Windows.Forms.RibbonButton();
             this.rbTabView = new System.Windows.Forms.RibbonTab();
             this.ribView = new System.Windows.Forms.RibbonPanel();
             this.rbRuler = new System.Windows.Forms.RibbonButton();
@@ -169,7 +169,7 @@
             this.rbMenu.BorderMode = System.Windows.Forms.RibbonWindowMode.InsideWindow;
             this.rbMenu.Font = new System.Drawing.Font("Microsoft Sans Serif", 9F);
             this.rbMenu.Location = new System.Drawing.Point(0, 0);
-            this.rbMenu.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
+            this.rbMenu.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
             this.rbMenu.Minimized = true;
             this.rbMenu.Name = "rbMenu";
             // 
@@ -202,7 +202,7 @@
             this.rbMenu.QuickAcessToolbar.Image = null;
             this.rbMenu.QuickAcessToolbar.Tag = null;
             this.rbMenu.QuickAcessToolbar.ToolTipImage = null;
-            this.rbMenu.Size = new System.Drawing.Size(1916, 130);
+            this.rbMenu.Size = new System.Drawing.Size(1277, 130);
             this.rbMenu.TabIndex = 0;
             this.rbMenu.Tabs.Add(this.rbTabHome);
             this.rbMenu.Tabs.Add(this.rbTabView);
@@ -705,7 +705,7 @@
             // 
             this.rbPReport.ButtonMoreVisible = false;
             this.rbPReport.Items.Add(this.rbReport);
-            this.rbPReport.Items.Add(this.ribbonButton2);
+            this.rbPReport.Items.Add(this.rb_Reclassify);
             this.rbPReport.Tag = "rbPReport";
             this.rbPReport.Text = "测量结果";
             // 
@@ -724,20 +724,20 @@
             this.rbReport.ToolTipTitle = null;
             this.rbReport.Click += new System.EventHandler(this.rbReport_Click);
             // 
-            // ribbonButton2
-            // 
-            this.ribbonButton2.AltKey = null;
-            this.ribbonButton2.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Down;
-            this.ribbonButton2.DropDownArrowSize = new System.Drawing.Size(5, 3);
-            this.ribbonButton2.Image = global::OTSMeasureApp.Properties.Resources.Reset32;
-            this.ribbonButton2.SmallImage = ((System.Drawing.Image)(resources.GetObject("ribbonButton2.SmallImage")));
-            this.ribbonButton2.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
-            this.ribbonButton2.Tag = null;
-            this.ribbonButton2.Text = "重新分类";
-            this.ribbonButton2.ToolTip = null;
-            this.ribbonButton2.ToolTipImage = null;
-            this.ribbonButton2.ToolTipTitle = null;
-            this.ribbonButton2.Click += new System.EventHandler(this.ribbonButton2_Click);
+            // rb_Reclassify
+            // 
+            this.rb_Reclassify.AltKey = null;
+            this.rb_Reclassify.DropDownArrowDirection = System.Windows.Forms.RibbonArrowDirection.Down;
+            this.rb_Reclassify.DropDownArrowSize = new System.Drawing.Size(5, 3);
+            this.rb_Reclassify.Image = global::OTSMeasureApp.Properties.Resources.Reset32;
+            this.rb_Reclassify.SmallImage = ((System.Drawing.Image)(resources.GetObject("rb_Reclassify.SmallImage")));
+            this.rb_Reclassify.Style = System.Windows.Forms.RibbonButtonStyle.Normal;
+            this.rb_Reclassify.Text = "重新分类";
+            this.rb_Reclassify.Tag = "rb_reclassify";
+            this.rb_Reclassify.ToolTip = null;
+            this.rb_Reclassify.ToolTipImage = null;
+            this.rb_Reclassify.ToolTipTitle = null;
+            this.rb_Reclassify.Click += new System.EventHandler(this.ribbonButton2_Click);
             // 
             // rbTabView
             // 
@@ -865,11 +865,11 @@
             this.TSGrayVal,
             this.STSemCoordinate,
             this.toolStripStatusLabel1});
-            this.statusStrip1.Location = new System.Drawing.Point(0, 1019);
+            this.statusStrip1.Location = new System.Drawing.Point(0, 671);
             this.statusStrip1.Name = "statusStrip1";
-            this.statusStrip1.Padding = new System.Windows.Forms.Padding(3, 0, 21, 0);
+            this.statusStrip1.Padding = new System.Windows.Forms.Padding(2, 0, 14, 0);
             this.statusStrip1.RightToLeft = System.Windows.Forms.RightToLeft.Yes;
-            this.statusStrip1.Size = new System.Drawing.Size(1916, 26);
+            this.statusStrip1.Size = new System.Drawing.Size(1277, 26);
             this.statusStrip1.TabIndex = 2;
             this.statusStrip1.Text = "statusStrip1";
             // 
@@ -905,9 +905,9 @@
             this.dockPanel.DockLeftPortion = 0.21D;
             this.dockPanel.DockRightPortion = 0.27D;
             this.dockPanel.Location = new System.Drawing.Point(0, 130);
-            this.dockPanel.Margin = new System.Windows.Forms.Padding(9, 11, 9, 11);
+            this.dockPanel.Margin = new System.Windows.Forms.Padding(6, 7, 6, 7);
             this.dockPanel.Name = "dockPanel";
-            this.dockPanel.Size = new System.Drawing.Size(1916, 889);
+            this.dockPanel.Size = new System.Drawing.Size(1277, 541);
             dockPanelGradient1.EndColor = System.Drawing.SystemColors.ControlLight;
             dockPanelGradient1.StartColor = System.Drawing.SystemColors.ControlLight;
             autoHideStripSkin1.DockStripGradient = dockPanelGradient1;
@@ -984,9 +984,9 @@
             // 
             // OTSIncAMeasureAppForm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(9F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1916, 1045);
+            this.ClientSize = new System.Drawing.Size(1277, 697);
             this.Controls.Add(this.dockPanel);
             this.Controls.Add(this.statusStrip1);
             this.Controls.Add(this.rbMenu);
@@ -994,8 +994,8 @@
             this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon")));
             this.IsMdiContainer = true;
             this.KeyPreview = true;
-            this.Margin = new System.Windows.Forms.Padding(3, 1, 3, 1);
-            this.MinimumSize = new System.Drawing.Size(1009, 730);
+            this.Margin = new System.Windows.Forms.Padding(2, 1, 2, 1);
+            this.MinimumSize = new System.Drawing.Size(678, 500);
             this.Name = "OTSIncAMeasureAppForm";
             this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
             this.Text = "OTSMeasureApp";
@@ -1071,7 +1071,7 @@
         public System.Windows.Forms.RibbonButton rbinterrupt;
         public System.Windows.Forms.RibbonButton rbAutoBeamOff;
         public System.Windows.Forms.RibbonButton rbSysMgrApp;
-        private System.Windows.Forms.RibbonButton ribbonButton2;
+        private System.Windows.Forms.RibbonButton rb_Reclassify;
         private System.Windows.Forms.RibbonButton ribbonButton4;
     }
 }

+ 5 - 5
OTSIncAMeasureApp/OTSIncAMeasureAppForm.resx

@@ -199,13 +199,13 @@
   <data name="ribbonButton4.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
+        wAAADsABataJCQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="ribbonButton4.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wQAADsEBuJFr7QAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
+        wAAADsABataJCQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="ribRectangle.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -217,13 +217,13 @@
   <data name="ribPolygon.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vQAADr0BR/uQrQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
+        vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
 </value>
   </data>
-  <data name="ribbonButton2.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="rb_Reclassify.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        wAAADsABataJCQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
+        vwAADr8BOAVTJAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="ribbonButton5.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">