AppStd/TaskFlow
8
1
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'master' of http://dd-vmp07-com04:3000/AppStd/ProcessManager_Client

Browse Source
This commit is contained in:
SchreiberM 2020-10-15 17:01:14 +02:00
commit eb5690b000
6 changed files with 107 additions and 47 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
app/DD_PM_WINDREAM/ApplicationEvents.vb Normal file
View File

@ -0,0 +1,24 @@
Imports Microsoft.VisualBasic.ApplicationServices
Namespace My
' Für MyApplication sind folgende Ereignisse verfügbar:
' Startup: Wird beim Starten der Anwendung noch vor dem Erstellen des Startformulars ausgelöst.
' Shutdown: Wird nach dem Schließen aller Anwendungsformulare ausgelöst. Dieses Ereignis wird nicht ausgelöst, wenn die Anwendung mit einem Fehler beendet wird.
' UnhandledException: Wird bei einem Ausnahmefehler ausgelöst.
' StartupNextInstance: Wird beim Starten einer Einzelinstanzanwendung ausgelöst, wenn die Anwendung bereits aktiv ist.
' NetworkAvailabilityChanged: Wird beim Herstellen oder Trennen der Netzwerkverbindung ausgelöst.
Partial Friend Class MyApplication
Private Sub MyApplication_UnhandledException(sender As Object, e As UnhandledExceptionEventArgs) Handles Me.UnhandledException
Dim oMessage = "Application encountered an unhandled error!" & vbNewLine & vbNewLine &
"The errormessage was:" & vbNewLine & e.Exception.Message & vbNewLine &
"The stacktrace was:" & vbNewLine & e.Exception.StackTrace
If IsNothing(LOGGER) = False Then
LOGGER.Info(oMessage)
LOGGER.Error(e.Exception)
End If
MsgBox(oMessage, MsgBoxStyle.Critical, "Process Manager")
End Sub
End Class
End Namespace

1
app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj
View File

@ -238,6 +238,7 @@
<Import Include="System.Xml.Linq" /> <Import Include="System.Xml.Linq" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>
<Compile Include="ApplicationEvents.vb" />
<Compile Include="ClassAnnotation.vb" /> <Compile Include="ClassAnnotation.vb" />
<Compile Include="ClassConfig.vb" /> <Compile Include="ClassConfig.vb" />
<Compile Include="ClassControlCreator.vb" /> <Compile Include="ClassControlCreator.vb" />

2
app/DD_PM_WINDREAM/My Project/AssemblyInfo.vb
View File

@ -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("2.1.4.8")> <Assembly: AssemblyVersion("2.1.4.9")>
<Assembly: AssemblyFileVersion("1.0.0.0")> <Assembly: AssemblyFileVersion("1.0.0.0")>

9
app/DD_PM_WINDREAM/frmMain.vb
View File

@ -89,7 +89,6 @@ Public Class frmMain
formopenClose = True formopenClose = True
LOGGER.Debug("Initializing MainForm....") LOGGER.Debug("Initializing MainForm....")
' Create helper to save/load expanded GroupColumns at runtime ' Create helper to save/load expanded GroupColumns at runtime
RefreshHelper = New RefreshHelper(GridView_Docs, "GUID") RefreshHelper = New RefreshHelper(GridView_Docs, "GUID")
@ -1964,6 +1963,7 @@ Public Class frmMain
End Sub End Sub
Private Sub frmMain_Resize(sender As Object, e As EventArgs) Handles Me.Resize Private Sub frmMain_Resize(sender As Object, e As EventArgs) Handles Me.Resize
Try
If formShown = False Then If formShown = False Then
Exit Sub Exit Sub
End If End If
@ -1974,6 +1974,9 @@ Public Class frmMain
My.Settings.frmMainWindowState = "Normal" My.Settings.frmMainWindowState = "Normal"
End If End If
My.Settings.Save() My.Settings.Save()
Catch ex As Exception
LOGGER.Error(ex)
End Try
End Sub End Sub
Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtniGrundeinstellung.ItemClick Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtniGrundeinstellung.ItemClick
Try Try
@ -2058,8 +2061,6 @@ Public Class frmMain
Catch ex As Exception Catch ex As Exception
LOGGER.Warn($"Timer5Mins Error: {ex.Message}") LOGGER.Warn($"Timer5Mins Error: {ex.Message}")
End Try End Try
End Sub End Sub
Private Sub bwBasicData_DoWork(sender As Object, e As DoWorkEventArgs) Handles bwBasicData.DoWork Private Sub bwBasicData_DoWork(sender As Object, e As DoWorkEventArgs) Handles bwBasicData.DoWork
GetBaseData("bwBasicData") GetBaseData("bwBasicData")
@ -2205,7 +2206,7 @@ Public Class frmMain
tslblObjectCount.Text = objectCount_Descr tslblObjectCount.Text = objectCount_Descr
tslblObjectCount.ForeColor = Color.DarkOrange tslblObjectCount.ForeColor = Color.DarkOrange
Catch ex As Exception Catch ex As Exception
LOGGER.Error(ex.Message)
End Try End Try
End Sub End Sub

36
app/DD_PM_WINDREAM/frmMassValidator.vb
View File

