diff --git a/ProjectLibrary/ProjectLibrary/FormLibrary.Designer.cs b/ProjectLibrary/ProjectLibrary/FormLibrary.Designer.cs index 9644744..4c28f37 100644 --- a/ProjectLibrary/ProjectLibrary/FormLibrary.Designer.cs +++ b/ProjectLibrary/ProjectLibrary/FormLibrary.Designer.cs @@ -121,7 +121,7 @@ BookReportToolStripMenuItem.Name = "BookReportToolStripMenuItem"; BookReportToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.E; BookReportToolStripMenuItem.Size = new Size(280, 22); - BookReportToolStripMenuItem.Text = "Движение книг"; + BookReportToolStripMenuItem.Text = "Деятельность библиотекаря"; BookReportToolStripMenuItem.Click += BookMoveToolStripMenuItem_Click; // // BookDistributionToolStripMenuItem diff --git a/ProjectLibrary/ProjectLibrary/FormLibrary.cs b/ProjectLibrary/ProjectLibrary/FormLibrary.cs index d28ebab..f99f64a 100644 --- a/ProjectLibrary/ProjectLibrary/FormLibrary.cs +++ b/ProjectLibrary/ProjectLibrary/FormLibrary.cs @@ -96,7 +96,7 @@ namespace ProjectLibrary { try { - _container.Resolve().ShowDialog(); + _container.Resolve().ShowDialog(); } catch (Exception ex) { diff --git a/ProjectLibrary/ProjectLibrary/Forms/FormBookRestoration.Designer.cs b/ProjectLibrary/ProjectLibrary/Forms/FormBookRestoration.Designer.cs index 93bc6dd..5eb04fb 100644 --- a/ProjectLibrary/ProjectLibrary/Forms/FormBookRestoration.Designer.cs +++ b/ProjectLibrary/ProjectLibrary/Forms/FormBookRestoration.Designer.cs @@ -127,7 +127,7 @@ Controls.Add(buttonCancel); Controls.Add(buttonSave); Name = "FormBookRestoration"; - Text = "FormBookRestoration"; + Text = "Реставрация книги"; ResumeLayout(false); PerformLayout(); } diff --git a/ProjectLibrary/ProjectLibrary/Forms/FormBookRestorations.Designer.cs b/ProjectLibrary/ProjectLibrary/Forms/FormBookRestorations.Designer.cs index 555db07..5458e24 100644 --- a/ProjectLibrary/ProjectLibrary/Forms/FormBookRestorations.Designer.cs +++ b/ProjectLibrary/ProjectLibrary/Forms/FormBookRestorations.Designer.cs @@ -30,8 +30,8 @@ { dataGridView = new DataGridView(); panel1 = new Panel(); - buttonAdd = new Button(); ButtonDel = new Button(); + buttonAdd = new Button(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); panel1.SuspendLayout(); SuspendLayout(); @@ -64,17 +64,6 @@ panel1.Size = new Size(144, 450); panel1.TabIndex = 2; // - // buttonAdd - // - buttonAdd.BackgroundImage = Properties.Resources.plus; - buttonAdd.BackgroundImageLayout = ImageLayout.Stretch; - buttonAdd.Location = new Point(33, 36); - buttonAdd.Name = "buttonAdd"; - buttonAdd.Size = new Size(75, 63); - buttonAdd.TabIndex = 0; - buttonAdd.UseVisualStyleBackColor = true; - buttonAdd.Click += ButtonAdd_Click; - // // ButtonDel // ButtonDel.BackgroundImage = Properties.Resources.minus; @@ -86,6 +75,17 @@ ButtonDel.UseVisualStyleBackColor = true; ButtonDel.Click += ButtonDel_Click; // + // buttonAdd + // + buttonAdd.BackgroundImage = Properties.Resources.plus; + buttonAdd.BackgroundImageLayout = ImageLayout.Stretch; + buttonAdd.Location = new Point(33, 36); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(75, 63); + buttonAdd.TabIndex = 0; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += ButtonAdd_Click; + // // FormBookRestorations // AutoScaleDimensions = new SizeF(7F, 15F); @@ -94,7 +94,7 @@ Controls.Add(dataGridView); Controls.Add(panel1); Name = "FormBookRestorations"; - Text = "FormBookRestorations"; + Text = "Реставрации книг"; Load += FormBookRestorations_Load; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); panel1.ResumeLayout(false); diff --git a/ProjectLibrary/ProjectLibrary/Forms/FormDirectoryReport.Designer.cs b/ProjectLibrary/ProjectLibrary/Forms/FormDirectoryReport.Designer.cs index dc9df8c..cbcb479 100644 --- a/ProjectLibrary/ProjectLibrary/Forms/FormDirectoryReport.Designer.cs +++ b/ProjectLibrary/ProjectLibrary/Forms/FormDirectoryReport.Designer.cs @@ -84,7 +84,7 @@ Controls.Add(checkBoxReaders); Controls.Add(checkBoxLibrarians); Name = "FormDirectoryReport"; - Text = "FormDirectoryReport"; + Text = "Отчет со справочниками"; ResumeLayout(false); PerformLayout(); } diff --git a/ProjectLibrary/ProjectLibrary/Forms/FormIssues.Designer.cs b/ProjectLibrary/ProjectLibrary/Forms/FormIssues.Designer.cs index 72f146f..8417e53 100644 --- a/ProjectLibrary/ProjectLibrary/Forms/FormIssues.Designer.cs +++ b/ProjectLibrary/ProjectLibrary/Forms/FormIssues.Designer.cs @@ -30,8 +30,8 @@ { dataGridView = new DataGridView(); panel1 = new Panel(); - buttonAdd = new Button(); ButtonDel = new Button(); + buttonAdd = new Button(); ((System.ComponentModel.ISupportInitialize)dataGridView).BeginInit(); panel1.SuspendLayout(); SuspendLayout(); @@ -64,17 +64,6 @@ panel1.Size = new Size(144, 450); panel1.TabIndex = 2; // - // buttonAdd - // - buttonAdd.BackgroundImage = Properties.Resources.plus; - buttonAdd.BackgroundImageLayout = ImageLayout.Stretch; - buttonAdd.Location = new Point(33, 36); - buttonAdd.Name = "buttonAdd"; - buttonAdd.Size = new Size(75, 63); - buttonAdd.TabIndex = 0; - buttonAdd.UseVisualStyleBackColor = true; - buttonAdd.Click += ButtonAdd_Click; - // // ButtonDel // ButtonDel.BackgroundImage = Properties.Resources.minus; @@ -86,6 +75,17 @@ ButtonDel.UseVisualStyleBackColor = true; ButtonDel.Click += ButtonDel_Click; // + // buttonAdd + // + buttonAdd.BackgroundImage = Properties.Resources.plus; + buttonAdd.BackgroundImageLayout = ImageLayout.Stretch; + buttonAdd.Location = new Point(33, 36); + buttonAdd.Name = "buttonAdd"; + buttonAdd.Size = new Size(75, 63); + buttonAdd.TabIndex = 0; + buttonAdd.UseVisualStyleBackColor = true; + buttonAdd.Click += ButtonAdd_Click; + // // FormIssues // AutoScaleDimensions = new SizeF(7F, 15F); @@ -94,7 +94,7 @@ Controls.Add(dataGridView); Controls.Add(panel1); Name = "FormIssues"; - Text = "FormIssues"; + Text = "Выдачи книг"; Load += FormIssues_Load; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); panel1.ResumeLayout(false); diff --git a/ProjectLibrary/ProjectLibrary/Forms/FormBookReport.Designer.cs b/ProjectLibrary/ProjectLibrary/Forms/FormLibrarianReport.Designer.cs similarity index 97% rename from ProjectLibrary/ProjectLibrary/Forms/FormBookReport.Designer.cs rename to ProjectLibrary/ProjectLibrary/Forms/FormLibrarianReport.Designer.cs index b75beef..a387bda 100644 --- a/ProjectLibrary/ProjectLibrary/Forms/FormBookReport.Designer.cs +++ b/ProjectLibrary/ProjectLibrary/Forms/FormLibrarianReport.Designer.cs @@ -1,6 +1,6 @@ namespace ProjectLibrary.Forms { - partial class FormBookReport + partial class FormLibrarianReport { /// /// Required designer variable. @@ -143,8 +143,8 @@ Controls.Add(label3); Controls.Add(label2); Controls.Add(label1); - Name = "FormBookReport"; - Text = "FormBookReport"; + Name = "FormLibrarianReport"; + Text = "Отчет по библиотекарю"; ResumeLayout(false); PerformLayout(); } diff --git a/ProjectLibrary/ProjectLibrary/Forms/FormBookReport.cs b/ProjectLibrary/ProjectLibrary/Forms/FormLibrarianReport.cs similarity index 94% rename from ProjectLibrary/ProjectLibrary/Forms/FormBookReport.cs rename to ProjectLibrary/ProjectLibrary/Forms/FormLibrarianReport.cs index 8131960..a7a843b 100644 --- a/ProjectLibrary/ProjectLibrary/Forms/FormBookReport.cs +++ b/ProjectLibrary/ProjectLibrary/Forms/FormLibrarianReport.cs @@ -13,10 +13,10 @@ using Unity; namespace ProjectLibrary.Forms; -public partial class FormBookReport : Form +public partial class FormLibrarianReport : Form { private readonly IUnityContainer _container; - public FormBookReport(IUnityContainer container, ILibrarianRepository librarianRepository) + public FormLibrarianReport(IUnityContainer container, ILibrarianRepository librarianRepository) { InitializeComponent(); _container = container ?? diff --git a/ProjectLibrary/ProjectLibrary/Forms/FormBookReport.resx b/ProjectLibrary/ProjectLibrary/Forms/FormLibrarianReport.resx similarity index 100% rename from ProjectLibrary/ProjectLibrary/Forms/FormBookReport.resx rename to ProjectLibrary/ProjectLibrary/Forms/FormLibrarianReport.resx diff --git a/ProjectLibrary/ProjectLibrary/Forms/FormReaders.Designer.cs b/ProjectLibrary/ProjectLibrary/Forms/FormReaders.Designer.cs index 183a216..4ae400a 100644 --- a/ProjectLibrary/ProjectLibrary/Forms/FormReaders.Designer.cs +++ b/ProjectLibrary/ProjectLibrary/Forms/FormReaders.Designer.cs @@ -107,7 +107,7 @@ Controls.Add(dataGridView); Controls.Add(panel1); Name = "FormReaders"; - Text = "FormReaders"; + Text = "Читатели"; Load += FormReaders_Load; ((System.ComponentModel.ISupportInitialize)dataGridView).EndInit(); panel1.ResumeLayout(false);