diff --git a/Sailboat/Sailboat/FormBoatCollection.Designer.cs b/Sailboat/Sailboat/FormBoatCollection.Designer.cs index d82d2d6..a9a48e6 100644 --- a/Sailboat/Sailboat/FormBoatCollection.Designer.cs +++ b/Sailboat/Sailboat/FormBoatCollection.Designer.cs @@ -29,31 +29,31 @@ namespace Sailboat /// private void InitializeComponent() { - this.pictureBoxCollection = new System.Windows.Forms.PictureBox(); - this.panelTools = new System.Windows.Forms.Panel(); - this.buttonSortByColor = new System.Windows.Forms.Button(); - this.buttonSortByType = new System.Windows.Forms.Button(); - this.panelCollection = new System.Windows.Forms.Panel(); - this.buttonDelObject = new System.Windows.Forms.Button(); - this.listBoxStorages = new System.Windows.Forms.ListBox(); - this.buttonAddObject = new System.Windows.Forms.Button(); - this.textBoxStorageName = new System.Windows.Forms.TextBox(); - this.maskedTextBoxNumber = new System.Windows.Forms.MaskedTextBox(); - this.buttonRefreshCollection = new System.Windows.Forms.Button(); - this.buttonRemoveBoat = new System.Windows.Forms.Button(); - this.buttonAddBoat = new System.Windows.Forms.Button(); - this.menuStrip = new System.Windows.Forms.MenuStrip(); - this.toolStripMenuItem1 = new System.Windows.Forms.ToolStripMenuItem(); - this.ToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.SaveToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.LoadToolStripMenuItem = new System.Windows.Forms.ToolStripMenuItem(); - this.openFileDialog = new System.Windows.Forms.OpenFileDialog(); - this.saveFileDialog = new System.Windows.Forms.SaveFileDialog(); - ((System.ComponentModel.ISupportInitialize)(this.pictureBoxCollection)).BeginInit(); - this.panelTools.SuspendLayout(); - this.panelCollection.SuspendLayout(); - this.menuStrip.SuspendLayout(); - this.SuspendLayout(); + pictureBoxCollection = new PictureBox(); + panelTools = new Panel(); + buttonSortByColor = new Button(); + buttonSortByType = new Button(); + panelCollection = new Panel(); + buttonDelObject = new Button(); + listBoxStorages = new ListBox(); + buttonAddObject = new Button(); + textBoxStorageName = new TextBox(); + maskedTextBoxNumber = new MaskedTextBox(); + buttonRefreshCollection = new Button(); + buttonRemoveBoat = new Button(); + buttonAddBoat = new Button(); + menuStrip = new MenuStrip(); + toolStripMenuItem1 = new ToolStripMenuItem(); + ToolStripMenuItem = new ToolStripMenuItem(); + SaveToolStripMenuItem = new ToolStripMenuItem(); + LoadToolStripMenuItem = new ToolStripMenuItem(); + openFileDialog = new OpenFileDialog(); + saveFileDialog = new SaveFileDialog(); + ((System.ComponentModel.ISupportInitialize)pictureBoxCollection).BeginInit(); + panelTools.SuspendLayout(); + panelCollection.SuspendLayout(); + menuStrip.SuspendLayout(); + SuspendLayout(); // // pictureBoxCollection // @@ -68,13 +68,15 @@ namespace Sailboat // panelTools // panelTools.BackColor = SystemColors.ScrollBar; + panelTools.Controls.Add(buttonSortByColor); + panelTools.Controls.Add(buttonSortByType); panelTools.Controls.Add(panelCollection); panelTools.Controls.Add(maskedTextBoxNumber); panelTools.Controls.Add(buttonRefreshCollection); panelTools.Controls.Add(buttonRemoveBoat); panelTools.Controls.Add(buttonAddBoat); panelTools.Controls.Add(menuStrip); - panelTools.Location = new Point(689, 0); + panelTools.Location = new Point(681, 0); panelTools.Margin = new Padding(3, 2, 3, 2); panelTools.Name = "panelTools"; panelTools.Size = new Size(183, 542); @@ -82,9 +84,10 @@ namespace Sailboat // // buttonSortByColor // - buttonSortByColor.Location = new System.Drawing.Point(20, 479); + buttonSortByColor.Location = new Point(18, 366); + buttonSortByColor.Margin = new Padding(3, 2, 3, 2); buttonSortByColor.Name = "buttonSortByColor"; - buttonSortByColor.Size = new System.Drawing.Size(180, 34); + buttonSortByColor.Size = new Size(158, 26); buttonSortByColor.TabIndex = 7; buttonSortByColor.Text = "Сортировать по цвету"; buttonSortByColor.UseVisualStyleBackColor = true; @@ -92,9 +95,10 @@ namespace Sailboat // // buttonSortByType // - buttonSortByType.Location = new System.Drawing.Point(20, 439); + buttonSortByType.Location = new Point(18, 336); + buttonSortByType.Margin = new Padding(3, 2, 3, 2); buttonSortByType.Name = "buttonSortByType"; - buttonSortByType.Size = new System.Drawing.Size(180, 34); + buttonSortByType.Size = new Size(158, 26); buttonSortByType.TabIndex = 6; buttonSortByType.Text = "Сортировать по типу"; buttonSortByType.UseVisualStyleBackColor = true; @@ -107,7 +111,7 @@ namespace Sailboat panelCollection.Controls.Add(listBoxStorages); panelCollection.Controls.Add(buttonAddObject); panelCollection.Controls.Add(textBoxStorageName); - panelCollection.Location = new Point(18, 124); + panelCollection.Location = new Point(18, 96); panelCollection.Margin = new Padding(3, 2, 3, 2); panelCollection.Name = "panelCollection"; panelCollection.Size = new Size(158, 215); @@ -156,7 +160,7 @@ namespace Sailboat // // maskedTextBoxNumber // - maskedTextBoxNumber.Location = new Point(43, 425); + maskedTextBoxNumber.Location = new Point(44, 446); maskedTextBoxNumber.Margin = new Padding(3, 2, 3, 2); maskedTextBoxNumber.Name = "maskedTextBoxNumber"; maskedTextBoxNumber.Size = new Size(110, 23); @@ -175,7 +179,7 @@ namespace Sailboat // // buttonRemoveBoat // - buttonRemoveBoat.Location = new Point(18, 465); + buttonRemoveBoat.Location = new Point(18, 482); buttonRemoveBoat.Margin = new Padding(3, 2, 3, 2); buttonRemoveBoat.Name = "buttonRemoveBoat"; buttonRemoveBoat.Size = new Size(158, 26); @@ -186,7 +190,7 @@ namespace Sailboat // // buttonAddBoat // - buttonAddBoat.Location = new Point(18, 368); + buttonAddBoat.Location = new Point(18, 408); buttonAddBoat.Margin = new Padding(3, 2, 3, 2); buttonAddBoat.Name = "buttonAddBoat"; buttonAddBoat.Size = new Size(158, 26); @@ -216,7 +220,6 @@ namespace Sailboat ToolStripMenuItem.Name = "ToolStripMenuItem"; ToolStripMenuItem.Size = new Size(48, 20); ToolStripMenuItem.Text = "Файл"; - ToolStripMenuItem.Size = new System.Drawing.Size(59, 24); // // SaveToolStripMenuItem // @@ -245,7 +248,7 @@ namespace Sailboat // AutoScaleDimensions = new SizeF(7F, 15F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(884, 546); + ClientSize = new Size(865, 546); Controls.Add(panelTools); Controls.Add(pictureBoxCollection); MainMenuStrip = menuStrip; diff --git a/Sailboat/Sailboat/FormBoatCollection.resx b/Sailboat/Sailboat/FormBoatCollection.resx index 3198a4b..52ba225 100644 --- a/Sailboat/Sailboat/FormBoatCollection.resx +++ b/Sailboat/Sailboat/FormBoatCollection.resx @@ -1,4 +1,64 @@ - + + +