This commit is contained in:
SchreiberM 2022-11-07 18:16:46 +01:00
parent 6e12bdc114
commit 752027ee0a
3 changed files with 85 additions and 73 deletions

View File

@ -27,15 +27,15 @@ Partial Class frmNotification_Startup
Me.btnCloseForm = New DevExpress.XtraBars.BarButtonItem() Me.btnCloseForm = New DevExpress.XtraBars.BarButtonItem()
Me.lbStatus = New DevExpress.XtraBars.BarStaticItem() Me.lbStatus = New DevExpress.XtraBars.BarStaticItem()
Me.btnMarkAsRead = New DevExpress.XtraBars.BarButtonItem() Me.btnMarkAsRead = New DevExpress.XtraBars.BarButtonItem()
Me.BarStaticItemFile = New DevExpress.XtraBars.BarStaticItem()
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() Me.BarStaticItemFileInfo = New DevExpress.XtraBars.BarStaticItem()
CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerControl1.Panel1.SuspendLayout() Me.SplitContainerControl1.Panel1.SuspendLayout()
CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SplitContainerControl1.Panel2.SuspendLayout()
Me.SplitContainerControl1.SuspendLayout() Me.SplitContainerControl1.SuspendLayout()
CType(Me.ListBoxControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.ListBoxControl1, System.ComponentModel.ISupportInitialize).BeginInit()
CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit()
@ -54,8 +54,6 @@ Partial Class frmNotification_Startup
' '
'SplitContainerControl1.Panel2 'SplitContainerControl1.Panel2
' '
Me.SplitContainerControl1.Panel2.Controls.Add(Me.RichEditControl1)
Me.SplitContainerControl1.Panel2.Controls.Add(Me.DocumentViewer1)
resources.ApplyResources(Me.SplitContainerControl1.Panel2, "SplitContainerControl1.Panel2") resources.ApplyResources(Me.SplitContainerControl1.Panel2, "SplitContainerControl1.Panel2")
Me.SplitContainerControl1.SplitterPosition = 255 Me.SplitContainerControl1.SplitterPosition = 255
' '
@ -77,9 +75,9 @@ Partial Class frmNotification_Startup
' '
Me.RibbonControl.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Green Me.RibbonControl.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Green
Me.RibbonControl.ExpandCollapseItem.Id = 0 Me.RibbonControl.ExpandCollapseItem.Id = 0
Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.btnCloseForm, Me.lbStatus, Me.btnMarkAsRead}) Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.btnCloseForm, Me.lbStatus, Me.btnMarkAsRead, Me.BarStaticItemFile, Me.BarStaticItemFileInfo})
resources.ApplyResources(Me.RibbonControl, "RibbonControl") resources.ApplyResources(Me.RibbonControl, "RibbonControl")
Me.RibbonControl.MaxItemId = 4 Me.RibbonControl.MaxItemId = 6
Me.RibbonControl.Name = "RibbonControl" Me.RibbonControl.Name = "RibbonControl"
Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@ -109,6 +107,14 @@ Partial Class frmNotification_Startup
Me.btnMarkAsRead.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.check Me.btnMarkAsRead.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.check
Me.btnMarkAsRead.Name = "btnMarkAsRead" Me.btnMarkAsRead.Name = "btnMarkAsRead"
' '
'BarStaticItemFile
'
resources.ApplyResources(Me.BarStaticItemFile, "BarStaticItemFile")
Me.BarStaticItemFile.Id = 4
Me.BarStaticItemFile.Name = "BarStaticItemFile"
Me.BarStaticItemFile.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
Me.BarStaticItemFile.VisibleInSearchMenu = False
'
'RibbonPage1 'RibbonPage1
' '
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1})
@ -125,15 +131,18 @@ Partial Class frmNotification_Startup
'RibbonStatusBar 'RibbonStatusBar
' '
Me.RibbonStatusBar.ItemLinks.Add(Me.lbStatus) Me.RibbonStatusBar.ItemLinks.Add(Me.lbStatus)
Me.RibbonStatusBar.ItemLinks.Add(Me.BarStaticItemFile)
Me.RibbonStatusBar.ItemLinks.Add(Me.BarStaticItemFileInfo)
resources.ApplyResources(Me.RibbonStatusBar, "RibbonStatusBar") resources.ApplyResources(Me.RibbonStatusBar, "RibbonStatusBar")
Me.RibbonStatusBar.Name = "RibbonStatusBar" Me.RibbonStatusBar.Name = "RibbonStatusBar"
Me.RibbonStatusBar.Ribbon = Me.RibbonControl Me.RibbonStatusBar.Ribbon = Me.RibbonControl
' '
'DocumentViewer1 'BarStaticItemFileInfo
' '
Me.DocumentViewer1.FileLoaded = False resources.ApplyResources(Me.BarStaticItemFileInfo, "BarStaticItemFileInfo")
resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1") Me.BarStaticItemFileInfo.Id = 5
Me.DocumentViewer1.Name = "DocumentViewer1" Me.BarStaticItemFileInfo.Name = "BarStaticItemFileInfo"
Me.BarStaticItemFileInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
' '
'frmNotification_Startup 'frmNotification_Startup
' '
@ -150,7 +159,6 @@ Partial Class frmNotification_Startup
CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerControl1.Panel1.ResumeLayout(False) Me.SplitContainerControl1.Panel1.ResumeLayout(False)
CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerControl1.Panel2.ResumeLayout(False)
CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit()
Me.SplitContainerControl1.ResumeLayout(False) Me.SplitContainerControl1.ResumeLayout(False)
CType(Me.ListBoxControl1, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.ListBoxControl1, System.ComponentModel.ISupportInitialize).EndInit()
@ -171,4 +179,6 @@ Partial Class frmNotification_Startup
Friend WithEvents btnCloseForm As DevExpress.XtraBars.BarButtonItem Friend WithEvents btnCloseForm As DevExpress.XtraBars.BarButtonItem
Friend WithEvents lbStatus As DevExpress.XtraBars.BarStaticItem Friend WithEvents lbStatus As DevExpress.XtraBars.BarStaticItem
Friend WithEvents btnMarkAsRead As DevExpress.XtraBars.BarButtonItem Friend WithEvents btnMarkAsRead As DevExpress.XtraBars.BarButtonItem
Friend WithEvents BarStaticItemFile As DevExpress.XtraBars.BarStaticItem
Friend WithEvents BarStaticItemFileInfo As DevExpress.XtraBars.BarStaticItem
End Class End Class

