diff --git a/GUIs.Common/Base/BaseErrorHandler.vb b/GUIs.Common/Base/BaseErrorHandler.vb index 30bffa3c..481cc53b 100644 --- a/GUIs.Common/Base/BaseErrorHandler.vb +++ b/GUIs.Common/Base/BaseErrorHandler.vb @@ -3,7 +3,7 @@ Imports System.Windows.Forms Imports DigitalData.Modules.Logging Namespace Base - Public Class BaseErrorHandler + Public Class NNBaseErrorHandler Private ReadOnly _LogConfig As LogConfig Private ReadOnly _Logger As Logger Private ReadOnly _Form As Form diff --git a/GUIs.Common/Base/BaseForm.vb b/GUIs.Common/Base/BaseForm.vb index f11cfabb..9ea5b30b 100644 --- a/GUIs.Common/Base/BaseForm.vb +++ b/GUIs.Common/Base/BaseForm.vb @@ -3,11 +3,10 @@ Imports DevExpress.XtraEditors Imports DigitalData.Modules.Logging Namespace Base - Public Class BaseForm + Public Class NNBaseForm Inherits XtraForm Private ReadOnly _Logger As Logger - Private ReadOnly _ErrorHandler As BaseErrorHandler Protected ReadOnly Property Logger As Logger Get @@ -25,7 +24,7 @@ Namespace Base ' My.LogConfig is undefined in the designer _Logger = LogConfig.GetLogger(oClassName) - _ErrorHandler = New BaseErrorHandler(LogConfig, _Logger, Me) + '_ErrorHandler = New BaseErrorHandler(LogConfig, _Logger, Me) ' When you add something, be careful if it ' depends on a global var like My.LogConfig @@ -34,16 +33,16 @@ Namespace Base ''' ============== PUBLIC METHODS ============== Public Sub ShowInfoMessage(Message As String) - _ErrorHandler.ShowInfoMessage(Message) + '_ErrorHandler.ShowInfoMessage(Message) End Sub Public Sub ShowErrorMessage(Exception As Exception) Dim oCallingClass = LogConfig.GetClassFullName(IncludeMethodNames:=True, Parts:=2) - _ErrorHandler.ShowErrorMessage(Exception, oCallingClass) + '_ErrorHandler.ShowErrorMessage(Exception, oCallingClass) End Sub Public Sub ShowErrorMessage(ErrorMessage As String) - _ErrorHandler.ShowErrorMessage(ErrorMessage) + '_ErrorHandler.ShowErrorMessage(ErrorMessage) End Sub End Class End Namespace diff --git a/GUIs.Common/Base/BaseRibbonForm.vb b/GUIs.Common/Base/BaseRibbonForm.vb deleted file mode 100644 index 6e6b586f..00000000 --- a/GUIs.Common/Base/BaseRibbonForm.vb +++ /dev/null @@ -1,62 +0,0 @@ -Imports DevExpress.XtraBars.Docking -Imports DevExpress.XtraBars.Ribbon -Imports DigitalData.Modules.Logging - -Namespace Base - ''' - ''' This BaseClass is used to provide common functionality like the Logger or ErrorHandler to all Forms - ''' - ''' - ''' To use it, create a form and change the `Inherits` statement in FormName.Designer.vb to this form. - ''' - ''' Partial Class frmExample - ''' Inherits BaseRibbonForm - ''' - ''' ... - ''' End Class - ''' - Public Class BaseRibbonForm - Inherits RibbonForm - - Private _Logger As Logger - Private _ErrorHandler As BaseErrorHandler - - Protected ReadOnly Property Logger As Logger - Get - Return _Logger - End Get - End Property - - Public Sub New() - End Sub - - Public Sub InitializeBaseForm(LogConfig As LogConfig) - ' Get the full name of the inheriting form - ' so the log messages have the right classname - Dim oClassName = [GetType]().FullName - - ' My.LogConfig is undefined in the designer - _Logger = LogConfig?.GetLogger(oClassName) - _ErrorHandler = New BaseErrorHandler(LogConfig, _Logger, Me) - - ' When you add something, be careful if it - ' depends on a global var like My.LogConfig - ' you might need to check for its existence with ? - End Sub - - ''' ============== PUBLIC METHODS ============== - Public Sub ShowInfoMessage(Message As String) - _ErrorHandler.ShowInfoMessage(Message) - End Sub - - Public Sub ShowErrorMessage(Exception As Exception) - Dim oCallingClass = LogConfig.GetClassFullName(IncludeMethodNames:=True, Parts:=2) - _ErrorHandler.ShowErrorMessage(Exception, oCallingClass) - End Sub - - Public Sub ShowErrorMessage(ErrorMessage As String) - Dim oCallingClass = LogConfig.GetClassFullName(IncludeMethodNames:=True, Parts:=2) - _ErrorHandler.ShowErrorMessage(New ApplicationException(ErrorMessage), oCallingClass) - End Sub - End Class -End Namespace diff --git a/GUIs.Common/Common.vbproj b/GUIs.Common/Common.vbproj index a519360f..8ecd345b 100644 --- a/GUIs.Common/Common.vbproj +++ b/GUIs.Common/Common.vbproj @@ -112,9 +112,6 @@ Form - - Form - @@ -124,6 +121,7 @@ Form + frmDialog.vb @@ -563,5 +561,14 @@ + + + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/FormHelper.vb b/GUIs.Common/FormHelper.vb new file mode 100644 index 00000000..6996d844 --- /dev/null +++ b/GUIs.Common/FormHelper.vb @@ -0,0 +1,47 @@ +Imports DigitalData.Modules.Logging +Imports System.Windows.Forms + +Public Class FormHelper + Private ReadOnly LogConfig As LogConfig + Private ReadOnly Logger As Logger + Private ReadOnly Form As Form + + Public Sub New(pLogConfig As LogConfig, pForm As Form) + LogConfig = pLogConfig + Logger = pLogConfig.GetLogger() + Form = pForm + End Sub + + Public Function ShowInfoMessage(pMessage As String, pTitle As String) As DialogResult + Logger.Info(pMessage) + + Dim oForm As New frmDialog(pMessage, pTitle, frmDialog.DialogType.Info) + Return oForm.ShowDialog() + End Function + + Public Function ShowErrorMessage(pMessage As String, pTitle As String) As DialogResult + Return ShowErrorMessage(New ApplicationException(pMessage), pTitle) + End Function + + Public Function ShowErrorMessage(pException As Exception, pTitle As String) As DialogResult + Logger.Error(pException) + + Dim oMessage = String.Format("In der Funktion '{0}' ist folgender Fehler aufgetreten: {1}", pTitle, vbNewLine & vbNewLine & pException.Message) + + If LogConfig.Debug Then + oMessage &= vbNewLine & vbNewLine & "=== Debug Information ===" + oMessage &= vbNewLine & vbNewLine & "Stacktrace:" + oMessage &= vbNewLine & pException.StackTrace + End If + + Dim oForm As New frmDialog(oMessage, pTitle, frmDialog.DialogType.Error) + Return oForm.ShowDialog() + End Function + + Public Function ShowWarningMessage(pMessage As String, pTitle As String) As DialogResult + Logger.Warn(pMessage) + + Dim oForm As New frmDialog(pMessage, pTitle, frmDialog.DialogType.Error) + Return oForm.ShowDialog() + End Function +End Class diff --git a/GUIs.Common/IBaseForm.vb b/GUIs.Common/IBaseForm.vb index d4e0913e..a8c6c99e 100644 --- a/GUIs.Common/IBaseForm.vb +++ b/GUIs.Common/IBaseForm.vb @@ -4,5 +4,4 @@ Imports DigitalData.Modules.Logging Public Interface IBaseForm ReadOnly Property LogConfig As LogConfig ReadOnly Property Logger As Logger - ReadOnly Property ErrorHandler As BaseErrorHandler End Interface diff --git a/GUIs.Common/My Project/Resources.Designer.vb b/GUIs.Common/My Project/Resources.Designer.vb index 4d4b2c7c..fe1f2277 100644 --- a/GUIs.Common/My Project/Resources.Designer.vb +++ b/GUIs.Common/My Project/Resources.Designer.vb @@ -90,6 +90,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property actions_checkcircled() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("actions_checkcircled", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -180,6 +190,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property cancel() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("cancel", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -190,6 +210,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property checkbox() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("checkbox", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' diff --git a/GUIs.Common/My Project/Resources.resx b/GUIs.Common/My Project/Resources.resx index 2c33fd80..0c3d15eb 100644 --- a/GUIs.Common/My Project/Resources.resx +++ b/GUIs.Common/My Project/Resources.resx @@ -145,8 +145,8 @@ ..\Resources\ZooFlow-Vergroessern.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\save2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\grid.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -157,9 +157,6 @@ ..\Resources\jpg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\autoarrange1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -172,30 +169,36 @@ ..\Resources\copy.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\zoom_more.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\togglefieldcodes1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\checkbox.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\selectdatamember.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\updatedataextract4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\refreshallpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\enablescrolling.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\title.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\clearpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\save2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\singlepageview1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\save1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\txt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -208,11 +211,14 @@ ..\Resources\bo_contract1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\clearall1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\_page.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\clearpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\categorize.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -220,8 +226,8 @@ ..\Resources\singlepageview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_database3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\title.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\columnheaders.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -232,11 +238,11 @@ ..\Resources\actions_user1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_database3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\filterquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -250,17 +256,20 @@ ..\Resources\private.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\cancel.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\Copy_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\save1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\_page.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\handtool1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\zoom_more.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\ppt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -274,7 +283,7 @@ ..\Resources\_blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\selectdatamember.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_checkcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/GUIs.Common/NNMsgBoxEx.Designer.vb b/GUIs.Common/NNMsgBoxEx.Designer.vb index 1cef32a5..b909dcd0 100644 --- a/GUIs.Common/NNMsgBoxEx.Designer.vb +++ b/GUIs.Common/NNMsgBoxEx.Designer.vb @@ -102,7 +102,7 @@ Partial Class NNMsgBoxEx Me.PanelControl1.Size = New System.Drawing.Size(485, 47) Me.PanelControl1.TabIndex = 23 ' - 'MsgBoxEx + 'NNMsgBoxEx ' Me.Appearance.BackColor = System.Drawing.SystemColors.ControlLightLight Me.Appearance.Options.UseBackColor = True @@ -115,7 +115,7 @@ Partial Class NNMsgBoxEx Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedDialog Me.MaximizeBox = False Me.MinimizeBox = False - Me.Name = "MsgBoxEx" + Me.Name = "NNMsgBoxEx" Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "[Title]" CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/GUIs.Common/NNMsgBoxEx.vb b/GUIs.Common/NNMsgBoxEx.vb index 2d43db46..4d4c4662 100644 --- a/GUIs.Common/NNMsgBoxEx.vb +++ b/GUIs.Common/NNMsgBoxEx.vb @@ -189,4 +189,8 @@ Public Class NNMsgBoxEx Button2 Button3 End Enum + + Private Sub NNMsgBoxEx_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + End Sub End Class diff --git a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb index 05ea3d6d..f0308a2f 100644 --- a/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb +++ b/GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb @@ -15,13 +15,13 @@ Public Class ctrlObjectPropertyDialog Private Property LogConfig As LogConfig Implements IBaseForm.LogConfig Private Property Logger As Logger Implements IBaseForm.Logger - Private Property ErrorHandler As BaseErrorHandler Implements IBaseForm.ErrorHandler Private Property ControlManager As AttributeControls Private Property GridBuilder As GridBuilder Private Property Client As Client Private Property Environment As Environment Private Property ObjectId As Long Private Property HostForm As Form + Private Property FormHelper As FormHelper Private ReadOnly Changes As New Dictionary(Of String, Object) @@ -42,7 +42,6 @@ Public Class ctrlObjectPropertyDialog LogConfig = pLogConfig Logger = pLogConfig.GetLogger() HostForm = pHostForm - ErrorHandler = New BaseErrorHandler(pLogConfig, pHostForm) ControlManager = New AttributeControls(pLogConfig, pEnv, pClient) GridBuilder = New GridBuilder(ViewObjectHistory, ViewValueHistory) @@ -67,10 +66,10 @@ Public Class ctrlObjectPropertyDialog }) Next - ErrorHandler.ShowInfoMessage($"{Changes.Count} Änderungen gespeichert!") + FormHelper.ShowInfoMessage($"{Changes.Count} Änderungen gespeichert!") Changes.Clear() Catch ex As Exception - ErrorHandler.ShowErrorMessage(ex, "SaveChanges") + FormHelper.ShowErrorMessage(ex, "SaveChanges") End Try End Function diff --git a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb index 0cc68a05..a2f70227 100644 --- a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb +++ b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb @@ -20,10 +20,10 @@ Public Class frmObjectPropertyDialog Private ReadOnly ObjectId As Int64 Private ReadOnly DatabaseIDB As MSSQLServer Private ReadOnly ControlManager As AttributeControls + Private Property FormHelper As FormHelper Private ReadOnly Property LogConfig As LogConfig Implements IBaseForm.LogConfig Private ReadOnly Property Logger As Logger Implements IBaseForm.Logger - Private ReadOnly Property ErrorHandler As BaseErrorHandler Implements IBaseForm.ErrorHandler Private ReadOnly Changes As New Dictionary(Of String, Object) @@ -41,7 +41,6 @@ Public Class frmObjectPropertyDialog ControlManager = New AttributeControls(LogConfig, Environment, pClient) AddHandler ControlManager.EditValueChanged, AddressOf BaseEdit_EditValueChanged - ErrorHandler = New BaseErrorHandler(LogConfig, Me) End Sub Private Async Sub frmObjectPropertyDialog_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -68,7 +67,7 @@ Public Class frmObjectPropertyDialog cmbBusinessEntity.EditValue = oEntityIds.First() Catch ex As Exception - ErrorHandler.ShowErrorMessage(ex, "frmObjectPropertyDialog_Load") + FormHelper.ShowErrorMessage(ex, "frmObjectPropertyDialog_Load") Finally If oHandle IsNot Nothing Then SplashScreenManager.CloseOverlayForm(oHandle) @@ -225,10 +224,10 @@ Public Class frmObjectPropertyDialog }) Next - ErrorHandler.ShowInfoMessage($"{Changes.Count} Änderungen gespeichert!") + FormHelper.ShowInfoMessage($"{Changes.Count} Änderungen gespeichert!", "btnSave_ItemClick") Changes.Clear() Catch ex As Exception - ErrorHandler.ShowErrorMessage(ex, "btnSave_ItemClick") + FormHelper.ShowErrorMessage(ex, "btnSave_ItemClick") End Try End Sub diff --git a/GUIs.Common/Resources/actions_checkcircled1.svg b/GUIs.Common/Resources/actions_checkcircled1.svg new file mode 100644 index 00000000..b1b6aa99 --- /dev/null +++ b/GUIs.Common/Resources/actions_checkcircled1.svg @@ -0,0 +1,15 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/cancel.svg b/GUIs.Common/Resources/cancel.svg new file mode 100644 index 00000000..8bd80aaf --- /dev/null +++ b/GUIs.Common/Resources/cancel.svg @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/checkbox.svg b/GUIs.Common/Resources/checkbox.svg new file mode 100644 index 00000000..f7d5c617 --- /dev/null +++ b/GUIs.Common/Resources/checkbox.svg @@ -0,0 +1,17 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/frmDialog.Designer.vb b/GUIs.Common/frmDialog.Designer.vb index 8c6eddee..87f0a808 100644 --- a/GUIs.Common/frmDialog.Designer.vb +++ b/GUIs.Common/frmDialog.Designer.vb @@ -22,76 +22,152 @@ Partial Class frmDialog 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() - Me.OK_Button = New System.Windows.Forms.Button() - Me.Cancel_Button = New System.Windows.Forms.Button() - Me.Panel1 = New System.Windows.Forms.Panel() - Me.lblMeldung = New System.Windows.Forms.Label() - Me.Panel2 = New System.Windows.Forms.Panel() - Me.Panel1.SuspendLayout() - Me.Panel2.SuspendLayout() + Me.components = New System.ComponentModel.Container() + Me.btnPositive = New DevExpress.XtraEditors.SimpleButton() + Me.btnNegative = New DevExpress.XtraEditors.SimpleButton() + Me.pnlContent = New DevExpress.XtraEditors.PanelControl() + Me.txtContent = New DevExpress.XtraEditors.LabelControl() + Me.SvgImageBox1 = New DevExpress.XtraEditors.SvgImageBox() + Me.PanelControl1 = New DevExpress.XtraEditors.PanelControl() + Me.pnlHeader = New DevExpress.XtraEditors.PanelControl() + Me.txtTitle = New DevExpress.XtraEditors.LabelControl() + Me.pnlFooter = New DevExpress.XtraEditors.PanelControl() + Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components) + CType(Me.pnlContent, System.ComponentModel.ISupportInitialize).BeginInit() + Me.pnlContent.SuspendLayout() + CType(Me.SvgImageBox1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.pnlHeader, System.ComponentModel.ISupportInitialize).BeginInit() + Me.pnlHeader.SuspendLayout() + CType(Me.pnlFooter, System.ComponentModel.ISupportInitialize).BeginInit() + Me.pnlFooter.SuspendLayout() + CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'OK_Button + 'btnPositive ' - Me.OK_Button.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles) - Me.OK_Button.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.OK_Button.Location = New System.Drawing.Point(3, 10) - Me.OK_Button.Name = "OK_Button" - Me.OK_Button.Size = New System.Drawing.Size(86, 32) - Me.OK_Button.TabIndex = 0 - Me.OK_Button.Text = "OK" + Me.btnPositive.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnPositive.DialogResult = System.Windows.Forms.DialogResult.OK + Me.btnPositive.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.actions_checkcircled + Me.btnPositive.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) + Me.btnPositive.Location = New System.Drawing.Point(386, 5) + Me.btnPositive.Name = "btnPositive" + Me.btnPositive.Size = New System.Drawing.Size(100, 23) + Me.btnPositive.TabIndex = 0 + Me.btnPositive.Text = "OK" ' - 'Cancel_Button + 'btnNegative ' - Me.Cancel_Button.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) - Me.Cancel_Button.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.Cancel_Button.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Cancel_Button.Location = New System.Drawing.Point(358, 10) - Me.Cancel_Button.Name = "Cancel_Button" - Me.Cancel_Button.Size = New System.Drawing.Size(91, 32) - Me.Cancel_Button.TabIndex = 1 - Me.Cancel_Button.Text = "Abbrechen" + Me.btnNegative.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.btnNegative.DialogResult = System.Windows.Forms.DialogResult.Cancel + Me.btnNegative.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.cancel + Me.btnNegative.ImageOptions.SvgImageSize = New System.Drawing.Size(16, 16) + Me.btnNegative.Location = New System.Drawing.Point(280, 5) + Me.btnNegative.Name = "btnNegative" + Me.btnNegative.Size = New System.Drawing.Size(100, 23) + Me.btnNegative.TabIndex = 1 + Me.btnNegative.Text = "Abbrechen" ' - 'Panel1 + 'pnlContent ' - Me.Panel1.BackColor = System.Drawing.Color.OrangeRed - Me.Panel1.Controls.Add(Me.lblMeldung) - Me.Panel1.Dock = System.Windows.Forms.DockStyle.Top - Me.Panel1.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.Panel1.Location = New System.Drawing.Point(0, 0) - Me.Panel1.Name = "Panel1" - Me.Panel1.Size = New System.Drawing.Size(452, 180) - Me.Panel1.TabIndex = 2 + Me.pnlContent.Controls.Add(Me.txtContent) + Me.pnlContent.Controls.Add(Me.SvgImageBox1) + Me.pnlContent.Controls.Add(Me.PanelControl1) + Me.pnlContent.Dock = System.Windows.Forms.DockStyle.Fill + Me.pnlContent.Location = New System.Drawing.Point(0, 40) + Me.pnlContent.Name = "pnlContent" + Me.pnlContent.Size = New System.Drawing.Size(498, 145) + Me.pnlContent.TabIndex = 3 ' - 'lblMeldung + 'txtContent ' - Me.lblMeldung.AutoSize = True - Me.lblMeldung.Font = New System.Drawing.Font("Segoe UI", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) - Me.lblMeldung.Location = New System.Drawing.Point(3, 9) - Me.lblMeldung.Name = "lblMeldung" - Me.lblMeldung.Size = New System.Drawing.Size(56, 21) - Me.lblMeldung.TabIndex = 0 - Me.lblMeldung.Text = "Label1" + Me.txtContent.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _ + Or System.Windows.Forms.AnchorStyles.Left) _ + Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles) + Me.txtContent.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!) + Me.txtContent.Appearance.Options.UseFont = True + Me.txtContent.Appearance.Options.UseTextOptions = True + Me.txtContent.Appearance.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Top + Me.txtContent.AutoEllipsis = True + Me.txtContent.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None + Me.txtContent.Location = New System.Drawing.Point(98, 6) + Me.txtContent.Name = "txtContent" + Me.txtContent.Padding = New System.Windows.Forms.Padding(10) + Me.txtContent.Size = New System.Drawing.Size(388, 133) + Me.txtContent.TabIndex = 1 + Me.txtContent.Text = "txtContent" ' - 'Panel2 + 'SvgImageBox1 ' - Me.Panel2.Controls.Add(Me.OK_Button) - Me.Panel2.Controls.Add(Me.Cancel_Button) - Me.Panel2.Dock = System.Windows.Forms.DockStyle.Fill - Me.Panel2.Location = New System.Drawing.Point(0, 180) - Me.Panel2.Name = "Panel2" - Me.Panel2.Size = New System.Drawing.Size(452, 45) - Me.Panel2.TabIndex = 3 + Me.SvgImageBox1.BackColor = System.Drawing.Color.Transparent + Me.SvgImageBox1.Location = New System.Drawing.Point(22, 16) + Me.SvgImageBox1.Name = "SvgImageBox1" + Me.SvgImageBox1.Size = New System.Drawing.Size(60, 60) + Me.SvgImageBox1.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Zoom + Me.SvgImageBox1.TabIndex = 0 + Me.SvgImageBox1.TabStop = False + Me.SvgImageBox1.Text = "SvgImageBox1" + ' + 'PanelControl1 + ' + Me.PanelControl1.Appearance.BackColor = System.Drawing.Color.FromArgb(CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer), CType(CType(240, Byte), Integer)) + Me.PanelControl1.Appearance.Options.UseBackColor = True + Me.PanelControl1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder + Me.PanelControl1.Location = New System.Drawing.Point(12, 6) + Me.PanelControl1.Name = "PanelControl1" + Me.PanelControl1.Size = New System.Drawing.Size(80, 80) + Me.PanelControl1.TabIndex = 2 + ' + 'pnlHeader + ' + Me.pnlHeader.Appearance.BackColor = System.Drawing.Color.FromArgb(CType(CType(165, Byte), Integer), CType(CType(36, Byte), Integer), CType(CType(19, Byte), Integer)) + Me.pnlHeader.Appearance.Options.UseBackColor = True + Me.pnlHeader.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder + Me.pnlHeader.Controls.Add(Me.txtTitle) + Me.pnlHeader.Dock = System.Windows.Forms.DockStyle.Top + Me.pnlHeader.Location = New System.Drawing.Point(0, 0) + Me.pnlHeader.Name = "pnlHeader" + Me.pnlHeader.Size = New System.Drawing.Size(498, 40) + Me.pnlHeader.TabIndex = 4 + ' + 'txtTitle + ' + Me.txtTitle.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.txtTitle.Appearance.ForeColor = System.Drawing.Color.White + Me.txtTitle.Appearance.Options.UseFont = True + Me.txtTitle.Appearance.Options.UseForeColor = True + Me.txtTitle.Location = New System.Drawing.Point(12, 12) + Me.txtTitle.Name = "txtTitle" + Me.txtTitle.Size = New System.Drawing.Size(45, 17) + Me.txtTitle.TabIndex = 0 + Me.txtTitle.Text = "txtTitle" + ' + 'pnlFooter + ' + Me.pnlFooter.Controls.Add(Me.btnPositive) + Me.pnlFooter.Controls.Add(Me.btnNegative) + Me.pnlFooter.Dock = System.Windows.Forms.DockStyle.Bottom + Me.pnlFooter.Location = New System.Drawing.Point(0, 185) + Me.pnlFooter.Name = "pnlFooter" + Me.pnlFooter.Size = New System.Drawing.Size(498, 40) + Me.pnlFooter.TabIndex = 5 + ' + 'SvgImageCollection1 + ' + Me.SvgImageCollection1.Add("warning", "image://svgimages/business objects/bo_attention.svg") + Me.SvgImageCollection1.Add("error", "image://svgimages/outlook inspired/highimportance.svg") + Me.SvgImageCollection1.Add("success", "image://svgimages/icon builder/actions_checkcircled.svg") + Me.SvgImageCollection1.Add("info", "image://svgimages/outlook inspired/about.svg") + Me.SvgImageCollection1.Add("question", "image://svgimages/icon builder/actions_question.svg") ' 'frmDialog ' - Me.AcceptButton = Me.OK_Button Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.CancelButton = Me.Cancel_Button - Me.ClientSize = New System.Drawing.Size(452, 225) - Me.Controls.Add(Me.Panel2) - Me.Controls.Add(Me.Panel1) + Me.ClientSize = New System.Drawing.Size(498, 225) + Me.Controls.Add(Me.pnlContent) + Me.Controls.Add(Me.pnlFooter) + Me.Controls.Add(Me.pnlHeader) Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None Me.MaximizeBox = False Me.MinimizeBox = False @@ -99,15 +175,27 @@ Partial Class frmDialog Me.ShowInTaskbar = False Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen Me.Text = "Dialog1" - Me.Panel1.ResumeLayout(False) - Me.Panel1.PerformLayout() - Me.Panel2.ResumeLayout(False) + CType(Me.pnlContent, System.ComponentModel.ISupportInitialize).EndInit() + Me.pnlContent.ResumeLayout(False) + CType(Me.SvgImageBox1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.pnlHeader, System.ComponentModel.ISupportInitialize).EndInit() + Me.pnlHeader.ResumeLayout(False) + Me.pnlHeader.PerformLayout() + CType(Me.pnlFooter, System.ComponentModel.ISupportInitialize).EndInit() + Me.pnlFooter.ResumeLayout(False) + CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub - Friend WithEvents OK_Button As System.Windows.Forms.Button - Friend WithEvents Cancel_Button As System.Windows.Forms.Button - Friend WithEvents Panel1 As Windows.Forms.Panel - Friend WithEvents Panel2 As Windows.Forms.Panel - Friend WithEvents lblMeldung As Windows.Forms.Label + Friend WithEvents btnNegative As DevExpress.XtraEditors.SimpleButton + Friend WithEvents btnPositive As DevExpress.XtraEditors.SimpleButton + Friend WithEvents pnlContent As DevExpress.XtraEditors.PanelControl + Friend WithEvents pnlHeader As DevExpress.XtraEditors.PanelControl + Friend WithEvents pnlFooter As DevExpress.XtraEditors.PanelControl + Friend WithEvents SvgImageBox1 As DevExpress.XtraEditors.SvgImageBox + Friend WithEvents SvgImageCollection1 As DevExpress.Utils.SvgImageCollection + Friend WithEvents txtContent As DevExpress.XtraEditors.LabelControl + Friend WithEvents txtTitle As DevExpress.XtraEditors.LabelControl + Friend WithEvents PanelControl1 As DevExpress.XtraEditors.PanelControl End Class diff --git a/GUIs.Common/frmDialog.resx b/GUIs.Common/frmDialog.resx index 1af7de15..f722219e 100644 --- a/GUIs.Common/frmDialog.resx +++ b/GUIs.Common/frmDialog.resx @@ -117,4 +117,7 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + 17, 17 + \ No newline at end of file diff --git a/GUIs.Common/frmDialog.vb b/GUIs.Common/frmDialog.vb index 775c7293..3fa8e1da 100644 --- a/GUIs.Common/frmDialog.vb +++ b/GUIs.Common/frmDialog.vb @@ -2,38 +2,101 @@ Imports System.Windows.Forms Public Class frmDialog - Public Sub New(pMessageText As String, pTitle As String, IsError As Boolean) + +#Region "WinAPI" + Public Const WM_NCLBUTTONDOWN As Integer = &HA1 + Public Const HT_CAPTION As Integer = &H2 + + Public Shared Function SendMessage(ByVal hWnd As IntPtr, ByVal Msg As Integer, ByVal wParam As Integer, ByVal lParam As Integer) As Integer + End Function + + Public Shared Function ReleaseCapture() As Boolean + End Function +#End Region + + Public Enum DialogType + Warning + [Error] + Success + Info + Question + End Enum + + Public Sub New(pMessageText As String, pTitle As String, pDialogType As DialogType) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + txtContent.Text = pMessageText + txtTitle.Text = pTitle - Me.lblMeldung.Text = pMessageText - Me.Text = pTitle - If IsError Then - Panel1.BackColor = Color.Red - Cancel_Button.Visible = False - Else - Panel1.BackColor = Color.OrangeRed - Cancel_Button.Visible = True + Select Case pDialogType + Case DialogType.Success + pnlContent.BackColor = Color.LightGreen + SvgImageBox1.SvgImage = SvgImageCollection1.Item("success") + btnNegative.Visible = False + SetOkCancelButtons() + + Case DialogType.Info + pnlContent.BackColor = Color.LightBlue + SvgImageBox1.SvgImage = SvgImageCollection1.Item("info") + SetOkCancelButtons() + + Case DialogType.Error + pnlContent.BackColor = Color.LightCoral + SvgImageBox1.SvgImage = SvgImageCollection1.Item("error") + btnNegative.Visible = False + SetOkCancelButtons() + + Case DialogType.Warning + pnlContent.BackColor = Color.LightYellow + SvgImageBox1.SvgImage = SvgImageCollection1.Item("warning") + SetOkCancelButtons() + + Case DialogType.Question + pnlContent.BackColor = Color.LightYellow + SvgImageBox1.SvgImage = SvgImageCollection1.Item("question") + SetYesNoButtons() + + + End Select + + Dim oLineBreaks = txtContent.Text.Split(vbNewLine).Count + + If oLineBreaks > 6 Then + Dim oHeightOffset = oLineBreaks * 20 + Height += oHeightOffset End If + + btnPositive.Focus() End Sub - Private Sub OK_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles OK_Button.Click - Me.DialogResult = System.Windows.Forms.DialogResult.OK - Me.Close() + Private Sub SetYesNoButtons() + btnNegative.Text = "Nein" + btnNegative.DialogResult = DialogResult.No + btnPositive.Text = "Ja" + btnPositive.DialogResult = DialogResult.Yes End Sub - Private Sub Cancel_Button_Click(ByVal sender As System.Object, ByVal e As System.EventArgs) Handles Cancel_Button.Click - Me.DialogResult = System.Windows.Forms.DialogResult.Cancel - Me.Close() + Private Sub SetOkCancelButtons() + btnNegative.Text = "Abbrechen" + btnNegative.DialogResult = DialogResult.Cancel + btnPositive.Text = "OK" + btnPositive.DialogResult = DialogResult.OK End Sub + Public Sub CancelButtonInvisible() - Cancel_Button.Visible = False + btnNegative.Visible = False End Sub Public Sub CancelButtonVisible() - Cancel_Button.Visible = True + btnNegative.Visible = True End Sub + Private Sub Header_MouseDown(ByVal sender As Object, ByVal e As MouseEventArgs) Handles pnlHeader.MouseDown, txtTitle.MouseDown + If e.Button = MouseButtons.Left Then + ReleaseCapture() + SendMessage(Handle, WM_NCLBUTTONDOWN, HT_CAPTION, 0) + End If + End Sub End Class diff --git a/GUIs.Common/frmDocumentResultList.vb b/GUIs.Common/frmDocumentResultList.vb index ea0df5a2..d346b0ef 100644 --- a/GUIs.Common/frmDocumentResultList.vb +++ b/GUIs.Common/frmDocumentResultList.vb @@ -31,7 +31,6 @@ Public Class frmDocumentResultList ' Interface implementations Private ReadOnly Property LogConfig As LogConfig Implements IBaseForm.LogConfig Private ReadOnly Property Logger As Logger Implements IBaseForm.Logger - Public ReadOnly Property ErrorHandler As BaseErrorHandler Implements IBaseForm.ErrorHandler Public Property ShouldReturnToPreviousForm As Boolean = False Implements IResultForm.ShouldReturnToPreviousForm ' Helper Classes @@ -48,6 +47,7 @@ Public Class frmDocumentResultList Private ReadOnly Helpers As DocumentResultList.Helpers Private ReadOnly Params As Params Private ReadOnly LayoutManager As Layout + Private ReadOnly FormHelper As FormHelper Private WithEvents Watcher As Watcher ' Runtime variables @@ -97,7 +97,7 @@ Public Class frmDocumentResultList LogConfig = pLogConfig Logger = pLogConfig.GetLogger() - ErrorHandler = New BaseErrorHandler(pLogConfig, Me) + FormHelper = New FormHelper(pLogConfig, Me) Environment = pEnvironment Params = pParams @@ -228,7 +228,7 @@ Public Class frmDocumentResultList End If Catch ex As Exception - ErrorHandler.ShowErrorMessage(ex, "Form Load", "Error while loading results") + FormHelper.ShowErrorMessage(ex, "Error while loading results") Finally IsLoading = False @@ -288,7 +288,7 @@ Public Class frmDocumentResultList DocumentViewer1.LoadFile(oFileName, New MemoryStream(oDocument.Contents)) If IsNothing(oDocument) Then DocumentViewer1.CloseDocument() - ErrorHandler.ShowErrorMessage("File could not be loaded!") + FormHelper.ShowErrorMessage("File could not be loaded!", "GridView_FocusedRowChanged") Exit Sub End If @@ -310,7 +310,7 @@ Public Class frmDocumentResultList UpdateRibbonActions(Nothing) End If Catch ex As Exception - ErrorHandler.ShowErrorMessage(ex, "GridView_FocusedRowChanged") + FormHelper.ShowErrorMessage(ex, "GridView_FocusedRowChanged") Finally Cursor = Cursors.Default End Try @@ -400,7 +400,7 @@ Public Class frmDocumentResultList End If Catch ex As Exception - ErrorHandler.ShowErrorMessage(ex, "Watcher_FileChanged") + FormHelper.ShowErrorMessage(ex, "Watcher_FileChanged") Finally ' Signal to the watcher that the file is no longer in use diff --git a/GUIs.Common/frmFileFlow_Duplicate.Designer.vb b/GUIs.Common/frmFileFlow_Duplicate.Designer.vb index ae867c4e..b50d962f 100644 --- a/GUIs.Common/frmFileFlow_Duplicate.Designer.vb +++ b/GUIs.Common/frmFileFlow_Duplicate.Designer.vb @@ -27,16 +27,16 @@ Partial Class frmFileFlow_Duplicate Me.SimpleButton2 = New DevExpress.XtraEditors.SimpleButton() Me.SimpleButton1 = New DevExpress.XtraEditors.SimpleButton() Me.LabelControlMessage = New DevExpress.XtraEditors.LabelControl() + Me.PictureEdit1 = New DevExpress.XtraEditors.PictureEdit() Me.PanelControl2 = New DevExpress.XtraEditors.PanelControl() Me.SimpleButton5 = New DevExpress.XtraEditors.SimpleButton() Me.SimpleButton4 = New DevExpress.XtraEditors.SimpleButton() Me.SimpleButton3 = New DevExpress.XtraEditors.SimpleButton() - Me.PictureEdit1 = New DevExpress.XtraEditors.PictureEdit() CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).BeginInit() Me.PanelControl1.SuspendLayout() + CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.PanelControl2, System.ComponentModel.ISupportInitialize).BeginInit() Me.PanelControl2.SuspendLayout() - CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' 'PanelControl1 @@ -98,6 +98,18 @@ Partial Class frmFileFlow_Duplicate Me.LabelControlMessage.TabIndex = 1 Me.LabelControlMessage.Text = "Diese Datei ist doppelt....Text aus New" ' + 'PictureEdit1 + ' + Me.PictureEdit1.EditValue = CType(resources.GetObject("PictureEdit1.EditValue"), Object) + Me.PictureEdit1.Location = New System.Drawing.Point(12, 22) + Me.PictureEdit1.Name = "PictureEdit1" + Me.PictureEdit1.Properties.Appearance.BackColor = System.Drawing.Color.DarkRed + Me.PictureEdit1.Properties.Appearance.Options.UseBackColor = True + Me.PictureEdit1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto] + Me.PictureEdit1.Properties.SizeMode = DevExpress.XtraEditors.Controls.PictureSizeMode.Zoom + Me.PictureEdit1.Size = New System.Drawing.Size(100, 96) + Me.PictureEdit1.TabIndex = 0 + ' 'PanelControl2 ' Me.PanelControl2.Appearance.BackColor = System.Drawing.SystemColors.Info @@ -160,18 +172,6 @@ Partial Class frmFileFlow_Duplicate Me.SimpleButton3.TabIndex = 1 Me.SimpleButton3.Text = "Datei anzeigen" ' - 'PictureEdit1 - ' - Me.PictureEdit1.EditValue = CType(resources.GetObject("PictureEdit1.EditValue"), Object) - Me.PictureEdit1.Location = New System.Drawing.Point(12, 22) - Me.PictureEdit1.Name = "PictureEdit1" - Me.PictureEdit1.Properties.Appearance.BackColor = System.Drawing.Color.DarkRed - Me.PictureEdit1.Properties.Appearance.Options.UseBackColor = True - Me.PictureEdit1.Properties.ShowCameraMenuItem = DevExpress.XtraEditors.Controls.CameraMenuItemVisibility.[Auto] - Me.PictureEdit1.Properties.SizeMode = DevExpress.XtraEditors.Controls.PictureSizeMode.Zoom - Me.PictureEdit1.Size = New System.Drawing.Size(100, 96) - Me.PictureEdit1.TabIndex = 0 - ' 'frmFileFlow_Duplicate ' Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 17.0!) @@ -189,9 +189,9 @@ Partial Class frmFileFlow_Duplicate CType(Me.PanelControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.PanelControl1.ResumeLayout(False) Me.PanelControl1.PerformLayout() + CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.PanelControl2, System.ComponentModel.ISupportInitialize).EndInit() Me.PanelControl2.ResumeLayout(False) - CType(Me.PictureEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) End Sub diff --git a/GUIs.Common/frmFileFlow_Duplicate.resx b/GUIs.Common/frmFileFlow_Duplicate.resx index 7ba1d9b2..d749fb75 100644 --- a/GUIs.Common/frmFileFlow_Duplicate.resx +++ b/GUIs.Common/frmFileFlow_Duplicate.resx @@ -154,6 +154,29 @@ My0wLjktMC4zYy0wLjksMC0xLjQsMS0xLjQsMS40aC0xLjRjMC0wLjgsMC4zLTEuNCwwLjgtMS45czEu Mi0wLjcsMi0wLjcgIHMxLjUsMC4yLDEuOSwwLjZjMC41LDAuNCwwLjcsMC45LDAuNywxLjZDMjguNiw4 LjIsMjYuNyw4LjUsMjYuNyw5LjR6IiBjbGFzcz0iR3JlZW4iIC8+DQo8L3N2Zz4L + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKEDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlVzZXIiPg0KICAgIDxwYXRoIGQ9Ik0xMCw5LjljLTAu + MSwwLjUsMC4yLDAuOSwwLjQsMS40YzAuMiwwLjUtMC4xLDEuNywwLjksMS42YzAsMCwwLDAuMSwwLDAu + MmMwLjYsMi4zLDIsNC45LDQuNyw0LjkgICBjMi43LDAsNC4yLTIuNiw0LjctNC45YzAsMCwwLTAuMSww + LTAuMWMxLDAuMSwwLjYtMS4xLDAuOS0xLjZjMC4yLTAuNSwwLjQtMC45LDAuMy0xLjRjLTAuMS0wLjQt + MC40LTAuNC0wLjUtMC4zICAgYzEuOC00LjktMS4xLTQuNy0xLjEtNC43UzIwLDIsMTQuOCwyQzEwLDIs + OS40LDYsMTAuNSw5LjZDMTAuNCw5LjYsMTAuMSw5LjcsMTAsOS45eiIgY2xhc3M9IkJsYWNrIiAvPg0K + ICAgIDxwYXRoIGQ9Ik0yMCwxOGMtMC44LDEuNS0yLjEsNC00LDRjLTEuOSwwLTMuMi0yLjUtNC00Yy0y + LjMsMy41LTgsMS04LDguNVYzMGgyNHYtMy41QzI4LDE5LjEsMjIuMywyMS40LDIwLDE4eiIgY2xhc3M9 + IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L @@ -230,29 +253,6 @@ Pg0KICAgIDxwYXRoIGQ9Ik0yMiw4SDhWNmgxNFY4eiBNMjIsMTBIOHYyaDE0VjEweiBNMjIsMTRIOHYy aDE0VjE0eiBNMjIsMThIOHYyaDE0VjE4eiBNMjIsMjJIOHYyaDE0VjIyeiIgY2xhc3M9IkJsdWUiIC8+ DQogIDwvZz4NCjwvc3ZnPgs= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKEDAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz - OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp - dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlVzZXIiPg0KICAgIDxwYXRoIGQ9Ik0xMCw5LjljLTAu - MSwwLjUsMC4yLDAuOSwwLjQsMS40YzAuMiwwLjUtMC4xLDEuNywwLjksMS42YzAsMCwwLDAuMSwwLDAu - MmMwLjYsMi4zLDIsNC45LDQuNyw0LjkgICBjMi43LDAsNC4yLTIuNiw0LjctNC45YzAsMCwwLTAuMSww - LTAuMWMxLDAuMSwwLjYtMS4xLDAuOS0xLjZjMC4yLTAuNSwwLjQtMC45LDAuMy0xLjRjLTAuMS0wLjQt - MC40LTAuNC0wLjUtMC4zICAgYzEuOC00LjktMS4xLTQuNy0xLjEtNC43UzIwLDIsMTQuOCwyQzEwLDIs - OS40LDYsMTAuNSw5LjZDMTAuNCw5LjYsMTAuMSw5LjcsMTAsOS45eiIgY2xhc3M9IkJsYWNrIiAvPg0K - ICAgIDxwYXRoIGQ9Ik0yMCwxOGMtMC44LDEuNS0yLjEsNC00LDRjLTEuOSwwLTMuMi0yLjUtNC00Yy0y - LjMsMy41LTgsMS04LDguNVYzMGgyNHYtMy41QzI4LDE5LjEsMjIuMywyMS40LDIwLDE4eiIgY2xhc3M9 - IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L \ No newline at end of file diff --git a/GUIs.Common/frmFileFlow_Duplicate.vb b/GUIs.Common/frmFileFlow_Duplicate.vb index 008e7d52..d3ed53f2 100644 --- a/GUIs.Common/frmFileFlow_Duplicate.vb +++ b/GUIs.Common/frmFileFlow_Duplicate.vb @@ -19,4 +19,7 @@ LabelControlMessage.Text = omessagetext End Sub + Private Sub SimpleButton3_Click(sender As Object, e As EventArgs) Handles SimpleButton3.Click + + End Sub End Class \ No newline at end of file diff --git a/GUIs.Monitor/frmMonitor.Designer.vb b/GUIs.Monitor/frmMonitor.Designer.vb index 61f4dad3..4d2070e4 100644 --- a/GUIs.Monitor/frmMonitor.Designer.vb +++ b/GUIs.Monitor/frmMonitor.Designer.vb @@ -3,7 +3,7 @@ Partial Class frmMonitor 'Inherits DevExpress.XtraBars.Ribbon.RibbonForm - Inherits BaseRibbonForm + Inherits DevExpress.XtraBars.Ribbon.RibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. _ diff --git a/GUIs.Monitor/frmMonitor.vb b/GUIs.Monitor/frmMonitor.vb index 85e2f547..e1eb0b3c 100644 --- a/GUIs.Monitor/frmMonitor.vb +++ b/GUIs.Monitor/frmMonitor.vb @@ -18,6 +18,8 @@ Imports DevExpress.XtraEditors.Controls Public Class frmMonitor Public Property LogConfig As LogConfig + Public Property Logger As Logger + Public Property FormHelper As FormHelper Public Property ConfigManager As ConfigManager(Of Config) Public Property Database As MSSQLServer @@ -33,9 +35,6 @@ Public Class frmMonitor Private ReadOnly DisplayColumns As New List(Of String) From {"COLUMN1", "COLUMN2", "COLUMN3", "ADDED_WHEN", "STATE", "ICON"} - - - Private SQLResultGrids As List(Of GridControl) Private SQLResultTabs As List(Of XtraTabPage) Private ActiveSQLResultGrid As GridControl @@ -76,8 +75,10 @@ Public Class frmMonitor Private Sub frmStart_Load(sender As Object, e As EventArgs) Handles MyBase.Load Try LogConfig = New LogConfig(LogConfig.PathType.AppData, Nothing, Nothing, "Digital Data", "Monitor") + Logger = LogConfig.GetLogger() + FormHelper = New FormHelper(LogConfig, Me) + ConfigManager = New ConfigManager(Of Config)(LogConfig, Application.UserAppDataPath, Application.UserAppDataPath, Application.StartupPath) - InitializeBaseForm(LogConfig) If ConfigManager.Config.ConnectionString = String.Empty Then Dim oSQLConfig As New frmSQLConfig(LogConfig) @@ -86,7 +87,7 @@ Public Class frmMonitor ConfigManager.Save() Application.Restart() Else - ShowErrorMessage("No Database configured. Application will close!") + FormHelper.ShowErrorMessage("No Database configured. Application will close!", "frmStart_Load") Application.Exit() End If @@ -143,7 +144,7 @@ Public Class frmMonitor SplitContainerControl3.Collapsed = True SplitContainerMain.Collapsed = True Catch ex As Exception - ShowErrorMessage(ex) + FormHelper.ShowErrorMessage(ex, "frmStart_Load") End Try End Sub @@ -195,7 +196,7 @@ Public Class frmMonitor Next Return True Catch ex As Exception - ShowErrorMessage(ex) + FormHelper.ShowErrorMessage(ex, "LoadData") Return False Finally SplitContainerContent.Enabled = False @@ -219,7 +220,7 @@ Public Class frmMonitor cmbSearchKeys.Properties.Items.Clear() cmbSearchKeys.Properties.Items.AddRange(SearchKeys) Catch ex As Exception - ShowErrorMessage(ex) + FormHelper.ShowErrorMessage(ex, "LoadSearchKeys") End Try End Sub diff --git a/GUIs.Test.TestGUI/frmMsgBox.vb b/GUIs.Test.TestGUI/frmMsgBox.vb index b7ce4aa3..f88fa83c 100644 --- a/GUIs.Test.TestGUI/frmMsgBox.vb +++ b/GUIs.Test.TestGUI/frmMsgBox.vb @@ -14,11 +14,12 @@ Public Class frmMsgBox End Sub Private Sub SimpleButton1_Click(sender As Object, e As EventArgs) Handles SimpleButton1.Click - Dim oMsgbox = New NNMsgBoxEx("Hallo Welt!", "Ein Titel") + Dim oMsgbox = New frmDialog("Diese Datei ist hier unerwünscht!", "Zooflow", frmDialog.DialogType.Error) oMsgbox.ShowDialog() End Sub Private Sub SimpleButton2_Click(sender As Object, e As EventArgs) Handles SimpleButton2.Click - MsgBox("Hallo Welt", MsgBoxStyle.OkOnly, "EinTitel") + Dim oMsgbox = New frmDialog("Der Fluxkompensator ist leer. Bitte auffüllen!", "File Flow", frmDialog.DialogType.Warning) + oMsgbox.ShowDialog() End Sub End Class \ No newline at end of file diff --git a/GUIs.Test.TestGUI/frmObjectProperties.vb b/GUIs.Test.TestGUI/frmObjectProperties.vb index 2184dd92..9ac74311 100644 --- a/GUIs.Test.TestGUI/frmObjectProperties.vb +++ b/GUIs.Test.TestGUI/frmObjectProperties.vb @@ -18,7 +18,4 @@ Public Class frmObjectProperties Public ReadOnly Property LogConfig As LogConfig Implements IBaseForm.LogConfig Public ReadOnly Property Logger As Logger Implements IBaseForm.Logger - - Public ReadOnly Property ErrorHandler As BaseErrorHandler Implements IBaseForm.ErrorHandler - End Class \ No newline at end of file diff --git a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb index 48867177..c3ada8fd 100644 --- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb +++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.Designer.vb @@ -2,7 +2,7 @@ Partial Class frmAdmin_Globix - Inherits BaseRibbonForm + Inherits DevExpress.XtraBars.Ribbon.RibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. diff --git a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb index 6b31475d..b62e76c4 100644 --- a/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb +++ b/GUIs.ZooFlow/Administration/Globix/frmAdmin_Globix.vb @@ -14,6 +14,9 @@ Public Class frmAdmin_Globix Private AttributesAutomatic As New Dictionary(Of String, String) Private Pages As ClassDetailPageManager + Private Logger As Logger = My.LogConfig.GetLogger + Private FormHelper As FormHelper + Public Sub New(PrimaryKey As Integer, Optional IsInsert As Boolean = False) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() @@ -22,10 +25,10 @@ Public Class frmAdmin_Globix Me.PrimaryKey = PrimaryKey Me.IsInsert = IsInsert Me.GlobixHelper = New ClassGIDatatables(My.LogConfig) + FormHelper = New FormHelper(My.LogConfig, Me) End Sub Private Sub frmAdmin_Globix_Load(sender As Object, e As EventArgs) Handles MyBase.Load - InitializeBaseForm(My.LogConfig) Try VWIDB_DOCTYPE_LANGUAGETableAdapter.Connection.ConnectionString = My.DatabaseIDB.CurrentSQLConnectionString TBDD_DOKUMENTARTTableAdapter.Connection.ConnectionString = My.DatabaseECM.CurrentSQLConnectionString @@ -107,7 +110,7 @@ Public Class frmAdmin_Globix oDragDropManager.AddGridView(viewAssignedUsers) oDragDropManager.AddGridView(viewAvailableUsers) Catch ex As Exception - ShowErrorMessage(ex) + FormHelper.ShowErrorMessage(ex, "frmAdmin_Globix_Load") End Try End Sub Sub Load_TabData() @@ -212,7 +215,7 @@ Public Class frmAdmin_Globix ShowStatus($"{oPage.Name} saved - {Now.ToString}", Color.DodgerBlue) Catch ex As Exception - ShowErrorMessage(ex) + FormHelper.ShowErrorMessage(ex, "BarButtonSave_ItemClick") ShowStatus($"{ex.Message} saved - {Now.ToString}", Color.Red) End Try 'Else @@ -302,7 +305,7 @@ Public Class frmAdmin_Globix Return False End If Catch ex As Exception - ShowErrorMessage(ex) + FormHelper.ShowErrorMessage(ex, "Insert_Doctype") ShowStatus($"Error Saving Fileflow Profile {ex.Message}", Color.Red) Return False End Try @@ -325,7 +328,7 @@ Public Class frmAdmin_Globix End If Catch ex As Exception - ShowErrorMessage(ex) + FormHelper.ShowErrorMessage(ex, "Update_Doctype") Return False End Try @@ -589,11 +592,11 @@ Public Class frmAdmin_Globix Private Sub SimpleButton4_Click(sender As Object, e As EventArgs) Handles SimpleButton4.Click Try If Regex.IsMatch(REGEXTextBox.Text, txtDateinameTest.Text) Then - Dim oMsgBox As New frmDialog("The RegEx resulted in a proper match!", "", False) + Dim oMsgBox As New frmDialog("The RegEx resulted in a proper match!", "Testing Regex", frmDialog.DialogType.Success) oMsgBox.ShowDialog() Else - Dim oMsgBox As New frmDialog("No Match- There might be an error in the RegEx!", "", True) + Dim oMsgBox As New frmDialog("No Match- There might be an error in the RegEx!", "Testing Regex", frmDialog.DialogType.Warning) oMsgBox.ShowDialog() End If @@ -668,7 +671,7 @@ Public Class frmAdmin_Globix ' ShowStatus($"{oPage.Name} deleted!") Catch ex As Exception - ShowErrorMessage(ex) + FormHelper.ShowErrorMessage(ex, "BarButtonItem2_ItemClick") End Try End Sub diff --git a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.Designer.vb b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.Designer.vb index bcd7c590..fd2c9c66 100644 --- a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.Designer.vb +++ b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.Designer.vb @@ -2,7 +2,7 @@ Partial Class frmAdmin_IDBAttribute - Inherits BaseRibbonForm + Inherits DevExpress.XtraBars.Ribbon.RibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. diff --git a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.vb b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.vb index 88ecabe0..b803adb8 100644 --- a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.vb +++ b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBAttribute.vb @@ -1,18 +1,21 @@ -Public Class frmAdmin_IDBAttribute +Imports DigitalData.GUIs.Common + +Public Class frmAdmin_IDBAttribute Implements IAdminForm Public Property HasChanges As Boolean = False Implements IAdminForm.HasChanges Public Property IsInsert As Boolean = False Implements IAdminForm.IsInsert Public Property PrimaryKey As Integer Implements IAdminForm.PrimaryKey + Private FormHelper As FormHelper Public Sub New(PrimaryKey As Integer, Optional IsInsert As Boolean = False) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. - InitializeBaseForm(My.LogConfig) Me.PrimaryKey = PrimaryKey Me.IsInsert = IsInsert + FormHelper = New FormHelper(My.LogConfig, Me) End Sub Private Sub frmAdmin_Attribute_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -27,7 +30,7 @@ DSIDB_Stammdaten.VWIDB_BE_ATTRIBUTE.ADDED_WHOColumn.DefaultValue = My.Application.User.UserName End If Catch ex As Exception - ShowErrorMessage(ex) + FormHelper.ShowErrorMessage(ex, "frmAdmin_Attribute_Load") End Try End Sub Private Sub FillAttribute() @@ -105,7 +108,7 @@ FillAttribute() Return True Catch ex As Exception - ShowErrorMessage(ex) + FormHelper.ShowErrorMessage(ex, "SaveData") ShowStatus($"Unexpeced error saving attribute {TextEdit2.Text} - {ex.Message}", Color.Red) Return False End Try @@ -120,7 +123,7 @@ End If Catch ex As Exception - ShowErrorMessage(ex) + FormHelper.ShowErrorMessage(ex, "DeleteAttribute") Return False End Try End Function diff --git a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBEntity.Designer.vb b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBEntity.Designer.vb index cf70364e..171876eb 100644 --- a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBEntity.Designer.vb +++ b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBEntity.Designer.vb @@ -2,7 +2,7 @@ Partial Class frmAdmin_IDBEntity - Inherits BaseRibbonForm + Inherits DevExpress.XtraBars.Ribbon.RibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. _ diff --git a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBEntity.vb b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBEntity.vb index e7b8d1ee..bb7e0d8b 100644 --- a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBEntity.vb +++ b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBEntity.vb @@ -1,19 +1,21 @@ -Imports DigitalData.Modules.Logging +Imports DigitalData.GUIs.Common +Imports DigitalData.Modules.Logging Public Class frmAdmin_IDBEntity Implements IAdminForm Public Property PrimaryKey As Integer Implements IAdminForm.PrimaryKey Public Property HasChanges As Boolean Implements IAdminForm.HasChanges Public Property IsInsert As Boolean Implements IAdminForm.IsInsert + Private FormHelper As FormHelper Public Sub New(PrimaryKey As Integer, Optional IsInsert As Boolean = False) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. - InitializeBaseForm(My.LogConfig) Me.PrimaryKey = PrimaryKey Me.IsInsert = IsInsert + FormHelper = New FormHelper(My.LogConfig, Me) End Sub Private Sub frmAdmin_IDBEntity_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -27,7 +29,7 @@ Public Class frmAdmin_IDBEntity End If Catch ex As Exception - ShowErrorMessage(ex) + FormHelper.ShowErrorMessage(ex, "frmAdmin_IDBEntity_Load") End Try End Sub @@ -74,7 +76,7 @@ Public Class frmAdmin_IDBEntity Return True Catch ex As Exception - ShowErrorMessage(ex) + FormHelper.ShowErrorMessage(ex, "SaveData") Return False End Try End Function @@ -84,7 +86,7 @@ Public Class frmAdmin_IDBEntity TBIDB_BUSINESS_ENTITYTableAdapter.Delete(PrimaryKey) Return True Catch ex As Exception - ShowErrorMessage(ex) + FormHelper.ShowErrorMessage(ex, "DeleteData") Return False End Try End Function diff --git a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBObjectStore.Designer.vb b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBObjectStore.Designer.vb index b6c43dee..ef831c38 100644 --- a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBObjectStore.Designer.vb +++ b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBObjectStore.Designer.vb @@ -2,7 +2,7 @@ Partial Class frmAdmin_IDBObjectStore - Inherits BaseRibbonForm + Inherits DevExpress.XtraBars.Ribbon.RibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. _ diff --git a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBObjectStore.vb b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBObjectStore.vb index 6ff1d9f8..11340113 100644 --- a/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBObjectStore.vb +++ b/GUIs.ZooFlow/Administration/IDB/frmAdmin_IDBObjectStore.vb @@ -1,4 +1,6 @@ -Public Class frmAdmin_IDBObjectStore +Imports DigitalData.GUIs.Common + +Public Class frmAdmin_IDBObjectStore Implements IAdminForm Public Property PrimaryKey As Integer Implements IAdminForm.PrimaryKey @@ -6,7 +8,7 @@ Public Property HasChanges As Boolean Implements IAdminForm.HasChanges - + Private FormHelper As FormHelper Public Property IsInsert As Boolean Implements IAdminForm.IsInsert Dim oStorePath As String = String.Empty @@ -19,9 +21,9 @@ InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. - InitializeBaseForm(My.LogConfig) Me.PrimaryKey = PrimaryKey Me.IsInsert = IsInsert + FormHelper = New FormHelper(My.LogConfig, Me) End Sub Private Sub BarButtonItem3_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem3.ItemClick @@ -103,7 +105,7 @@ Return True Catch ex As Exception - ShowErrorMessage(ex) + FormHelper.ShowErrorMessage(ex, "SaveData") Return False End Try End Function diff --git a/GUIs.ZooFlow/Administration/Users/frmAdmin_User.vb b/GUIs.ZooFlow/Administration/Users/frmAdmin_User.vb index 9b8f14a1..f05d9f10 100644 --- a/GUIs.ZooFlow/Administration/Users/frmAdmin_User.vb +++ b/GUIs.ZooFlow/Administration/Users/frmAdmin_User.vb @@ -12,9 +12,11 @@ Public Class frmAdmin_User Public Property IsInsert As Boolean Implements IAdminForm.IsInsert - Private Property ErrorHandler As BaseErrorHandler + + Private Property Pages As ClassDetailPageManager Private Property Logger As Logger + Private Property FormHelper As FormHelper Public Sub New(pPrimaryKey As Integer, Optional pIsInsert As Boolean = False) ' Dieser Aufruf ist für den Designer erforderlich. @@ -23,7 +25,6 @@ Public Class frmAdmin_User ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. PrimaryKey = pPrimaryKey IsInsert = pIsInsert - ErrorHandler = New BaseErrorHandler(My.LogConfig, My.LogConfig.GetLogger, Me) Logger = My.LogConfig.GetLogger() End Sub @@ -69,7 +70,7 @@ Public Class frmAdmin_User TBDD_USERTableAdapter.Delete(PrimaryKey) Return True Catch ex As Exception - ErrorHandler.ShowErrorMessage(ex, "DeleteData") + FormHelper.ShowErrorMessage(ex, "DeleteData") Return False End Try End Function @@ -94,7 +95,7 @@ Public Class frmAdmin_User oPage.IsInsert = False txtStatus.Caption = $"{oPage.Name} gespeichert!" Catch ex As Exception - ErrorHandler.ShowErrorMessage(ex, "ItemClick") + FormHelper.ShowErrorMessage(ex, "ItemClick") End Try Else txtStatus.Caption = $"Keine Änderungen" diff --git a/GUIs.ZooFlow/Administration/Users/frmAdmin_UserGroupRelations.vb b/GUIs.ZooFlow/Administration/Users/frmAdmin_UserGroupRelations.vb index f31d457f..74472fc2 100644 --- a/GUIs.ZooFlow/Administration/Users/frmAdmin_UserGroupRelations.vb +++ b/GUIs.ZooFlow/Administration/Users/frmAdmin_UserGroupRelations.vb @@ -6,7 +6,8 @@ Public Class frmAdmin_UserGroupRelations Public ReadOnly Property LogConfig As Modules.Logging.LogConfig Implements IBaseForm.LogConfig Public ReadOnly Property Logger As Modules.Logging.Logger Implements IBaseForm.Logger - Public ReadOnly Property ErrorHandler As BaseErrorHandler Implements IBaseForm.ErrorHandler + + Public Property PrimaryKey As Integer Implements IAdminForm.PrimaryKey Public Property HasChanges As Boolean Implements IAdminForm.HasChanges Public Property IsInsert As Boolean Implements IAdminForm.IsInsert @@ -14,6 +15,7 @@ Public Class frmAdmin_UserGroupRelations Private Property SelectedGroupId As Integer = Nothing Private Property SelectedAvailableUser As Integer = Nothing Private Property SelectedRelatedUser As Integer = Nothing + Private FormHelper As FormHelper = Nothing Public Sub New(pPrimaryKey As Integer) ' Dieser Aufruf ist für den Designer erforderlich. @@ -21,7 +23,7 @@ Public Class frmAdmin_UserGroupRelations ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. LogConfig = My.LogConfig - ErrorHandler = New BaseErrorHandler(LogConfig, Me) + FormHelper = New FormHelper(LogConfig, Me) End Sub Private Async Sub frmAdmin_UserGroupRelations_Load(sender As Object, e As EventArgs) Handles MyBase.Load @@ -39,7 +41,7 @@ Public Class frmAdmin_UserGroupRelations Dim oTable As DataTable = Await My.DatabaseECM.GetDatatableAsync(oSQL) GridControl2.DataSource = oTable Catch ex As Exception - ErrorHandler.ShowErrorMessage(ex, "Fehler beim Laden des Formulars") + FormHelper.ShowErrorMessage(ex, "Fehler beim Laden des Formulars") End Try End Sub @@ -56,7 +58,7 @@ Public Class frmAdmin_UserGroupRelations Dim oTable = Await My.DatabaseECM.GetDatatableAsync(oSql) Return oTable Catch ex As Exception - ErrorHandler.ShowErrorMessage(ex, "GetAvailableUsersByGroupId") + FormHelper.ShowErrorMessage(ex, "GetAvailableUsersByGroupId") Return Nothing End Try End Function @@ -72,7 +74,7 @@ Public Class frmAdmin_UserGroupRelations Dim oTable = Await My.DatabaseECM.GetDatatableAsync(oSql) Return oTable Catch ex As Exception - ErrorHandler.ShowErrorMessage(ex, "GetRelatedUsersByGroupId") + FormHelper.ShowErrorMessage(ex, "GetRelatedUsersByGroupId") Return Nothing End Try End Function diff --git a/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.Designer.vb index f9f843e9..b12cd2ed 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.Designer.vb @@ -2,7 +2,7 @@ Partial Class frmAdmin_ClipboardWatcher - Inherits BaseRibbonForm + Inherits DevExpress.XtraBars.Ribbon.RibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. diff --git a/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.vb b/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.vb index 56e2cf7e..25b5ec7d 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_ClipboardWatcher.vb @@ -33,6 +33,7 @@ Public Class frmAdmin_ClipboardWatcher Private Const PROFILE_TYPE_DATA_ONLY As Integer = 2 Private Pages As ClassDetailPageManager + Private FormHelper As FormHelper Friend Class ProfileType Public Property Id As Integer @@ -57,15 +58,12 @@ Public Class frmAdmin_ClipboardWatcher InitializeComponent() ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. - InitializeBaseForm(My.LogConfig) - Me.PrimaryKey = PrimaryKey Me.IsInsert = IsInsert + FormHelper = New FormHelper(My.LogConfig, Me) End Sub Private Sub frmAdmin_CWProfile_Load(sender As Object, e As EventArgs) Handles Me.Load - InitializeBaseForm(My.LogConfig) - Try TBCW_PROFILESTableAdapter.Connection.ConnectionString = My.DatabaseECM.CurrentSQLConnectionString TBCW_PROFILESTableAdapter.Fill(DBCW_Stammdaten.TBCW_PROFILES, PrimaryKey) @@ -129,7 +127,7 @@ Public Class frmAdmin_ClipboardWatcher AddHandler Pages.CurrentPage_Changed, AddressOf CurrentPage_Changed Catch ex As Exception - ShowErrorMessage(ex) + FormHelper.ShowErrorMessage(ex, "frmAdmin_CWProfile_Load") End Try End Sub @@ -176,7 +174,7 @@ Public Class frmAdmin_ClipboardWatcher ShowStatus($"{oPage.Name} gespeichert!") Catch ex As Exception - ShowErrorMessage(ex) + FormHelper.ShowErrorMessage(ex, "BarButtonSave_ItemClick") End Try Else ShowStatus("Keine Änderungen!") diff --git a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb index 5a81e742..53553c19 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.Designer.vb @@ -2,7 +2,7 @@ Partial Class frmAdmin_SourceSQL - Inherits BaseRibbonForm + Inherits DevExpress.XtraBars.Ribbon.RibbonForm 'Form overrides dispose to clean up the component list. diff --git a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb index bc0bbb8d..a7db961e 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_SourceSQL.vb @@ -1,5 +1,6 @@ Imports DevExpress.XtraEditors.DXErrorProvider Imports DevExpress.XtraLayout +Imports DigitalData.GUIs.Common Public Class frmAdmin_SourceSQL Implements IAdminForm @@ -11,13 +12,15 @@ Public Class frmAdmin_SourceSQL Public Property IsInsert As Boolean Implements IAdminForm.IsInsert Private Pages As ClassDetailPageManager + Private FormHelper As FormHelper Public Sub New(PrimaryKey As Integer) ' Dieser Aufruf ist für den Designer erforderlich. InitializeComponent() + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. - InitializeBaseForm(My.LogConfig) + FormHelper = New FormHelper(My.LogConfig, Me) Me.PrimaryKey = PrimaryKey End Sub @@ -45,7 +48,7 @@ Public Class frmAdmin_SourceSQL ValidationHelper() Catch ex As Exception - ShowErrorMessage(ex) + FormHelper.ShowErrorMessage(ex, "frmAdmin_SourceSQL_Load") End Try End Sub @@ -105,8 +108,8 @@ Public Class frmAdmin_SourceSQL Return True Catch ex As Exception - ShowErrorMessage(ex) - Return False + FormHelper.ShowErrorMessage(ex, "SaveData") + Return False End Try End Function @@ -115,7 +118,7 @@ Public Class frmAdmin_SourceSQL TBZF_ADMIN_SOURCE_SQLTableAdapter.Delete(PrimaryKey) Return True Catch ex As Exception - ShowErrorMessage(ex) + FormHelper.ShowErrorMessage(ex, "DeleteData") Return False End Try End Function diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb index 7ecd6da1..480daedb 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.Designer.vb @@ -4,7 +4,7 @@ Imports DigitalData.GUIs.Common.Base Partial Class frmAdmin_Start - Inherits BaseRibbonForm + Inherits DevExpress.XtraBars.Ribbon.RibbonForm 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. diff --git a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb index a392cd52..30ce375d 100644 --- a/GUIs.ZooFlow/Administration/frmAdmin_Start.vb +++ b/GUIs.ZooFlow/Administration/frmAdmin_Start.vb @@ -16,18 +16,14 @@ Public Class frmAdmin_Start Private CurrentModule As String Private CurrentPage As String Private CurrentItem As ClassDetailForm.DetailData + Private FormHelper As FormHelper + Private Logger As Logger Private DetailForm As ClassDetailForm - Public Sub New() - ' Dieser Aufruf ist für den Designer erforderlich. - InitializeComponent() - - ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. - InitializeBaseForm(My.LogConfig) - End Sub - Private Sub frmAdministration_Load(sender As Object, e As EventArgs) Handles MyBase.Load + FormHelper = New FormHelper(My.LogConfig, Me) + Logger = My.LogConfig.GetLogger() DetailForm = New ClassDetailForm(My.LogConfig) AddHandler DetailForm.DetailFormClosed, AddressOf DetailForm_Closed @@ -46,7 +42,7 @@ Public Class frmAdmin_Start Load_GridData(oDetailData) Else - Dim oMsgBox As New frmDialog($"Could not load data for Page [{oKey}] because it does not exist!", "Error", True) + Dim oMsgBox As New frmDialog($"Could not load data for Page [{oKey}] because it does not exist!", "Error", frmDialog.DialogType.Error) oMsgBox.ShowDialog() End If End If @@ -103,7 +99,7 @@ Public Class frmAdmin_Start End If Catch ex As Exception - ShowErrorMessage(ex) + FormHelper.ShowErrorMessage(ex, "TreeListMenu_FocusedNodeChanged") End Try End Sub @@ -219,7 +215,7 @@ Public Class frmAdmin_Start End If End If Catch ex As Exception - ShowErrorMessage(ex) + FormHelper.ShowErrorMessage(ex, "GridView1_RowClick") End Try End Sub @@ -260,7 +256,7 @@ Public Class frmAdmin_Start Try DetailForm.Handle_OpenDetail(Nothing, CurrentPage, True) Catch ex As Exception - ShowErrorMessage(ex) + FormHelper.ShowErrorMessage(ex, "btnAddRecord_ItemClick") End Try End Sub diff --git a/GUIs.ZooFlow/ClassDragDrop.vb b/GUIs.ZooFlow/ClassDragDrop.vb index c2603d1d..0e83ca2c 100644 --- a/GUIs.ZooFlow/ClassDragDrop.vb +++ b/GUIs.ZooFlow/ClassDragDrop.vb @@ -100,7 +100,7 @@ Public Class ClassDragDrop Catch ex As Exception Logger.Error(ex) - Dim oMsgBox As New frmDialog("Error in view_MouseMove: " & ex.Message, "", True) + Dim oMsgBox As New frmDialog(ex.Message, "View_MouseMove", frmDialog.DialogType.Error) oMsgBox.ShowDialog() End Try End Sub diff --git a/GUIs.ZooFlow/ClassInit.vb b/GUIs.ZooFlow/ClassInit.vb index eb115c3c..a5b6547a 100644 --- a/GUIs.ZooFlow/ClassInit.vb +++ b/GUIs.ZooFlow/ClassInit.vb @@ -372,7 +372,7 @@ Public Class ClassInit Dim oMessage = $"{oMessageStart}{oMessage1}{oMessage2}{oMessageEnd}" - Dim oMsgBox As New frmDialog(oMessage, _MainForm.Text, True) + Dim oMsgBox As New frmDialog(oMessage, _MainForm.Text, frmDialog.DialogType.Error) oMsgBox.ShowDialog() Application.ExitThread() Else diff --git a/GUIs.ZooFlow/Modules/Globix/ClassFilehandle.vb b/GUIs.ZooFlow/Modules/Globix/ClassFilehandle.vb index b685a3c2..c9d67c4a 100644 --- a/GUIs.ZooFlow/Modules/Globix/ClassFilehandle.vb +++ b/GUIs.ZooFlow/Modules/Globix/ClassFilehandle.vb @@ -127,14 +127,16 @@ Public Class ClassFilehandle Else oMSG = "Shortcuts cannot be droppped!" End If - Dim oMsgBox As New frmDialog(oMSG, "", True) + Dim oMsgBox As New frmDialog(oMSG, "FileHandle", frmDialog.DialogType.Warning) oMsgBox.ShowDialog() Return False End If Return UserFiles.Insert_GI_File(oTempFilePath, pHandletype) Catch ex As Exception - MsgBox("Unexpected Error in Decide_FileHandle: " & ex.Message, MsgBoxStyle.Critical) + Dim oMsgBox As New frmDialog(ex.Message, "Decide_FileHandle", frmDialog.DialogType.Error) + oMsgBox.ShowDialog() + Return False End Try End Function diff --git a/GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb b/GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb index 9dc2467c..fe3ad581 100644 --- a/GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb +++ b/GUIs.ZooFlow/Modules/Globix/ClassFolderwatcher.vb @@ -82,7 +82,7 @@ Public Class ClassFolderwatcher Catch ex As Exception Logger.Error(ex.Message) - Dim oMsgBox As New frmDialog("Error in StartStop_FolderWatch:" & vbNewLine & ex.Message, "", True) + Dim oMsgBox As New frmDialog(ex.Message, "Folder Watch", frmDialog.DialogType.Error) oMsgBox.ShowDialog() End Try End Function diff --git a/GUIs.ZooFlow/Modules/Globix/ClassValidator.vb b/GUIs.ZooFlow/Modules/Globix/ClassValidator.vb index ab7cd50d..b3317f86 100644 --- a/GUIs.ZooFlow/Modules/Globix/ClassValidator.vb +++ b/GUIs.ZooFlow/Modules/Globix/ClassValidator.vb @@ -261,7 +261,7 @@ Public Class ClassValidator Private Sub ShowValidationMessage() 'MsgBox(ClassConstants.TEXT_MISSING_INPUT, MsgBoxStyle.Exclamation, ClassConstants.TITLE_MISSING_INPUT) - Dim oMsgBox As New frmDialog(ClassConstants.TITLE_MISSING_INPUT & vbNewLine & ClassConstants.TEXT_MISSING_INPUT, "", True) + Dim oMsgBox As New frmDialog(ClassConstants.TEXT_MISSING_INPUT, ClassConstants.TITLE_MISSING_INPUT, frmDialog.DialogType.Warning) oMsgBox.ShowDialog() End Sub End Class diff --git a/GUIs.ZooFlow/Modules/Globix/frmFileflow_Duplicate.Designer.vb b/GUIs.ZooFlow/Modules/Globix/frmFileflow_Duplicate.Designer.vb index d86007a9..6379aee4 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmFileflow_Duplicate.Designer.vb +++ b/GUIs.ZooFlow/Modules/Globix/frmFileflow_Duplicate.Designer.vb @@ -117,7 +117,7 @@ Partial Class frmFileflow_Duplicate Me.SimpleButton4.Appearance.Options.UseBackColor = True Me.SimpleButton4.Appearance.Options.UseFont = True Me.SimpleButton4.Appearance.Options.UseForeColor = True - Me.SimpleButton4.ImageOptions.SvgImage = CType(resources.GetObject("SimpleButton4.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.SimpleButton4.ImageOptions.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.bo_appointment1 Me.SimpleButton4.Location = New System.Drawing.Point(20, 85) Me.SimpleButton4.Name = "SimpleButton4" Me.SimpleButton4.PaintStyle = DevExpress.XtraEditors.Controls.PaintStyles.Light diff --git a/GUIs.ZooFlow/Modules/Globix/frmFileflow_Duplicate.resx b/GUIs.ZooFlow/Modules/Globix/frmFileflow_Duplicate.resx index d749fb75..856ab58e 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmFileflow_Duplicate.resx +++ b/GUIs.ZooFlow/Modules/Globix/frmFileflow_Duplicate.resx @@ -209,30 +209,6 @@ Ny0yLjlTMjguNywxNCwyNS4yLDE0Yy0zLjIsMC0zLjYsMi41LTIuOSw0LjdjMCwwLjEtMC4yLDAuMS0w LjMsMC4yICAgYy0wLjEsMC40LDAuMSwwLjYsMC4zLDAuOVMyMi4yLDIwLjgsMjIuOSwyMC44eiIgY2xh c3M9IkJsdWUiIC8+DQogIDwvZz4NCjwvc3ZnPgs= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAP4DAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ - LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD - MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw - MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu - bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iVG9kYXkiPg0KICAgIDxwYXRoIGQ9 - Ik0yOSwwSDFDMC41LDAsMCwwLjUsMCwxdjMwYzAsMC41LDAuNSwxLDEsMWgyOGMwLjUsMCwxLTAuNSwx - LTFWMUMzMCwwLjUsMjkuNSwwLDI5LDB6IE0yOCwzMEgyVjRoMjZWMzB6IiBjbGFzcz0iQmxhY2siIC8+ - DQogICAgPGcgY2xhc3M9InN0MCI+DQogICAgICA8cGF0aCBkPSJNMTAsMTJINFY2aDZWMTJ6IE0xOCw2 - aC02djZoNlY2eiBNMjYsNmgtNnY2aDZWNnogTTI2LDE0aC02djZoNlYxNHogTTEwLDIySDR2Nmg2VjIy - eiBNMTgsMjJoLTZ2Nmg2VjIyeiAgICAgTTI2LDIyaC02djZoNlYyMnogTTEwLDE0SDR2Nmg2VjE0eiIg - Y2xhc3M9IkJsYWNrIiAvPg0KICAgIDwvZz4NCiAgICA8cmVjdCB4PSIxMiIgeT0iMTQiIHdpZHRoPSI2 - IiBoZWlnaHQ9IjYiIHJ4PSIwIiByeT0iMCIgY2xhc3M9IkdyZWVuIiAvPg0KICA8L2c+DQo8L3N2Zz4L diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.vb b/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.vb index 19215f45..20bb2775 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.vb +++ b/GUIs.ZooFlow/Modules/Globix/frmGlobixBasicConfig.vb @@ -52,7 +52,7 @@ Public Class frmGlobixBasicConfig Else otext = "Error in creating Hotfolder: " & pMypath & vbNewLine & "Please check the rights!" & vbNewLine & ex.Message End If - Dim oMsgBox As New frmDialog("No Match- There might be an error in the RegEx!", "", True) + Dim oMsgBox As New frmDialog("No Match- There might be an error in the RegEx!", Text, frmDialog.DialogType.Warning) oMsgBox.ShowDialog() Exit Sub End Try diff --git a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb index 21a819b4..b20d34ac 100644 --- a/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb +++ b/GUIs.ZooFlow/Modules/Globix/frmGlobix_Index.vb @@ -470,7 +470,7 @@ INNER JOIN IDB.dbo.VWIDB_DOCTYPE_LANGUAGE DL ON DT.IDB_DOCTYPE_ID = DL.Doctype_I Else omsg = "Please check Datatype of Indexvalue!" End If - Dim oMsgBox As New frmDialog(omsg, "", True) + Dim oMsgBox As New frmDialog(omsg, "Indexe Laden", frmDialog.DialogType.Warning) oMsgBox.ShowDialog() Logger.Warn("DataType [{0}] not implemented!", oIndex.DataType) End Select @@ -659,7 +659,7 @@ INNER JOIN IDB.dbo.VWIDB_DOCTYPE_LANGUAGE DL ON DT.IDB_DOCTYPE_ID = DL.Doctype_I Else oMsg = "Please Index file completely" & vbNewLine & "(Abort 1 of Indexdialog)" End If - Dim oMsgBox As New frmDialog(oMsg, "", False) + Dim oMsgBox As New frmDialog(oMsg, Text, frmDialog.DialogType.Warning) oMsgBox.CancelButtonInvisible() oMsgBox.ShowDialog() CancelAttempts += 1 @@ -671,7 +671,7 @@ INNER JOIN IDB.dbo.VWIDB_DOCTYPE_LANGUAGE DL ON DT.IDB_DOCTYPE_ID = DL.Doctype_I Else oMsg = "You abort the indexdialog for the 2nd time!" & vbNewLine & "Do You want to abort indexing?" End If - Dim oMsgBox As New frmDialog(oMsg, "", False) + Dim oMsgBox As New frmDialog(oMsg, Text, frmDialog.DialogType.Question) oMsgBox.CancelButtonVisible() If oMsgBox.DialogResult = DialogResult.Yes Then diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index c4078a92..92cb8335 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -660,6 +660,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property bo_appointment1() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("bo_appointment1", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' diff --git a/GUIs.ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx index b4d6774e..3de1570b 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -196,12 +196,15 @@ ..\Resources\DD_Icons_ICO_PMANAGER_256px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\ZOOFLOW_DRAG_NORMAL.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ZooFlow_Sidebar_individuelle_suche.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\editquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -241,21 +244,24 @@ ..\Resources\Flow.PNG;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\nextview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\del4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\viewmergeddata1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\actions_deletecircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\link1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\bo_category1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\ZooflowTitle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -304,9 +310,6 @@ ..\Resources\actions_check3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\definednameuseinformula2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\save5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -340,8 +343,8 @@ ..\Resources\actions_addcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\ZooFlow_G_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\documentproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -364,6 +367,9 @@ ..\Resources\new4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\ZooFlow_G_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\save6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -379,8 +385,11 @@ ..\Resources\actions_check2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\bell_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\doublenext1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\ZooFlow_drop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\GLOBIX_short.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -397,8 +406,8 @@ ..\Resources\windows.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\editdatasource1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\viewmergeddata1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\save4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -409,15 +418,12 @@ ..\Resources\managedatasource1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\Checked-outforEdit_Color_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - - ..\Resources\ZOOFLOW_DRAG_NORMAL.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\pagesetup.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\save9.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\refresh_16xMD.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -433,12 +439,12 @@ ..\Resources\Editdatasetwithdesigner_8449.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\definednameuseinformula1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\unlink.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\2_LUPE_INAKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -454,9 +460,15 @@ ..\Resources\actions_send1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\editdatasource1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\del5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\new1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -499,9 +511,6 @@ ..\Resources\new3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_deletecircled3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\actions_check.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -514,8 +523,8 @@ ..\Resources\actions_calendar1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\switchrowcolumns.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\bo_category.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_deletecircled5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -526,41 +535,35 @@ ..\Resources\ZOOFLOW_DRAG_PROGRESSIVE.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\documentproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\StatusAnnotations_Information_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\Compare_RefreshScriptPreview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\actions_addcircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\Checked-outforEdit_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\bell_delete.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\save2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\save8.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\save9.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\bo_validation1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\actions_deletecircled3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\ZooFlow_Sidebar_TOP.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\ZooFlow_Sidebar_individuelle_suche.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\definednameuseinformula2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\actions_calendar.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -580,8 +583,8 @@ ..\Resources\ZooFlow_PM_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_edit1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\StatusAnnotations_Information_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\del.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -595,23 +598,23 @@ ..\Resources\2_ZOO_FLOW_Abo_MouseOver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\doublenext1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\ZooFlow_drop.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\Checked-outforEdit_Color_13297.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\about4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\1_LOGO_ZOO_FLOW_DROP2.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\switchrowcolumns.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\bo_document.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\bo_category.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_addcircled3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\save8.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\servermode.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -625,8 +628,8 @@ ..\Resources\definednameuseinformula3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_addcircled3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\unlink.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\1_LOGO_ZOO_FLOW1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -640,7 +643,7 @@ ..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\bo_category1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\bo_appointment1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/bo_appointment1.svg b/GUIs.ZooFlow/Resources/bo_appointment1.svg new file mode 100644 index 00000000..f208bfc1 --- /dev/null +++ b/GUIs.ZooFlow/Resources/bo_appointment1.svg @@ -0,0 +1,29 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 86a23e76..609d5694 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -1122,6 +1122,7 @@ + diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index b962fb70..aabbb160 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/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