diff --git a/.vs/TruthTableControl/FileContentIndex/1e3e811f-2b93-46ed-862b-9fbe7b2b1914.vsidx b/.vs/TruthTableControl/FileContentIndex/1e3e811f-2b93-46ed-862b-9fbe7b2b1914.vsidx new file mode 100644 index 0000000..d721d2b Binary files /dev/null and b/.vs/TruthTableControl/FileContentIndex/1e3e811f-2b93-46ed-862b-9fbe7b2b1914.vsidx differ diff --git a/.vs/TruthTableControl/FileContentIndex/875d17ee-38ac-407a-8c5d-8caf853538f9.vsidx b/.vs/TruthTableControl/FileContentIndex/875d17ee-38ac-407a-8c5d-8caf853538f9.vsidx deleted file mode 100644 index a72386b..0000000 Binary files a/.vs/TruthTableControl/FileContentIndex/875d17ee-38ac-407a-8c5d-8caf853538f9.vsidx and /dev/null differ diff --git a/.vs/TruthTableControl/v17/.suo b/.vs/TruthTableControl/v17/.suo index 7ddb484..ff3dd5d 100644 Binary files a/.vs/TruthTableControl/v17/.suo and b/.vs/TruthTableControl/v17/.suo differ diff --git a/HE-Test_Dll/Form1.Designer.cs b/HE-Test_Dll/Form1.Designer.cs index 08b3d5a..933a01e 100644 --- a/HE-Test_Dll/Form1.Designer.cs +++ b/HE-Test_Dll/Form1.Designer.cs @@ -81,18 +81,26 @@ // this.truthTableControl.AlwaysEncrypted = false; this.truthTableControl.CheckBoxEncryptValueText = "Encrypt"; + this.truthTableControl.CleanUpButton = true; this.truthTableControl.Group = null; this.truthTableControl.GroupName = "Group"; this.truthTableControl.Groups = null; this.truthTableControl.InitialDirectory = "C:\\"; - this.truthTableControl.Location = new System.Drawing.Point(12, 13); - this.truthTableControl.MaximumSize = new System.Drawing.Size(1600, 227); + this.truthTableControl.InterfaceNxPortal = null; + this.truthTableControl.Location = new System.Drawing.Point(12, 12); + this.truthTableControl.MaximumSize = new System.Drawing.Size(1600, 460); + this.truthTableControl.MenuAction = null; + this.truthTableControl.MenuHelp = null; + this.truthTableControl.MenuInformations = null; + this.truthTableControl.MenuPreferences = null; + this.truthTableControl.MenuTools = null; this.truthTableControl.MinimumSize = new System.Drawing.Size(1100, 227); + this.truthTableControl.MoveButtons = true; this.truthTableControl.Name = "truthTableControl"; this.truthTableControl.Password = null; - this.truthTableControl.Size = new System.Drawing.Size(1200, 227); + this.truthTableControl.Size = new System.Drawing.Size(1110, 354); this.truthTableControl.TabIndex = 13; - this.truthTableControl.TableKeyName = "Variable Name"; + this.truthTableControl.TableKeyName = "Function"; this.truthTableControl.TableValue1_1Name = "Visible"; this.truthTableControl.TableValue1_2Name = "Enable"; this.truthTableControl.TableValue2_1Name = "Visible"; @@ -110,6 +118,14 @@ this.truthTableControl.TableValue8_1Name = "Visible"; this.truthTableControl.TableValue8_2Name = "Enable"; this.truthTableControl.Topic = "Topic"; + this.truthTableControl.User1Label = "Administrator"; + this.truthTableControl.User2Label = "Developer"; + this.truthTableControl.User3Label = "Key User"; + this.truthTableControl.User4Label = "Advanced User"; + this.truthTableControl.User5Label = "User"; + this.truthTableControl.User6Label = "Trainee"; + this.truthTableControl.User7Label = "Guest"; + this.truthTableControl.User8Label = "Supplier"; this.truthTableControl.ValueControlName = "Value control"; this.truthTableControl.XMLfileName = null; this.truthTableControl.XMLgroupFileName = null; @@ -118,7 +134,7 @@ // this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F); this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font; - this.ClientSize = new System.Drawing.Size(1222, 450); + this.ClientSize = new System.Drawing.Size(1134, 450); this.Controls.Add(this.truthTableControl); this.Controls.Add(this.groupBoxProgramInfo); this.Controls.Add(this.groupBoxDLLInfo); diff --git a/HE-Test_Dll/bin/Debug/HE-Test_Dll.exe b/HE-Test_Dll/bin/Debug/HE-Test_Dll.exe index 4472182..3a22938 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 402a900..fb6e176 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/hettabcon.resources.dll b/HE-Test_Dll/bin/Debug/de/hettabcon.resources.dll index c4ebf68..f531584 100644 Binary files a/HE-Test_Dll/bin/Debug/de/hettabcon.resources.dll and b/HE-Test_Dll/bin/Debug/de/hettabcon.resources.dll differ diff --git a/HE-Test_Dll/bin/Debug/en/hettabcon.resources.dll b/HE-Test_Dll/bin/Debug/en/hettabcon.resources.dll index e95edd9..12840c3 100644 Binary files a/HE-Test_Dll/bin/Debug/en/hettabcon.resources.dll and b/HE-Test_Dll/bin/Debug/en/hettabcon.resources.dll differ diff --git a/HE-Test_Dll/bin/Debug/hettabcon.dll b/HE-Test_Dll/bin/Debug/hettabcon.dll index 27257f7..7224c10 100644 Binary files a/HE-Test_Dll/bin/Debug/hettabcon.dll and b/HE-Test_Dll/bin/Debug/hettabcon.dll differ diff --git a/HE-Test_Dll/bin/Debug/hettabcon.pdb b/HE-Test_Dll/bin/Debug/hettabcon.pdb index 16f2545..c8e106e 100644 Binary files a/HE-Test_Dll/bin/Debug/hettabcon.pdb and b/HE-Test_Dll/bin/Debug/hettabcon.pdb differ diff --git a/HE-Test_Dll/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/HE-Test_Dll/obj/Debug/DesignTimeResolveAssemblyReferences.cache index b3b4190..39e5860 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 4472182..3a22938 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 402a900..fb6e176 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_TruthTableControl.csproj.AssemblyReference.cache b/HE-Test_Dll/obj/Debug/HE-Test_TruthTableControl.csproj.AssemblyReference.cache index 6dea7d2..3479772 100644 Binary files a/HE-Test_Dll/obj/Debug/HE-Test_TruthTableControl.csproj.AssemblyReference.cache and b/HE-Test_Dll/obj/Debug/HE-Test_TruthTableControl.csproj.AssemblyReference.cache differ diff --git a/HE-Test_Dll/obj/Debug/HE-Test_TruthTableControl.csproj.GenerateResource.cache b/HE-Test_Dll/obj/Debug/HE-Test_TruthTableControl.csproj.GenerateResource.cache index cfcf5ee..d118e77 100644 Binary files a/HE-Test_Dll/obj/Debug/HE-Test_TruthTableControl.csproj.GenerateResource.cache and b/HE-Test_Dll/obj/Debug/HE-Test_TruthTableControl.csproj.GenerateResource.cache differ diff --git a/TruthTableControl/TruthTableControl.Designer.cs b/TruthTableControl/TruthTableControl.Designer.cs index 74652b9..90f4229 100644 --- a/TruthTableControl/TruthTableControl.Designer.cs +++ b/TruthTableControl/TruthTableControl.Designer.cs @@ -47,9 +47,6 @@ this.buttonSave = new System.Windows.Forms.Button(); this.buttonLoad = new System.Windows.Forms.Button(); this.dataGridViewValues = new System.Windows.Forms.DataGridView(); - this.labelGroup = new System.Windows.Forms.Label(); - this.openFileDialog = new System.Windows.Forms.OpenFileDialog(); - this.saveFileDialog = new System.Windows.Forms.SaveFileDialog(); this.ColumnFunction = new System.Windows.Forms.DataGridViewTextBoxColumn(); this.ColumnAdminVisible = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.ColumnAdminEnable = new System.Windows.Forms.DataGridViewCheckBoxColumn(); @@ -67,6 +64,9 @@ this.ColumnGuestEnable = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.ColumnSupplierVisible = new System.Windows.Forms.DataGridViewCheckBoxColumn(); this.ColumnSupplierEnable = new System.Windows.Forms.DataGridViewCheckBoxColumn(); + this.labelGroup = new System.Windows.Forms.Label(); + this.openFileDialog = new System.Windows.Forms.OpenFileDialog(); + this.saveFileDialog = new System.Windows.Forms.SaveFileDialog(); this.groupBoxValueControl.SuspendLayout(); this.panelEncrypt.SuspendLayout(); ((System.ComponentModel.ISupportInitialize)(this.dataGridViewValues)).BeginInit(); @@ -162,6 +162,7 @@ // panelEncrypt // resources.ApplyResources(this.panelEncrypt, "panelEncrypt"); + this.panelEncrypt.BackColor = System.Drawing.Color.Transparent; this.panelEncrypt.Controls.Add(this.checkBoxEncryptValues); this.panelEncrypt.Name = "panelEncrypt"; // @@ -229,16 +230,6 @@ this.dataGridViewValues.RowsRemoved += new System.Windows.Forms.DataGridViewRowsRemovedEventHandler(this.dataGridViewValues_RowsRemoved); this.dataGridViewValues.KeyDown += new System.Windows.Forms.KeyEventHandler(this.dataGridViewValues_KeyDown); // - // labelGroup - // - resources.ApplyResources(this.labelGroup, "labelGroup"); - this.labelGroup.Name = "labelGroup"; - // - // openFileDialog - // - this.openFileDialog.FileName = "openFileDialog"; - resources.ApplyResources(this.openFileDialog, "openFileDialog"); - // // ColumnFunction // resources.ApplyResources(this.ColumnFunction, "ColumnFunction"); @@ -357,6 +348,16 @@ this.ColumnSupplierEnable.Resizable = System.Windows.Forms.DataGridViewTriState.True; this.ColumnSupplierEnable.SortMode = System.Windows.Forms.DataGridViewColumnSortMode.Automatic; // + // labelGroup + // + resources.ApplyResources(this.labelGroup, "labelGroup"); + this.labelGroup.Name = "labelGroup"; + // + // openFileDialog + // + this.openFileDialog.FileName = "openFileDialog"; + resources.ApplyResources(this.openFileDialog, "openFileDialog"); + // // TruthTableControl // resources.ApplyResources(this, "$this"); diff --git a/TruthTableControl/TruthTableControl.resx b/TruthTableControl/TruthTableControl.resx index 9e7f6b5..24dea1d 100644 --- a/TruthTableControl/TruthTableControl.resx +++ b/TruthTableControl/TruthTableControl.resx @@ -438,6 +438,15 @@ Top, Bottom, Right + + True + + + None + + + Left + True @@ -493,7 +502,7 @@ 10 - Top, Right + Bottom, Right Zoom @@ -927,18 +936,6 @@ 1200, 227 - - openFileDialog - - - System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - saveFileDialog - - - System.Windows.Forms.SaveFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - ColumnFunction @@ -1041,6 +1038,18 @@ System.Windows.Forms.DataGridViewCheckBoxColumn, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + openFileDialog + + + System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + saveFileDialog + + + System.Windows.Forms.SaveFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + TruthTableControl diff --git a/TruthTableControl/bin/Debug/de/hettabcon.resources.dll b/TruthTableControl/bin/Debug/de/hettabcon.resources.dll index c4ebf68..f531584 100644 Binary files a/TruthTableControl/bin/Debug/de/hettabcon.resources.dll and b/TruthTableControl/bin/Debug/de/hettabcon.resources.dll differ diff --git a/TruthTableControl/bin/Debug/en/hettabcon.resources.dll b/TruthTableControl/bin/Debug/en/hettabcon.resources.dll index e95edd9..12840c3 100644 Binary files a/TruthTableControl/bin/Debug/en/hettabcon.resources.dll and b/TruthTableControl/bin/Debug/en/hettabcon.resources.dll differ diff --git a/TruthTableControl/bin/Debug/hettabcon.dll b/TruthTableControl/bin/Debug/hettabcon.dll index 27257f7..7224c10 100644 Binary files a/TruthTableControl/bin/Debug/hettabcon.dll and b/TruthTableControl/bin/Debug/hettabcon.dll differ diff --git a/TruthTableControl/bin/Debug/hettabcon.pdb b/TruthTableControl/bin/Debug/hettabcon.pdb index 16f2545..c8e106e 100644 Binary files a/TruthTableControl/bin/Debug/hettabcon.pdb and b/TruthTableControl/bin/Debug/hettabcon.pdb differ diff --git a/TruthTableControl/obj/Debug/Eugen.ESystem.Windows.Forms.TruthTableControl.resources b/TruthTableControl/obj/Debug/Eugen.ESystem.Windows.Forms.TruthTableControl.resources index ee2a2b0..79b3aa8 100644 Binary files a/TruthTableControl/obj/Debug/Eugen.ESystem.Windows.Forms.TruthTableControl.resources and b/TruthTableControl/obj/Debug/Eugen.ESystem.Windows.Forms.TruthTableControl.resources differ diff --git a/TruthTableControl/obj/Debug/TruthTableControl.csproj.AssemblyReference.cache b/TruthTableControl/obj/Debug/TruthTableControl.csproj.AssemblyReference.cache index f72f9da..a4ed5a9 100644 Binary files a/TruthTableControl/obj/Debug/TruthTableControl.csproj.AssemblyReference.cache and b/TruthTableControl/obj/Debug/TruthTableControl.csproj.AssemblyReference.cache differ diff --git a/TruthTableControl/obj/Debug/TruthTableControl.csproj.GenerateResource.cache b/TruthTableControl/obj/Debug/TruthTableControl.csproj.GenerateResource.cache index adae95b..ad60e41 100644 Binary files a/TruthTableControl/obj/Debug/TruthTableControl.csproj.GenerateResource.cache and b/TruthTableControl/obj/Debug/TruthTableControl.csproj.GenerateResource.cache differ diff --git a/TruthTableControl/obj/Debug/de/hettabcon.resources.dll b/TruthTableControl/obj/Debug/de/hettabcon.resources.dll index c4ebf68..f531584 100644 Binary files a/TruthTableControl/obj/Debug/de/hettabcon.resources.dll and b/TruthTableControl/obj/Debug/de/hettabcon.resources.dll differ diff --git a/TruthTableControl/obj/Debug/en/hettabcon.resources.dll b/TruthTableControl/obj/Debug/en/hettabcon.resources.dll index e95edd9..12840c3 100644 Binary files a/TruthTableControl/obj/Debug/en/hettabcon.resources.dll and b/TruthTableControl/obj/Debug/en/hettabcon.resources.dll differ diff --git a/TruthTableControl/obj/Debug/hettabcon.dll b/TruthTableControl/obj/Debug/hettabcon.dll index 27257f7..7224c10 100644 Binary files a/TruthTableControl/obj/Debug/hettabcon.dll and b/TruthTableControl/obj/Debug/hettabcon.dll differ diff --git a/TruthTableControl/obj/Debug/hettabcon.pdb b/TruthTableControl/obj/Debug/hettabcon.pdb index 16f2545..c8e106e 100644 Binary files a/TruthTableControl/obj/Debug/hettabcon.pdb and b/TruthTableControl/obj/Debug/hettabcon.pdb differ