diff --git a/.vs/Remontor/v17/.suo b/.vs/Remontor/v17/.suo new file mode 100644 index 0000000..94c6567 Binary files /dev/null and b/.vs/Remontor/v17/.suo differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/0bafb6a2-f380-47b3-9889-a585bceb0e74.vsidx b/Remontor/.vs/Remontor/FileContentIndex/0bafb6a2-f380-47b3-9889-a585bceb0e74.vsidx deleted file mode 100644 index be40abc..0000000 Binary files a/Remontor/.vs/Remontor/FileContentIndex/0bafb6a2-f380-47b3-9889-a585bceb0e74.vsidx and /dev/null differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/163060c3-1601-45d4-a237-6b0dda38ce95.vsidx b/Remontor/.vs/Remontor/FileContentIndex/163060c3-1601-45d4-a237-6b0dda38ce95.vsidx new file mode 100644 index 0000000..0e21638 Binary files /dev/null and b/Remontor/.vs/Remontor/FileContentIndex/163060c3-1601-45d4-a237-6b0dda38ce95.vsidx differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/1833a1ca-493c-4d2a-be89-aeb520fe5e95.vsidx b/Remontor/.vs/Remontor/FileContentIndex/1833a1ca-493c-4d2a-be89-aeb520fe5e95.vsidx deleted file mode 100644 index 2b9824f..0000000 Binary files a/Remontor/.vs/Remontor/FileContentIndex/1833a1ca-493c-4d2a-be89-aeb520fe5e95.vsidx and /dev/null differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/2299c033-dc8c-436c-8ce6-aaef6c7684c8.vsidx b/Remontor/.vs/Remontor/FileContentIndex/2299c033-dc8c-436c-8ce6-aaef6c7684c8.vsidx deleted file mode 100644 index 6ad1917..0000000 Binary files a/Remontor/.vs/Remontor/FileContentIndex/2299c033-dc8c-436c-8ce6-aaef6c7684c8.vsidx and /dev/null differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/2fd50e65-f963-443d-b3c5-60ad1134dc91.vsidx b/Remontor/.vs/Remontor/FileContentIndex/2fd50e65-f963-443d-b3c5-60ad1134dc91.vsidx new file mode 100644 index 0000000..57db83e Binary files /dev/null and b/Remontor/.vs/Remontor/FileContentIndex/2fd50e65-f963-443d-b3c5-60ad1134dc91.vsidx differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/313eff2d-ddcc-4257-9301-6c3cd226728f.vsidx b/Remontor/.vs/Remontor/FileContentIndex/313eff2d-ddcc-4257-9301-6c3cd226728f.vsidx deleted file mode 100644 index 96a976f..0000000 Binary files a/Remontor/.vs/Remontor/FileContentIndex/313eff2d-ddcc-4257-9301-6c3cd226728f.vsidx and /dev/null differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/5c37e1dc-d8f6-4443-a43d-df0080083321.vsidx b/Remontor/.vs/Remontor/FileContentIndex/5c37e1dc-d8f6-4443-a43d-df0080083321.vsidx new file mode 100644 index 0000000..94e46c7 Binary files /dev/null and b/Remontor/.vs/Remontor/FileContentIndex/5c37e1dc-d8f6-4443-a43d-df0080083321.vsidx differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/9309edac-fe7d-4173-b62a-32c722823399.vsidx b/Remontor/.vs/Remontor/FileContentIndex/9309edac-fe7d-4173-b62a-32c722823399.vsidx new file mode 100644 index 0000000..12b39ea Binary files /dev/null and b/Remontor/.vs/Remontor/FileContentIndex/9309edac-fe7d-4173-b62a-32c722823399.vsidx differ diff --git a/Remontor/.vs/Remontor/v17/.suo b/Remontor/.vs/Remontor/v17/.suo index b3bdfc3..fc4576a 100644 Binary files a/Remontor/.vs/Remontor/v17/.suo and b/Remontor/.vs/Remontor/v17/.suo differ diff --git a/Remontor/BarSessionControl.Designer.cs b/Remontor/BarSessionControl.Designer.cs index ad2003c..b6bcbcd 100644 --- a/Remontor/BarSessionControl.Designer.cs +++ b/Remontor/BarSessionControl.Designer.cs @@ -30,6 +30,9 @@ { this.FlowButton = new System.Windows.Forms.FlowLayoutPanel(); this.NewBtn = new System.Windows.Forms.Button(); + this.label1 = new System.Windows.Forms.Label(); + this.button7 = new System.Windows.Forms.Button(); + this.ShowWords = new System.Windows.Forms.Button(); this.button4 = new System.Windows.Forms.Button(); this.button3 = new System.Windows.Forms.Button(); this.button2 = new System.Windows.Forms.Button(); @@ -42,21 +45,20 @@ // FlowButton // this.FlowButton.Controls.Add(this.NewBtn); - this.FlowButton.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; this.FlowButton.Location = new System.Drawing.Point(0, 0); this.FlowButton.Margin = new System.Windows.Forms.Padding(0); this.FlowButton.Name = "FlowButton"; - this.FlowButton.Size = new System.Drawing.Size(589, 21); + this.FlowButton.Size = new System.Drawing.Size(687, 20); 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.connect_min; + this.NewBtn.BackgroundImage = global::Remontor.Properties.Resources.add_circle_24dp_19C016_FILL0_wght400_GRAD0_opsz24; this.NewBtn.FlatAppearance.BorderSize = 0; this.NewBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.NewBtn.Location = new System.Drawing.Point(559, 0); + 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); @@ -64,79 +66,127 @@ 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(489, 22); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(195, 13); + this.label1.TabIndex = 15; + this.label1.Text = "Продолжительность сессии 23:32:33"; + // + // button7 + // + this.button7.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.button7.BackgroundImage = global::Remontor.Properties.Resources.settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz202; + this.button7.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.button7.FlatAppearance.BorderSize = 0; + this.button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button7.Location = new System.Drawing.Point(1043, 0); + this.button7.Name = "button7"; + this.button7.Size = new System.Drawing.Size(40, 40); + this.button7.TabIndex = 14; + this.button7.UseVisualStyleBackColor = true; + // + // ShowWords + // + this.ShowWords.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.ShowWords.BackgroundImage = global::Remontor.Properties.Resources.menu_book_24dp_6B2346_FILL0_wght400_GRAD0_opsz241; + this.ShowWords.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; + this.ShowWords.FlatAppearance.BorderSize = 0; + this.ShowWords.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.ShowWords.Location = new System.Drawing.Point(951, 1); + this.ShowWords.Name = "ShowWords"; + this.ShowWords.Size = new System.Drawing.Size(40, 40); + this.ShowWords.TabIndex = 13; + this.ShowWords.UseVisualStyleBackColor = true; + this.ShowWords.Click += new System.EventHandler(this.ShowWords_Click); + // // button4 // + this.button4.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.button4.BackColor = System.Drawing.SystemColors.Control; - this.button4.BackgroundImage = global::Remontor.Properties.Resources.min_size; + this.button4.BackgroundImage = global::Remontor.Properties.Resources.tv_24dp_48752C_FILL0_wght400_GRAD0_opsz24; + this.button4.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.button4.FlatAppearance.BorderSize = 0; this.button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.button4.Location = new System.Drawing.Point(636, 1); + this.button4.Location = new System.Drawing.Point(750, 0); this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(20, 20); + this.button4.Size = new System.Drawing.Size(40, 40); this.button4.TabIndex = 12; this.button4.UseVisualStyleBackColor = false; // // button3 // + this.button3.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.button3.BackColor = System.Drawing.SystemColors.Control; - this.button3.BackgroundImage = global::Remontor.Properties.Resources._1_size; + this.button3.BackgroundImage = global::Remontor.Properties.Resources.tv_24dp_48752C_FILL0_wght400_GRAD0_opsz2411; + this.button3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.button3.FlatAppearance.BorderSize = 0; this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.button3.Location = new System.Drawing.Point(663, 1); + this.button3.Location = new System.Drawing.Point(796, -1); this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(20, 20); + this.button3.Size = new System.Drawing.Size(40, 40); this.button3.TabIndex = 11; this.button3.UseVisualStyleBackColor = false; // // button2 // + this.button2.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.button2.BackColor = System.Drawing.SystemColors.Control; - this.button2.BackgroundImage = global::Remontor.Properties.Resources._2_size; + this.button2.BackgroundImage = global::Remontor.Properties.Resources.tv_24dp_48752C_FILL0_wght400_GRAD0_opsz242; + this.button2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.button2.FlatAppearance.BorderSize = 0; this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button2.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.button2.Location = new System.Drawing.Point(690, 1); + this.button2.Location = new System.Drawing.Point(841, -1); this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(20, 20); + this.button2.Size = new System.Drawing.Size(40, 40); this.button2.TabIndex = 10; this.button2.UseVisualStyleBackColor = false; // // button1 // + this.button1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); this.button1.BackColor = System.Drawing.SystemColors.Control; - this.button1.BackgroundImage = global::Remontor.Properties.Resources.max_size; + this.button1.BackgroundImage = global::Remontor.Properties.Resources.developer_mode_tv_24dp_48752C_FILL0_wght400_GRAD0_opsz24; + this.button1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.button1.FlatAppearance.BorderSize = 0; this.button1.FlatStyle = System.Windows.Forms.FlatStyle.Flat; this.button1.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.button1.Location = new System.Drawing.Point(717, 1); + this.button1.Location = new System.Drawing.Point(887, 1); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(20, 20); + this.button1.Size = new System.Drawing.Size(40, 40); this.button1.TabIndex = 9; this.button1.UseVisualStyleBackColor = false; // // button5 // + 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.reconnect_min; + 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(592, 1); + this.button5.Location = new System.Drawing.Point(690, 0); this.button5.Name = "button5"; - this.button5.Size = new System.Drawing.Size(20, 20); + this.button5.Size = new System.Drawing.Size(40, 40); this.button5.TabIndex = 5; this.button5.UseVisualStyleBackColor = false; // // ShowBar // - this.ShowBar.BackgroundImage = global::Remontor.Properties.Resources.up_min1; + this.ShowBar.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); + this.ShowBar.BackgroundImage = global::Remontor.Properties.Resources.history_20dp_2854C5_FILL0_wght400_GRAD0_opsz201; + this.ShowBar.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; this.ShowBar.FlatAppearance.BorderSize = 0; this.ShowBar.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.ShowBar.Location = new System.Drawing.Point(744, 1); + this.ShowBar.Location = new System.Drawing.Point(998, 0); this.ShowBar.Name = "ShowBar"; - this.ShowBar.Size = new System.Drawing.Size(20, 20); + this.ShowBar.Size = new System.Drawing.Size(40, 40); this.ShowBar.TabIndex = 1; this.ShowBar.UseVisualStyleBackColor = true; this.ShowBar.Click += new System.EventHandler(this.ShowBar_Click); @@ -145,6 +195,9 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.label1); + this.Controls.Add(this.button7); + this.Controls.Add(this.ShowWords); this.Controls.Add(this.button4); this.Controls.Add(this.button3); this.Controls.Add(this.button2); @@ -153,9 +206,11 @@ this.Controls.Add(this.button5); this.Controls.Add(this.ShowBar); this.Name = "BarSessionControl"; - this.Size = new System.Drawing.Size(768, 21); + 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(); } @@ -169,5 +224,8 @@ private System.Windows.Forms.Button button2; private System.Windows.Forms.Button button3; private System.Windows.Forms.Button button4; + private System.Windows.Forms.Button ShowWords; + private System.Windows.Forms.Button button7; + private System.Windows.Forms.Label label1; } } diff --git a/Remontor/BarSessionControl.cs b/Remontor/BarSessionControl.cs index 725fa0b..0ad49ef 100644 --- a/Remontor/BarSessionControl.cs +++ b/Remontor/BarSessionControl.cs @@ -12,12 +12,22 @@ using System.Windows.Forms; namespace Remontor { + enum BarShow + { + HideBar, + ShowHistory, + ShowWords + } internal partial class BarSessionControl : UserControl { - public delegate bool HideWors(); - public HideWors hideWors; + public delegate bool HideBars(BarShow state); + public HideBars hideWors; + public HideBars hideHistory; + private BarShow barShow = BarShow.HideBar; public List buttons; + + public BarSessionControl() { InitializeComponent(); @@ -45,15 +55,24 @@ namespace Remontor private void ShowBar_Click(object sender, EventArgs e) { - if (!hideWors()) + if (barShow == BarShow.ShowHistory) { - ShowBar.BackgroundImage = global::Remontor.Properties.Resources. - down_min11; + barShow = BarShow.HideBar; } else { - ShowBar.BackgroundImage = global::Remontor.Properties.Resources.up_min1; + barShow = BarShow.ShowHistory; } + if (hideHistory(barShow)) + { + ShowBar.BackColor = SystemColors.ActiveCaption; + ShowWords.BackColor = SystemColors.Control; + } + else + { + ShowBar.BackColor = SystemColors.Control; + } + hideWors(barShow); } private void NewBtn_Click(object sender, EventArgs e) @@ -66,5 +85,32 @@ namespace Remontor { if(e.Control is BarButtonControl) e.Control.Dispose(); } + + private void BarSessionControl_Load(object sender, EventArgs e) + { + + } + + private void ShowWords_Click(object sender, EventArgs e) + { + if (barShow == BarShow.ShowWords) + { + barShow = BarShow.HideBar; + } + else + { + barShow = BarShow.ShowWords; + } + if (hideWors(barShow)) + { + ShowWords.BackColor = SystemColors.ActiveCaption; + ShowBar.BackColor = SystemColors.Control; + } + else + { + ShowWords.BackColor = SystemColors.Control; + } + hideHistory(barShow); + } } } diff --git a/Remontor/Connector/Connect.cs b/Remontor/Connector/Connect.cs index 3c01f16..954237b 100644 --- a/Remontor/Connector/Connect.cs +++ b/Remontor/Connector/Connect.cs @@ -57,12 +57,12 @@ namespace Remontor.Connector public void ConnectSCCM(Control panel) { - Proc = Process.Start("notepad"); - //Thread.Sleep(500); // Allow the process to open it's window - Proc.WaitForInputIdle(); - SetParent(Proc.MainWindowHandle, panel.Handle); - SetWindowLong(Proc.MainWindowHandle, GWL_STYLE, WS_VISIBLE); - MoveWindow(Proc.MainWindowHandle, panel.Bounds.X, panel.Bounds.Y, panel.Bounds.Width, panel.Bounds.Height, true); + //Proc = Process.Start("notepad"); + ////Thread.Sleep(500); // Allow the process to open it's window + //Proc.WaitForInputIdle(); + //SetParent(Proc.MainWindowHandle, panel.Handle); + //SetWindowLong(Proc.MainWindowHandle, GWL_STYLE, WS_VISIBLE); + //MoveWindow(Proc.MainWindowHandle, panel.Bounds.X, panel.Bounds.Y, panel.Bounds.Width, panel.Bounds.Height, true); } public void Activ(bool act) diff --git a/Remontor/Connector/SConnector.cs b/Remontor/Connector/SConnector.cs index 1e531c5..1d77c61 100644 --- a/Remontor/Connector/SConnector.cs +++ b/Remontor/Connector/SConnector.cs @@ -1,4 +1,5 @@ -using System; +using Remontor.History; +using System; using System.Collections.Generic; using System.Linq; using System.Runtime.Remoting.Contexts; @@ -22,9 +23,10 @@ namespace Remontor.Connector Update(Connects); Activ(con); con.ConnectSCCM(Panel); - + HistoryList.Add(con); } + public static void Activ(Connect actConnect) { actConnect.Activ(true); diff --git a/Remontor/FlowContainer.Designer.cs b/Remontor/FlowContainer.Designer.cs index 732d912..8d7c5e8 100644 --- a/Remontor/FlowContainer.Designer.cs +++ b/Remontor/FlowContainer.Designer.cs @@ -29,12 +29,13 @@ private void InitializeComponent() { this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); - this.label1 = new System.Windows.Forms.Label(); this.label2 = new System.Windows.Forms.Label(); - this.listBox1 = new System.Windows.Forms.ListBox(); - this.treeView1 = new System.Windows.Forms.TreeView(); - this.button2 = new System.Windows.Forms.Button(); + this.historyControl3 = new Remontor.History.HistoryControl(); + this.historyControl2 = new Remontor.History.HistoryControl(); + this.historyControl1 = new Remontor.History.HistoryControl(); + this.HistoryPanel = new System.Windows.Forms.FlowLayoutPanel(); this.tableLayoutPanel1.SuspendLayout(); + this.HistoryPanel.SuspendLayout(); this.SuspendLayout(); // // tableLayoutPanel1 @@ -42,71 +43,66 @@ this.tableLayoutPanel1.BackColor = System.Drawing.SystemColors.Control; this.tableLayoutPanel1.ColumnCount = 1; this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); - this.tableLayoutPanel1.Controls.Add(this.button2, 0, 4); - this.tableLayoutPanel1.Controls.Add(this.treeView1, 0, 1); - this.tableLayoutPanel1.Controls.Add(this.listBox1, 0, 3); - this.tableLayoutPanel1.Controls.Add(this.label2, 0, 2); - this.tableLayoutPanel1.Controls.Add(this.label1, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.label2, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.HistoryPanel, 0, 1); this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; this.tableLayoutPanel1.GrowStyle = System.Windows.Forms.TableLayoutPanelGrowStyle.FixedSize; this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.tableLayoutPanel1.Name = "tableLayoutPanel1"; - this.tableLayoutPanel1.RowCount = 5; - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 13F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 13F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50F)); - this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 30F)); + this.tableLayoutPanel1.RowCount = 2; this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); - this.tableLayoutPanel1.Size = new System.Drawing.Size(280, 781); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(330, 781); this.tableLayoutPanel1.TabIndex = 1; // - // label1 - // - this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(3, 0); - this.label1.Name = "label1"; - this.label1.Size = new System.Drawing.Size(67, 13); - this.label1.TabIndex = 2; - this.label1.Text = "Справочник"; - // // label2 // this.label2.AutoSize = true; - this.label2.Location = new System.Drawing.Point(3, 375); + this.label2.Location = new System.Drawing.Point(3, 3); + this.label2.Margin = new System.Windows.Forms.Padding(3); this.label2.Name = "label2"; this.label2.Size = new System.Drawing.Size(120, 13); this.label2.TabIndex = 3; this.label2.Text = "История подключений"; // - // listBox1 + // historyControl3 // - this.listBox1.Dock = System.Windows.Forms.DockStyle.Fill; - this.listBox1.FormattingEnabled = true; - this.listBox1.Location = new System.Drawing.Point(3, 391); - this.listBox1.Name = "listBox1"; - this.listBox1.Size = new System.Drawing.Size(274, 356); - this.listBox1.TabIndex = 1; + this.historyControl3.BackColor = System.Drawing.SystemColors.Window; + this.historyControl3.Location = new System.Drawing.Point(0, 96); + this.historyControl3.Margin = new System.Windows.Forms.Padding(0); + this.historyControl3.Name = "historyControl3"; + this.historyControl3.Size = new System.Drawing.Size(315, 48); + this.historyControl3.TabIndex = 2; // - // treeView1 + // historyControl2 // - this.treeView1.Dock = System.Windows.Forms.DockStyle.Fill; - this.treeView1.Location = new System.Drawing.Point(3, 16); - this.treeView1.Name = "treeView1"; - this.treeView1.Size = new System.Drawing.Size(274, 356); - this.treeView1.TabIndex = 0; + this.historyControl2.BackColor = System.Drawing.SystemColors.Window; + this.historyControl2.Location = new System.Drawing.Point(0, 48); + this.historyControl2.Margin = new System.Windows.Forms.Padding(0); + this.historyControl2.Name = "historyControl2"; + this.historyControl2.Size = new System.Drawing.Size(315, 48); + this.historyControl2.TabIndex = 1; // - // button2 + // historyControl1 // - this.button2.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.button2.Location = new System.Drawing.Point(3, 753); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(274, 25); - this.button2.TabIndex = 5; - this.button2.Text = "Параметры"; - this.button2.UseVisualStyleBackColor = true; + this.historyControl1.BackColor = System.Drawing.SystemColors.Window; + this.historyControl1.Location = new System.Drawing.Point(0, 0); + this.historyControl1.Margin = new System.Windows.Forms.Padding(0); + this.historyControl1.Name = "historyControl1"; + this.historyControl1.Size = new System.Drawing.Size(315, 48); + this.historyControl1.TabIndex = 0; + // + // HistoryPanel + // + this.HistoryPanel.BackColor = System.Drawing.SystemColors.Window; + this.HistoryPanel.Controls.Add(this.historyControl1); + this.HistoryPanel.Controls.Add(this.historyControl2); + this.HistoryPanel.Controls.Add(this.historyControl3); + this.HistoryPanel.Dock = System.Windows.Forms.DockStyle.Fill; + this.HistoryPanel.Location = new System.Drawing.Point(3, 23); + this.HistoryPanel.Name = "HistoryPanel"; + this.HistoryPanel.Size = new System.Drawing.Size(324, 755); + this.HistoryPanel.TabIndex = 6; // // FlowContainer // @@ -116,9 +112,10 @@ this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.Controls.Add(this.tableLayoutPanel1); this.Name = "FlowContainer"; - this.Size = new System.Drawing.Size(280, 781); + this.Size = new System.Drawing.Size(330, 781); this.tableLayoutPanel1.ResumeLayout(false); this.tableLayoutPanel1.PerformLayout(); + this.HistoryPanel.ResumeLayout(false); this.ResumeLayout(false); } @@ -126,10 +123,10 @@ #endregion private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; - private System.Windows.Forms.Button button2; - private System.Windows.Forms.TreeView treeView1; - private System.Windows.Forms.ListBox listBox1; private System.Windows.Forms.Label label2; - private System.Windows.Forms.Label label1; + private System.Windows.Forms.FlowLayoutPanel HistoryPanel; + private History.HistoryControl historyControl1; + private History.HistoryControl historyControl2; + private History.HistoryControl historyControl3; } } diff --git a/Remontor/FlowContainer.cs b/Remontor/FlowContainer.cs index 0e5b683..fa31643 100644 --- a/Remontor/FlowContainer.cs +++ b/Remontor/FlowContainer.cs @@ -1,4 +1,5 @@ -using System; +using Remontor.History; +using System; using System.Collections.Generic; using System.ComponentModel; using System.Data; @@ -10,7 +11,7 @@ using System.Windows.Forms; namespace Remontor { - public partial class FlowContainer : UserControl + internal partial class FlowContainer : UserControl { private bool Showed = true; private Size NormalSize; @@ -18,14 +19,34 @@ namespace Remontor { InitializeComponent(); NormalSize = this.Size; + HistoryList.Update += UpdateHistory; } - public bool HideBar() + public bool HideBar(BarShow barShow) { - this.Visible =! this.Visible; + if (barShow == BarShow.ShowHistory) + { + this.Visible = true; + } + else + { + this.Visible = false; + } + return this.Visible; } + public void UpdateHistory(List items) + { + HistoryPanel.Controls.Clear(); + foreach(HistoryItem item in items) + { + HistoryControl HistoryItem = new HistoryControl(item); + HistoryPanel.Controls.Add(HistoryItem); + } + + } + private void flowLayoutPanel1_Paint(object sender, PaintEventArgs e) { diff --git a/Remontor/FlowContainerWords.Designer.cs b/Remontor/FlowContainerWords.Designer.cs new file mode 100644 index 0000000..67f5d8f --- /dev/null +++ b/Remontor/FlowContainerWords.Designer.cs @@ -0,0 +1,94 @@ +namespace Remontor +{ + partial class FlowContainerWords + { + /// + /// Обязательная переменная конструктора. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Освободить все используемые ресурсы. + /// + /// истинно, если управляемый ресурс должен быть удален; иначе ложно. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Код, автоматически созданный конструктором компонентов + + /// + /// Требуемый метод для поддержки конструктора — не изменяйте + /// содержимое этого метода с помощью редактора кода. + /// + private void InitializeComponent() + { + this.tableLayoutPanel1 = new System.Windows.Forms.TableLayoutPanel(); + this.label2 = new System.Windows.Forms.Label(); + this.WordsTree = new System.Windows.Forms.TreeView(); + this.tableLayoutPanel1.SuspendLayout(); + this.SuspendLayout(); + // + // tableLayoutPanel1 + // + this.tableLayoutPanel1.BackColor = System.Drawing.SystemColors.Control; + this.tableLayoutPanel1.ColumnCount = 1; + this.tableLayoutPanel1.ColumnStyles.Add(new System.Windows.Forms.ColumnStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.Controls.Add(this.label2, 0, 0); + this.tableLayoutPanel1.Controls.Add(this.WordsTree, 0, 1); + this.tableLayoutPanel1.Dock = System.Windows.Forms.DockStyle.Fill; + this.tableLayoutPanel1.GrowStyle = System.Windows.Forms.TableLayoutPanelGrowStyle.FixedSize; + this.tableLayoutPanel1.Location = new System.Drawing.Point(0, 0); + this.tableLayoutPanel1.Name = "tableLayoutPanel1"; + this.tableLayoutPanel1.RowCount = 2; + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Absolute, 20F)); + this.tableLayoutPanel1.RowStyles.Add(new System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 100F)); + this.tableLayoutPanel1.Size = new System.Drawing.Size(330, 781); + this.tableLayoutPanel1.TabIndex = 1; + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(3, 3); + this.label2.Margin = new System.Windows.Forms.Padding(3); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(67, 13); + this.label2.TabIndex = 3; + this.label2.Text = "Справочник"; + // + // WordsTree + // + this.WordsTree.BorderStyle = System.Windows.Forms.BorderStyle.None; + this.WordsTree.Dock = System.Windows.Forms.DockStyle.Fill; + this.WordsTree.Location = new System.Drawing.Point(3, 23); + this.WordsTree.Name = "WordsTree"; + this.WordsTree.Size = new System.Drawing.Size(324, 755); + this.WordsTree.TabIndex = 4; + // + // FlowContainerWords + // + 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.tableLayoutPanel1); + this.Name = "FlowContainerWords"; + this.Size = new System.Drawing.Size(330, 781); + this.tableLayoutPanel1.ResumeLayout(false); + this.tableLayoutPanel1.PerformLayout(); + this.ResumeLayout(false); + + } + + #endregion + + private System.Windows.Forms.TableLayoutPanel tableLayoutPanel1; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.TreeView WordsTree; + } +} diff --git a/Remontor/FlowContainerWords.cs b/Remontor/FlowContainerWords.cs new file mode 100644 index 0000000..43ac568 --- /dev/null +++ b/Remontor/FlowContainerWords.cs @@ -0,0 +1,51 @@ +using Remontor.History; +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 +{ + internal partial class FlowContainerWords : UserControl + { + private bool Showed = true; + private Size NormalSize; + public FlowContainerWords() + { + InitializeComponent(); + NormalSize = this.Size; + + } + + public bool HideBar(BarShow barShow) + { + if(barShow == BarShow.ShowWords) + { + this.Visible = true; + } + else + { + this.Visible = false; + } + + return this.Visible; + } + + public void UpdateHistory(List items) + { + + + } + + + private void flowLayoutPanel1_Paint(object sender, PaintEventArgs e) + { + + } + } +} diff --git a/Remontor/FlowContainerWords.resx b/Remontor/FlowContainerWords.resx new file mode 100644 index 0000000..c83e356 --- /dev/null +++ b/Remontor/FlowContainerWords.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + True + + \ No newline at end of file diff --git a/Remontor/Form1.Designer.cs b/Remontor/Form1.Designer.cs index 29d87e8..c569f37 100644 --- a/Remontor/Form1.Designer.cs +++ b/Remontor/Form1.Designer.cs @@ -30,6 +30,7 @@ { this.panel3 = new System.Windows.Forms.Panel(); this.label1 = new System.Windows.Forms.Label(); + this.flowContainerWords1 = new Remontor.FlowContainerWords(); this.barSessionControl1 = new Remontor.BarSessionControl(); this.flowContainer1 = new Remontor.FlowContainer(); this.panel3.SuspendLayout(); @@ -41,27 +42,41 @@ | System.Windows.Forms.AnchorStyles.Left) | System.Windows.Forms.AnchorStyles.Right))); this.panel3.Controls.Add(this.label1); - this.panel3.Location = new System.Drawing.Point(0, 1); + this.panel3.Location = new System.Drawing.Point(0, 25); this.panel3.Name = "panel3"; - this.panel3.Size = new System.Drawing.Size(1082, 717); + this.panel3.Size = new System.Drawing.Size(1082, 693); this.panel3.TabIndex = 1; this.panel3.Paint += new System.Windows.Forms.PaintEventHandler(this.panel3_Paint); // // label1 // this.label1.AutoSize = true; - this.label1.Location = new System.Drawing.Point(467, 361); + this.label1.Dock = System.Windows.Forms.DockStyle.Fill; + this.label1.Location = new System.Drawing.Point(0, 0); this.label1.Name = "label1"; this.label1.Size = new System.Drawing.Size(151, 13); this.label1.TabIndex = 0; this.label1.Text = "Нету активныйх соединений"; // + // flowContainerWords1 + // + this.flowContainerWords1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Bottom) + | System.Windows.Forms.AnchorStyles.Right))); + this.flowContainerWords1.BackColor = System.Drawing.SystemColors.Control; + this.flowContainerWords1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.flowContainerWords1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; + this.flowContainerWords1.Location = new System.Drawing.Point(762, 43); + this.flowContainerWords1.Name = "flowContainerWords1"; + this.flowContainerWords1.Size = new System.Drawing.Size(330, 675); + this.flowContainerWords1.TabIndex = 1; + // // barSessionControl1 // - this.barSessionControl1.Anchor = ((System.Windows.Forms.AnchorStyles)((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Right))); - this.barSessionControl1.Location = new System.Drawing.Point(310, 0); + this.barSessionControl1.Anchor = ((System.Windows.Forms.AnchorStyles)(((System.Windows.Forms.AnchorStyles.Top | System.Windows.Forms.AnchorStyles.Left) + | System.Windows.Forms.AnchorStyles.Right))); + this.barSessionControl1.Location = new System.Drawing.Point(0, 0); this.barSessionControl1.Name = "barSessionControl1"; - this.barSessionControl1.Size = new System.Drawing.Size(772, 21); + this.barSessionControl1.Size = new System.Drawing.Size(1082, 40); this.barSessionControl1.TabIndex = 1; this.barSessionControl1.Load += new System.EventHandler(this.barSessionControl1_Load); // @@ -72,10 +87,11 @@ this.flowContainer1.BackColor = System.Drawing.Color.Transparent; this.flowContainer1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; this.flowContainer1.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.flowContainer1.Location = new System.Drawing.Point(840, 21); + this.flowContainer1.Location = new System.Drawing.Point(762, 43); this.flowContainer1.Name = "flowContainer1"; - this.flowContainer1.Size = new System.Drawing.Size(245, 674); + this.flowContainer1.Size = new System.Drawing.Size(330, 675); this.flowContainer1.TabIndex = 1; + this.flowContainer1.Visible = false; // // Form1 // @@ -83,6 +99,7 @@ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; this.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; this.ClientSize = new System.Drawing.Size(1082, 718); + this.Controls.Add(this.flowContainerWords1); this.Controls.Add(this.barSessionControl1); this.Controls.Add(this.flowContainer1); this.Controls.Add(this.panel3); @@ -101,6 +118,7 @@ private FlowContainer flowContainer1; private BarSessionControl barSessionControl1; private System.Windows.Forms.Label label1; + private FlowContainerWords flowContainerWords1; } } diff --git a/Remontor/Form1.cs b/Remontor/Form1.cs index 1af9f16..2ebf96a 100644 --- a/Remontor/Form1.cs +++ b/Remontor/Form1.cs @@ -38,7 +38,8 @@ namespace Remontor public Form1() { InitializeComponent(); - barSessionControl1.hideWors = flowContainer1.HideBar; + barSessionControl1.hideHistory = flowContainer1.HideBar; + barSessionControl1.hideWors = flowContainerWords1.HideBar; SConnector.Panel = this.panel3; diff --git a/Remontor/History/HistoryControl.Designer.cs b/Remontor/History/HistoryControl.Designer.cs new file mode 100644 index 0000000..6e2fa29 --- /dev/null +++ b/Remontor/History/HistoryControl.Designer.cs @@ -0,0 +1,151 @@ +namespace Remontor.History +{ + partial class HistoryControl + { + /// + /// Обязательная переменная конструктора. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Освободить все используемые ресурсы. + /// + /// истинно, если управляемый ресурс должен быть удален; иначе ложно. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Код, автоматически созданный конструктором компонентов + + /// + /// Требуемый метод для поддержки конструктора — не изменяйте + /// содержимое этого метода с помощью редактора кода. + /// + private void InitializeComponent() + { + 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(); + ((System.ComponentModel.ISupportInitialize)(this.Photo)).BeginInit(); + this.SuspendLayout(); + // + // label3 + // + this.label3.AutoSize = true; + this.label3.Location = new System.Drawing.Point(57, 5); + this.label3.Name = "label3"; + this.label3.Size = new System.Drawing.Size(40, 13); + this.label3.TabIndex = 7; + this.label3.Text = "Время"; + this.label3.MouseEnter += new System.EventHandler(this.HistoryControl_MouseEnter); + this.label3.MouseLeave += new System.EventHandler(this.HistoryControl_MouseLeave); + // + // label2 + // + this.label2.AutoSize = true; + this.label2.Location = new System.Drawing.Point(57, 31); + this.label2.Name = "label2"; + this.label2.Size = new System.Drawing.Size(34, 13); + this.label2.TabIndex = 6; + this.label2.Text = "ФИО"; + this.label2.MouseEnter += new System.EventHandler(this.HistoryControl_MouseEnter); + this.label2.MouseLeave += new System.EventHandler(this.HistoryControl_MouseLeave); + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(57, 18); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(47, 13); + this.label1.TabIndex = 5; + this.label1.Text = "Имя ПК"; + this.label1.MouseEnter += new System.EventHandler(this.HistoryControl_MouseEnter); + this.label1.MouseLeave += new System.EventHandler(this.HistoryControl_MouseLeave); + // + // Photo + // + 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.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; + this.TimeLB.Location = new System.Drawing.Point(94, 5); + this.TimeLB.Name = "TimeLB"; + this.TimeLB.Size = new System.Drawing.Size(79, 13); + this.TimeLB.TabIndex = 10; + this.TimeLB.Text = "19:24 10.12.23"; + this.TimeLB.MouseEnter += new System.EventHandler(this.HistoryControl_MouseEnter); + this.TimeLB.MouseLeave += new System.EventHandler(this.HistoryControl_MouseLeave); + // + // FIOLB + // + this.FIOLB.AutoSize = true; + this.FIOLB.Location = new System.Drawing.Point(89, 31); + this.FIOLB.Name = "FIOLB"; + this.FIOLB.Size = new System.Drawing.Size(170, 13); + this.FIOLB.TabIndex = 9; + this.FIOLB.Text = "Симаков Владимир Михайлович"; + this.FIOLB.MouseEnter += new System.EventHandler(this.HistoryControl_MouseEnter); + this.FIOLB.MouseLeave += new System.EventHandler(this.HistoryControl_MouseLeave); + // + // PCLB + // + this.PCLB.AutoSize = true; + this.PCLB.Location = new System.Drawing.Point(105, 18); + this.PCLB.Name = "PCLB"; + this.PCLB.Size = new System.Drawing.Size(117, 13); + this.PCLB.TabIndex = 8; + this.PCLB.Text = "v.simakov(1ma005524)"; + this.PCLB.MouseEnter += new System.EventHandler(this.HistoryControl_MouseEnter); + this.PCLB.MouseLeave += new System.EventHandler(this.HistoryControl_MouseLeave); + // + // HistoryControl + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackColor = System.Drawing.SystemColors.Window; + this.Controls.Add(this.TimeLB); + this.Controls.Add(this.FIOLB); + this.Controls.Add(this.PCLB); + this.Controls.Add(this.label3); + this.Controls.Add(this.label2); + this.Controls.Add(this.label1); + this.Controls.Add(this.Photo); + this.Margin = new System.Windows.Forms.Padding(0); + this.Name = "HistoryControl"; + this.Size = new System.Drawing.Size(315, 48); + this.MouseEnter += new System.EventHandler(this.HistoryControl_MouseEnter); + this.MouseLeave += new System.EventHandler(this.HistoryControl_MouseLeave); + ((System.ComponentModel.ISupportInitialize)(this.Photo)).EndInit(); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Label label3; + private System.Windows.Forms.Label label2; + private System.Windows.Forms.Label label1; + private System.Windows.Forms.PictureBox Photo; + private System.Windows.Forms.Label TimeLB; + private System.Windows.Forms.Label FIOLB; + private System.Windows.Forms.Label PCLB; + } +} diff --git a/Remontor/History/HistoryControl.cs b/Remontor/History/HistoryControl.cs new file mode 100644 index 0000000..438caf1 --- /dev/null +++ b/Remontor/History/HistoryControl.cs @@ -0,0 +1,45 @@ +using Remontor.Connector; +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; +using System.Xml.Linq; + +namespace Remontor.History +{ + internal partial class HistoryControl : UserControl + { + public Color BackCustum; + public HistoryControl() + { + InitializeComponent(); + BackCustum = this.BackColor; + } + + public HistoryControl(HistoryItem hitem) + { + InitializeComponent(); + string output = string.Format("{0,17: HH:mm:ss dd.MM.yy}", hitem.GetStart()); + TimeLB.Text = output; + PCLB.Text = hitem.NameNode(); + FIOLB.Text = hitem.GetComp().GetName(); + BackCustum = this.BackColor; + } + + private void HistoryControl_MouseEnter(object sender, EventArgs e) + { + this.BackColor = SystemColors.ControlLight; + + } + + private void HistoryControl_MouseLeave(object sender, EventArgs e) + { + this.BackColor = BackCustum; + } + } +} diff --git a/Remontor/History/HistoryControl.resx b/Remontor/History/HistoryControl.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Remontor/History/HistoryControl.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/Remontor/History/HistoryItem.cs b/Remontor/History/HistoryItem.cs index 029588a..d7797ed 100644 --- a/Remontor/History/HistoryItem.cs +++ b/Remontor/History/HistoryItem.cs @@ -14,7 +14,7 @@ namespace Remontor.History { private IComp comp; private DateTime startTime; - private string statusName; + private string Login; public HistoryItem(IComp comp, DateTime startTime) { @@ -32,6 +32,11 @@ namespace Remontor.History { return new SHistory(comp.GetName(), startTime.ToShortTimeString()); + } + public DateTime GetStart() + { + return startTime; + } public IComp GetComp() @@ -61,7 +66,7 @@ namespace Remontor.History get { string name = NameNode(); name = name.Length > 25 ? name.Substring(0,25): name; - string output = string.Format("{0,17:dd.MM.yy HH:mm:ss} {1,-25} {2,-9}", startTime, name, this.statusName); + string output = string.Format("{0,17:dd.MM.yy HH:mm:ss} {1,-25} {2,-9}", startTime, name, this.Login); return output; } } diff --git a/Remontor/History/HistoryList.cs b/Remontor/History/HistoryList.cs index 8613111..ce3d50d 100644 --- a/Remontor/History/HistoryList.cs +++ b/Remontor/History/HistoryList.cs @@ -18,7 +18,7 @@ namespace Remontor.History static public List Hitem = new List(); //static private FormHistory formHistory; - public delegate void UpdateMethod(); + public delegate void UpdateMethod(List items); static public event UpdateMethod Update; static public HistoryItem Add(Connect connect) { @@ -26,14 +26,14 @@ namespace Remontor.History HistoryItem historyItem = new HistoryItem(connect); Hitem.Insert(0, historyItem); ClearFirst(); - Update(); + Update(Hitem); return historyItem; } static public void Updated() { - Update(); + Update(Hitem); } static public void Clear() { diff --git a/Remontor/Properties/Resources.Designer.cs b/Remontor/Properties/Resources.Designer.cs index b6f3ef0..5cb18bd 100644 --- a/Remontor/Properties/Resources.Designer.cs +++ b/Remontor/Properties/Resources.Designer.cs @@ -80,6 +80,16 @@ namespace Remontor.Properties { } } + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap add_circle_24dp_19C016_FILL0_wght400_GRAD0_opsz24 { + get { + object obj = ResourceManager.GetObject("add_circle_24dp_19C016_FILL0_wght400_GRAD0_opsz24", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// @@ -120,6 +130,16 @@ namespace Remontor.Properties { } } + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap developer_mode_tv_24dp_48752C_FILL0_wght400_GRAD0_opsz24 { + get { + object obj = ResourceManager.GetObject("developer_mode_tv_24dp_48752C_FILL0_wght400_GRAD0_opsz24", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// @@ -160,6 +180,26 @@ namespace Remontor.Properties { } } + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + 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)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap history_20dp_2854C5_FILL0_wght400_GRAD0_opsz201 { + get { + object obj = ResourceManager.GetObject("history_20dp_2854C5_FILL0_wght400_GRAD0_opsz201", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// @@ -170,6 +210,26 @@ namespace Remontor.Properties { } } + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + 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)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap menu_book_24dp_6B2346_FILL0_wght400_GRAD0_opsz241 { + get { + object obj = ResourceManager.GetObject("menu_book_24dp_6B2346_FILL0_wght400_GRAD0_opsz241", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// @@ -210,6 +270,86 @@ namespace Remontor.Properties { } } + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + 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)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + 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)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz202 { + get { + object obj = ResourceManager.GetObject("settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz202", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap sync_24dp_2854C5_FILL0_wght400_GRAD0_opsz24 { + get { + object obj = ResourceManager.GetObject("sync_24dp_2854C5_FILL0_wght400_GRAD0_opsz24", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap tv_24dp_48752C_FILL0_wght400_GRAD0_opsz24 { + get { + object obj = ResourceManager.GetObject("tv_24dp_48752C_FILL0_wght400_GRAD0_opsz24", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap tv_24dp_48752C_FILL0_wght400_GRAD0_opsz241 { + get { + object obj = ResourceManager.GetObject("tv_24dp_48752C_FILL0_wght400_GRAD0_opsz241", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap tv_24dp_48752C_FILL0_wght400_GRAD0_opsz2411 { + get { + object obj = ResourceManager.GetObject("tv_24dp_48752C_FILL0_wght400_GRAD0_opsz2411", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap tv_24dp_48752C_FILL0_wght400_GRAD0_opsz242 { + get { + object obj = ResourceManager.GetObject("tv_24dp_48752C_FILL0_wght400_GRAD0_opsz242", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// diff --git a/Remontor/Properties/Resources.resx b/Remontor/Properties/Resources.resx index 858af1c..7c904e9 100644 --- a/Remontor/Properties/Resources.resx +++ b/Remontor/Properties/Resources.resx @@ -118,55 +118,97 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\Person.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\tv_24dp_48752C_FILL0_wght400_GRAD0_opsz24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\close_min.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\reconnect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\down_min.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\apple-touch-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\min_size.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\up_min1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\max_size.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\1_size.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\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 ..\Resources\2_size.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\reconnect_min.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\apple-touch-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\sync_24dp_2854C5_FILL0_wght400_GRAD0_opsz24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\min_size.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\down_min1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\connect_min.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\menu_book_24dp_6B2346_FILL0_wght400_GRAD0_opsz241.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\up_min11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\close_min.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\max_size.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\tv_24dp_48752C_FILL0_wght400_GRAD0_opsz2411.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\history_20dp_2854C5_FILL0_wght400_GRAD0_opsz20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\down_min11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\tv_24dp_48752C_FILL0_wght400_GRAD0_opsz241.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\history_20dp_2854C5_FILL0_wght400_GRAD0_opsz201.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz20.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\tv_24dp_48752C_FILL0_wght400_GRAD0_opsz242.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz202.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\Person.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\1_size.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\up_min1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\doble.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\connect_min.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz201.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\reconnect_min.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\up_min11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\menu_book_24dp_6B2346_FILL0_wght400_GRAD0_opsz24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\down_min.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\reconnect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\add_circle_24dp_19C016_FILL0_wght400_GRAD0_opsz24.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + \ No newline at end of file diff --git a/Remontor/Remontor.csproj b/Remontor/Remontor.csproj index a3ef507..fb8c5ca 100644 --- a/Remontor/Remontor.csproj +++ b/Remontor/Remontor.csproj @@ -68,6 +68,12 @@ Finder.cs + + UserControl + + + FlowContainerWords.cs + UserControl @@ -80,6 +86,12 @@ Form1.cs + + UserControl + + + HistoryControl.cs + @@ -166,12 +178,18 @@ Finder.cs + + FlowContainerWords.cs + FlowContainer.cs Form1.cs + + HistoryControl.cs + ResXFileCodeGenerator Resources.Designer.cs @@ -273,5 +291,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Remontor/Resources/add_circle_24dp_19C016_FILL0_wght400_GRAD0_opsz24.png b/Remontor/Resources/add_circle_24dp_19C016_FILL0_wght400_GRAD0_opsz24.png new file mode 100644 index 0000000..41dc617 Binary files /dev/null and b/Remontor/Resources/add_circle_24dp_19C016_FILL0_wght400_GRAD0_opsz24.png differ diff --git a/Remontor/Resources/developer_mode_tv_24dp_48752C_FILL0_wght400_GRAD0_opsz24.png b/Remontor/Resources/developer_mode_tv_24dp_48752C_FILL0_wght400_GRAD0_opsz24.png new file mode 100644 index 0000000..eb9aac4 Binary files /dev/null and b/Remontor/Resources/developer_mode_tv_24dp_48752C_FILL0_wght400_GRAD0_opsz24.png differ diff --git a/Remontor/Resources/history_20dp_2854C5_FILL0_wght400_GRAD0_opsz20.png b/Remontor/Resources/history_20dp_2854C5_FILL0_wght400_GRAD0_opsz20.png new file mode 100644 index 0000000..aa653be Binary files /dev/null and b/Remontor/Resources/history_20dp_2854C5_FILL0_wght400_GRAD0_opsz20.png differ diff --git a/Remontor/Resources/history_20dp_2854C5_FILL0_wght400_GRAD0_opsz201.png b/Remontor/Resources/history_20dp_2854C5_FILL0_wght400_GRAD0_opsz201.png new file mode 100644 index 0000000..41d7354 Binary files /dev/null and b/Remontor/Resources/history_20dp_2854C5_FILL0_wght400_GRAD0_opsz201.png differ diff --git a/Remontor/Resources/menu_book_24dp_6B2346_FILL0_wght400_GRAD0_opsz24.png b/Remontor/Resources/menu_book_24dp_6B2346_FILL0_wght400_GRAD0_opsz24.png new file mode 100644 index 0000000..023c0b4 Binary files /dev/null and b/Remontor/Resources/menu_book_24dp_6B2346_FILL0_wght400_GRAD0_opsz24.png differ diff --git a/Remontor/Resources/menu_book_24dp_6B2346_FILL0_wght400_GRAD0_opsz241.png b/Remontor/Resources/menu_book_24dp_6B2346_FILL0_wght400_GRAD0_opsz241.png new file mode 100644 index 0000000..450562d Binary files /dev/null and b/Remontor/Resources/menu_book_24dp_6B2346_FILL0_wght400_GRAD0_opsz241.png differ diff --git a/Remontor/Resources/settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz20.png b/Remontor/Resources/settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz20.png new file mode 100644 index 0000000..2e2e583 Binary files /dev/null and b/Remontor/Resources/settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz20.png differ diff --git a/Remontor/Resources/settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz201.png b/Remontor/Resources/settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz201.png new file mode 100644 index 0000000..6557e85 Binary files /dev/null and b/Remontor/Resources/settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz201.png differ diff --git a/Remontor/Resources/settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz202.png b/Remontor/Resources/settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz202.png new file mode 100644 index 0000000..43eac2b Binary files /dev/null and b/Remontor/Resources/settings_20dp_F19E39_FILL0_wght400_GRAD0_opsz202.png differ diff --git a/Remontor/Resources/sync_24dp_2854C5_FILL0_wght400_GRAD0_opsz24.png b/Remontor/Resources/sync_24dp_2854C5_FILL0_wght400_GRAD0_opsz24.png new file mode 100644 index 0000000..68fa480 Binary files /dev/null and b/Remontor/Resources/sync_24dp_2854C5_FILL0_wght400_GRAD0_opsz24.png differ diff --git a/Remontor/Resources/tv_24dp_48752C_FILL0_wght400_GRAD0_opsz24.png b/Remontor/Resources/tv_24dp_48752C_FILL0_wght400_GRAD0_opsz24.png new file mode 100644 index 0000000..69e2d3a Binary files /dev/null and b/Remontor/Resources/tv_24dp_48752C_FILL0_wght400_GRAD0_opsz24.png differ diff --git a/Remontor/Resources/tv_24dp_48752C_FILL0_wght400_GRAD0_opsz241.png b/Remontor/Resources/tv_24dp_48752C_FILL0_wght400_GRAD0_opsz241.png new file mode 100644 index 0000000..c736389 Binary files /dev/null and b/Remontor/Resources/tv_24dp_48752C_FILL0_wght400_GRAD0_opsz241.png differ diff --git a/Remontor/Resources/tv_24dp_48752C_FILL0_wght400_GRAD0_opsz2411.png b/Remontor/Resources/tv_24dp_48752C_FILL0_wght400_GRAD0_opsz2411.png new file mode 100644 index 0000000..12b5be0 Binary files /dev/null and b/Remontor/Resources/tv_24dp_48752C_FILL0_wght400_GRAD0_opsz2411.png differ diff --git a/Remontor/Resources/tv_24dp_48752C_FILL0_wght400_GRAD0_opsz242.png b/Remontor/Resources/tv_24dp_48752C_FILL0_wght400_GRAD0_opsz242.png new file mode 100644 index 0000000..f52f6f5 Binary files /dev/null and b/Remontor/Resources/tv_24dp_48752C_FILL0_wght400_GRAD0_opsz242.png differ diff --git a/Remontor/bin/Debug/Remontor.exe b/Remontor/bin/Debug/Remontor.exe index 0a30f6f..31ae2b9 100644 Binary files a/Remontor/bin/Debug/Remontor.exe and b/Remontor/bin/Debug/Remontor.exe differ diff --git a/Remontor/bin/Debug/Remontor.pdb b/Remontor/bin/Debug/Remontor.pdb index 65e70d0..507a42e 100644 Binary files a/Remontor/bin/Debug/Remontor.pdb and b/Remontor/bin/Debug/Remontor.pdb differ diff --git a/Remontor/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Remontor/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 55a2101..1ffcc71 100644 Binary files a/Remontor/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Remontor/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Remontor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Remontor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 00f5d57..e0fbbce 100644 Binary files a/Remontor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Remontor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Remontor/obj/Debug/Remontor.FlowContainerWords.resources b/Remontor/obj/Debug/Remontor.FlowContainerWords.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/Remontor/obj/Debug/Remontor.FlowContainerWords.resources differ diff --git a/Remontor/obj/Debug/Remontor.History.HistoryControl.resources b/Remontor/obj/Debug/Remontor.History.HistoryControl.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/Remontor/obj/Debug/Remontor.History.HistoryControl.resources differ diff --git a/Remontor/obj/Debug/Remontor.Properties.Resources.resources b/Remontor/obj/Debug/Remontor.Properties.Resources.resources index b65bf5a..1a97759 100644 Binary files a/Remontor/obj/Debug/Remontor.Properties.Resources.resources and b/Remontor/obj/Debug/Remontor.Properties.Resources.resources differ diff --git a/Remontor/obj/Debug/Remontor.csproj.CoreCompileInputs.cache b/Remontor/obj/Debug/Remontor.csproj.CoreCompileInputs.cache index 308cd60..434d273 100644 --- a/Remontor/obj/Debug/Remontor.csproj.CoreCompileInputs.cache +++ b/Remontor/obj/Debug/Remontor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -3acf4e3322dc5ba5bba9a16775bbf8edfe9e6506 +b1e05729df70b7421776d42c13cb1f68767c0276 diff --git a/Remontor/obj/Debug/Remontor.csproj.FileListAbsolute.txt b/Remontor/obj/Debug/Remontor.csproj.FileListAbsolute.txt index cf387e7..57fe493 100644 --- a/Remontor/obj/Debug/Remontor.csproj.FileListAbsolute.txt +++ b/Remontor/obj/Debug/Remontor.csproj.FileListAbsolute.txt @@ -22,3 +22,29 @@ C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Debug\Remontor.Word C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Debug\Remontor.Words.WordsEditCompControl.resources C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Debug\Remontor.Words.WordsItemControl.resources C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Debug\Remontor.BarButtonControl.resources +C:\Users\klavi\Source\Repos\Remontor\Remontor\bin\Debug\Remontor.exe.config +C:\Users\klavi\Source\Repos\Remontor\Remontor\bin\Debug\Remontor.exe +C:\Users\klavi\Source\Repos\Remontor\Remontor\bin\Debug\Remontor.pdb +C:\Users\klavi\Source\Repos\Remontor\Remontor\obj\Debug\Remontor.csproj.AssemblyReference.cache +C:\Users\klavi\Source\Repos\Remontor\Remontor\obj\Debug\Remontor.csproj.SuggestedBindingRedirects.cache +C:\Users\klavi\Source\Repos\Remontor\Remontor\obj\Debug\Remontor.BarButtonControl.resources +C:\Users\klavi\Source\Repos\Remontor\Remontor\obj\Debug\Remontor.BarSessionControl.resources +C:\Users\klavi\Source\Repos\Remontor\Remontor\obj\Debug\Remontor.Finder.Finder.resources +C:\Users\klavi\Source\Repos\Remontor\Remontor\obj\Debug\Remontor.FlowContainer.resources +C:\Users\klavi\Source\Repos\Remontor\Remontor\obj\Debug\Remontor.Form1.resources +C:\Users\klavi\Source\Repos\Remontor\Remontor\obj\Debug\Remontor.Properties.Resources.resources +C:\Users\klavi\Source\Repos\Remontor\Remontor\obj\Debug\Remontor.SessionItemControl.resources +C:\Users\klavi\Source\Repos\Remontor\Remontor\obj\Debug\Remontor.Setting.SettingRebootControl.resources +C:\Users\klavi\Source\Repos\Remontor\Remontor\obj\Debug\Remontor.Setting.SettingSCCMControl.resources +C:\Users\klavi\Source\Repos\Remontor\Remontor\obj\Debug\Remontor.Setting.SettingWordsControl.resources +C:\Users\klavi\Source\Repos\Remontor\Remontor\obj\Debug\Remontor.Words.BilderWords.resources +C:\Users\klavi\Source\Repos\Remontor\Remontor\obj\Debug\Remontor.Words.WordsCategoryControl.resources +C:\Users\klavi\Source\Repos\Remontor\Remontor\obj\Debug\Remontor.Words.WordsEditCategoryControl.resources +C:\Users\klavi\Source\Repos\Remontor\Remontor\obj\Debug\Remontor.Words.WordsEditCompControl.resources +C:\Users\klavi\Source\Repos\Remontor\Remontor\obj\Debug\Remontor.Words.WordsItemControl.resources +C:\Users\klavi\Source\Repos\Remontor\Remontor\obj\Debug\Remontor.csproj.GenerateResource.cache +C:\Users\klavi\Source\Repos\Remontor\Remontor\obj\Debug\Remontor.csproj.CoreCompileInputs.cache +C:\Users\klavi\Source\Repos\Remontor\Remontor\obj\Debug\Remontor.exe +C:\Users\klavi\Source\Repos\Remontor\Remontor\obj\Debug\Remontor.pdb +C:\Users\klavi\Source\Repos\Remontor\Remontor\obj\Debug\Remontor.History.HistoryControl.resources +C:\Users\klavi\Source\Repos\Remontor\Remontor\obj\Debug\Remontor.FlowContainerWords.resources diff --git a/Remontor/obj/Debug/Remontor.csproj.GenerateResource.cache b/Remontor/obj/Debug/Remontor.csproj.GenerateResource.cache index 161371a..7cc4c73 100644 Binary files a/Remontor/obj/Debug/Remontor.csproj.GenerateResource.cache and b/Remontor/obj/Debug/Remontor.csproj.GenerateResource.cache differ diff --git a/Remontor/obj/Debug/Remontor.exe b/Remontor/obj/Debug/Remontor.exe index 0a30f6f..31ae2b9 100644 Binary files a/Remontor/obj/Debug/Remontor.exe and b/Remontor/obj/Debug/Remontor.exe differ diff --git a/Remontor/obj/Debug/Remontor.pdb b/Remontor/obj/Debug/Remontor.pdb index 65e70d0..507a42e 100644 Binary files a/Remontor/obj/Debug/Remontor.pdb and b/Remontor/obj/Debug/Remontor.pdb differ diff --git a/Remontor/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll b/Remontor/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll index 8cadfcc..d6ee079 100644 Binary files a/Remontor/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll and b/Remontor/obj/Debug/TempPE/Properties.Resources.Designer.cs.dll differ