diff --git a/Laba3/FormMain.Designer.cs b/Laba3/FormMain.Designer.cs
index 495830c..091b0b6 100644
--- a/Laba3/FormMain.Designer.cs
+++ b/Laba3/FormMain.Designer.cs
@@ -38,6 +38,7 @@ namespace View
AddElementToolStripMenuItem = new ToolStripMenuItem();
UpdElementToolStripMenuItem = new ToolStripMenuItem();
DelElementToolStripMenuItem = new ToolStripMenuItem();
+ справочникToolStripMenuItem = new ToolStripMenuItem();
DocsToolStripMenuItem = new ToolStripMenuItem();
WordDocToolStripMenuItem = new ToolStripMenuItem();
TableDocToolStripMenuItem = new ToolStripMenuItem();
@@ -64,7 +65,7 @@ namespace View
//
// ActionsToolStripMenuItem
//
- ActionsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { AddElementToolStripMenuItem, UpdElementToolStripMenuItem, DelElementToolStripMenuItem });
+ ActionsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { AddElementToolStripMenuItem, UpdElementToolStripMenuItem, DelElementToolStripMenuItem, справочникToolStripMenuItem });
ActionsToolStripMenuItem.Name = "ActionsToolStripMenuItem";
ActionsToolStripMenuItem.Size = new Size(88, 26);
ActionsToolStripMenuItem.Text = "Действия";
@@ -73,7 +74,7 @@ namespace View
//
AddElementToolStripMenuItem.Name = "AddElementToolStripMenuItem";
AddElementToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.A;
- AddElementToolStripMenuItem.Size = new Size(213, 26);
+ AddElementToolStripMenuItem.Size = new Size(224, 26);
AddElementToolStripMenuItem.Text = "Добавить";
AddElementToolStripMenuItem.Click += AddElementToolStripMenuItem_Click;
//
@@ -81,7 +82,7 @@ namespace View
//
UpdElementToolStripMenuItem.Name = "UpdElementToolStripMenuItem";
UpdElementToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.U;
- UpdElementToolStripMenuItem.Size = new Size(213, 26);
+ UpdElementToolStripMenuItem.Size = new Size(224, 26);
UpdElementToolStripMenuItem.Text = "Изменить";
UpdElementToolStripMenuItem.Click += UpdElementToolStripMenuItem_Click;
//
@@ -89,10 +90,17 @@ namespace View
//
DelElementToolStripMenuItem.Name = "DelElementToolStripMenuItem";
DelElementToolStripMenuItem.ShortcutKeys = Keys.Control | Keys.D;
- DelElementToolStripMenuItem.Size = new Size(213, 26);
+ DelElementToolStripMenuItem.Size = new Size(224, 26);
DelElementToolStripMenuItem.Text = "Удалить";
DelElementToolStripMenuItem.Click += DelElementToolStripMenuItem_Click;
//
+ // справочникToolStripMenuItem
+ //
+ справочникToolStripMenuItem.Name = "справочникToolStripMenuItem";
+ справочникToolStripMenuItem.Size = new Size(224, 26);
+ справочникToolStripMenuItem.Text = "Справочник";
+ справочникToolStripMenuItem.Click += ManufacElementToolStripMenuItem_Click;
+ //
// DocsToolStripMenuItem
//
DocsToolStripMenuItem.DropDownItems.AddRange(new ToolStripItem[] { WordDocToolStripMenuItem, TableDocToolStripMenuItem, ChartDocToolStripMenuItem });
@@ -169,5 +177,6 @@ namespace View
private Library14Petrushin.PdfImg pdfImg;
private Library15Gerimovich.WordDiagramComponent wordDiagramComponent;
private WinFormsLibrary1.ComponentTable componentTable;
+ private ToolStripMenuItem справочникToolStripMenuItem;
}
}
\ No newline at end of file
diff --git a/Laba3/FormMain.cs b/Laba3/FormMain.cs
index 0d1a172..d61900b 100644
--- a/Laba3/FormMain.cs
+++ b/Laba3/FormMain.cs
@@ -89,6 +89,9 @@ namespace View
switch (e.KeyCode)
{
+ case Keys.I:
+ ShowManufacturers();
+ break;
case Keys.A:
AddNewElement();
break;
@@ -197,6 +200,15 @@ namespace View
}
}
+ private void ShowManufacturers()
+ {
+ _plugins[_selectedPlugin].GetManufacturers()?.Show();
+ }
+ private void ManufacElementToolStripMenuItem_Click(object sender, EventArgs e)
+ {
+ ShowManufacturers();
+ }
+
private void AddElementToolStripMenuItem_Click(object sender, EventArgs e)
{
AddNewElement();
diff --git a/Laba3/FormMain.resx b/Laba3/FormMain.resx
index 1af7de1..6c82d08 100644
--- a/Laba3/FormMain.resx
+++ b/Laba3/FormMain.resx
@@ -1,17 +1,17 @@
-
@@ -117,4 +117,7 @@
System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089
+
+ 17, 17
+
\ No newline at end of file
diff --git a/PluginsConvention14/MyPlugin/MainPluginConvention.cs b/PluginsConvention14/MyPlugin/MainPluginConvention.cs
index 75e59a6..a6c7d9f 100644
--- a/PluginsConvention14/MyPlugin/MainPluginConvention.cs
+++ b/PluginsConvention14/MyPlugin/MainPluginConvention.cs
@@ -51,12 +51,10 @@ namespace PluginsConvention14.MyPlugin
}
- /// Название плагина
- /*string IPluginsConvention.PluginName => PluginName();
- public string PluginName()
+ public Form GetManufacturers()
{
- return "Products";
- }*/
+ return new ManufacturerForm(_manufacturerRepository);
+ }
public UserControl GetControl => оutputTableResults;
diff --git a/PluginsConvention14/Plugins/IPluginsConvention.cs b/PluginsConvention14/Plugins/IPluginsConvention.cs
index c055a6f..885c73e 100644
--- a/PluginsConvention14/Plugins/IPluginsConvention.cs
+++ b/PluginsConvention14/Plugins/IPluginsConvention.cs
@@ -56,5 +56,10 @@
///
///
bool CreatePdf(PluginsConventionSaveDocument saveDocument);
+ ///
+ /// Получение формы для работы со справочником
+ ///
+ ///
+ Form GetManufacturers();
}
}