diff --git a/.vs/DuoValueControl/FileContentIndex/067d7b5a-bfea-43d2-b0f3-2867927a1241.vsidx b/.vs/DuoValueControl/FileContentIndex/067d7b5a-bfea-43d2-b0f3-2867927a1241.vsidx new file mode 100644 index 0000000..5874549 Binary files /dev/null and b/.vs/DuoValueControl/FileContentIndex/067d7b5a-bfea-43d2-b0f3-2867927a1241.vsidx differ diff --git a/.vs/DuoValueControl/FileContentIndex/110eec67-286c-4897-ad92-7479e33d648b.vsidx b/.vs/DuoValueControl/FileContentIndex/110eec67-286c-4897-ad92-7479e33d648b.vsidx deleted file mode 100644 index 00afb51..0000000 Binary files a/.vs/DuoValueControl/FileContentIndex/110eec67-286c-4897-ad92-7479e33d648b.vsidx and /dev/null differ diff --git a/.vs/DuoValueControl/FileContentIndex/7f4dafbb-600b-48f7-aa33-8b9d1b189c9c.vsidx b/.vs/DuoValueControl/FileContentIndex/7f4dafbb-600b-48f7-aa33-8b9d1b189c9c.vsidx deleted file mode 100644 index 9addcb3..0000000 Binary files a/.vs/DuoValueControl/FileContentIndex/7f4dafbb-600b-48f7-aa33-8b9d1b189c9c.vsidx and /dev/null differ diff --git a/.vs/DuoValueControl/FileContentIndex/83852965-660d-4454-a831-5ca679df6bf1.vsidx b/.vs/DuoValueControl/FileContentIndex/83852965-660d-4454-a831-5ca679df6bf1.vsidx new file mode 100644 index 0000000..4f60d96 Binary files /dev/null and b/.vs/DuoValueControl/FileContentIndex/83852965-660d-4454-a831-5ca679df6bf1.vsidx differ diff --git a/.vs/DuoValueControl/FileContentIndex/c1129b92-afa9-4830-b1c2-355d36ff7dd2.vsidx b/.vs/DuoValueControl/FileContentIndex/84634d9c-d893-44f9-bc67-fc8d00d54448.vsidx similarity index 61% rename from .vs/DuoValueControl/FileContentIndex/c1129b92-afa9-4830-b1c2-355d36ff7dd2.vsidx rename to .vs/DuoValueControl/FileContentIndex/84634d9c-d893-44f9-bc67-fc8d00d54448.vsidx index b9790c2..29ef331 100644 Binary files a/.vs/DuoValueControl/FileContentIndex/c1129b92-afa9-4830-b1c2-355d36ff7dd2.vsidx and b/.vs/DuoValueControl/FileContentIndex/84634d9c-d893-44f9-bc67-fc8d00d54448.vsidx differ diff --git a/.vs/DuoValueControl/FileContentIndex/d7e326f4-675b-49cd-b8eb-5548021560a3.vsidx b/.vs/DuoValueControl/FileContentIndex/d5606fb4-d8b5-4ba6-a4fd-e995d01df531.vsidx similarity index 61% rename from .vs/DuoValueControl/FileContentIndex/d7e326f4-675b-49cd-b8eb-5548021560a3.vsidx rename to .vs/DuoValueControl/FileContentIndex/d5606fb4-d8b5-4ba6-a4fd-e995d01df531.vsidx index 2e69ce2..7179483 100644 Binary files a/.vs/DuoValueControl/FileContentIndex/d7e326f4-675b-49cd-b8eb-5548021560a3.vsidx and b/.vs/DuoValueControl/FileContentIndex/d5606fb4-d8b5-4ba6-a4fd-e995d01df531.vsidx differ diff --git a/.vs/DuoValueControl/v17/.suo b/.vs/DuoValueControl/v17/.suo index ab56061..81c1eb4 100644 Binary files a/.vs/DuoValueControl/v17/.suo and b/.vs/DuoValueControl/v17/.suo differ diff --git a/DuoValueControl/DuoValueControl.cs b/DuoValueControl/DuoValueControl.cs index 3201308..bf08492 100644 --- a/DuoValueControl/DuoValueControl.cs +++ b/DuoValueControl/DuoValueControl.cs @@ -382,6 +382,11 @@ namespace Eugen.ESystem.Windows.Forms string[] values = new string[loadXML.Values.Length]; values = loadXML.Values; + if (!String.IsNullOrEmpty(Group)) + { + loadXML.Group = Group; + } + for (int i = 0; i < values.Length; i++) { if (values[i].StartsWith("$$$$")) diff --git a/DuoValueControl/LoadXML.cs b/DuoValueControl/LoadXML.cs index db55549..cbfdc9c 100644 --- a/DuoValueControl/LoadXML.cs +++ b/DuoValueControl/LoadXML.cs @@ -38,7 +38,10 @@ namespace Eugen.ESystem.Windows.Forms { temp = groupElement.ToString().Split(' '); - Group = ExtractGroup(temp); + if (String.IsNullOrEmpty(Group)) + { + Group = ExtractGroup(temp); + } lkeys.Add(ExtractKey(temp)); lvalues.Add(ExtractValue(temp)); diff --git a/DuoValueControl/bin/Debug/de/hedvalcon.resources.dll b/DuoValueControl/bin/Debug/de/hedvalcon.resources.dll index 9a96b06..cd0aba3 100644 Binary files a/DuoValueControl/bin/Debug/de/hedvalcon.resources.dll and b/DuoValueControl/bin/Debug/de/hedvalcon.resources.dll differ diff --git a/DuoValueControl/bin/Debug/en/hedvalcon.resources.dll b/DuoValueControl/bin/Debug/en/hedvalcon.resources.dll index d504ba3..1480842 100644 Binary files a/DuoValueControl/bin/Debug/en/hedvalcon.resources.dll and b/DuoValueControl/bin/Debug/en/hedvalcon.resources.dll differ diff --git a/DuoValueControl/bin/Debug/hedvalcon.dll b/DuoValueControl/bin/Debug/hedvalcon.dll index e72eaee..0915b64 100644 Binary files a/DuoValueControl/bin/Debug/hedvalcon.dll and b/DuoValueControl/bin/Debug/hedvalcon.dll differ diff --git a/DuoValueControl/bin/Debug/hedvalcon.pdb b/DuoValueControl/bin/Debug/hedvalcon.pdb index 9d90ffe..6ffdbe6 100644 Binary files a/DuoValueControl/bin/Debug/hedvalcon.pdb and b/DuoValueControl/bin/Debug/hedvalcon.pdb differ diff --git a/DuoValueControl/obj/Debug/DuoValueControl.csproj.GenerateResource.cache b/DuoValueControl/obj/Debug/DuoValueControl.csproj.GenerateResource.cache index 3a53c82..0f19eb2 100644 Binary files a/DuoValueControl/obj/Debug/DuoValueControl.csproj.GenerateResource.cache and b/DuoValueControl/obj/Debug/DuoValueControl.csproj.GenerateResource.cache differ diff --git a/DuoValueControl/obj/Debug/de/hedvalcon.resources.dll b/DuoValueControl/obj/Debug/de/hedvalcon.resources.dll index 9a96b06..cd0aba3 100644 Binary files a/DuoValueControl/obj/Debug/de/hedvalcon.resources.dll and b/DuoValueControl/obj/Debug/de/hedvalcon.resources.dll differ diff --git a/DuoValueControl/obj/Debug/en/hedvalcon.resources.dll b/DuoValueControl/obj/Debug/en/hedvalcon.resources.dll index d504ba3..1480842 100644 Binary files a/DuoValueControl/obj/Debug/en/hedvalcon.resources.dll and b/DuoValueControl/obj/Debug/en/hedvalcon.resources.dll differ diff --git a/DuoValueControl/obj/Debug/hedvalcon.dll b/DuoValueControl/obj/Debug/hedvalcon.dll index e72eaee..0915b64 100644 Binary files a/DuoValueControl/obj/Debug/hedvalcon.dll and b/DuoValueControl/obj/Debug/hedvalcon.dll differ diff --git a/DuoValueControl/obj/Debug/hedvalcon.pdb b/DuoValueControl/obj/Debug/hedvalcon.pdb index 9d90ffe..6ffdbe6 100644 Binary files a/DuoValueControl/obj/Debug/hedvalcon.pdb and b/DuoValueControl/obj/Debug/hedvalcon.pdb differ diff --git a/HE-Test_Dll/Form1.cs b/HE-Test_Dll/Form1.cs index a25ce42..e4b32c8 100644 --- a/HE-Test_Dll/Form1.cs +++ b/HE-Test_Dll/Form1.cs @@ -127,7 +127,7 @@ namespace HE_Test_Dll1 duoValueControl.ValueControlName = "My XML Control"; duoValueControl.Topic = "NX-Portal"; duoValueControl.GroupName = "MyGroup"; - //duoValueControl.Group = "NX_1953"; //Belegt die Gruppe vor. Darf kein Leerzeichen enthalten + //duoValueControl.Group = "NX_2212"; //Belegt die Gruppe vor. Darf kein Leerzeichen enthalten duoValueControl.TableKeyName = "MyVarName"; duoValueControl.TableValueName = "MyValue"; duoValueControl.CheckBoxEncryptValueText = "Encrypt\r\nvalues"; diff --git a/HE-Test_Dll/bin/Debug/HE-Test_Dll.exe b/HE-Test_Dll/bin/Debug/HE-Test_Dll.exe index 68147cf..81f38ea 100644 Binary files a/HE-Test_Dll/bin/Debug/HE-Test_Dll.exe and b/HE-Test_Dll/bin/Debug/HE-Test_Dll.exe differ diff --git a/HE-Test_Dll/bin/Debug/HE-Test_Dll.pdb b/HE-Test_Dll/bin/Debug/HE-Test_Dll.pdb index 152f4dd..8474fd5 100644 Binary files a/HE-Test_Dll/bin/Debug/HE-Test_Dll.pdb and b/HE-Test_Dll/bin/Debug/HE-Test_Dll.pdb differ diff --git a/HE-Test_Dll/bin/Debug/de/hedvalcon.resources.dll b/HE-Test_Dll/bin/Debug/de/hedvalcon.resources.dll index 9a96b06..cd0aba3 100644 Binary files a/HE-Test_Dll/bin/Debug/de/hedvalcon.resources.dll and b/HE-Test_Dll/bin/Debug/de/hedvalcon.resources.dll differ diff --git a/HE-Test_Dll/bin/Debug/en/hedvalcon.resources.dll b/HE-Test_Dll/bin/Debug/en/hedvalcon.resources.dll index d504ba3..1480842 100644 Binary files a/HE-Test_Dll/bin/Debug/en/hedvalcon.resources.dll and b/HE-Test_Dll/bin/Debug/en/hedvalcon.resources.dll differ diff --git a/HE-Test_Dll/bin/Debug/hedvalcon.dll b/HE-Test_Dll/bin/Debug/hedvalcon.dll index e72eaee..0915b64 100644 Binary files a/HE-Test_Dll/bin/Debug/hedvalcon.dll and b/HE-Test_Dll/bin/Debug/hedvalcon.dll differ diff --git a/HE-Test_Dll/bin/Debug/hedvalcon.pdb b/HE-Test_Dll/bin/Debug/hedvalcon.pdb index 9d90ffe..6ffdbe6 100644 Binary files a/HE-Test_Dll/bin/Debug/hedvalcon.pdb and b/HE-Test_Dll/bin/Debug/hedvalcon.pdb differ diff --git a/HE-Test_Dll/obj/Debug/HE-Test_Dll.exe b/HE-Test_Dll/obj/Debug/HE-Test_Dll.exe index 68147cf..81f38ea 100644 Binary files a/HE-Test_Dll/obj/Debug/HE-Test_Dll.exe and b/HE-Test_Dll/obj/Debug/HE-Test_Dll.exe differ diff --git a/HE-Test_Dll/obj/Debug/HE-Test_Dll.pdb b/HE-Test_Dll/obj/Debug/HE-Test_Dll.pdb index 152f4dd..8474fd5 100644 Binary files a/HE-Test_Dll/obj/Debug/HE-Test_Dll.pdb and b/HE-Test_Dll/obj/Debug/HE-Test_Dll.pdb differ diff --git a/HE-Test_Dll/obj/Debug/HE-Test_DuoValueControl.csproj.AssemblyReference.cache b/HE-Test_Dll/obj/Debug/HE-Test_DuoValueControl.csproj.AssemblyReference.cache index e940689..3b93874 100644 Binary files a/HE-Test_Dll/obj/Debug/HE-Test_DuoValueControl.csproj.AssemblyReference.cache and b/HE-Test_Dll/obj/Debug/HE-Test_DuoValueControl.csproj.AssemblyReference.cache differ diff --git a/HE-Test_Dll/obj/Debug/HE-Test_DuoValueControl.csproj.GenerateResource.cache b/HE-Test_Dll/obj/Debug/HE-Test_DuoValueControl.csproj.GenerateResource.cache index b417364..b4a7022 100644 Binary files a/HE-Test_Dll/obj/Debug/HE-Test_DuoValueControl.csproj.GenerateResource.cache and b/HE-Test_Dll/obj/Debug/HE-Test_DuoValueControl.csproj.GenerateResource.cache differ