добавили конекстное меню и перехват диалога цссь

This commit is contained in:
klavirshik 2024-10-28 02:25:41 +02:00
parent a36007fdd1
commit fcbc5c5b7d
45 changed files with 968 additions and 377 deletions

Binary file not shown.

View File

@ -30,6 +30,8 @@
{
this.NameBtn = new System.Windows.Forms.Label();
this.CloseBtn = new System.Windows.Forms.Button();
this.PbPerson = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.PbPerson)).BeginInit();
this.SuspendLayout();
//
// NameBtn
@ -37,7 +39,7 @@
this.NameBtn.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)));
this.NameBtn.AutoSize = true;
this.NameBtn.Location = new System.Drawing.Point(7, 4);
this.NameBtn.Location = new System.Drawing.Point(42, 13);
this.NameBtn.Name = "NameBtn";
this.NameBtn.Size = new System.Drawing.Size(13, 13);
this.NameBtn.TabIndex = 8;
@ -53,24 +55,38 @@
this.CloseBtn.FlatAppearance.BorderSize = 0;
this.CloseBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.CloseBtn.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.CloseBtn.Location = new System.Drawing.Point(20, 1);
this.CloseBtn.Location = new System.Drawing.Point(97, 1);
this.CloseBtn.Name = "CloseBtn";
this.CloseBtn.Size = new System.Drawing.Size(20, 20);
this.CloseBtn.TabIndex = 7;
this.CloseBtn.UseVisualStyleBackColor = false;
this.CloseBtn.Click += new System.EventHandler(this.CloseBtn_Click);
//
// PbPerson
//
this.PbPerson.Image = global::Remontor.Properties.Resources.Person;
this.PbPerson.Location = new System.Drawing.Point(1, 2);
this.PbPerson.Name = "PbPerson";
this.PbPerson.Size = new System.Drawing.Size(41, 37);
this.PbPerson.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.PbPerson.TabIndex = 9;
this.PbPerson.TabStop = false;
this.PbPerson.Click += new System.EventHandler(this.NameBtn_Click);
//
// BarButtonControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.BackColor = System.Drawing.SystemColors.Control;
this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None;
this.Controls.Add(this.PbPerson);
this.Controls.Add(this.NameBtn);
this.Controls.Add(this.CloseBtn);
this.Margin = new System.Windows.Forms.Padding(0);
this.Name = "BarButtonControl";
this.Size = new System.Drawing.Size(42, 21);
this.Size = new System.Drawing.Size(119, 40);
this.Click += new System.EventHandler(this.NameBtn_Click);
((System.ComponentModel.ISupportInitialize)(this.PbPerson)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@ -80,5 +96,6 @@
private System.Windows.Forms.Button CloseBtn;
private System.Windows.Forms.Label NameBtn;
private System.Windows.Forms.PictureBox PbPerson;
}
}

View File

@ -1,4 +1,6 @@
using Remontor.Connector;
using Remontor.Picter;
using Remontor.Seacher;
using System;
using System.Collections.Generic;
using System.ComponentModel;
@ -25,9 +27,11 @@ namespace Remontor
if(backColor) this.BackColor = Color.Gainsboro;
this.connect = connect;
NameBtn.Text = connect.toString();
this.Width = NameBtn.Width + 32;
this.Width = NameBtn.Width + 72;
Background = this.BackColor;
connect.Update += UpdateAct;
SPicManager.PictureSet(PbPerson, connect.GetComp);
}
private void UpdateAct()

View File

@ -30,51 +30,45 @@
{
this.FlowButton = new System.Windows.Forms.FlowLayoutPanel();
this.NewBtn = new System.Windows.Forms.Button();
this.label1 = new System.Windows.Forms.Label();
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.button5 = new System.Windows.Forms.Button();
this.RecoonectBt = new System.Windows.Forms.Button();
this.ShowBar = new System.Windows.Forms.Button();
this.FlowButton.SuspendLayout();
this.SuspendLayout();
//
// FlowButton
//
this.FlowButton.Anchor = ((System.Windows.Forms.AnchorStyles)((((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom)
| System.Windows.Forms.AnchorStyles.Left)
| System.Windows.Forms.AnchorStyles.Right)));
this.FlowButton.Controls.Add(this.NewBtn);
this.FlowButton.Location = new System.Drawing.Point(0, 20);
this.FlowButton.Location = new System.Drawing.Point(0, 1);
this.FlowButton.Margin = new System.Windows.Forms.Padding(0);
this.FlowButton.Name = "FlowButton";
this.FlowButton.Size = new System.Drawing.Size(687, 20);
this.FlowButton.Size = new System.Drawing.Size(687, 39);
this.FlowButton.TabIndex = 8;
this.FlowButton.ControlRemoved += new System.Windows.Forms.ControlEventHandler(this.FlowButton_ControlRemoved);
//
// NewBtn
//
this.NewBtn.BackColor = System.Drawing.Color.Transparent;
this.NewBtn.BackgroundImage = global::Remontor.Properties.Resources.add_circle_24dp_19C016_FILL0_wght400_GRAD0_opsz24;
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(20, 20);
this.NewBtn.Size = new System.Drawing.Size(40, 40);
this.NewBtn.TabIndex = 0;
this.NewBtn.UseVisualStyleBackColor = false;
this.NewBtn.Click += new System.EventHandler(this.NewBtn_Click);
//
// label1
//
this.label1.AutoSize = true;
this.label1.Location = new System.Drawing.Point(492, 4);
this.label1.Name = "label1";
this.label1.Size = new System.Drawing.Size(195, 13);
this.label1.TabIndex = 15;
this.label1.Text = "Продолжительность сессии 23:32:33";
//
// ShowSetting
//
this.ShowSetting.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
@ -167,20 +161,21 @@
this.DobleMonFull.UseVisualStyleBackColor = false;
this.DobleMonFull.Click += new System.EventHandler(this.DobleMonFull_Click);
//
// button5
// RecoonectBt
//
this.button5.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.button5.BackColor = System.Drawing.SystemColors.Control;
this.button5.BackgroundImage = global::Remontor.Properties.Resources.sync_24dp_2854C5_FILL0_wght400_GRAD0_opsz24;
this.button5.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.button5.FlatAppearance.BorderSize = 0;
this.button5.FlatStyle = System.Windows.Forms.FlatStyle.Flat;
this.button5.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204)));
this.button5.Location = new System.Drawing.Point(690, 0);
this.button5.Name = "button5";
this.button5.Size = new System.Drawing.Size(40, 40);
this.button5.TabIndex = 5;
this.button5.UseVisualStyleBackColor = false;
this.RecoonectBt.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right)));
this.RecoonectBt.BackColor = System.Drawing.SystemColors.Control;
this.RecoonectBt.BackgroundImage = global::Remontor.Properties.Resources.sync_24dp_2854C5_FILL0_wght400_GRAD0_opsz24;
this.RecoonectBt.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
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, 0);
this.RecoonectBt.Name = "RecoonectBt";
this.RecoonectBt.Size = new System.Drawing.Size(40, 40);
this.RecoonectBt.TabIndex = 5;
this.RecoonectBt.UseVisualStyleBackColor = false;
this.RecoonectBt.MouseDown += new System.Windows.Forms.MouseEventHandler(this.RecoonectBt_Click);
//
// ShowBar
//
@ -201,21 +196,19 @@
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.ShowSetting);
this.Controls.Add(this.label1);
this.Controls.Add(this.ShowWords);
this.Controls.Add(this.OneMonBt);
this.Controls.Add(this.DobleMonOneBt);
this.Controls.Add(this.DobleMonTwoBt);
this.Controls.Add(this.DobleMonFull);
this.Controls.Add(this.FlowButton);
this.Controls.Add(this.button5);
this.Controls.Add(this.RecoonectBt);
this.Controls.Add(this.ShowBar);
this.Name = "BarSessionControl";
this.Size = new System.Drawing.Size(1082, 39);
this.Load += new System.EventHandler(this.BarSessionControl_Load);
this.FlowButton.ResumeLayout(false);
this.ResumeLayout(false);
this.PerformLayout();
}
@ -223,7 +216,7 @@
private System.Windows.Forms.Button NewBtn;
private System.Windows.Forms.Button ShowBar;
private System.Windows.Forms.Button button5;
private System.Windows.Forms.Button RecoonectBt;
private System.Windows.Forms.FlowLayoutPanel FlowButton;
private System.Windows.Forms.Button DobleMonFull;
private System.Windows.Forms.Button DobleMonTwoBt;
@ -231,6 +224,5 @@
private System.Windows.Forms.Button OneMonBt;
private System.Windows.Forms.Button ShowWords;
private System.Windows.Forms.Button ShowSetting;
private System.Windows.Forms.Label label1;
}
}

