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

Что то пошло не так

This commit is contained in:
klavirshik 2024-08-29 02:05:56 +02:00
parent d6b16aa7cf
commit 6af2875ad1
3 changed files with 64 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
Reseter2/Form1.Designer.cs generated
View File

@ -63,7 +63,7 @@
this.label16 = new System.Windows.Forms.Label(); this.label16 = new System.Windows.Forms.Label();
this.cm_words = new System.Windows.Forms.ContextMenuStrip(this.components); this.cm_words = new System.Windows.Forms.ContextMenuStrip(this.components);
this.WordsReboot = new System.Windows.Forms.ToolStripMenuItem(); this.WordsReboot = new System.Windows.Forms.ToolStripMenuItem();
this.cb_comp = new System.Windows.Forms.ComboBox(); this.tb_comp = new System.Windows.Forms.TextBox();
this.checkControl1 = new Reseter2.CheckControl(); this.checkControl1 = new Reseter2.CheckControl();
this.treeView1 = new Reseter2.NewTreeView(); this.treeView1 = new Reseter2.NewTreeView();
this.settingRebootControl1 = new Reseter2.Setting.SettingRebootControl(); this.settingRebootControl1 = new Reseter2.Setting.SettingRebootControl();
@ -431,22 +431,15 @@
this.WordsReboot.Text = "Перезарузить"; this.WordsReboot.Text = "Перезарузить";
this.WordsReboot.Click += new System.EventHandler(this.WordsReboot_Click); this.WordsReboot.Click += new System.EventHandler(this.WordsReboot_Click);
// //
// cb_comp // tb_comp
// //
this.cb_comp.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) this.tb_comp.Location = new System.Drawing.Point(67, 11);
| System.Windows.Forms.AnchorStyles.Right))); this.tb_comp.Name = "tb_comp";
this.cb_comp.DropDownHeight = 100; this.tb_comp.Size = new System.Drawing.Size(210, 20);
this.cb_comp.FormattingEnabled = true; this.tb_comp.TabIndex = 5;
this.cb_comp.ImeMode = System.Windows.Forms.ImeMode.NoControl; this.tb_comp.TextChanged += new System.EventHandler(this.cb_comp_TextUpdate);
this.cb_comp.Items.AddRange(new object[] { this.tb_comp.Enter += new System.EventHandler(this.tb_comp_Enter);
"Введите запрос"}); this.tb_comp.Leave += new System.EventHandler(this.tb_comp_Leave);
this.cb_comp.Location = new System.Drawing.Point(67, 11);
this.cb_comp.MaxDropDownItems = 7;
this.cb_comp.MaxLength = 100;
this.cb_comp.Name = "cb_comp";
this.cb_comp.Size = new System.Drawing.Size(210, 21);
this.cb_comp.TabIndex = 5;
this.cb_comp.TextUpdate += new System.EventHandler(this.cb_comp_TextUpdate);
// //
// checkControl1 // checkControl1
// //
@ -504,7 +497,7 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None; this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.None;
this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink;
this.ClientSize = new System.Drawing.Size(410, 753); this.ClientSize = new System.Drawing.Size(410, 753);
this.Controls.Add(this.cb_comp); this.Controls.Add(this.tb_comp);
this.Controls.Add(this.tabControl1); this.Controls.Add(this.tabControl1);
this.Controls.Add(this.bt_reset); this.Controls.Add(this.bt_reset);
this.Controls.Add(this.label1); this.Controls.Add(this.label1);
@ -565,7 +558,6 @@
private Setting.SettingWordsControl settingWordsControl1; private Setting.SettingWordsControl settingWordsControl1;
private Setting.SettingRebootControl settingRebootControl1; private Setting.SettingRebootControl settingRebootControl1;
private Setting.SettingSCCMControl settingSCCMControl1; private Setting.SettingSCCMControl settingSCCMControl1;
private System.Windows.Forms.ComboBox cb_comp;
private System.Windows.Forms.StatusStrip statusStrip1; private System.Windows.Forms.StatusStrip statusStrip1;
private System.Windows.Forms.ToolStripStatusLabel ss_activ; private System.Windows.Forms.ToolStripStatusLabel ss_activ;
private System.Windows.Forms.ToolStripStatusLabel ss_close; private System.Windows.Forms.ToolStripStatusLabel ss_close;
@ -573,6 +565,7 @@
private System.Windows.Forms.Button button2; private System.Windows.Forms.Button button2;
private System.Windows.Forms.ContextMenuStrip cm_words; private System.Windows.Forms.ContextMenuStrip cm_words;
private System.Windows.Forms.ToolStripMenuItem WordsReboot; private System.Windows.Forms.ToolStripMenuItem WordsReboot;
private System.Windows.Forms.TextBox tb_comp;
} }
} }

66
Reseter2/Form1.cs
View File

