Pārlūkot izejas kodu

Merge branch 'OTSsteelmineralsystem' of http://36.129.163.148:30080/gogsadmin/OTS into OTSsteelmineralsystem

gsp 6 mēneši atpakaļ
vecāks
revīzija
8d9d4621d7

+ 2 - 2
Bin/x64/Debug/Config/ProData/HardwareConfig.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <XMLData PathName="HardwareConfig.xml" ID="1">
-  <Member RegName="SemControllerName" Value="OffLine" ImageInputSources="SE" />
-  <Member RegName="EDSName" Value="OffLine" DelayQuantify="true" WeightPercentageToAtomicPercentage="false" />
+  <Member RegName="SemControllerName" Value="Oxford" ImageInputSources="SE" />
+  <Member RegName="EDSName" Value="Oxford" DelayQuantify="true" WeightPercentageToAtomicPercentage="false" />
   <Member RegName="BrukerDllVersion" Version="Bruker.API.Esprit64.dll" />
   <Member RegName="FEIIP" Value="192.168.0.1" />
   <Member RegName="FEIPORT" Value="7520" />

+ 36 - 0
SpectrumSTDEditor/UI/Form_Main.Designer.cs

@@ -63,6 +63,7 @@
             this.rbNew = new System.Windows.Forms.RibbonButton();
             this.rbBackup = new System.Windows.Forms.RibbonButton();
             this.rbSave = new System.Windows.Forms.RibbonButton();
+            this.ribbonPanel5 = new System.Windows.Forms.RibbonPanel();
             this.ribbonPanel2 = new System.Windows.Forms.RibbonPanel();
             this.ribbonTab1 = new System.Windows.Forms.RibbonTab();
             this.ribbonTab3 = new System.Windows.Forms.RibbonTab();
@@ -78,6 +79,8 @@
             this.ribbonButton1 = new System.Windows.Forms.RibbonButton();
             this.ribbonButton2 = new System.Windows.Forms.RibbonButton();
             this.ribbonButton3 = new System.Windows.Forms.RibbonButton();
+            this.comboBoxfilter = new System.Windows.Forms.ComboBox();
+            this.btnfilter = new System.Windows.Forms.Button();
             this.SuspendLayout();
             // 
             // ribbonSeparator1
@@ -238,6 +241,7 @@
             // ribbonTab2
             // 
             this.ribbonTab2.Panels.Add(this.ribbonPanel3);
+            this.ribbonTab2.Panels.Add(this.ribbonPanel5);
             this.ribbonTab2.Tag = "ribbonTab2";
             this.ribbonTab2.Text = "主页";
             // 
@@ -330,6 +334,11 @@
             this.rbSave.ToolTipTitle = null;
             this.rbSave.Click += new System.EventHandler(this.rbSave_Click);
             // 
+            // ribbonPanel5
+            // 
+            this.ribbonPanel5.Tag = null;
+            this.ribbonPanel5.Text = "标准库内容数据筛选";
+            // 
             // ribbonPanel2
             // 
             this.ribbonPanel2.Tag = null;
@@ -544,11 +553,34 @@
             this.ribbonButton3.ToolTipImage = null;
             this.ribbonButton3.ToolTipTitle = null;
             // 
+            // comboBoxfilter
+            // 
+            this.comboBoxfilter.FormattingEnabled = true;
+            this.comboBoxfilter.Location = new System.Drawing.Point(311, 58);
+            this.comboBoxfilter.Name = "comboBoxfilter";
+            this.comboBoxfilter.Size = new System.Drawing.Size(129, 20);
+            this.comboBoxfilter.TabIndex = 35;
+            this.comboBoxfilter.SelectedIndexChanged += new System.EventHandler(this.comboBoxfilter_SelectedIndexChanged);
+            this.comboBoxfilter.Enter += new System.EventHandler(this.comboBoxfilter_Enter);
+            // 
+            // btnfilter
+            // 
+            this.btnfilter.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
+            this.btnfilter.Location = new System.Drawing.Point(346, 84);
+            this.btnfilter.Name = "btnfilter";
+            this.btnfilter.Size = new System.Drawing.Size(94, 21);
+            this.btnfilter.TabIndex = 36;
+            this.btnfilter.Text = "跳转";
+            this.btnfilter.UseVisualStyleBackColor = true;
+            this.btnfilter.Click += new System.EventHandler(this.btnfilter_Click);
+            // 
             // Form_Main
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 12F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.ClientSize = new System.Drawing.Size(1805, 790);
+            this.Controls.Add(this.btnfilter);
+            this.Controls.Add(this.comboBoxfilter);
             this.Controls.Add(this.dockPanel1);
             this.Controls.Add(this.ribbon1);
             this.IsMdiContainer = true;
