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

Compare commits

base: tester:0.2
Branches Tags
tester:main
tester:0.2
...
compare: tester:main
Branches Tags
tester:main
tester:0.2

3 Commits
0.2 ... main

Author SHA1 Message Date
klavirshik 73bba68768 Добавили кнопку отправить контрл альт делит 2025-04-23 14:17:13 +02:00
klavirshik 512fa239b0 Передали управлени 2025-04-22 17:56:40 +02:00
klavirshik 250a59a78d Внесли правки, добаили меню 2025-01-29 19:24:24 +02:00
42 changed files with 3233 additions and 180 deletions
Show Stats Expand all files Collapse all files

0
Remontor/.vs/Remontor/FileContentIndex/read.lock
View File

BIN
Remontor/.vs/Remontor/v17/.suo
View File

Binary file not shown.

1427
Remontor/.vs/Remontor/v17/DocumentLayout.backup.json Normal file
View File

File diff suppressed because it is too large Load Diff

1427
Remontor/.vs/Remontor/v17/DocumentLayout.json Normal file
View File

File diff suppressed because it is too large Load Diff

1
Remontor/.vs/Remontor/v17/ResourceExplorer/settings.json Normal file
View File

@ -0,0 +1 @@
{"ShowEmptyProjects":false,"CustomColumnOrderings":{"name":0,"file-path":1,"file-name":2,"neutral-value":3,"neutral-comment":4,"type":5},"ShowValidationErrors":true,"SelectedResourceGroupsByProject":{"C:\\Users\\\u0412\u043B\u0430\u0434\u0438\u043C\u0438\u0440\\source\\repos\\Remontor\\Remontor\\Remontor.csproj":["C:\\Users\\\u0412\u043B\u0430\u0434\u0438\u043C\u0438\u0440\\source\\repos\\Remontor\\Remontor\\Properties\\Resources.resx","C:\\Users\\\u0412\u043B\u0430\u0434\u0438\u043C\u0438\u0440\\source\\repos\\Remontor\\Remontor\\Setting\\SettingSCCMControl.resx"]},"VisibleColumnKeys":["name","neutral-value","neutral-comment"]}

8
Remontor/AboutForm.Designer.cs generated
View File

@ -45,9 +45,9 @@
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(12, 181);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(347, 13);
this.label1.Size = new System.Drawing.Size(353, 13);
this.label1.TabIndex = 0;
this.label1.Text = "SCCMанагер программа для удобной организации работы c SCCM\r\n";
this.label1.Text = "SCCMанагер - программа для удобной организации работы c SCCM\r\n";
//
// label20
//
@ -76,7 +76,7 @@
this.label2.Name = "label2";
this.label2.Size = new System.Drawing.Size(31, 13);
this.label2.TabIndex = 9;
this.label2.Text = "2024";
this.label2.Text = "2025";
//
// pictureBox1
//
@ -94,7 +94,7 @@
this.label3.Name = "label3";
this.label3.Size = new System.Drawing.Size(62, 13);
this.label3.TabIndex = 11;
this.label3.Text = "Версия 0.2";
this.label3.Text = "Версия 0.4";
//
// groupBox1
//

51
Remontor/BarSessionControl.Designer.cs generated
View File

@ -29,13 +29,14 @@
private void InitializeComponent()
{
this.FlowButton = new System.Windows.Forms.FlowLayoutPanel();
this.NewBtn = new System.Windows.Forms.Button();
this.btControl = new System.Windows.Forms.Button();
this.ShowSetting = new System.Windows.Forms.Button();
this.ShowWords = new System.Windows.Forms.Button();
this.OneMonBt = new System.Windows.Forms.Button();
this.DobleMonOneBt = new System.Windows.Forms.Button();
this.DobleMonTwoBt = new System.Windows.Forms.Button();
this.DobleMonFull = new System.Windows.Forms.Button();
this.NewBtn = new System.Windows.Forms.Button();
this.RecoonectBt = new System.Windows.Forms.Button();
this.ShowBar = new System.Windows.Forms.Button();
this.FlowButton.SuspendLayout();
@ -50,24 +51,25 @@
this.FlowButton.Location = new System.Drawing.Point(0, 0);
this.FlowButton.Margin = new System.Windows.Forms.Padding(0);
this.FlowButton.Name = "FlowButton";
this.FlowButton.Size = new System.Drawing.Size(687, 40);
this.FlowButton.Size = new System.Drawing.Size(663, 40);
this.FlowButton.TabIndex = 8;
this.FlowButton.ControlRemoved += new System.Windows.Forms.ControlEventHandler(this.FlowButton_ControlRemoved);
//
// NewBtn
// btControl
//
this.NewBtn.BackColor = System.Drawing.Color.Transparent;
this.NewBtn.BackgroundImage = global::Remontor.Properties.Resources.Add;
this.NewBtn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.NewBtn.FlatAppearance.BorderSize = 0;
this.NewBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.NewBtn.Location = new System.Drawing.Point(10, 0);
this.NewBtn.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0);
this.NewBtn.Name = "NewBtn";
this.NewBtn.Size = new System.Drawing.Size(40, 38);
this.NewBtn.TabIndex = 0;
this.NewBtn.UseVisualStyleBackColor = false;
this.NewBtn.Click += new System.EventHandler(this.NewBtn_Click);
this.btControl.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.btControl.BackColor = System.Drawing.SystemColors.Control;
this.btControl.BackgroundImage = global::Remontor.Properties.Resources.settings_power_36dp_EA3323_FILL0_wght600_GRAD200_opsz40;
this.btControl.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center;
this.btControl.FlatAppearance.BorderSize = 0;
this.btControl.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.btControl.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.btControl.Location = new System.Drawing.Point(704, 0);
this.btControl.Name = "btControl";
this.btControl.Size = new System.Drawing.Size(40, 40);
this.btControl.TabIndex = 15;
this.btControl.UseVisualStyleBackColor = false;
this.btControl.Click += new System.EventHandler(this.btControl_Click);
//
// ShowSetting
//
@ -161,6 +163,21 @@
this.DobleMonFull.UseVisualStyleBackColor = false;
this.DobleMonFull.Click += new System.EventHandler(this.DobleMonFull_Click);
//
// NewBtn
//
this.NewBtn.BackColor = System.Drawing.Color.Transparent;
this.NewBtn.BackgroundImage = global::Remontor.Properties.Resources.Add;
this.NewBtn.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.NewBtn.FlatAppearance.BorderSize = 0;
this.NewBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.NewBtn.Location = new System.Drawing.Point(10, 0);
this.NewBtn.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0);
this.NewBtn.Name = "NewBtn";
this.NewBtn.Size = new System.Drawing.Size(40, 38);
this.NewBtn.TabIndex = 0;
this.NewBtn.UseVisualStyleBackColor = false;
this.NewBtn.Click += new System.EventHandler(this.NewBtn_Click);
//
// RecoonectBt
//
this.RecoonectBt.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@ -170,7 +187,7 @@
this.RecoonectBt.FlatAppearance.BorderSize = 0;
this.RecoonectBt.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.RecoonectBt.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.RecoonectBt.Location = new System.Drawing.Point(690, -1);
this.RecoonectBt.Location = new System.Drawing.Point(666, 0);
this.RecoonectBt.Name = "RecoonectBt";
this.RecoonectBt.Size = new System.Drawing.Size(40, 40);
this.RecoonectBt.TabIndex = 5;
@ -195,6 +212,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.btControl);
this.Controls.Add(this.ShowSetting);
this.Controls.Add(this.ShowWords);
this.Controls.Add(this.OneMonBt);
@ -225,5 +243,6 @@
private System.Windows.Forms.Button OneMonBt;
private System.Windows.Forms.Button ShowWords;
private System.Windows.Forms.Button ShowSetting;
private System.Windows.Forms.Button btControl;
}
}

