LookupControl: Version 2.3.3.0

Controls.LookupGrid/LookupControl3.vb

@@ -30,10 +30,8 @@ Public Class LookupControl3
         RepositoryItemLookupControl3.RegisterLookupControl()
     End Sub
 
-    Public Sub New()
+    Private Sub LookupControl3_EditValueChanging(sender As Object, e As ChangingEventArgs) Handles Me.EditValueChanging
-    End Sub
+        e.Cancel = True
-
-    Private Sub InitializeComponent()
     End Sub
 End Class
 
@@ -41,10 +39,6 @@ End Class
 Public Class RepositoryItemLookupControl3
     Inherits RepositoryItemGridLookUpEdit
 
-    Public Sub PopupFIlter() Handles Me.BeforePopup
-
-    End Sub
-
     Shared Sub New()
         RegisterLookupControl()
     End Sub
@@ -54,7 +48,6 @@ Public Class RepositoryItemLookupControl3
     End Sub
 
     Private Const TAG_DROPDOWN = "openDropdown"
-
     Private Const TAG_BUTTON_LOOKUP_FORM = "openLookupForm"
 
     Private _R As Resources.ResourceManager = My.Resources.Strings.ResourceManager
@@ -69,8 +62,6 @@ 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
@@ -106,15 +97,6 @@ Public Class RepositoryItemLookupControl3
         End Set
     End Property
 
