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

Zooflow: Fix messageboxes without title

Browse Source
This commit is contained in:
Jonathan Jenne
2022-05-23 15:07:07 +02:00
parent ce7261acca
commit 39c69704f4
56 changed files with 683 additions and 432 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
GUIs.Common/Base/BaseErrorHandler.vb
View File

@@ -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

11
GUIs.Common/Base/BaseForm.vb
View File

@@ -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

62
GUIs.Common/Base/BaseRibbonForm.vb
View File

@@ -1,62 +0,0 @@
Imports DevExpress.XtraBars.Docking
Imports DevExpress.XtraBars.Ribbon
Imports DigitalData.Modules.Logging
Namespace Base
''' <summary>
''' This BaseClass is used to provide common functionality like the Logger or ErrorHandler to all Forms
''' </summary>
''' <example>
''' 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
''' </example>
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

13
GUIs.Common/Common.vbproj
View File

@@ -112,9 +112,6 @@
<SubType>Form</SubType>
</Compile>
<Compile Include="Base\BaseResult.vb" />
<Compile Include="Base\BaseRibbonForm.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="Constants.vb" />
<Compile Include="DataResultList\DataResultConfig.vb" />
<Compile Include="DataResultList\DataResultParams.vb" />
@@ -124,6 +121,7 @@
<Compile Include="DataResultList\frmDataResultList.vb">
<SubType>Form</SubType>
</Compile>
<Compile Include="FormHelper.vb" />
<Compile Include="frmDialog.Designer.vb">
<DependentUpon>frmDialog.vb</DependentUpon>
</Compile>
@@ -563,5 +561,14 @@
<ItemGroup>
<None Include="Resources\selectdatamember.svg" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\checkbox.svg" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\cancel.svg" />
</ItemGroup>
<ItemGroup>
<None Include="Resources\actions_checkcircled1.svg" />
</ItemGroup>
<Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
</Project>

47
GUIs.Common/FormHelper.vb Normal file
View File

@@ -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

1
GUIs.Common/IBaseForm.vb
View File

@@ -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

30
GUIs.Common/My Project/Resources.Designer.vb generated
View File