@ -273,17 +273,31 @@ Public Class frmMassValidator
End If End If
#End Region #End Region
Dim maxWith As Integer = cmb.Width 'Dim oMaxWidth As Integer = cmb.Width
Using g As Graphics = Me.CreateGraphics
For Each oItem As Object In cmb.Items 'Für alle Einträge... 'Using oGraphics As Graphics = cmb.CreateGraphics()
Dim g1 As Graphics = cmb.CreateGraphics ' Dim oStringLength = oGraphics.MeasureString(Text, cmb.Font).Width
If g1.MeasureString(Text, cmb.Font).Width + 30 > maxWith Then ' If oStringLength + 30 > oMaxWidth Then
maxWith = g1.MeasureString(Text, cmb.Font).Width + 30 ' oMaxWidth = oStringLength + 30
End If ' End If
g1.Dispose() 'End Using
Next oItem
End Using 'Using g As Graphics = Me.CreateGraphics
cmb.DropDownWidth = maxWith ' For Each oItem As Object In cmb.Items 'Für alle Einträge...
' Dim g1 As Graphics = cmb.CreateGraphics
' If g1.MeasureString(Text, cmb.Font).Width + 30 > oMaxWidth Then
' oMaxWidth = g1.MeasureString(Text, cmb.Font).Width + 30
' End If
' g1.Dispose()
' Next oItem
'End Using
'cmb.DropDownWidth = oMaxWidth
oControl = cmb oControl = cmb
End If End If

64
app/DD_PM_WINDREAM/frmValidator.vb
View File

@ -906,17 +906,26 @@ Public Class frmValidator
#End Region #End Region
Dim maxWith As Integer = oComboBox.Width 'Dim oMaxWidth As Integer = oComboBox.Width
Using g As Graphics = Me.CreateGraphics
For Each oItem As Object In oComboBox.Items 'Für alle Einträge... 'Using oGraphics As Graphics = oComboBox.CreateGraphics()
Dim g1 As Graphics = oComboBox.CreateGraphics ' Dim oStringLength = oGraphics.MeasureString(Text, oComboBox.Font).Width
If g1.MeasureString(Text, oComboBox.Font).Width + 30 > maxWith Then ' If oStringLength + 30 > oMaxWidth Then
maxWith = g1.MeasureString(Text, oComboBox.Font).Width + 30 ' oMaxWidth = oStringLength + 30
End If ' End If
g1.Dispose() 'End Using
Next oItem
End Using 'Using g As Graphics = Me.CreateGraphics
oComboBox.DropDownWidth = maxWith ' For Each oItem As Object In oComboBox.Items 'Für alle Einträge...
' Dim g1 As Graphics = oComboBox.CreateGraphics
' If g1.MeasureString(Text, oComboBox.Font).Width + 30 > oMaxWidth Then
' oMaxWidth = g1.MeasureString(Text, oComboBox.Font).Width + 30
' End If
' g1.Dispose()
' Next oItem
'End Using
'oComboBox.DropDownWidth = oMaxWidth
oMyControl = oComboBox oMyControl = oComboBox
End If End If
@ -2269,17 +2278,28 @@ Public Class frmValidator
cmbpanel.DisplayMember = resultDT.Columns(0).ColumnName cmbpanel.DisplayMember = resultDT.Columns(0).ColumnName
cmbpanel.ValueMember = resultDT.Columns(0).ColumnName cmbpanel.ValueMember = resultDT.Columns(0).ColumnName
Dim maxWith As Integer = cmbpanel.Width
Using g As Graphics = Me.CreateGraphics
For Each oItem As Object In cmbpanel.Items 'Für alle Einträge... 'Dim oMaxWidth As Integer = cmbpanel.Width
Dim g1 As Graphics = cmbpanel.CreateGraphics
If g1.MeasureString(Text, cmbpanel.Font).Width + 30 > maxWith Then 'Using oGraphics As Graphics = cmbpanel.CreateGraphics()
maxWith = g1.MeasureString(Text, cmbpanel.Font).Width + 30 ' Dim oStringLength = oGraphics.MeasureString(Text, cmbpanel.Font).Width
End If ' If oStringLength + 30 > oMaxWidth Then
g1.Dispose() ' oMaxWidth = oStringLength + 30
Next oItem ' End If
End Using 'End Using
cmbpanel.DropDownWidth = maxWith
'Using g As Graphics = Me.CreateGraphics
' For Each oItem As Object In cmbpanel.Items 'Für alle Einträge...
' Dim g1 As Graphics = cmbpanel.CreateGraphics
' If g1.MeasureString(Text, cmbpanel.Font).Width + 30 > oMaxWidth Then
' oMaxWidth = g1.MeasureString(Text, cmbpanel.Font).Width + 30
' End If
' g1.Dispose()
' Next oItem
'End Using
'cmbpanel.DropDownWidth = oMaxWidth
ElseIf displayboxname.StartsWith(ClassControlCreator.PREFIX_LOOKUP) Or displayboxname.StartsWith(ClassControlCreator.PREFIX_TABLE) Then ElseIf displayboxname.StartsWith(ClassControlCreator.PREFIX_LOOKUP) Or displayboxname.StartsWith(ClassControlCreator.PREFIX_TABLE) Then
LOGGER.Warn("Depending_Control_Set_Result PREFIX_LOOKUP NOT IMPLEMENTED") LOGGER.Warn("Depending_Control_Set_Result PREFIX_LOOKUP NOT IMPLEMENTED")