diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb index 547f3a9e..e5098d43 100644 --- a/GUIs.ZooFlow/frmFlowForm.Designer.vb +++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb @@ -1,6 +1,8 @@ - +Imports DigitalData.GUIs.Common.Base + + Partial Class frmFlowForm - Inherits DevExpress.XtraEditors.XtraForm + Inherits BaseForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. @@ -23,7 +25,7 @@ Partial Class frmFlowForm Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, Nothing, true, true) + Dim SplashScreenManager As DevExpress.XtraSplashScreen.SplashScreenManager = New DevExpress.XtraSplashScreen.SplashScreenManager(Me, Nothing, True, True) Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmFlowForm)) Me.NotifyIcon = New System.Windows.Forms.NotifyIcon(Me.components) Me.ContextMenuSystray = New System.Windows.Forms.ContextMenuStrip(Me.components) diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index c4cf7d21..22a70e64 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -18,7 +18,6 @@ Public Class frmFlowForm Private Const OPACITY_HIDDEN = 0.65 Private Const OPACITY_SHOWN = 0.85 - Private Logger As Logger Private DTIDB_SEARCHES As DataTable ' Common Helpers Classes @@ -58,6 +57,8 @@ Public Class frmFlowForm Private WithEvents Watcher As ClipboardWatcher.Watcher = ClipboardWatcher.Watcher.Singleton Public Sub New() + MyBase.New(My.LogConfig) + ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() @@ -66,9 +67,6 @@ Public Class frmFlowForm End Sub Private Sub frmFlowForm_Load(sender As Object, e As EventArgs) Handles Me.Load - ' === Initialize Logger === - Logger = My.LogConfig.GetLogger() - ' === Show Splash Screen === SplashScreenManager.ShowForm(Me, GetType(frmSplash), False, False) @@ -250,8 +248,7 @@ Public Class frmFlowForm ProfileLoader = New ClassProfileLoader(My.LogConfig, AppServerOrDB) ProfileLoader.LoadProfiles() Catch ex As Exception - Logger.Error(ex) - MsgBox("Error while initializing Clipboard Watcher!", MsgBoxStyle.Critical, Text) + ShowErrorMessage(ex) End Try Else My.Application.ClipboardWatcher.MonitoringActive = False @@ -291,6 +288,8 @@ Public Class frmFlowForm If oDT.Rows.Count = 0 Then Throw New ApplicationException("No Default Path configured for User!") + 'Logger.Warn("No Default Path configured for User. Skipping.") + 'Exit Sub End If Dim oFolderWatchPath = oDT.Rows.Item(0).Item("FOLDER_PATH") @@ -319,9 +318,7 @@ Public Class frmFlowForm 'FWFunction_STARTED = True FolderWatch.StartStop_FolderWatch() Catch ex As Exception - MsgBox($"Init_Folderwatch: Unexpected error while starting FolderWatch: {ex.Message}", MsgBoxStyle.Critical) - Logger.Error(ex) - Logger.Info($"Init_Folderwatch: Unexpected error: {ex.Message}") + ShowErrorMessage(ex) End Try Try @@ -350,8 +347,7 @@ Public Class frmFlowForm 'FWFunction_STARTED = True FolderWatch.StartStop_FolderWatchSCAN() Catch ex As Exception - MsgBox($"Init_Folderwatch: Unexpected error while starting FolderWatchScan: {ex.Message}", MsgBoxStyle.Critical) - Logger.Info($"Init_Folderwatch: Unexpected error: {ex.Message}") + ShowErrorMessage(ex) End Try End Sub @@ -529,12 +525,12 @@ Public Class frmFlowForm Private Function FormLoaded_Visible() As Boolean For Each frm As Form In Application.OpenForms If frm.Name.Equals("frmSearchStart") Or frm.Name.Equals("frmGlobix_Index") Or frm.Name.Equals("frmAdmin_Start") Then - Me.Visible = False - Exit Function + Return False End If Next - Me.Visible = True + TimerCheckActiveForms.Enabled = False + Return True End Function Private Sub DatenbankverbindungToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles DatenbankverbindungToolStripMenuItem.Click @@ -542,13 +538,13 @@ Public Class frmFlowForm End Sub Private Sub TimerCheckActiveForms_Tick(sender As Object, e As EventArgs) Handles TimerCheckActiveForms.Tick - FormLoaded_Visible() - If Me.Visible = False Then Exit Sub + Visible = FormLoaded_Visible() + If Visible = False Then Exit Sub End Sub Private Sub NotifyIcon_DoubleClick(sender As Object, e As EventArgs) Handles NotifyIcon.DoubleClick - If Me.Visible = False Then - Me.Visible = True + If Visible = False Then + Visible = True TimerCheckActiveForms.Enabled = False End If End Sub @@ -657,7 +653,7 @@ Public Class frmFlowForm Next Show() Catch ex As Exception - MsgBox("Unexpected Error in Check_Dropped_Files:" & vbNewLine & ex.Message, MsgBoxStyle.Critical) + ShowErrorMessage(ex) Show() End Try @@ -673,8 +669,7 @@ Public Class frmFlowForm TimerCheckActiveForms.Enabled = True End If Catch ex As Exception - Logger.Error(ex) - MsgBox(ex.Message, MsgBoxStyle.Critical) + ShowErrorMessage(ex) End Try End Sub Sub NotifyIconReset() @@ -696,7 +691,7 @@ Public Class frmFlowForm End Select NotifyIcon.ShowBalloonTip(30000, NI_TITLE, NI_MESSAGE, oNIType) Catch ex As Exception - + ShowErrorMessage(ex) End Try End Sub Sub Start_Folderwatch() @@ -749,8 +744,7 @@ Public Class frmFlowForm Logger.Info("FWSCAN not started") End If Catch ex As Exception - Logger.Info("Error while starting folderwatch scan: " & ex.Message) - Logger.Error(ex.Message) + ShowErrorMessage(ex) End Try Try @@ -786,8 +780,7 @@ Public Class frmFlowForm Logger.Info("Folderwatch not started") End If Catch ex As Exception - Logger.Info("Error while starting folderwatch: " & ex.Message) - Logger.Error(ex.Message) + ShowErrorMessage(ex) End Try If TimerFolderwatch.Enabled = False Then