Доработка тулбара

This commit is contained in:
klavirshik 2024-10-11 19:09:09 +02:00
parent 35c865e203
commit 146918dfd8
35 changed files with 486 additions and 152 deletions

Binary file not shown.

77
Remontor/BarButtonControl.Designer.cs generated Normal file
View File

@ -0,0 +1,77 @@
namespace Remontor
{
partial class BarButtonControl
{
/// <summary>
/// Обязательная переменная конструктора.
/// </summary>
private System.ComponentModel.IContainer components = null;
/// <summary>
/// Освободить все используемые ресурсы.
/// </summary>
/// <param name="disposing">истинно, если управляемый ресурс должен быть удален; иначе ложно.</param>
protected override void Dispose(bool disposing)
{
if (disposing && (components != null))
{
components.Dispose();
}
base.Dispose(disposing);
}
#region Код, автоматически созданный конструктором компонентов
/// <summary>
/// Требуемый метод для поддержки конструктора — не изменяйте
/// содержимое этого метода с помощью редактора кода.
/// </summary>
private void InitializeComponent()
{
this.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;
}
}

View File

@ -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)
{
}
}
}

View File

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

View File

@ -28,142 +28,99 @@
/// </summary>
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;
}
}

View File

@ -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() + ")";
}
}
}

View File

@ -8,10 +8,13 @@ namespace Remontor.Connector
{
internal static class SConnector
{
public delegate void UpdateConnect(List<Connect> connects);
public static event UpdateConnect Update;
private static List<Connect> Connects = new List<Connect>();
public static void NewConnect(IComp comp)
{
Connects.Add(new Connect(comp));
Update(Connects);
}
}
}

View File

@ -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);
//

View File

@ -24,7 +24,7 @@ namespace Remontor.History
public HistoryItem(Connect connect)
{
this.comp = connect.Comp;
this.comp = connect.GetComp;
this.startTime = DateTime.Now;
}

View File

@ -60,6 +60,26 @@ namespace Remontor.Properties {
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _1_size {
get {
object obj = ResourceManager.GetObject("1_size", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap _2_size {
get {
object obj = ResourceManager.GetObject("2_size", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
@ -100,6 +120,16 @@ namespace Remontor.Properties {
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap doble {
get {
object obj = ResourceManager.GetObject("doble", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
@ -140,6 +170,16 @@ namespace Remontor.Properties {
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap min_size {
get {
object obj = ResourceManager.GetObject("min_size", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
@ -179,5 +219,15 @@ namespace Remontor.Properties {
return ((System.Drawing.Bitmap)(obj));
}
}
/// <summary>
/// Поиск локализованного ресурса типа System.Drawing.Bitmap.
/// </summary>
internal static System.Drawing.Bitmap up_min11 {
get {
object obj = ResourceManager.GetObject("up_min11", resourceCulture);
return ((System.Drawing.Bitmap)(obj));
}
}
}
}

View File

@ -118,8 +118,11 @@
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="max_size" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\max_size.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="Person" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Person.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="close_min" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\close_min.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="reconnect" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\reconnect.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@ -127,31 +130,43 @@
<data name="down_min" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\down_min.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="connect_min" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\connect_min.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="reconnect_min" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\reconnect_min.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="apple-touch-icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\apple-touch-icon.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="close" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="min_size" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\min_size.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="up_min1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\up_min1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="down_min11" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\down_min11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="max_size" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\max_size.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="close_min" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\close_min.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="1_size" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\1_size.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="close" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\close.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="2_size" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\2_size.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="reconnect_min" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\reconnect_min.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="down_min1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\down_min1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="Person" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Person.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="connect_min" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\connect_min.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="up_min11" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\up_min11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="down_min11" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\down_min11.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="doble" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\doble.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>

View File

@ -46,6 +46,12 @@
<Reference Include="System.Xml" />
</ItemGroup>
<ItemGroup>
<Compile Include="BarButtonControl.cs">
<SubType>UserControl</SubType>
</Compile>
<Compile Include="BarButtonControl.Designer.cs">
<DependentUpon>BarButtonControl.cs</DependentUpon>
</Compile>
<Compile Include="BarSessionControl.cs">
<SubType>UserControl</SubType>
</Compile>
@ -151,6 +157,9 @@
<DependentUpon>WordsItemControl.cs</DependentUpon>
</Compile>
<Compile Include="Words\WordsList.cs" />
<EmbeddedResource Include="BarButtonControl.resx">
<DependentUpon>BarButtonControl.cs</DependentUpon>
</EmbeddedResource>
<EmbeddedResource Include="BarSessionControl.resx">
<DependentUpon>BarSessionControl.cs</DependentUpon>
</EmbeddedResource>
@ -249,5 +258,20 @@
<ItemGroup>
<None Include="Resources\Person.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\up_min11.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\min_size.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\1_size.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\2_size.png" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\doble.png" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
</Project>

Binary file not shown.

After

Width:  |  Height:  |  Size: 353 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 425 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 217 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 253 B

Binary file not shown.

After

Width:  |  Height:  |  Size: 253 B

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -1 +1 @@
a242571a09c5a9eb69787b6862e9dfdf49e5e5fd
3acf4e3322dc5ba5bba9a16775bbf8edfe9e6506

View File

@ -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

Binary file not shown.

Binary file not shown.