Zooflow: Fix messageboxes without title

GUIs.ZooFlow/frmFlowForm.vb

@@ -17,7 +17,6 @@ Imports DigitalData.Modules.Language
 Imports DevExpress.LookAndFeel
 Imports System.Threading.Tasks
 Imports System.Threading
-Imports DigitalData.Controls.MessageBoxEx
 
 Public Class frmFlowForm
 #Region "Sidebar DllImport"
@@ -160,9 +159,9 @@ Public Class frmFlowForm
     Private Logger As Logger
     Private Init As ClassInit
     Private FileEx As Filesystem.File
-    Private ErrorHandler As BaseErrorHandler
     Private Modules As ClassModules
     Private Search As SearchRunner
+    Private FormHelper As FormHelper
 
     ' Globix Helper Classes
     Private FileDropNew As FileDrop
@@ -227,8 +226,9 @@ Public Class frmFlowForm
 
             ' === Initialize Environment ===
             Logger = My.LogConfig.GetLogger()
+            FormHelper = New FormHelper(My.LogConfig, Me)
             Environment = My.Application.GetEnvironment()
-            ErrorHandler = New BaseErrorHandler(My.LogConfig, Logger, Me)
+            'ErrorHandler = New BaseErrorHandler(My.LogConfig, Logger, Me)
             Modules = New ClassModules(My.LogConfig, My.SystemConfig)
             FileEx = New Filesystem.File(My.LogConfig)
             Search = New SearchRunner(My.LogConfig, Environment, "FlowSearch") With {
@@ -295,7 +295,7 @@ Public Class frmFlowForm
                     ProfileLoader = New ClassProfileLoader(My.LogConfig, My.Database)
                     ProfileLoader.LoadProfiles()
                 Catch ex As Exception
-                    ErrorHandler.ShowErrorMessage(ex, "Init Search FLOW")
+                    FormHelper.ShowErrorMessage(ex, "Init Search FLOW")
                 End Try
             Else
                 My.Application.ClipboardWatcher.MonitoringActive = False
@@ -315,7 +315,7 @@ Public Class frmFlowForm
                     Else
                         oMsg = "File-Exclusions in Folderwatch could not be created!"
                     End If
-                    Dim oMsgBox As New frmDialog(oMsg, "Error", True)
+                    Dim oMsgBox As New frmDialog(oMsg, Text, frmDialog.DialogType.Warning)
                     oMsgBox.ShowDialog()
                 End If
 
@@ -367,7 +367,7 @@ Public Class frmFlowForm
             colPrimary.FieldName = AccessedFilesTable.Columns(1).ColumnName ' "DisplayFileName"
             colSecondary.FieldName = AccessedFilesTable.Columns(2).ColumnName '"Changed when"
         Catch ex As Exception
-            ShowErrorMessage(ex)
+            FormHelper.ShowErrorMessage(ex, "Load_Recent_Files")
         End Try
     End Function
 
@@ -448,7 +448,7 @@ Public Class frmFlowForm
 
 
         Catch ex As Exception
-            ShowErrorMessage(ex)
+            FormHelper.ShowErrorMessage(ex, "Init_Folderwatch")
         End Try
 
         Try
@@ -475,7 +475,7 @@ Public Class frmFlowForm
 
             End If
         Catch ex As Exception
-            ShowErrorMessage(ex)
+            FormHelper.ShowErrorMessage(ex, "Init_Folderwatch")
         End Try
 
     End Sub
@@ -500,18 +500,18 @@ Public Class frmFlowForm
     End Sub
 
     Sub ExitZooflow()
-        Dim omessage = "Wollen sie ZooFlow wirklich beenden?"
+        Dim oMessage = "Wollen sie ZooFlow wirklich beenden?"
         If My.Application.User.Language <> "de-DE" Then
-            omessage = "Are you sure you want to close ZooFlow?"
+            oMessage = "Are you sure you want to close ZooFlow?"
         End If
         Dim oTitle = "Zooflow beenden"
         If My.Application.User.Language <> "de-DE" Then
             oTitle = "Exit Zooflow"
         End If
-        Dim oMsgBox As New frmDialog(omessage, oTitle, False)
+        Dim oMsgBox As New frmDialog(oMessage, oTitle, frmDialog.DialogType.Question)
         oMsgBox.ShowDialog()
 
-        If oMsgBox.DialogResult = DialogResult.OK Then
+        If oMsgBox.DialogResult = DialogResult.Yes Then
             Close()
         Else
             ESCHitCount = 0
@@ -613,7 +613,7 @@ Public Class frmFlowForm
         End If
         If TheFormIsAlreadyLoaded("frmIndexFileList") Then
             Cursor = Cursors.Default
-            Dim oMsgBox As New frmDialog("Please index the active file first!", "Drag 'n Drop not allowed!", True)
+            Dim oMsgBox As New frmDialog("Please index the active file first!", "Drag 'n Drop not allowed!", frmDialog.DialogType.Warning)
             oMsgBox.ShowDialog()
             Exit Function
         End If
@@ -679,7 +679,7 @@ Public Class frmFlowForm
                 End If
             Next
         Catch ex As Exception
-            ShowErrorMessage(ex)
+            FormHelper.ShowErrorMessage(ex, "Globix_CheckDroppedFiles")
         Finally
             CleanTempFiles()
             Show()
@@ -718,7 +718,7 @@ Public Class frmFlowForm
             End If
             Cursor = Cursors.Default
         Catch ex As Exception
-            ShowErrorMessage(ex)
+            FormHelper.ShowErrorMessage(ex, "Globix_Open_IndexDialog")
         End Try
     End Sub
     Sub NotifyIconReset()
@@ -740,7 +740,7 @@ Public Class frmFlowForm
             End Select
             NotifyIcon.ShowBalloonTip(30000, NI_TITLE, NI_MESSAGE, oNIType)
         Catch ex As Exception
-            ShowErrorMessage(ex)
+            FormHelper.ShowErrorMessage(ex, "GlobixClosed")
         End Try
     End Sub
     Sub Folderwatch_CheckFiles()
@@ -789,7 +789,7 @@ Public Class frmFlowForm
                     Logger.Info("FWSCAN not started")
                 End If
             Catch ex As Exception
-                ShowErrorMessage(ex)
+                FormHelper.ShowErrorMessage(ex, "Folderwatch_CheckFiles")
             End Try
 
             Try
@@ -826,7 +826,7 @@ Public Class frmFlowForm
                     Logger.Info("Folderwatch not started")
                 End If
             Catch ex As Exception
-                ShowErrorMessage(ex)
+                FormHelper.ShowErrorMessage(ex, "Folderwatch_CheckFiles")
             End Try
 
             If TimerCheckFolderWatchTable.Enabled = False Then
@@ -917,7 +917,7 @@ Public Class frmFlowForm
             If ex.Message.Contains("Sammlung wurde geändert") Or ex.Message.Contains("Enumeration") Then
 
             Else
-                Dim oMsgBox As New frmDialog("Error in Work FolderWatch-File:" & vbNewLine & ex.Message, "Drag 'n Drop not allowed!", True)
+                Dim oMsgBox As New frmDialog("Error in Work FolderWatch-File:" & vbNewLine & ex.Message, "Drag 'n Drop not allowed!", frmDialog.DialogType.Error)
                 oMsgBox.ShowDialog()
             End If
 
@@ -1098,12 +1098,6 @@ Public Class frmFlowForm
 
     End Sub
 
-
-    Private Sub ShowErrorMessage(pEx As Exception)
-        Dim oCallingClass = LogConfig.GetClassFullName(IncludeMethodNames:=True, Parts:=2)
-        ErrorHandler.ShowErrorMessage(pEx, oCallingClass)
-    End Sub
-
     Private Function GetResultWindowString(SearchContent As String) As String
         If SearchContent <> String.Empty Then
             If My.Application.User.Language = DigitalData.Modules.ZooFlow.State.UserState.LANG_DE_DE Then
@@ -1136,7 +1130,7 @@ Public Class frmFlowForm
                 End If
 
             Catch ex As Exception
-                ShowErrorMessage(ex)
+                FormHelper.ShowErrorMessage(ex, "CheckQuickSearch1")
             Finally
                 RunningTask = Nothing
                 SplashScreenManager.CloseOverlayForm(oHandle)
@@ -1164,7 +1158,7 @@ Public Class frmFlowForm
             My.SystemConfig.AppServerConfig = oForm.ServiceAddress
             My.SystemConfigManager.Save()
         Catch ex As Exception
-            ErrorHandler.ShowErrorMessage("Service Config")
+            FormHelper.ShowErrorMessage(ex, "Service Config")
         End Try
     End Sub
 
@@ -1196,7 +1190,7 @@ Public Class frmFlowForm
 
             End If
         Catch ex As Exception
-            ShowErrorMessage(ex)
+            FormHelper.ShowErrorMessage(ex, "PictureBoxPM_Click")
         End Try
     End Sub
     Private Function PM_Running() As Boolean
@@ -1254,7 +1248,7 @@ Public Class frmFlowForm
 
                 Search.RunWithDataTable(oResult, "Suche")
             Catch ex As Exception
-                ErrorHandler.ShowErrorMessage(ex, "Laden eines Dokuments")
+                FormHelper.ShowErrorMessage(ex, "Laden eines Dokuments")
             Finally
                 SplashScreenManager.CloseOverlayForm(oHandle)
             End Try