@@ -90,6 +90,16 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
'''</summary>
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
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
'''</summary>
@@ -180,6 +190,16 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
'''</summary>
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
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
'''</summary>
@@ -190,6 +210,16 @@ Namespace My.Resources
End Get
End Property
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
'''</summary>
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
'''<summary>
''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
'''</summary>

63
GUIs.Common/My Project/Resources.resx
View File

@@ -145,8 +145,8 @@
<data name="ZooFlow-Vergroessern" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ZooFlow-Vergroessern.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="save2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\save2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
<data name="save" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="grid" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\grid.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -157,9 +157,6 @@
<data name="jpg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\jpg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="xls" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="autoarrange" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\autoarrange1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
@@ -172,30 +169,36 @@
<data name="copy" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\copy.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="zoom_more" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\zoom_more.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="togglefieldcodes" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\togglefieldcodes1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="checkbox" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\checkbox.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="selectdatamember" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\selectdatamember.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="updatedataextract" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\updatedataextract4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="refreshallpivottable" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\refreshallpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="open" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="enablescrolling" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\enablescrolling.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="title" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\title.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="clearpivottable" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clearpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
<data name="save2" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\save2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="singlepageview1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\singlepageview1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="save1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\save1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="txt" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\txt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
@@ -208,11 +211,14 @@
<data name="bo_contract" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\bo_contract1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="dwg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="clearall" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clearall1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="_page" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\_page.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="clearpivottable" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\clearpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="categorize" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\categorize.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -220,8 +226,8 @@
<data name="singlepageview" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\singlepageview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="actions_database" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\actions_database3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
<data name="title" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\title.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="columnheaders" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\columnheaders.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -232,11 +238,11 @@
<data name="actions_user" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\actions_user1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="save" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\save.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
<data name="xls" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="dwg" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
<data name="actions_database" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\actions_database3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="filterquery" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\filterquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -250,17 +256,20 @@
<data name="private" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\private.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="cancel" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\cancel.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="Copy_32x32" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\Copy_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="save1" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\save1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
<data name="_page" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\_page.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="handtool" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\handtool1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="open" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
<data name="zoom_more" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\zoom_more.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="ppt" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\ppt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
@@ -274,7 +283,7 @@
<data name="_blank" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\_blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
<data name="selectdatamember" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\selectdatamember.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
<data name="actions_checkcircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\actions_checkcircled1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
</root>

4
GUIs.Common/NNMsgBoxEx.Designer.vb generated
View File

@@ -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()

4
GUIs.Common/NNMsgBoxEx.vb
View File

@@ -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

7
GUIs.Common/ObjectPropertyDialog/ctrlObjectPropertyDialog.vb
View File

@@ -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

9
GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.vb
View File

@@ -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

15
GUIs.Common/Resources/actions_checkcircled1.svg Normal file
View File

@@ -0,0 +1,15 @@
<?xml version='1.0' encoding='UTF-8'?>
<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
<style type="text/css">
.Blue{fill:#1177D7;}
.Yellow{fill:#FFB115;}
.Black{fill:#727272;}
.Green{fill:#039C23;}
.Red{fill:#D11C1C;}
.st0{opacity:0.75;}
.st1{opacity:0.5;}
</style>
<g id="CheckCircled">
<path d="M16,4C9.4,4,4,9.4,4,16c0,6.6,5.4,12,12,12s12-5.4,12-12C28,9.4,22.6,4,16,4z M14,22l-6-6l2-2l4,4l8-8l2,2 L14,22z" class="Green" />
</g>
</svg>

7
GUIs.Common/Resources/cancel.svg Normal file
View File

@@ -0,0 +1,7 @@
<?xml version='1.0' encoding='UTF-8'?>
<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
<style type="text/css">
.Red{fill:#D11C1C;}
</style>
<path d="M16,2C8.3,2,2,8.3,2,16s6.3,14,14,14s14-6.3,14-14S23.7,2,16,2z M23,20l-3,3l-4-4l-4,4l-3-3l4-4l-4-4l3-3l4,4 l4-4l3,3l-4,4L23,20z" class="Red" />
</svg>

17
GUIs.Common/Resources/checkbox.svg Normal file
View File

@@ -0,0 +1,17 @@
<?xml version='1.0' encoding='UTF-8'?>
<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
<style type="text/css">
.Black{fill:#727272;}
.Yellow{fill:#FFB115;}
.Blue{fill:#1177D7;}
.Green{fill:#039C23;}
.Red{fill:#D11C1C;}
.White{fill:#FFFFFF;}
.st0{opacity:0.75;}
.st1{opacity:0.5;}
.st2{opacity:0.25;}
</style>
<g id="CheckBox">
<path d="M27,4H5C4.5,4,4,4.5,4,5v22c0,0.5,0.5,1,1,1h22c0.5,0,1-0.5,1-1V5C28,4.5,27.5,4,27,4z M14,22l-6-6l2-2l4,4 l8-8l2,2L14,22z" class="Green" />
</g>
</svg>

212
GUIs.Common/frmDialog.Designer.vb generated
View File

@@ -22,76 +22,152 @@ Partial Class frmDialog
'Das Bearbeiten mit dem Code-Editor ist nicht möglich.
<System.Diagnostics.DebuggerStepThrough()> _
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

3
GUIs.Common/frmDialog.resx
View File

@@ -117,4 +117,7 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<metadata name="SvgImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
</root>

97
GUIs.Common/frmDialog.vb
View File

@@ -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
<System.Runtime.InteropServices.DllImport("user32.dll")>
Public Shared Function SendMessage(ByVal hWnd As IntPtr, ByVal Msg As Integer, ByVal wParam As Integer, ByVal lParam As Integer) As Integer
End Function
<System.Runtime.InteropServices.DllImport("user32.dll")>
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

12
GUIs.Common/frmDocumentResultList.vb
View File

@@ -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

30
GUIs.Common/frmFileFlow_Duplicate.Designer.vb generated
View File

@@ -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

46
GUIs.Common/frmFileFlow_Duplicate.resx
View File

@@ -154,6 +154,29 @@
My0wLjktMC4zYy0wLjksMC0xLjQsMS0xLjQsMS40aC0xLjRjMC0wLjgsMC4zLTEuNCwwLjgtMS45czEu
Mi0wLjcsMi0wLjcgIHMxLjUsMC4yLDEuOSwwLjZjMC41LDAuNCwwLjcsMC45LDAuNywxLjZDMjguNiw4
LjIsMjYuNyw4LjUsMjYuNyw5LjR6IiBjbGFzcz0iR3JlZW4iIC8+DQo8L3N2Zz4L
</value>
</data>
<data name="PictureEdit1.EditValue" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKEDAAAC77u/
PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlVzZXIiPg0KICAgIDxwYXRoIGQ9Ik0xMCw5LjljLTAu
MSwwLjUsMC4yLDAuOSwwLjQsMS40YzAuMiwwLjUtMC4xLDEuNywwLjksMS42YzAsMCwwLDAuMSwwLDAu
MmMwLjYsMi4zLDIsNC45LDQuNyw0LjkgICBjMi43LDAsNC4yLTIuNiw0LjctNC45YzAsMCwwLTAuMSww
LTAuMWMxLDAuMSwwLjYtMS4xLDAuOS0xLjZjMC4yLTAuNSwwLjQtMC45LDAuMy0xLjRjLTAuMS0wLjQt
MC40LTAuNC0wLjUtMC4zICAgYzEuOC00LjktMS4xLTQuNy0xLjEtNC43UzIwLDIsMTQuOCwyQzEwLDIs
OS40LDYsMTAuNSw5LjZDMTAuNCw5LjYsMTAuMSw5LjcsMTAsOS45eiIgY2xhc3M9IkJsYWNrIiAvPg0K
ICAgIDxwYXRoIGQ9Ik0yMCwxOGMtMC44LDEuNS0yLjEsNC00LDRjLTEuOSwwLTMuMi0yLjUtNC00Yy0y
LjMsMy41LTgsMS04LDguNVYzMGgyNHYtMy41QzI4LDE5LjEsMjIuMywyMS40LDIwLDE4eiIgY2xhc3M9
IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L
</value>
</data>
<data name="SimpleButton5.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
@@ -230,29 +253,6 @@
Pg0KICAgIDxwYXRoIGQ9Ik0yMiw4SDhWNmgxNFY4eiBNMjIsMTBIOHYyaDE0VjEweiBNMjIsMTRIOHYy
aDE0VjE0eiBNMjIsMThIOHYyaDE0VjE4eiBNMjIsMjJIOHYyaDE0VjIyeiIgY2xhc3M9IkJsdWUiIC8+
DQogIDwvZz4NCjwvc3ZnPgs=
</value>
</data>
<data name="PictureEdit1.EditValue" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKEDAAAC77u/
PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9IlVzZXIiPg0KICAgIDxwYXRoIGQ9Ik0xMCw5LjljLTAu
MSwwLjUsMC4yLDAuOSwwLjQsMS40YzAuMiwwLjUtMC4xLDEuNywwLjksMS42YzAsMCwwLDAuMSwwLDAu
MmMwLjYsMi4zLDIsNC45LDQuNyw0LjkgICBjMi43LDAsNC4yLTIuNiw0LjctNC45YzAsMCwwLTAuMSww
LTAuMWMxLDAuMSwwLjYtMS4xLDAuOS0xLjZjMC4yLTAuNSwwLjQtMC45LDAuMy0xLjRjLTAuMS0wLjQt
MC40LTAuNC0wLjUtMC4zICAgYzEuOC00LjktMS4xLTQuNy0xLjEtNC43UzIwLDIsMTQuOCwyQzEwLDIs
OS40LDYsMTAuNSw5LjZDMTAuNCw5LjYsMTAuMSw5LjcsMTAsOS45eiIgY2xhc3M9IkJsYWNrIiAvPg0K
ICAgIDxwYXRoIGQ9Ik0yMCwxOGMtMC44LDEuNS0yLjEsNC00LDRjLTEuOSwwLTMuMi0yLjUtNC00Yy0y
LjMsMy41LTgsMS04LDguNVYzMGgyNHYtMy41QzI4LDE5LjEsMjIuMywyMS40LDIwLDE4eiIgY2xhc3M9
IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L
</value>
</data>
</root>

3
GUIs.Common/frmFileFlow_Duplicate.vb
View File

@@ -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