@ -22,6 +22,7 @@ namespace Reseter2
{ {
//private FormHistory formHistory; //private FormHistory formHistory;
//System.Windows.Forms.CheckBox //System.Windows.Forms.CheckBox
private System.Windows.Forms.ListBox listBox;
private bool unSave; private bool unSave;
private bool FocusContext; private bool FocusContext;
private object selectItem; private object selectItem;
@ -56,9 +57,22 @@ namespace Reseter2
SGlobalSetting.LoadSetting(); SGlobalSetting.LoadSetting();
WordsList.MainCategory = SGlobalSetting.LoadWords(); WordsList.MainCategory = SGlobalSetting.LoadWords();
this.listBox = new ListBox();
this.Controls.Add(listBox);
// this.listBox.
InitializeComponent(); InitializeComponent();
this.listBox.Location = new Point(tb_comp.Location.X, tb_comp.Location.Y+ tb_comp.Height);
this.listBox.Width = tb_comp.Width;
this.listBox.Height = tb_comp.Height*5;
this.listBox.Items.Add("Введите строку");
this.listBox.Leave += tb_comp_Leave;
this.listBox.Enter += tb_comp_Enter;
this.listBox.Visible = false;
this.Save += settingWordsControl1.Save; this.Save += settingWordsControl1.Save;
this.Save += settingSCCMControl1.Save; this.Save += settingSCCMControl1.Save;
this.Save += settingRebootControl1.Save; this.Save += settingRebootControl1.Save;
@ -97,16 +111,16 @@ namespace Reseter2
private void bt_reset_Click(object sender, EventArgs e) private void bt_reset_Click(object sender, EventArgs e)
{ {
if(cb_comp.SelectedIndex < 0) //if(cb_comp.SelectedIndex < 0)
{ //{
Reseter.AddTask(cb_comp.Text); // Reseter.AddTask(cb_comp.Text);
} //}
else //else
{ //{
Reseter.AddTask(SSeaher.seaherMetod.Result(cb_comp.SelectedIndex)); // Reseter.AddTask(SSeaher.seaherMetod.Result(cb_comp.SelectedIndex));
} //}
cb_comp.SelectedIndex = -1; //cb_comp.SelectedIndex = -1;
cb_comp.Text = ""; //cb_comp.Text = "";
tabControl1.SelectedIndex = 0; tabControl1.SelectedIndex = 0;
@ -546,18 +560,32 @@ namespace Reseter2
} }
public void cb_comp_ResultUpdate(List<string> Items) public void cb_comp_ResultUpdate(List<string> Items)
{ {
if(cb_comp.Items.Count != Items.Count) cb_comp.DroppedDown = false; //if (Items.Count > 0)
cb_comp.Items.Clear();
cb_comp.Items.AddRange(Items.ToArray());
// cb_comp.AutoCompleteCustomSource.Clear();
// cb_comp.AutoCompleteCustomSource.AddRange(Items.ToArray());
// cb_comp.AutoCompleteMode = AutoCompleteMode.None; //if(cb_comp.Items.Count != Items.Count) cb_comp.DroppedDown = false;
cb_comp.SelectionStart = cb_comp.Text.Length; // cb_comp.Items.Clear();
cb_comp.DroppedDown = true; // cb_comp.Items.AddRange(Items.ToArray());
cb_comp.SelectedIndex = -1; //cb_comp.AutoCompleteCustomSource.Clear();
//// cb_comp.AutoCompleteCustomSource.AddRange(Items.ToArray());
// // cb_comp.AutoCompleteMode = AutoCompleteMode.None;
// cb_comp.SelectionStart = cb_comp.Text.Length;
// cb_comp.DroppedDown = true;
// cb_comp.SelectedIndex = -1;
} }
private void tb_comp_Leave(object sender, EventArgs e)
{
if(listBox.Focused || tb_comp.Focused) listBox.Visible = false;
}
private void tb_comp_Enter(object sender, EventArgs e)
{
listBox.Visible = true;
}
} }
} }

12
Reseter2/Form1.resx
View File

@ -121,17 +121,17 @@
<value>122, 17</value> <value>122, 17</value>
</metadata> </metadata>
<metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="statusStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>645, 17</value> <value>654, 17</value>
</metadata> </metadata>
<metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="imageList1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>425, 17</value> <value>434, 17</value>
</metadata> </metadata>
<data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64"> <data name="imageList1.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
<value> <value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACk ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACk
UQAAAk1TRnQBSQFMAgEBCQEAAegBBAHoAQQBGAEAARgBAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAFg UQAAAk1TRnQBSQFMAgEBCQEAAZABBQGQAQUBGAEAARgBAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAFg
AwABSAMAAQEBAAEQBgABNhIAAf8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/ 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/ 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/ Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/
@ -483,14 +483,14 @@
</value> </value>
</data> </data>
<metadata name="imageList2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="imageList2.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>535, 17</value> <value>544, 17</value>
</metadata> </metadata>
<data name="imageList2.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64"> <data name="imageList2.ImageStream" mimetype="application/x-microsoft.net.object.binary.base64">
<value> <value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABQ ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABQ
CgAAAk1TRnQBSQFMAgEBAwEAAYgBAwGIAQMBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo CgAAAk1TRnQBSQFMAgEBAwEAATABBAEwAQQBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
@ -541,7 +541,7 @@
<value>209, 17</value> <value>209, 17</value>
</metadata> </metadata>
<metadata name="cm_words.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a"> <metadata name="cm_words.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>761, 17</value> <value>770, 17</value>
</metadata> </metadata>
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" /> <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64"> <data name="$this.Icon" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">