Внесли правки, добаили меню
This commit is contained in:
parent
dab1f0b45f
commit
250a59a78d
Binary file not shown.
File diff suppressed because it is too large
Load Diff
File diff suppressed because it is too large
Load Diff
|
|
@ -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.3";
|
||||
//
|
||||
// groupBox1
|
||||
//
|
||||
|
|
|
|||
|
|
@ -53,7 +53,7 @@
|
|||
//
|
||||
// BtSave
|
||||
//
|
||||
this.BtSave.Location = new System.Drawing.Point(3, 554);
|
||||
this.BtSave.Location = new System.Drawing.Point(3, 545);
|
||||
this.BtSave.Name = "BtSave";
|
||||
this.BtSave.Size = new System.Drawing.Size(323, 28);
|
||||
this.BtSave.TabIndex = 3;
|
||||
|
|
@ -84,14 +84,14 @@
|
|||
//
|
||||
this.settingSCCMControl1.Location = new System.Drawing.Point(3, 112);
|
||||
this.settingSCCMControl1.Name = "settingSCCMControl1";
|
||||
this.settingSCCMControl1.Size = new System.Drawing.Size(323, 178);
|
||||
this.settingSCCMControl1.Size = new System.Drawing.Size(323, 120);
|
||||
this.settingSCCMControl1.TabIndex = 1;
|
||||
//
|
||||
// settingAppControl1
|
||||
//
|
||||
this.settingAppControl1.Location = new System.Drawing.Point(3, 296);
|
||||
this.settingAppControl1.Location = new System.Drawing.Point(3, 238);
|
||||
this.settingAppControl1.Name = "settingAppControl1";
|
||||
this.settingAppControl1.Size = new System.Drawing.Size(325, 252);
|
||||
this.settingAppControl1.Size = new System.Drawing.Size(325, 301);
|
||||
this.settingAppControl1.TabIndex = 2;
|
||||
//
|
||||
// FlowConteinerSetting
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -31,13 +31,15 @@ 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;
|
||||
|
||||
|
|
@ -130,5 +132,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);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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());
|
||||
|
|
|
|||
|
|
@ -29,6 +29,8 @@
|
|||
private void InitializeComponent()
|
||||
{
|
||||
this.groupBox3 = new System.Windows.Forms.GroupBox();
|
||||
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 +50,7 @@
|
|||
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.BtSetCurrentPos = new System.Windows.Forms.Button();
|
||||
this.groupBox3.SuspendLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.NbHeight)).BeginInit();
|
||||
((System.ComponentModel.ISupportInitialize)(this.NbWidth)).BeginInit();
|
||||
|
|
@ -61,6 +62,7 @@
|
|||
//
|
||||
// groupBox3
|
||||
//
|
||||
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 +85,29 @@
|
|||
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, 296);
|
||||
this.groupBox3.TabIndex = 4;
|
||||
this.groupBox3.TabStop = false;
|
||||
this.groupBox3.Text = "Параметры приложения";
|
||||
//
|
||||
// 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 +176,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 +193,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 +304,15 @@
|
|||
//
|
||||
this.openFileDialog1.FileName = "CmRcViewer.exe";
|
||||
//
|
||||
// TbDlgName
|
||||
// BtSetCurrentPos
|
||||
//
|
||||
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;
|
||||
//
|
||||
// label9
|
||||
//
|
||||
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.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);
|
||||
//
|
||||
// settingAppControl
|
||||
//
|
||||
|
|
@ -298,7 +320,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, 302);
|
||||
this.groupBox3.ResumeLayout(false);
|
||||
this.groupBox3.PerformLayout();
|
||||
((System.ComponentModel.ISupportInitialize)(this.NbHeight)).EndInit();
|
||||
|
|
@ -335,5 +357,6 @@
|
|||
private System.Windows.Forms.Label label8;
|
||||
private System.Windows.Forms.TextBox TbDlgName;
|
||||
private System.Windows.Forms.Label label9;
|
||||
private System.Windows.Forms.Button BtSetCurrentPos;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -89,5 +89,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;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -23,7 +23,7 @@ namespace Remontor.Setting
|
|||
username = string.Empty;
|
||||
password = string.Empty;
|
||||
on = false;
|
||||
windowsAuth = false;
|
||||
windowsAuth = true;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -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;
|
||||
|
|
|
|||
|
|
@ -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
|
|||
}
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
|
@ -1 +1 @@
|
|||
83a4d0ce82387745d4a30e6240992c32ac7a5850
|
||||
fefec1afbddeafae0cd40a02c6097e5d369a23f80ba62be103438b0428d09428
|
||||
|
|
|
|||
|
|
@ -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
|
||||
|
|
|
|||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Loading…
Reference in New Issue