@@ -559,6 +591,7 @@
             this.WindowState = System.Windows.Forms.FormWindowState.Maximized;
             this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form_ConstantsEditor2_FormClosing);
             this.Load += new System.EventHandler(this.Form_Main_Load);
+            this.Paint += new System.Windows.Forms.PaintEventHandler(this.Form_Main_Paint);
             this.ResumeLayout(false);
 
         }
@@ -599,5 +632,8 @@
         private System.Windows.Forms.RibbonSeparator ribbonSeparator3;
         private System.Windows.Forms.RibbonOrbMenuItem ribbon_Exit;
         private System.Windows.Forms.RibbonOrbMenuItem ribbonOrbMenuItem_Convert;
+        private System.Windows.Forms.ComboBox comboBoxfilter;
+        private System.Windows.Forms.Button btnfilter;
+        private System.Windows.Forms.RibbonPanel ribbonPanel5;
     }
 }

+ 54 - 46
SpectrumSTDEditor/UI/Form_Main.cs

@@ -85,6 +85,8 @@ namespace SpectrumSTDEditor
                 //        m_STDRuleslist.AddNewRow(STDId, "NewClassify", Attributes.string10ToColor(STDDictionary[STDId].Color));
                 //    }
                 //}
+                
+
             }
         }
 
@@ -579,52 +581,6 @@ namespace SpectrumSTDEditor
             view.BackColor = Color.White;
             m_Attributes.Grid_Attributes[2, 1].View = view;
         }
-        public void AddSTDGroupsToAttribute()
-        {
-            try
-            {
-                System.Data.SQLite.SQLiteConnection m_dbConnection = new System.Data.SQLite.SQLiteConnection("data source='" + STDDBAddress + "'");
-                m_dbConnection.Open();
-                System.Data.SQLite.SQLiteDataAdapter m_dataAdapter = new System.Data.SQLite.SQLiteDataAdapter("select name,id from STDGroups order by iorder", m_dbConnection);
-                DataSet ds = new DataSet();
-                m_dataAdapter.Fill(ds);
-                DataTable dt = ds.Tables[0];
-                if (dt != null)
-                {
-                    if (dt.Rows.Count >= 0)
-                    {
-                        GroupIdDictionaryFromId.Clear();
-                        GroupIdDictionaryFromName.Clear();
-
-                        List<string> ss = new List<string>();
-                        if (dt.Select("id='0'").Length == 0)
-                        {
-                            GroupIdDictionaryFromId.Add(0, "Default");
-                            GroupIdDictionaryFromName.Add("Default", 0);
-                            ss.Add("Default");
-                        }
-                        foreach (DataRow item in dt.Rows)
-                        {
-                            ss.Add(item["name"].ToString());
-                            GroupIdDictionaryFromName.Add(item["name"].ToString(), int.Parse(item["id"].ToString()));
-                            GroupIdDictionaryFromId.Add(int.Parse(item["id"].ToString()), item["name"].ToString());
-                        }
-                        SourceGrid.Cells.Editors.ComboBox GroupIdCBBox = new SourceGrid.Cells.Editors.ComboBox(typeof(string));
-                        GroupIdCBBox.StandardValues = ss;
-                        GroupIdCBBox.EditableMode = SourceGrid.EditableMode.SingleClick | SourceGrid.EditableMode.Focus;
-                        m_Attributes.Grid_Attributes[11, 1] = new SourceGrid.Cells.Cell("Default", GroupIdCBBox);
-                        GroupIdCBBox.Control.DropDownStyle = ComboBoxStyle.DropDownList;        //设置下拉框为不可以编辑的状态
-                    }
-                }
-                //string ConstantsStr = dt.Rows[0][0].ToString();
-                m_dbConnection.Close();
-            }
-            catch (Exception ee)
-            {
-                MessageBox.Show(ee.ToString());
-            }
-        }
-
         //void SetNonexistentGroupsToDefault()
         //{
         //    foreach (KeyValuePair<int, STDdata> kv in STDDictionary)
@@ -1033,5 +989,57 @@ namespace SpectrumSTDEditor
                 return;
             }
         }
