diff --git a/.gitignore b/.gitignore index 5945aca..26212b2 100644 --- a/.gitignore +++ b/.gitignore @@ -396,4 +396,4 @@ FodyWeavers.xsd *.msp # JetBrains Rider -*.sln.iml \ No newline at end of file +*.sln.iml diff --git a/SushiBar/SushiBar/Forms/FormComponent.Designer.cs b/SushiBar/SushiBar/Forms/FormComponent.Designer.cs index d1047dd..ad848b9 100644 --- a/SushiBar/SushiBar/Forms/FormComponent.Designer.cs +++ b/SushiBar/SushiBar/Forms/FormComponent.Designer.cs @@ -74,15 +74,18 @@ // FormComponent // resources.ApplyResources(this, "$this"); - AutoScaleMode = AutoScaleMode.Font; + AutoScaleMode = AutoScaleMode.None; Controls.Add(buttonCancel); Controls.Add(buttonSave); Controls.Add(textBoxCost); Controls.Add(label2); Controls.Add(textBoxName); Controls.Add(label1); + MaximizeBox = false; Name = "FormComponent"; - Load += this.FormComponent_Load; + ShowInTaskbar = false; + TopMost = true; + Load += FormComponent_Load; ResumeLayout(false); PerformLayout(); } diff --git a/SushiBar/SushiBar/Forms/FormComponent.resx b/SushiBar/SushiBar/Forms/FormComponent.resx index e8bc8e2..4cf9735 100644 --- a/SushiBar/SushiBar/Forms/FormComponent.resx +++ b/SushiBar/SushiBar/Forms/FormComponent.resx @@ -117,184 +117,184 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 68, 6 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - - 1 - - - $this - - - 0 - buttonSave - - 12, 9 + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 4 - - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - $this - - - FormComponent - - - 1 - - - 800, 450 - - - 2 - - - button2 - - - $this - - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 95, 85 - - - $this - - - 3 - - - 95, 39 - - - 95, 6 - - - $this - - - 95, 85 - - - FormComponent - - - 0 - - - 222, 85 - - - System.Windows.Forms.Form, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 5 - - + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 $this + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + $this - - 5 + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - 1 - - + $this - - label1 + + 0 - - 1 + + + 222, 85 - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 95, 39 - - label2 + + buttonCancel 8, 20 - - textBox1 + + label1 + + System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + FormComponent + + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 2 + + System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 800, 450 + + + 5 + + + 2 + + + 222, 85 + + + $this + + + 0 + + + 68, 6 + + + FormComponent + + + 4 + + + 1 + + + 5 + + + $this + + + 12, 9 + + + 3 + + + $this + 5 + + textBox1 + + + 1 + + + 1 + + + 95, 85 + $this + + textBoxCost + + + 3 + + + 1 + + + 4 + + + $this + button1 - - buttonCancel + + button2 + + + 0 + + + 95, 85 + + + $this + + + System.Windows.Forms.Form, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 12, 42 + + + System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 textBoxName - - System.Windows.Forms.Button, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 222, 85 - - - textBoxCost - - - 3 - - - 4 - - - System.Windows.Forms.TextBox, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - 0 + + label2 4 - - System.Windows.Forms.Label, System.Windows.Forms, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 95, 6 - - 12, 42 + + 0 ru diff --git a/SushiBar/SushiBar/Forms/FormComponents.Designer.cs b/SushiBar/SushiBar/Forms/FormComponents.Designer.cs index 6497064..b68809c 100644 --- a/SushiBar/SushiBar/Forms/FormComponents.Designer.cs +++ b/SushiBar/SushiBar/Forms/FormComponents.Designer.cs @@ -38,21 +38,21 @@ // // dataGridView // + dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Dock = DockStyle.Left; dataGridView.Location = new Point(0, 0); dataGridView.Name = "dataGridView"; dataGridView.RowHeadersWidth = 51; dataGridView.RowTemplate.Height = 29; dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView.Size = new Size(668, 408); + dataGridView.Size = new Size(694, 408); dataGridView.TabIndex = 0; // // buttonAdd // - buttonAdd.Location = new Point(674, 12); + buttonAdd.Location = new Point(700, 12); buttonAdd.Name = "buttonAdd"; - buttonAdd.Size = new Size(114, 29); + buttonAdd.Size = new Size(180, 29); buttonAdd.TabIndex = 1; buttonAdd.Text = "Добавить"; buttonAdd.UseVisualStyleBackColor = true; @@ -60,9 +60,9 @@ // // buttonUpd // - buttonUpd.Location = new Point(674, 47); + buttonUpd.Location = new Point(700, 47); buttonUpd.Name = "buttonUpd"; - buttonUpd.Size = new Size(114, 29); + buttonUpd.Size = new Size(180, 29); buttonUpd.TabIndex = 2; buttonUpd.Text = "Изменить"; buttonUpd.UseVisualStyleBackColor = true; @@ -70,9 +70,9 @@ // // buttonDel // - buttonDel.Location = new Point(674, 82); + buttonDel.Location = new Point(700, 82); buttonDel.Name = "buttonDel"; - buttonDel.Size = new Size(114, 29); + buttonDel.Size = new Size(180, 29); buttonDel.TabIndex = 3; buttonDel.Text = "Удалить"; buttonDel.UseVisualStyleBackColor = true; @@ -80,9 +80,9 @@ // // buttonRef // - buttonRef.Location = new Point(674, 117); + buttonRef.Location = new Point(700, 117); buttonRef.Name = "buttonRef"; - buttonRef.Size = new Size(114, 29); + buttonRef.Size = new Size(180, 29); buttonRef.TabIndex = 4; buttonRef.Text = "Обновить"; buttonRef.UseVisualStyleBackColor = true; @@ -92,7 +92,7 @@ // AutoScaleDimensions = new SizeF(8F, 20F); AutoScaleMode = AutoScaleMode.Font; - ClientSize = new Size(800, 408); + ClientSize = new Size(892, 408); Controls.Add(buttonRef); Controls.Add(buttonDel); Controls.Add(buttonUpd); diff --git a/SushiBar/SushiBar/Forms/FormCreateOrder.Designer.cs b/SushiBar/SushiBar/Forms/FormCreateOrder.Designer.cs index 7ac7d1a..22d1beb 100644 --- a/SushiBar/SushiBar/Forms/FormCreateOrder.Designer.cs +++ b/SushiBar/SushiBar/Forms/FormCreateOrder.Designer.cs @@ -112,8 +112,7 @@ // // FormCreateOrder // - AutoScaleDimensions = new SizeF(8F, 20F); - AutoScaleMode = AutoScaleMode.Font; + AutoScaleMode = AutoScaleMode.None; ClientSize = new Size(403, 152); Controls.Add(comboBoxSushi); Controls.Add(textBoxSum); @@ -123,7 +122,10 @@ Controls.Add(label1); Controls.Add(buttonCancel); Controls.Add(buttonSave); + MaximizeBox = false; + MinimizeBox = false; Name = "FormCreateOrder"; + ShowInTaskbar = false; Text = "Заказ"; Load += FormCreateOrder_Load; ResumeLayout(false); diff --git a/SushiBar/SushiBar/Forms/FormMain.Designer.cs b/SushiBar/SushiBar/Forms/FormMain.Designer.cs index 4e09e00..30af1f6 100644 --- a/SushiBar/SushiBar/Forms/FormMain.Designer.cs +++ b/SushiBar/SushiBar/Forms/FormMain.Designer.cs @@ -49,12 +49,13 @@ // dataGridView // dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Location = new Point(12, 31); + dataGridView.Dock = DockStyle.Left; + dataGridView.Location = new Point(0, 28); dataGridView.Name = "dataGridView"; dataGridView.RowHeadersWidth = 51; dataGridView.RowTemplate.Height = 29; dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView.Size = new Size(980, 407); + dataGridView.Size = new Size(980, 422); dataGridView.TabIndex = 0; // // menuStrip1 diff --git a/SushiBar/SushiBar/Forms/FormSushi.Designer.cs b/SushiBar/SushiBar/Forms/FormSushi.Designer.cs index ba6aac9..83ce316 100644 --- a/SushiBar/SushiBar/Forms/FormSushi.Designer.cs +++ b/SushiBar/SushiBar/Forms/FormSushi.Designer.cs @@ -62,9 +62,9 @@ // dataGridView.AllowUserToAddRows = false; dataGridView.AllowUserToDeleteRows = false; + dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; dataGridView.Columns.AddRange(new DataGridViewColumn[] { ID, ComponentName, ComponentCount }); - dataGridView.Dock = DockStyle.Left; dataGridView.Location = new Point(3, 24); dataGridView.Margin = new Padding(3, 4, 3, 4); dataGridView.Name = "dataGridView"; @@ -72,7 +72,7 @@ dataGridView.RowHeadersWidth = 51; dataGridView.RowTemplate.Height = 25; dataGridView.SelectionMode = DataGridViewSelectionMode.FullRowSelect; - dataGridView.Size = new Size(630, 267); + dataGridView.Size = new Size(630, 263); dataGridView.TabIndex = 1; // // ID @@ -219,8 +219,12 @@ Controls.Add(buttonCancel); Controls.Add(buttonSave); Controls.Add(groupBox1); + MaximizeBox = false; + MinimizeBox = false; Name = "FormSushi"; + ShowInTaskbar = false; Text = "Суши"; + TopMost = true; Load += FormSushi_Load; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); groupBox1.ResumeLayout(false); diff --git a/SushiBar/SushiBar/Forms/FormSushi.resx b/SushiBar/SushiBar/Forms/FormSushi.resx index b17d555..610eb88 100644 --- a/SushiBar/SushiBar/Forms/FormSushi.resx +++ b/SushiBar/SushiBar/Forms/FormSushi.resx @@ -126,4 +126,13 @@ True + + True + + + True + + + True + \ No newline at end of file diff --git a/SushiBar/SushiBar/Forms/FormSushiComponent.Designer.cs b/SushiBar/SushiBar/Forms/FormSushiComponent.Designer.cs index 147cb44..0563bb3 100644 --- a/SushiBar/SushiBar/Forms/FormSushiComponent.Designer.cs +++ b/SushiBar/SushiBar/Forms/FormSushiComponent.Designer.cs @@ -100,8 +100,12 @@ Controls.Add(comboBoxComponent); Controls.Add(label2); Controls.Add(label1); + MaximizeBox = false; + MinimizeBox = false; Name = "FormSushiComponent"; + ShowInTaskbar = false; Text = "Компонент Изделия"; + TopMost = true; ResumeLayout(false); PerformLayout(); } diff --git a/SushiBar/SushiBar/Forms/FormSushis.Designer.cs b/SushiBar/SushiBar/Forms/FormSushis.Designer.cs index eb92582..b340685 100644 --- a/SushiBar/SushiBar/Forms/FormSushis.Designer.cs +++ b/SushiBar/SushiBar/Forms/FormSushis.Designer.cs @@ -38,9 +38,9 @@ // // dataGridView // + dataGridView.Anchor = AnchorStyles.Top | AnchorStyles.Bottom | AnchorStyles.Left | AnchorStyles.Right; dataGridView.AutoSizeColumnsMode = DataGridViewAutoSizeColumnsMode.ColumnHeader; dataGridView.ColumnHeadersHeightSizeMode = DataGridViewColumnHeadersHeightSizeMode.AutoSize; - dataGridView.Dock = DockStyle.Left; dataGridView.Location = new Point(0, 0); dataGridView.Name = "dataGridView"; dataGridView.RowHeadersWidth = 70;