From a422486cbf4d2045da73af4b784c7b2dc9209874 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=9C=D1=8D=D0=B9?= Date: Sat, 11 Nov 2023 20:35:27 +0300 Subject: [PATCH] =?UTF-8?q?1=20=D0=BB=D0=B0=D0=B1=D0=BE=D1=80=D0=B0=D1=82?= =?UTF-8?q?=D0=BE=D1=80=D0=BD=D0=B0=D1=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- DoubleDeckerBus/DDBus.Designer.cs | 138 ------------------ DoubleDeckerBus/DoubleDeckerBus.cs | 4 +- .../FormDoubleDeckerbus.Designer.cs | 130 +++++++++++++++++ .../{DDBus.cs => FormDoubleDeckerbus.cs} | 4 +- .../{DDBus.resx => FormDoubleDeckerbus.resx} | 62 +++++++- DoubleDeckerBus/Program.cs | 2 +- 6 files changed, 196 insertions(+), 144 deletions(-) delete mode 100644 DoubleDeckerBus/DDBus.Designer.cs create mode 100644 DoubleDeckerBus/FormDoubleDeckerbus.Designer.cs rename DoubleDeckerBus/{DDBus.cs => FormDoubleDeckerbus.cs} (96%) rename DoubleDeckerBus/{DDBus.resx => FormDoubleDeckerbus.resx} (98%) diff --git a/DoubleDeckerBus/DDBus.Designer.cs b/DoubleDeckerBus/DDBus.Designer.cs deleted file mode 100644 index 2bad135..0000000 --- a/DoubleDeckerBus/DDBus.Designer.cs +++ /dev/null @@ -1,138 +0,0 @@ -namespace DoubleDeckerBus -{ - partial class DDBus - { - /// - /// Required designer variable. - /// - private System.ComponentModel.IContainer components = null; - - /// - /// Clean up any resources being used. - /// - /// true if managed resources should be disposed; otherwise, false. - protected override void Dispose(bool disposing) - { - if (disposing && (components != null)) - { - components.Dispose(); - } - base.Dispose(disposing); - } - - #region Windows Form Designer generated code - - /// - /// Required method for Designer support - do not modify - /// the contents of this method with the code editor. - /// - private void InitializeComponent() - { - System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(DDBus)); - this.pictureBoxBus = new System.Windows.Forms.PictureBox(); - this.buttonCreate = new System.Windows.Forms.Button(); - this.buttonUp = new System.Windows.Forms.Button(); - this.buttonDown = new System.Windows.Forms.Button(); - this.buttonLeft = new System.Windows.Forms.Button(); - this.buttonRight = new System.Windows.Forms.Button(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).BeginInit(); - this.SuspendLayout(); - // - // pictureBoxBus - // - this.pictureBoxBus.Dock = System.Windows.Forms.DockStyle.Fill; - this.pictureBoxBus.Location = new System.Drawing.Point(0, 0); - this.pictureBoxBus.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.pictureBoxBus.Name = "pictureBoxBus"; - this.pictureBoxBus.Size = new System.Drawing.Size(1010, 615); - this.pictureBoxBus.TabIndex = 1; - this.pictureBoxBus.TabStop = false; - // - // buttonCreate - // - this.buttonCreate.Location = new System.Drawing.Point(14, 541); - this.buttonCreate.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.buttonCreate.Name = "buttonCreate"; - this.buttonCreate.Size = new System.Drawing.Size(95, 57); - this.buttonCreate.TabIndex = 2; - this.buttonCreate.Text = "Создать"; - this.buttonCreate.UseVisualStyleBackColor = true; - this.buttonCreate.Click += new System.EventHandler(this.buttonCreate_Click); - // - // buttonUp - // - this.buttonUp.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("buttonUp.BackgroundImage"))); - this.buttonUp.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.buttonUp.Location = new System.Drawing.Point(896, 487); - this.buttonUp.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.buttonUp.Name = "buttonUp"; - this.buttonUp.Size = new System.Drawing.Size(46, 53); - this.buttonUp.TabIndex = 3; - this.buttonUp.UseVisualStyleBackColor = true; - this.buttonUp.Click += new System.EventHandler(this.ButtonMove_Click); - // - // buttonDown - // - this.buttonDown.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("buttonDown.BackgroundImage"))); - this.buttonDown.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.buttonDown.Location = new System.Drawing.Point(896, 548); - this.buttonDown.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.buttonDown.Name = "buttonDown"; - this.buttonDown.Size = new System.Drawing.Size(46, 53); - this.buttonDown.TabIndex = 4; - this.buttonDown.UseVisualStyleBackColor = true; - this.buttonDown.Click += new System.EventHandler(this.ButtonMove_Click); - // - // buttonLeft - // - this.buttonLeft.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("buttonLeft.BackgroundImage"))); - this.buttonLeft.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.buttonLeft.Location = new System.Drawing.Point(843, 547); - this.buttonLeft.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.buttonLeft.Name = "buttonLeft"; - this.buttonLeft.Size = new System.Drawing.Size(46, 53); - this.buttonLeft.TabIndex = 5; - this.buttonLeft.UseVisualStyleBackColor = true; - this.buttonLeft.Click += new System.EventHandler(this.ButtonMove_Click); - // - // buttonRight - // - this.buttonRight.BackgroundImage = ((System.Drawing.Image)(resources.GetObject("buttonRight.BackgroundImage"))); - this.buttonRight.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Zoom; - this.buttonRight.Location = new System.Drawing.Point(949, 547); - this.buttonRight.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.buttonRight.Name = "buttonRight"; - this.buttonRight.Size = new System.Drawing.Size(46, 53); - this.buttonRight.TabIndex = 6; - this.buttonRight.UseVisualStyleBackColor = true; - this.buttonRight.Click += new System.EventHandler(this.ButtonMove_Click); - // - // DDBus - // - this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 20F); - this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1010, 615); - this.Controls.Add(this.buttonRight); - this.Controls.Add(this.buttonLeft); - this.Controls.Add(this.buttonDown); - this.Controls.Add(this.buttonUp); - this.Controls.Add(this.buttonCreate); - this.Controls.Add(this.pictureBoxBus); - this.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4); - this.Name = "DDBus"; - this.Text = "Bus"; - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxBus)).EndInit(); - this.ResumeLayout(false); - - } - - #endregion - - private PictureBox pictureBoxBus; - private Button buttonCreate; - private Button buttonUp; - private Button buttonDown; - private Button buttonLeft; - private Button buttonRight; - } -} \ No newline at end of file diff --git a/DoubleDeckerBus/DoubleDeckerBus.cs b/DoubleDeckerBus/DoubleDeckerBus.cs index a950a2c..7298c10 100644 --- a/DoubleDeckerBus/DoubleDeckerBus.cs +++ b/DoubleDeckerBus/DoubleDeckerBus.cs @@ -25,11 +25,11 @@ namespace DoubleDeckerBus /// public Color AdditionalColor { get; private set; } /// - /// Признак (опция) наличия антикрыла + /// Признак (опция) наличия лестницы /// public bool Stairs { get; private set; } /// - /// Признак (опция) наличия гоночной полосы + /// Признак (опция) наличия второго этажа /// public bool SecondFloor { get; private set; } /// diff --git a/DoubleDeckerBus/FormDoubleDeckerbus.Designer.cs b/DoubleDeckerBus/FormDoubleDeckerbus.Designer.cs new file mode 100644 index 0000000..8e99fb2 --- /dev/null +++ b/DoubleDeckerBus/FormDoubleDeckerbus.Designer.cs @@ -0,0 +1,130 @@ +namespace DoubleDeckerBus +{ + partial class FormDoubleDeckerbus + { + /// + /// Required designer variable. + /// + private System.ComponentModel.IContainer components = null; + + /// + /// Clean up any resources being used. + /// + /// true if managed resources should be disposed; otherwise, false. + protected override void Dispose(bool disposing) + { + if (disposing && (components != null)) + { + components.Dispose(); + } + base.Dispose(disposing); + } + + #region Windows Form Designer generated code + + /// + /// Required method for Designer support - do not modify + /// the contents of this method with the code editor. + /// + private void InitializeComponent() + { + System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(FormDoubleDeckerbus)); + pictureBoxBus = new PictureBox(); + buttonCreate = new Button(); + buttonUp = new Button(); + buttonDown = new Button(); + buttonLeft = new Button(); + buttonRight = new Button(); + ((System.ComponentModel.ISupportInitialize)pictureBoxBus).BeginInit(); + SuspendLayout(); + // + // pictureBoxBus + // + pictureBoxBus.Dock = DockStyle.Fill; + pictureBoxBus.Location = new Point(0, 0); + pictureBoxBus.Name = "pictureBoxBus"; + pictureBoxBus.Size = new Size(884, 461); + pictureBoxBus.TabIndex = 1; + pictureBoxBus.TabStop = false; + // + // buttonCreate + // + buttonCreate.Location = new Point(12, 406); + buttonCreate.Name = "buttonCreate"; + buttonCreate.Size = new Size(83, 43); + buttonCreate.TabIndex = 2; + buttonCreate.Text = "Создать"; + buttonCreate.UseVisualStyleBackColor = true; + buttonCreate.Click += buttonCreate_Click; + // + // buttonUp + // + buttonUp.BackgroundImage = (Image)resources.GetObject("buttonUp.BackgroundImage"); + buttonUp.BackgroundImageLayout = ImageLayout.Zoom; + buttonUp.Location = new Point(784, 365); + buttonUp.Name = "buttonUp"; + buttonUp.Size = new Size(40, 40); + buttonUp.TabIndex = 3; + buttonUp.UseVisualStyleBackColor = true; + buttonUp.Click += ButtonMove_Click; + // + // buttonDown + // + buttonDown.BackgroundImage = (Image)resources.GetObject("buttonDown.BackgroundImage"); + buttonDown.BackgroundImageLayout = ImageLayout.Zoom; + buttonDown.Location = new Point(784, 411); + buttonDown.Name = "buttonDown"; + buttonDown.Size = new Size(40, 40); + buttonDown.TabIndex = 4; + buttonDown.UseVisualStyleBackColor = true; + buttonDown.Click += ButtonMove_Click; + // + // buttonLeft + // + buttonLeft.BackgroundImage = (Image)resources.GetObject("buttonLeft.BackgroundImage"); + buttonLeft.BackgroundImageLayout = ImageLayout.Zoom; + buttonLeft.Location = new Point(738, 410); + buttonLeft.Name = "buttonLeft"; + buttonLeft.Size = new Size(40, 40); + buttonLeft.TabIndex = 5; + buttonLeft.UseVisualStyleBackColor = true; + buttonLeft.Click += ButtonMove_Click; + // + // buttonRight + // + buttonRight.BackgroundImage = (Image)resources.GetObject("buttonRight.BackgroundImage"); + buttonRight.BackgroundImageLayout = ImageLayout.Zoom; + buttonRight.Location = new Point(830, 410); + buttonRight.Name = "buttonRight"; + buttonRight.Size = new Size(40, 40); + buttonRight.TabIndex = 6; + buttonRight.UseVisualStyleBackColor = true; + buttonRight.Click += ButtonMove_Click; + // + // FormDoubleDeckerbus + // + AutoScaleDimensions = new SizeF(7F, 15F); + AutoScaleMode = AutoScaleMode.Font; + ClientSize = new Size(884, 461); + Controls.Add(buttonRight); + Controls.Add(buttonLeft); + Controls.Add(buttonDown); + Controls.Add(buttonUp); + Controls.Add(buttonCreate); + Controls.Add(pictureBoxBus); + Name = "FormDoubleDeckerbus"; + Text = "DoubleDeckerBus"; + ((System.ComponentModel.ISupportInitialize)pictureBoxBus).EndInit(); + ResumeLayout(false); + } + + #endregion + + private PictureBox pictureBoxBus; + private Button buttonCreate; + private Button buttonUp; + private Button buttonDown; + private Button buttonLeft; + private Button buttonRight; + } +} \ No newline at end of file diff --git a/DoubleDeckerBus/DDBus.cs b/DoubleDeckerBus/FormDoubleDeckerbus.cs similarity index 96% rename from DoubleDeckerBus/DDBus.cs rename to DoubleDeckerBus/FormDoubleDeckerbus.cs index d350e06..a83ba10 100644 --- a/DoubleDeckerBus/DDBus.cs +++ b/DoubleDeckerBus/FormDoubleDeckerbus.cs @@ -1,6 +1,6 @@ namespace DoubleDeckerBus { - public partial class DDBus : Form + public partial class FormDoubleDeckerbus : Form { /// /// - @@ -9,7 +9,7 @@ namespace DoubleDeckerBus /// /// /// - public DDBus() + public FormDoubleDeckerbus() { InitializeComponent(); } diff --git a/DoubleDeckerBus/DDBus.resx b/DoubleDeckerBus/FormDoubleDeckerbus.resx similarity index 98% rename from DoubleDeckerBus/DDBus.resx rename to DoubleDeckerBus/FormDoubleDeckerbus.resx index 7bd5202..2f7d102 100644 --- a/DoubleDeckerBus/DDBus.resx +++ b/DoubleDeckerBus/FormDoubleDeckerbus.resx @@ -1,4 +1,64 @@ - + + + diff --git a/DoubleDeckerBus/Program.cs b/DoubleDeckerBus/Program.cs index 01ca218..19ac6e2 100644 --- a/DoubleDeckerBus/Program.cs +++ b/DoubleDeckerBus/Program.cs @@ -11,7 +11,7 @@ namespace DoubleDeckerBus static void Main() { ApplicationConfiguration.Initialize(); - Application.Run(new DDBus()); + Application.Run(new FormDoubleDeckerbus()); } } } \ No newline at end of file