diff --git a/.vs/TripleValueControlGrafic/FileContentIndex/337e7ff7-b2b4-4d6a-9c8f-06c1202637ab.vsidx b/.vs/TripleValueControlGrafic/FileContentIndex/1781e2c1-904f-4066-8629-ebe934804360.vsidx similarity index 56% rename from .vs/TripleValueControlGrafic/FileContentIndex/337e7ff7-b2b4-4d6a-9c8f-06c1202637ab.vsidx rename to .vs/TripleValueControlGrafic/FileContentIndex/1781e2c1-904f-4066-8629-ebe934804360.vsidx index c0ddba9..7f919c4 100644 Binary files a/.vs/TripleValueControlGrafic/FileContentIndex/337e7ff7-b2b4-4d6a-9c8f-06c1202637ab.vsidx and b/.vs/TripleValueControlGrafic/FileContentIndex/1781e2c1-904f-4066-8629-ebe934804360.vsidx differ diff --git a/.vs/TripleValueControlGrafic/FileContentIndex/473e02f5-2f6a-4ba8-8075-1bc1cbee2954.vsidx b/.vs/TripleValueControlGrafic/FileContentIndex/473e02f5-2f6a-4ba8-8075-1bc1cbee2954.vsidx new file mode 100644 index 0000000..67fafea Binary files /dev/null and b/.vs/TripleValueControlGrafic/FileContentIndex/473e02f5-2f6a-4ba8-8075-1bc1cbee2954.vsidx differ diff --git a/.vs/TripleValueControlGrafic/FileContentIndex/56f865c1-7c7e-4230-82b3-2b0a03af3816.vsidx b/.vs/TripleValueControlGrafic/FileContentIndex/56f865c1-7c7e-4230-82b3-2b0a03af3816.vsidx deleted file mode 100644 index 5d7e4ad..0000000 Binary files a/.vs/TripleValueControlGrafic/FileContentIndex/56f865c1-7c7e-4230-82b3-2b0a03af3816.vsidx and /dev/null differ diff --git a/.vs/TripleValueControlGrafic/v17/.suo b/.vs/TripleValueControlGrafic/v17/.suo index 65a826a..83274a6 100644 Binary files a/.vs/TripleValueControlGrafic/v17/.suo and b/.vs/TripleValueControlGrafic/v17/.suo differ diff --git a/HE-Test_Dll/Form1.cs b/HE-Test_Dll/Form1.cs index e85e63b..a4f911c 100644 --- a/HE-Test_Dll/Form1.cs +++ b/HE-Test_Dll/Form1.cs @@ -133,7 +133,7 @@ namespace HE_Test_Dll tripleValueControl.TableAttributeName = "MyAttribut"; //tripleValueControl.AlwaysEncrypted = true; //Alle Werte werden immer Verschlüsselt tripleValueControl.SetDialogWidth(600); //Der Dialog kann zwischen 316 und 800 breit sein - tripleValueControl.DialogHeight = 300; //Der Dialog kann zwischen 227 und 600 hoch sein + tripleValueControl.SetDialogHeight(300); //Der Dialog kann zwischen 227 und 600 hoch sein tripleValueControl.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 7241c92..2ff68ee 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 d541482..40dea45 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/hetvalcon.resources.dll b/HE-Test_Dll/bin/Debug/de/hetvalcon.resources.dll index 12faa2f..d7925e7 100644 Binary files a/HE-Test_Dll/bin/Debug/de/hetvalcon.resources.dll and b/HE-Test_Dll/bin/Debug/de/hetvalcon.resources.dll differ diff --git a/HE-Test_Dll/bin/Debug/en/hetvalcon.resources.dll b/HE-Test_Dll/bin/Debug/en/hetvalcon.resources.dll index 0648584..0b89c57 100644 Binary files a/HE-Test_Dll/bin/Debug/en/hetvalcon.resources.dll and b/HE-Test_Dll/bin/Debug/en/hetvalcon.resources.dll differ diff --git a/HE-Test_Dll/bin/Debug/hetvalcon.dll b/HE-Test_Dll/bin/Debug/hetvalcon.dll index 462a138..6404b73 100644 Binary files a/HE-Test_Dll/bin/Debug/hetvalcon.dll and b/HE-Test_Dll/bin/Debug/hetvalcon.dll differ diff --git a/HE-Test_Dll/bin/Debug/hetvalcon.pdb b/HE-Test_Dll/bin/Debug/hetvalcon.pdb index 81b314e..ecdeb6e 100644 Binary files a/HE-Test_Dll/bin/Debug/hetvalcon.pdb and b/HE-Test_Dll/bin/Debug/hetvalcon.pdb differ diff --git a/HE-Test_Dll/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/HE-Test_Dll/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 52fb23e..0880976 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 7241c92..2ff68ee 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 d541482..40dea45 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_TripleValueControlGrafic.csproj.AssemblyReference.cache b/HE-Test_Dll/obj/Debug/HE-Test_TripleValueControlGrafic.csproj.AssemblyReference.cache index dd863cf..6ebd1c9 100644 Binary files a/HE-Test_Dll/obj/Debug/HE-Test_TripleValueControlGrafic.csproj.AssemblyReference.cache and b/HE-Test_Dll/obj/Debug/HE-Test_TripleValueControlGrafic.csproj.AssemblyReference.cache differ diff --git a/TripleValueControlGrafic/TripleValueControl.cs b/TripleValueControlGrafic/TripleValueControl.cs index 7aacc37..4556b72 100644 --- a/TripleValueControlGrafic/TripleValueControl.cs +++ b/TripleValueControlGrafic/TripleValueControl.cs @@ -228,16 +228,6 @@ namespace Eugen.ESystem.Windows.Forms set { dataGridViewValues.Columns[2].HeaderText = value; } } - /// - /// Adjusts the width of the control. An empty value forces the default value - /// - public int DialogWidth { set; get; } - - /// - /// Adjusts the height of the control. An empty value forces the default value - /// - public int DialogHeight { set; get; } - /// /// Adjusts the width of the name column of the table. An empty value forces the default value /// @@ -252,6 +242,16 @@ namespace Eugen.ESystem.Windows.Forms private int rowIndexColored = 0; private bool onlyRefresh = false; private int StandardValue { get; set; } + + /// + /// Adjusts the width of the control. An empty value forces the default value + /// + private int DialogWidth { set; get; } + + /// + /// Adjusts the height of the control. An empty value forces the default value + /// + private int DialogHeight { set; get; } #endregion private void InitializeUserControl() @@ -435,42 +435,6 @@ namespace Eugen.ESystem.Windows.Forms private void LoadXML() { - //controlPanelControl.CheckBoxEncryptStatusSelected = false; - - //var loadXML = new LoadXML(); - //loadXML.FileName = XMLfileName; - //loadXML.Load(); - //string[] values = new string[loadXML.Values.Length]; - //values = loadXML.Values; - //string[] attributes = new string[loadXML.Attributes.Length]; - //attributes = loadXML.Attributes; - - //if (!String.IsNullOrEmpty(Group)) - //{ - // loadXML.Group = Group; - //} - - //for (int i = 0; i < values.Length; i++) - //{ - // if (values[i].StartsWith("$$$$")) - // { - // values[i] = Decrypt(values[i], Password); - // controlPanelControl.CheckBoxEncryptStatusSelected = true; //Wenn ein verschlüsseltes Element gefunden wurde, dann setzen - // } - - // if (attributes[i].StartsWith("$$$$")) - // { - // attributes[i] = Decrypt(attributes[i], Password); - // controlPanelControl.CheckBoxEncryptStatusSelected = true; //Wenn ein verschlüsseltes Element gefunden wurde, dann setzen - // } - - // dataGridViewValues.Rows.Add(loadXML.Keys[i], values[i], attributes[i]); - //} - - //dataGridViewValues.Refresh(); - - //textBoxGroup.Text = loadXML.Group; //Gruppe setzen - controlPanelControl.CheckBoxEncryptStatusSelected = false; var loadXML = new LoadXML(); @@ -594,7 +558,7 @@ namespace Eugen.ESystem.Windows.Forms } } - private void SetDialogHeight(int height) + public void SetDialogHeight(int height) { if (height >= this.MinimumSize.Height && height <= this.MaximumSize.Height) { diff --git a/TripleValueControlGrafic/bin/Debug/de/hetvalcon.resources.dll b/TripleValueControlGrafic/bin/Debug/de/hetvalcon.resources.dll index 12faa2f..d7925e7 100644 Binary files a/TripleValueControlGrafic/bin/Debug/de/hetvalcon.resources.dll and b/TripleValueControlGrafic/bin/Debug/de/hetvalcon.resources.dll differ diff --git a/TripleValueControlGrafic/bin/Debug/en/hetvalcon.resources.dll b/TripleValueControlGrafic/bin/Debug/en/hetvalcon.resources.dll index 0648584..0b89c57 100644 Binary files a/TripleValueControlGrafic/bin/Debug/en/hetvalcon.resources.dll and b/TripleValueControlGrafic/bin/Debug/en/hetvalcon.resources.dll differ diff --git a/TripleValueControlGrafic/bin/Debug/hetvalcon.dll b/TripleValueControlGrafic/bin/Debug/hetvalcon.dll index 462a138..6404b73 100644 Binary files a/TripleValueControlGrafic/bin/Debug/hetvalcon.dll and b/TripleValueControlGrafic/bin/Debug/hetvalcon.dll differ diff --git a/TripleValueControlGrafic/bin/Debug/hetvalcon.pdb b/TripleValueControlGrafic/bin/Debug/hetvalcon.pdb index 81b314e..ecdeb6e 100644 Binary files a/TripleValueControlGrafic/bin/Debug/hetvalcon.pdb and b/TripleValueControlGrafic/bin/Debug/hetvalcon.pdb differ diff --git a/TripleValueControlGrafic/obj/Debug/de/hetvalcon.resources.dll b/TripleValueControlGrafic/obj/Debug/de/hetvalcon.resources.dll index 12faa2f..d7925e7 100644 Binary files a/TripleValueControlGrafic/obj/Debug/de/hetvalcon.resources.dll and b/TripleValueControlGrafic/obj/Debug/de/hetvalcon.resources.dll differ diff --git a/TripleValueControlGrafic/obj/Debug/en/hetvalcon.resources.dll b/TripleValueControlGrafic/obj/Debug/en/hetvalcon.resources.dll index 0648584..0b89c57 100644 Binary files a/TripleValueControlGrafic/obj/Debug/en/hetvalcon.resources.dll and b/TripleValueControlGrafic/obj/Debug/en/hetvalcon.resources.dll differ diff --git a/TripleValueControlGrafic/obj/Debug/hetvalcon.dll b/TripleValueControlGrafic/obj/Debug/hetvalcon.dll index 462a138..6404b73 100644 Binary files a/TripleValueControlGrafic/obj/Debug/hetvalcon.dll and b/TripleValueControlGrafic/obj/Debug/hetvalcon.dll differ diff --git a/TripleValueControlGrafic/obj/Debug/hetvalcon.pdb b/TripleValueControlGrafic/obj/Debug/hetvalcon.pdb index 81b314e..ecdeb6e 100644 Binary files a/TripleValueControlGrafic/obj/Debug/hetvalcon.pdb and b/TripleValueControlGrafic/obj/Debug/hetvalcon.pdb differ