View File

@ -150,6 +150,37 @@ namespace Remontor
SConnector.SetModeMon(new DobleMonFull());
}
private void CloseMenu()
{
RecoonectBt.BackColor = SystemColors.Control;
}
private void RecoonectBt_Click(object sender, MouseEventArgs e)
{
if(e.Button == MouseButtons.Left)
{
if (SConnector.ActionConnect != null)
{
SConnector.DeleteConnect(SConnector.ActionConnect);
SConnector.ActionConnect.Delete();
SConnector.NewConnect(SConnector.ActionConnect.GetComp);
}
}else if (e.Button == MouseButtons.Right)
{
if (SConnector.ActionConnect != null)
{
if (sender is Button)
{
Button bt = (Button)sender;
bt.BackColor = SystemColors.ActiveCaption;
Control control = (Control)sender;
SConnector.FormMain.MenuStripCommand.ShowMenuUpdate(SConnector.ActionConnect, control.PointToScreen(e.Location), CloseMenu);
}
}
}
}
}
}

View File

@ -7,7 +7,7 @@ using System.Threading.Tasks;
namespace Remontor
{
internal interface IComp
public interface IComp
{
string GetName();
string GetNetName();

View File

@ -2,9 +2,12 @@
using System;
using System.Collections.Generic;
using System.Diagnostics;
using System.Drawing;
using System.Linq;
using System.Net;
using System.Runtime.InteropServices;
using System.Text;
using System.Threading;
using System.Threading.Tasks;
using System.Windows.Forms;
@ -24,37 +27,59 @@ namespace Remontor.Connector
private const int SWP_NOMOVE = 0x2;
private const int SWP_NOSIZE = 0x1;
private const int GWL_STYLE = (-16);
private const int WS_VISIBLE = 0x10000000;
private const uint WS_VISIBLE = 0x10000000;
private const int WM_CLOSE = 0x10;
private const int WS_CHILD = 0x40000000;
private const uint WS_CHILD = 0x40000000;
private const uint WS_POPUP = 0x80000000;
private const uint WS_OVERLAPPED = 0x00000000;
private const uint WS_THICKFRAME = 0x00040000;
private const uint WS_DISABLED = 0x08000000;
private const uint WS_MINIMIZE = 0x20000000;
public const uint WS_MAXIMIZEBOX = 0x00010000;
[DllImport("user32.dll")]
static extern IntPtr SetParent(IntPtr hWndChild, IntPtr hWndNewParent);
[DllImport("user32.dll")]
static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
static extern int SetWindowLong(IntPtr hWnd, int nIndex, uint dwNewLong);
[DllImport("user32.dll", SetLastError = true)]
private static extern IntPtr FindWindow(string lpClassName, string lpWindowName);
[DllImport("user32.dll")]
static extern bool ShowWindow(IntPtr hWnd, int nCmdShow);
[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)
{
return FindWindow(null, title);
}
private IModeMon ModeMonitor;
private Process Proc;
private bool Active = false;
private IComp Comp;
private string Login = "";
private string ConnectStr;
public delegate void UpdateConnect();
public event UpdateConnect Update;
public Control View;
public IntPtr hwnd;
public Connect(IComp comp)
{
Comp = comp;
ConnectStr = Comp.GetNetNameStr();
}
public Connect(IComp comp, string login)
public Connect(IComp comp, IPAddress ip)
{
this.Comp = comp;
this.Login = login;
ConnectStr = ip.ToString();
}
public void ConnectSCCM(Control panel)
@ -64,13 +89,18 @@ namespace Remontor.Connector
View.Dock = DockStyle.Fill;
panel.Controls.Add(View);
ModeMonitor = new OneMon();
Proc = Process.Start(SGlobalSetting.settingApp.pathApp, Comp.GetNetNameStr());
Proc = Process.Start(SGlobalSetting.settingApp.pathApp, ConnectStr);
//Proc = Process.Start(SGlobalSetting.settingApp.pathApp);
//Thread.Sleep(500); // Allow the process to open it's window
Proc.WaitForInputIdle();
SetParent(Proc.MainWindowHandle, View.Handle);
SetWindowLong(Proc.MainWindowHandle, GWL_STYLE, WS_VISIBLE);
ModeMonitor.Resize(Proc, View);
//Thread.Sleep(500);
hwnd = GetWindowHandleByTitle("Contacting Remote Control Agent on client " + ConnectStr);
Point CenterView = new Point(View.Bounds.Width/2, View.Bounds.Height/2);
Point CenterDraw = View.PointToScreen(CenterView);
MoveWindow(hwnd, CenterDraw.X- 325, CenterDraw.Y - 125 ,650,250,true);
}
catch (Exception) {
MessageBox.Show("Не верно заданно приложение для подключения.");
@ -86,7 +116,20 @@ namespace Remontor.Connector
{
this.Active = act;
View.Visible = act;
if(act)Resize();
if (act) Resize();
if (act)
{
ShowWindow(hwnd, 5);
Point CenterView = new Point(View.Bounds.Width / 2, View.Bounds.Height / 2);
Point CenterDraw = View.PointToScreen(CenterView);
MoveWindow(hwnd, CenterDraw.X - 325, CenterDraw.Y - 125, 650, 250, true);
}
else
{
ShowWindow(hwnd, 0);
}
ModeMonitor.Resize(Proc, View);
Update();
}
@ -100,6 +143,9 @@ namespace Remontor.Connector
public void Resize()
{
ModeMonitor.Resize(Proc, View);
Point CenterView = new Point(View.Bounds.Width / 2, View.Bounds.Height / 2);
Point CenterDraw = View.PointToScreen(CenterView);
MoveWindow(hwnd, CenterDraw.X - 325, CenterDraw.Y - 125, 650, 250, true);
}
public IModeMon GetModeMon()
@ -135,6 +181,8 @@ namespace Remontor.Connector
ModeMonitor = new OffMon();
SConnector.Panel.Controls.Remove(View);
if (Proc != null) Proc.Close();
if (Proc != null) Proc.Dispose();
Proc = null;
}
}
}

