Reseter2/Form1.Designer.cs

@@ -496,7 +496,7 @@
             this.label18.Name = "label18";
             this.label18.Size = new System.Drawing.Size(62, 13);
             this.label18.TabIndex = 4;
-            this.label18.Text = "Версия 2.1";
+            this.label18.Text = "Версия 2.0";
             // 
             // label17
             // 

Reseter2/Form1.cs

@@ -108,9 +108,9 @@ namespace Reseter2
                     {
                         Reseter.AddTask(tb_comp.Text.Trim());
                         tabControl1.SelectedIndex = 0;
+                        ListComp.SelectedIndex = -1;
                         StopRefreshSeacher = true;
                         tb_comp.Text = "";
-                        ListComp.SelectedIndex = -1;
                         ListComp.Items.Clear();
                         ListComp.Items.Add("Введите запрос");
                         ListComp.Enabled = false;
@@ -133,9 +133,9 @@ namespace Reseter2
                 {
                     Reseter.AddTask(CompSelected);
                     tabControl1.SelectedIndex = 0;
+                    ListComp.SelectedIndex = -1;
                     StopRefreshSeacher = true;
                     tb_comp.Text = "";
-                    ListComp.SelectedIndex = -1;
                     ListComp.Items.Clear();
                     ListComp.Items.Add("Введите запрос");
                     ListComp.ItemHeight = 14;
@@ -597,17 +597,7 @@ namespace Reseter2
 
         private void ListComp_ChangeIndex(object sender, EventArgs e)
         {
-            if(ListComp.SelectedIndex > -1)
+
-            { 
-                StopRefreshSeacher = true;
-                CompSelected = SSeaher.seaherMetod.Result(ListComp.SelectedIndex);
-                tb_comp.Text = SSeaher.seaherMetod.ResultString(ListComp.SelectedIndex);
-                tb_comp.SelectionStart = tb_comp.Text.Length;
-                PreSelected = ListComp.SelectedIndex;
-                ListComp.Refresh();
-                StopRefreshSeacher = false;
-            }
-           
         }
 
 
@@ -684,14 +674,10 @@ namespace Reseter2
                         bt_reset_Click(null, null);
                         break;
                     }
-                    else if (PreSelected >= 0)
+                    if (PreSelected >= 0)
                     {
                         ListComp.SelectedIndex = PreSelected;
                         e.SuppressKeyPress = true;
-                        StopRefreshSeacher = true;
-                        CompSelected = SSeaher.seaherMetod.Result(ListComp.SelectedIndex);
-                        tb_comp.Text = SSeaher.seaherMetod.ResultString(ListComp.SelectedIndex);
-                        StopRefreshSeacher = false;
                         ListComp.Refresh();
 
                     }

Reseter2/Form1.resx

@@ -131,7 +131,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACk
-        UQAAAk1TRnQBSQFMAgEBCQEAAYgBBwGIAQcBGAEAARgBAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAFg
+        UQAAAk1TRnQBSQFMAgEBCQEAAYABBwGAAQcBGAEAARgBAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAFg
         AwABSAMAAQEBAAEQBgABNhIAAf8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/
         AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/kAAB/wF/
         Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/
@@ -490,7 +490,7 @@
         AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
         LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
         ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABQ
-        CgAAAk1TRnQBSQFMAgEBAwEAASgBBgEoAQYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CgAAAk1TRnQBSQFMAgEBAwEAASABBgEgAQYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
         AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
         AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
         AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA

Reseter2/Reseter2.csproj

@@ -23,10 +23,9 @@
     <UpdatePeriodically>false</UpdatePeriodically>
     <UpdateRequired>false</UpdateRequired>
     <MapFileExtensions>true</MapFileExtensions>
-    <ApplicationRevision>0</ApplicationRevision>
+    <ApplicationRevision>1</ApplicationRevision>
-    <ApplicationVersion>2.1.0.%2a</ApplicationVersion>
+    <ApplicationVersion>2.0.0.%2a</ApplicationVersion>
     <UseApplicationTrust>false</UseApplicationTrust>
-    <PublishWizardCompleted>true</PublishWizardCompleted>
     <BootstrapperEnabled>true</BootstrapperEnabled>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
@@ -65,17 +64,16 @@
     <TargetZone>LocalIntranet</TargetZone>
   </PropertyGroup>
   <PropertyGroup>
-    <GenerateManifests>true</GenerateManifests>
+    <GenerateManifests>false</GenerateManifests>
   </PropertyGroup>
   <PropertyGroup>
     <ApplicationManifest>Properties\app.manifest</ApplicationManifest>
   </PropertyGroup>
   <PropertyGroup>
-    <SignAssembly>false</SignAssembly>
+    <SignAssembly>true</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>Klavirshik.pfx</AssemblyOriginatorKeyFile>
-    </AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <PropertyGroup>
     <ManifestCertificateThumbprint>9A04F507AAE2666E7DAF9DC3357A574132BA2697</ManifestCertificateThumbprint>
@@ -251,6 +249,7 @@
     <EmbeddedResource Include="Words\WordsItemControl.resx">
       <DependentUpon>WordsItemControl.cs</DependentUpon>
     </EmbeddedResource>
+    <None Include="Klavirshik.pfx" />
     <None Include="Properties\app.manifest" />
     <None Include="Properties\Settings.settings">
       <Generator>SettingsSingleFileGenerator</Generator>

Reseter2/Seacher/SeachSCCM.cs

@@ -27,7 +27,7 @@ namespace Reseter2.Seacher
         private Mode mode;
         private Timer TimerDisconnect;
 
-        public enum Mode{
+        private enum Mode{
             PCname,
             Login,
             Username

Reseter2/Seacher/SeahcLocal.cs

@@ -12,7 +12,6 @@ namespace Reseter2.Seacher
         internal delegate void ResultUpdate(List<string> Item, bool eneble, int itemHeight);
         private ResultUpdate Update;
         private List<IComp> comps = new List<IComp>();
-        private List<string> ResultStr = new List<string>();
         private bool enable;
         public void Change(ResultUpdate sender, string seach)
         {
@@ -34,7 +33,6 @@ namespace Reseter2.Seacher
         {
             int i = 0;
             comps.Clear();
-            ResultStr.Clear();
             List<string> result = new List<string>();
             foreach(HistoryItem item in HistoryList.Hitem)
             {
@@ -49,23 +47,6 @@ namespace Reseter2.Seacher
                     {
                         result.Add(item.NameNode());
                         comps.Add(item.GetComp());
-                        int razdelitel = item.NameNode().IndexOf('(');
-                        if (razdelitel != -1)
-                        {
-                            int beginString = item.NameNode().ToUpper().IndexOf(seach.ToUpper());
-                            if (razdelitel < beginString)
-                            {
-                                ResultStr.Add(item.NameNode().Substring(razdelitel + 1, item.NameNode().Length - razdelitel - 2));
-                            }
-                            else
-                            {
-                                ResultStr.Add(item.NameNode().Substring(0, razdelitel));
-                            }
-                        }
-                        else
-                        {
-                            ResultStr.Add(item.NameNode());
-                        }
                         ++i;
                         enable = true;
                         if (i>6) return result;
@@ -88,20 +69,18 @@ namespace Reseter2.Seacher
 
         public string ResultString(int index)
         {
+            string buf;
+            if (comps[index].GetName() == null)
+            {
+                buf = comps[index].GetNetNameStr();
+            }
+            else
+            {
+                buf = comps[index].GetName();
+                if (comps[index].GetNetNameStr() != null) buf += "(" + comps[index].GetNetNameStr() + ")";
 
-            return ResultStr[index];
+            }
-            //string buf;
+            return buf;
-            //if (comps[index].GetName() == null)
-            //{
-            //    buf = comps[index].GetNetNameStr();
-            //}
-            //else
-            //{
-            //    buf = comps[index].GetName();
-            //    if (comps[index].GetNetNameStr() != null) buf += "(" + comps[index].GetNetNameStr() + ")";
-
-            //}
-            //return buf;
         }
     }
 }