+        private void Form_Main_Paint(object sender, PaintEventArgs e)
+        {
+            comboBoxfilter.Location = new Point(ribbonPanel5.GetContentBounds().X+1, ribbonPanel5.GetContentBounds().Y + 1);
+            btnfilter.Location = new Point(ribbonPanel5.GetContentBounds().X + 36, ribbonPanel5.GetContentBounds().Y + 25);
+        }
+
+        private void comboBoxfilter_Enter(object sender, EventArgs e)
+        {
+            comboBoxfilter.Items.Clear();
+            List<string> PeriodicTable =new List<string>();
+            foreach (var item in STDDictionary)
+            {
+                PeriodicTable.Add(item.Value.ChineseName);
+                PeriodicTable.Add(item.Value.StrName);
+            }
+            AutoCompleteStringCollection sc = new AutoCompleteStringCollection();
+            sc.AddRange(PeriodicTable.ToArray());
+            this.comboBoxfilter.AutoCompleteMode = System.Windows.Forms.AutoCompleteMode.SuggestAppend;
+            this.comboBoxfilter.AutoCompleteSource = System.Windows.Forms.AutoCompleteSource.CustomSource;
+            this.comboBoxfilter.AutoCompleteCustomSource = sc;
+        }
+
+        private void comboBoxfilter_SelectedIndexChanged(object sender, EventArgs e)
+        {
+            if (comboBoxfilter.Text.Length > 0)
+            {
+                // 将 SelectionStart 设置为文本的长度,即光标位置移到文本末尾
+                comboBoxfilter.SelectionStart = comboBoxfilter.Text.Length;
+
+                // 如果你想让光标仅仅定位而没有任何文本被选中,保持 SelectionLength 为 0
+                comboBoxfilter.SelectionLength = 0;
+            }
+        }
+
+        private void btnfilter_Click(object sender, EventArgs e)
+        {
+            for (int i = 1; i < m_STDRuleslist.Grid_Minerals.RowsCount; i++)
+            {
+                int id = (int)m_STDRuleslist.Grid_Minerals[i, 0].Tag;
+                if (STDDictionary[id].StrName == comboBoxfilter.Text || STDDictionary[id].ChineseName == comboBoxfilter.Text)
+                {
+                    Position pos = new Position(i, 0);
+                    m_STDRuleslist.Grid_Minerals.Selection.Focus(pos, true);
+                    SaveDataOfSelRule(m_STDRuleslist.PreRow, 0);
+                    ChangeSTDEditorAndGrid_Attributes(id);
+                    m_SubMidWindow.m_ComparativeLibrary.MakeCheckboxUnchecked();
+                    m_STDRuleslist.PreRow = i;
+                }
+                m_STDRuleslist.SetOrderButtonsStatus();
+            }
+        }
+
     }
 }

+ 20 - 20
SpectrumSTDEditor/UI/Form_Main.resx

@@ -121,121 +121,121 @@
   <data name="ribbonOrbMenuItem_Convert.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vwAADr8BOAVTJAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
+        vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="ribbonOrbMenuItem_Convert.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vwAADr8BOAVTJAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
+        vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="ribbonOrbRecentItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
+        vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="ribbonOrbRecentItem1.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
+        vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="ribbonOrbOptionButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
+        vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="ribbonOrbOptionButton1.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
+        vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="ribbonOrbMenuItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
+        vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="ribbonOrbMenuItem1.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
+        vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="ribbonDescriptionMenuItem1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
+        vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="ribbonDescriptionMenuItem1.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
+        vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="ribbonColorChooser1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
+        vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="ribbonColorChooser1.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
+        vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="ribbonOrbMenuItem2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
+        vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="ribbonOrbMenuItem2.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
+        vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="ribbonButton1.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
+        vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="ribbonButton1.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
+        vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="ribbonButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
+        vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="ribbonButton2.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
+        vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
 </value>
   </data>
   <data name="ribbonButton3.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAACAAAAAgCAYAAABzenr0AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
+        vAAADrwBlbxySQAAABpJREFUWEftwQEBAAAAgiD/r25IQAAAAMC5GhAgAAGdeElDAAAAAElFTkSuQmCC
 </value>
   </data>
   <data name="ribbonButton3.SmallImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
         iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO
-        vgAADr4B6kKxwAAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
+        vAAADrwBlbxySQAAABNJREFUOE9jGAWjYBSMAjBgYAAABBAAAadEfGMAAAAASUVORK5CYII=
 </value>
   </data>
 </root>

+ 1 - 1
SpectrumSTDEditor/UI/STDRuleslist.cs

@@ -518,7 +518,7 @@ namespace SpectrumSTDEditor
             //Grid_Minerals.Refresh();
         }
 
-        void SetOrderButtonsStatus()
+        public void SetOrderButtonsStatus()
         {
             Grid_Minerals.Focus();
             int i = Grid_Minerals.Selection.ActivePosition.Row;