3 Commits

Author SHA1 Message Date
Jonathan Jenne
87335beff8 LookupGrid: Fix Form text, fix form sticking out of monitor when there is no space 2022-04-01 11:03:57 +02:00
Jonathan Jenne
6891642b37 EDMIAPI: Version 1.5.3.0 2022-03-31 16:50:55 +02:00
Jonathan Jenne
5a8da9ff39 EDMIAPI: fix crash when idb database or client is missing 2022-03-31 16:50:07 +02:00
7 changed files with 29 additions and 12 deletions

View File

@@ -257,13 +257,26 @@ Public Class RepositoryItemLookupControl3
.PreventDuplicates = PreventDuplicates,
.DataSource = DataSource,
.SelectedValues = SelectedValues,
.StartPosition = FormStartPosition.Manual,
.Location = OwnerEdit.PointToScreen(New Point(OwnerEdit.Width, 0))
.StartPosition = FormStartPosition.Manual
}
Dim oScreen = Screen.FromControl(oForm)
oForm.Location = GetFormLocation(oForm.Height, oForm.Width, oScreen)
Return oForm
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)
MyBase.RaiseButtonClick(e)

View File

@@ -94,9 +94,9 @@ Namespace My.Resources
'''<summary>
''' Sucht eine lokalisierte Zeichenfolge, die Bitte wählen Sie einen oder mehrere Werte aus: ähnelt.
'''</summary>
Friend Shared ReadOnly Property PopupForm_TextMultiLine() As String
Friend Shared ReadOnly Property PopupForm_TextMultiselect() As String
Get
Return ResourceManager.GetString("PopupForm_TextMultiLine", resourceCulture)
Return ResourceManager.GetString("PopupForm_TextMultiselect", resourceCulture)
End Get
End Property
End Class

View File

@@ -126,7 +126,7 @@
<data name="PopupForm_Text" xml:space="preserve">
<value>Please choose a value:</value>
</data>
<data name="PopupForm_TextMultiLine" xml:space="preserve">
<data name="PopupForm_TextMultiselect" xml:space="preserve">
<value>Please choose one or more values:</value>
</data>
</root>

View File

@@ -126,7 +126,7 @@
<data name="PopupForm_Text" xml:space="preserve">
<value>Bitte wählen Sie einen Wert aus:</value>
</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>
</data>
</root>

View File

@@ -65,10 +65,10 @@ Public Class frmLookupGrid
oCheckboxColumn.OptionsColumn.AllowFocus = False
Text = _R.GetString("PopupForm_Text")
Text = _R.GetString("PopupForm_TextMultiselect")
_DataColumn = 1
Else
Text = _R.GetString("PopupForm_TextMultiLine")
Text = _R.GetString("PopupForm_Text")
_DataColumn = 0
End If

View File

@@ -53,8 +53,12 @@ Public Class DatabaseWithFallback
_DatabaseECM = DatabaseECM
_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
_ClientConfig = Client.ClientConfig
_ClientConfig = Client?.ClientConfig
End Sub
''' <summary>

View File

@@ -13,7 +13,7 @@ Imports System.Runtime.InteropServices
<Assembly: AssemblyCompany("Digital Data")>
<Assembly: AssemblyProduct("EDMIAPI")>
<Assembly: AssemblyCopyright("Copyright © 2022")>
<Assembly: AssemblyTrademark("1.5.2.0")>
<Assembly: AssemblyTrademark("1.5.3.0")>
<Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
' <Assembly: AssemblyVersion("1.0.*")>
<Assembly: AssemblyVersion("1.5.2.0")>
<Assembly: AssemblyFileVersion("1.5.2.0")>
<Assembly: AssemblyVersion("1.5.3.0")>
<Assembly: AssemblyFileVersion("1.5.3.0")>