diff --git a/.vs/DynamicMenuItems.git/FileContentIndex/2934bdb4-ee19-441c-bfc9-0fbbb6aeb48d.vsidx b/.vs/DynamicMenuItems.git/FileContentIndex/2934bdb4-ee19-441c-bfc9-0fbbb6aeb48d.vsidx deleted file mode 100644 index a0d6efd..0000000 Binary files a/.vs/DynamicMenuItems.git/FileContentIndex/2934bdb4-ee19-441c-bfc9-0fbbb6aeb48d.vsidx and /dev/null differ diff --git a/.vs/DynamicMenuItems.git/FileContentIndex/3a0c6b40-686a-4483-9665-37aff22167b2.vsidx b/.vs/DynamicMenuItems.git/FileContentIndex/3a0c6b40-686a-4483-9665-37aff22167b2.vsidx new file mode 100644 index 0000000..b1e687c Binary files /dev/null and b/.vs/DynamicMenuItems.git/FileContentIndex/3a0c6b40-686a-4483-9665-37aff22167b2.vsidx differ diff --git a/.vs/DynamicMenuItems.git/FileContentIndex/4133f4f0-d589-4a2e-8868-b71371a94df6.vsidx b/.vs/DynamicMenuItems.git/FileContentIndex/4133f4f0-d589-4a2e-8868-b71371a94df6.vsidx deleted file mode 100644 index 7075cf4..0000000 Binary files a/.vs/DynamicMenuItems.git/FileContentIndex/4133f4f0-d589-4a2e-8868-b71371a94df6.vsidx and /dev/null differ diff --git a/.vs/DynamicMenuItems.git/FileContentIndex/882e588d-eab0-4041-a64c-626af7fdcd2d.vsidx b/.vs/DynamicMenuItems.git/FileContentIndex/882e588d-eab0-4041-a64c-626af7fdcd2d.vsidx deleted file mode 100644 index 11b5544..0000000 Binary files a/.vs/DynamicMenuItems.git/FileContentIndex/882e588d-eab0-4041-a64c-626af7fdcd2d.vsidx and /dev/null differ diff --git a/.vs/DynamicMenuItems.git/FileContentIndex/8dcf4bfd-a0a4-4817-b0f3-358a75a45dbc.vsidx b/.vs/DynamicMenuItems.git/FileContentIndex/8dcf4bfd-a0a4-4817-b0f3-358a75a45dbc.vsidx new file mode 100644 index 0000000..a13795c Binary files /dev/null and b/.vs/DynamicMenuItems.git/FileContentIndex/8dcf4bfd-a0a4-4817-b0f3-358a75a45dbc.vsidx differ diff --git a/.vs/DynamicMenuItems.git/FileContentIndex/8f422da0-c014-4207-9ab9-f93f999f3fb0.vsidx b/.vs/DynamicMenuItems.git/FileContentIndex/8f422da0-c014-4207-9ab9-f93f999f3fb0.vsidx new file mode 100644 index 0000000..bd6c358 Binary files /dev/null and b/.vs/DynamicMenuItems.git/FileContentIndex/8f422da0-c014-4207-9ab9-f93f999f3fb0.vsidx differ diff --git a/.vs/DynamicMenuItems.git/FileContentIndex/a5687c0d-f1a8-4535-a7d0-1093670d56cd.vsidx b/.vs/DynamicMenuItems.git/FileContentIndex/a5687c0d-f1a8-4535-a7d0-1093670d56cd.vsidx deleted file mode 100644 index fd8ac3e..0000000 Binary files a/.vs/DynamicMenuItems.git/FileContentIndex/a5687c0d-f1a8-4535-a7d0-1093670d56cd.vsidx and /dev/null differ diff --git a/.vs/DynamicMenuItems.git/FileContentIndex/c2dd5a20-ba87-4104-bb42-ff226d354847.vsidx b/.vs/DynamicMenuItems.git/FileContentIndex/c2dd5a20-ba87-4104-bb42-ff226d354847.vsidx new file mode 100644 index 0000000..d767168 Binary files /dev/null and b/.vs/DynamicMenuItems.git/FileContentIndex/c2dd5a20-ba87-4104-bb42-ff226d354847.vsidx differ diff --git a/.vs/DynamicMenuItems.git/v17/.suo b/.vs/DynamicMenuItems.git/v17/.suo index ceb825b..3856ba9 100644 Binary files a/.vs/DynamicMenuItems.git/v17/.suo and b/.vs/DynamicMenuItems.git/v17/.suo differ diff --git a/DynamicMenuItems/DynamicMenuItems.cs b/DynamicMenuItems/DynamicMenuItems.cs index 78684e6..fbbf462 100644 --- a/DynamicMenuItems/DynamicMenuItems.cs +++ b/DynamicMenuItems/DynamicMenuItems.cs @@ -428,18 +428,18 @@ namespace Eugen.ESystem log.WriteMessage("The license value was saved to roaming", LogWriter.LogLevel.Information, LogWriter.Time.Write); //Logdatei schreiben } - OnMyEvent(EventArgs.Empty); //Das eigene Event aufrufen + OnDynamicMenuItemEvent(EventArgs.Empty); //Das eigene Event aufrufen } - public event EventHandler MyEvent; //Ein eigens Event erstellen + public event EventHandler DynamicMenuItemEvent; //Ein eigens Event erstellen //Eventhandler - protected virtual void OnMyEvent(EventArgs e) + protected virtual void OnDynamicMenuItemEvent(EventArgs e) { - EventHandler myEvent = MyEvent; - if (myEvent != null) + EventHandler dynamicMenuItemEvent = DynamicMenuItemEvent; + if (dynamicMenuItemEvent != null) { - myEvent(this, e); + dynamicMenuItemEvent(this, e); } } diff --git a/DynamicMenuItems/bin/Debug/de/hedynmeit.resources.dll b/DynamicMenuItems/bin/Debug/de/hedynmeit.resources.dll index a71398a..de15df9 100644 Binary files a/DynamicMenuItems/bin/Debug/de/hedynmeit.resources.dll and b/DynamicMenuItems/bin/Debug/de/hedynmeit.resources.dll differ diff --git a/DynamicMenuItems/bin/Debug/en/hedynmeit.resources.dll b/DynamicMenuItems/bin/Debug/en/hedynmeit.resources.dll index e313b01..0ca7fef 100644 Binary files a/DynamicMenuItems/bin/Debug/en/hedynmeit.resources.dll and b/DynamicMenuItems/bin/Debug/en/hedynmeit.resources.dll differ diff --git a/DynamicMenuItems/bin/Debug/hedynmeit.dll b/DynamicMenuItems/bin/Debug/hedynmeit.dll index cb19722..270bf99 100644 Binary files a/DynamicMenuItems/bin/Debug/hedynmeit.dll and b/DynamicMenuItems/bin/Debug/hedynmeit.dll differ diff --git a/DynamicMenuItems/bin/Debug/hedynmeit.pdb b/DynamicMenuItems/bin/Debug/hedynmeit.pdb index fc8e395..c5e9165 100644 Binary files a/DynamicMenuItems/bin/Debug/hedynmeit.pdb and b/DynamicMenuItems/bin/Debug/hedynmeit.pdb differ diff --git a/DynamicMenuItems/obj/Debug/de/hedynmeit.resources.dll b/DynamicMenuItems/obj/Debug/de/hedynmeit.resources.dll index a71398a..de15df9 100644 Binary files a/DynamicMenuItems/obj/Debug/de/hedynmeit.resources.dll and b/DynamicMenuItems/obj/Debug/de/hedynmeit.resources.dll differ diff --git a/DynamicMenuItems/obj/Debug/en/hedynmeit.resources.dll b/DynamicMenuItems/obj/Debug/en/hedynmeit.resources.dll index e313b01..0ca7fef 100644 Binary files a/DynamicMenuItems/obj/Debug/en/hedynmeit.resources.dll and b/DynamicMenuItems/obj/Debug/en/hedynmeit.resources.dll differ diff --git a/DynamicMenuItems/obj/Debug/hedynmeit.dll b/DynamicMenuItems/obj/Debug/hedynmeit.dll index cb19722..270bf99 100644 Binary files a/DynamicMenuItems/obj/Debug/hedynmeit.dll and b/DynamicMenuItems/obj/Debug/hedynmeit.dll differ diff --git a/DynamicMenuItems/obj/Debug/hedynmeit.pdb b/DynamicMenuItems/obj/Debug/hedynmeit.pdb index fc8e395..c5e9165 100644 Binary files a/DynamicMenuItems/obj/Debug/hedynmeit.pdb and b/DynamicMenuItems/obj/Debug/hedynmeit.pdb differ diff --git a/Test_DynamicMenuItems/Form1.cs b/Test_DynamicMenuItems/Form1.cs index 6be0568..10afe9e 100644 --- a/Test_DynamicMenuItems/Form1.cs +++ b/Test_DynamicMenuItems/Form1.cs @@ -117,87 +117,86 @@ namespace Test_DynamicMenuItems labelProgramInfo.Text = String.Concat(ProgramName, "\r\n", ProgramVersion, "\r\n", Copyright); // Zeigt die Programm-Information an labelDLLInfo.Text = String.Concat(DynamicMenuItems.DllName, "\r\n", DynamicMenuItems.DllVersion, "\r\n", DynamicMenuItems.Copyright); // Zeigt die DLL-Information an - InitMyObjectMyEvent(); + InitDynamicMenuItemObjectDynamicMenuItemEvent(); } - DynamicMenuItems myObject = new DynamicMenuItems(); //Event deklarieren + DynamicMenuItems dynamicMenuItemObject = new DynamicMenuItems(); //Event deklarieren - private void InitMyObjectMyEvent() + private void InitDynamicMenuItemObjectDynamicMenuItemEvent() { string logfile = @"H:\Programmieren\Git-WorkRepository\VisualStudio\_DLL\DynamicMenuItems.git\Daten\Log.log"; //Name der Logdatei DynamicMenuItems.LogFile = logfile; //Namen der Logdatei bekanntgeben - myObject.MyEvent += myObject_MyEvent; //Event abonnieren + dynamicMenuItemObject.DynamicMenuItemEvent += dynamicMenuItemObject_DynamicMenuItemEvent; //Event abonnieren } private void buttonAddMenuItem_Click(object sender, EventArgs e) { - myObject.Password = "abc"; - myObject.XmlFile = "H:\\Programmieren\\Git-WorkRepository\\VisualStudio\\_DLL\\DynamicMenuItems.git\\Daten\\LicenseBundles.xml"; - //myObject.Topic = "NX-Portal";//Topic der XML-Datei - //myObject.Group = "Bundle"; //Gruppe der XML-Datei - //myObject.Key = "License"; //Schlüssel der XML-Datei - myObject.Menu = subtestToolStripMenuItem; //Menu unter dem die MenuItems angelegt werden sollen - //myObject.BackColor = Color.FromArgb(60, 60, 60); //Hintergrundfarbe des MenuItems - //myObject.ForeColor = SystemColors.ControlDark; //Vordergrundfarbe des MenuItems + dynamicMenuItemObject.Password = "abc"; + dynamicMenuItemObject.XmlFile = "H:\\Programmieren\\Git-WorkRepository\\VisualStudio\\_DLL\\DynamicMenuItems.git\\Daten\\LicenseBundles.xml"; + //dynamicMenuItemObject.Topic = "NX-Portal";//Topic der XML-Datei + //dynamicMenuItemObject.Group = "Bundle"; //Gruppe der XML-Datei + //dynamicMenuItemObject.Key = "License"; //Schlüssel der XML-Datei + dynamicMenuItemObject.Menu = subtestToolStripMenuItem; //Menu unter dem die MenuItems angelegt werden sollen + //dynamicMenuItemObject.BackColor = Color.FromArgb(60, 60, 60); //Hintergrundfarbe des MenuItems + //dynamicMenuItemObject.ForeColor = SystemColors.ControlDark; //Vordergrundfarbe des MenuItems - myObject.AddMenuItem("NX91110"); //Einen Menueintrag erzeugen + dynamicMenuItemObject.AddMenuItem("NX91110"); //Einen Menueintrag erzeugen } private void buttonAddmenuItems_Click(object sender, EventArgs e) { - myObject.Password = "abc"; - myObject.XmlFile = "H:\\Programmieren\\Git-WorkRepository\\VisualStudio\\_DLL\\DynamicMenuItems.git\\Daten\\LicenseBundles.xml"; - //myObject.Topic = "NX-Portal";//Topic der XML-Datei - //myObject.Group = "Bundle"; //Gruppe der XML-Datei - //myObject.Key = "License"; //Schlüssel der XML-Datei - myObject.Menu = subtestToolStripMenuItem; //Menu unter dem die MenuItems angelegt werden sollen - myObject.BackColor = Color.FromArgb(60, 60, 60); //Hintergrundfarbe des MenuItems - myObject.ForeColor = SystemColors.ControlDark; //Vordergrundfarbe des MenuItems + dynamicMenuItemObject.Password = "abc"; + dynamicMenuItemObject.XmlFile = "H:\\Programmieren\\Git-WorkRepository\\VisualStudio\\_DLL\\DynamicMenuItems.git\\Daten\\LicenseBundles.xml"; + //dynamicMenuItemObject.Topic = "NX-Portal";//Topic der XML-Datei + //dynamicMenuItemObject.Group = "Bundle"; //Gruppe der XML-Datei + //dynamicMenuItemObject.Key = "License"; //Schlüssel der XML-Datei + dynamicMenuItemObject.Menu = subtestToolStripMenuItem; //Menu unter dem die MenuItems angelegt werden sollen + dynamicMenuItemObject.BackColor = Color.FromArgb(60, 60, 60); //Hintergrundfarbe des MenuItems + dynamicMenuItemObject.ForeColor = SystemColors.ControlDark; //Vordergrundfarbe des MenuItems string[] items = { "NX91110", "NX93300", "SC13500" }; //Liste der Menueinträge die angelegt werden sollen - myObject.AddMenuItems(items); //Menueinträge aus einer List erzeugen + dynamicMenuItemObject.AddMenuItems(items); //Menueinträge aus einer List erzeugen } private void buttonAddMenuItemsFromXML_Click(object sender, EventArgs e) { - myObject.Password = "abc"; - myObject.XmlFile = "H:\\Programmieren\\Git-WorkRepository\\VisualStudio\\_DLL\\DynamicMenuItems.git\\Daten\\LicenseBundles.xml"; - myObject.Topic = "NX-Portal";//Topic der XML-Datei - myObject.Group = "Bundle"; //Gruppe der XML-Datei - myObject.Key = "License"; //Schlüssel der XML-Datei - myObject.Menu = subtestToolStripMenuItem; //Menu unter dem die MenuItems angelegt werden sollen - myObject.BackColor = Color.FromArgb(60, 60, 60); //Hintergrundfarbe des MenuItems - myObject.ForeColor = SystemColors.ControlDark; //Vordergrundfarbe des MenuItems + dynamicMenuItemObject.Password = "abc"; + dynamicMenuItemObject.XmlFile = "H:\\Programmieren\\Git-WorkRepository\\VisualStudio\\_DLL\\DynamicMenuItems.git\\Daten\\LicenseBundles.xml"; + dynamicMenuItemObject.Topic = "NX-Portal";//Topic der XML-Datei + dynamicMenuItemObject.Group = "Bundle"; //Gruppe der XML-Datei + dynamicMenuItemObject.Key = "License"; //Schlüssel der XML-Datei + dynamicMenuItemObject.Menu = subtestToolStripMenuItem; //Menu unter dem die MenuItems angelegt werden sollen + dynamicMenuItemObject.BackColor = Color.FromArgb(60, 60, 60); //Hintergrundfarbe des MenuItems + dynamicMenuItemObject.ForeColor = SystemColors.ControlDark; //Vordergrundfarbe des MenuItems - myObject.AddMenuItemsFromXML(); //Alle Menüeinträge aus einer XML-Datei erzeugen + dynamicMenuItemObject.AddMenuItemsFromXML(); //Alle Menüeinträge aus einer XML-Datei erzeugen } private void buttonRemoveItem_Click(object sender, EventArgs e) { - myObject.Menu = subtestToolStripMenuItem; + dynamicMenuItemObject.Menu = subtestToolStripMenuItem; - myObject.RemoveMenuItem("NX91110"); //Einen Menüeintrag löschen + dynamicMenuItemObject.RemoveMenuItem("NX91110"); //Einen Menüeintrag löschen } private void buttonRemoveItems_Click(object sender, EventArgs e) { - myObject.Menu = subtestToolStripMenuItem; + dynamicMenuItemObject.Menu = subtestToolStripMenuItem; string[] items = { "NX91110", "NX93300", "SC13500" }; - myObject.RemoveMenuItems(items); //Eine Liste von Menüeinträgen löschen + dynamicMenuItemObject.RemoveMenuItems(items); //Eine Liste von Menüeinträgen löschen } private void buttonRemoveAllMenuItems_Click(object sender, EventArgs e) { - var myObject = new DynamicMenuItems(); - myObject.Menu = subtestToolStripMenuItem; + dynamicMenuItemObject.Menu = subtestToolStripMenuItem; - myObject.RemoveAllMenuItems(); //Alle Menüeinträge löschen + dynamicMenuItemObject.RemoveAllMenuItems(); //Alle Menüeinträge löschen } - public static void myObject_MyEvent(Object objSender, EventArgs e) + public static void dynamicMenuItemObject_DynamicMenuItemEvent(Object objSender, EventArgs e) { DoSomethingInForm1(); //Wird ausgeführt, wenn ein Event gefeuert wird } diff --git a/Test_DynamicMenuItems/bin/Debug/Test_DynamicMenuItems.exe b/Test_DynamicMenuItems/bin/Debug/Test_DynamicMenuItems.exe index 145d72e..fc17c4c 100644 Binary files a/Test_DynamicMenuItems/bin/Debug/Test_DynamicMenuItems.exe and b/Test_DynamicMenuItems/bin/Debug/Test_DynamicMenuItems.exe differ diff --git a/Test_DynamicMenuItems/bin/Debug/Test_DynamicMenuItems.pdb b/Test_DynamicMenuItems/bin/Debug/Test_DynamicMenuItems.pdb index 97f5512..8c2d076 100644 Binary files a/Test_DynamicMenuItems/bin/Debug/Test_DynamicMenuItems.pdb and b/Test_DynamicMenuItems/bin/Debug/Test_DynamicMenuItems.pdb differ diff --git a/Test_DynamicMenuItems/bin/Debug/de/hedynmeit.resources.dll b/Test_DynamicMenuItems/bin/Debug/de/hedynmeit.resources.dll index a71398a..de15df9 100644 Binary files a/Test_DynamicMenuItems/bin/Debug/de/hedynmeit.resources.dll and b/Test_DynamicMenuItems/bin/Debug/de/hedynmeit.resources.dll differ diff --git a/Test_DynamicMenuItems/bin/Debug/en/hedynmeit.resources.dll b/Test_DynamicMenuItems/bin/Debug/en/hedynmeit.resources.dll index e313b01..0ca7fef 100644 Binary files a/Test_DynamicMenuItems/bin/Debug/en/hedynmeit.resources.dll and b/Test_DynamicMenuItems/bin/Debug/en/hedynmeit.resources.dll differ diff --git a/Test_DynamicMenuItems/bin/Debug/hedynmeit.dll b/Test_DynamicMenuItems/bin/Debug/hedynmeit.dll index cb19722..270bf99 100644 Binary files a/Test_DynamicMenuItems/bin/Debug/hedynmeit.dll and b/Test_DynamicMenuItems/bin/Debug/hedynmeit.dll differ diff --git a/Test_DynamicMenuItems/bin/Debug/hedynmeit.pdb b/Test_DynamicMenuItems/bin/Debug/hedynmeit.pdb index fc8e395..c5e9165 100644 Binary files a/Test_DynamicMenuItems/bin/Debug/hedynmeit.pdb and b/Test_DynamicMenuItems/bin/Debug/hedynmeit.pdb differ diff --git a/Test_DynamicMenuItems/obj/Debug/Test_DynamicMenuItems.csproj.AssemblyReference.cache b/Test_DynamicMenuItems/obj/Debug/Test_DynamicMenuItems.csproj.AssemblyReference.cache index b0e1cb2..b678bfa 100644 Binary files a/Test_DynamicMenuItems/obj/Debug/Test_DynamicMenuItems.csproj.AssemblyReference.cache and b/Test_DynamicMenuItems/obj/Debug/Test_DynamicMenuItems.csproj.AssemblyReference.cache differ diff --git a/Test_DynamicMenuItems/obj/Debug/Test_DynamicMenuItems.exe b/Test_DynamicMenuItems/obj/Debug/Test_DynamicMenuItems.exe index 145d72e..fc17c4c 100644 Binary files a/Test_DynamicMenuItems/obj/Debug/Test_DynamicMenuItems.exe and b/Test_DynamicMenuItems/obj/Debug/Test_DynamicMenuItems.exe differ diff --git a/Test_DynamicMenuItems/obj/Debug/Test_DynamicMenuItems.pdb b/Test_DynamicMenuItems/obj/Debug/Test_DynamicMenuItems.pdb index 97f5512..8c2d076 100644 Binary files a/Test_DynamicMenuItems/obj/Debug/Test_DynamicMenuItems.pdb and b/Test_DynamicMenuItems/obj/Debug/Test_DynamicMenuItems.pdb differ