View File

@ -165,6 +165,39 @@
<data name="&gt;&gt;SplitContainerControl1.Panel1.ZOrder" xml:space="preserve"> <data name="&gt;&gt;SplitContainerControl1.Panel1.ZOrder" xml:space="preserve">
<value>0</value> <value>0</value>
</data> </data>
<data name="SplitContainerControl1.Panel2.Text" xml:space="preserve">
<value>Panel2</value>
</data>
<data name="&gt;&gt;SplitContainerControl1.Panel2.Name" xml:space="preserve">
<value>SplitContainerControl1.Panel2</value>
</data>
<data name="&gt;&gt;SplitContainerControl1.Panel2.Type" xml:space="preserve">
<value>DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;SplitContainerControl1.Panel2.Parent" xml:space="preserve">
<value>SplitContainerControl1</value>
</data>
<data name="&gt;&gt;SplitContainerControl1.Panel2.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="SplitContainerControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>1050, 500</value>
</data>
<data name="SplitContainerControl1.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="&gt;&gt;SplitContainerControl1.Name" xml:space="preserve">
<value>SplitContainerControl1</value>
</data>
<data name="&gt;&gt;SplitContainerControl1.Type" xml:space="preserve">
<value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;SplitContainerControl1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;SplitContainerControl1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="RichEditControl1.Location" type="System.Drawing.Point, System.Drawing"> <data name="RichEditControl1.Location" type="System.Drawing.Point, System.Drawing">
<value>21, 45</value> <value>21, 45</value>
</data> </data>
@ -177,6 +210,12 @@
<data name="btnMarkAsRead.Caption" xml:space="preserve"> <data name="btnMarkAsRead.Caption" xml:space="preserve">
<value>Als gelesen markieren</value> <value>Als gelesen markieren</value>
</data> </data>
<data name="BarStaticItemFile.Caption" xml:space="preserve">
<value>BarStaticItem1</value>
</data>
<data name="BarStaticItemFileInfo.Caption" xml:space="preserve">
<value>BarStaticItem1</value>
</data>
<data name="RibbonControl.Location" type="System.Drawing.Point, System.Drawing"> <data name="RibbonControl.Location" type="System.Drawing.Point, System.Drawing">
<value>0, 0</value> <value>0, 0</value>
</data> </data>
@ -231,66 +270,6 @@
<data name="&gt;&gt;RichEditControl1.Type" xml:space="preserve"> <data name="&gt;&gt;RichEditControl1.Type" xml:space="preserve">
<value>DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="&gt;&gt;RichEditControl1.Parent" xml:space="preserve">
<value>SplitContainerControl1.Panel2</value>
</data>
<data name="&gt;&gt;RichEditControl1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="DocumentViewer1.Location" type="System.Drawing.Point, System.Drawing">
<value>444, 36</value>
</data>
<data name="DocumentViewer1.Size" type="System.Drawing.Size, System.Drawing">
<value>329, 331</value>
</data>
<data name="DocumentViewer1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
</data>
<data name="&gt;&gt;DocumentViewer1.Name" xml:space="preserve">
<value>DocumentViewer1</value>
</data>
<data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve">
<value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.8.0.0, Culture=neutral, PublicKeyToken=null</value>
</data>
<data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve">
<value>SplitContainerControl1.Panel2</value>
</data>
<data name="&gt;&gt;DocumentViewer1.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="SplitContainerControl1.Panel2.Text" xml:space="preserve">
<value>Panel2</value>
</data>
<data name="&gt;&gt;SplitContainerControl1.Panel2.Name" xml:space="preserve">
<value>SplitContainerControl1.Panel2</value>
</data>
<data name="&gt;&gt;SplitContainerControl1.Panel2.Type" xml:space="preserve">
<value>DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;SplitContainerControl1.Panel2.Parent" xml:space="preserve">
<value>SplitContainerControl1</value>
</data>
<data name="&gt;&gt;SplitContainerControl1.Panel2.ZOrder" xml:space="preserve">
<value>1</value>
</data>
<data name="SplitContainerControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>1050, 500</value>
</data>
<data name="SplitContainerControl1.TabIndex" type="System.Int32, mscorlib">
<value>2</value>
</data>
<data name="&gt;&gt;SplitContainerControl1.Name" xml:space="preserve">
<value>SplitContainerControl1</value>
</data>
<data name="&gt;&gt;SplitContainerControl1.Type" xml:space="preserve">
<value>DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;SplitContainerControl1.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;SplitContainerControl1.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089"> <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
<value>True</value> <value>True</value>
</metadata> </metadata>
@ -321,6 +300,12 @@
<data name="&gt;&gt;btnMarkAsRead.Type" xml:space="preserve"> <data name="&gt;&gt;btnMarkAsRead.Type" xml:space="preserve">
<value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="&gt;&gt;BarStaticItemFile.Name" xml:space="preserve">
<value>BarStaticItemFile</value>
</data>
<data name="&gt;&gt;BarStaticItemFile.Type" xml:space="preserve">
<value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;RibbonPage1.Name" xml:space="preserve"> <data name="&gt;&gt;RibbonPage1.Name" xml:space="preserve">
<value>RibbonPage1</value> <value>RibbonPage1</value>
</data> </data>
@ -333,6 +318,12 @@
<data name="&gt;&gt;RibbonPageGroup1.Type" xml:space="preserve"> <data name="&gt;&gt;RibbonPageGroup1.Type" xml:space="preserve">
<value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value> <value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data> </data>
<data name="&gt;&gt;BarStaticItemFileInfo.Name" xml:space="preserve">
<value>BarStaticItemFileInfo</value>
</data>
<data name="&gt;&gt;BarStaticItemFileInfo.Type" xml:space="preserve">
<value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;$this.Name" xml:space="preserve"> <data name="&gt;&gt;$this.Name" xml:space="preserve">
<value>frmNotification_Startup</value> <value>frmNotification_Startup</value>
</data> </data>

