jj: Default Value for lookupgrid, admin fixes, no topmost for index window

This commit is contained in:
Jonathan Jenne
2018-10-29 15:34:58 +01:00
parent 52966dcc47
commit 000b3e48d8
4 changed files with 3195 additions and 1720 deletions

View File

@@ -563,7 +563,14 @@ Public Class frmIndex
' TODO: Hier noch die Vorbelegung für Vektor Indexe einfügen
gridLookup.Properties.PopupFormSize = New Size(gridLookup.Properties.PopupFormSize.Width, 100)
gridLookup.Properties.NullText = LOOKUP_NO_RECORDS
gridLookup.Properties.DataSource = Nothing
If Vorgabe.Length > 0 Then
gridLookup.Properties.DataSource = New List(Of String) From {Vorgabe}
gridLookup.Properties.NullText = String.Format(LOOKUP_N_RECORDS, 1)
Else
gridLookup.Properties.DataSource = Nothing
gridLookup.Properties.NullText = LOOKUP_NO_RECORDS
End If
' Da das gridLookup ein Readonly Control sein soll,
' sich aber trotzdem öffnen lassen soll, müssen wir so das setzen eines neuen Werts verhindern
@@ -605,6 +612,7 @@ Public Class frmIndex
textBox.Location = New Point(11, y)
textBox.Size = New Size(300, LOOKUP_CONTROL_HEIGHT)
textBox.ReadOnly = True
textBox.Text = Vorgabe
AddHandler lookupButton.Click, Sub()
Dim frm As New frmLookupGrid()
@@ -908,7 +916,7 @@ Public Class frmIndex
End If
If ctrl.Name.StartsWith("cmbMulti") Then
Dim cmbMulti As DevExpress.XtraEditors.GridLookUpEdit = ctrl
Dim values As List(Of Object) = cmbMulti.Properties.DataSource
Dim values As List(Of String) = cmbMulti.Properties.DataSource
If values.Count = 0 Then
Dim optional_index As Boolean = ClassDatabase.Execute_Scalar("SELECT OPTIONAL FROM TBDD_INDEX_MAN WHERE DOK_ID = " & dokartid & " AND NAME = '" & Replace(cmbMulti.Name, "cmbMulti", "") & "'", MyConnectionString, True)
@@ -2005,7 +2013,7 @@ Public Class frmIndex
End Sub
Private Sub frmIndex_Shown(sender As Object, e As System.EventArgs) Handles Me.Shown
Me.TopMost = True
'Me.TopMost = True
Me.BringToFront()
Me.Focus()
Me.Cursor = Cursors.Default