14
Remontor/BarSessionControl.cs
View File

@ -133,21 +133,25 @@ namespace Remontor
private void OneMonBt_Click(object sender, EventArgs e)
{
SConnector.ResizeActiv();
SConnector.SetModeMon(new OneMon());
}
private void DobleMonOneBt_Click(object sender, EventArgs e)
{
SConnector.ResizeActiv();
SConnector.SetModeMon(new DobleMonOne());
}
private void DobleMonTwoBt_Click(object sender, EventArgs e)
{
SConnector.ResizeActiv();
SConnector.SetModeMon(new DobleMonTwo());
}
private void DobleMonFull_Click(object sender, EventArgs e)
{
SConnector.ResizeActiv();
SConnector.SetModeMon(new DobleMonFull());
}
@ -162,7 +166,6 @@ namespace Remontor
if (e.Button == MouseButtons.Left)
{
// SConnector.DeleteConnect(SConnector.ActionConnect);
SConnector.ActionConnect.Reconnect();
// SConnector.NewConnect(SConnector.ActionConnect.GetComp);
@ -193,5 +196,14 @@ namespace Remontor
Color.Black, 0, ButtonBorderStyle.Dotted, // right
Color.Black, 1, ButtonBorderStyle.Solid);// bottom
}
private void btControl_Click(object sender, EventArgs e)
{
if (SConnector.ActionConnect != null)
{
SConnector.ActionConnect.CommandCAD();
}
}
}
}

14
Remontor/Connector/Connect.cs
View File

