diff --git a/GUIs.Test.TestGUI/frmLookup.Designer.vb b/GUIs.Test.TestGUI/frmLookup.Designer.vb index fe2490f7..65a79e84 100644 --- a/GUIs.Test.TestGUI/frmLookup.Designer.vb +++ b/GUIs.Test.TestGUI/frmLookup.Designer.vb @@ -28,17 +28,22 @@ Partial Class frmLookup 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)) + 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() - Me.RepositoryItemLookupControl31 = New DigitalData.Controls.LookupGrid.RepositoryItemLookupControl3() - Me.RepositoryItemLookupControl31View = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.RepositoryItemLookupControl34 = New DigitalData.Controls.LookupGrid.RepositoryItemLookupControl3() + Me.RepositoryItemLookupControl34View = New DevExpress.XtraGrid.Views.Grid.GridView() Me.LookupControl31 = New DigitalData.Controls.LookupGrid.LookupControl3() Me.LookupControl31View = New DevExpress.XtraGrid.Views.Grid.GridView() CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.RepositoryItemLookupControl31, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.RepositoryItemLookupControl31View, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemLookupControl34, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RepositoryItemLookupControl34View, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LookupControl31.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.LookupControl31View, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() @@ -48,8 +53,8 @@ Partial Class frmLookup Me.GridControl1.Location = New System.Drawing.Point(12, 12) Me.GridControl1.MainView = Me.GridView1 Me.GridControl1.Name = "GridControl1" - Me.GridControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemLookupControl31}) - Me.GridControl1.Size = New System.Drawing.Size(400, 200) + Me.GridControl1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemLookupControl34}) + 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}) ' @@ -62,45 +67,45 @@ Partial Class frmLookup 'GridColumn1 ' Me.GridColumn1.Caption = "GridColumn1" - Me.GridColumn1.ColumnEdit = Me.RepositoryItemLookupControl31 Me.GridColumn1.Name = "GridColumn1" Me.GridColumn1.Visible = True Me.GridColumn1.VisibleIndex = 0 ' - 'RepositoryItemLookupControl31 + 'RepositoryItemLookupControl34 ' - Me.RepositoryItemLookupControl31.ActionButtonIndex = 1 - Me.RepositoryItemLookupControl31.AllowAddNewValues = False - Me.RepositoryItemLookupControl31.AutoHeight = False - Me.RepositoryItemLookupControl31.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.RepositoryItemLookupControl31.DataSource = Nothing - Me.RepositoryItemLookupControl31.MultiSelect = False - Me.RepositoryItemLookupControl31.Name = "RepositoryItemLookupControl31" - Me.RepositoryItemLookupControl31.PopupView = Me.RepositoryItemLookupControl31View - Me.RepositoryItemLookupControl31.PreventDuplicates = False - Me.RepositoryItemLookupControl31.ReadOnly = False - Me.RepositoryItemLookupControl31.SelectedValues = CType(resources.GetObject("RepositoryItemLookupControl31.SelectedValues"), System.Collections.Generic.List(Of String)) + Me.RepositoryItemLookupControl34.ActionButtonIndex = 1 + Me.RepositoryItemLookupControl34.AllowAddNewValues = False + Me.RepositoryItemLookupControl34.AutoHeight = False + Me.RepositoryItemLookupControl34.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.RepositoryItemLookupControl34.DataSource = Nothing + Me.RepositoryItemLookupControl34.MultiSelect = False + Me.RepositoryItemLookupControl34.Name = "RepositoryItemLookupControl34" + Me.RepositoryItemLookupControl34.PopupView = Me.RepositoryItemLookupControl34View + Me.RepositoryItemLookupControl34.PreventDuplicates = False + Me.RepositoryItemLookupControl34.ReadOnly = False + Me.RepositoryItemLookupControl34.SelectedValues = CType(resources.GetObject("RepositoryItemLookupControl34.SelectedValues"), System.Collections.Generic.List(Of String)) ' - 'RepositoryItemLookupControl31View + 'RepositoryItemLookupControl34View ' - Me.RepositoryItemLookupControl31View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus - Me.RepositoryItemLookupControl31View.Name = "RepositoryItemLookupControl31View" - Me.RepositoryItemLookupControl31View.OptionsSelection.EnableAppearanceFocusedCell = False - Me.RepositoryItemLookupControl31View.OptionsView.ShowGroupPanel = False + Me.RepositoryItemLookupControl34View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus + Me.RepositoryItemLookupControl34View.Name = "RepositoryItemLookupControl34View" + Me.RepositoryItemLookupControl34View.OptionsSelection.EnableAppearanceFocusedCell = False + Me.RepositoryItemLookupControl34View.OptionsView.ShowGroupPanel = False ' 'LookupControl31 ' - Me.LookupControl31.Location = New System.Drawing.Point(539, 55) + Me.LookupControl31.Location = New System.Drawing.Point(562, 116) Me.LookupControl31.Name = "LookupControl31" + Me.LookupControl31.Properties.ActionButtonIndex = 1 Me.LookupControl31.Properties.AllowAddNewValues = False - Me.LookupControl31.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)}) + Me.LookupControl31.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.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(100, 20) + Me.LookupControl31.Size = New System.Drawing.Size(157, 20) Me.LookupControl31.TabIndex = 2 ' 'LookupControl31View @@ -121,8 +126,8 @@ Partial Class frmLookup Me.Text = "Form1" CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.GridView1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.RepositoryItemLookupControl31, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.RepositoryItemLookupControl31View, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemLookupControl34, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RepositoryItemLookupControl34View, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LookupControl31.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.LookupControl31View, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) @@ -131,8 +136,8 @@ Partial Class frmLookup 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 RepositoryItemLookupControl31 As DigitalData.Controls.LookupGrid.RepositoryItemLookupControl3 - Friend WithEvents RepositoryItemLookupControl31View As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents RepositoryItemLookupControl34 As DigitalData.Controls.LookupGrid.RepositoryItemLookupControl3 + Friend WithEvents RepositoryItemLookupControl34View As DevExpress.XtraGrid.Views.Grid.GridView Friend WithEvents LookupControl31 As DigitalData.Controls.LookupGrid.LookupControl3 Friend WithEvents LookupControl31View As DevExpress.XtraGrid.Views.Grid.GridView End Class diff --git a/GUIs.Test.TestGUI/frmLookup.resx b/GUIs.Test.TestGUI/frmLookup.resx index 4f340c6b..583b20a8 100644 --- a/GUIs.Test.TestGUI/frmLookup.resx +++ b/GUIs.Test.TestGUI/frmLookup.resx @@ -117,7 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - + AAEAAAD/////AQAAAAAAAAAMAgAAAJoBbXNjb3JsaWIsIFZlcnNpb249NC4wLjAuMCwgQ3VsdHVyZT1u ZXV0cmFsLCBQdWJsaWNLZXlUb2tlbj1iNzdhNWM1NjE5MzRlMDg5XV0sIG1zY29ybGliLCBWZXJzaW9u diff --git a/GUIs.Test.TestGUI/frmLookup.vb b/GUIs.Test.TestGUI/frmLookup.vb index 4902254d..904bbe12 100644 --- a/GUIs.Test.TestGUI/frmLookup.vb +++ b/GUIs.Test.TestGUI/frmLookup.vb @@ -8,10 +8,22 @@ Public Class frmLookup _Datasource.Add($"item-{index}") Next + LookupControl31.Properties.DataSource = GetDatatable(10) 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), + .[ReadOnly] = False, + .MultiSelect = False + } + + GridControl1.RepositoryItems.Add(oEditor2) + GridView1.Columns(0).ColumnEdit = oEditor2 End Sub Private Function GetDatatable(Limit As Integer) As DataTable diff --git a/GUIs.Test.TestGUI/frmStart.Designer.vb b/GUIs.Test.TestGUI/frmStart.Designer.vb index b6b73b38..e029f4b5 100644 --- a/GUIs.Test.TestGUI/frmStart.Designer.vb +++ b/GUIs.Test.TestGUI/frmStart.Designer.vb @@ -41,7 +41,7 @@ Partial Class frmStart Me.Button2.Name = "Button2" Me.Button2.Size = New System.Drawing.Size(236, 55) Me.Button2.TabIndex = 0 - Me.Button2.Text = "Relations" + Me.Button2.Text = "LookupControl" Me.Button2.UseVisualStyleBackColor = True ' 'frmStart