diff --git a/Remontor/.vs/Remontor/FileContentIndex/313eff2d-ddcc-4257-9301-6c3cd226728f.vsidx b/Remontor/.vs/Remontor/FileContentIndex/313eff2d-ddcc-4257-9301-6c3cd226728f.vsidx new file mode 100644 index 0000000..96a976f Binary files /dev/null and b/Remontor/.vs/Remontor/FileContentIndex/313eff2d-ddcc-4257-9301-6c3cd226728f.vsidx differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/3dec04ad-cdf3-4c0d-a702-2cd6a3bf48f6.vsidx b/Remontor/.vs/Remontor/FileContentIndex/3dec04ad-cdf3-4c0d-a702-2cd6a3bf48f6.vsidx deleted file mode 100644 index 679a534..0000000 Binary files a/Remontor/.vs/Remontor/FileContentIndex/3dec04ad-cdf3-4c0d-a702-2cd6a3bf48f6.vsidx and /dev/null differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/5b42a617-b374-44d8-a124-e845feab7e74.vsidx b/Remontor/.vs/Remontor/FileContentIndex/5b42a617-b374-44d8-a124-e845feab7e74.vsidx new file mode 100644 index 0000000..ac1a003 Binary files /dev/null and b/Remontor/.vs/Remontor/FileContentIndex/5b42a617-b374-44d8-a124-e845feab7e74.vsidx differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/9f288de6-1887-4c84-a00e-a8759ed7a967.vsidx b/Remontor/.vs/Remontor/FileContentIndex/9f288de6-1887-4c84-a00e-a8759ed7a967.vsidx deleted file mode 100644 index 1bf52cd..0000000 Binary files a/Remontor/.vs/Remontor/FileContentIndex/9f288de6-1887-4c84-a00e-a8759ed7a967.vsidx and /dev/null differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/a0b44f29-2792-40ce-bcdf-4375490f32a8.vsidx b/Remontor/.vs/Remontor/FileContentIndex/a0b44f29-2792-40ce-bcdf-4375490f32a8.vsidx new file mode 100644 index 0000000..f132774 Binary files /dev/null and b/Remontor/.vs/Remontor/FileContentIndex/a0b44f29-2792-40ce-bcdf-4375490f32a8.vsidx differ diff --git a/Remontor/.vs/Remontor/FileContentIndex/cf99afb8-1dc3-46d6-9a7a-fd9f78b801a0.vsidx b/Remontor/.vs/Remontor/FileContentIndex/cf99afb8-1dc3-46d6-9a7a-fd9f78b801a0.vsidx deleted file mode 100644 index c2a8dd9..0000000 Binary files a/Remontor/.vs/Remontor/FileContentIndex/cf99afb8-1dc3-46d6-9a7a-fd9f78b801a0.vsidx and /dev/null differ diff --git a/Remontor/.vs/Remontor/v17/.suo b/Remontor/.vs/Remontor/v17/.suo index 7c55d48..7c11f28 100644 Binary files a/Remontor/.vs/Remontor/v17/.suo and b/Remontor/.vs/Remontor/v17/.suo differ diff --git a/Remontor/BarButtonControl.Designer.cs b/Remontor/BarButtonControl.Designer.cs new file mode 100644 index 0000000..b1827fd --- /dev/null +++ b/Remontor/BarButtonControl.Designer.cs @@ -0,0 +1,77 @@ +namespace Remontor +{ + partial class BarButtonControl + { + /// + /// Обязательная переменная конструктора. + /// + 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.button6 = new System.Windows.Forms.Button(); + this.label1 = new System.Windows.Forms.Label(); + this.SuspendLayout(); + // + // button6 + // + this.button6.BackColor = System.Drawing.SystemColors.Control; + this.button6.BackgroundImage = global::Remontor.Properties.Resources.close_min; + this.button6.FlatAppearance.BorderSize = 0; + this.button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.button6.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); + this.button6.Location = new System.Drawing.Point(131, 1); + this.button6.Name = "button6"; + this.button6.Size = new System.Drawing.Size(20, 20); + this.button6.TabIndex = 7; + this.button6.UseVisualStyleBackColor = false; + // + // label1 + // + this.label1.AutoSize = true; + this.label1.Location = new System.Drawing.Point(7, 4); + this.label1.Name = "label1"; + this.label1.Size = new System.Drawing.Size(118, 13); + this.label1.TabIndex = 8; + this.label1.Text = "v.volkova(1MA001234)"; + this.label1.TextAlign = System.Drawing.ContentAlignment.MiddleRight; + // + // BarButtonControl + // + this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); + this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.Controls.Add(this.label1); + this.Controls.Add(this.button6); + this.Name = "BarButtonControl"; + this.Size = new System.Drawing.Size(150, 21); + this.ResumeLayout(false); + this.PerformLayout(); + + } + + #endregion + + private System.Windows.Forms.Button button6; + private System.Windows.Forms.Label label1; + } +} diff --git a/Remontor/BarButtonControl.cs b/Remontor/BarButtonControl.cs new file mode 100644 index 0000000..e494e56 --- /dev/null +++ b/Remontor/BarButtonControl.cs @@ -0,0 +1,25 @@ +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 +{ + public partial class BarButtonControl : UserControl + { + public BarButtonControl() + { + InitializeComponent(); + } + + private void BarButtonControl_Load(object sender, EventArgs e) + { + + } + } +} diff --git a/Remontor/BarButtonControl.resx b/Remontor/BarButtonControl.resx new file mode 100644 index 0000000..1af7de1 --- /dev/null +++ b/Remontor/BarButtonControl.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/BarSessionControl.Designer.cs b/Remontor/BarSessionControl.Designer.cs index 8265bbe..3cda615 100644 --- a/Remontor/BarSessionControl.Designer.cs +++ b/Remontor/BarSessionControl.Designer.cs @@ -28,142 +28,99 @@ /// private void InitializeComponent() { - this.button2 = new System.Windows.Forms.Button(); - this.button3 = new System.Windows.Forms.Button(); + this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); + this.barButtonControl3 = new Remontor.BarButtonControl(); + this.barButtonControl2 = new Remontor.BarButtonControl(); + this.barButtonControl1 = new Remontor.BarButtonControl(); this.button4 = new System.Windows.Forms.Button(); - this.button7 = new System.Windows.Forms.Button(); - this.button6 = new System.Windows.Forms.Button(); + this.button3 = new System.Windows.Forms.Button(); + this.button2 = new System.Windows.Forms.Button(); + this.button1 = new System.Windows.Forms.Button(); + this.NewBtn = new System.Windows.Forms.Button(); this.button5 = new System.Windows.Forms.Button(); this.ShowBar = new System.Windows.Forms.Button(); - this.NewBtn = new System.Windows.Forms.Button(); - this.flowLayoutPanel1 = new System.Windows.Forms.FlowLayoutPanel(); - this.button1 = new System.Windows.Forms.Button(); this.flowLayoutPanel1.SuspendLayout(); this.SuspendLayout(); // - // button2 - // - this.button2.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.button2.FlatAppearance.BorderSize = 0; - this.button2.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button2.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.button2.Location = new System.Drawing.Point(431, 0); - this.button2.Margin = new System.Windows.Forms.Padding(0); - this.button2.Name = "button2"; - this.button2.Size = new System.Drawing.Size(140, 21); - this.button2.TabIndex = 2; - this.button2.Text = "k.kotov(1MA001236)"; - this.button2.UseVisualStyleBackColor = false; - // - // button3 - // - this.button3.BackColor = System.Drawing.SystemColors.Control; - this.button3.FlatAppearance.BorderSize = 0; - this.button3.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button3.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.button3.Location = new System.Drawing.Point(322, 0); - this.button3.Margin = new System.Windows.Forms.Padding(0); - this.button3.Name = "button3"; - this.button3.Size = new System.Drawing.Size(109, 21); - this.button3.TabIndex = 3; - this.button3.Text = "Котов Киррил"; - this.button3.UseVisualStyleBackColor = false; - // - // button4 - // - this.button4.BackColor = System.Drawing.Color.FromArgb(((int)(((byte)(224)))), ((int)(((byte)(224)))), ((int)(((byte)(224))))); - this.button4.FlatAppearance.BorderSize = 0; - this.button4.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button4.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.button4.Location = new System.Drawing.Point(213, 0); - this.button4.Margin = new System.Windows.Forms.Padding(0); - this.button4.Name = "button4"; - this.button4.Size = new System.Drawing.Size(109, 21); - this.button4.TabIndex = 4; - this.button4.Text = "Котов Киррил"; - this.button4.UseVisualStyleBackColor = false; - // - // button7 - // - this.button7.BackColor = System.Drawing.SystemColors.Control; - this.button7.FlatAppearance.BorderSize = 0; - this.button7.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button7.Font = new System.Drawing.Font("Microsoft Sans Serif", 8.25F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.button7.Location = new System.Drawing.Point(104, 0); - this.button7.Margin = new System.Windows.Forms.Padding(0); - this.button7.Name = "button7"; - this.button7.Size = new System.Drawing.Size(109, 21); - this.button7.TabIndex = 7; - this.button7.Text = "Котов Киррил"; - this.button7.UseMnemonic = false; - this.button7.UseVisualStyleBackColor = false; - // - // button6 - // - this.button6.BackColor = System.Drawing.SystemColors.Control; - this.button6.BackgroundImage = global::Remontor.Properties.Resources.close_min; - this.button6.FlatAppearance.BorderSize = 0; - this.button6.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.button6.Font = new System.Drawing.Font("Microsoft Sans Serif", 6.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.button6.Location = new System.Drawing.Point(598, 0); - this.button6.Name = "button6"; - this.button6.Size = new System.Drawing.Size(21, 21); - this.button6.TabIndex = 6; - this.button6.UseVisualStyleBackColor = false; - // - // button5 - // - this.button5.BackColor = System.Drawing.SystemColors.Control; - this.button5.BackgroundImage = global::Remontor.Properties.Resources.reconnect_min; - 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(571, 0); - this.button5.Name = "button5"; - this.button5.Size = new System.Drawing.Size(21, 21); - this.button5.TabIndex = 5; - this.button5.UseVisualStyleBackColor = false; - // - // ShowBar - // - this.ShowBar.BackgroundImage = global::Remontor.Properties.Resources.up_min1; - this.ShowBar.FlatAppearance.BorderSize = 0; - this.ShowBar.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.ShowBar.Location = new System.Drawing.Point(670, 0); - this.ShowBar.Name = "ShowBar"; - this.ShowBar.Size = new System.Drawing.Size(21, 21); - this.ShowBar.TabIndex = 1; - this.ShowBar.UseVisualStyleBackColor = true; - this.ShowBar.Click += new System.EventHandler(this.ShowBar_Click); - // - // NewBtn - // - this.NewBtn.BackColor = System.Drawing.Color.Transparent; - this.NewBtn.BackgroundImage = global::Remontor.Properties.Resources.connect_min; - this.NewBtn.FlatAppearance.BorderSize = 0; - this.NewBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; - this.NewBtn.Location = new System.Drawing.Point(73, 0); - this.NewBtn.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0); - this.NewBtn.Name = "NewBtn"; - this.NewBtn.Size = new System.Drawing.Size(21, 21); - this.NewBtn.TabIndex = 0; - this.NewBtn.UseVisualStyleBackColor = false; - this.NewBtn.Click += new System.EventHandler(this.NewBtn_Click); - // // flowLayoutPanel1 // - this.flowLayoutPanel1.Controls.Add(this.button2); - this.flowLayoutPanel1.Controls.Add(this.button3); - this.flowLayoutPanel1.Controls.Add(this.button4); - this.flowLayoutPanel1.Controls.Add(this.button7); + this.flowLayoutPanel1.Controls.Add(this.barButtonControl3); + this.flowLayoutPanel1.Controls.Add(this.barButtonControl2); + this.flowLayoutPanel1.Controls.Add(this.barButtonControl1); this.flowLayoutPanel1.Controls.Add(this.NewBtn); this.flowLayoutPanel1.FlowDirection = System.Windows.Forms.FlowDirection.RightToLeft; this.flowLayoutPanel1.Location = new System.Drawing.Point(0, 0); this.flowLayoutPanel1.Margin = new System.Windows.Forms.Padding(0); this.flowLayoutPanel1.Name = "flowLayoutPanel1"; - this.flowLayoutPanel1.Size = new System.Drawing.Size(571, 21); + this.flowLayoutPanel1.Size = new System.Drawing.Size(589, 21); this.flowLayoutPanel1.TabIndex = 8; // + // barButtonControl3 + // + this.barButtonControl3.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.barButtonControl3.Location = new System.Drawing.Point(439, 0); + this.barButtonControl3.Margin = new System.Windows.Forms.Padding(0); + this.barButtonControl3.Name = "barButtonControl3"; + this.barButtonControl3.Size = new System.Drawing.Size(150, 21); + this.barButtonControl3.TabIndex = 3; + // + // barButtonControl2 + // + this.barButtonControl2.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.barButtonControl2.Location = new System.Drawing.Point(289, 0); + this.barButtonControl2.Margin = new System.Windows.Forms.Padding(0); + this.barButtonControl2.Name = "barButtonControl2"; + this.barButtonControl2.Size = new System.Drawing.Size(150, 21); + this.barButtonControl2.TabIndex = 2; + // + // barButtonControl1 + // + this.barButtonControl1.BackgroundImageLayout = System.Windows.Forms.ImageLayout.None; + this.barButtonControl1.Location = new System.Drawing.Point(139, 0); + this.barButtonControl1.Margin = new System.Windows.Forms.Padding(0); + this.barButtonControl1.Name = "barButtonControl1"; + this.barButtonControl1.Size = new System.Drawing.Size(150, 21); + this.barButtonControl1.TabIndex = 1; + // + // button4 + // + this.button4.BackColor = System.Drawing.SystemColors.Control; + this.button4.BackgroundImage = global::Remontor.Properties.Resources.min_size; + 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.Name = "button4"; + this.button4.Size = new System.Drawing.Size(20, 20); + this.button4.TabIndex = 12; + this.button4.UseVisualStyleBackColor = false; + // + // button3 + // + this.button3.BackColor = System.Drawing.SystemColors.Control; + this.button3.BackgroundImage = global::Remontor.Properties.Resources._1_size; + 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.Name = "button3"; + this.button3.Size = new System.Drawing.Size(20, 20); + this.button3.TabIndex = 11; + this.button3.UseVisualStyleBackColor = false; + // + // button2 + // + this.button2.BackColor = System.Drawing.SystemColors.Control; + this.button2.BackgroundImage = global::Remontor.Properties.Resources._2_size; + 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.Name = "button2"; + this.button2.Size = new System.Drawing.Size(20, 20); + this.button2.TabIndex = 10; + this.button2.UseVisualStyleBackColor = false; + // // button1 // this.button1.BackColor = System.Drawing.SystemColors.Control; @@ -171,23 +128,64 @@ 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(643, 0); + this.button1.Location = new System.Drawing.Point(717, 1); this.button1.Name = "button1"; - this.button1.Size = new System.Drawing.Size(21, 21); + this.button1.Size = new System.Drawing.Size(20, 20); this.button1.TabIndex = 9; this.button1.UseVisualStyleBackColor = false; // + // NewBtn + // + this.NewBtn.BackColor = System.Drawing.Color.Transparent; + this.NewBtn.BackgroundImage = global::Remontor.Properties.Resources.connect_min; + this.NewBtn.FlatAppearance.BorderSize = 0; + this.NewBtn.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.NewBtn.Location = new System.Drawing.Point(108, 0); + this.NewBtn.Margin = new System.Windows.Forms.Padding(10, 0, 10, 0); + this.NewBtn.Name = "NewBtn"; + this.NewBtn.Size = new System.Drawing.Size(21, 21); + this.NewBtn.TabIndex = 0; + this.NewBtn.UseVisualStyleBackColor = false; + this.NewBtn.Click += new System.EventHandler(this.NewBtn_Click); + // + // button5 + // + this.button5.BackColor = System.Drawing.SystemColors.Control; + this.button5.BackgroundImage = global::Remontor.Properties.Resources.reconnect_min; + 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.Name = "button5"; + this.button5.Size = new System.Drawing.Size(20, 20); + this.button5.TabIndex = 5; + this.button5.UseVisualStyleBackColor = false; + // + // ShowBar + // + this.ShowBar.BackgroundImage = global::Remontor.Properties.Resources.up_min1; + this.ShowBar.FlatAppearance.BorderSize = 0; + this.ShowBar.FlatStyle = System.Windows.Forms.FlatStyle.Flat; + this.ShowBar.Location = new System.Drawing.Point(744, 1); + this.ShowBar.Name = "ShowBar"; + this.ShowBar.Size = new System.Drawing.Size(20, 20); + this.ShowBar.TabIndex = 1; + this.ShowBar.UseVisualStyleBackColor = true; + this.ShowBar.Click += new System.EventHandler(this.ShowBar_Click); + // // BarSessionControl // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; + this.Controls.Add(this.button4); + this.Controls.Add(this.button3); + this.Controls.Add(this.button2); this.Controls.Add(this.button1); this.Controls.Add(this.flowLayoutPanel1); - this.Controls.Add(this.button6); this.Controls.Add(this.button5); this.Controls.Add(this.ShowBar); this.Name = "BarSessionControl"; - this.Size = new System.Drawing.Size(694, 21); + this.Size = new System.Drawing.Size(768, 21); this.flowLayoutPanel1.ResumeLayout(false); this.ResumeLayout(false); @@ -197,13 +195,14 @@ private System.Windows.Forms.Button NewBtn; private System.Windows.Forms.Button ShowBar; + private System.Windows.Forms.Button button5; + private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; + private System.Windows.Forms.Button button1; + private BarButtonControl barButtonControl1; + private BarButtonControl barButtonControl3; + private BarButtonControl barButtonControl2; private System.Windows.Forms.Button button2; private System.Windows.Forms.Button button3; private System.Windows.Forms.Button button4; - private System.Windows.Forms.Button button5; - private System.Windows.Forms.Button button6; - private System.Windows.Forms.Button button7; - private System.Windows.Forms.FlowLayoutPanel flowLayoutPanel1; - private System.Windows.Forms.Button button1; } } diff --git a/Remontor/Connector/Connect.cs b/Remontor/Connector/Connect.cs index 7e5e121..379c8d3 100644 --- a/Remontor/Connector/Connect.cs +++ b/Remontor/Connector/Connect.cs @@ -8,8 +8,8 @@ namespace Remontor.Connector { internal class Connect { - public IComp Comp; - + private IComp Comp; + private string Login = ""; public Connect(IComp comp) { @@ -17,6 +17,26 @@ namespace Remontor.Connector } + public Connect(IComp comp, string login) + { + this.Comp = comp; + this.Login = login; + } + + public IComp GetComp + { + get { return Comp; } + } + public string toString() + { + string result; + if (Login == "") + { + return Comp.GetNetNameStr(); + } + return Login + "(" + Comp.GetNetNameStr() + ")"; + } + } } diff --git a/Remontor/Connector/SConnector.cs b/Remontor/Connector/SConnector.cs index 326722b..2d6a011 100644 --- a/Remontor/Connector/SConnector.cs +++ b/Remontor/Connector/SConnector.cs @@ -8,10 +8,13 @@ namespace Remontor.Connector { internal static class SConnector { + public delegate void UpdateConnect(List connects); + public static event UpdateConnect Update; private static List Connects = new List(); public static void NewConnect(IComp comp) { Connects.Add(new Connect(comp)); + Update(Connects); } } } diff --git a/Remontor/Form1.Designer.cs b/Remontor/Form1.Designer.cs index 2c2aae8..29d87e8 100644 --- a/Remontor/Form1.Designer.cs +++ b/Remontor/Form1.Designer.cs @@ -59,9 +59,9 @@ // 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(388, 0); + this.barSessionControl1.Location = new System.Drawing.Point(310, 0); this.barSessionControl1.Name = "barSessionControl1"; - this.barSessionControl1.Size = new System.Drawing.Size(694, 21); + this.barSessionControl1.Size = new System.Drawing.Size(772, 21); this.barSessionControl1.TabIndex = 1; this.barSessionControl1.Load += new System.EventHandler(this.barSessionControl1_Load); // diff --git a/Remontor/History/HistoryItem.cs b/Remontor/History/HistoryItem.cs index 72d63d1..029588a 100644 --- a/Remontor/History/HistoryItem.cs +++ b/Remontor/History/HistoryItem.cs @@ -24,7 +24,7 @@ namespace Remontor.History public HistoryItem(Connect connect) { - this.comp = connect.Comp; + this.comp = connect.GetComp; this.startTime = DateTime.Now; } diff --git a/Remontor/Properties/Resources.Designer.cs b/Remontor/Properties/Resources.Designer.cs index 2630ac1..b6f3ef0 100644 --- a/Remontor/Properties/Resources.Designer.cs +++ b/Remontor/Properties/Resources.Designer.cs @@ -60,6 +60,26 @@ namespace Remontor.Properties { } } + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _1_size { + get { + object obj = ResourceManager.GetObject("1_size", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap _2_size { + get { + object obj = ResourceManager.GetObject("2_size", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// @@ -100,6 +120,16 @@ namespace Remontor.Properties { } } + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap doble { + get { + object obj = ResourceManager.GetObject("doble", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// @@ -140,6 +170,16 @@ namespace Remontor.Properties { } } + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap min_size { + get { + object obj = ResourceManager.GetObject("min_size", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } + /// /// Поиск локализованного ресурса типа System.Drawing.Bitmap. /// @@ -179,5 +219,15 @@ namespace Remontor.Properties { return ((System.Drawing.Bitmap)(obj)); } } + + /// + /// Поиск локализованного ресурса типа System.Drawing.Bitmap. + /// + internal static System.Drawing.Bitmap up_min11 { + get { + object obj = ResourceManager.GetObject("up_min11", resourceCulture); + return ((System.Drawing.Bitmap)(obj)); + } + } } } diff --git a/Remontor/Properties/Resources.resx b/Remontor/Properties/Resources.resx index 130e665..858af1c 100644 --- a/Remontor/Properties/Resources.resx +++ b/Remontor/Properties/Resources.resx @@ -118,8 +118,11 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - ..\Resources\max_size.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\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 @@ -127,31 +130,43 @@ ..\Resources\down_min.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\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\close.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\down_min11.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\close_min.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\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\down_min1.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\connect_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\down_min11.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 \ No newline at end of file diff --git a/Remontor/Remontor.csproj b/Remontor/Remontor.csproj index 6acf995..a3ef507 100644 --- a/Remontor/Remontor.csproj +++ b/Remontor/Remontor.csproj @@ -46,6 +46,12 @@ + + UserControl + + + BarButtonControl.cs + UserControl @@ -151,6 +157,9 @@ WordsItemControl.cs + + BarButtonControl.cs + BarSessionControl.cs @@ -249,5 +258,20 @@ + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/Remontor/Resources/1_size.png b/Remontor/Resources/1_size.png new file mode 100644 index 0000000..e4b09f7 Binary files /dev/null and b/Remontor/Resources/1_size.png differ diff --git a/Remontor/Resources/2_size.png b/Remontor/Resources/2_size.png new file mode 100644 index 0000000..8b21534 Binary files /dev/null and b/Remontor/Resources/2_size.png differ diff --git a/Remontor/Resources/doble.png b/Remontor/Resources/doble.png new file mode 100644 index 0000000..c31e6f0 Binary files /dev/null and b/Remontor/Resources/doble.png differ diff --git a/Remontor/Resources/min_size.png b/Remontor/Resources/min_size.png new file mode 100644 index 0000000..c6e2552 Binary files /dev/null and b/Remontor/Resources/min_size.png differ diff --git a/Remontor/Resources/up_min11.png b/Remontor/Resources/up_min11.png new file mode 100644 index 0000000..c6e2552 Binary files /dev/null and b/Remontor/Resources/up_min11.png differ diff --git a/Remontor/bin/Debug/Remontor.exe b/Remontor/bin/Debug/Remontor.exe index 3838f52..7d01a6d 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 99e6c50..901e54b 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 f7576a9..9afaf62 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 b151148..00f5d57 100644 Binary files a/Remontor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Remontor/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Remontor/obj/Debug/Remontor.BarButtonControl.resources b/Remontor/obj/Debug/Remontor.BarButtonControl.resources new file mode 100644 index 0000000..6c05a97 Binary files /dev/null and b/Remontor/obj/Debug/Remontor.BarButtonControl.resources differ diff --git a/Remontor/obj/Debug/Remontor.Properties.Resources.resources b/Remontor/obj/Debug/Remontor.Properties.Resources.resources index 8fc7438..b65bf5a 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 30d814a..308cd60 100644 --- a/Remontor/obj/Debug/Remontor.csproj.CoreCompileInputs.cache +++ b/Remontor/obj/Debug/Remontor.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -a242571a09c5a9eb69787b6862e9dfdf49e5e5fd +3acf4e3322dc5ba5bba9a16775bbf8edfe9e6506 diff --git a/Remontor/obj/Debug/Remontor.csproj.FileListAbsolute.txt b/Remontor/obj/Debug/Remontor.csproj.FileListAbsolute.txt index 83da36e..cf387e7 100644 --- a/Remontor/obj/Debug/Remontor.csproj.FileListAbsolute.txt +++ b/Remontor/obj/Debug/Remontor.csproj.FileListAbsolute.txt @@ -21,3 +21,4 @@ C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Debug\Remontor.Word C:\Users\Владимир\source\repos\Remontor\Remontor\obj\Debug\Remontor.Words.WordsEditCategoryControl.resources 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 diff --git a/Remontor/obj/Debug/Remontor.csproj.GenerateResource.cache b/Remontor/obj/Debug/Remontor.csproj.GenerateResource.cache index aa4cba2..e64b5d8 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 3838f52..7d01a6d 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 99e6c50..901e54b 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 3c3477b..8cadfcc 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