@ -40,8 +40,13 @@ namespace Remontor.Connector
private const uint WS_DISABLED = 0x08000000;
private const uint WS_MINIMIZE = 0x20000000;
public const uint WS_MAXIMIZEBOX = 0x00010000;
public const Int32 WM_NULL = 0x0;
public const Int32 WM_CLICK = 0xD4;
public const UInt32 WM_COMMAND = 0x0111;
[DllImport("user32.dll")]
public static extern IntPtr SendMessage(IntPtr hWnd, UInt32 Msg, Int32 wParam, Int32 lParam);
[DllImport("user32.dll")]
static extern IntPtr SetParent(IntPtr hWndChild, IntPtr hWndNewParent);
@ -56,6 +61,8 @@ namespace Remontor.Connector
[DllImport("user32.dll")]
static extern bool MoveWindow(IntPtr Handle, int x, int y, int w, int h, bool repaint);
public static IntPtr GetWindowHandleByTitle(string title)
{
@ -125,7 +132,7 @@ namespace Remontor.Connector
MoveWindow(hwnd, CenterDraw.X- 325, CenterDraw.Y - 125 ,675,275,true);
Task.Run(new Action(() => {
Thread.Sleep(4000);
Thread.Sleep(6000);
SConnector.FormMain.Invoke(new MethodInvoker(delegate
@ -325,5 +332,10 @@ namespace Remontor.Connector
Proc.CloseMainWindow();
}
}
public void CommandCAD()
{
SendMessage(Proc.MainWindowHandle, WM_COMMAND, WM_CLICK, WM_NULL);
}
}
}

15
Remontor/Finder/Finder.cs
View File

@ -1,6 +1,7 @@
using Remontor.Connector;
using Remontor.Pinger;
using Remontor.Seacher;
using Remontor.Setting;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@ -37,7 +38,12 @@ namespace Remontor.Finder
}
else
{
if (CompNameLB.Text.Length > 0)
if (((SessionItemControl)SeaherPanel.Controls[0]).seacherResult.Result() != null && SGlobalSetting.settingApp.ConnectMode)
{
SConnector.NewConnect(((SessionItemControl)SeaherPanel.Controls[0]).seacherResult.Result());
this.Close();
}
else if (CompNameLB.Text.Length > 0)
{
SConnector.NewConnect(new CompId(CompNameLB.Text));
}
@ -173,7 +179,12 @@ namespace Remontor.Finder
}
if (PreSelected == -1)
{
if (CompNameLB.Text.Length > 0)
if (((SessionItemControl)SeaherPanel.Controls[0]).seacherResult.Result() != null && SGlobalSetting.settingApp.ConnectMode)
{
SConnector.NewConnect(((SessionItemControl)SeaherPanel.Controls[0]).seacherResult.Result());
this.Close();
}
else if (CompNameLB.Text.Length > 0)
{
SConnector.NewConnect(new CompId(CompNameLB.Text));
this.Close();

48
Remontor/FlowConteinerSetting.Designer.cs generated
View File

@ -29,11 +29,11 @@
private void InitializeComponent()
{
this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel();
this.BtSave = new System.Windows.Forms.Button();
this.BtAbout = new System.Windows.Forms.Button();
this.settingWordsControl1 = new Remontor.Setting.SettingWordsControl();
this.settingSCCMControl1 = new Remontor.Setting.SettingSCCMControl();
this.settingAppControl1 = new Remontor.Setting.settingAppControl();
this.BtSave = new System.Windows.Forms.Button();
this.BtAbout = new System.Windows.Forms.Button();
this.flowLayoutPanel1.SuspendLayout();
this.SuspendLayout();
//
@ -51,9 +51,30 @@
this.flowLayoutPanel1.Size = new System.Drawing.Size(330, 616);
this.flowLayoutPanel1.TabIndex = 0;
//
// settingWordsControl1
//
this.settingWordsControl1.Location = new System.Drawing.Point(3, 3);
this.settingWordsControl1.Name = "settingWordsControl1";
this.settingWordsControl1.Size = new System.Drawing.Size(324, 103);
this.settingWordsControl1.TabIndex = 0;
//
// settingSCCMControl1
//
this.settingSCCMControl1.Location = new System.Drawing.Point(3, 112);
this.settingSCCMControl1.Name = "settingSCCMControl1";
this.settingSCCMControl1.Size = new System.Drawing.Size(323, 120);
this.settingSCCMControl1.TabIndex = 1;
//
// settingAppControl1
//
this.settingAppControl1.Location = new System.Drawing.Point(3, 238);
this.settingAppControl1.Name = "settingAppControl1";
this.settingAppControl1.Size = new System.Drawing.Size(325, 335);
this.settingAppControl1.TabIndex = 2;
//
// BtSave
//
this.BtSave.Location = new System.Drawing.Point(3, 554);
this.BtSave.Location = new System.Drawing.Point(3, 579);
this.BtSave.Name = "BtSave";
this.BtSave.Size = new System.Drawing.Size(323, 28);
this.BtSave.TabIndex = 3;
@ -73,27 +94,6 @@
this.BtAbout.UseVisualStyleBackColor = true;
this.BtAbout.Click += new System.EventHandler(this.BtAbout_Click);
//
// settingWordsControl1
//
this.settingWordsControl1.Location = new System.Drawing.Point(3, 3);
this.settingWordsControl1.Name = "settingWordsControl1";
this.settingWordsControl1.Size = new System.Drawing.Size(324, 103);
this.settingWordsControl1.TabIndex = 0;
//
// settingSCCMControl1
//
this.settingSCCMControl1.Location = new System.Drawing.Point(3, 112);
this.settingSCCMControl1.Name = "settingSCCMControl1";
this.settingSCCMControl1.Size = new System.Drawing.Size(323, 178);
this.settingSCCMControl1.TabIndex = 1;
//
// settingAppControl1
//
this.settingAppControl1.Location = new System.Drawing.Point(3, 296);
this.settingAppControl1.Name = "settingAppControl1";
this.settingAppControl1.Size = new System.Drawing.Size(325, 252);
this.settingAppControl1.TabIndex = 2;
//
// FlowConteinerSetting
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);

1
Remontor/Form1.Designer.cs generated
View File

@ -125,6 +125,7 @@
this.Deactivate += new System.EventHandler(this.Form1_Deactivate);
this.FormClosing += new System.Windows.Forms.FormClosingEventHandler(this.Form1_FormClosing);
this.Load += new System.EventHandler(this.Form1_Load);
this.Shown += new System.EventHandler(this.Form1_Shown);
this.Move += new System.EventHandler(this.tabControl1_SizeChanged);
this.Resize += new System.EventHandler(this.tabControl1_SizeChanged);
this.panel3.ResumeLayout(false);

11
Remontor/Form1.cs
View File

@ -86,7 +86,7 @@ namespace Remontor
SConnector.x = this.Bounds.X;
SConnector.y = this.Bounds.Y;
SConnector.Width = this.Bounds.Width;
SConnector.Height = this.Bounds.Height;
SConnector.Height = this.Bounds.Height;
}
private void barSessionControl1_Load(object sender, EventArgs e)
@ -125,6 +125,15 @@ namespace Remontor
{
}
private void Form1_Shown(object sender, EventArgs e)
{
if (SGlobalSetting.settingApp.StartMode)
{
Finder.Finder finder = new Finder.Finder();
finder.ShowDialog();
}
}
}
}

40
Remontor/MenuStripCommand.Designer.cs generated
View File

