diff --git a/.vs/GtaVUsersInfo/DesignTimeBuild/.dtbcache.v2 b/.vs/GtaVUsersInfo/DesignTimeBuild/.dtbcache.v2 index a6176f1..04ae1be 100644 Binary files a/.vs/GtaVUsersInfo/DesignTimeBuild/.dtbcache.v2 and b/.vs/GtaVUsersInfo/DesignTimeBuild/.dtbcache.v2 differ diff --git a/.vs/GtaVUsersInfo/FileContentIndex/0320c4c5-409a-4ffd-9ec1-cb37805ba871.vsidx b/.vs/GtaVUsersInfo/FileContentIndex/0320c4c5-409a-4ffd-9ec1-cb37805ba871.vsidx deleted file mode 100644 index 37fc4fc..0000000 Binary files a/.vs/GtaVUsersInfo/FileContentIndex/0320c4c5-409a-4ffd-9ec1-cb37805ba871.vsidx and /dev/null differ diff --git a/.vs/GtaVUsersInfo/FileContentIndex/26f1736a-a5f0-49e3-8b8a-0b48a876135f.vsidx b/.vs/GtaVUsersInfo/FileContentIndex/26f1736a-a5f0-49e3-8b8a-0b48a876135f.vsidx new file mode 100644 index 0000000..7a3bdc9 Binary files /dev/null and b/.vs/GtaVUsersInfo/FileContentIndex/26f1736a-a5f0-49e3-8b8a-0b48a876135f.vsidx differ diff --git a/.vs/GtaVUsersInfo/FileContentIndex/3854eb5a-c96a-4127-b92c-31a76f21eb41.vsidx b/.vs/GtaVUsersInfo/FileContentIndex/3854eb5a-c96a-4127-b92c-31a76f21eb41.vsidx new file mode 100644 index 0000000..398c326 Binary files /dev/null and b/.vs/GtaVUsersInfo/FileContentIndex/3854eb5a-c96a-4127-b92c-31a76f21eb41.vsidx differ diff --git a/.vs/GtaVUsersInfo/FileContentIndex/7e388260-c786-4c68-a58c-a61f68784f61.vsidx b/.vs/GtaVUsersInfo/FileContentIndex/7e388260-c786-4c68-a58c-a61f68784f61.vsidx deleted file mode 100644 index c1c5e9b..0000000 Binary files a/.vs/GtaVUsersInfo/FileContentIndex/7e388260-c786-4c68-a58c-a61f68784f61.vsidx and /dev/null differ diff --git a/.vs/GtaVUsersInfo/FileContentIndex/87daad5a-03ee-4111-bd29-8975ba2b3e27.vsidx b/.vs/GtaVUsersInfo/FileContentIndex/87daad5a-03ee-4111-bd29-8975ba2b3e27.vsidx new file mode 100644 index 0000000..303bc66 Binary files /dev/null and b/.vs/GtaVUsersInfo/FileContentIndex/87daad5a-03ee-4111-bd29-8975ba2b3e27.vsidx differ diff --git a/.vs/GtaVUsersInfo/FileContentIndex/95f84248-5f39-4c0c-b948-48bf39a9d554.vsidx b/.vs/GtaVUsersInfo/FileContentIndex/95f84248-5f39-4c0c-b948-48bf39a9d554.vsidx deleted file mode 100644 index 8095c5c..0000000 Binary files a/.vs/GtaVUsersInfo/FileContentIndex/95f84248-5f39-4c0c-b948-48bf39a9d554.vsidx and /dev/null differ diff --git a/.vs/GtaVUsersInfo/FileContentIndex/de2d8361-bcad-4f16-b5a7-c775f9702fe3.vsidx b/.vs/GtaVUsersInfo/FileContentIndex/de2d8361-bcad-4f16-b5a7-c775f9702fe3.vsidx deleted file mode 100644 index 2e95f27..0000000 Binary files a/.vs/GtaVUsersInfo/FileContentIndex/de2d8361-bcad-4f16-b5a7-c775f9702fe3.vsidx and /dev/null differ diff --git a/.vs/GtaVUsersInfo/FileContentIndex/ee41b38c-92a7-4412-9dca-909ef079c894.vsidx b/.vs/GtaVUsersInfo/FileContentIndex/ee41b38c-92a7-4412-9dca-909ef079c894.vsidx new file mode 100644 index 0000000..a06dd3d Binary files /dev/null and b/.vs/GtaVUsersInfo/FileContentIndex/ee41b38c-92a7-4412-9dca-909ef079c894.vsidx differ diff --git a/.vs/GtaVUsersInfo/v17/.futdcache.v2 b/.vs/GtaVUsersInfo/v17/.futdcache.v2 index a43a4aa..3731161 100644 Binary files a/.vs/GtaVUsersInfo/v17/.futdcache.v2 and b/.vs/GtaVUsersInfo/v17/.futdcache.v2 differ diff --git a/.vs/GtaVUsersInfo/v17/.suo b/.vs/GtaVUsersInfo/v17/.suo index 35ab21d..0d2d96a 100644 Binary files a/.vs/GtaVUsersInfo/v17/.suo and b/.vs/GtaVUsersInfo/v17/.suo differ diff --git a/.vs/ProjectEvaluation/gtavusersinfo.metadata.v7.bin b/.vs/ProjectEvaluation/gtavusersinfo.metadata.v7.bin index b378415..c3fca9f 100644 Binary files a/.vs/ProjectEvaluation/gtavusersinfo.metadata.v7.bin and b/.vs/ProjectEvaluation/gtavusersinfo.metadata.v7.bin differ diff --git a/.vs/ProjectEvaluation/gtavusersinfo.projects.v7.bin b/.vs/ProjectEvaluation/gtavusersinfo.projects.v7.bin index ef7dc36..6384e99 100644 Binary files a/.vs/ProjectEvaluation/gtavusersinfo.projects.v7.bin and b/.vs/ProjectEvaluation/gtavusersinfo.projects.v7.bin differ diff --git a/Car.cs b/Car.cs index 08643b7..92baaa1 100644 --- a/Car.cs +++ b/Car.cs @@ -12,6 +12,7 @@ namespace GtaVUsersInfo public string Manufacturer { get; set; } public string Class { get; set; } public string Model { get; set; } + public Color color { get; set; } public Car() { } @@ -23,6 +24,7 @@ namespace GtaVUsersInfo Manufacturer = car.Manufacturer; Class = car.Class; Model = car.Model; + color = car.color; } public static List ConvertToCarList(List cars) diff --git a/Controls/CarControl.Designer.cs b/Controls/CarControl.Designer.cs index bac275e..0fda736 100644 --- a/Controls/CarControl.Designer.cs +++ b/Controls/CarControl.Designer.cs @@ -28,255 +28,270 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - this.MainPanel = new System.Windows.Forms.Panel(); - this.PhotoPanel = new System.Windows.Forms.Panel(); - this.PhotoBox = new System.Windows.Forms.PictureBox(); - this.MoneyPanel = new System.Windows.Forms.Panel(); - this.MoneyTextBox = new System.Windows.Forms.TextBox(); - this.MoneyLabel = new System.Windows.Forms.Label(); - this.ClassPanel = new System.Windows.Forms.Panel(); - this.ClassTextBox = new System.Windows.Forms.TextBox(); - this.ClassLabel = new System.Windows.Forms.Label(); - this.NamePanel = new System.Windows.Forms.Panel(); - this.ManufacturerLabel = new System.Windows.Forms.Label(); - this.NameLabel = new System.Windows.Forms.Label(); - this.ModelPanel = new System.Windows.Forms.Panel(); - this.ModelTextBox = new System.Windows.Forms.TextBox(); - this.ModelLabel = new System.Windows.Forms.Label(); - this.contextMenuStrip1 = new System.Windows.Forms.ContextMenuStrip(this.components); - this.MainPanel.SuspendLayout(); - this.PhotoPanel.SuspendLayout(); - ((System.ComponentModel.ISupportInitialize)(this.PhotoBox)).BeginInit(); - this.MoneyPanel.SuspendLayout(); - this.ClassPanel.SuspendLayout(); - this.NamePanel.SuspendLayout(); - this.ModelPanel.SuspendLayout(); - this.SuspendLayout(); + components = new System.ComponentModel.Container(); + MainPanel = new Panel(); + PhotoPanel = new Panel(); + PhotoBox = new PictureBox(); + MoneyPanel = new Panel(); + MoneyTextBox = new TextBox(); + MoneyLabel = new Label(); + ClassPanel = new Panel(); + ClassTextBox = new TextBox(); + ClassLabel = new Label(); + NamePanel = new Panel(); + ManufacturerLabel = new Label(); + NameLabel = new Label(); + ModelPanel = new Panel(); + ModelTextBox = new TextBox(); + ModelLabel = new Label(); + contextMenuStrip1 = new ContextMenuStrip(components); + MainPanel.SuspendLayout(); + PhotoPanel.SuspendLayout(); + ((System.ComponentModel.ISupportInitialize)PhotoBox).BeginInit(); + MoneyPanel.SuspendLayout(); + ClassPanel.SuspendLayout(); + NamePanel.SuspendLayout(); + ModelPanel.SuspendLayout(); + SuspendLayout(); // // MainPanel // - this.MainPanel.Controls.Add(this.PhotoPanel); - this.MainPanel.Controls.Add(this.MoneyPanel); - this.MainPanel.Controls.Add(this.ClassPanel); - this.MainPanel.Controls.Add(this.NamePanel); - this.MainPanel.Controls.Add(this.ModelPanel); - this.MainPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.MainPanel.Location = new System.Drawing.Point(0, 0); - this.MainPanel.Name = "MainPanel"; - this.MainPanel.Size = new System.Drawing.Size(210, 204); - this.MainPanel.TabIndex = 0; + MainPanel.Controls.Add(PhotoPanel); + MainPanel.Controls.Add(MoneyPanel); + MainPanel.Controls.Add(ClassPanel); + MainPanel.Controls.Add(NamePanel); + MainPanel.Controls.Add(ModelPanel); + MainPanel.Dock = DockStyle.Fill; + MainPanel.Location = new Point(0, 0); + MainPanel.Margin = new Padding(4, 3, 4, 3); + MainPanel.Name = "MainPanel"; + MainPanel.Size = new Size(245, 235); + MainPanel.TabIndex = 0; // // PhotoPanel // - this.PhotoPanel.Controls.Add(this.PhotoBox); - this.PhotoPanel.Dock = System.Windows.Forms.DockStyle.Fill; - this.PhotoPanel.Location = new System.Drawing.Point(0, 18); - this.PhotoPanel.Name = "PhotoPanel"; - this.PhotoPanel.Size = new System.Drawing.Size(210, 135); - this.PhotoPanel.TabIndex = 4; + PhotoPanel.Controls.Add(PhotoBox); + PhotoPanel.Dock = DockStyle.Fill; + PhotoPanel.Location = new Point(0, 18); + PhotoPanel.Margin = new Padding(4, 3, 4, 3); + PhotoPanel.Name = "PhotoPanel"; + PhotoPanel.Size = new Size(245, 166); + PhotoPanel.TabIndex = 4; // // PhotoBox // - this.PhotoBox.Dock = System.Windows.Forms.DockStyle.Fill; - this.PhotoBox.Location = new System.Drawing.Point(0, 0); - this.PhotoBox.Name = "PhotoBox"; - this.PhotoBox.Size = new System.Drawing.Size(210, 135); - this.PhotoBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom; - this.PhotoBox.TabIndex = 0; - this.PhotoBox.TabStop = false; + PhotoBox.Dock = DockStyle.Fill; + PhotoBox.Location = new Point(0, 0); + PhotoBox.Margin = new Padding(4, 3, 4, 3); + PhotoBox.Name = "PhotoBox"; + PhotoBox.Size = new Size(245, 166); + PhotoBox.SizeMode = PictureBoxSizeMode.Zoom; + PhotoBox.TabIndex = 0; + PhotoBox.TabStop = false; // // MoneyPanel // - this.MoneyPanel.AutoSize = true; - this.MoneyPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.MoneyPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.MoneyPanel.Controls.Add(this.MoneyTextBox); - this.MoneyPanel.Controls.Add(this.MoneyLabel); - this.MoneyPanel.Dock = System.Windows.Forms.DockStyle.Bottom; - this.MoneyPanel.Location = new System.Drawing.Point(0, 153); - this.MoneyPanel.Name = "MoneyPanel"; - this.MoneyPanel.Size = new System.Drawing.Size(210, 17); - this.MoneyPanel.TabIndex = 3; + MoneyPanel.AutoSize = true; + MoneyPanel.AutoSizeMode = AutoSizeMode.GrowAndShrink; + MoneyPanel.BorderStyle = BorderStyle.FixedSingle; + MoneyPanel.Controls.Add(MoneyTextBox); + MoneyPanel.Controls.Add(MoneyLabel); + MoneyPanel.Dock = DockStyle.Bottom; + MoneyPanel.Location = new Point(0, 184); + MoneyPanel.Margin = new Padding(4, 3, 4, 3); + MoneyPanel.Name = "MoneyPanel"; + MoneyPanel.Size = new Size(245, 17); + MoneyPanel.TabIndex = 3; // // MoneyTextBox // - this.MoneyTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.MoneyTextBox.Dock = System.Windows.Forms.DockStyle.Top; - this.MoneyTextBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.MoneyTextBox.Location = new System.Drawing.Point(56, 0); - this.MoneyTextBox.Name = "MoneyTextBox"; - this.MoneyTextBox.Size = new System.Drawing.Size(152, 15); - this.MoneyTextBox.TabIndex = 1; - this.MoneyTextBox.Enter += new System.EventHandler(this.carPrice_Enter); - this.MoneyTextBox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.carPrice_KeyPress); - this.MoneyTextBox.Leave += new System.EventHandler(this.carPrice_Leave); + MoneyTextBox.BorderStyle = BorderStyle.None; + MoneyTextBox.Dock = DockStyle.Top; + MoneyTextBox.Font = new Font("Microsoft Sans Serif", 9.75F, FontStyle.Regular, GraphicsUnit.Point); + MoneyTextBox.Location = new Point(56, 0); + MoneyTextBox.Margin = new Padding(4, 3, 4, 3); + MoneyTextBox.Name = "MoneyTextBox"; + MoneyTextBox.Size = new Size(187, 15); + MoneyTextBox.TabIndex = 1; + MoneyTextBox.Enter += carPrice_Enter; + MoneyTextBox.KeyPress += carPrice_KeyPress; + MoneyTextBox.Leave += carPrice_Leave; // // MoneyLabel // - this.MoneyLabel.AutoSize = true; - this.MoneyLabel.Dock = System.Windows.Forms.DockStyle.Left; - this.MoneyLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.MoneyLabel.Location = new System.Drawing.Point(0, 0); - this.MoneyLabel.Name = "MoneyLabel"; - this.MoneyLabel.Size = new System.Drawing.Size(56, 16); - this.MoneyLabel.TabIndex = 0; - this.MoneyLabel.Text = "Деньги:"; + MoneyLabel.AutoSize = true; + MoneyLabel.Dock = DockStyle.Left; + MoneyLabel.Font = new Font("Microsoft Sans Serif", 9.75F, FontStyle.Regular, GraphicsUnit.Point); + MoneyLabel.Location = new Point(0, 0); + MoneyLabel.Margin = new Padding(4, 0, 4, 0); + MoneyLabel.Name = "MoneyLabel"; + MoneyLabel.Size = new Size(56, 16); + MoneyLabel.TabIndex = 0; + MoneyLabel.Text = "Деньги:"; // // ClassPanel // - this.ClassPanel.AutoSize = true; - this.ClassPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.ClassPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.ClassPanel.Controls.Add(this.ClassTextBox); - this.ClassPanel.Controls.Add(this.ClassLabel); - this.ClassPanel.Dock = System.Windows.Forms.DockStyle.Bottom; - this.ClassPanel.Location = new System.Drawing.Point(0, 170); - this.ClassPanel.Name = "ClassPanel"; - this.ClassPanel.Size = new System.Drawing.Size(210, 17); - this.ClassPanel.TabIndex = 2; + ClassPanel.AutoSize = true; + ClassPanel.AutoSizeMode = AutoSizeMode.GrowAndShrink; + ClassPanel.BorderStyle = BorderStyle.FixedSingle; + ClassPanel.Controls.Add(ClassTextBox); + ClassPanel.Controls.Add(ClassLabel); + ClassPanel.Dock = DockStyle.Bottom; + ClassPanel.Location = new Point(0, 201); + ClassPanel.Margin = new Padding(4, 3, 4, 3); + ClassPanel.Name = "ClassPanel"; + ClassPanel.Size = new Size(245, 17); + ClassPanel.TabIndex = 2; // // ClassTextBox // - this.ClassTextBox.BackColor = System.Drawing.Color.White; - this.ClassTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.ClassTextBox.Dock = System.Windows.Forms.DockStyle.Top; - this.ClassTextBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.ClassTextBox.Location = new System.Drawing.Point(48, 0); - this.ClassTextBox.Name = "ClassTextBox"; - this.ClassTextBox.ReadOnly = true; - this.ClassTextBox.Size = new System.Drawing.Size(160, 15); - this.ClassTextBox.TabIndex = 3; + ClassTextBox.BackColor = SystemColors.Window; + ClassTextBox.BorderStyle = BorderStyle.None; + ClassTextBox.Dock = DockStyle.Top; + ClassTextBox.Font = new Font("Microsoft Sans Serif", 9.75F, FontStyle.Regular, GraphicsUnit.Point); + ClassTextBox.Location = new Point(48, 0); + ClassTextBox.Margin = new Padding(4, 3, 4, 3); + ClassTextBox.Name = "ClassTextBox"; + ClassTextBox.ReadOnly = true; + ClassTextBox.Size = new Size(195, 15); + ClassTextBox.TabIndex = 3; // // ClassLabel // - this.ClassLabel.AutoSize = true; - this.ClassLabel.Dock = System.Windows.Forms.DockStyle.Left; - this.ClassLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.ClassLabel.Location = new System.Drawing.Point(0, 0); - this.ClassLabel.Name = "ClassLabel"; - this.ClassLabel.Size = new System.Drawing.Size(48, 16); - this.ClassLabel.TabIndex = 0; - this.ClassLabel.Text = "Класс:"; + ClassLabel.AutoSize = true; + ClassLabel.Dock = DockStyle.Left; + ClassLabel.Font = new Font("Microsoft Sans Serif", 9.75F, FontStyle.Regular, GraphicsUnit.Point); + ClassLabel.Location = new Point(0, 0); + ClassLabel.Margin = new Padding(4, 0, 4, 0); + ClassLabel.Name = "ClassLabel"; + ClassLabel.Size = new Size(48, 16); + ClassLabel.TabIndex = 0; + ClassLabel.Text = "Класс:"; // // NamePanel // - this.NamePanel.AutoSize = true; - this.NamePanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.NamePanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.NamePanel.Controls.Add(this.ManufacturerLabel); - this.NamePanel.Controls.Add(this.NameLabel); - this.NamePanel.Dock = System.Windows.Forms.DockStyle.Top; - this.NamePanel.Location = new System.Drawing.Point(0, 0); - this.NamePanel.Name = "NamePanel"; - this.NamePanel.Size = new System.Drawing.Size(210, 18); - this.NamePanel.TabIndex = 1; + NamePanel.AutoSize = true; + NamePanel.AutoSizeMode = AutoSizeMode.GrowAndShrink; + NamePanel.BorderStyle = BorderStyle.FixedSingle; + NamePanel.Controls.Add(ManufacturerLabel); + NamePanel.Controls.Add(NameLabel); + NamePanel.Dock = DockStyle.Top; + NamePanel.Location = new Point(0, 0); + NamePanel.Margin = new Padding(4, 3, 4, 3); + NamePanel.Name = "NamePanel"; + NamePanel.Size = new Size(245, 18); + NamePanel.TabIndex = 1; // // ManufacturerLabel // - this.ManufacturerLabel.AutoSize = true; - this.ManufacturerLabel.Dock = System.Windows.Forms.DockStyle.Right; - this.ManufacturerLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.ManufacturerLabel.Location = new System.Drawing.Point(159, 0); - this.ManufacturerLabel.Name = "ManufacturerLabel"; - this.ManufacturerLabel.Size = new System.Drawing.Size(49, 16); - this.ManufacturerLabel.TabIndex = 1; - this.ManufacturerLabel.Text = "Марка"; + ManufacturerLabel.AutoSize = true; + ManufacturerLabel.Dock = DockStyle.Right; + ManufacturerLabel.Font = new Font("Microsoft Sans Serif", 9.75F, FontStyle.Regular, GraphicsUnit.Point); + ManufacturerLabel.Location = new Point(194, 0); + ManufacturerLabel.Margin = new Padding(4, 0, 4, 0); + ManufacturerLabel.Name = "ManufacturerLabel"; + ManufacturerLabel.Size = new Size(49, 16); + ManufacturerLabel.TabIndex = 1; + ManufacturerLabel.Text = "Марка"; // // NameLabel // - this.NameLabel.AutoSize = true; - this.NameLabel.Dock = System.Windows.Forms.DockStyle.Fill; - this.NameLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.NameLabel.Location = new System.Drawing.Point(0, 0); - this.NameLabel.Name = "NameLabel"; - this.NameLabel.Size = new System.Drawing.Size(73, 16); - this.NameLabel.TabIndex = 0; - this.NameLabel.Text = "Название"; + NameLabel.AutoSize = true; + NameLabel.Dock = DockStyle.Fill; + NameLabel.Font = new Font("Microsoft Sans Serif", 9.75F, FontStyle.Regular, GraphicsUnit.Point); + NameLabel.Location = new Point(0, 0); + NameLabel.Margin = new Padding(4, 0, 4, 0); + NameLabel.Name = "NameLabel"; + NameLabel.Size = new Size(73, 16); + NameLabel.TabIndex = 0; + NameLabel.Text = "Название"; // // ModelPanel // - this.ModelPanel.AutoSize = true; - this.ModelPanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.ModelPanel.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.ModelPanel.Controls.Add(this.ModelTextBox); - this.ModelPanel.Controls.Add(this.ModelLabel); - this.ModelPanel.Dock = System.Windows.Forms.DockStyle.Bottom; - this.ModelPanel.Location = new System.Drawing.Point(0, 187); - this.ModelPanel.Name = "ModelPanel"; - this.ModelPanel.Size = new System.Drawing.Size(210, 17); - this.ModelPanel.TabIndex = 0; + ModelPanel.AutoSize = true; + ModelPanel.AutoSizeMode = AutoSizeMode.GrowAndShrink; + ModelPanel.BorderStyle = BorderStyle.FixedSingle; + ModelPanel.Controls.Add(ModelTextBox); + ModelPanel.Controls.Add(ModelLabel); + ModelPanel.Dock = DockStyle.Bottom; + ModelPanel.Location = new Point(0, 218); + ModelPanel.Margin = new Padding(4, 3, 4, 3); + ModelPanel.Name = "ModelPanel"; + ModelPanel.Size = new Size(245, 17); + ModelPanel.TabIndex = 0; // // ModelTextBox // - this.ModelTextBox.BackColor = System.Drawing.Color.White; - this.ModelTextBox.BorderStyle = System.Windows.Forms.BorderStyle.None; - this.ModelTextBox.Dock = System.Windows.Forms.DockStyle.Top; - this.ModelTextBox.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.ModelTextBox.Location = new System.Drawing.Point(60, 0); - this.ModelTextBox.Name = "ModelTextBox"; - this.ModelTextBox.ReadOnly = true; - this.ModelTextBox.Size = new System.Drawing.Size(148, 15); - this.ModelTextBox.TabIndex = 2; + ModelTextBox.BackColor = SystemColors.Window; + ModelTextBox.BorderStyle = BorderStyle.None; + ModelTextBox.Dock = DockStyle.Top; + ModelTextBox.Font = new Font("Microsoft Sans Serif", 9.75F, FontStyle.Regular, GraphicsUnit.Point); + ModelTextBox.Location = new Point(60, 0); + ModelTextBox.Margin = new Padding(4, 3, 4, 3); + ModelTextBox.Name = "ModelTextBox"; + ModelTextBox.ReadOnly = true; + ModelTextBox.Size = new Size(183, 15); + ModelTextBox.TabIndex = 2; // // ModelLabel // - this.ModelLabel.AutoSize = true; - this.ModelLabel.Dock = System.Windows.Forms.DockStyle.Left; - this.ModelLabel.Font = new System.Drawing.Font("Microsoft Sans Serif", 9.75F, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, ((byte)(204))); - this.ModelLabel.Location = new System.Drawing.Point(0, 0); - this.ModelLabel.Name = "ModelLabel"; - this.ModelLabel.Size = new System.Drawing.Size(60, 16); - this.ModelLabel.TabIndex = 0; - this.ModelLabel.Text = "Модель:"; + ModelLabel.AutoSize = true; + ModelLabel.Dock = DockStyle.Left; + ModelLabel.Font = new Font("Microsoft Sans Serif", 9.75F, FontStyle.Regular, GraphicsUnit.Point); + ModelLabel.Location = new Point(0, 0); + ModelLabel.Margin = new Padding(4, 0, 4, 0); + ModelLabel.Name = "ModelLabel"; + ModelLabel.Size = new Size(60, 16); + ModelLabel.TabIndex = 0; + ModelLabel.Text = "Модель:"; // // contextMenuStrip1 // - this.contextMenuStrip1.Name = "contextMenuStrip1"; - this.contextMenuStrip1.Size = new System.Drawing.Size(61, 4); + contextMenuStrip1.Name = "contextMenuStrip1"; + contextMenuStrip1.Size = new Size(61, 4); // // CarControl // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.BackColor = System.Drawing.Color.White; - this.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle; - this.Controls.Add(this.MainPanel); - this.Name = "CarControl"; - this.Size = new System.Drawing.Size(210, 204); - this.MainPanel.ResumeLayout(false); - this.MainPanel.PerformLayout(); - this.PhotoPanel.ResumeLayout(false); - ((System.ComponentModel.ISupportInitialize)(this.PhotoBox)).EndInit(); - this.MoneyPanel.ResumeLayout(false); - this.MoneyPanel.PerformLayout(); - this.ClassPanel.ResumeLayout(false); - this.ClassPanel.PerformLayout(); - this.NamePanel.ResumeLayout(false); - this.NamePanel.PerformLayout(); - this.ModelPanel.ResumeLayout(false); - this.ModelPanel.PerformLayout(); - this.ResumeLayout(false); - + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + BackColor = Color.White; + BorderStyle = BorderStyle.FixedSingle; + Controls.Add(MainPanel); + Margin = new Padding(4, 3, 4, 3); + Name = "CarControl"; + Size = new Size(245, 235); + MainPanel.ResumeLayout(false); + MainPanel.PerformLayout(); + PhotoPanel.ResumeLayout(false); + ((System.ComponentModel.ISupportInitialize)PhotoBox).EndInit(); + MoneyPanel.ResumeLayout(false); + MoneyPanel.PerformLayout(); + ClassPanel.ResumeLayout(false); + ClassPanel.PerformLayout(); + NamePanel.ResumeLayout(false); + NamePanel.PerformLayout(); + ModelPanel.ResumeLayout(false); + ModelPanel.PerformLayout(); + ResumeLayout(false); } #endregion - private System.Windows.Forms.Panel MainPanel; - private System.Windows.Forms.Panel MoneyPanel; - private System.Windows.Forms.Label MoneyLabel; - private System.Windows.Forms.Panel ClassPanel; - private System.Windows.Forms.Label ClassLabel; - private System.Windows.Forms.Panel NamePanel; - private System.Windows.Forms.Label NameLabel; - private System.Windows.Forms.Panel ModelPanel; - private System.Windows.Forms.Label ModelLabel; - private System.Windows.Forms.Panel PhotoPanel; - private System.Windows.Forms.PictureBox PhotoBox; - private System.Windows.Forms.Label ManufacturerLabel; - private System.Windows.Forms.TextBox MoneyTextBox; - private System.Windows.Forms.ContextMenuStrip contextMenuStrip1; - private System.Windows.Forms.TextBox ModelTextBox; - private System.Windows.Forms.TextBox ClassTextBox; + private Panel MainPanel; + private Panel MoneyPanel; + private Label MoneyLabel; + private Panel ClassPanel; + private Label ClassLabel; + private Panel NamePanel; + private Label NameLabel; + private Panel ModelPanel; + private Label ModelLabel; + private Panel PhotoPanel; + private PictureBox PhotoBox; + private Label ManufacturerLabel; + private TextBox MoneyTextBox; + private ContextMenuStrip contextMenuStrip1; + private TextBox ModelTextBox; + private TextBox ClassTextBox; } } diff --git a/Controls/CarControl.cs b/Controls/CarControl.cs index 5f3295e..d7fbc4a 100644 --- a/Controls/CarControl.cs +++ b/Controls/CarControl.cs @@ -5,6 +5,7 @@ using System.Net.Http; using System.Threading.Tasks; using System.Windows.Forms; using GtaVUsersInfo.Helpers; +using GtaVUsersInfo.Sources; namespace GtaVUsersInfo.Controls { @@ -12,6 +13,7 @@ namespace GtaVUsersInfo.Controls { private static readonly HttpClient httpClient = new HttpClient(); private Car car; + public Car Car { get { return car; } @@ -36,6 +38,8 @@ namespace GtaVUsersInfo.Controls ModelTextBox.Text = Car.Model; MoneyTextBox.Text = '$' + Car.Price.ToString(); + ChangeColor(); + LoadImageAsync(Car.Photo); } @@ -111,5 +115,25 @@ namespace GtaVUsersInfo.Controls e.Handled = true; } } + + private void ChangeColor() + { + this.BackColor = car.color; + MoneyTextBox.BackColor = car.color; + ClassTextBox.BackColor = car.color; + ModelTextBox.BackColor = car.color; + } + + public void ChangeColor(object sender, EventArgs e) + { + using (ColorDialog colorDialog = new ColorDialog()) + { + if (colorDialog.ShowDialog() == DialogResult.OK) + { + car.color = colorDialog.Color; + ChangeColor(); + } + } + } } } \ No newline at end of file diff --git a/Controls/CarControl.resx b/Controls/CarControl.resx index ad53752..82079dd 100644 --- a/Controls/CarControl.resx +++ b/Controls/CarControl.resx @@ -1,24 +1,24 @@  - diff --git a/Controls/CarItemMenuStrip.Designer.cs b/Controls/CarItemMenuStrip.Designer.cs index 0f54391..ce02293 100644 --- a/Controls/CarItemMenuStrip.Designer.cs +++ b/Controls/CarItemMenuStrip.Designer.cs @@ -28,57 +28,69 @@ /// private void InitializeComponent() { - this.components = new System.ComponentModel.Container(); - this.myMenuStrip = new System.Windows.Forms.ContextMenuStrip(this.components); - this.addNewToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.editToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.deleteToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.myMenuStrip.SuspendLayout(); - this.SuspendLayout(); + components = new System.ComponentModel.Container(); + myMenuStrip = new ContextMenuStrip(components); + addNewToolStripMenuItem = new ToolStripMenuItem(); + editToolStripMenuItem = new ToolStripMenuItem(); + deleteToolStripMenuItem = new ToolStripMenuItem(); + colorToolStripMenuItem = new ToolStripMenuItem(); + toolStripSeparator1 = new ToolStripSeparator(); + myMenuStrip.SuspendLayout(); + SuspendLayout(); // // myMenuStrip // - this.myMenuStrip.Items.AddRange(new System.Windows.Forms.ToolStripItem[] { - this.addNewToolStripMenuItem, - this.editToolStripMenuItem, - this.deleteToolStripMenuItem}); - this.myMenuStrip.Name = "contextMenuStrip"; - this.myMenuStrip.Size = new System.Drawing.Size(181, 92); + myMenuStrip.Items.AddRange(new ToolStripItem[] { addNewToolStripMenuItem, editToolStripMenuItem, deleteToolStripMenuItem, toolStripSeparator1, colorToolStripMenuItem }); + myMenuStrip.Name = "contextMenuStrip"; + myMenuStrip.Size = new Size(181, 120); // // addNewToolStripMenuItem // - this.addNewToolStripMenuItem.Name = "addNewToolStripMenuItem"; - this.addNewToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.addNewToolStripMenuItem.Text = "Создать"; + addNewToolStripMenuItem.Name = "addNewToolStripMenuItem"; + addNewToolStripMenuItem.Size = new Size(180, 22); + addNewToolStripMenuItem.Text = "Создать"; // // editToolStripMenuItem // - this.editToolStripMenuItem.Name = "editToolStripMenuItem"; - this.editToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.editToolStripMenuItem.Text = "Изменить"; + editToolStripMenuItem.Name = "editToolStripMenuItem"; + editToolStripMenuItem.Size = new Size(180, 22); + editToolStripMenuItem.Text = "Изменить"; // // deleteToolStripMenuItem // - this.deleteToolStripMenuItem.Name = "deleteToolStripMenuItem"; - this.deleteToolStripMenuItem.Size = new System.Drawing.Size(180, 22); - this.deleteToolStripMenuItem.Text = "Удалить"; + deleteToolStripMenuItem.Name = "deleteToolStripMenuItem"; + deleteToolStripMenuItem.Size = new Size(180, 22); + deleteToolStripMenuItem.Text = "Удалить"; // - // CarMenuStrip + // colorToolStripMenuItem // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.Name = "CarMenuStrip"; - this.Size = new System.Drawing.Size(158, 245); - this.myMenuStrip.ResumeLayout(false); - this.ResumeLayout(false); - + colorToolStripMenuItem.Name = "colorToolStripMenuItem"; + colorToolStripMenuItem.Size = new Size(180, 22); + colorToolStripMenuItem.Text = "Цвет"; + // + // toolStripSeparator1 + // + toolStripSeparator1.Name = "toolStripSeparator1"; + toolStripSeparator1.Size = new Size(177, 6); + // + // CarItemMenuStrip + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + Margin = new Padding(4, 3, 4, 3); + Name = "CarItemMenuStrip"; + Size = new Size(184, 283); + myMenuStrip.ResumeLayout(false); + ResumeLayout(false); } #endregion - private System.Windows.Forms.ContextMenuStrip myMenuStrip; - private System.Windows.Forms.ToolStripMenuItem addNewToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem editToolStripMenuItem; - private System.Windows.Forms.ToolStripMenuItem deleteToolStripMenuItem; + private ContextMenuStrip myMenuStrip; + private ToolStripMenuItem addNewToolStripMenuItem; + private ToolStripMenuItem editToolStripMenuItem; + private ToolStripMenuItem deleteToolStripMenuItem; + private ToolStripSeparator toolStripSeparator1; + private ToolStripMenuItem colorToolStripMenuItem; } } diff --git a/Controls/CarItemMenuStrip.cs b/Controls/CarItemMenuStrip.cs index 395f94e..415190b 100644 --- a/Controls/CarItemMenuStrip.cs +++ b/Controls/CarItemMenuStrip.cs @@ -19,19 +19,21 @@ namespace GtaVUsersInfo.Controls public CarControl Car; - public CarItemMenuStrip(EventHandler add, EventHandler edit, EventHandler delete, CarControl car) + public CarItemMenuStrip(EventHandler add, EventHandler edit, EventHandler delete, EventHandler color, CarControl car) { InitializeComponent(); addNewToolStripMenuItem.Click += add; editToolStripMenuItem.Click += edit; deleteToolStripMenuItem.Click += delete; + colorToolStripMenuItem.Click += color; Car = car; addNewToolStripMenuItem.Tag = this; editToolStripMenuItem.Tag = this; deleteToolStripMenuItem.Tag = this; + colorToolStripMenuItem.Tag = this; } } } diff --git a/Controls/CarItemMenuStrip.resx b/Controls/CarItemMenuStrip.resx index 72c1c54..37e0f3b 100644 --- a/Controls/CarItemMenuStrip.resx +++ b/Controls/CarItemMenuStrip.resx @@ -1,24 +1,24 @@  - diff --git a/Controls/ParameterControl.Designer.cs b/Controls/ParameterControl.Designer.cs index d8a81be..3cd7f2a 100644 --- a/Controls/ParameterControl.Designer.cs +++ b/Controls/ParameterControl.Designer.cs @@ -28,64 +28,67 @@ /// private void InitializeComponent() { - this.namePanel = new System.Windows.Forms.Panel(); - this.Textbox = new System.Windows.Forms.TextBox(); - this.Label = new System.Windows.Forms.Label(); - this.namePanel.SuspendLayout(); - this.SuspendLayout(); + namePanel = new Panel(); + Textbox = new TextBox(); + Label = new Label(); + namePanel.SuspendLayout(); + SuspendLayout(); // // namePanel // - this.namePanel.AutoSize = true; - this.namePanel.AutoSizeMode = System.Windows.Forms.AutoSizeMode.GrowAndShrink; - this.namePanel.Controls.Add(this.Textbox); - this.namePanel.Controls.Add(this.Label); - this.namePanel.Dock = System.Windows.Forms.DockStyle.Top; - this.namePanel.Location = new System.Drawing.Point(0, 0); - this.namePanel.Name = "namePanel"; - this.namePanel.Padding = new System.Windows.Forms.Padding(2); - this.namePanel.Size = new System.Drawing.Size(150, 37); - this.namePanel.TabIndex = 2; + namePanel.AutoSize = true; + namePanel.AutoSizeMode = AutoSizeMode.GrowAndShrink; + namePanel.Controls.Add(Textbox); + namePanel.Controls.Add(Label); + namePanel.Dock = DockStyle.Top; + namePanel.Location = new Point(0, 0); + namePanel.Margin = new Padding(4, 3, 4, 3); + namePanel.Name = "namePanel"; + namePanel.Padding = new Padding(2); + namePanel.Size = new Size(175, 42); + namePanel.TabIndex = 2; // // Textbox // - this.Textbox.Dock = System.Windows.Forms.DockStyle.Top; - this.Textbox.ImeMode = System.Windows.Forms.ImeMode.NoControl; - this.Textbox.Location = new System.Drawing.Point(2, 15); - this.Textbox.Name = "Textbox"; - this.Textbox.Size = new System.Drawing.Size(146, 20); - this.Textbox.TabIndex = 1; - this.Textbox.KeyPress += new System.Windows.Forms.KeyPressEventHandler(this.textBox_KeyPress); + Textbox.Dock = DockStyle.Top; + Textbox.ImeMode = ImeMode.NoControl; + Textbox.Location = new Point(2, 17); + Textbox.Margin = new Padding(4, 3, 4, 3); + Textbox.Name = "Textbox"; + Textbox.Size = new Size(171, 23); + Textbox.TabIndex = 1; + Textbox.KeyPress += textBox_KeyPress; // // Label // - this.Label.AutoSize = true; - this.Label.Dock = System.Windows.Forms.DockStyle.Top; - this.Label.Location = new System.Drawing.Point(2, 2); - this.Label.Name = "Label"; - this.Label.Size = new System.Drawing.Size(32, 13); - this.Label.TabIndex = 0; - this.Label.Text = "Имя:"; + Label.AutoSize = true; + Label.Dock = DockStyle.Top; + Label.Location = new Point(2, 2); + Label.Margin = new Padding(4, 0, 4, 0); + Label.Name = "Label"; + Label.Size = new Size(34, 15); + Label.TabIndex = 0; + Label.Text = "Имя:"; // // ParameterControl // - this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.AutoSize = true; - this.Controls.Add(this.namePanel); - this.Name = "ParameterControl"; - this.Size = new System.Drawing.Size(150, 37); - this.namePanel.ResumeLayout(false); - this.namePanel.PerformLayout(); - this.ResumeLayout(false); - this.PerformLayout(); - + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + AutoSize = true; + Controls.Add(namePanel); + Margin = new Padding(4, 3, 4, 3); + Name = "ParameterControl"; + Size = new Size(175, 48); + namePanel.ResumeLayout(false); + namePanel.PerformLayout(); + ResumeLayout(false); + PerformLayout(); } #endregion - private System.Windows.Forms.Panel namePanel; - private System.Windows.Forms.TextBox Textbox; - private System.Windows.Forms.Label Label; + private Panel namePanel; + private TextBox Textbox; + private Label Label; } } diff --git a/Controls/ParameterControl.cs b/Controls/ParameterControl.cs index bcdf776..9949796 100644 --- a/Controls/ParameterControl.cs +++ b/Controls/ParameterControl.cs @@ -12,8 +12,8 @@ namespace GtaVUsersInfo.Controls { public partial class ParameterControl : UserControl { - public string ParamName - { + public string ParamName + { get { return Label.Text.TrimEnd(':'); } set { Label.Text = value + ':'; } } diff --git a/Controls/ParameterControl.resx b/Controls/ParameterControl.resx index 1af7de1..a395bff 100644 --- a/Controls/ParameterControl.resx +++ b/Controls/ParameterControl.resx @@ -1,24 +1,24 @@  - diff --git a/MainForm.Designer.cs b/MainForm.Designer.cs index 9bf92f9..e87e292 100644 --- a/MainForm.Designer.cs +++ b/MainForm.Designer.cs @@ -29,9 +29,9 @@ private void InitializeComponent() { System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(MainForm)); - panel1 = new Panel(); + upPanel = new Panel(); debugCheck = new CheckBox(); - panel2 = new Panel(); + downPanel = new Panel(); buttonsPanel = new Panel(); readJsonButton = new Button(); addParameter = new Button(); @@ -63,22 +63,22 @@ splitterRigth = new Splitter(); carsPanel = new Panel(); carsItems = new FlowLayoutPanel(); - panel1.SuspendLayout(); + upPanel.SuspendLayout(); buttonsPanel.SuspendLayout(); menuStrip.SuspendLayout(); carsPanel.SuspendLayout(); SuspendLayout(); // - // panel1 + // upPanel // - panel1.BorderStyle = BorderStyle.FixedSingle; - panel1.Controls.Add(debugCheck); - panel1.Dock = DockStyle.Top; - panel1.Location = new Point(0, 24); - panel1.Margin = new Padding(4, 3, 4, 3); - panel1.Name = "panel1"; - panel1.Size = new Size(891, 23); - panel1.TabIndex = 0; + upPanel.BorderStyle = BorderStyle.FixedSingle; + upPanel.Controls.Add(debugCheck); + upPanel.Dock = DockStyle.Top; + upPanel.Location = new Point(0, 24); + upPanel.Margin = new Padding(4, 3, 4, 3); + upPanel.Name = "upPanel"; + upPanel.Size = new Size(891, 23); + upPanel.TabIndex = 0; // // debugCheck // @@ -92,15 +92,15 @@ debugCheck.UseVisualStyleBackColor = true; debugCheck.CheckedChanged += debugCheck_CheckedChanged; // - // panel2 + // downPanel // - panel2.BorderStyle = BorderStyle.FixedSingle; - panel2.Dock = DockStyle.Bottom; - panel2.Location = new Point(0, 534); - panel2.Margin = new Padding(4, 3, 4, 3); - panel2.Name = "panel2"; - panel2.Size = new Size(891, 23); - panel2.TabIndex = 1; + downPanel.BorderStyle = BorderStyle.FixedSingle; + downPanel.Dock = DockStyle.Bottom; + downPanel.Location = new Point(0, 534); + downPanel.Margin = new Padding(4, 3, 4, 3); + downPanel.Name = "downPanel"; + downPanel.Size = new Size(891, 23); + downPanel.TabIndex = 1; // // buttonsPanel // @@ -325,24 +325,28 @@ buttonPanelToolStripMenuItem.Name = "buttonPanelToolStripMenuItem"; buttonPanelToolStripMenuItem.Size = new Size(188, 22); buttonPanelToolStripMenuItem.Text = "Левая панель"; + buttonPanelToolStripMenuItem.Click += buttonPanelToolStripMenuItem_Click; // // parameterPanelToolStripMenuItem // parameterPanelToolStripMenuItem.Name = "parameterPanelToolStripMenuItem"; parameterPanelToolStripMenuItem.Size = new Size(188, 22); parameterPanelToolStripMenuItem.Text = "Правая панель"; + parameterPanelToolStripMenuItem.Click += parameterPanelToolStripMenuItem_Click; // // carPanelToolStripMenuItem // carPanelToolStripMenuItem.Name = "carPanelToolStripMenuItem"; carPanelToolStripMenuItem.Size = new Size(188, 22); carPanelToolStripMenuItem.Text = "Центральная панель"; + carPanelToolStripMenuItem.Click += carPanelToolStripMenuItem_Click; // // top_downPanelToolStripMenuItem // top_downPanelToolStripMenuItem.Name = "top_downPanelToolStripMenuItem"; top_downPanelToolStripMenuItem.Size = new Size(188, 22); top_downPanelToolStripMenuItem.Text = "Верх/низ"; + top_downPanelToolStripMenuItem.Click += top_downPanelToolStripMenuItem_Click; // // splitterLeft // @@ -352,7 +356,6 @@ splitterLeft.Size = new Size(6, 487); splitterLeft.TabIndex = 6; splitterLeft.TabStop = false; - splitterLeft.SplitterMoved += SplitterMoved; // // splitterRigth // @@ -363,7 +366,6 @@ splitterRigth.Size = new Size(6, 487); splitterRigth.TabIndex = 7; splitterRigth.TabStop = false; - splitterRigth.SplitterMoved += SplitterMoved; // // carsPanel // @@ -379,6 +381,7 @@ // carsItems // carsItems.AutoScroll = true; + carsItems.BackColor = Color.White; carsItems.Dock = DockStyle.Fill; carsItems.Location = new Point(0, 0); carsItems.Margin = new Padding(4, 3, 4, 3); @@ -397,8 +400,8 @@ Controls.Add(splitterLeft); Controls.Add(parametersPanel); Controls.Add(buttonsPanel); - Controls.Add(panel2); - Controls.Add(panel1); + Controls.Add(downPanel); + Controls.Add(upPanel); Controls.Add(menuStrip); Icon = (Icon)resources.GetObject("$this.Icon"); MainMenuStrip = menuStrip; @@ -409,9 +412,8 @@ Text = "null"; FormClosing += MainForm_FormClosing; Load += MainForm_Load; - Resize += MainForm_Resize; - panel1.ResumeLayout(false); - panel1.PerformLayout(); + upPanel.ResumeLayout(false); + upPanel.PerformLayout(); buttonsPanel.ResumeLayout(false); buttonsPanel.PerformLayout(); menuStrip.ResumeLayout(false); @@ -423,8 +425,8 @@ #endregion - private Panel panel1; - private Panel panel2; + private Panel upPanel; + private Panel downPanel; private Panel buttonsPanel; private Panel parametersPanel; private MenuStrip menuStrip; diff --git a/MainForm.cs b/MainForm.cs index 0439b8c..7cfa3e4 100644 --- a/MainForm.cs +++ b/MainForm.cs @@ -33,14 +33,16 @@ namespace GtaVUsersInfo private List parameters; private List cars; - private FontSettings fontSettings; - private Font defaultFont; private Color defaultColor; + private Color defaultPanelColor; + private List dtControls; + private FontSettings fontSettings; private WindowParameters window; + private PanelColorSettings panelColorSettings; private bool isUser; @@ -98,13 +100,43 @@ namespace GtaVUsersInfo } else { - window = new WindowParameters(new Size(this.Width, this.Height), new Size(this.splitterLeft.SplitPosition, this.splitterRigth.SplitPosition)); + window = new WindowParameters(new Size(this.Width, this.Height), new Size(this.splitterLeft.SplitPosition, this.splitterRigth.SplitPosition), IsFormFullscreen()); WindowParameters.SaveWindowParameters(window); WindowResize(); } isUser = true; + + panelColorSettings = PanelColorSettings.LoadPanelSettings(); + if (panelColorSettings != null) + { + ChangePanelColor(); + } + else + { + panelColorSettings = new PanelColorSettings(defaultPanelColor, defaultPanelColor, defaultPanelColor, defaultPanelColor); + ChangePanelColor(); + } } + private bool IsFormFullscreen() + { + if (this.WindowState == FormWindowState.Maximized) + { + return true; + } + return false; + } + + private void SetFullscreen(bool fullscreen) + { + if (fullscreen) + { + this.WindowState = FormWindowState.Maximized; + } + } + + + private void MainForm_Load(object sender, EventArgs e) { AllPanelCreate(); @@ -124,6 +156,7 @@ namespace GtaVUsersInfo this.Height = window.height; this.splitterLeft.SplitPosition = window.leftPos; this.splitterRigth.SplitPosition = window.rightPos; + SetFullscreen(window.isFullScreen); } private void ParameterPanelCreate() @@ -145,7 +178,7 @@ namespace GtaVUsersInfo foreach (CarControl car in cars) { - car.MenuStrip = new CarItemMenuStrip(addCar_Click, editCar, deleteCar, car).Menu; + car.MenuStrip = new CarItemMenuStrip(addCar_Click, editCar, deleteCar, car.ChangeColor, car).Menu; carsItems.Controls.Add(car); } } @@ -429,7 +462,6 @@ namespace GtaVUsersInfo var split = openFileDialog.FileName.Split('\\'); this.Text = split[split.Length - 1]; window.prevFile = openFileDialog.FileName; - SaveWindowSize(); return data; } return null; // Если пользователь отменил выбор файла @@ -473,7 +505,6 @@ namespace GtaVUsersInfo this.Text = "null"; window.prevFile = null; - SaveWindowSize(); AllPanelCreate(); } @@ -497,6 +528,8 @@ namespace GtaVUsersInfo e.Cancel = true; return; } + + SaveWindowSize(); } #endregion @@ -549,19 +582,85 @@ namespace GtaVUsersInfo { if (isUser) { - window = new WindowParameters(new Size(this.Width, this.Height), new Size(this.splitterLeft.SplitPosition, this.splitterRigth.SplitPosition), window.prevFile); + window = new WindowParameters(new Size(this.Width, this.Height), new Size(this.splitterLeft.SplitPosition, this.splitterRigth.SplitPosition), IsFormFullscreen(), window.prevFile); WindowParameters.SaveWindowParameters(window); } } - private void MainForm_Resize(object sender, EventArgs e) + private void SaveColorPanel() { - SaveWindowSize(); + PanelColorSettings.SavePanelSettings(panelColorSettings); } - private void SplitterMoved(object sender, SplitterEventArgs e) + private void ChangePanelColor() { - SaveWindowSize(); + this.buttonsPanel.BackColor = panelColorSettings.leftPanel; + this.parametersPanel.BackColor = panelColorSettings.rightPanel; + this.carsPanel.BackColor = panelColorSettings.centerPanel; + this.carsItems.BackColor = panelColorSettings.centerPanel; + this.upPanel.BackColor = panelColorSettings.upDownPanel; + this.downPanel.BackColor = panelColorSettings.upDownPanel; + this.menuStrip.BackColor = panelColorSettings.upDownPanel; + } + + private void buttonPanelToolStripMenuItem_Click(object sender, EventArgs e) + { + using (ColorDialog colorDialog = new ColorDialog()) + { + if (colorDialog.ShowDialog() == DialogResult.OK) + { + panelColorSettings.leftPanel = colorDialog.Color; + + ChangePanelColor(); + + SaveColorPanel(); + } + } + } + + private void parameterPanelToolStripMenuItem_Click(object sender, EventArgs e) + { + using (ColorDialog colorDialog = new ColorDialog()) + { + if (colorDialog.ShowDialog() == DialogResult.OK) + { + panelColorSettings.rightPanel = colorDialog.Color; + + ChangePanelColor(); + + SaveColorPanel(); + } + } + } + + private void carPanelToolStripMenuItem_Click(object sender, EventArgs e) + { + using (ColorDialog colorDialog = new ColorDialog()) + { + if (colorDialog.ShowDialog() == DialogResult.OK) + { + panelColorSettings.centerPanel = colorDialog.Color; + + ChangePanelColor(); + + SaveColorPanel(); + } + } + } + + private void top_downPanelToolStripMenuItem_Click(object sender, EventArgs e) + { + using (ColorDialog colorDialog = new ColorDialog()) + { + if (colorDialog.ShowDialog() == DialogResult.OK) + { + panelColorSettings.upDownPanel = colorDialog.Color; + + ChangePanelColor(); + + SaveColorPanel(); + } + } } } } diff --git a/Resources.Designer.cs b/Resources.Designer.cs index c8b3005..d7bcf3e 100644 --- a/Resources.Designer.cs +++ b/Resources.Designer.cs @@ -115,6 +115,15 @@ namespace GtaVUsersInfo { } } + /// + /// Ищет локализованную строку, похожую на data/panelColor.json. + /// + public static string paneColorlSettingsJsonPath { + get { + return ResourceManager.GetString("paneColorlSettingsJsonPath", resourceCulture); + } + } + /// /// Ищет локализованную строку, похожую на data/window.json. /// diff --git a/Resources.resx b/Resources.resx index dfa2871..fb008e2 100644 --- a/Resources.resx +++ b/Resources.resx @@ -136,6 +136,9 @@ Resources\icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + data/panelColor.json + data/window.json diff --git a/Sources/PanelColorSettings.cs b/Sources/PanelColorSettings.cs new file mode 100644 index 0000000..9c7cfff --- /dev/null +++ b/Sources/PanelColorSettings.cs @@ -0,0 +1,64 @@ +using Newtonsoft.Json; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace GtaVUsersInfo.Sources +{ + [Serializable] + public class PanelColorSettings + { + public Color leftPanel; + public Color rightPanel; + public Color centerPanel; + public Color upDownPanel; + + public PanelColorSettings() { } + + public PanelColorSettings(Color left, Color right, Color center, Color upDown) + { + leftPanel = left; + rightPanel = right; + centerPanel = center; + upDownPanel = upDown; + } + + public static void SavePanelSettings(PanelColorSettings color) + { + string json = JsonConvert.SerializeObject(color, Formatting.Indented); + + if (!Directory.Exists(Path.GetDirectoryName(Resources.paneColorlSettingsJsonPath))) + { + Directory.CreateDirectory(Path.GetDirectoryName(Resources.paneColorlSettingsJsonPath)); + } + + File.WriteAllText(Resources.paneColorlSettingsJsonPath, json); + } + + public static PanelColorSettings LoadPanelSettings() + { + try + { + string json = File.ReadAllText(Resources.paneColorlSettingsJsonPath); + return JsonConvert.DeserializeObject(json); + } + catch (FileNotFoundException) + { + Console.WriteLine($"Файл с цветами панелей не найден: {Resources.paneColorlSettingsJsonPath}"); + return null; + } + catch (JsonException ex) + { + Console.WriteLine($"Ошибка при десериализации JSON с цветами панелей: {ex.Message}"); + return null; + } + catch (Exception ex) + { + Console.WriteLine($"Произошла неожиданная ошибка при открытии файла с цветами панелей: {ex.Message}"); + return null; + } + } + } +} diff --git a/Sources/WindowParameters.cs b/Sources/WindowParameters.cs index 749e524..5f85082 100644 --- a/Sources/WindowParameters.cs +++ b/Sources/WindowParameters.cs @@ -14,24 +14,27 @@ namespace GtaVUsersInfo.Sources public int height; public int leftPos; public int rightPos; + public bool isFullScreen; public string? prevFile; public WindowParameters() { } - public WindowParameters(Size window, Size pos) + public WindowParameters(Size window, Size pos, bool isfull) { width = window.Width; height = window.Height; leftPos = pos.Width; rightPos = pos.Height; + isFullScreen = isfull; } - public WindowParameters(Size window, Size pos, string file) + public WindowParameters(Size window, Size pos, bool isfull, string file) { width = window.Width; height = window.Height; leftPos = pos.Width; rightPos = pos.Height; + isFullScreen = isfull; prevFile = file; } diff --git a/bin/Debug/net7.0-windows/GtaVUsersInfo.dll b/bin/Debug/net7.0-windows/GtaVUsersInfo.dll index b5aa44d..1361a87 100644 Binary files a/bin/Debug/net7.0-windows/GtaVUsersInfo.dll and b/bin/Debug/net7.0-windows/GtaVUsersInfo.dll differ diff --git a/bin/Debug/net7.0-windows/GtaVUsersInfo.pdb b/bin/Debug/net7.0-windows/GtaVUsersInfo.pdb index 3e4c6ed..dfa1183 100644 Binary files a/bin/Debug/net7.0-windows/GtaVUsersInfo.pdb and b/bin/Debug/net7.0-windows/GtaVUsersInfo.pdb differ diff --git a/bin/Debug/net7.0-windows/data/fontsettings.json b/bin/Debug/net7.0-windows/data/fontsettings.json index aaa46ba..b4714db 100644 --- a/bin/Debug/net7.0-windows/data/fontsettings.json +++ b/bin/Debug/net7.0-windows/data/fontsettings.json @@ -1,6 +1,6 @@ { "FontFamily": "Segoe UI", - "FontSize": 72.0, + "FontSize": 15.75, "FontStyle": 0, - "FontColor": "64, 0, 64" + "FontColor": "Black" } \ No newline at end of file diff --git a/bin/Debug/net7.0-windows/data/panelColor.json b/bin/Debug/net7.0-windows/data/panelColor.json new file mode 100644 index 0000000..bc71c7c --- /dev/null +++ b/bin/Debug/net7.0-windows/data/panelColor.json @@ -0,0 +1,6 @@ +{ + "leftPanel": "Silver", + "rightPanel": "Silver", + "centerPanel": "Silver", + "upDownPanel": "128, 128, 192" +} \ No newline at end of file diff --git a/bin/Debug/net7.0-windows/data/window.json b/bin/Debug/net7.0-windows/data/window.json index 43d9c07..fdb4d7d 100644 --- a/bin/Debug/net7.0-windows/data/window.json +++ b/bin/Debug/net7.0-windows/data/window.json @@ -3,5 +3,6 @@ "height": 1026, "leftPos": 150, "rightPos": 181, - "prevFile": "C:\\Users\\eugen\\YandexDisk\\Важное\\GTAV\\Карл.json" + "isFullScreen": true, + "prevFile": "C:\\Users\\eugen\\YandexDisk\\БТШ\\Карл.json" } \ No newline at end of file diff --git a/obj/Debug/net7.0-windows/GtaVUsersInfo.Resources.resources b/obj/Debug/net7.0-windows/GtaVUsersInfo.Resources.resources index 59c13ca..94aa1aa 100644 Binary files a/obj/Debug/net7.0-windows/GtaVUsersInfo.Resources.resources and b/obj/Debug/net7.0-windows/GtaVUsersInfo.Resources.resources differ diff --git a/obj/Debug/net7.0-windows/GtaVUsersInfo.csproj.CoreCompileInputs.cache b/obj/Debug/net7.0-windows/GtaVUsersInfo.csproj.CoreCompileInputs.cache index 06ddd8b..44410df 100644 --- a/obj/Debug/net7.0-windows/GtaVUsersInfo.csproj.CoreCompileInputs.cache +++ b/obj/Debug/net7.0-windows/GtaVUsersInfo.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -8a6478b13bc7a79a0338eb465c5bca8fb9e4c8be +cffc69186f6bcce96c6d04f34e1dc7e20a79c6a9 diff --git a/obj/Debug/net7.0-windows/GtaVUsersInfo.csproj.GenerateResource.cache b/obj/Debug/net7.0-windows/GtaVUsersInfo.csproj.GenerateResource.cache index bbd8dfc..53ad3a9 100644 Binary files a/obj/Debug/net7.0-windows/GtaVUsersInfo.csproj.GenerateResource.cache and b/obj/Debug/net7.0-windows/GtaVUsersInfo.csproj.GenerateResource.cache differ diff --git a/obj/Debug/net7.0-windows/GtaVUsersInfo.dll b/obj/Debug/net7.0-windows/GtaVUsersInfo.dll index b5aa44d..1361a87 100644 Binary files a/obj/Debug/net7.0-windows/GtaVUsersInfo.dll and b/obj/Debug/net7.0-windows/GtaVUsersInfo.dll differ diff --git a/obj/Debug/net7.0-windows/GtaVUsersInfo.pdb b/obj/Debug/net7.0-windows/GtaVUsersInfo.pdb index 3e4c6ed..dfa1183 100644 Binary files a/obj/Debug/net7.0-windows/GtaVUsersInfo.pdb and b/obj/Debug/net7.0-windows/GtaVUsersInfo.pdb differ diff --git a/obj/Debug/net7.0-windows/TempPE/Resources.Designer.cs.dll b/obj/Debug/net7.0-windows/TempPE/Resources.Designer.cs.dll index c2528ed..4337f5f 100644 Binary files a/obj/Debug/net7.0-windows/TempPE/Resources.Designer.cs.dll and b/obj/Debug/net7.0-windows/TempPE/Resources.Designer.cs.dll differ diff --git a/obj/Debug/net7.0-windows/ref/GtaVUsersInfo.dll b/obj/Debug/net7.0-windows/ref/GtaVUsersInfo.dll index cf24f8a..8f2a02f 100644 Binary files a/obj/Debug/net7.0-windows/ref/GtaVUsersInfo.dll and b/obj/Debug/net7.0-windows/ref/GtaVUsersInfo.dll differ diff --git a/obj/Debug/net7.0-windows/refint/GtaVUsersInfo.dll b/obj/Debug/net7.0-windows/refint/GtaVUsersInfo.dll index cf24f8a..8f2a02f 100644 Binary files a/obj/Debug/net7.0-windows/refint/GtaVUsersInfo.dll and b/obj/Debug/net7.0-windows/refint/GtaVUsersInfo.dll differ