diff --git a/Controls.LookupGrid/LookupControl3.vb b/Controls.LookupGrid/LookupControl3.vb index 1bc07807..3450f3a4 100644 --- a/Controls.LookupGrid/LookupControl3.vb +++ b/Controls.LookupGrid/LookupControl3.vb @@ -159,7 +159,7 @@ Public Class RepositoryItemLookupControl3 Case 0 NullText = _R.GetString("LookupControl_NoRecords") Case 1 - NullText = _R.GetString("LookupControl_OneRecord") + NullText = Values.FirstOrDefault() Case Else NullText = String.Format(_R.GetString("LookupControl_NRecords"), Values.Count) End Select diff --git a/Controls.LookupGrid/Resources/Strings.Designer.vb b/Controls.LookupGrid/Resources/Strings.Designer.vb index a88c816a..8086d3d6 100644 --- a/Controls.LookupGrid/Resources/Strings.Designer.vb +++ b/Controls.LookupGrid/Resources/Strings.Designer.vb @@ -82,15 +82,6 @@ Namespace My.Resources End Get End Property - ''' - ''' Sucht eine lokalisierte Zeichenfolge, die 1 Datensatz ausgewählt ähnelt. - ''' - Friend Shared ReadOnly Property LookupControl_OneRecord() As String - Get - Return ResourceManager.GetString("LookupControl_OneRecord", resourceCulture) - End Get - End Property - ''' ''' Sucht eine lokalisierte Zeichenfolge, die Bitte wählen Sie einen Wert aus: ähnelt. ''' diff --git a/Controls.LookupGrid/Resources/Strings.en.resx b/Controls.LookupGrid/Resources/Strings.en.resx index 653a4c64..5f7dada9 100644 --- a/Controls.LookupGrid/Resources/Strings.en.resx +++ b/Controls.LookupGrid/Resources/Strings.en.resx @@ -123,9 +123,6 @@ {0} records selected - - 1 record selected - Please choose a value: diff --git a/Controls.LookupGrid/Resources/Strings.resx b/Controls.LookupGrid/Resources/Strings.resx index 093ffed5..f7c2d066 100644 --- a/Controls.LookupGrid/Resources/Strings.resx +++ b/Controls.LookupGrid/Resources/Strings.resx @@ -123,9 +123,6 @@ {0} Datensätze ausgewählt - - 1 Datensatz ausgewählt - Bitte wählen Sie einen Wert aus: diff --git a/Controls.LookupGrid/frmLookupGrid.Designer.vb b/Controls.LookupGrid/frmLookupGrid.Designer.vb index 334a1455..38cf40f2 100644 --- a/Controls.LookupGrid/frmLookupGrid.Designer.vb +++ b/Controls.LookupGrid/frmLookupGrid.Designer.vb @@ -1,6 +1,6 @@  _ Partial Class frmLookupGrid - Inherits System.Windows.Forms.Form + Inherits DevExpress.XtraEditors.XtraForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. _ diff --git a/Controls.LookupGrid/frmLookupGrid.en.resx b/Controls.LookupGrid/frmLookupGrid.en.resx index f00661ee..2b9b7341 100644 --- a/Controls.LookupGrid/frmLookupGrid.en.resx +++ b/Controls.LookupGrid/frmLookupGrid.en.resx @@ -120,6 +120,10 @@ Clear + + + 390, 293 + Choose a value: diff --git a/Controls.LookupGrid/frmLookupGrid.resx b/Controls.LookupGrid/frmLookupGrid.resx index 13d7fb82..4e138705 100644 --- a/Controls.LookupGrid/frmLookupGrid.resx +++ b/Controls.LookupGrid/frmLookupGrid.resx @@ -117,6 +117,9 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + btnOK + OK (F2) @@ -150,14 +153,11 @@ $this - System.Windows.Forms.Form, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + DevExpress.XtraEditors.XtraForm, DevExpress.Utils.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a System.Windows.Forms.Button, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - Panel1 - frmLookupGrid @@ -177,10 +177,6 @@ 1 - - - None - Center @@ -218,9 +214,6 @@ 136, 23 - - viewLookup - Tile @@ -236,6 +229,9 @@ Wählen Sie einen oder mehrere Werte: + + Panel1 + Inherit @@ -255,11 +251,15 @@ 0, 221 - + + 6, 13 + + Panel1 - - btnOK + + + None System.Windows.Forms.Panel, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 @@ -273,8 +273,8 @@ - - 6, 13 + + viewLookup 12, 6 diff --git a/Controls.LookupGrid/frmLookupGrid.vb b/Controls.LookupGrid/frmLookupGrid.vb index a34ed92f..5c858cb0 100644 --- a/Controls.LookupGrid/frmLookupGrid.vb +++ b/Controls.LookupGrid/frmLookupGrid.vb @@ -233,4 +233,11 @@ Public Class frmLookupGrid Private Sub frmLookupGrid_Shown(sender As Object, e As EventArgs) Handles Me.Shown BringToFront() End Sub + + Private Sub viewLookup_ValidateRow(sender As Object, e As ValidateRowEventArgs) Handles viewLookup.ValidateRow + If MultiSelect Then + Dim oRow As DataRowView = viewLookup.GetRow(e.RowHandle) + oRow.Row.Item("SELECTED") = True + End If + End Sub End Class \ No newline at end of file diff --git a/GUIs.Test.TestGUI/frmLookup.Designer.vb b/GUIs.Test.TestGUI/frmLookup.Designer.vb index 885d4a7f..ffb971af 100644 --- a/GUIs.Test.TestGUI/frmLookup.Designer.vb +++ b/GUIs.Test.TestGUI/frmLookup.Designer.vb @@ -66,9 +66,9 @@ Partial Class frmLookup 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.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, 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.LookupControl31.Properties.MultiSelect = False + Me.LookupControl31.Properties.MultiSelect = True Me.LookupControl31.Properties.PopupView = Me.LookupControl31View Me.LookupControl31.Properties.PreventDuplicates = False Me.LookupControl31.Properties.ReadOnly = False