@ -38,6 +38,10 @@
this.CommandOpenRegEdit = new System.Windows.Forms.ToolStripMenuItem();
this.CommandOpenControlPC = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.CommandCopyName = new System.Windows.Forms.ToolStripMenuItem();
this.CommandCopyIP = new System.Windows.Forms.ToolStripMenuItem();
this.CommandCopyDesc = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator3 = new System.Windows.Forms.ToolStripSeparator();
this.CommandSavePC = new System.Windows.Forms.ToolStripMenuItem();
this.contextMenuCommand.SuspendLayout();
this.SuspendLayout();
@ -53,10 +57,14 @@
this.CommandOpenRegEdit,
this.CommandOpenControlPC,
this.toolStripSeparator2,
this.CommandCopyName,
this.CommandCopyIP,
this.CommandCopyDesc,
this.toolStripSeparator3,
this.CommandSavePC});
this.contextMenuCommand.Name = "contextMenuCommand";
this.contextMenuCommand.ShowImageMargin = false;
this.contextMenuCommand.Size = new System.Drawing.Size(184, 192);
this.contextMenuCommand.Size = new System.Drawing.Size(184, 242);
//
// CommandConnect
//
@ -111,6 +119,32 @@
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(180, 6);
//
// CommandCopyName
//
this.CommandCopyName.Name = "CommandCopyName";
this.CommandCopyName.Size = new System.Drawing.Size(183, 22);
this.CommandCopyName.Text = "Копировать имя ПК";
this.CommandCopyName.Click += new System.EventHandler(this.CommandCopyName_Click);
//
// CommandCopyIP
//
this.CommandCopyIP.Name = "CommandCopyIP";
this.CommandCopyIP.Size = new System.Drawing.Size(183, 22);
this.CommandCopyIP.Text = "Копировать IP";
this.CommandCopyIP.Click += new System.EventHandler(this.CommandCopyIP_Click);
//
// CommandCopyDesc
//
this.CommandCopyDesc.Name = "CommandCopyDesc";
this.CommandCopyDesc.Size = new System.Drawing.Size(183, 22);
this.CommandCopyDesc.Text = "Копировать описание";
this.CommandCopyDesc.Click += new System.EventHandler(this.CommandCopyDesc_Click);
//
// toolStripSeparator3
//
this.toolStripSeparator3.Name = "toolStripSeparator3";
this.toolStripSeparator3.Size = new System.Drawing.Size(180, 6);
//
// CommandSavePC
//
this.CommandSavePC.Name = "CommandSavePC";
@ -140,5 +174,9 @@
private System.Windows.Forms.ToolStripMenuItem CommandSavePC;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
private System.Windows.Forms.ToolStripMenuItem CommandCopyName;
private System.Windows.Forms.ToolStripMenuItem CommandCopyIP;
private System.Windows.Forms.ToolStripMenuItem CommandCopyDesc;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator3;
}
}

36
Remontor/MenuStripCommand.cs
View File

@ -31,16 +31,35 @@ namespace Remontor
}
public void ShowMenu(IComp comp, Point point, CloseMenuDelegate close)
{
if(comp.GetIP() != null)
if (comp.GetIP() != null)
{
contextMenuCommand.Items[1].Enabled = true;
contextMenuCommand.Items[9].Enabled = true;
}
else
{
contextMenuCommand.Items[1].Enabled = false;
contextMenuCommand.Items[9].Enabled = false;
}
Comp = comp;
if (comp.GetDescription() != null) {
contextMenuCommand.Items[10].Enabled = true;
}
else
{
contextMenuCommand.Items[10].Enabled = false;
}
if (comp.GetNetNameStr() != null)
{
contextMenuCommand.Items[8].Enabled = true;
}
else
{
contextMenuCommand.Items[8].Enabled = false;
}
contextMenuCommand.Items[7].Visible = true;
contextMenuCommand.Items[8].Visible = true;
contextMenuCommand.Show(point);
@ -130,5 +149,20 @@ namespace Remontor
HistoryList.Updated();
}
}
private void CommandCopyName_Click(object sender, EventArgs e)
{
Clipboard.SetText(Comp.GetNetNameStr(), TextDataFormat.Text);
}
private void CommandCopyIP_Click(object sender, EventArgs e)
{
Clipboard.SetText(Comp.GetIP().ToString(), TextDataFormat.Text);
}
private void CommandCopyDesc_Click(object sender, EventArgs e)
{
Clipboard.SetText(Comp.GetDescription(), TextDataFormat.Text);
}
}
}

30
Remontor/Properties/Resources.Designer.cs generated
View File