View File

@ -44,7 +44,16 @@ Public Class frmNotification_Startup
Public Sub New(pNotificationsTable As DataTable, pLogConfig As LogConfig, pGDPictureKey As String, pCaption As String, pEnvironment As DigitalData.Modules.ZooFlow.Environment) Public Sub New(pNotificationsTable As DataTable, pLogConfig As LogConfig, pGDPictureKey As String, pCaption As String, pEnvironment As DigitalData.Modules.ZooFlow.Environment)
' Dieser Aufruf ist für den Designer erforderlich. ' Dieser Aufruf ist für den Designer erforderlich.
InitializeComponent() InitializeComponent()
Try
' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
Dim cultureInfo As System.Globalization.CultureInfo
cultureInfo = New System.Globalization.CultureInfo(_Environment.User.Language)
cultureInfo.DateTimeFormat.ShortDatePattern = _Environment.User.DateFormat
Thread.CurrentThread.CurrentCulture = cultureInfo
Thread.CurrentThread.CurrentUICulture = cultureInfo
Catch ex As Exception
End Try
' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu.
LogConfig = pLogConfig LogConfig = pLogConfig
Logger = pLogConfig.GetLogger() Logger = pLogConfig.GetLogger()
@ -125,17 +134,19 @@ Public Class frmNotification_Startup
RichEditControl1.Text = oMessage RichEditControl1.Text = oMessage
RichEditControl1.Visible = True RichEditControl1.Visible = True
RichEditControl1.Dock = Windows.Forms.DockStyle.Fill RichEditControl1.Dock = Windows.Forms.DockStyle.Fill
BarStaticItemFileInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
ElseIf oType = TYPE_FILE Then ElseIf oType = TYPE_FILE Then
If IO.File.Exists(oMessage) Then If IO.File.Exists(oMessage) Then
DocumentViewer1.LoadFile(oMessage) DocumentViewer1.LoadFile(oMessage)
DocumentViewer1.Visible = True DocumentViewer1.Visible = True
DocumentViewer1.Dock = Windows.Forms.DockStyle.Fill DocumentViewer1.Dock = Windows.Forms.DockStyle.Fill
BarStaticItemFileInfo.Caption = oMessage
Else Else
Dim oMsgBox As New frmDialog("File not existing!", "Load Notification File", frmDialog.DialogType.Warning) Dim oMsgBox As New frmDialog("File not existing!", "Load Notification File", frmDialog.DialogType.Warning)
oMsgBox.ShowDialog() oMsgBox.ShowDialog()
BarStaticItemFileInfo.Caption += " - NOT EXISTING"
End If End If
BarStaticItemFileInfo.Visibility = DevExpress.XtraBars.BarItemVisibility.Always
End If End If
If oMarkasRead = True Then If oMarkasRead = True Then