View File

@ -3,6 +3,7 @@ using System;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
using System.Runtime.InteropServices;
using System.Runtime.Remoting.Contexts;
using System.Text;
using System.Threading.Tasks;
@ -31,6 +32,17 @@ namespace Remontor.Connector
HistoryList.Add(con);
}
public static void NewConnectIP(IComp comp)
{
Connect con = new Connect(comp, comp.GetIP());
Connects.Add(con);
Update(Connects);
con.ConnectSCCM(Panel);
Activ(con);
HistoryList.Add(con);
}
public static void Activ(Connect actConnect)
{
@ -53,6 +65,17 @@ namespace Remontor.Connector
UpdateMode(ActionConnect.GetModeMon());
}
public static void CloseAllSession()
{
Connect[] buffConnects = new Connect[Connects.Count];
Connects.CopyTo(buffConnects);
foreach(Connect connect in buffConnects)
{
DeleteConnect(connect);
}
}
public static void SetModeMon(IModeMon Mode)
{
if(ActionConnect != null)

View File

@ -21,6 +21,7 @@ namespace Remontor.Finder
public Finder()
{
InitializeComponent();
SConnector.FormMain.MenuStripCommand.actForm = this;
}
private void ConnectBtn_Click(object sender, EventArgs e)
@ -155,7 +156,7 @@ namespace Remontor.Finder
private void Finder_FormClosed(object sender, FormClosedEventArgs e)
{
SConnector.FormMain.MenuStripCommand.actForm = null;
}
}
}

View File

@ -37,13 +37,14 @@ namespace Remontor
public void UpdateHistory(List<HistoryItem> items)
{
HistoryPanel.SuspendLayout();
HistoryPanel.Controls.Clear();
foreach(HistoryItem item in items)
{
HistoryControl HistoryItem = new HistoryControl(item);
HistoryPanel.Controls.Add(HistoryItem);
}
HistoryPanel.ResumeLayout();
}
private void BtSave_Click(object sender, EventArgs e)

View File