@ -200,6 +200,16 @@ namespace Remontor.Properties {
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap icon333_192 {
get {
object obj = ResourceManager.GetObject("icon333-192", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
@ -240,6 +250,26 @@ namespace Remontor.Properties {
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap settings_power_36dp_EA3323_FILL0_wght600_GRAD200_opsz40 {
get {
object obj = ResourceManager.GetObject("settings_power_36dp_EA3323_FILL0_wght600_GRAD200_opsz40", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap settings_power_40dp_EA3323_FILL0_wght400_GRAD0_opsz40 {
get {
object obj = ResourceManager.GetObject("settings_power_40dp_EA3323_FILL0_wght400_GRAD0_opsz40", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>

43
Remontor/Properties/Resources.resx
View File

@ -130,8 +130,11 @@
<data name="1words" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\1words.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="3words" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\3words.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="close_min" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\close_min.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz202" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz202.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="8words" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\8words.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -145,29 +148,41 @@
<data name="developer_mode_tv_24dp_48752C_FILL0_wght400_GRAD0_opsz24" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\developer_mode_tv_24dp_48752C_FILL0_wght400_GRAD0_opsz24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="menu_book_24dp_6B2346_FILL0_wght400_GRAD0_opsz241" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\menu_book_24dp_6B2346_FILL0_wght400_GRAD0_opsz241.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="5words" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\5words.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="settings_power_40dp_EA3323_FILL0_wght400_GRAD0_opsz40" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\settings_power_40dp_EA3323_FILL0_wght400_GRAD0_opsz40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="history_20dp_2854C5_FILL0_wght400_GRAD0_opsz201" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\history_20dp_2854C5_FILL0_wght400_GRAD0_opsz201.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="2words" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\2words.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="icon333-192" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\icon333-192.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="close" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="menu_book_24dp_6B2346_FILL0_wght400_GRAD0_opsz241" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\menu_book_24dp_6B2346_FILL0_wght400_GRAD0_opsz241.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz202" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz202.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Add" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="7words" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\7words.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Main2about1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Main2about1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="6words" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\6words.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="5words" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\5words.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="3words" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\3words.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="sync_24dp_2854C5_FILL0_wght400_GRAD0_opsz24" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sync_24dp_2854C5_FILL0_wght400_GRAD0_opsz24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -175,16 +190,10 @@
<data name="0words" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\0words.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Add" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Add.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="4words" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\4words.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="close_min" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\close_min.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Main2about1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Main2about1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="settings_power_36dp_EA3323_FILL0_wght600_GRAD200_opsz40" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\settings_power_36dp_EA3323_FILL0_wght600_GRAD200_opsz40.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

3
Remontor/Remontor.csproj
View File

@ -352,6 +352,9 @@
<Content Include="Main.ico" />
<Content Include="Main2.ico" />
<Content Include="MainIcon.ico" />
<None Include="Resources\settings_power_36dp_EA3323_FILL0_wght600_GRAD200_opsz40.png" />
<None Include="Resources\settings_power_40dp_EA3323_FILL0_wght400_GRAD0_opsz40.png" />
<None Include="Resources\icon333-192.png" />
<Content Include="Resources\Main2about.png" />
<None Include="Resources\Main2about1.png" />
</ItemGroup>

BIN
Remontor/Resources/icon333-192.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 17 KiB

BIN
Remontor/Resources/settings_power_36dp_EA3323_FILL0_wght600_GRAD200_opsz40.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 955 B

BIN
Remontor/Resources/settings_power_40dp_EA3323_FILL0_wght400_GRAD0_opsz40.png Normal file
View File

Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 1019 B

7
Remontor/Seacher/SeachSCCM.cs
View File

@ -128,17 +128,18 @@ namespace Remontor.Seacher
" 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 + "%')";
" WHERE LOWER(dbo.v_R_User.Full_User_Name0) LIKE LOWER(N'%" + query + "%')" +
" ORDER BY dbo._RES_COLL_SMS00001.LastActiveTime DESC";
mode = Mode.Username;
}
else if(regexNumrable.Matches(query).Count > 0)
{
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 + "%')";
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 + "%') ORDER BY dbo._RES_COLL_SMS00001.LastActiveTime DESC";
mode = Mode.PCname;
}
else
{
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 + "%')";
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 + "%') ORDER BY dbo._RES_COLL_SMS00001.LastActiveTime DESC";
mode = Mode.Login;
}
//MessageBox.Show(mode.ToString());

4
Remontor/Setting/SettingApp.cs
View File

@ -18,6 +18,8 @@ namespace Remontor.Setting
public int WidthDoble;
public int HeightDoble;
public string DialogName;
public bool StartMode;
public bool ConnectMode;
public SettingApp()
{
this.pathApp = "CmRcViewer.exe";
@ -29,6 +31,8 @@ namespace Remontor.Setting
this.WidthDoble = 3840;
this.HeightDoble = 1040;
this.DialogName = "Устанавливается контакт с агентом удаленного управления на клиенте {#PCName}";
this.StartMode = true;
this.ConnectMode = true;
}
}

85
Remontor/Setting/SettingAppControl.Designer.cs generated
View File

@ -29,6 +29,9 @@
private void InitializeComponent()
{
this.groupBox3 = new System.Windows.Forms.GroupBox();
this.BtSetCurrentPos = new System.Windows.Forms.Button();
this.TbDlgName = new System.Windows.Forms.TextBox();
this.label9 = new System.Windows.Forms.Label();
this.label8 = new System.Windows.Forms.Label();
this.label7 = new System.Windows.Forms.Label();
this.label6 = new System.Windows.Forms.Label();
@ -48,8 +51,8 @@
this.path = new System.Windows.Forms.TextBox();
this.label12 = new System.Windows.Forms.Label();
this.openFileDialog1 = new System.Windows.Forms.OpenFileDialog();
this.TbDlgName = new System.Windows.Forms.TextBox();
this.label9 = new System.Windows.Forms.Label();
this.cbStartMode = new System.Windows.Forms.CheckBox();
this.cbConnectMode = new System.Windows.Forms.CheckBox();
this.groupBox3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.NbHeight)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.NbWidth)).BeginInit();
@ -61,6 +64,9 @@
//
// groupBox3
//
this.groupBox3.Controls.Add(this.cbConnectMode);
this.groupBox3.Controls.Add(this.cbStartMode);
this.groupBox3.Controls.Add(this.BtSetCurrentPos);
this.groupBox3.Controls.Add(this.TbDlgName);
this.groupBox3.Controls.Add(this.label9);
this.groupBox3.Controls.Add(this.label8);
@ -83,11 +89,39 @@
this.groupBox3.Controls.Add(this.label12);
this.groupBox3.Location = new System.Drawing.Point(3, 3);
this.groupBox3.Name = "groupBox3";
this.groupBox3.Size = new System.Drawing.Size(319, 249);
this.groupBox3.Size = new System.Drawing.Size(319, 349);
this.groupBox3.TabIndex = 4;
this.groupBox3.TabStop = false;
this.groupBox3.Text = "Параметры приложения";
//
// BtSetCurrentPos
//
this.BtSetCurrentPos.Location = new System.Drawing.Point(84, 209);
this.BtSetCurrentPos.Name = "BtSetCurrentPos";
this.BtSetCurrentPos.Size = new System.Drawing.Size(226, 23);
this.BtSetCurrentPos.TabIndex = 25;
this.BtSetCurrentPos.Text = "Задать текущую позицию окна";
this.BtSetCurrentPos.UseVisualStyleBackColor = true;
this.BtSetCurrentPos.Click += new System.EventHandler(this.BtSetCurrentPos_Click);
//
// TbDlgName
//
this.TbDlgName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.TbDlgName.Location = new System.Drawing.Point(10, 260);
this.TbDlgName.Name = "TbDlgName";
this.TbDlgName.Size = new System.Drawing.Size(298, 20);
this.TbDlgName.TabIndex = 24;
//
// label9
//
this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(7, 244);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(115, 13);
this.label9.TabIndex = 23;
this.label9.Text = "Имя диалога статуса";
//
// label8
//
this.label8.AutoSize = true;
@ -156,6 +190,11 @@
0,
0,
0});
this.NbY.Minimum = new decimal(new int[] {
9000,
0,
0,
-2147483648});
this.NbY.Name = "NbY";
this.NbY.Size = new System.Drawing.Size(48, 20);
this.NbY.TabIndex = 16;
@ -168,6 +207,11 @@
0,
0,
0});
this.NbX.Minimum = new decimal(new int[] {
9000,
0,
0,
-2147483648});
this.NbX.Name = "NbX";
this.NbX.Size = new System.Drawing.Size(48, 20);
this.NbX.TabIndex = 15;
@ -274,23 +318,25 @@
//
this.openFileDialog1.FileName = "CmRcViewer.exe";
//
// TbDlgName
// cbStartMode
//
this.TbDlgName.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.TbDlgName.Location = new System.Drawing.Point(10, 219);
this.TbDlgName.Name = "TbDlgName";
this.TbDlgName.Size = new System.Drawing.Size(298, 20);
this.TbDlgName.TabIndex = 24;
this.cbStartMode.AutoSize = true;
this.cbStartMode.Location = new System.Drawing.Point(10, 287);
this.cbStartMode.Name = "cbStartMode";
this.cbStartMode.Size = new System.Drawing.Size(206, 17);
this.cbStartMode.TabIndex = 26;
this.cbStartMode.Text = "Открывать при старте окно поиска";
this.cbStartMode.UseVisualStyleBackColor = true;
//
// label9
// cbConnectMode
//
this.label9.AutoSize = true;
this.label9.Location = new System.Drawing.Point(7, 203);
this.label9.Name = "label9";
this.label9.Size = new System.Drawing.Size(115, 13);
this.label9.TabIndex = 23;
this.label9.Text = "Имя диалога статуса";
this.cbConnectMode.AutoSize = true;
this.cbConnectMode.Location = new System.Drawing.Point(10, 310);
this.cbConnectMode.Name = "cbConnectMode";
this.cbConnectMode.Size = new System.Drawing.Size(306, 17);
this.cbConnectMode.TabIndex = 27;
this.cbConnectMode.Text = "Подключаться к первому найденному в списке поиска";
this.cbConnectMode.UseVisualStyleBackColor = true;
//
// settingAppControl
//
@ -298,7 +344,7 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.groupBox3);
this.Name = "settingAppControl";
this.Size = new System.Drawing.Size(325, 256);
this.Size = new System.Drawing.Size(325, 387);
this.groupBox3.ResumeLayout(false);
this.groupBox3.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.NbHeight)).EndInit();
@ -335,5 +381,8 @@
private System.Windows.Forms.Label label8;
private System.Windows.Forms.TextBox TbDlgName;
private System.Windows.Forms.Label label9;
private System.Windows.Forms.Button BtSetCurrentPos;
private System.Windows.Forms.CheckBox cbConnectMode;
private System.Windows.Forms.CheckBox cbStartMode;
}
}

