Compare commits
3 Commits
809b4dafc3
...
87335beff8
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
87335beff8 | ||
|
|
6891642b37 | ||
|
|
5a8da9ff39 |
@@ -257,13 +257,26 @@ Public Class RepositoryItemLookupControl3
|
|||||||
.PreventDuplicates = PreventDuplicates,
|
.PreventDuplicates = PreventDuplicates,
|
||||||
.DataSource = DataSource,
|
.DataSource = DataSource,
|
||||||
.SelectedValues = SelectedValues,
|
.SelectedValues = SelectedValues,
|
||||||
.StartPosition = FormStartPosition.Manual,
|
.StartPosition = FormStartPosition.Manual
|
||||||
.Location = OwnerEdit.PointToScreen(New Point(OwnerEdit.Width, 0))
|
|
||||||
}
|
}
|
||||||
|
Dim oScreen = Screen.FromControl(oForm)
|
||||||
|
oForm.Location = GetFormLocation(oForm.Height, oForm.Width, oScreen)
|
||||||
|
|
||||||
Return oForm
|
Return oForm
|
||||||
End Function
|
End Function
|
||||||
|
|
||||||
|
Private Function GetFormLocation(pFormHeight As Integer, pFormWidth As Integer, pScreen As Screen) As Point
|
||||||
|
' This is the location on the same height like the Lookup Control
|
||||||
|
Dim oDefaultLocation = OwnerEdit.PointToScreen(New Point(OwnerEdit.Width, 0))
|
||||||
|
Dim oScreenheight = pScreen.Bounds.Height
|
||||||
|
|
||||||
|
If oScreenheight < (oDefaultLocation.Y + pFormHeight) Then
|
||||||
|
Return OwnerEdit.PointToScreen(New Point(OwnerEdit.Width, -pFormHeight + OwnerEdit.Height))
|
||||||
|
End If
|
||||||
|
|
||||||
|
Return oDefaultLocation
|
||||||
|
End Function
|
||||||
|
|
||||||
Protected Overrides Sub RaiseButtonClick(e As ButtonPressedEventArgs)
|
Protected Overrides Sub RaiseButtonClick(e As ButtonPressedEventArgs)
|
||||||
MyBase.RaiseButtonClick(e)
|
MyBase.RaiseButtonClick(e)
|
||||||
|
|
||||||
|
|||||||
@@ -94,9 +94,9 @@ Namespace My.Resources
|
|||||||
'''<summary>
|
'''<summary>
|
||||||
''' Sucht eine lokalisierte Zeichenfolge, die Bitte wählen Sie einen oder mehrere Werte aus: ähnelt.
|
''' Sucht eine lokalisierte Zeichenfolge, die Bitte wählen Sie einen oder mehrere Werte aus: ähnelt.
|
||||||
'''</summary>
|
'''</summary>
|
||||||
Friend Shared ReadOnly Property PopupForm_TextMultiLine() As String
|
Friend Shared ReadOnly Property PopupForm_TextMultiselect() As String
|
||||||
Get
|
Get
|
||||||
Return ResourceManager.GetString("PopupForm_TextMultiLine", resourceCulture)
|
Return ResourceManager.GetString("PopupForm_TextMultiselect", resourceCulture)
|
||||||
End Get
|
End Get
|
||||||
End Property
|
End Property
|
||||||
End Class
|
End Class
|
||||||
|
|||||||
@@ -126,7 +126,7 @@
|
|||||||
<data name="PopupForm_Text" xml:space="preserve">
|
<data name="PopupForm_Text" xml:space="preserve">
|
||||||
<value>Please choose a value:</value>
|
<value>Please choose a value:</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="PopupForm_TextMultiLine" xml:space="preserve">
|
<data name="PopupForm_TextMultiselect" xml:space="preserve">
|
||||||
<value>Please choose one or more values:</value>
|
<value>Please choose one or more values:</value>
|
||||||
</data>
|
</data>
|
||||||
</root>
|
</root>
|
||||||
@@ -126,7 +126,7 @@
|
|||||||
<data name="PopupForm_Text" xml:space="preserve">
|
<data name="PopupForm_Text" xml:space="preserve">
|
||||||
<value>Bitte wählen Sie einen Wert aus:</value>
|
<value>Bitte wählen Sie einen Wert aus:</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="PopupForm_TextMultiLine" xml:space="preserve">
|
<data name="PopupForm_TextMultiselect" xml:space="preserve">
|
||||||
<value>Bitte wählen Sie einen oder mehrere Werte aus:</value>
|
<value>Bitte wählen Sie einen oder mehrere Werte aus:</value>
|
||||||
</data>
|
</data>
|
||||||
</root>
|
</root>
|
||||||
@@ -65,10 +65,10 @@ Public Class frmLookupGrid
|
|||||||
oCheckboxColumn.OptionsColumn.AllowFocus = False
|
oCheckboxColumn.OptionsColumn.AllowFocus = False
|
||||||
|
|
||||||
|
|
||||||
Text = _R.GetString("PopupForm_Text")
|
Text = _R.GetString("PopupForm_TextMultiselect")
|
||||||
_DataColumn = 1
|
_DataColumn = 1
|
||||||
Else
|
Else
|
||||||
Text = _R.GetString("PopupForm_TextMultiLine")
|
Text = _R.GetString("PopupForm_Text")
|
||||||
_DataColumn = 0
|
_DataColumn = 0
|
||||||
End If
|
End If
|
||||||
|
|
||||||
|
|||||||
@@ -53,8 +53,12 @@ Public Class DatabaseWithFallback
|
|||||||
_DatabaseECM = DatabaseECM
|
_DatabaseECM = DatabaseECM
|
||||||
_DatabaseIDB = DatabaseIDB
|
_DatabaseIDB = DatabaseIDB
|
||||||
|
|
||||||
|
_Logger.Debug("Client exists: [{0}]", Not IsNothing(Client))
|
||||||
|
_Logger.Debug("DatabaseECM exists: [{0}]", Not IsNothing(DatabaseECM))
|
||||||
|
_Logger.Debug("DatabaseIDB exists: [{0}]", Not IsNothing(DatabaseIDB))
|
||||||
|
|
||||||
' Load client config, will throw if client is not yet connected to service
|
' Load client config, will throw if client is not yet connected to service
|
||||||
_ClientConfig = Client.ClientConfig
|
_ClientConfig = Client?.ClientConfig
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
''' <summary>
|
''' <summary>
|
||||||
|
|||||||
@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
|
|||||||
<Assembly: AssemblyCompany("Digital Data")>
|
<Assembly: AssemblyCompany("Digital Data")>
|
||||||
<Assembly: AssemblyProduct("EDMIAPI")>
|
<Assembly: AssemblyProduct("EDMIAPI")>
|
||||||
<Assembly: AssemblyCopyright("Copyright © 2022")>
|
<Assembly: AssemblyCopyright("Copyright © 2022")>
|
||||||
<Assembly: AssemblyTrademark("1.5.2.0")>
|
<Assembly: AssemblyTrademark("1.5.3.0")>
|
||||||
|
|
||||||
<Assembly: ComVisible(False)>
|
<Assembly: ComVisible(False)>
|
||||||
|
|
||||||
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
|||||||
' übernehmen, indem Sie "*" eingeben:
|
' übernehmen, indem Sie "*" eingeben:
|
||||||
' <Assembly: AssemblyVersion("1.0.*")>
|
' <Assembly: AssemblyVersion("1.0.*")>
|
||||||
|
|
||||||
<Assembly: AssemblyVersion("1.5.2.0")>
|
<Assembly: AssemblyVersion("1.5.3.0")>
|
||||||
<Assembly: AssemblyFileVersion("1.5.2.0")>
|
<Assembly: AssemblyFileVersion("1.5.3.0")>
|
||||||
|
|||||||
Reference in New Issue
Block a user