-    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
         Dim oClassInfo = New EditorClassInfo(
@@ -146,7 +128,8 @@ Public Class RepositoryItemLookupControl3
                 FirstOrDefault()
 
         If oButton IsNot Nothing Then
-            oButton.Enabled = pVisible
+            oButton.Visible = pVisible
+            ActionButtonIndex = oButton.Index
         End If
     End Sub
 
@@ -177,7 +160,7 @@ Public Class RepositoryItemLookupControl3
             End Select
         Else
             NullText = Values.FirstOrDefault()
-            OwnerEdit.EditValue = Values.FirstOrDefault()
+            'OwnerEdit.EditValue = Values.FirstOrDefault()
         End If
 
         _SelectedValues = Values
@@ -186,13 +169,20 @@ Public Class RepositoryItemLookupControl3
     End Sub
 
     Public Overrides Sub CreateDefaultButton()
-        Dim oLookupFormButtonm = New EditorButton() With {
+        Dim oButtons As New List(Of EditorButton) From {
+            New EditorButton() With {
                 .Kind = ButtonPredefines.Search,
                 .Tag = TAG_BUTTON_LOOKUP_FORM,
                 .Width = 25
+            },
+            New EditorButton() With {
+                .Kind = ButtonPredefines.Combo,
+                .Tag = TAG_DROPDOWN,
+                .Width = 25
+            }
         }
 
-        Buttons.AddRange({oLookupFormButtonm})
+        Buttons.AddRange(oButtons.ToArray)
     End Sub
 
     Private Function GetLookupForm() As frmLookupGrid
@@ -200,7 +190,7 @@ Public Class RepositoryItemLookupControl3
             .MultiSelect = MultiSelect,
             .AddNewValues = AllowAddNewValues,
             .PreventDuplicates = PreventDuplicates,
-            .DataSource = _OriginalDatasource,
+            .DataSource = DataSource,
             .SelectedValues = SelectedValues,
             .StartPosition = FormStartPosition.Manual,
             .Location = OwnerEdit.PointToScreen(New Point(OwnerEdit.Width, 0))
@@ -248,11 +238,4 @@ Public Class RepositoryItemLookupControl3
             e.Cancel = True
         End If
     End Sub
-
-    Private Sub RepositoryItemLookupControl3_Popup(sender As Object, e As EventArgs) Handles Me.Popup
-
-    End Sub
-
-
-
 End Class

Controls.LookupGrid/My Project/AssemblyInfo.vb

@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("2.3.2.0")>
+<Assembly: AssemblyVersion("2.3.3.0")>
-<Assembly: AssemblyFileVersion("2.3.2.0")>
+<Assembly: AssemblyFileVersion("2.3.3.0")>

GUIs.Test.TestGUI/frmLookup.Designer.vb

@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmLookup
     Inherits System.Windows.Forms.Form
 
     'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
     Protected Overrides Sub Dispose(ByVal disposing As Boolean)
         Try
             If disposing AndAlso components IsNot Nothing Then
@@ -20,69 +20,18 @@ 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.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
-        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 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()
-        CType(Me.LookUpEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.LookupControl31.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.LookupControl31View, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
-        'LookUpEdit1
-        '
-        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(412, 40)
-        Me.LookupControl31.Name = "LookupControl31"
-        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(161, 20)
-        Me.LookupControl31.TabIndex = 1
-        '
-        'LookupControl31View
-        '
-        Me.LookupControl31View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus
-        Me.LookupControl31View.Name = "LookupControl31View"
-        Me.LookupControl31View.OptionsSelection.EnableAppearanceFocusedCell = False
-        Me.LookupControl31View.OptionsView.ShowGroupPanel = 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.LookupControl31)
-        Me.Controls.Add(Me.LookUpEdit1)
         Me.Name = "frmLookup"
         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()
         Me.ResumeLayout(False)
 
     End Sub
-
-    Friend WithEvents LookUpEdit1 As DevExpress.XtraEditors.LookUpEdit
-    Friend WithEvents LookupControl31 As DigitalData.Controls.LookupGrid.LookupControl3
-    Friend WithEvents LookupControl31View As DevExpress.XtraGrid.Views.Grid.GridView
 End Class

GUIs.Test.TestGUI/frmLookup.resx

@@ -117,13 +117,4 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="LookupControl31.Properties.SelectedValues" mimetype="application/x-microsoft.net.object.binary.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAJoBbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1u
-        ZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0sIG1zY29ybGliLCBWZXJzaW9u
-        PTQuMC4wLjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjc3YTVjNTYxOTM0ZTA4OQUB
-        AAAAMFN5c3RlbS5Db2xsZWN0aW9ucy5HZW5lcmljLkxpc3RgMVtbU3lzdGVtLlN0cmluZwMAAAAGX2l0
-        ZW1zBV9zaXplCF92ZXJzaW9uBgAACAgCAAAACQMAAAAAAAAAAAAAABEDAAAAAAAAAAs=
-</value>
-  </data>
 </root>

GUIs.Test.TestGUI/frmLookup.vb

@@ -1,13 +1,27 @@
-Public Class frmLookup
+Imports DigitalData.Controls.LookupGrid
 
-    Private _Datasource As List(Of String) = New List(Of String)
+Public Class frmLookup
+
+    Private _Datasource As List(Of String) = New List(Of String) From {"Foo", "Bar", "Baz", "Bart", "Maggie", "Homer"}
 
     Private Sub frmLookup_Load(sender As Object, e As EventArgs) Handles MyBase.Load
         Dim oTable = GetDatatable(10)
 
+        Dim LookupControl31 As New LookupControl3 With {
+            .Location = New Point(10, 10),
+            .Size = New Drawing.Size(100, 27)
+        }
+        Dim LookupControl32 As New LookupControl3 With {
+            .Location = New Point(10, 60),
+            .Size = New Drawing.Size(100, 27)
+        }
 
-        LookUpEdit1.Properties.DataSource = oTable
+        Controls.AddRange({LookupControl31, LookupControl32})
-        LookupControl31.Properties.Datasource = oTable
+
+        LookupControl31.Properties.DataSource = oTable
+
+        LookupControl32.Properties.MultiSelect = True
+        LookupControl32.Properties.DataSource = oTable
     End Sub
 
     Private Function GetDatatable(Limit As Integer) As DataTable