@ -68,6 +68,13 @@ namespace Remontor
}
private void CloseMenu()
{
tapNode = false;
}
private void TreeView_NodeMouseClick(object sender, TreeNodeMouseClickEventArgs e)
{
@ -79,9 +86,11 @@ namespace Remontor
{
if (BoundsNode.Contains(e.Location) && e.Node.Tag is WordsComp)
{
Control control = (Control)sender;
SConnector.FormMain.MenuStripCommand.ShowMenuWords(((WordsComp)e.Node.Tag).GetComp(), control.PointToScreen(e.Location), CloseMenu);
tree.SelectedNode = e.Node;
//System.Console.WriteLine("click") ;
// cm_words.Show(tree.PointToScreen(e.Location));
tapNode = true;
}
else
{

View File

@ -121,6 +121,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.Move += new System.EventHandler(this.tabControl1_SizeChanged);
this.Resize += new System.EventHandler(this.tabControl1_SizeChanged);
this.panel3.ResumeLayout(false);
this.panel3.PerformLayout();

View File

@ -18,12 +18,12 @@ using static System.Windows.Forms.VisualStyles.VisualStyleElement;
namespace Remontor
{
public partial class Form1 : Form
internal partial class Form1 : Form
{
public bool CloseOn = false;
public bool ShowOn = false;
public MenuStripCommand MenuStripCommand;
public Form1()
{
SGlobalSetting.LoadSetting();
@ -35,7 +35,8 @@ namespace Remontor
SConnector.Panel = this.panel3;
SConnector.FormMain = this;
MenuStripCommand = new MenuStripCommand();
MenuStripCommand.UpdateTree += flowContainerWords1.UpdateTree;
flowConteinerSetting1.settingWordsControl1.UpdateTree += flowContainerWords1.UpdateTree;
flowConteinerSetting1.UpdateTree += flowContainerWords1.UpdateTree;
flowConteinerSetting1.Save += flowContainerWords1.Save;
@ -46,18 +47,8 @@ namespace Remontor
}
private void FlowConteinerSetting1_Save()
{
throw new NotImplementedException();
}
[DllImport("user32.dll")]
static extern IntPtr SetParent(IntPtr hWndChild, IntPtr hWndNewParent);
[DllImport("user32.dll")]
static extern int SetWindowLong(IntPtr hWnd, int nIndex, int dwNewLong);
[DllImport("user32.dll")]
static extern bool MoveWindow(IntPtr Handle, int x, int y, int w, int h, bool repaint);
private void tabControl1_SizeChanged(object sender, EventArgs e)
{
SConnector.ResizeActiv();
@ -97,11 +88,17 @@ namespace Remontor
private void Form1_FormClosing(object sender, FormClosingEventArgs e)
{
SConnector.CloseAllSession();
CloseOn = true;
flowContainerWords1.Save();
SGlobalSetting.SaveSettig();
}
private void menuStrip1_ItemClicked(object sender, ToolStripItemClickedEventArgs e)
{
}
}
}

View File

@ -31,10 +31,10 @@
this.label3 = new System.Windows.Forms.Label();
this.label2 = new System.Windows.Forms.Label();
this.label1 = new System.Windows.Forms.Label();
this.Photo = new System.Windows.Forms.PictureBox();
this.TimeLB = new System.Windows.Forms.Label();
this.FIOLB = new System.Windows.Forms.Label();
this.PCLB = new System.Windows.Forms.Label();
this.Photo = new System.Windows.Forms.PictureBox();
((System.ComponentModel.ISupportInitialize)(this.Photo)).BeginInit();
this.SuspendLayout();
//
@ -46,6 +46,8 @@
this.label3.Size = new System.Drawing.Size(40, 13);
this.label3.TabIndex = 7;
this.label3.Text = "Время";
this.label3.DoubleClick += new System.EventHandler(this.HistoryControl_DoubleClick);
this.label3.MouseClick += new System.Windows.Forms.MouseEventHandler(this.label3_MouseClick);
this.label3.MouseEnter += new System.EventHandler(this.HistoryControl_MouseEnter);
this.label3.MouseLeave += new System.EventHandler(this.HistoryControl_MouseLeave);
//
@ -57,6 +59,8 @@
this.label2.Size = new System.Drawing.Size(34, 13);
this.label2.TabIndex = 6;
this.label2.Text = "ФИО";
this.label2.DoubleClick += new System.EventHandler(this.HistoryControl_DoubleClick);
this.label2.MouseClick += new System.Windows.Forms.MouseEventHandler(this.label3_MouseClick);
this.label2.MouseEnter += new System.EventHandler(this.HistoryControl_MouseEnter);
this.label2.MouseLeave += new System.EventHandler(this.HistoryControl_MouseLeave);
//
@ -68,22 +72,11 @@
this.label1.Size = new System.Drawing.Size(47, 13);
this.label1.TabIndex = 5;
this.label1.Text = "Имя ПК";
this.label1.DoubleClick += new System.EventHandler(this.HistoryControl_DoubleClick);
this.label1.MouseClick += new System.Windows.Forms.MouseEventHandler(this.label3_MouseClick);
this.label1.MouseEnter += new System.EventHandler(this.HistoryControl_MouseEnter);
this.label1.MouseLeave += new System.EventHandler(this.HistoryControl_MouseLeave);
//
// Photo
//
this.Photo.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.Photo.Image = global::Remontor.Properties.Resources.Person;
this.Photo.Location = new System.Drawing.Point(3, 1);
this.Photo.Name = "Photo";
this.Photo.Size = new System.Drawing.Size(48, 48);
this.Photo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.Photo.TabIndex = 4;
this.Photo.TabStop = false;
this.Photo.MouseEnter += new System.EventHandler(this.HistoryControl_MouseEnter);
this.Photo.MouseLeave += new System.EventHandler(this.HistoryControl_MouseLeave);
//
// TimeLB
//
this.TimeLB.AutoSize = true;
@ -92,6 +85,8 @@
this.TimeLB.Size = new System.Drawing.Size(79, 13);
this.TimeLB.TabIndex = 10;
this.TimeLB.Text = "19:24 10.12.23";
this.TimeLB.DoubleClick += new System.EventHandler(this.HistoryControl_DoubleClick);
this.TimeLB.MouseClick += new System.Windows.Forms.MouseEventHandler(this.label3_MouseClick);
this.TimeLB.MouseEnter += new System.EventHandler(this.HistoryControl_MouseEnter);
this.TimeLB.MouseLeave += new System.EventHandler(this.HistoryControl_MouseLeave);
//
@ -103,6 +98,8 @@
this.FIOLB.Size = new System.Drawing.Size(170, 13);
this.FIOLB.TabIndex = 9;
this.FIOLB.Text = "Симаков Владимир Михайлович";
this.FIOLB.DoubleClick += new System.EventHandler(this.HistoryControl_DoubleClick);
this.FIOLB.MouseClick += new System.Windows.Forms.MouseEventHandler(this.label3_MouseClick);
this.FIOLB.MouseEnter += new System.EventHandler(this.HistoryControl_MouseEnter);
this.FIOLB.MouseLeave += new System.EventHandler(this.HistoryControl_MouseLeave);
//
@ -114,9 +111,26 @@
this.PCLB.Size = new System.Drawing.Size(117, 13);
this.PCLB.TabIndex = 8;
this.PCLB.Text = "v.simakov(1ma005524)";
this.PCLB.DoubleClick += new System.EventHandler(this.HistoryControl_DoubleClick);
this.PCLB.MouseClick += new System.Windows.Forms.MouseEventHandler(this.label3_MouseClick);
this.PCLB.MouseEnter += new System.EventHandler(this.HistoryControl_MouseEnter);
this.PCLB.MouseLeave += new System.EventHandler(this.HistoryControl_MouseLeave);
//
// Photo
//
this.Photo.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom;
this.Photo.Image = global::Remontor.Properties.Resources.Person;
this.Photo.Location = new System.Drawing.Point(3, 1);
this.Photo.Name = "Photo";
this.Photo.Size = new System.Drawing.Size(48, 48);
this.Photo.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom;
this.Photo.TabIndex = 4;
this.Photo.TabStop = false;
this.Photo.DoubleClick += new System.EventHandler(this.HistoryControl_DoubleClick);
this.Photo.MouseClick += new System.Windows.Forms.MouseEventHandler(this.label3_MouseClick);
this.Photo.MouseEnter += new System.EventHandler(this.HistoryControl_MouseEnter);
this.Photo.MouseLeave += new System.EventHandler(this.HistoryControl_MouseLeave);
//
// HistoryControl
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
@ -132,6 +146,8 @@
this.Margin = new System.Windows.Forms.Padding(0);
this.Name = "HistoryControl";
this.Size = new System.Drawing.Size(290, 48);
this.DoubleClick += new System.EventHandler(this.HistoryControl_DoubleClick);
this.MouseClick += new System.Windows.Forms.MouseEventHandler(this.label3_MouseClick);
this.MouseEnter += new System.EventHandler(this.HistoryControl_MouseEnter);
this.MouseLeave += new System.EventHandler(this.HistoryControl_MouseLeave);
((System.ComponentModel.ISupportInitialize)(this.Photo)).EndInit();

View File

@ -17,6 +17,8 @@ namespace Remontor.History
internal partial class HistoryControl : UserControl
{
public Color BackCustum;
private HistoryItem historyItem;
bool OpenMenu = false;
public HistoryControl()
{
InitializeComponent();
@ -32,6 +34,7 @@ namespace Remontor.History
FIOLB.Text = hitem.GetComp().GetDescription();
BackCustum = this.BackColor;
SPicManager.PictureSet(Photo, hitem.GetComp());
historyItem = hitem;
}
@ -43,7 +46,42 @@ namespace Remontor.History
private void HistoryControl_MouseLeave(object sender, EventArgs e)
{
if (!OpenMenu)
{
this.BackColor = BackCustum;
//System.Console.WriteLine("out");
}
}
private void HistoryControl_DoubleClick(object sender, EventArgs e)
{
SConnector.NewConnect(historyItem.GetComp());
}
private void CloseMenu()
{
OpenMenu = false;
this.BackColor = BackCustum;
}
private void label3_MouseClick(object sender, MouseEventArgs e)
{
if (e.Button == MouseButtons.Right)
{
if (sender is Control)
{
OpenMenu = true;
//System.Console.WriteLine("in");
this.BackColor = SystemColors.ActiveCaption;
Control control = (Control)sender;
SConnector.FormMain.MenuStripCommand.ShowMenu(historyItem.GetComp(), control.PointToScreen(e.Location), CloseMenu);
}
}
}
}
}

143
Remontor/MenuStripCommand.Designer.cs generated Normal file
View File

@ -0,0 +1,143 @@
namespace Remontor
{
partial class MenuStripCommand
{
/// <summary>
/// Обязательная переменная конструктора.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Освободить все используемые ресурсы.
/// </summary>
/// <param name="disposing">истинно, если управляемый ресурс должен быть удален; иначе ложно.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Код, автоматически созданный конструктором компонентов
/// <summary>
/// Требуемый метод для поддержки конструктора — не изменяйте
/// содержимое этого метода с помощью редактора кода.
/// </summary>
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
this.contextMenuCommand = new System.Windows.Forms.ContextMenuStrip(this.components);
this.CommandConnect = new System.Windows.Forms.ToolStripMenuItem();
this.CommandConnecIP = new System.Windows.Forms.ToolStripMenuItem();
this.CommandConnectRDP = new System.Windows.Forms.ToolStripMenuItem();
this.CommandOpenFS = new System.Windows.Forms.ToolStripMenuItem();
this.CommandOpenRegEdit = new System.Windows.Forms.ToolStripMenuItem();
this.CommandOpenControlPC = new System.Windows.Forms.ToolStripMenuItem();
this.CommandSavePC = new System.Windows.Forms.ToolStripMenuItem();
this.toolStripSeparator1 = new System.Windows.Forms.ToolStripSeparator();
this.toolStripSeparator2 = new System.Windows.Forms.ToolStripSeparator();
this.contextMenuCommand.SuspendLayout();
this.SuspendLayout();
//
// contextMenuCommand
//
this.contextMenuCommand.Items.AddRange(new System.Windows.Forms.ToolStripItem[] {
this.CommandConnect,
this.CommandConnecIP,
this.CommandConnectRDP,
this.toolStripSeparator1,
this.CommandOpenFS,
this.CommandOpenRegEdit,
this.CommandOpenControlPC,
this.toolStripSeparator2,
this.CommandSavePC});
this.contextMenuCommand.Name = "contextMenuCommand";
this.contextMenuCommand.ShowImageMargin = false;
this.contextMenuCommand.Size = new System.Drawing.Size(200, 192);
//
// CommandConnect
//
this.CommandConnect.Name = "CommandConnect";
this.CommandConnect.Size = new System.Drawing.Size(199, 22);
this.CommandConnect.Text = "Подключться...";
this.CommandConnect.Click += new System.EventHandler(this.CommandConnect_Click);
//
// CommandConnecIP
//
this.CommandConnecIP.Name = "CommandConnecIP";
this.CommandConnecIP.Size = new System.Drawing.Size(199, 22);
this.CommandConnecIP.Text = "Подключиться по IP";
this.CommandConnecIP.Click += new System.EventHandler(this.CommandConnecIP_Click);
//
// CommandConnectRDP
//
this.CommandConnectRDP.Name = "CommandConnectRDP";
this.CommandConnectRDP.Size = new System.Drawing.Size(199, 22);
this.CommandConnectRDP.Text = "Подключиться по RDP";
this.CommandConnectRDP.Click += new System.EventHandler(this.CommandConnectRDP_Click);
//
// CommandOpenFS
//
this.CommandOpenFS.Name = "CommandOpenFS";
this.CommandOpenFS.Size = new System.Drawing.Size(199, 22);
this.CommandOpenFS.Text = "Открыть проводник";
this.CommandOpenFS.Click += new System.EventHandler(this.CommandOpenFS_Click);
//
// CommandOpenRegEdit
//
this.CommandOpenRegEdit.Name = "CommandOpenRegEdit";
this.CommandOpenRegEdit.Size = new System.Drawing.Size(199, 22);
this.CommandOpenRegEdit.Text = "Открыть реестр";
this.CommandOpenRegEdit.Click += new System.EventHandler(this.CommandOpenRegEdit_Click);
//
// CommandOpenControlPC
//
this.CommandOpenControlPC.Name = "CommandOpenControlPC";
this.CommandOpenControlPC.Size = new System.Drawing.Size(199, 22);
this.CommandOpenControlPC.Text = "Открыть управление комп.";
this.CommandOpenControlPC.Click += new System.EventHandler(this.CommandOpenControlPC_Click);
//
// CommandSavePC
//
this.CommandSavePC.Name = "CommandSavePC";
this.CommandSavePC.Size = new System.Drawing.Size(199, 22);
this.CommandSavePC.Text = "Сохранить ПК";
this.CommandSavePC.Click += new System.EventHandler(this.CommandSavePC_Click);
//
// toolStripSeparator1
//
this.toolStripSeparator1.Name = "toolStripSeparator1";
this.toolStripSeparator1.Size = new System.Drawing.Size(196, 6);
//
// toolStripSeparator2
//
this.toolStripSeparator2.Name = "toolStripSeparator2";
this.toolStripSeparator2.Size = new System.Drawing.Size(196, 6);
//
// MenuStripCommand
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Name = "MenuStripCommand";
this.contextMenuCommand.ResumeLayout(false);
this.ResumeLayout(false);
}
#endregion
private System.Windows.Forms.ContextMenuStrip contextMenuCommand;
private System.Windows.Forms.ToolStripMenuItem CommandConnect;
private System.Windows.Forms.ToolStripMenuItem CommandConnecIP;
private System.Windows.Forms.ToolStripMenuItem CommandConnectRDP;
private System.Windows.Forms.ToolStripMenuItem CommandOpenFS;
private System.Windows.Forms.ToolStripMenuItem CommandOpenRegEdit;
private System.Windows.Forms.ToolStripMenuItem CommandOpenControlPC;
private System.Windows.Forms.ToolStripMenuItem CommandSavePC;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator1;
private System.Windows.Forms.ToolStripSeparator toolStripSeparator2;
}
}

View File

@ -0,0 +1,126 @@
using Remontor.Connector;
using Remontor.Finder;
using Remontor.Words;
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Diagnostics;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Remontor
{
internal partial class MenuStripCommand : UserControl
{
public delegate void DUpdateTree();
public DUpdateTree UpdateTree;
public delegate void CloseMenuDelegate();
event CloseMenuDelegate Close;
private IComp Comp;
public Form actForm;
public Connect NowConnect = null;
public MenuStripCommand()
{
InitializeComponent();
}
public void ShowMenu(IComp comp, Point point, CloseMenuDelegate close)
{
if(comp.GetIP() != null)
{
contextMenuCommand.Items[1].Enabled = true;
}
else
{
contextMenuCommand.Items[1].Enabled = false;
}
Comp = comp;
contextMenuCommand.Items[7].Visible = true;
contextMenuCommand.Items[8].Visible = true;
contextMenuCommand.Show(point);
contextMenuCommand.Closed+= ContextMenuCommand_Closed;
Close = close;
NowConnect = null;
}
public void ShowMenuUpdate(Connect connect, Point point, CloseMenuDelegate close)
{
ShowMenu(connect.GetComp, point, close);
NowConnect = connect;
}
public void ShowMenuWords(IComp comp, Point point, CloseMenuDelegate close)
{
ShowMenu(comp, point, close);
contextMenuCommand.Items[7].Visible = false;
contextMenuCommand.Items[8].Visible = false;
}
private void ContextMenuCommand_Closed(object sender, ToolStripDropDownClosedEventArgs e)
{
if(Close != null) Close();
}
private void CommandConnect_Click(object sender, EventArgs e)
{
if (NowConnect != null)
{
SConnector.DeleteConnect(NowConnect);
NowConnect.Delete();
}
if (actForm != null) actForm.Close();
SConnector.NewConnect(Comp);
}
private void CommandConnecIP_Click(object sender, EventArgs e)
{
if (NowConnect != null)
{
SConnector.DeleteConnect(NowConnect);
NowConnect.Delete();
}
if (actForm != null) actForm.Close();
if (Comp.GetIP() != null)SConnector.NewConnectIP(Comp);
}
private void CommandConnectRDP_Click(object sender, EventArgs e)
{
if (actForm != null) actForm.Close();
Process.Start("mstsc.exe", "/v:" + Comp.GetNetNameStr());
}
private void CommandOpenFS_Click(object sender, EventArgs e)
{
if (actForm != null) actForm.Close();
Process.Start("explorer", @"\\" + Comp.GetNetNameStr());
}
private void CommandOpenRegEdit_Click(object sender, EventArgs e)
{
if (actForm != null) actForm.Close();
Process.Start("sc", @"\\ComputerName query RemoteRegistry" + Comp.GetNetNameStr());
}
private void CommandOpenControlPC_Click(object sender, EventArgs e)
{
if (actForm != null) actForm.Close();
Process.Start("compmgmt.msc", @"/computer:" + Comp.GetNetNameStr());
}
private void CommandSavePC_Click(object sender, EventArgs e)
{
if (actForm != null) actForm.Close();
BilderWords bilderWords = new BilderWords(Comp);
DialogResult result = bilderWords.ShowDialog();
if (result == DialogResult.OK)
{
UpdateTree();
}
}
}
}

View File

@ -0,0 +1,123 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="contextMenuCommand.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

View File

@ -1,4 +1,5 @@
using Remontor.Pinger;
using Remontor.Setting;
using Remontor.Words;
using System;
using System.Collections.Generic;
@ -43,13 +44,25 @@ namespace Remontor.Picter
{
try
{
PicList.Add(picBase.LoginGet, picBase);
if (PicList.ContainsKey(picBase.LoginGet))
{
PicList.Add(picBase.LoginGet, picBase);
System.Console.WriteLine("add " + picBase.LoginGet + " all " + PicList.Count);
}
while (PicList.Count > SGlobalSetting.settingApp.sizePhotoItem)
{
System.Console.WriteLine("delete " + PicList.First().Key);
PicList.Remove(PicList.First().Key);
}
}
catch
{
}
}
}
}

