diff --git a/.vs/DuoMultiValueControl/FileContentIndex/40b4718f-75c3-4e5d-ba3d-4763388171bd.vsidx b/.vs/DuoMultiValueControl/FileContentIndex/40b4718f-75c3-4e5d-ba3d-4763388171bd.vsidx new file mode 100644 index 0000000..29fd8a0 Binary files /dev/null and b/.vs/DuoMultiValueControl/FileContentIndex/40b4718f-75c3-4e5d-ba3d-4763388171bd.vsidx differ diff --git a/.vs/DuoMultiValueControl/FileContentIndex/d144c7be-3417-4502-a0a1-04a29ae36b4b.vsidx b/.vs/DuoMultiValueControl/FileContentIndex/40b62192-35c5-418e-99c0-e1e567a54a14.vsidx similarity index 100% rename from .vs/DuoMultiValueControl/FileContentIndex/d144c7be-3417-4502-a0a1-04a29ae36b4b.vsidx rename to .vs/DuoMultiValueControl/FileContentIndex/40b62192-35c5-418e-99c0-e1e567a54a14.vsidx diff --git a/.vs/DuoMultiValueControl/FileContentIndex/a587b5ae-cf03-42b0-8123-a4f7db0bd1ee.vsidx b/.vs/DuoMultiValueControl/FileContentIndex/a587b5ae-cf03-42b0-8123-a4f7db0bd1ee.vsidx deleted file mode 100644 index 06dd33b..0000000 Binary files a/.vs/DuoMultiValueControl/FileContentIndex/a587b5ae-cf03-42b0-8123-a4f7db0bd1ee.vsidx and /dev/null differ diff --git a/.vs/DuoMultiValueControl/v17/.suo b/.vs/DuoMultiValueControl/v17/.suo index 7bc00bb..465706e 100644 Binary files a/.vs/DuoMultiValueControl/v17/.suo and b/.vs/DuoMultiValueControl/v17/.suo differ diff --git a/DuoMultiValueControl/DuoMultiValueControl.Designer.cs b/DuoMultiValueControl/DuoMultiValueControl.Designer.cs index a68bff7..81cef66 100644 --- a/DuoMultiValueControl/DuoMultiValueControl.Designer.cs +++ b/DuoMultiValueControl/DuoMultiValueControl.Designer.cs @@ -92,7 +92,7 @@ this.labelGroup2.Name = "labelGroup2"; this.labelGroup2.Size = new System.Drawing.Size(97, 13); this.labelGroup2.TabIndex = 14; - this.labelGroup2.Text = "Group1 2"; + this.labelGroup2.Text = "Group2"; // // buttonCleanup // @@ -222,7 +222,7 @@ this.labelGroup1.Name = "labelGroup1"; this.labelGroup1.Size = new System.Drawing.Size(97, 13); this.labelGroup1.TabIndex = 0; - this.labelGroup1.Text = "Group1 1"; + this.labelGroup1.Text = "Group1"; // // openFileDialog // diff --git a/DuoMultiValueControl/DuoMultiValueControl.cs b/DuoMultiValueControl/DuoMultiValueControl.cs index ca85312..d626ddf 100644 --- a/DuoMultiValueControl/DuoMultiValueControl.cs +++ b/DuoMultiValueControl/DuoMultiValueControl.cs @@ -260,8 +260,18 @@ namespace Eugen.ESystem.Windows.Forms set { alwaysEncrypted = value; - checkBoxEncryptValues.Enabled = !alwaysEncrypted; - checkBoxEncryptValues.Checked = alwaysEncrypted; + } + } + + /// + /// Controls whether values are never encrypted. An empty value forces the default value (false). True always dectivates 'AlwaysEncrypted' + /// + public bool NeverEncrypted + { + get { return neverEncrypted; } + set + { + neverEncrypted = value; } } #endregion @@ -269,6 +279,7 @@ namespace Eugen.ESystem.Windows.Forms #region Private values private string password; private bool alwaysEncrypted = false; + private bool neverEncrypted = false; private bool standardValueSet = false; private int selectedRow = 0; private int rowIndexColored = 0; @@ -607,6 +618,7 @@ namespace Eugen.ESystem.Windows.Forms public void SetBasicValues() { + //'Groups1' mit Werten befüllen Groups1 = ReadGroups(XMLgroup1FileName); if (Groups1 != null) @@ -620,6 +632,7 @@ namespace Eugen.ESystem.Windows.Forms comboBoxGroup1.SelectedIndex = 0; } + //'Groups2' mit Werten befüllen Groups2 = ReadGroups(XMLgroup2FileName); if (Groups2 != null) @@ -632,6 +645,17 @@ namespace Eugen.ESystem.Windows.Forms comboBoxGroup2.SelectedIndex = 0; } + + // 'checkBoxEncryptValues' entsprechend der übergebenen Parameter setzen + if (neverEncrypted) + { + checkBoxEncryptValues.Visible = !neverEncrypted; + } + else + { + checkBoxEncryptValues.Checked = alwaysEncrypted; + checkBoxEncryptValues.Enabled = !alwaysEncrypted; + } } private void LoadXML() diff --git a/DuoMultiValueControl/bin/Debug/de/hedmvalcon.resources.dll b/DuoMultiValueControl/bin/Debug/de/hedmvalcon.resources.dll index 3d1a2fa..31da8a0 100644 Binary files a/DuoMultiValueControl/bin/Debug/de/hedmvalcon.resources.dll and b/DuoMultiValueControl/bin/Debug/de/hedmvalcon.resources.dll differ diff --git a/DuoMultiValueControl/bin/Debug/en/hedmvalcon.resources.dll b/DuoMultiValueControl/bin/Debug/en/hedmvalcon.resources.dll index c1391cf..4a9243a 100644 Binary files a/DuoMultiValueControl/bin/Debug/en/hedmvalcon.resources.dll and b/DuoMultiValueControl/bin/Debug/en/hedmvalcon.resources.dll differ diff --git a/DuoMultiValueControl/bin/Debug/hedmvalcon.dll b/DuoMultiValueControl/bin/Debug/hedmvalcon.dll index 88d1e26..7a1e0a0 100644 Binary files a/DuoMultiValueControl/bin/Debug/hedmvalcon.dll and b/DuoMultiValueControl/bin/Debug/hedmvalcon.dll differ diff --git a/DuoMultiValueControl/bin/Debug/hedmvalcon.pdb b/DuoMultiValueControl/bin/Debug/hedmvalcon.pdb index 467b9f2..982f2f6 100644 Binary files a/DuoMultiValueControl/bin/Debug/hedmvalcon.pdb and b/DuoMultiValueControl/bin/Debug/hedmvalcon.pdb differ diff --git a/DuoMultiValueControl/obj/Debug/DuoMultiValueControl.csproj.GenerateResource.cache b/DuoMultiValueControl/obj/Debug/DuoMultiValueControl.csproj.GenerateResource.cache index 5c8ee6f..1a0a2df 100644 Binary files a/DuoMultiValueControl/obj/Debug/DuoMultiValueControl.csproj.GenerateResource.cache and b/DuoMultiValueControl/obj/Debug/DuoMultiValueControl.csproj.GenerateResource.cache differ diff --git a/DuoMultiValueControl/obj/Debug/de/hedmvalcon.resources.dll b/DuoMultiValueControl/obj/Debug/de/hedmvalcon.resources.dll index 3d1a2fa..31da8a0 100644 Binary files a/DuoMultiValueControl/obj/Debug/de/hedmvalcon.resources.dll and b/DuoMultiValueControl/obj/Debug/de/hedmvalcon.resources.dll differ diff --git a/DuoMultiValueControl/obj/Debug/en/hedmvalcon.resources.dll b/DuoMultiValueControl/obj/Debug/en/hedmvalcon.resources.dll index c1391cf..4a9243a 100644 Binary files a/DuoMultiValueControl/obj/Debug/en/hedmvalcon.resources.dll and b/DuoMultiValueControl/obj/Debug/en/hedmvalcon.resources.dll differ diff --git a/DuoMultiValueControl/obj/Debug/hedmvalcon.dll b/DuoMultiValueControl/obj/Debug/hedmvalcon.dll index 88d1e26..7a1e0a0 100644 Binary files a/DuoMultiValueControl/obj/Debug/hedmvalcon.dll and b/DuoMultiValueControl/obj/Debug/hedmvalcon.dll differ diff --git a/DuoMultiValueControl/obj/Debug/hedmvalcon.pdb b/DuoMultiValueControl/obj/Debug/hedmvalcon.pdb index 467b9f2..982f2f6 100644 Binary files a/DuoMultiValueControl/obj/Debug/hedmvalcon.pdb and b/DuoMultiValueControl/obj/Debug/hedmvalcon.pdb differ diff --git a/HE-Test_Dll/Form1.cs b/HE-Test_Dll/Form1.cs index f7f49a3..0c9318d 100644 --- a/HE-Test_Dll/Form1.cs +++ b/HE-Test_Dll/Form1.cs @@ -137,6 +137,7 @@ namespace HE_Test_Dll1 duoMultiValueControl.TableKeyName = "MyVarName"; duoMultiValueControl.TableValueName = "MyValue"; //duoMultiValueControl.AlwaysEncrypted = true; //Alle Werte werden immer Verschlüsselt + //duoMultiValueControl.NeverEncrypted = true; //Alle Werte werden nie Verschlüsselt duoMultiValueControl.SetDialogWidth(600); //Der Dialog kann zwischen 316 und 800 breit sein duoMultiValueControl.SetDialogHeight(300); //Der Dialog kann zwischen 227 und 460 hoch sein duoMultiValueControl.SetBasicValues(); //Die übergebenen Werte anzeigen diff --git a/HE-Test_Dll/bin/Debug/HE-Test_Dll.exe b/HE-Test_Dll/bin/Debug/HE-Test_Dll.exe index 97623da..a029f3c 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 c98d6f7..97274bb 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/hedmvalcon.resources.dll b/HE-Test_Dll/bin/Debug/de/hedmvalcon.resources.dll index 3d1a2fa..7d4f35c 100644 Binary files a/HE-Test_Dll/bin/Debug/de/hedmvalcon.resources.dll and b/HE-Test_Dll/bin/Debug/de/hedmvalcon.resources.dll differ diff --git a/HE-Test_Dll/bin/Debug/en/hedmvalcon.resources.dll b/HE-Test_Dll/bin/Debug/en/hedmvalcon.resources.dll index c1391cf..6414646 100644 Binary files a/HE-Test_Dll/bin/Debug/en/hedmvalcon.resources.dll and b/HE-Test_Dll/bin/Debug/en/hedmvalcon.resources.dll differ diff --git a/HE-Test_Dll/bin/Debug/hedmvalcon.dll b/HE-Test_Dll/bin/Debug/hedmvalcon.dll index 88d1e26..8513888 100644 Binary files a/HE-Test_Dll/bin/Debug/hedmvalcon.dll and b/HE-Test_Dll/bin/Debug/hedmvalcon.dll differ diff --git a/HE-Test_Dll/bin/Debug/hedmvalcon.pdb b/HE-Test_Dll/bin/Debug/hedmvalcon.pdb index 467b9f2..66d351c 100644 Binary files a/HE-Test_Dll/bin/Debug/hedmvalcon.pdb and b/HE-Test_Dll/bin/Debug/hedmvalcon.pdb differ diff --git a/HE-Test_Dll/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/HE-Test_Dll/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 99498eb..fba62af 100644 Binary files a/HE-Test_Dll/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/HE-Test_Dll/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/HE-Test_Dll/obj/Debug/HE-Test_Dll.exe b/HE-Test_Dll/obj/Debug/HE-Test_Dll.exe index 97623da..a029f3c 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 c98d6f7..97274bb 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_DuoMultiValueControl.csproj.AssemblyReference.cache b/HE-Test_Dll/obj/Debug/HE-Test_DuoMultiValueControl.csproj.AssemblyReference.cache index cf1eda0..4a21c4f 100644 Binary files a/HE-Test_Dll/obj/Debug/HE-Test_DuoMultiValueControl.csproj.AssemblyReference.cache and b/HE-Test_Dll/obj/Debug/HE-Test_DuoMultiValueControl.csproj.AssemblyReference.cache differ