16
Remontor/Setting/SettingAppControl.cs
View File

@ -42,6 +42,8 @@ namespace Remontor.Setting
NbWidth.Value = SGlobalSetting.settingApp.WidthDoble;
NbHeight.Value = SGlobalSetting.settingApp.HeightDoble;
TbDlgName.Text = SGlobalSetting.settingApp.DialogName;
cbConnectMode.Checked = SGlobalSetting.settingApp.ConnectMode;
cbStartMode.Checked = SGlobalSetting.settingApp.StartMode;
}
}
@ -57,6 +59,8 @@ namespace Remontor.Setting
SGlobalSetting.settingApp.WidthDoble = (int)NbWidth.Value;
SGlobalSetting.settingApp.HeightDoble = (int)NbHeight.Value;
SGlobalSetting.settingApp.DialogName = TbDlgName.Text;
SGlobalSetting.settingApp.ConnectMode = cbConnectMode.Checked;
SGlobalSetting.settingApp.StartMode = cbStartMode.Checked;
}
public bool edited()
@ -69,7 +73,9 @@ namespace Remontor.Setting
SGlobalSetting.settingApp.yPosDoble != (int)NbY.Value ||
SGlobalSetting.settingApp.WidthDoble != (int)NbWidth.Value ||
SGlobalSetting.settingApp.HeightDoble != (int)NbHeight.Value ||
SGlobalSetting.settingApp.DialogName != TbDlgName.Text
SGlobalSetting.settingApp.DialogName != TbDlgName.Text ||
SGlobalSetting.settingApp.ConnectMode != cbConnectMode.Checked ||
SGlobalSetting.settingApp.StartMode != cbStartMode.Checked
);
}
@ -89,5 +95,13 @@ namespace Remontor.Setting
{
}
private void BtSetCurrentPos_Click(object sender, EventArgs e)
{
NbX.Value = SConnector.FormMain.Location.X;
NbY.Value = SConnector.FormMain.Location.Y;
NbWidth.Value = SConnector.FormMain.Width;
NbHeight.Value = SConnector.FormMain.Height;
}
}
}

2
Remontor/Setting/SettingSCCM.cs
View File

@ -23,7 +23,7 @@ namespace Remontor.Setting
username = string.Empty;
password = string.Empty;
on = false;
windowsAuth = false;
windowsAuth = true;
}
}

72
Remontor/Setting/SettingSCCMControl.Designer.cs generated
View File

