tester
/
Reseter2
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 1 Wiki Activity

Поправили выбор перезагрузки

This commit is contained in:
klavirshik 2024-10-08 01:02:03 +02:00
parent 70453a2840
commit 7a6ecf6a05
4 changed files with 53 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
Reseter2/Form1.cs
View File

@ -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,7 +597,16 @@ 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);
PreSelected = ListComp.SelectedIndex;
ListComp.Refresh();
StopRefreshSeacher = false;
}
}
@ -674,10 +683,14 @@ namespace Reseter2
bt_reset_Click(null, null);
break;
}
if (PreSelected >= 0)
else 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();
}

6
Reseter2/Reseter2.csproj
View File

@ -70,10 +70,11 @@
<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
</PropertyGroup>
<PropertyGroup>
<SignAssembly>true</SignAssembly>
<SignAssembly>false</SignAssembly>
</PropertyGroup>
<PropertyGroup>
<AssemblyOriginatorKeyFile>Klavirshik.pfx</AssemblyOriginatorKeyFile>
<AssemblyOriginatorKeyFile>
</AssemblyOriginatorKeyFile>
</PropertyGroup>
<PropertyGroup>
<ManifestCertificateThumbprint>9A04F507AAE2666E7DAF9DC3357A574132BA2697</ManifestCertificateThumbprint>
@ -249,7 +250,6 @@
<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>

2
Reseter2/Seacher/SeachSCCM.cs
View File

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

43
Reseter2/Seacher/SeahcLocal.cs
View File

@ -12,6 +12,7 @@ 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)
{
@ -33,6 +34,7 @@ namespace Reseter2.Seacher
{
int i = 0;
comps.Clear();
ResultStr.Clear();
List<string> result = new List<string>();
foreach(HistoryItem item in HistoryList.Hitem)
{
@ -47,6 +49,23 @@ 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;
@ -69,18 +88,20 @@ 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 buf;
return ResultStr[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 buf;
}
}
}