diff --git a/Reseter2/Form1.Designer.cs b/Reseter2/Form1.Designer.cs index 0970ba8..0995368 100644 --- a/Reseter2/Form1.Designer.cs +++ b/Reseter2/Form1.Designer.cs @@ -44,8 +44,6 @@ this.tabPage2 = new System.Windows.Forms.TabPage(); this.label2 = new System.Windows.Forms.Label(); this.bt_resetAll = new System.Windows.Forms.Button(); - this.checkControl1 = new Reseter2.CheckControl(); - this.treeView1 = new Reseter2.NewTreeView(); this.imageList1 = new System.Windows.Forms.ImageList(this.components); this.imageList2 = new System.Windows.Forms.ImageList(this.components); this.tabPage3 = new System.Windows.Forms.TabPage(); @@ -59,11 +57,12 @@ this.sm_RebootItem = new System.Windows.Forms.ToolStripMenuItem(); this.sm_SaveItem = new System.Windows.Forms.ToolStripMenuItem(); this.tabPage4 = new System.Windows.Forms.TabPage(); - this.settingRebootControl1 = new Reseter2.Setting.SettingRebootControl(); - this.settingSCCMControl1 = new Reseter2.Setting.SettingSCCMControl(); - this.settingWordsControl1 = new Reseter2.Setting.SettingWordsControl(); this.button4 = new System.Windows.Forms.Button(); this.tabPage5 = new System.Windows.Forms.TabPage(); + this.label20 = new System.Windows.Forms.Label(); + this.label19 = new System.Windows.Forms.Label(); + this.label18 = new System.Windows.Forms.Label(); + this.label17 = new System.Windows.Forms.Label(); this.groupBox1 = new System.Windows.Forms.GroupBox(); this.label15 = new System.Windows.Forms.Label(); this.label14 = new System.Windows.Forms.Label(); @@ -79,10 +78,12 @@ this.cm_words = new System.Windows.Forms.ContextMenuStrip(this.components); this.WordsReboot = new System.Windows.Forms.ToolStripMenuItem(); this.tb_comp = new System.Windows.Forms.TextBox(); - this.label17 = new System.Windows.Forms.Label(); - this.label18 = new System.Windows.Forms.Label(); - this.label19 = new System.Windows.Forms.Label(); - this.label20 = new System.Windows.Forms.Label(); + this.checkControl1 = new Reseter2.CheckControl(); + this.treeView1 = new Reseter2.NewTreeView(); + this.settingRebootControl1 = new Reseter2.Setting.SettingRebootControl(); + this.settingSCCMControl1 = new Reseter2.Setting.SettingSCCMControl(); + this.settingWordsControl1 = new Reseter2.Setting.SettingWordsControl(); + this.WordsCopy = new System.Windows.Forms.ToolStripMenuItem(); this.tabControl1.SuspendLayout(); this.tabPage1.SuspendLayout(); this.statusStrip1.SuspendLayout(); @@ -247,35 +248,6 @@ this.bt_resetAll.UseVisualStyleBackColor = false; this.bt_resetAll.Click += new System.EventHandler(this.bt_resetAll_Click); // - // checkControl1 - // - this.checkControl1.Location = new System.Drawing.Point(14, 7); - this.checkControl1.Name = "checkControl1"; - this.checkControl1.Size = new System.Drawing.Size(18, 18); - this.checkControl1.TabIndex = 2; - // - // treeView1 - // - this.treeView1.Dock = System.Windows.Forms.DockStyle.Bottom; - this.treeView1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.treeView1.HideSelection = false; - this.treeView1.ImageIndex = 0; - this.treeView1.ImageList = this.imageList1; - this.treeView1.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.treeView1.Indent = 27; - this.treeView1.ItemHeight = 24; - this.treeView1.Location = new System.Drawing.Point(3, 32); - this.treeView1.Name = "treeView1"; - this.treeView1.SelectedImageIndex = 0; - this.treeView1.ShowLines = false; - this.treeView1.ShowNodeToolTips = true; - this.treeView1.Size = new System.Drawing.Size(396, 653); - this.treeView1.StateImageList = this.imageList2; - this.treeView1.TabIndex = 0; - this.treeView1.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterCheck); - this.treeView1.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.treeView1_NodeMouseClick); - this.treeView1.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.treeView1_NodeMouseDoubleClick); - // // imageList1 // this.imageList1.ImageStream = ((System.Windows.Forms.ImageListStreamer)(resources.GetObject("imageList1.ImageStream"))); @@ -327,40 +299,40 @@ // label6 // this.label6.AutoSize = true; - this.label6.Font = new System.Drawing.Font("Cascadia Code", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.label6.Location = new System.Drawing.Point(327, 3); + this.label6.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F); + this.label6.Location = new System.Drawing.Point(327, 5); this.label6.Name = "label6"; - this.label6.Size = new System.Drawing.Size(37, 15); + this.label6.Size = new System.Drawing.Size(38, 13); this.label6.TabIndex = 5; this.label6.Text = "Конец"; // // label5 // this.label5.AutoSize = true; - this.label5.Font = new System.Drawing.Font("Cascadia Code", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.label5.Location = new System.Drawing.Point(269, 3); + this.label5.Font = new System.Drawing.Font("Consolas", 8.25F); + this.label5.Location = new System.Drawing.Point(269, 5); this.label5.Name = "label5"; - this.label5.Size = new System.Drawing.Size(43, 15); + this.label5.Size = new System.Drawing.Size(43, 13); this.label5.TabIndex = 4; this.label5.Text = "Статус"; // // label4 // this.label4.AutoSize = true; - this.label4.Font = new System.Drawing.Font("Cascadia Code", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.label4.Location = new System.Drawing.Point(112, 3); + this.label4.Font = new System.Drawing.Font("Consolas", 8.25F); + this.label4.Location = new System.Drawing.Point(112, 5); this.label4.Name = "label4"; - this.label4.Size = new System.Drawing.Size(25, 15); + this.label4.Size = new System.Drawing.Size(25, 13); this.label4.TabIndex = 3; this.label4.Text = "Имя"; // // label3 // this.label3.AutoSize = true; - this.label3.Font = new System.Drawing.Font("Cascadia Code", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.label3.Location = new System.Drawing.Point(3, 3); + this.label3.Font = new System.Drawing.Font("Consolas", 8.25F); + this.label3.Location = new System.Drawing.Point(3, 5); this.label3.Name = "label3"; - this.label3.Size = new System.Drawing.Size(79, 15); + this.label3.Size = new System.Drawing.Size(79, 13); this.label3.TabIndex = 2; this.label3.Text = "Время старта"; // @@ -369,12 +341,11 @@ this.lb_history.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.lb_history.ContextMenuStrip = this.cm_history; - this.lb_history.Font = new System.Drawing.Font("Cascadia Code", 8.25F); + this.lb_history.Font = new System.Drawing.Font("Consolas", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(0))); this.lb_history.FormattingEnabled = true; - this.lb_history.ItemHeight = 15; this.lb_history.Location = new System.Drawing.Point(3, 21); this.lb_history.Name = "lb_history"; - this.lb_history.Size = new System.Drawing.Size(396, 634); + this.lb_history.Size = new System.Drawing.Size(396, 628); this.lb_history.TabIndex = 0; this.lb_history.MouseDown += new System.Windows.Forms.MouseEventHandler(this.lb_history_MouseDown); this.lb_history.MouseLeave += new System.EventHandler(this.lb_history_MouseLeave); @@ -421,27 +392,6 @@ this.tabPage4.Text = "Настройки"; this.tabPage4.UseVisualStyleBackColor = true; // - // settingRebootControl1 - // - this.settingRebootControl1.Location = new System.Drawing.Point(6, 299); - this.settingRebootControl1.Name = "settingRebootControl1"; - this.settingRebootControl1.Size = new System.Drawing.Size(391, 130); - this.settingRebootControl1.TabIndex = 7; - // - // settingSCCMControl1 - // - this.settingSCCMControl1.Location = new System.Drawing.Point(6, 115); - this.settingSCCMControl1.Name = "settingSCCMControl1"; - this.settingSCCMControl1.Size = new System.Drawing.Size(391, 178); - this.settingSCCMControl1.TabIndex = 6; - // - // settingWordsControl1 - // - this.settingWordsControl1.Location = new System.Drawing.Point(6, 6); - this.settingWordsControl1.Name = "settingWordsControl1"; - this.settingWordsControl1.Size = new System.Drawing.Size(391, 103); - this.settingWordsControl1.TabIndex = 5; - // // button4 // this.button4.Location = new System.Drawing.Point(317, 435); @@ -469,6 +419,44 @@ this.tabPage5.Text = "О программе"; this.tabPage5.UseVisualStyleBackColor = true; // + // label20 + // + this.label20.AutoSize = true; + this.label20.Location = new System.Drawing.Point(6, 640); + this.label20.Name = "label20"; + this.label20.Size = new System.Drawing.Size(159, 39); + this.label20.TabIndex = 6; + this.label20.Text = "Цензура, идеи, тестирование \r\nИлюхин Георгий Николаевич \r\ngeorgii.iliukhin@gmail." + + "com"; + // + // label19 + // + this.label19.AutoSize = true; + this.label19.Location = new System.Drawing.Point(222, 640); + this.label19.Name = "label19"; + this.label19.Size = new System.Drawing.Size(170, 39); + this.label19.TabIndex = 5; + this.label19.Text = "Разработка\r\nСимаков Владимир Михайлович\r\nklavirshik@yandex.ru"; + this.label19.TextAlign = System.Drawing.ContentAlignment.TopRight; + // + // label18 + // + this.label18.AutoSize = true; + this.label18.Location = new System.Drawing.Point(6, 221); + this.label18.Name = "label18"; + this.label18.Size = new System.Drawing.Size(62, 13); + this.label18.TabIndex = 4; + this.label18.Text = "Версия 2.0"; + // + // label17 + // + this.label17.AutoSize = true; + this.label17.Location = new System.Drawing.Point(6, 208); + this.label17.Name = "label17"; + this.label17.Size = new System.Drawing.Size(325, 13); + this.label17.TabIndex = 3; + this.label17.Text = "Многопоточная перезагрузка рабочих станций на ОС Windows"; + // // groupBox1 // this.groupBox1.Controls.Add(this.label15); @@ -573,7 +561,7 @@ // this.pictureBox1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.pictureBox1.Image = ((System.Drawing.Image)(resources.GetObject("pictureBox1.Image"))); - this.pictureBox1.Location = new System.Drawing.Point(153, 6); + this.pictureBox1.Location = new System.Drawing.Point(153, 44); this.pictureBox1.Name = "pictureBox1"; this.pictureBox1.Size = new System.Drawing.Size(96, 96); this.pictureBox1.TabIndex = 1; @@ -582,7 +570,7 @@ // label16 // this.label16.AutoSize = true; - this.label16.Location = new System.Drawing.Point(6, 122); + this.label16.Location = new System.Drawing.Point(6, 195); this.label16.Name = "label16"; this.label16.Size = new System.Drawing.Size(50, 13); this.label16.TabIndex = 0; @@ -591,15 +579,16 @@ // cm_words // this.cm_words.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.WordsReboot}); + this.WordsReboot, + this.WordsCopy}); this.cm_words.Name = "cm_words"; this.cm_words.ShowImageMargin = false; - this.cm_words.Size = new System.Drawing.Size(125, 26); + this.cm_words.Size = new System.Drawing.Size(169, 70); // // WordsReboot // this.WordsReboot.Name = "WordsReboot"; - this.WordsReboot.Size = new System.Drawing.Size(124, 22); + this.WordsReboot.Size = new System.Drawing.Size(168, 22); this.WordsReboot.Text = "Перезарузить"; this.WordsReboot.Click += new System.EventHandler(this.WordsReboot_Click); // @@ -615,43 +604,62 @@ this.tb_comp.Enter += new System.EventHandler(this.tb_comp_Enter); this.tb_comp.KeyDown += new System.Windows.Forms.KeyEventHandler(this.tb_comp_KeyDown); // - // label17 + // checkControl1 // - this.label17.AutoSize = true; - this.label17.Location = new System.Drawing.Point(6, 135); - this.label17.Name = "label17"; - this.label17.Size = new System.Drawing.Size(325, 13); - this.label17.TabIndex = 3; - this.label17.Text = "Многопоточная перезагрузка рабочих станций на ОС Windows"; + this.checkControl1.Location = new System.Drawing.Point(14, 7); + this.checkControl1.Name = "checkControl1"; + this.checkControl1.Size = new System.Drawing.Size(18, 18); + this.checkControl1.TabIndex = 2; // - // label18 + // treeView1 // - this.label18.AutoSize = true; - this.label18.Location = new System.Drawing.Point(6, 148); - this.label18.Name = "label18"; - this.label18.Size = new System.Drawing.Size(62, 13); - this.label18.TabIndex = 4; - this.label18.Text = "Версия 2.0"; + this.treeView1.Dock = System.Windows.Forms.DockStyle.Bottom; + this.treeView1.Font = new System.Drawing.Font("Microsoft Sans Serif", 12F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.treeView1.HideSelection = false; + this.treeView1.ImageIndex = 0; + this.treeView1.ImageList = this.imageList1; + this.treeView1.ImeMode = System.Windows.Forms.ImeMode.NoControl; + this.treeView1.Indent = 27; + this.treeView1.ItemHeight = 24; + this.treeView1.Location = new System.Drawing.Point(3, 32); + this.treeView1.Name = "treeView1"; + this.treeView1.SelectedImageIndex = 0; + this.treeView1.ShowLines = false; + this.treeView1.ShowNodeToolTips = true; + this.treeView1.Size = new System.Drawing.Size(396, 653); + this.treeView1.StateImageList = this.imageList2; + this.treeView1.TabIndex = 0; + this.treeView1.AfterCheck += new System.Windows.Forms.TreeViewEventHandler(this.treeView1_AfterCheck); + this.treeView1.NodeMouseClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.treeView1_NodeMouseClick); + this.treeView1.NodeMouseDoubleClick += new System.Windows.Forms.TreeNodeMouseClickEventHandler(this.treeView1_NodeMouseDoubleClick); // - // label19 + // settingRebootControl1 // - this.label19.AutoSize = true; - this.label19.Location = new System.Drawing.Point(222, 640); - this.label19.Name = "label19"; - this.label19.Size = new System.Drawing.Size(170, 39); - this.label19.TabIndex = 5; - this.label19.Text = "Разработка\r\nСимаков Владимир Михайлович\r\nklavirshik@yandex.ru"; - this.label19.TextAlign = System.Drawing.ContentAlignment.TopRight; + this.settingRebootControl1.Location = new System.Drawing.Point(6, 299); + this.settingRebootControl1.Name = "settingRebootControl1"; + this.settingRebootControl1.Size = new System.Drawing.Size(391, 130); + this.settingRebootControl1.TabIndex = 7; // - // label20 + // settingSCCMControl1 // - this.label20.AutoSize = true; - this.label20.Location = new System.Drawing.Point(6, 640); - this.label20.Name = "label20"; - this.label20.Size = new System.Drawing.Size(159, 39); - this.label20.TabIndex = 6; - this.label20.Text = "Цензура, идеи, тестирование \r\nИлюхин Георгий Николаевич \r\ngeorgii.iliukhin@gmail." + - "com"; + this.settingSCCMControl1.Location = new System.Drawing.Point(6, 115); + this.settingSCCMControl1.Name = "settingSCCMControl1"; + this.settingSCCMControl1.Size = new System.Drawing.Size(391, 178); + this.settingSCCMControl1.TabIndex = 6; + // + // settingWordsControl1 + // + this.settingWordsControl1.Location = new System.Drawing.Point(6, 6); + this.settingWordsControl1.Name = "settingWordsControl1"; + this.settingWordsControl1.Size = new System.Drawing.Size(391, 103); + this.settingWordsControl1.TabIndex = 5; + // + // WordsCopy + // + this.WordsCopy.Name = "WordsCopy"; + this.WordsCopy.Size = new System.Drawing.Size(168, 22); + this.WordsCopy.Text = "Скопировать в буфер"; + this.WordsCopy.Click += new System.EventHandler(this.WordsCopy_Click); // // Form1 // @@ -663,6 +671,7 @@ this.Controls.Add(this.bt_reset); this.Controls.Add(this.label1); this.Icon = ((System.Drawing.Icon)(resources.GetObject("$this.Icon"))); + this.MaximizeBox = false; this.Name = "Form1"; this.Text = "Reseter2"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing); @@ -743,6 +752,7 @@ private System.Windows.Forms.Label label17; private System.Windows.Forms.Label label19; private System.Windows.Forms.Label label20; + private System.Windows.Forms.ToolStripMenuItem WordsCopy; } } diff --git a/Reseter2/Form1.cs b/Reseter2/Form1.cs index bc11afa..32cf963 100644 --- a/Reseter2/Form1.cs +++ b/Reseter2/Form1.cs @@ -191,8 +191,14 @@ namespace Reseter2 { if (selectItem is HistoryItem historyItem) { - Reseter.AddTask(historyItem.GetComp()); - tabControl1.SelectedIndex = 0; + DialogResult result = MessageBox.Show("Перезагрузить ПК: " + historyItem.GetComp().GetNetNameStr(), "Создание новой задачи", MessageBoxButtons.YesNo, MessageBoxIcon.Warning); + if (result == DialogResult.Yes) + { + Reseter.AddTask(historyItem.GetComp()); + tabControl1.SelectedIndex = 0; + + } + } } @@ -591,22 +597,7 @@ namespace Reseter2 private void ListComp_ChangeIndex(object sender, EventArgs e) { - if(ListComp.SelectedIndex < 0) - { - CompSelected = null; - } - else - { - CompSelected = SSeaher.seaherMetod.Result(ListComp.SelectedIndex); - PreSelected = ListComp.SelectedIndex; - // Console.WriteLine(ListComp.SelectedItem.ToString()); - StopRefreshSeacher = true; - tb_comp.Text = SSeaher.seaherMetod.ResultString(ListComp.SelectedIndex); - StopRefreshSeacher = false; - ListComp.Refresh(); - } - - + } @@ -701,6 +692,16 @@ namespace Reseter2 { } + + private void WordsCopy_Click(object sender, EventArgs e) + { + if (treeView1.SelectedNode.Tag is WordsComp) + { + WordsComp wordsComp = (WordsComp)treeView1.SelectedNode.Tag; + + Clipboard.SetText(wordsComp.GetNetName()); + } + } } } diff --git a/Reseter2/Form1.resx b/Reseter2/Form1.resx index 29031fa..a262f07 100644 --- a/Reseter2/Form1.resx +++ b/Reseter2/Form1.resx @@ -131,7 +131,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACk - UQAAAk1TRnQBSQFMAgEBCQEAAcABBgHAAQYBGAEAARgBAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAFg + UQAAAk1TRnQBSQFMAgEBCQEAAXgBBwF4AQcBGAEAARgBAAT/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 - CgAAAk1TRnQBSQFMAgEBAwEAAWABBQFgAQUBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo + CgAAAk1TRnQBSQFMAgEBAwEAARgBBgEYAQYBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5 AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA @@ -544,7 +544,7 @@ iVBORw0KGgoAAAANSUhEUgAAAGAAAABgCAYAAADimHc4AAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wwAADsMBx2+oZAAAGiBJREFUeF7tXQlwXdV5fl7wbsu2ZBloOmSAQknjNJ2BdmIgBrxgW7Il2Vq9YBvb + vAAADrwBlbxySQAAGiBJREFUeF7tXQlwXdV5fl7wbsu2ZBloOmSAQknjNJ2BdmIgBrxgW7Il2Vq9YBvb GENjDKbQGWgIBUIpDpDgZJq0hoRQw4QklJbNYAe8gxd51b7LWr3LkqWnxf77f+ee/73z7rv36Um6MjjW P/Pp3Hvfucv5vrP89yxXPvqqrb6M6NBmos/eIHpvLdFbTxL91yqiVxcTrU0jenYm0WO3EP3jjUQP/hXR yuuIVnyTaPlfEi292gK2cQy/IQ7i4hyci2vgWusfItrA18Y9cC/cE/f+iu3iCOBvItq/keidZ4lemU+0 diff --git a/Reseter2/Properties/app.manifest b/Reseter2/Properties/app.manifest new file mode 100644 index 0000000..3d38900 --- /dev/null +++ b/Reseter2/Properties/app.manifest @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Reseter2/ReseteTask.cs b/Reseter2/ReseteTask.cs index 88fe8f2..d26cb9e 100644 --- a/Reseter2/ReseteTask.cs +++ b/Reseter2/ReseteTask.cs @@ -66,7 +66,8 @@ namespace Reseter2 { p = pingResult.Ping.ToString() + "ms"; } - taskControl.DataContrl(p, pingResult.TimeoutPing.ToString(), pingResult.Ip, sw.Elapsed); + if (pingResult.Ip != null) Comp.SetIP(pingResult.Ip); + taskControl.DataContrl(p, pingResult.TimeoutPing.ToString(), pingResult.Ip, Comp.GetNetName() , sw.Elapsed); StatusTask.Next(); task = Task.Run(StatusTask.Tick); } diff --git a/Reseter2/Reseter2.csproj b/Reseter2/Reseter2.csproj index 76022d7..f5bae3c 100644 --- a/Reseter2/Reseter2.csproj +++ b/Reseter2/Reseter2.csproj @@ -23,8 +23,8 @@ false false true - 0 - 1.0.0.%2a + 1 + 2.0.0.%2a false true @@ -49,10 +49,26 @@ prompt 4 preview + false + bin\Release\Reseter2.xml + MinimumRecommendedRules.ruleset + false reseter.ico + + false + + + LocalIntranet + + + false + + + Properties\app.manifest + @@ -219,6 +235,7 @@ WordsItemControl.cs + SettingsSingleFileGenerator Settings.Designer.cs @@ -233,7 +250,6 @@ - diff --git a/Reseter2/Seacher/SeachSCCM.cs b/Reseter2/Seacher/SeachSCCM.cs index abe5773..525f01b 100644 --- a/Reseter2/Seacher/SeachSCCM.cs +++ b/Reseter2/Seacher/SeachSCCM.cs @@ -62,7 +62,7 @@ namespace Reseter2.Seacher { Activate(); Update = sender; - if (Connection.State == ConnectionState.Open) + if (Connection != null && Connection.State == ConnectionState.Open) { List result; if (seach.Length > 2) @@ -96,17 +96,24 @@ namespace Reseter2.Seacher MatchCollection jjj = regexNumrable.Matches(query); if (regexCyrillic.Matches(query).Count > 0) { - result = "SELECT dbo._RES_COLL_SMS00001.Name, dbo._RES_COLL_SMS00001.UserName, dbo.v_R_User.Full_User_Name0, dbo._RES_COLL_SMS00001.LastActiveTime FROM dbo.v_R_User JOIN dbo._RES_COLL_SMS00001 ON dbo.v_R_User.User_Name0=dbo._RES_COLL_SMS00001.UserName WHERE LOWER(dbo.v_R_User.Full_User_Name0) LIKE LOWER('%" + query + "%') LIMIT 15"; + result = "SELECT TOP (15) " + + "dbo._RES_COLL_SMS00001.Name," + + " dbo._RES_COLL_SMS00001.UserName," + + " dbo.v_R_User.Full_User_Name0," + + " dbo._RES_COLL_SMS00001.LastActiveTime" + + " FROM dbo.v_R_User " + + "JOIN dbo._RES_COLL_SMS00001 ON dbo.v_R_User.User_Name0=dbo._RES_COLL_SMS00001.UserName" + + " WHERE LOWER(dbo.v_R_User.Full_User_Name0) LIKE LOWER(N'%" + query + "%')"; mode = Mode.Username; } else if(regexNumrable.Matches(query).Count > 0) { - result = "SELECT dbo._RES_COLL_SMS00001.Name, dbo._RES_COLL_SMS00001.UserName, dbo.v_R_User.Full_User_Name0, dbo._RES_COLL_SMS00001.LastActiveTime FROM dbo._RES_COLL_SMS00001 LEFT JOIN dbo.v_R_User ON dbo._RES_COLL_SMS00001.UserName = dbo.v_R_User.User_Name0 WHERE LOWER(dbo._RES_COLL_SMS00001.Name) LIKE LOWER('%" + query + "%') LIMIT 15"; + result = "SELECT TOP (15) dbo._RES_COLL_SMS00001.Name, dbo._RES_COLL_SMS00001.UserName, dbo.v_R_User.Full_User_Name0, dbo._RES_COLL_SMS00001.LastActiveTime FROM dbo._RES_COLL_SMS00001 LEFT JOIN dbo.v_R_User ON dbo._RES_COLL_SMS00001.UserName = dbo.v_R_User.User_Name0 WHERE LOWER(dbo._RES_COLL_SMS00001.Name) LIKE LOWER(N'%" + query + "%')"; mode = Mode.PCname; } else { - result = "SELECT dbo._RES_COLL_SMS00001.Name, dbo._RES_COLL_SMS00001.UserName, dbo.v_R_User.Full_User_Name0, dbo._RES_COLL_SMS00001.LastActiveTime FROM dbo._RES_COLL_SMS00001 LEFT JOIN dbo.v_R_User ON dbo._RES_COLL_SMS00001.UserName = dbo.v_R_User.User_Name0 WHERE LOWER(dbo._RES_COLL_SMS00001.Name) LIKE LOWER('%" + query + "%') OR LOWER(dbo._RES_COLL_SMS00001.UserName) LIKE LOWER('%" + query + "%') LIMIT 15" + + result = "SELECT TOP (15) dbo._RES_COLL_SMS00001.Name, dbo._RES_COLL_SMS00001.UserName, dbo.v_R_User.Full_User_Name0, dbo._RES_COLL_SMS00001.LastActiveTime FROM dbo._RES_COLL_SMS00001 LEFT JOIN dbo.v_R_User ON dbo._RES_COLL_SMS00001.UserName = dbo.v_R_User.User_Name0 WHERE LOWER(dbo._RES_COLL_SMS00001.Name) LIKE LOWER(N'%" + query + "%') OR LOWER(dbo._RES_COLL_SMS00001.UserName) LIKE LOWER(N'%" + query + "%')" + ""; ; mode = Mode.Login; } @@ -117,7 +124,7 @@ namespace Reseter2.Seacher int y = 0; comps.Clear(); List result = new List(); - if (Connection.State == ConnectionState.Open) + if (Connection.State == ConnectionState.Open && Connection != null) { try { @@ -155,14 +162,15 @@ namespace Reseter2.Seacher enable = false; result.Add("Ничего не найдено"); } - TimerDisconnect.Change(30000, 30000); + TimerDisconnect.Change(90000, 90000); return result; } public void Activate() { if (Connection == null) { - string stringConnect = "server=" + SGlobalSetting.settingSCCM.server + ";database=" + SGlobalSetting.settingSCCM.dataBase + ";" + AuthType.AuthString() + ";charset=utf8"; + + string stringConnect = "server=" + SGlobalSetting.settingSCCM.server + ";database=" + SGlobalSetting.settingSCCM.dataBase + ";" + AuthType.AuthString(); try { Connection = new SqlConnection(stringConnect); @@ -170,7 +178,7 @@ namespace Reseter2.Seacher Console.WriteLine("Подключились"); error = "Подключенно"; TimerCallback TimerDelegate = new TimerCallback(Deactivate); - TimerDisconnect = new Timer(TimerDelegate, null, 30000,30000); + TimerDisconnect = new Timer(TimerDelegate, null, 90000,90000); } catch { @@ -228,7 +236,7 @@ namespace Reseter2.Seacher { try { - string sql = "SELECT * FROM dbo._RES_COLL_SMS00001 LIMIT 1"; + string sql = "SELECT TOP (1) * FROM dbo._RES_COLL_SMS00001"; SqlCommand sqlCom = new SqlCommand(sql, Connection); sqlCom.ExecuteNonQuery(); SqlDataAdapter dataAdapter = new SqlDataAdapter(sqlCom); diff --git a/Reseter2/Setting/SGlobalSetting.cs b/Reseter2/Setting/SGlobalSetting.cs index 89f7397..6d733a9 100644 --- a/Reseter2/Setting/SGlobalSetting.cs +++ b/Reseter2/Setting/SGlobalSetting.cs @@ -148,7 +148,16 @@ namespace Reseter2.Setting { Memory.Close(); Memory.Dispose(); - return Save(output); + + bool save = Save(output); + if (save) { + WordsList.MainCategory = output; + return true; + } + else + { + return false; + } } else { @@ -179,7 +188,17 @@ namespace Reseter2.Setting file.Close(); file.Dispose(); - return SaveCheck(settingWords.PathBase, output); + + bool save = SaveCheck(settingWords.PathBase, output); ; + if (save) + { + WordsList.MainCategory = output; + return true; + } + else + { + return false; + } } WordsList.MainCategory = output; diff --git a/Reseter2/Shutdown.cs b/Reseter2/Shutdown.cs index 4d0be46..ec6c562 100644 --- a/Reseter2/Shutdown.cs +++ b/Reseter2/Shutdown.cs @@ -18,7 +18,7 @@ namespace Reseter2 { if (param.Length > 0) { - // MessageBox.Show(@"-r -m \\" + param + " -f -t 5"); + //MessageBox.Show(@"-r -m \\" + param + " -f -t 5"); StartShutDown(@"-r -m \\" + param + " -f -t 5"); } diff --git a/Reseter2/TaskControl.Designer.cs b/Reseter2/TaskControl.Designer.cs index a6a79cd..25e9b47 100644 --- a/Reseter2/TaskControl.Designer.cs +++ b/Reseter2/TaskControl.Designer.cs @@ -55,7 +55,7 @@ // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(85, 16); + this.label1.Location = new System.Drawing.Point(80, 16); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(50, 13); this.label1.TabIndex = 0; @@ -65,16 +65,16 @@ // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(85, 30); + this.label2.Location = new System.Drawing.Point(80, 30); this.label2.Name = "label2"; - this.label2.Size = new System.Drawing.Size(75, 13); + this.label2.Size = new System.Drawing.Size(27, 13); this.label2.TabIndex = 1; - this.label2.Text = "Сетевое имя:"; + this.label2.Text = "Net:"; // // lb_name // this.lb_name.AutoSize = true; - this.lb_name.Location = new System.Drawing.Point(132, 16); + this.lb_name.Location = new System.Drawing.Point(127, 16); this.lb_name.Name = "lb_name"; this.lb_name.Size = new System.Drawing.Size(64, 13); this.lb_name.TabIndex = 2; @@ -83,7 +83,7 @@ // lb_ip // this.lb_ip.AutoSize = true; - this.lb_ip.Location = new System.Drawing.Point(156, 30); + this.lb_ip.Location = new System.Drawing.Point(103, 30); this.lb_ip.Name = "lb_ip"; this.lb_ip.Size = new System.Drawing.Size(70, 13); this.lb_ip.TabIndex = 3; @@ -92,7 +92,7 @@ // lb_stage // this.lb_stage.AutoSize = true; - this.lb_stage.Location = new System.Drawing.Point(85, 2); + this.lb_stage.Location = new System.Drawing.Point(80, 2); this.lb_stage.Name = "lb_stage"; this.lb_stage.Size = new System.Drawing.Size(0, 13); this.lb_stage.TabIndex = 4; @@ -100,7 +100,7 @@ // label4 // this.label4.AutoSize = true; - this.label4.Location = new System.Drawing.Point(85, 43); + this.label4.Location = new System.Drawing.Point(80, 43); this.label4.Name = "label4"; this.label4.Size = new System.Drawing.Size(31, 13); this.label4.TabIndex = 5; @@ -109,7 +109,7 @@ // lb_ping // this.lb_ping.AutoSize = true; - this.lb_ping.Location = new System.Drawing.Point(119, 43); + this.lb_ping.Location = new System.Drawing.Point(114, 43); this.lb_ping.Name = "lb_ping"; this.lb_ping.Size = new System.Drawing.Size(0, 13); this.lb_ping.TabIndex = 6; @@ -117,7 +117,7 @@ // Timeout // this.Timeout.AutoSize = true; - this.Timeout.Location = new System.Drawing.Point(159, 43); + this.Timeout.Location = new System.Drawing.Point(154, 43); this.Timeout.Name = "Timeout"; this.Timeout.Size = new System.Drawing.Size(48, 13); this.Timeout.TabIndex = 7; @@ -126,7 +126,7 @@ // lb_timeout // this.lb_timeout.AutoSize = true; - this.lb_timeout.Location = new System.Drawing.Point(210, 43); + this.lb_timeout.Location = new System.Drawing.Point(205, 43); this.lb_timeout.Name = "lb_timeout"; this.lb_timeout.Size = new System.Drawing.Size(0, 13); this.lb_timeout.TabIndex = 8; @@ -172,7 +172,7 @@ // label3 // this.label3.AutoSize = true; - this.label3.Location = new System.Drawing.Point(85, 58); + this.label3.Location = new System.Drawing.Point(80, 58); this.label3.Name = "label3"; this.label3.Size = new System.Drawing.Size(49, 13); this.label3.TabIndex = 13; @@ -181,7 +181,7 @@ // lb_time // this.lb_time.AutoSize = true; - this.lb_time.Location = new System.Drawing.Point(130, 58); + this.lb_time.Location = new System.Drawing.Point(125, 58); this.lb_time.Name = "lb_time"; this.lb_time.Size = new System.Drawing.Size(34, 13); this.lb_time.TabIndex = 14; diff --git a/Reseter2/TaskControl.cs b/Reseter2/TaskControl.cs index c98bbe9..61a2a23 100644 --- a/Reseter2/TaskControl.cs +++ b/Reseter2/TaskControl.cs @@ -42,11 +42,25 @@ namespace Reseter2 } - public void DataContrl(string ping, string timeout, IPAddress ip, TimeSpan time) + public void DataContrl(string ping, string timeout, IPAddress ip, string netname, TimeSpan time) { lb_ping.Text = ping; lb_timeout.Text = timeout; - if(ip != null)lb_ip.Text = ip.ToString(); + lb_ip.Text = reseterTask.Comp.GetNetNameStr(); + + if (netname != null) + { + lb_ip.Text = netname; + if (ip != null && netname != null) lb_ip.Text = lb_ip.Text + "(" + ip.ToString() + ")"; + } + else + { + if (ip != null) lb_ip.Text = ip.ToString(); + } + + + + lb_time.Text = time.ToString(@"mm\:ss"); } diff --git a/Reseter2/TaskControl.resx b/Reseter2/TaskControl.resx index fe7580c..9e193cf 100644 --- a/Reseter2/TaskControl.resx +++ b/Reseter2/TaskControl.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAABk - lAIAAk1TRnQBSQFMAgEBCAEAATgBAAE4AQABQAEAAUABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgEAAEB + lAIAAk1TRnQBSQFMAgEBCAEAAUABAAFAAQABQAEAAUABAAT/ARkBAAj/AUIBTQE2BwABNgMAASgEAAEB AgABwAMAAQEBAAEYBgABQAEC/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A /wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A/wD/AP8A diff --git a/Reseter2/Words/BilderWords.Designer.cs b/Reseter2/Words/BilderWords.Designer.cs index 6d5a02e..63f2473 100644 --- a/Reseter2/Words/BilderWords.Designer.cs +++ b/Reseter2/Words/BilderWords.Designer.cs @@ -206,6 +206,7 @@ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent; this.Text = "Редактор справочника"; this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.BilderWords_FormClosing); + this.Load += new System.EventHandler(this.BilderWords_Load); this.groupBox1.ResumeLayout(false); this.ResumeLayout(false); this.PerformLayout(); diff --git a/Reseter2/Words/BilderWords.cs b/Reseter2/Words/BilderWords.cs index 961ef65..7920d7b 100644 --- a/Reseter2/Words/BilderWords.cs +++ b/Reseter2/Words/BilderWords.cs @@ -304,7 +304,7 @@ namespace Reseter2.Words } else { - WordsList.MainCategory = ChangeCategory; + // WordsList.MainCategory = ChangeCategory; this.DialogResult = DialogResult.OK; } @@ -411,5 +411,10 @@ namespace Reseter2.Words { this.Close(); } + + private void BilderWords_Load(object sender, EventArgs e) + { + + } } } diff --git a/Reseter2/Words/BilderWords.resx b/Reseter2/Words/BilderWords.resx index dbe131b..75f4de0 100644 --- a/Reseter2/Words/BilderWords.resx +++ b/Reseter2/Words/BilderWords.resx @@ -125,7 +125,7 @@ AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0 ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAACQ - JAAAAk1TRnQBSQFMAgEBCQEAAZABAAGQAQABEAEAARABAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAFA + JAAAAk1TRnQBSQFMAgEBCQEAAZgBAAGYAQABEAEAARABAAT/AREBAAj/AUIBTQE2BwABNgMAASgDAAFA AwABMAMAAQEBAAEQBgABGBIAAf8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/ AX8B/wF/Af8BfwH/AX8B/wF/Af8Bf2AAAf8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/ Af8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8Bf2AAAf8BfwH/AX8B/wF/Af8BfwH/AX8B/wF/Af8BfwH/