View File

@ -1,4 +1,6 @@
using System;
using Remontor.Setting;
using System;
using System.Collections;
using System.Collections.Generic;
using System.Drawing;
using System.Linq;
@ -20,7 +22,7 @@ namespace Remontor.Pinger
{
if (ResultPing.ContainsKey(comp.GetNetName()))
{
{
if ((DateTime.Now - ResultPing[comp.GetNetName()].timePing).Seconds > LifeTimePing)
{
// panel.Visible = true;
@ -70,7 +72,12 @@ namespace Remontor.Pinger
{
try
{
ResultPing.Add(pingResult.NameOrAddress, pingResult);
if(ResultPing.ContainsKey(pingResult.NameOrAddress)) ResultPing.Add(pingResult.NameOrAddress, pingResult);
while (ResultPing.Count > 200)
{
ResultPing.Remove(ResultPing.First().Key);
}
}
catch
{

View File

@ -70,16 +70,6 @@ namespace Remontor.Properties {
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _1_size {
get {
object obj = ResourceManager.GetObject("1_size", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
@ -90,16 +80,6 @@ namespace Remontor.Properties {
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _2_size {
get {
object obj = ResourceManager.GetObject("2_size", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
@ -173,19 +153,9 @@ namespace Remontor.Properties {
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap add_circle_24dp_19C016_FILL0_wght400_GRAD0_opsz24 {
internal static System.Drawing.Bitmap Add {
get {
object obj = ResourceManager.GetObject("add_circle_24dp_19C016_FILL0_wght400_GRAD0_opsz24", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap apple_touch_icon {
get {
object obj = ResourceManager.GetObject("apple-touch-icon", resourceCulture);
object obj = ResourceManager.GetObject("Add", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
@ -210,16 +180,6 @@ namespace Remontor.Properties {
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap connect_min {
get {
object obj = ResourceManager.GetObject("connect_min", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
@ -230,56 +190,6 @@ namespace Remontor.Properties {
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap doble {
get {
object obj = ResourceManager.GetObject("doble", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap down_min {
get {
object obj = ResourceManager.GetObject("down_min", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap down_min1 {
get {
object obj = ResourceManager.GetObject("down_min1", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap down_min11 {
get {
object obj = ResourceManager.GetObject("down_min11", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap history_20dp_2854C5_FILL0_wght400_GRAD0_opsz20 {
get {
object obj = ResourceManager.GetObject("history_20dp_2854C5_FILL0_wght400_GRAD0_opsz20", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
@ -290,26 +200,6 @@ namespace Remontor.Properties {
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap max_size {
get {
object obj = ResourceManager.GetObject("max_size", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap menu_book_24dp_6B2346_FILL0_wght400_GRAD0_opsz24 {
get {
object obj = ResourceManager.GetObject("menu_book_24dp_6B2346_FILL0_wght400_GRAD0_opsz24", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
@ -320,16 +210,6 @@ namespace Remontor.Properties {
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap min_size {
get {
object obj = ResourceManager.GetObject("min_size", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
@ -340,56 +220,6 @@ namespace Remontor.Properties {
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap ping_test {
get {
object obj = ResourceManager.GetObject("ping_test", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap reconnect {
get {
object obj = ResourceManager.GetObject("reconnect", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap reconnect_min {
get {
object obj = ResourceManager.GetObject("reconnect_min", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz20 {
get {
object obj = ResourceManager.GetObject("settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz20", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz201 {
get {
object obj = ResourceManager.GetObject("settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz201", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
@ -449,25 +279,5 @@ namespace Remontor.Properties {
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap up_min1 {
get {
object obj = ResourceManager.GetObject("up_min1", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap up_min11 {
get {
object obj = ResourceManager.GetObject("up_min11", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
}
}

View File

@ -118,127 +118,70 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<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="tv_24dp_48752C_FILL0_wght400_GRAD0_opsz24" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\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="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>
</data>
<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="add_circle_24dp_19C016_FILL0_wght400_GRAD0_opsz24" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\add_circle_24dp_19C016_FILL0_wght400_GRAD0_opsz24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<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="ping_test" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ping_test.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="2_size" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\2_size.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="tv_24dp_48752C_FILL0_wght400_GRAD0_opsz242" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\tv_24dp_48752C_FILL0_wght400_GRAD0_opsz242.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="apple-touch-icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\apple-touch-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<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="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>
</data>
<data name="min_size" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\min_size.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="down_min1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\down_min1.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="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="max_size" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\max_size.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="tv_24dp_48752C_FILL0_wght400_GRAD0_opsz2411" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\tv_24dp_48752C_FILL0_wght400_GRAD0_opsz2411.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_opsz20" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\history_20dp_2854C5_FILL0_wght400_GRAD0_opsz20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="down_min11" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\down_min11.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="settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz20" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<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="tv_24dp_48752C_FILL0_wght400_GRAD0_opsz241" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\tv_24dp_48752C_FILL0_wght400_GRAD0_opsz241.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="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="tv_24dp_48752C_FILL0_wght400_GRAD0_opsz242" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\tv_24dp_48752C_FILL0_wght400_GRAD0_opsz242.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="Person" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Person.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="up_min1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\up_min1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="1_size" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\1_size.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="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="doble" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\doble.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="connect_min" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\connect_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_opsz201" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz201.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="reconnect_min" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\reconnect_min.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="up_min11" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\up_min11.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_opsz24" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\menu_book_24dp_6B2346_FILL0_wght400_GRAD0_opsz24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="down_min" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\down_min.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="reconnect" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\reconnect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<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="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="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 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="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="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="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="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="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="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>
<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>
</root>

View File

@ -107,6 +107,12 @@
<Compile Include="History\HistoryItem.cs" />
<Compile Include="History\HistoryList.cs" />
<Compile Include="History\SHistory.cs" />
<Compile Include="MenuStripCommand.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="MenuStripCommand.Designer.cs">
<DependentUpon>MenuStripCommand.cs</DependentUpon>
</Compile>
<Compile Include="Picter\PicBase.cs" />
<Compile Include="Picter\PicBaseWords.cs" />
<Compile Include="Picter\PicLoaderTask.cs" />
@ -157,6 +163,12 @@
</Compile>
<Compile Include="Setting\SGlobalSetting.cs" />
<Compile Include="Setting\SSetting.cs" />
<Compile Include="Words\AboutForm.cs">
<SubType>Form</SubType>
</Compile>
<Compile Include="Words\AboutForm.Designer.cs">
<DependentUpon>AboutForm.cs</DependentUpon>
</Compile>
<Compile Include="Words\BilderWords.cs">
<SubType>Form</SubType>
</Compile>
@ -216,6 +228,9 @@
<EmbeddedResource Include="History\HistoryControl.resx">
<DependentUpon>HistoryControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="MenuStripCommand.resx">
<DependentUpon>MenuStripCommand.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
@ -238,6 +253,9 @@
<EmbeddedResource Include="Setting\SettingWordsControl.resx">
<DependentUpon>SettingWordsControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Words\AboutForm.resx">
<DependentUpon>AboutForm.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="Words\BilderWords.resx">
<DependentUpon>BilderWords.cs</DependentUpon>
</EmbeddedResource>
@ -389,5 +407,8 @@
<ItemGroup>
<None Include="Resources\8words.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\Add.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

BIN
Remontor/Resources/Add.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 3.5 KiB

View File

@ -48,6 +48,7 @@
this.LbNetNameStatic.TabIndex = 1;
this.LbNetNameStatic.Text = "Имя ПК";
this.LbNetNameStatic.Click += new System.EventHandler(this.SessionItemControl_Click);
this.LbNetNameStatic.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SessionItemControl_MouseClick);
//
// LbData
//
@ -58,6 +59,7 @@
this.LbData.TabIndex = 2;
this.LbData.Text = "LastLogon";
this.LbData.Click += new System.EventHandler(this.SessionItemControl_Click);
this.LbData.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SessionItemControl_MouseClick);
//
// LbName
//
@ -68,6 +70,7 @@
this.LbName.TabIndex = 3;
this.LbName.Text = "Котов Кирилл Николаевич";
this.LbName.Click += new System.EventHandler(this.SessionItemControl_Click);
this.LbName.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SessionItemControl_MouseClick);
//
// LbNetName
//
@ -78,6 +81,7 @@
this.LbNetName.TabIndex = 4;
this.LbNetName.Text = "-";
this.LbNetName.Click += new System.EventHandler(this.SessionItemControl_Click);
this.LbNetName.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SessionItemControl_MouseClick);
//
// PbPerson
//
@ -89,6 +93,7 @@
this.PbPerson.TabIndex = 0;
this.PbPerson.TabStop = false;
this.PbPerson.Click += new System.EventHandler(this.SessionItemControl_Click);
this.PbPerson.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SessionItemControl_MouseClick);
//
// PPingStat
//
@ -98,6 +103,7 @@
this.PPingStat.Size = new System.Drawing.Size(8, 8);
this.PPingStat.TabIndex = 5;
this.PPingStat.Click += new System.EventHandler(this.SessionItemControl_Click);
this.PPingStat.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SessionItemControl_MouseClick);
//
// LbLoginStatic
//
@ -107,6 +113,7 @@
this.LbLoginStatic.Size = new System.Drawing.Size(38, 13);
this.LbLoginStatic.TabIndex = 6;
this.LbLoginStatic.Text = "Логин";
this.LbLoginStatic.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SessionItemControl_MouseClick);
//
// LbLogin
//
@ -116,6 +123,7 @@
this.LbLogin.Size = new System.Drawing.Size(10, 13);
this.LbLogin.TabIndex = 7;
this.LbLogin.Text = "-";
this.LbLogin.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SessionItemControl_MouseClick);
//
// SessionItemControl
//
@ -135,6 +143,7 @@
this.Size = new System.Drawing.Size(353, 55);
this.Load += new System.EventHandler(this.SessionItemControl_Load);
this.Click += new System.EventHandler(this.SessionItemControl_Click);
this.MouseClick += new System.Windows.Forms.MouseEventHandler(this.SessionItemControl_MouseClick);
((System.ComponentModel.ISupportInitialize)(this.PbPerson)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();

View File

@ -1,4 +1,6 @@
using Remontor.Picter;
using Remontor.Connector;
using Remontor.History;
using Remontor.Picter;
using Remontor.Pinger;
using Remontor.Seacher;
using System;
@ -51,27 +53,30 @@ namespace Remontor
else if(seacherResult is HistoryResult)
{
HistoryResult result = (HistoryResult) seacherResult;
LbName.Text = result.GetComp().GetDescription();
LbLogin.Text = result.GetComp().GetName();
LbNetName.Text = result.GetComp().GetNetName();
Comp = result.GetComp();
LbName.Text = Comp.GetDescription();
LbLogin.Text = Comp.GetName();
LbNetName.Text = Comp.GetNetName();
LbData.Text = "last connect:" + result.GetLastConnect();
Select += UpdateAct;
Index = index;
SPicManager.PictureSet(PbPerson, result.GetComp());
SPicManager.PictureSet(PbPerson, Comp);
}
else if (seacherResult is SCCMResult)
{
SCCMResult result = (SCCMResult)seacherResult;
LbName.Text = result.GetComp().GetDescription();
LbNetName.Text = result.GetComp().GetNetName();
LbLogin.Text = result.GetComp().GetName();
Comp = result.GetComp();
LbName.Text = Comp.GetDescription();
LbNetName.Text = Comp.GetNetName();
LbLogin.Text = Comp.GetName();
LbData.Text = "last login:" + result.GetLastConnect();
Select += UpdateAct;
Index = index;
SPicManager.PictureSet(PbPerson, Comp);
}
}
@ -114,10 +119,8 @@ namespace Remontor
private void SessionItemControl_Click(object sender, EventArgs e)
{
if (!(seacherResult is NoResult))
{
Select(this);
}
}
@ -135,5 +138,32 @@ namespace Remontor
}
}
private void SessionItemControl_MouseClick(object sender, MouseEventArgs e)
{
if(e.Button == MouseButtons.Left)
{
if (!(seacherResult is NoResult))
{
Select(this);
}
}else if(e.Button == MouseButtons.Right)
{
if(Comp != null)
{
this.BackColor = SystemColors.ActiveCaption;
Control control = (Control)sender;
SConnector.FormMain.MenuStripCommand.ShowMenu(Comp, control.PointToScreen(e.Location), CloseMenu);
}
}
}
private void CloseMenu()
{
this.BackColor = SystemColors.Window;
}
}
}

46
Remontor/Words/AboutForm.Designer.cs generated Normal file
View File

@ -0,0 +1,46 @@
namespace Remontor.Words
{
partial class AboutForm
{
/// <summary>
/// Required designer variable.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Clean up any resources being used.
/// </summary>
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Windows Form Designer generated code
/// <summary>
/// Required method for Designer support - do not modify
/// the contents of this method with the code editor.
/// </summary>
private void InitializeComponent()
{
this.SuspendLayout();
//
// AboutForm
//
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.ClientSize = new System.Drawing.Size(800, 450);
this.Name = "AboutForm";
this.Text = "О программе";
this.ResumeLayout(false);
}
#endregion
}
}

View File

@ -0,0 +1,20 @@
using System;
using System.Collections.Generic;
using System.ComponentModel;
using System.Data;
using System.Drawing;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Remontor.Words
{
public partial class AboutForm : Form
{
public AboutForm()
{
InitializeComponent();
}
}
}

View File

@ -0,0 +1,120 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
</root>

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1 +1 @@
a251207a1f709599554699a07461e3f985fbdd91
0e56687aa700e9f91fd77cd5fb555dd338a94233

View File

@ -52,3 +52,5 @@ C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Debug\Remontor.Flow
C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Debug\Remontor.Setting.settingAppControl.resources
C:\Users\klavi\source\repos\Remontor\Remontor\obj\Debug\Remontor.FlowConteinerSetting.resources
C:\Users\klavi\source\repos\Remontor\Remontor\obj\Debug\Remontor.Setting.settingAppControl.resources
C:\Users\klavi\source\repos\Remontor\Remontor\obj\Debug\Remontor.MenuStripCommand.resources
C:\Users\klavi\source\repos\Remontor\Remontor\obj\Debug\Remontor.Words.AboutForm.resources

Binary file not shown.

Binary file not shown.