@ -30,11 +30,6 @@
{
this.groupBox2 = new System.Windows.Forms.GroupBox();
this.bt_checkConnect = new System.Windows.Forms.Button();
this.label10 = new System.Windows.Forms.Label();
this.ib_password = new System.Windows.Forms.TextBox();
this.label11 = new System.Windows.Forms.Label();
this.ib_username = new System.Windows.Forms.TextBox();
this.cb_windowsAuth = new System.Windows.Forms.CheckBox();
this.label9 = new System.Windows.Forms.Label();
this.ib_dataBase = new System.Windows.Forms.TextBox();
this.label8 = new System.Windows.Forms.Label();
@ -46,11 +41,6 @@
// groupBox2
//
this.groupBox2.Controls.Add(this.bt_checkConnect);
this.groupBox2.Controls.Add(this.label10);
this.groupBox2.Controls.Add(this.ib_password);
this.groupBox2.Controls.Add(this.label11);
this.groupBox2.Controls.Add(this.ib_username);
this.groupBox2.Controls.Add(this.cb_windowsAuth);
this.groupBox2.Controls.Add(this.label9);
this.groupBox2.Controls.Add(this.ib_dataBase);
this.groupBox2.Controls.Add(this.label8);
@ -58,7 +48,7 @@
this.groupBox2.Controls.Add(this.cb_on);
this.groupBox2.Location = new System.Drawing.Point(3, 3);
this.groupBox2.Name = "groupBox2";
this.groupBox2.Size = new System.Drawing.Size(319, 173);
this.groupBox2.Size = new System.Drawing.Size(319, 115);
this.groupBox2.TabIndex = 3;
this.groupBox2.TabStop = false;
this.groupBox2.Text = "Параметры поиска";
@ -67,7 +57,7 @@
// bt_checkConnect
//
this.bt_checkConnect.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.bt_checkConnect.Location = new System.Drawing.Point(196, 143);
this.bt_checkConnect.Location = new System.Drawing.Point(198, 81);
this.bt_checkConnect.Name = "bt_checkConnect";
this.bt_checkConnect.Size = new System.Drawing.Size(112, 23);
this.bt_checkConnect.TabIndex = 11;
@ -75,53 +65,6 @@
this.bt_checkConnect.UseVisualStyleBackColor = true;
this.bt_checkConnect.Click += new System.EventHandler(this.bt_checkConnect_Click);
//
// label10
//
this.label10.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.label10.AutoSize = true;
this.label10.Location = new System.Drawing.Point(162, 102);
this.label10.Name = "label10";
this.label10.Size = new System.Drawing.Size(45, 13);
this.label10.TabIndex = 10;
this.label10.Text = "Пароль";
//
// ib_password
//
this.ib_password.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.ib_password.Location = new System.Drawing.Point(165, 118);
this.ib_password.Name = "ib_password";
this.ib_password.PasswordChar = '•';
this.ib_password.Size = new System.Drawing.Size(145, 20);
this.ib_password.TabIndex = 9;
//
// label11
//
this.label11.AutoSize = true;
this.label11.Location = new System.Drawing.Point(6, 102);
this.label11.Name = "label11";
this.label11.Size = new System.Drawing.Size(38, 13);
this.label11.TabIndex = 8;
this.label11.Text = "Логин";
//
// ib_username
//
this.ib_username.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.ib_username.Location = new System.Drawing.Point(6, 117);
this.ib_username.Name = "ib_username";
this.ib_username.Size = new System.Drawing.Size(145, 20);
this.ib_username.TabIndex = 7;
//
// cb_windowsAuth
//
this.cb_windowsAuth.AutoSize = true;
this.cb_windowsAuth.Location = new System.Drawing.Point(10, 82);
this.cb_windowsAuth.Name = "cb_windowsAuth";
this.cb_windowsAuth.Size = new System.Drawing.Size(157, 17);
this.cb_windowsAuth.TabIndex = 6;
this.cb_windowsAuth.Text = "Аутентификация Windows";
this.cb_windowsAuth.UseVisualStyleBackColor = true;
this.cb_windowsAuth.CheckedChanged += new System.EventHandler(this.cb_windowsAuth_CheckedChanged);
//
// label9
//
this.label9.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@ -135,7 +78,7 @@
// ib_dataBase
//
this.ib_dataBase.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.ib_dataBase.Location = new System.Drawing.Point(165, 55);
this.ib_dataBase.Location = new System.Drawing.Point(165, 56);
this.ib_dataBase.Name = "ib_dataBase";
this.ib_dataBase.Size = new System.Drawing.Size(145, 20);
this.ib_dataBase.TabIndex = 4;
@ -152,7 +95,7 @@
// ib_server
//
this.ib_server.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Left | System.Windows.Forms.AnchorStyles.Right)));
this.ib_server.Location = new System.Drawing.Point(6, 55);
this.ib_server.Location = new System.Drawing.Point(6, 56);
this.ib_server.Name = "ib_server";
this.ib_server.Size = new System.Drawing.Size(145, 20);
this.ib_server.TabIndex = 1;
@ -174,7 +117,7 @@
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.groupBox2);
this.Name = "SettingSCCMControl";
this.Size = new System.Drawing.Size(326, 178);
this.Size = new System.Drawing.Size(326, 122);
this.groupBox2.ResumeLayout(false);
this.groupBox2.PerformLayout();
this.ResumeLayout(false);
@ -185,11 +128,6 @@
private System.Windows.Forms.GroupBox groupBox2;
private System.Windows.Forms.Button bt_checkConnect;
private System.Windows.Forms.Label label10;
private System.Windows.Forms.TextBox ib_password;
private System.Windows.Forms.Label label11;
private System.Windows.Forms.TextBox ib_username;
private System.Windows.Forms.CheckBox cb_windowsAuth;
private System.Windows.Forms.Label label9;
private System.Windows.Forms.TextBox ib_dataBase;
private System.Windows.Forms.Label label8;

29
Remontor/Setting/SettingSCCMControl.cs
View File

