Поправили выбор перезагрузки
This commit is contained in:
parent
70453a2840
commit
7a6ecf6a05
|
|
@ -108,9 +108,9 @@ namespace Reseter2
|
||||||
{
|
{
|
||||||
Reseter.AddTask(tb_comp.Text.Trim());
|
Reseter.AddTask(tb_comp.Text.Trim());
|
||||||
tabControl1.SelectedIndex = 0;
|
tabControl1.SelectedIndex = 0;
|
||||||
ListComp.SelectedIndex = -1;
|
|
||||||
StopRefreshSeacher = true;
|
StopRefreshSeacher = true;
|
||||||
tb_comp.Text = "";
|
tb_comp.Text = "";
|
||||||
|
ListComp.SelectedIndex = -1;
|
||||||
ListComp.Items.Clear();
|
ListComp.Items.Clear();
|
||||||
ListComp.Items.Add("Введите запрос");
|
ListComp.Items.Add("Введите запрос");
|
||||||
ListComp.Enabled = false;
|
ListComp.Enabled = false;
|
||||||
|
|
@ -133,9 +133,9 @@ namespace Reseter2
|
||||||
{
|
{
|
||||||
Reseter.AddTask(CompSelected);
|
Reseter.AddTask(CompSelected);
|
||||||
tabControl1.SelectedIndex = 0;
|
tabControl1.SelectedIndex = 0;
|
||||||
ListComp.SelectedIndex = -1;
|
|
||||||
StopRefreshSeacher = true;
|
StopRefreshSeacher = true;
|
||||||
tb_comp.Text = "";
|
tb_comp.Text = "";
|
||||||
|
ListComp.SelectedIndex = -1;
|
||||||
ListComp.Items.Clear();
|
ListComp.Items.Clear();
|
||||||
ListComp.Items.Add("Введите запрос");
|
ListComp.Items.Add("Введите запрос");
|
||||||
ListComp.ItemHeight = 14;
|
ListComp.ItemHeight = 14;
|
||||||
|
|
@ -597,7 +597,16 @@ namespace Reseter2
|
||||||
|
|
||||||
private void ListComp_ChangeIndex(object sender, EventArgs e)
|
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);
|
bt_reset_Click(null, null);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
if (PreSelected >= 0)
|
else if (PreSelected >= 0)
|
||||||
{
|
{
|
||||||
ListComp.SelectedIndex = PreSelected;
|
ListComp.SelectedIndex = PreSelected;
|
||||||
e.SuppressKeyPress = true;
|
e.SuppressKeyPress = true;
|
||||||
|
StopRefreshSeacher = true;
|
||||||
|
CompSelected = SSeaher.seaherMetod.Result(ListComp.SelectedIndex);
|
||||||
|
tb_comp.Text = SSeaher.seaherMetod.ResultString(ListComp.SelectedIndex);
|
||||||
|
StopRefreshSeacher = false;
|
||||||
ListComp.Refresh();
|
ListComp.Refresh();
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -70,10 +70,11 @@
|
||||||
<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
|
<ApplicationManifest>Properties\app.manifest</ApplicationManifest>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<SignAssembly>true</SignAssembly>
|
<SignAssembly>false</SignAssembly>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<AssemblyOriginatorKeyFile>Klavirshik.pfx</AssemblyOriginatorKeyFile>
|
<AssemblyOriginatorKeyFile>
|
||||||
|
</AssemblyOriginatorKeyFile>
|
||||||
</PropertyGroup>
|
</PropertyGroup>
|
||||||
<PropertyGroup>
|
<PropertyGroup>
|
||||||
<ManifestCertificateThumbprint>9A04F507AAE2666E7DAF9DC3357A574132BA2697</ManifestCertificateThumbprint>
|
<ManifestCertificateThumbprint>9A04F507AAE2666E7DAF9DC3357A574132BA2697</ManifestCertificateThumbprint>
|
||||||
|
|
@ -249,7 +250,6 @@
|
||||||
<EmbeddedResource Include="Words\WordsItemControl.resx">
|
<EmbeddedResource Include="Words\WordsItemControl.resx">
|
||||||
<DependentUpon>WordsItemControl.cs</DependentUpon>
|
<DependentUpon>WordsItemControl.cs</DependentUpon>
|
||||||
</EmbeddedResource>
|
</EmbeddedResource>
|
||||||
<None Include="Klavirshik.pfx" />
|
|
||||||
<None Include="Properties\app.manifest" />
|
<None Include="Properties\app.manifest" />
|
||||||
<None Include="Properties\Settings.settings">
|
<None Include="Properties\Settings.settings">
|
||||||
<Generator>SettingsSingleFileGenerator</Generator>
|
<Generator>SettingsSingleFileGenerator</Generator>
|
||||||
|
|
|
||||||
|
|
@ -27,7 +27,7 @@ namespace Reseter2.Seacher
|
||||||
private Mode mode;
|
private Mode mode;
|
||||||
private Timer TimerDisconnect;
|
private Timer TimerDisconnect;
|
||||||
|
|
||||||
private enum Mode{
|
public enum Mode{
|
||||||
PCname,
|
PCname,
|
||||||
Login,
|
Login,
|
||||||
Username
|
Username
|
||||||
|
|
|
||||||
|
|
@ -12,6 +12,7 @@ namespace Reseter2.Seacher
|
||||||
internal delegate void ResultUpdate(List<string> Item, bool eneble, int itemHeight);
|
internal delegate void ResultUpdate(List<string> Item, bool eneble, int itemHeight);
|
||||||
private ResultUpdate Update;
|
private ResultUpdate Update;
|
||||||
private List<IComp> comps = new List<IComp>();
|
private List<IComp> comps = new List<IComp>();
|
||||||
|
private List<string> ResultStr = new List<string>();
|
||||||
private bool enable;
|
private bool enable;
|
||||||
public void Change(ResultUpdate sender, string seach)
|
public void Change(ResultUpdate sender, string seach)
|
||||||
{
|
{
|
||||||
|
|
@ -33,6 +34,7 @@ namespace Reseter2.Seacher
|
||||||
{
|
{
|
||||||
int i = 0;
|
int i = 0;
|
||||||
comps.Clear();
|
comps.Clear();
|
||||||
|
ResultStr.Clear();
|
||||||
List<string> result = new List<string>();
|
List<string> result = new List<string>();
|
||||||
foreach(HistoryItem item in HistoryList.Hitem)
|
foreach(HistoryItem item in HistoryList.Hitem)
|
||||||
{
|
{
|
||||||
|
|
@ -47,6 +49,23 @@ namespace Reseter2.Seacher
|
||||||
{
|
{
|
||||||
result.Add(item.NameNode());
|
result.Add(item.NameNode());
|
||||||
comps.Add(item.GetComp());
|
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;
|
++i;
|
||||||
enable = true;
|
enable = true;
|
||||||
if (i>6) return result;
|
if (i>6) return result;
|
||||||
|
|
@ -69,18 +88,20 @@ namespace Reseter2.Seacher
|
||||||
|
|
||||||
public string ResultString(int index)
|
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];
|
||||||
return buf;
|
//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;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue