From 6e5d1f57210607a43d4dd5121e3b80f07a69c92e Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Fri, 26 Mar 2021 16:40:39 +0100 Subject: [PATCH] LookupGrid: Hopefully fix the fProperties shit --- Controls.LookupGrid/LookupControl3.vb | 45 ++++-- GUIs.Test.TestGUI/My Project/licenses.licx | 4 +- GUIs.Test.TestGUI/frmLookup.Designer.vb | 164 +++------------------ GUIs.Test.TestGUI/frmLookup.resx | 18 --- GUIs.Test.TestGUI/frmLookup.vb | 40 +---- 5 files changed, 65 insertions(+), 206 deletions(-) diff --git a/Controls.LookupGrid/LookupControl3.vb b/Controls.LookupGrid/LookupControl3.vb index 3e54fa45..e092eb70 100644 --- a/Controls.LookupGrid/LookupControl3.vb +++ b/Controls.LookupGrid/LookupControl3.vb @@ -32,12 +32,19 @@ Public Class LookupControl3 Public Sub New() End Sub + + Private Sub InitializeComponent() + End Sub End Class Public Class RepositoryItemLookupControl3 Inherits RepositoryItemGridLookUpEdit + Public Sub PopupFIlter() Handles Me.BeforePopup + + End Sub + Shared Sub New() RegisterLookupControl() End Sub @@ -62,6 +69,8 @@ Public Class RepositoryItemLookupControl3 Public Delegate Sub SelectedValuesChangedHandler(sender As Object, SelectedValues As List(Of String)) Public Event SelectedValuesChanged As SelectedValuesChangedHandler + Private _OriginalDatasource As DataTable + Public Overrides ReadOnly Property EditorTypeName As String Get Return CustomEditName @@ -97,11 +106,14 @@ Public Class RepositoryItemLookupControl3 End Set End Property - Protected Overrides Sub RaiseQueryPopUp(e As CancelEventArgs) - If MultiSelect = False Then - e.Cancel = True - End If - End Sub + Public Overloads Property Datasource As DataTable + Get + Return _OriginalDatasource + End Get + Set(value As DataTable) + _OriginalDatasource = value + End Set + End Property Public Shared Sub RegisterLookupControl() Dim img As Image = Nothing @@ -174,16 +186,10 @@ Public Class RepositoryItemLookupControl3 End Sub Public Overrides Sub CreateDefaultButton() - If MultiSelect Then - MyBase.CreateDefaultButton() - Buttons.Item(0).Tag = TAG_DROPDOWN - ActionButtonIndex = 0 - End If - Dim oLookupFormButtonm = New EditorButton() With { .Kind = ButtonPredefines.Search, .Tag = TAG_BUTTON_LOOKUP_FORM, - .Width = 20 + .Width = 25 } Buttons.AddRange({oLookupFormButtonm}) @@ -194,7 +200,7 @@ Public Class RepositoryItemLookupControl3 .MultiSelect = MultiSelect, .AddNewValues = AllowAddNewValues, .PreventDuplicates = PreventDuplicates, - .DataSource = DataSource, + .DataSource = _OriginalDatasource, .SelectedValues = SelectedValues, .StartPosition = FormStartPosition.Manual, .Location = OwnerEdit.PointToScreen(New Point(OwnerEdit.Width, 0)) @@ -236,4 +242,17 @@ Public Class RepositoryItemLookupControl3 e.Cancel = True End If End Sub + + Protected Overrides Sub RaiseQueryPopUp(e As CancelEventArgs) + If MultiSelect = False Then + e.Cancel = True + End If + End Sub + + Private Sub RepositoryItemLookupControl3_Popup(sender As Object, e As EventArgs) Handles Me.Popup + + End Sub + + + End Class diff --git a/GUIs.Test.TestGUI/My Project/licenses.licx b/GUIs.Test.TestGUI/My Project/licenses.licx index f2a4df50..c0ffb89a 100644 --- a/GUIs.Test.TestGUI/My Project/licenses.licx +++ b/GUIs.Test.TestGUI/My Project/licenses.licx @@ -1,4 +1,6 @@ +DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraWizard.WizardControl, DevExpress.XtraWizard.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/GUIs.Test.TestGUI/frmLookup.Designer.vb b/GUIs.Test.TestGUI/frmLookup.Designer.vb index f4b2ca5f..253ac206 100644 --- a/GUIs.Test.TestGUI/frmLookup.Designer.vb +++ b/GUIs.Test.TestGUI/frmLookup.Designer.vb @@ -1,9 +1,9 @@ - + _ Partial Class frmLookup Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - + _ Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,81 +20,44 @@ Partial Class frmLookup 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - + _ Private Sub InitializeComponent() - Dim EditorButtonImageOptions4 As DevExpress.XtraEditors.Controls.EditorButtonImageOptions = New DevExpress.XtraEditors.Controls.EditorButtonImageOptions() - Dim SerializableAppearanceObject13 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Dim SerializableAppearanceObject14 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Dim SerializableAppearanceObject15 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Dim SerializableAppearanceObject16 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmLookup)) Dim EditorButtonImageOptions1 As DevExpress.XtraEditors.Controls.EditorButtonImageOptions = New DevExpress.XtraEditors.Controls.EditorButtonImageOptions() Dim SerializableAppearanceObject1 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() Dim SerializableAppearanceObject2 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() Dim SerializableAppearanceObject3 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() Dim SerializableAppearanceObject4 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Dim EditorButtonImageOptions2 As DevExpress.XtraEditors.Controls.EditorButtonImageOptions = New DevExpress.XtraEditors.Controls.EditorButtonImageOptions() - Dim SerializableAppearanceObject5 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Dim SerializableAppearanceObject6 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Dim SerializableAppearanceObject7 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Dim SerializableAppearanceObject8 As DevExpress.Utils.SerializableAppearanceObject = New DevExpress.Utils.SerializableAppearanceObject() - Me.GridControl1 = New DevExpress.XtraGrid.GridControl() - Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.GridColumn1 = New DevExpress.XtraGrid.Columns.GridColumn() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmLookup)) + Me.LookUpEdit1 = New DevExpress.XtraEditors.LookUpEdit() Me.LookupControl31 = New DigitalData.Controls.LookupGrid.LookupControl3() Me.LookupControl31View = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.LookupControl32 = New DigitalData.Controls.LookupGrid.LookupControl3() - Me.GridView2 = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.LookupControl33 = New DigitalData.Controls.LookupGrid.LookupControl3() - Me.GridView3 = New DevExpress.XtraGrid.Views.Grid.GridView() - Me.Label1 = New System.Windows.Forms.Label() - Me.Label2 = New System.Windows.Forms.Label() - CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.LookUpEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LookupControl31.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LookupControl31View, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LookupControl32.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.LookupControl33.Properties, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.GridView3, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'GridControl1 - ' - Me.GridControl1.Location = New System.Drawing.Point(12, 12) - Me.GridControl1.MainView = Me.GridView1 - Me.GridControl1.Name = "GridControl1" - Me.GridControl1.Size = New System.Drawing.Size(452, 375) - Me.GridControl1.TabIndex = 1 - Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1}) - ' - 'GridView1 - ' - Me.GridView1.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.GridColumn1}) - Me.GridView1.GridControl = Me.GridControl1 - Me.GridView1.Name = "GridView1" + 'LookUpEdit1 ' - 'GridColumn1 - ' - Me.GridColumn1.Caption = "GridColumn1" - Me.GridColumn1.Name = "GridColumn1" - Me.GridColumn1.Visible = True - Me.GridColumn1.VisibleIndex = 0 + Me.LookUpEdit1.Location = New System.Drawing.Point(620, 40) + Me.LookUpEdit1.Name = "LookUpEdit1" + Me.LookUpEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.LookUpEdit1.Size = New System.Drawing.Size(100, 20) + Me.LookUpEdit1.TabIndex = 0 ' 'LookupControl31 ' - Me.LookupControl31.Location = New System.Drawing.Point(631, 12) + Me.LookupControl31.Location = New System.Drawing.Point(412, 40) Me.LookupControl31.Name = "LookupControl31" - Me.LookupControl31.Properties.ActionButtonIndex = 1 - Me.LookupControl31.Properties.AllowAddNewValues = True - Me.LookupControl31.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Search, "", 20, True, True, False, EditorButtonImageOptions4, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject13, SerializableAppearanceObject14, SerializableAppearanceObject15, SerializableAppearanceObject16, "", "openLookupForm", Nothing, DevExpress.Utils.ToolTipAnchor.[Default]), New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.LookupControl31.Properties.MultiSelect = True + Me.LookupControl31.Properties.AllowAddNewValues = False + Me.LookupControl31.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Search, "", 25, True, True, False, EditorButtonImageOptions1, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject1, SerializableAppearanceObject2, SerializableAppearanceObject3, SerializableAppearanceObject4, "", "openLookupForm", Nothing, DevExpress.Utils.ToolTipAnchor.[Default])}) + Me.LookupControl31.Properties.Datasource = Nothing + Me.LookupControl31.Properties.MultiSelect = False Me.LookupControl31.Properties.PopupView = Me.LookupControl31View Me.LookupControl31.Properties.PreventDuplicates = False Me.LookupControl31.Properties.ReadOnly = False Me.LookupControl31.Properties.SelectedValues = CType(resources.GetObject("LookupControl31.Properties.SelectedValues"), System.Collections.Generic.List(Of String)) - Me.LookupControl31.Size = New System.Drawing.Size(157, 20) - Me.LookupControl31.TabIndex = 2 + Me.LookupControl31.Size = New System.Drawing.Size(161, 20) + Me.LookupControl31.TabIndex = 1 ' 'LookupControl31View ' @@ -103,102 +66,23 @@ Partial Class frmLookup Me.LookupControl31View.OptionsSelection.EnableAppearanceFocusedCell = False Me.LookupControl31View.OptionsView.ShowGroupPanel = False ' - 'LookupControl32 - ' - Me.LookupControl32.Location = New System.Drawing.Point(631, 38) - Me.LookupControl32.Name = "LookupControl32" - Me.LookupControl32.Properties.ActionButtonIndex = 1 - Me.LookupControl32.Properties.AllowAddNewValues = True - Me.LookupControl32.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Search, "", 20, True, True, False, EditorButtonImageOptions1, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject1, SerializableAppearanceObject2, SerializableAppearanceObject3, SerializableAppearanceObject4, "", "openLookupForm", Nothing, DevExpress.Utils.ToolTipAnchor.[Default]), New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.LookupControl32.Properties.MultiSelect = True - Me.LookupControl32.Properties.PopupView = Me.GridView2 - Me.LookupControl32.Properties.PreventDuplicates = False - Me.LookupControl32.Properties.ReadOnly = False - Me.LookupControl32.Properties.SelectedValues = CType(resources.GetObject("LookupControl32.Properties.SelectedValues"), System.Collections.Generic.List(Of String)) - Me.LookupControl32.Size = New System.Drawing.Size(157, 20) - Me.LookupControl32.TabIndex = 2 - ' - 'GridView2 - ' - Me.GridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus - Me.GridView2.Name = "GridView2" - Me.GridView2.OptionsSelection.EnableAppearanceFocusedCell = False - Me.GridView2.OptionsView.ShowGroupPanel = False - ' - 'LookupControl33 - ' - Me.LookupControl33.Location = New System.Drawing.Point(631, 64) - Me.LookupControl33.Name = "LookupControl33" - Me.LookupControl33.Properties.ActionButtonIndex = 1 - Me.LookupControl33.Properties.AllowAddNewValues = True - Me.LookupControl33.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Search, "", 20, True, True, False, EditorButtonImageOptions2, New DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), SerializableAppearanceObject5, SerializableAppearanceObject6, SerializableAppearanceObject7, SerializableAppearanceObject8, "", "openLookupForm", Nothing, DevExpress.Utils.ToolTipAnchor.[Default]), New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) - Me.LookupControl33.Properties.MultiSelect = True - Me.LookupControl33.Properties.PopupView = Me.GridView3 - Me.LookupControl33.Properties.PreventDuplicates = False - Me.LookupControl33.Properties.ReadOnly = False - Me.LookupControl33.Properties.SelectedValues = CType(resources.GetObject("LookupControl33.Properties.SelectedValues"), System.Collections.Generic.List(Of String)) - Me.LookupControl33.Size = New System.Drawing.Size(157, 20) - Me.LookupControl33.TabIndex = 2 - ' - 'GridView3 - ' - Me.GridView3.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus - Me.GridView3.Name = "GridView3" - Me.GridView3.OptionsSelection.EnableAppearanceFocusedCell = False - Me.GridView3.OptionsView.ShowGroupPanel = False - ' - 'Label1 - ' - Me.Label1.AutoSize = True - Me.Label1.Location = New System.Drawing.Point(509, 15) - Me.Label1.Name = "Label1" - Me.Label1.Size = New System.Drawing.Size(93, 13) - Me.Label1.TabIndex = 3 - Me.Label1.Text = "MultiSelect = True" - ' - 'Label2 - ' - Me.Label2.AutoSize = True - Me.Label2.Location = New System.Drawing.Point(509, 41) - Me.Label2.Name = "Label2" - Me.Label2.Size = New System.Drawing.Size(96, 13) - Me.Label2.TabIndex = 3 - Me.Label2.Text = "MultiSelect = False" - ' 'frmLookup ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(800, 450) - Me.Controls.Add(Me.Label2) - Me.Controls.Add(Me.Label1) - Me.Controls.Add(Me.LookupControl33) - Me.Controls.Add(Me.LookupControl32) Me.Controls.Add(Me.LookupControl31) - Me.Controls.Add(Me.GridControl1) + Me.Controls.Add(Me.LookUpEdit1) Me.Name = "frmLookup" - Me.Text = "Form1" - CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() + Me.Text = "frmLookup" + CType(Me.LookUpEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LookupControl31.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LookupControl31View, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LookupControl32.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.LookupControl33.Properties, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.GridView3, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) - Me.PerformLayout() End Sub - Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl - Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents GridColumn1 As DevExpress.XtraGrid.Columns.GridColumn + + Friend WithEvents LookUpEdit1 As DevExpress.XtraEditors.LookUpEdit Friend WithEvents LookupControl31 As DigitalData.Controls.LookupGrid.LookupControl3 Friend WithEvents LookupControl31View As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents LookupControl32 As DigitalData.Controls.LookupGrid.LookupControl3 - Friend WithEvents GridView2 As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents LookupControl33 As DigitalData.Controls.LookupGrid.LookupControl3 - Friend WithEvents GridView3 As DevExpress.XtraGrid.Views.Grid.GridView - Friend WithEvents Label1 As Label - Friend WithEvents Label2 As Label End Class diff --git a/GUIs.Test.TestGUI/frmLookup.resx b/GUIs.Test.TestGUI/frmLookup.resx index c5893a2a..4fb23b11 100644 --- a/GUIs.Test.TestGUI/frmLookup.resx +++ b/GUIs.Test.TestGUI/frmLookup.resx @@ -124,24 +124,6 @@ PTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OQUB AAAAMFN5c3RlbS5Db2xsZWN0aW9ucy5HZW5lcmljLkxpc3RgMVtbU3lzdGVtLlN0cmluZwMAAAAGX2l0 ZW1zBV9zaXplCF92ZXJzaW9uBgAACAgCAAAACQMAAAAAAAAAAAAAABEDAAAAAAAAAAs= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAJoBbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1u - ZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0sIG1zY29ybGliLCBWZXJzaW9u - PTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OQUB - AAAAMFN5c3RlbS5Db2xsZWN0aW9ucy5HZW5lcmljLkxpc3RgMVtbU3lzdGVtLlN0cmluZwMAAAAGX2l0 - ZW1zBV9zaXplCF92ZXJzaW9uBgAACAgCAAAACQMAAAAAAAAAAAAAABEDAAAAAAAAAAs= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAJoBbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1u - ZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0sIG1zY29ybGliLCBWZXJzaW9u - PTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OQUB - AAAAMFN5c3RlbS5Db2xsZWN0aW9ucy5HZW5lcmljLkxpc3RgMVtbU3lzdGVtLlN0cmluZwMAAAAGX2l0 - ZW1zBV9zaXplCF92ZXJzaW9uBgAACAgCAAAACQMAAAAAAAAAAAAAABEDAAAAAAAAAAs= \ No newline at end of file diff --git a/GUIs.Test.TestGUI/frmLookup.vb b/GUIs.Test.TestGUI/frmLookup.vb index 74ee0d83..91e1e62d 100644 --- a/GUIs.Test.TestGUI/frmLookup.vb +++ b/GUIs.Test.TestGUI/frmLookup.vb @@ -1,37 +1,13 @@ -Imports DigitalData.Controls.LookupGrid +Public Class frmLookup -Public Class frmLookup Private _Datasource As List(Of String) = New List(Of String) - Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load - For index = 1 To 1000000 - _Datasource.Add($"item-{index}") - Next - + Private Sub frmLookup_Load(sender As Object, e As EventArgs) Handles MyBase.Load Dim oTable = GetDatatable(10) - LookupControl31.Properties.DataSource = oTable - LookupControl31.Properties.ValueMember = oTable.Columns.Item(0).ColumnName - LookupControl31.Properties.DisplayMember = oTable.Columns.Item(0).ColumnName - LookupControl32.Properties.MultiSelect = True - - LookupControl32.Properties.DataSource = oTable - LookupControl32.Properties.ValueMember = oTable.Columns.Item(0).ColumnName - LookupControl32.Properties.DisplayMember = oTable.Columns.Item(0).ColumnName - LookupControl32.Properties.MultiSelect = False - - Dim oEditor As New LookupControl3 - GridControl1.DataSource = New List(Of String) From {"foo", "var"} - GridControl1.ForceInitialize() - - Dim oFirstColumn = GridView1.Columns.First() - Dim oEditor2 As New RepositoryItemLookupControl3() With { - .DataSource = GetDatatable(10), - .DisplayMember = "Col1", - .ValueMember = "Col1" - } - GridControl1.RepositoryItems.Add(oEditor2) - GridView1.Columns(0).ColumnEdit = oEditor2 + + LookUpEdit1.Properties.DataSource = oTable + LookupControl31.Properties.Datasource = oTable End Sub Private Function GetDatatable(Limit As Integer) As DataTable @@ -52,8 +28,4 @@ Public Class frmLookup Return oDatatable End Function - - Private Sub LookupControl32_EditValueChanged(sender As Object, e As EventArgs) Handles LookupControl32.EditValueChanged, LookupControl33.EditValueChanged - - End Sub -End Class +End Class \ No newline at end of file