@ -21,8 +21,6 @@ namespace Remontor.Setting
UpdateSetting();
SMetodForm.EnableContextMenu(ib_server);
SMetodForm.EnableContextMenu(ib_dataBase);
SMetodForm.EnableContextMenu(ib_username);
SMetodForm.EnableContextMenu(ib_password);
}
@ -32,26 +30,19 @@ namespace Remontor.Setting
{
ib_server.Text = SGlobalSetting.settingSCCM.server;
ib_dataBase.Text = SGlobalSetting.settingSCCM.dataBase;
ib_username.Text = SGlobalSetting.settingSCCM.username;
ib_password.Text = SGlobalSetting.settingSCCM.password;
cb_on.Checked = SGlobalSetting.settingSCCM.on;
cb_windowsAuth.Checked = SGlobalSetting.settingSCCM.windowsAuth;
SearchControl(cb_on.Checked);
}
}
private void AuthControl(bool enable)
{
ib_username.Enabled = enable;
ib_password.Enabled = enable;
}
private void SearchControl(bool enable)
{
ib_server.Enabled = enable;
ib_dataBase.Enabled = enable;
cb_windowsAuth.Enabled = enable;
bt_checkConnect.Enabled = enable;
AuthControl(!cb_windowsAuth.Checked && enable);
}
private void cb_on_CheckedChanged(object sender, EventArgs e)
@ -61,17 +52,14 @@ namespace Remontor.Setting
private void cb_windowsAuth_CheckedChanged(object sender, EventArgs e)
{
AuthControl(!cb_windowsAuth.Checked);
}
public bool edited()
{
return (SGlobalSetting.settingSCCM.server != ib_server.Text ||
SGlobalSetting.settingSCCM.dataBase != ib_dataBase.Text ||
SGlobalSetting.settingSCCM.username != ib_username.Text ||
SGlobalSetting.settingSCCM.password != ib_password.Text ||
SGlobalSetting.settingSCCM.on != cb_on.Checked ||
SGlobalSetting.settingSCCM.windowsAuth != cb_windowsAuth.Checked);
SGlobalSetting.settingSCCM.on != cb_on.Checked);
}
@ -79,17 +67,15 @@ namespace Remontor.Setting
{
SGlobalSetting.settingSCCM.server = ib_server.Text;
SGlobalSetting.settingSCCM.dataBase = ib_dataBase.Text;
SGlobalSetting.settingSCCM.username = ib_username.Text;
SGlobalSetting.settingSCCM.password = ib_password.Text;
SGlobalSetting.settingSCCM.on = cb_on.Checked;
SGlobalSetting.settingSCCM.windowsAuth = cb_windowsAuth.Checked;
}
private void bt_checkConnect_Click(object sender, EventArgs e)
{
SConnector.FormMain.ShowOn = true;
SeachSCCM SeacherCheck = new SeachSCCM(cb_windowsAuth.Checked, ib_username.Text, ib_password.Text);
SeachSCCM SeacherCheck = new SeachSCCM(true);
MessageBox.Show(SeacherCheck.CheckConnect(ib_server.Text,ib_dataBase.Text));
SConnector.FormMain.ShowOn = false;
}
@ -100,3 +86,4 @@ namespace Remontor.Setting
}
}
}

BIN
Remontor/bin/Debug/res.dat
View File

Binary file not shown.

BIN
Remontor/bin/Release/SCCMанагер.exe
View File

Binary file not shown.

BIN
Remontor/bin/Release/SCCMанагер.pdb
View File

Binary file not shown.

BIN
Remontor/bin/Release/res.dat
View File

Binary file not shown.

BIN
Remontor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
Remontor/obj/Release/DesignTimeResolveAssemblyReferences.cache
View File

Binary file not shown.

BIN
Remontor/obj/Release/DesignTimeResolveAssemblyReferencesInput.cache
View File

Binary file not shown.

BIN
Remontor/obj/Release/Remontor.Properties.Resources.resources
View File

Binary file not shown.

2
Remontor/obj/Release/Remontor.csproj.CoreCompileInputs.cache
View File

@ -1 +1 @@
83a4d0ce82387745d4a30e6240992c32ac7a5850
fefec1afbddeafae0cd40a02c6097e5d369a23f80ba62be103438b0428d09428

27
Remontor/obj/Release/Remontor.csproj.FileListAbsolute.txt
View File

@ -26,3 +26,30 @@ C:\Users\klavi\source\repos\Remontor\Remontor\bin\Release\SCCMанагер.exe
C:\Users\klavi\source\repos\Remontor\Remontor\bin\Release\SCCMанагер.pdb
C:\Users\klavi\source\repos\Remontor\Remontor\obj\Release\SCCMанагер.exe
C:\Users\klavi\source\repos\Remontor\Remontor\obj\Release\SCCMанагер.pdb
C:\Users\Владимир\source\repos\Remontor\Remontor\bin\Release\SCCMанагер.exe.config
C:\Users\Владимир\source\repos\Remontor\Remontor\bin\Release\SCCMанагер.exe
C:\Users\Владимир\source\repos\Remontor\Remontor\bin\Release\SCCMанагер.pdb
C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Release\Remontor.csproj.AssemblyReference.cache
C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Release\Remontor.BarButtonControl.resources
C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Release\Remontor.BarSessionControl.resources
C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Release\Remontor.Finder.Finder.resources
C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Release\Remontor.FlowContainerWords.resources
C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Release\Remontor.FlowContainer.resources
C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Release\Remontor.FlowConteinerSetting.resources
C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Release\Remontor.Form1.resources
C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Release\Remontor.History.HistoryControl.resources
C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Release\Remontor.MenuStripCommand.resources
C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Release\Remontor.Properties.Resources.resources
C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Release\Remontor.SessionItemControl.resources
C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Release\Remontor.Setting.settingAppControl.resources
C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Release\Remontor.Setting.SettingSCCMControl.resources
C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Release\Remontor.Setting.SettingWordsControl.resources
C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Release\Remontor.Words.AboutForm.resources
C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Release\Remontor.Words.BilderWords.resources
C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Release\Remontor.Words.WordsEditCategoryControl.resources
C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Release\Remontor.Words.WordsEditCompControl.resources
C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Release\Remontor.Words.WordsItemControl.resources
C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Release\Remontor.csproj.GenerateResource.cache
C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Release\Remontor.csproj.CoreCompileInputs.cache
C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Release\SCCMанагер.exe
C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Release\SCCMанагер.pdb

BIN
Remontor/obj/Release/Remontor.csproj.GenerateResource.cache
View File

Binary file not shown.

BIN
Remontor/obj/Release/SCCMанагер.exe
View File

Binary file not shown.

BIN
Remontor/obj/Release/SCCMанагер.pdb
View File

Binary file not shown.

BIN
Remontor/obj/Release/TempPE/Properties.Resources.Designer.cs.dll
View File

Binary file not shown.