diff --git a/TestGUI/Form1.Designer.vb b/TestGUI/Form1.Designer.vb index 9a7c16ee..ece45d55 100644 --- a/TestGUI/Form1.Designer.vb +++ b/TestGUI/Form1.Designer.vb @@ -22,6 +22,7 @@ Partial Class Form1 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(Form1)) Me.Button1 = New System.Windows.Forms.Button() Me.Button3 = New System.Windows.Forms.Button() Me.Label1 = New System.Windows.Forms.Label() @@ -43,7 +44,7 @@ Partial Class Form1 Me.TextBox1 = New System.Windows.Forms.TextBox() Me.Label6 = New System.Windows.Forms.Label() Me.Button4 = New System.Windows.Forms.Button() - Me.Grid1 = New DigitalData.Controls.LookupGrid.Grid() + Me.LookupControl1 = New DigitalData.Controls.LookupGrid.LookupControl() CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -229,23 +230,24 @@ Partial Class Form1 Me.Button4.Text = "Test Background Worker Logging" Me.Button4.UseVisualStyleBackColor = True ' - 'Grid1 + 'LookupControl1 ' - Me.Grid1.AutoSize = True - Me.Grid1.BackColor = System.Drawing.Color.Transparent - Me.Grid1.DataSource = Nothing - Me.Grid1.Location = New System.Drawing.Point(686, 214) - Me.Grid1.Name = "Grid1" - Me.Grid1.SelectedValues = Nothing - Me.Grid1.Size = New System.Drawing.Size(270, 24) - Me.Grid1.TabIndex = 23 + Me.LookupControl1.AutoSize = True + Me.LookupControl1.BackColor = System.Drawing.Color.Transparent + Me.LookupControl1.DataSource = Nothing + Me.LookupControl1.Location = New System.Drawing.Point(695, 214) + Me.LookupControl1.MultiSelect = True + Me.LookupControl1.Name = "LookupControl1" + Me.LookupControl1.SelectedValues = CType(resources.GetObject("LookupControl1.SelectedValues"), System.Collections.Generic.List(Of String)) + Me.LookupControl1.Size = New System.Drawing.Size(270, 23) + Me.LookupControl1.TabIndex = 23 ' 'Form1 ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(1050, 487) - Me.Controls.Add(Me.Grid1) + Me.Controls.Add(Me.LookupControl1) Me.Controls.Add(Me.Button4) Me.Controls.Add(Me.Label6) Me.Controls.Add(Me.TextBox1) @@ -297,5 +299,5 @@ Partial Class Form1 Friend WithEvents TextBox1 As TextBox Friend WithEvents Label6 As Label Friend WithEvents Button4 As Button - Friend WithEvents Grid1 As DigitalData.Controls.LookupGrid.Grid + Friend WithEvents LookupControl1 As DigitalData.Controls.LookupGrid.LookupControl End Class diff --git a/TestGUI/Form1.resx b/TestGUI/Form1.resx index 1af7de15..7a53cff0 100644 --- a/TestGUI/Form1.resx +++ b/TestGUI/Form1.resx @@ -117,4 +117,13 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + AAEAAAD/////AQAAAAAAAAAMAgAAAJoBbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1u + ZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0sIG1zY29ybGliLCBWZXJzaW9u + PTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OQUB + AAAAMFN5c3RlbS5Db2xsZWN0aW9ucy5HZW5lcmljLkxpc3RgMVtbU3lzdGVtLlN0cmluZwMAAAAGX2l0 + ZW1zBV9zaXplCF92ZXJzaW9uBgAACAgCAAAACQMAAAAAAAAAAAAAABEDAAAAAAAAAAs= + + \ No newline at end of file diff --git a/TestGUI/My Project/licenses.licx b/TestGUI/My Project/licenses.licx index 824a99fc..48e01e50 100644 --- a/TestGUI/My Project/licenses.licx +++ b/TestGUI/My Project/licenses.licx @@ -1 +1,2 @@ DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/TestGUI/TestGUI.vbproj b/TestGUI/TestGUI.vbproj index 05e422c8..5c07f2f3 100644 --- a/TestGUI/TestGUI.vbproj +++ b/TestGUI/TestGUI.vbproj @@ -54,6 +54,10 @@ + + False + bin\Debug\DigitalData.Controls.LookupGrid.dll + ..\packages\NLog.4.5.10\lib\net45\NLog.dll