From 8af1f0a64ab3783687e00a16d946234a73c96bc6 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Tue, 25 Oct 2022 15:24:02 +0200 Subject: [PATCH] Common: Rebuild frmNotification_Startup --- GUIs.Common/Common.vbproj | 25 +- GUIs.Common/My Project/Resources.Designer.vb | 22 +- GUIs.Common/My Project/Resources.resx | 56 +-- .../NNfrmNotification_Startup.Designer.vb | 156 ++++++++ ...x => NNfrmNotification_Startup.en-US.resx} | 0 ...x => NNfrmNotification_Startup.fr-FR.resx} | 0 GUIs.Common/NNfrmNotification_Startup.resx | 319 +++++++++++++++ GUIs.Common/NNfrmNotification_Startup.vb | 199 ++++++++++ GUIs.Common/Resources/check1.svg | 16 + .../Resources/clearheaderandfooter.svg | 7 + .../frmNotification_Startup.Designer.vb | 205 ++++++---- GUIs.Common/frmNotification_Startup.en.resx | 135 +++++++ GUIs.Common/frmNotification_Startup.fr.resx | 135 +++++++ GUIs.Common/frmNotification_Startup.resx | 369 +++++++++--------- GUIs.Common/frmNotification_Startup.vb | 110 +++--- 15 files changed, 1401 insertions(+), 353 deletions(-) create mode 100644 GUIs.Common/NNfrmNotification_Startup.Designer.vb rename GUIs.Common/{frmNotification_Startup.en-US.resx => NNfrmNotification_Startup.en-US.resx} (100%) rename GUIs.Common/{frmNotification_Startup.fr-FR.resx => NNfrmNotification_Startup.fr-FR.resx} (100%) create mode 100644 GUIs.Common/NNfrmNotification_Startup.resx create mode 100644 GUIs.Common/NNfrmNotification_Startup.vb create mode 100644 GUIs.Common/Resources/check1.svg create mode 100644 GUIs.Common/Resources/clearheaderandfooter.svg create mode 100644 GUIs.Common/frmNotification_Startup.en.resx create mode 100644 GUIs.Common/frmNotification_Startup.fr.resx diff --git a/GUIs.Common/Common.vbproj b/GUIs.Common/Common.vbproj index 6231f18d..78499e57 100644 --- a/GUIs.Common/Common.vbproj +++ b/GUIs.Common/Common.vbproj @@ -192,6 +192,12 @@ Form + + NNfrmNotification_Startup.vb + + + Form + frmNotification_Startup.vb @@ -274,10 +280,19 @@ frmFileFlow_Duplicate.vb - + + NNfrmNotification_Startup.vb + + + NNfrmNotification_Startup.vb + + + NNfrmNotification_Startup.vb + + frmNotification_Startup.vb - + frmNotification_Startup.vb @@ -601,5 +616,11 @@ + + + + + + \ No newline at end of file diff --git a/GUIs.Common/My Project/Resources.Designer.vb b/GUIs.Common/My Project/Resources.Designer.vb index 11e5598d..98b3d6de 100644 --- a/GUIs.Common/My Project/Resources.Designer.vb +++ b/GUIs.Common/My Project/Resources.Designer.vb @@ -22,7 +22,7 @@ Namespace My.Resources ''' ''' Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw. ''' - _ @@ -250,6 +250,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property check() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("check", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -270,6 +280,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property clearheaderandfooter() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("clearheaderandfooter", 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 f59f1a87..20cf055b 100644 --- a/GUIs.Common/My Project/Resources.resx +++ b/GUIs.Common/My Project/Resources.resx @@ -121,6 +121,9 @@ ..\Resources\bo_transition.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\groupheader.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\security_unlock.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -133,9 +136,6 @@ ..\Resources\doc.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\Article_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - ..\Resources\actions_question.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -148,8 +148,8 @@ ..\Resources\ZooFlow-Vergroessern.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\business_world2.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 @@ -181,6 +181,9 @@ ..\Resources\checkbox.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\selectdatamember.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -196,32 +199,29 @@ ..\Resources\enablescrolling.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\bo_contract1.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\save3.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\singlepageview1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\bo_localization.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\txt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\Open_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\groupheader.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\singlepageview.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 @@ -238,8 +238,8 @@ ..\Resources\categorize.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\singlepageview.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\bo_contract1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\saveas.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -247,20 +247,26 @@ ..\Resources\title.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\business_world.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 + + ..\Resources\_page.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\editcolors.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\actions_user1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\clearheaderandfooter.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\actions_database3.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\filterquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -292,16 +298,16 @@ ..\Resources\ppt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\business_world.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\actions_user1.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\Article_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\_blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\business_world2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\check1.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/NNfrmNotification_Startup.Designer.vb b/GUIs.Common/NNfrmNotification_Startup.Designer.vb new file mode 100644 index 00000000..3121d9a5 --- /dev/null +++ b/GUIs.Common/NNfrmNotification_Startup.Designer.vb @@ -0,0 +1,156 @@ + +Partial Class NNfrmNotification_Startup + Inherits DevExpress.XtraBars.Ribbon.RibbonForm + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + + Private Sub InitializeComponent() + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(NNfrmNotification_Startup)) + Me.ListBoxControl1 = New DevExpress.XtraEditors.ListBoxControl() + Me.RichEditControl1 = New DevExpress.XtraRichEdit.RichEditControl() + Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() + Me.bbtnitmMarkRead = New DevExpress.XtraBars.BarButtonItem() + Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem() + Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() + Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() + CType(Me.ListBoxControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SuspendLayout() + ' + 'ListBoxControl1 + ' + resources.ApplyResources(Me.ListBoxControl1, "ListBoxControl1") + Me.ListBoxControl1.Name = "ListBoxControl1" + ' + 'RichEditControl1 + ' + resources.ApplyResources(Me.RichEditControl1, "RichEditControl1") + Me.RichEditControl1.MenuManager = Me.RibbonControl1 + Me.RichEditControl1.Name = "RichEditControl1" + Me.RichEditControl1.Options.HorizontalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden + Me.RichEditControl1.Options.VerticalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden + ' + 'RibbonControl1 + ' + Me.RibbonControl1.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Green + Me.RibbonControl1.ExpandCollapseItem.Id = 0 + Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.bbtnitmMarkRead, Me.BarStaticItem1}) + resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") + Me.RibbonControl1.MaxItemId = 5 + Me.RibbonControl1.Name = "RibbonControl1" + Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl1.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + ' + 'BarButtonItem1 + ' + resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1") + Me.BarButtonItem1.Id = 1 + Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem1.Name = "BarButtonItem1" + ' + 'bbtnitmMarkRead + ' + resources.ApplyResources(Me.bbtnitmMarkRead, "bbtnitmMarkRead") + Me.bbtnitmMarkRead.Id = 3 + Me.bbtnitmMarkRead.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitmMarkRead.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.bbtnitmMarkRead.Name = "bbtnitmMarkRead" + Me.bbtnitmMarkRead.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + ' + 'BarStaticItem1 + ' + Me.BarStaticItem1.Id = 4 + Me.BarStaticItem1.Name = "BarStaticItem1" + ' + 'RibbonPage1 + ' + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) + Me.RibbonPage1.Name = "RibbonPage1" + resources.ApplyResources(Me.RibbonPage1, "RibbonPage1") + ' + 'RibbonPageGroup1 + ' + Me.RibbonPageGroup1.AllowTextClipping = False + Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) + Me.RibbonPageGroup1.ItemLinks.Add(Me.bbtnitmMarkRead) + Me.RibbonPageGroup1.Name = "RibbonPageGroup1" + resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1") + ' + 'RibbonStatusBar1 + ' + Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItem1) + resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1") + Me.RibbonStatusBar1.Name = "RibbonStatusBar1" + Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 + ' + 'RibbonPage2 + ' + Me.RibbonPage2.Name = "RibbonPage2" + resources.ApplyResources(Me.RibbonPage2, "RibbonPage2") + ' + 'frmNotification_Startup + ' + resources.ApplyResources(Me, "$this") + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.IconOptions.SvgImage = CType(resources.GetObject("frmNotification_Startup.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.Name = "frmNotification_Startup" + Me.Ribbon = Me.RibbonControl1 + Me.StatusBar = Me.RibbonStatusBar1 + Me.TopMost = True + CType(Me.ListBoxControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents ListBoxControl1 As DevExpress.XtraEditors.ListBoxControl + Friend WithEvents RichEditControl1 As DevExpress.XtraRichEdit.RichEditControl + Friend WithEvents DocumentViewer1 As Controls.DocumentViewer.DocumentViewer + Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl + Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar + Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem + Friend WithEvents bbtnitmMarkRead As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem + + ''NOTE: The following procedure is required by the Windows Form Designer + ''It can be modified using the Windows Form Designer. + ''Do not modify it using the code editor. + ' + 'Private Sub InitializeComponent() + ' Me.SuspendLayout() + ' ' + ' 'frmNotification_Startup2 + ' ' + ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + ' Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + ' Me.ClientSize = New System.Drawing.Size(1046, 634) + ' Me.Name = "frmNotification_Startup" + ' Me.Text = "frmNotification_Startup" + ' Me.ResumeLayout(False) + + 'End Sub +End Class diff --git a/GUIs.Common/frmNotification_Startup.en-US.resx b/GUIs.Common/NNfrmNotification_Startup.en-US.resx similarity index 100% rename from GUIs.Common/frmNotification_Startup.en-US.resx rename to GUIs.Common/NNfrmNotification_Startup.en-US.resx diff --git a/GUIs.Common/frmNotification_Startup.fr-FR.resx b/GUIs.Common/NNfrmNotification_Startup.fr-FR.resx similarity index 100% rename from GUIs.Common/frmNotification_Startup.fr-FR.resx rename to GUIs.Common/NNfrmNotification_Startup.fr-FR.resx diff --git a/GUIs.Common/NNfrmNotification_Startup.resx b/GUIs.Common/NNfrmNotification_Startup.resx new file mode 100644 index 00000000..cdf3cf67 --- /dev/null +++ b/GUIs.Common/NNfrmNotification_Startup.resx @@ -0,0 +1,319 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + + Left + + + + 0, 158 + + + 248, 559 + + + + 0 + + + ListBoxControl1 + + + DevExpress.XtraEditors.ListBoxControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + 682, 211 + + + Hinweise schließen + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAM0DAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ + LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD + MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw + MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu + bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQ2xvc2UiPg0KICAgIDxwYXRoIGQ9 + Ik0xNiwyQzguMywyLDIsOC4zLDIsMTZzNi4zLDE0LDE0LDE0czE0LTYuMywxNC0xNFMyMy43LDIsMTYs + MnogTTIzLjcsMjEuN2MwLjQsMC40LDAuNCwxLDAsMS40bC0wLjYsMC42ICAgYy0wLjQsMC40LTEsMC40 + LTEuNCwwTDE2LDE4bC01LjcsNS43Yy0wLjQsMC40LTEsMC40LTEuNCwwbC0wLjYtMC42Yy0wLjQtMC40 + LTAuNC0xLDAtMS40TDE0LDE2bC01LjctNS43Yy0wLjQtMC40LTAuNC0xLDAtMS40ICAgbDAuNi0wLjZj + MC40LTAuNCwxLTAuNCwxLjQsMEwxNiwxNGw1LjctNS43YzAuNC0wLjQsMS0wLjQsMS40LDBsMC42LDAu + NmMwLjQsMC40LDAuNCwxLDAsMS40TDE4LDE2TDIzLjcsMjEuN3oiIGNsYXNzPSJSZWQiIC8+DQogIDwv + Zz4NCjwvc3ZnPgs= + + + + Als gelesen markieren + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKMCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh + Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl + Pg0KICA8ZyBpZD0iQ2hlY2tCb3giPg0KICAgIDxwYXRoIGQ9Ik0yNyw0SDVDNC41LDQsNCw0LjUsNCw1 + djIyYzAsMC41LDAuNSwxLDEsMWgyMmMwLjUsMCwxLTAuNSwxLTFWNUMyOCw0LjUsMjcuNSw0LDI3LDR6 + IE0xNCwyMmwtNi02bDItMmw0LDQgICBsOC04bDIsMkwxNCwyMnoiIGNsYXNzPSJHcmVlbiIgLz4NCiAg + PC9nPg0KPC9zdmc+Cw== + + + + 0, 0 + + + Funktionen + + + Start + + + 1134, 0 + + + 0, 717 + + + 1134, 20 + + + RibbonStatusBar1 + + + DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonControl1 + + + DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + 269, 425 + + + 1 + + + False + + + RichEditControl1 + + + DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPage2 + + + True + + + 6, 13 + + + 1308, 775 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAAkDAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iQ29tcGF0aWJpbGl0eSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5l + dyAwIDAgMzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIx + MTU7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0K + ICA8cGF0aCBkPSJNMTYuNCwxMS40YzAuNi0wLjksMS41LTEuNCwyLjYtMS40czIuMSwwLjUsMi42LDEu + NEwyMiwxMlY0SDNDMi40LDQsMiwzLjYsMiwzYzAtMC42LDAuNC0xLDEtMWgxOVYxICBjMC0wLjYtMC40 + LTEtMS0xSDNDMS4zLDAsMCwxLjMsMCwzdjIwYzAsMS43LDEuMywzLDMsM2g0LjRMMTYuNCwxMS40eiIg + Y2xhc3M9IkJsdWUiIC8+DQogIDxwYXRoIGQ9Ik0xOC4xLDEyLjVMOC4xLDI4LjZDNy43LDI5LjIsOC4z + LDMwLDkuMSwzMGgxOS45YzAuOCwwLDEuMy0wLjgsMC45LTEuNGwtOS45LTE2LjEgIEMxOS41LDExLjgs + MTguNSwxMS44LDE4LjEsMTIuNXoiIGNsYXNzPSJZZWxsb3ciIC8+DQogIDxwYXRoIGQ9Ik0yMCwyNGgt + MnYtOGgyVjI0eiBNMjAsMjZoLTJ2MmgyVjI2eiIgY2xhc3M9IkJsYWNrIiAvPg0KPC9zdmc+Cw== + + + + CenterScreen + + + Hinweise + + + BarButtonItem1 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + bbtnitmMarkRead + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + BarStaticItem1 + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPage1 + + + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPageGroup1 + + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + RibbonPage2 + + + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + frmNotification_Startup + + + DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + \ No newline at end of file diff --git a/GUIs.Common/NNfrmNotification_Startup.vb b/GUIs.Common/NNfrmNotification_Startup.vb new file mode 100644 index 00000000..7fec48e0 --- /dev/null +++ b/GUIs.Common/NNfrmNotification_Startup.vb @@ -0,0 +1,199 @@ +Imports System.Drawing +Imports System.Threading +Imports DigitalData.Modules.EDMI.API +Imports DigitalData.Modules.Logging +Imports DigitalData.Modules.ZooFlow +Imports DigitalData.Modules.ZooFlow.Constants +Public Class NNfrmNotification_Startup + Private ReadOnly NotificationItems As New List(Of NotificationItem) + Private oDTNotifications As DataTable + Private ReadOnly Property LogConfig As LogConfig + Private ReadOnly Property Logger As Logger + Private ReadOnly Environment As Environment + Private GDPictureKey As String + Private MyCaption As String + Private NOTIFY_ID As Integer + Private Property OperationMode As OperationMode + Private Client As Client + Friend Class NotificationItem + Public Id As Integer + Public Title As String + Public MSGSTRING As String + + Public Overrides Function ToString() As String + Return Title + End Function + End Class + Public Sub New(DTNotifications As DataTable, pLogConfig As LogConfig, pGDPictureKey As String, pCaption As String, pEnvironment As Environment) + oDTNotifications = DTNotifications + LogConfig = pLogConfig + Logger = pLogConfig.GetLogger() + GDPictureKey = pGDPictureKey + MyCaption = pCaption + Environment = pEnvironment + + ' Dieser Aufruf ist für den Designer erforderlich. + 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 + + + End Sub + + Private Sub frmNotification_Startup_Load(sender As Object, e As EventArgs) Handles Me.Load + Try + DocumentViewer1.Init(LogConfig, GDPictureKey) + OperationMode = GetOperationMode() + Client = Environment.Service.Client + Me.Text = MyCaption + If oDTNotifications.Rows.Count = 1 Then + Me.ListBoxControl1.Visible = False + Load_Profile(oDTNotifications.Rows(0).Item("GUID")) + Else + + + For Each oRow As DataRow In oDTNotifications.Rows + NotificationItems.Add(New NotificationItem With { + .Id = CInt(oRow.Item("GUID")), + .Title = oRow.Item("TITLE").ToString + }) + Next + + ' ListBoxControl1.Items.Clear() + 'ListBoxControl1.Items.AddRange(NotificationItems) + + + + ListBoxControl1.DataSource = oDTNotifications + ListBoxControl1.ValueMember = "GUID" + ListBoxControl1.DisplayMember = "TITLE" + End If + Catch ex As Exception + Dim oMsgBox As New frmDialog(ex.Message, "Unexpected Error loading form:", frmDialog.DialogType.Error) + oMsgBox.ShowDialog() + End Try + End Sub + Sub Load_Profile(oIndex As Integer) + Try + DocumentViewer1.Visible = False + RichEditControl1.Visible = False + Dim oType As String, oMSG_STRING As String, oMarkasRead As Boolean + + If oDTNotifications.Rows.Count = 1 Then + oType = oDTNotifications.Rows(0).Item("DISPLAY_TYPE") + oMSG_STRING = oDTNotifications.Rows(0).Item("MSG_STRING") + oMarkasRead = oDTNotifications.Rows(0).Item("VALIDATE_READ") + NOTIFY_ID = oDTNotifications.Rows(0).Item("GUID") + Else + Dim oCount As Integer = 0 + For Each orow As DataRow In oDTNotifications.Rows + If oIndex = oCount Then + oType = orow.Item("DISPLAY_TYPE") + oMSG_STRING = orow.Item("MSG_STRING") + oMarkasRead = orow.Item("VALIDATE_READ") + NOTIFY_ID = orow.Item("GUID") + Exit For + Else + oCount += 1 + End If + + Next + End If + + If oType = "MESSAGE" Then + RichEditControl1.Text = oMSG_STRING + RichEditControl1.Visible = True + RichEditControl1.Dock = Windows.Forms.DockStyle.Fill + Else + If IO.File.Exists(oMSG_STRING) Then + DocumentViewer1.LoadFile(oMSG_STRING) + DocumentViewer1.Visible = True + DocumentViewer1.Dock = Windows.Forms.DockStyle.Fill + Else + Dim oMsgBox As New frmDialog("File not existing!", "Load Notification File", frmDialog.DialogType.Warning) + oMsgBox.ShowDialog() + End If + End If + If oMarkasRead = True Then + bbtnitmMarkRead.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + Else + bbtnitmMarkRead.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + End If + + Catch ex As Exception + Dim oMsgBox As New frmDialog(ex.Message, "Unexpected Error loading Message:", frmDialog.DialogType.Error) + oMsgBox.ShowDialog() + End Try + End Sub + + Private Sub ListBoxControl1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ListBoxControl1.SelectedValueChanged + If ListBoxControl1.SelectedIndex <> -1 Then + Try + Load_Profile(ListBoxControl1.SelectedIndex) + Catch ex As Exception + Dim oMsgBox As New frmDialog(ex.Message, "Unexpected Error switching Notifications:", frmDialog.DialogType.Error) + oMsgBox.ShowDialog() + End Try + End If + End Sub + + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + Me.Close() + End Sub + + Private Sub bbtnitmMarkRead_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmMarkRead.ItemClick + Dim oSuccess As Boolean = True + Try + + Dim oInsert = $"INSERT INTO [dbo].[TBDD_NOTIFICATIONS_USER_HISTORY] + ([NOTIFY_ID] + ,[USR_ID]) + VALUES + ({NOTIFY_ID} + ,{Environment.User.UserId})" + If OperationMode = OperationMode.ZooFlow Or OperationMode = OperationMode.WithAppServer Then + Dim oResponse = Client.ExecuteNonQueryFromECM(oInsert) + If Not oResponse.OK Then + oSuccess = False + End If + Else + oSuccess = Environment.Database.ExecuteNonQuery(oInsert) + + End If + If oSuccess = False Then + BarStaticItem1.Caption = "Error while setting History!" + BarStaticItem1.ItemAppearance.Normal.BackColor = Color.Red + Else + BarStaticItem1.Caption = "History successfully saved!" + BarStaticItem1.ItemAppearance.Normal.BackColor = Color.Green + If oDTNotifications.Rows.Count = 1 Then + Me.Close() + End If + End If + Catch ex As Exception + Dim oMsgBox As New frmDialog(ex.Message, "Unexpected Error HistoryInsert:", frmDialog.DialogType.Error) + oMsgBox.ShowDialog() + oSuccess = False + End Try + + End Sub + Private Function GetOperationMode() As OperationMode + Dim oOperationMode As OperationMode + + If Environment.Service.Client?.IsOnline AndAlso Environment.Service.Address <> String.Empty Then + oOperationMode = OperationMode.WithAppServer + Else + oOperationMode = OperationMode.NoAppServer + End If + + Return oOperationMode + End Function +End Class \ No newline at end of file diff --git a/GUIs.Common/Resources/check1.svg b/GUIs.Common/Resources/check1.svg new file mode 100644 index 00000000..bc91b5a7 --- /dev/null +++ b/GUIs.Common/Resources/check1.svg @@ -0,0 +1,16 @@ + + + + + \ No newline at end of file diff --git a/GUIs.Common/Resources/clearheaderandfooter.svg b/GUIs.Common/Resources/clearheaderandfooter.svg new file mode 100644 index 00000000..4a355089 --- /dev/null +++ b/GUIs.Common/Resources/clearheaderandfooter.svg @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/GUIs.Common/frmNotification_Startup.Designer.vb b/GUIs.Common/frmNotification_Startup.Designer.vb index 3f421f6b..55625bb8 100644 --- a/GUIs.Common/frmNotification_Startup.Designer.vb +++ b/GUIs.Common/frmNotification_Startup.Designer.vb @@ -1,87 +1,115 @@ - -Partial Class frmNotification_Startup + _ +Partial Class frmNotification_Startup2 Inherits DevExpress.XtraBars.Ribbon.RibbonForm - 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - + 'Form overrides dispose to clean up the component list. + _ Protected Overrides Sub Dispose(ByVal disposing As Boolean) - Try - If disposing AndAlso components IsNot Nothing Then - components.Dispose() - End If - Finally - MyBase.Dispose(disposing) - End Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + MyBase.Dispose(disposing) End Sub - 'Wird vom Windows Form-Designer benötigt. + 'Required by the Windows Form Designer Private components As System.ComponentModel.IContainer - 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. - 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. - 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - + 'NOTE: The following procedure is required by the Windows Form Designer + 'It can be modified using the Windows Form Designer. + 'Do not modify it using the code editor. + _ Private Sub InitializeComponent() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmNotification_Startup)) + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmNotification_Startup2)) + Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() Me.ListBoxControl1 = New DevExpress.XtraEditors.ListBoxControl() Me.RichEditControl1 = New DevExpress.XtraRichEdit.RichEditControl() - Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl() - Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem() - Me.bbtnitmMarkRead = New DevExpress.XtraBars.BarButtonItem() - Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem() + Me.RibbonControl = New DevExpress.XtraBars.Ribbon.RibbonControl() + Me.btnCloseForm = New DevExpress.XtraBars.BarButtonItem() + Me.lbStatus = New DevExpress.XtraBars.BarStaticItem() + Me.btnMarkAsRead = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() - Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() + Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() + Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() + CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl1.Panel1.SuspendLayout() + CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl1.Panel2.SuspendLayout() + Me.SplitContainerControl1.SuspendLayout() CType(Me.ListBoxControl1, System.ComponentModel.ISupportInitialize).BeginInit() - CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' - 'ListBoxControl1 + 'SplitContainerControl1 ' - resources.ApplyResources(Me.ListBoxControl1, "ListBoxControl1") - Me.ListBoxControl1.Name = "ListBoxControl1" + resources.ApplyResources(Me.SplitContainerControl1, "SplitContainerControl1") + Me.SplitContainerControl1.Name = "SplitContainerControl1" ' - 'RichEditControl1 + 'SplitContainerControl1.Panel1 ' - resources.ApplyResources(Me.RichEditControl1, "RichEditControl1") - Me.RichEditControl1.MenuManager = Me.RibbonControl1 - Me.RichEditControl1.Name = "RichEditControl1" - Me.RichEditControl1.Options.HorizontalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden - Me.RichEditControl1.Options.VerticalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden - ' - 'RibbonControl1 + resources.ApplyResources(Me.SplitContainerControl1.Panel1, "SplitContainerControl1.Panel1") + Me.SplitContainerControl1.Panel1.Controls.Add(Me.ListBoxControl1) ' - Me.RibbonControl1.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Green - Me.RibbonControl1.ExpandCollapseItem.Id = 0 - Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.BarButtonItem1, Me.bbtnitmMarkRead, Me.BarStaticItem1}) - resources.ApplyResources(Me.RibbonControl1, "RibbonControl1") - Me.RibbonControl1.MaxItemId = 5 - Me.RibbonControl1.Name = "RibbonControl1" - Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) - Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] - Me.RibbonControl1.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.[False] - Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1 + 'SplitContainerControl1.Panel2 ' - 'BarButtonItem1 + resources.ApplyResources(Me.SplitContainerControl1.Panel2, "SplitContainerControl1.Panel2") + Me.SplitContainerControl1.Panel2.Controls.Add(Me.RichEditControl1) + Me.SplitContainerControl1.Panel2.Controls.Add(Me.DocumentViewer1) + Me.SplitContainerControl1.SplitterPosition = 255 ' - resources.ApplyResources(Me.BarButtonItem1, "BarButtonItem1") - Me.BarButtonItem1.Id = 1 - Me.BarButtonItem1.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem1.Name = "BarButtonItem1" + 'ListBoxControl1 ' - 'bbtnitmMarkRead + resources.ApplyResources(Me.ListBoxControl1, "ListBoxControl1") + Me.ListBoxControl1.Name = "ListBoxControl1" ' - resources.ApplyResources(Me.bbtnitmMarkRead, "bbtnitmMarkRead") - Me.bbtnitmMarkRead.Id = 3 - Me.bbtnitmMarkRead.ImageOptions.SvgImage = CType(resources.GetObject("bbtnitmMarkRead.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.bbtnitmMarkRead.Name = "bbtnitmMarkRead" - Me.bbtnitmMarkRead.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + 'RichEditControl1 ' - 'BarStaticItem1 + resources.ApplyResources(Me.RichEditControl1, "RichEditControl1") + Me.RichEditControl1.MenuManager = Me.RibbonControl + Me.RichEditControl1.Name = "RichEditControl1" ' - Me.BarStaticItem1.Id = 4 - Me.BarStaticItem1.Name = "BarStaticItem1" + 'RibbonControl + ' + resources.ApplyResources(Me.RibbonControl, "RibbonControl") + Me.RibbonControl.ColorScheme = DevExpress.XtraBars.Ribbon.RibbonControlColorScheme.Green + Me.RibbonControl.ExpandCollapseItem.Id = 0 + Me.RibbonControl.ExpandCollapseItem.ImageOptions.ImageIndex = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.ImageIndex"), Integer) + Me.RibbonControl.ExpandCollapseItem.ImageOptions.LargeImageIndex = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.LargeImageIndex"), Integer) + Me.RibbonControl.ExpandCollapseItem.ImageOptions.SvgImage = CType(resources.GetObject("RibbonControl.ExpandCollapseItem.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.RibbonControl.ExpandCollapseItem.SearchTags = resources.GetString("RibbonControl.ExpandCollapseItem.SearchTags") + Me.RibbonControl.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.btnCloseForm, Me.lbStatus, Me.btnMarkAsRead}) + Me.RibbonControl.MaxItemId = 4 + Me.RibbonControl.Name = "RibbonControl" + Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl.StatusBar = Me.RibbonStatusBar + ' + 'btnCloseForm + ' + resources.ApplyResources(Me.btnCloseForm, "btnCloseForm") + Me.btnCloseForm.Id = 1 + Me.btnCloseForm.ImageOptions.ImageIndex = CType(resources.GetObject("btnCloseForm.ImageOptions.ImageIndex"), Integer) + Me.btnCloseForm.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnCloseForm.ImageOptions.LargeImageIndex"), Integer) + Me.btnCloseForm.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.clearheaderandfooter + Me.btnCloseForm.Name = "btnCloseForm" + ' + 'lbStatus + ' + resources.ApplyResources(Me.lbStatus, "lbStatus") + Me.lbStatus.Id = 2 + Me.lbStatus.ImageOptions.ImageIndex = CType(resources.GetObject("lbStatus.ImageOptions.ImageIndex"), Integer) + Me.lbStatus.ImageOptions.LargeImageIndex = CType(resources.GetObject("lbStatus.ImageOptions.LargeImageIndex"), Integer) + Me.lbStatus.ImageOptions.SvgImage = CType(resources.GetObject("lbStatus.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.lbStatus.Name = "lbStatus" + ' + 'btnMarkAsRead + ' + resources.ApplyResources(Me.btnMarkAsRead, "btnMarkAsRead") + Me.btnMarkAsRead.Id = 3 + Me.btnMarkAsRead.ImageOptions.ImageIndex = CType(resources.GetObject("btnMarkAsRead.ImageOptions.ImageIndex"), Integer) + Me.btnMarkAsRead.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnMarkAsRead.ImageOptions.LargeImageIndex"), Integer) + Me.btnMarkAsRead.ImageOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.check + Me.btnMarkAsRead.Name = "btnMarkAsRead" ' 'RibbonPage1 ' @@ -91,49 +119,56 @@ Partial Class frmNotification_Startup ' 'RibbonPageGroup1 ' - Me.RibbonPageGroup1.AllowTextClipping = False - Me.RibbonPageGroup1.ItemLinks.Add(Me.BarButtonItem1) - Me.RibbonPageGroup1.ItemLinks.Add(Me.bbtnitmMarkRead) + Me.RibbonPageGroup1.ItemLinks.Add(Me.btnCloseForm) + Me.RibbonPageGroup1.ItemLinks.Add(Me.btnMarkAsRead) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1") ' - 'RibbonStatusBar1 + 'RibbonStatusBar ' - Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItem1) - resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1") - Me.RibbonStatusBar1.Name = "RibbonStatusBar1" - Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1 + resources.ApplyResources(Me.RibbonStatusBar, "RibbonStatusBar") + Me.RibbonStatusBar.ItemLinks.Add(Me.lbStatus) + Me.RibbonStatusBar.Name = "RibbonStatusBar" + Me.RibbonStatusBar.Ribbon = Me.RibbonControl ' - 'RibbonPage2 + 'DocumentViewer1 ' - Me.RibbonPage2.Name = "RibbonPage2" - resources.ApplyResources(Me.RibbonPage2, "RibbonPage2") + resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1") + Me.DocumentViewer1.FileLoaded = False + Me.DocumentViewer1.Name = "DocumentViewer1" ' - 'frmNotification_Startup + 'frmNotification_Startup2 ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font - Me.IconOptions.SvgImage = CType(resources.GetObject("frmNotification_Startup.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.Name = "frmNotification_Startup" - Me.Ribbon = Me.RibbonControl1 - Me.StatusBar = Me.RibbonStatusBar1 - Me.TopMost = True + Me.Controls.Add(Me.SplitContainerControl1) + Me.Controls.Add(Me.RibbonStatusBar) + Me.Controls.Add(Me.RibbonControl) + Me.Name = "frmNotification_Startup2" + Me.Ribbon = Me.RibbonControl + Me.StatusBar = Me.RibbonStatusBar + CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl1.Panel1.ResumeLayout(False) + CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl1.Panel2.ResumeLayout(False) + CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl1.ResumeLayout(False) CType(Me.ListBoxControl1, System.ComponentModel.ISupportInitialize).EndInit() - CType(Me.RibbonControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() End Sub + Friend WithEvents RibbonControl As DevExpress.XtraBars.Ribbon.RibbonControl + Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage + Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonStatusBar As DevExpress.XtraBars.Ribbon.RibbonStatusBar + Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl Friend WithEvents ListBoxControl1 As DevExpress.XtraEditors.ListBoxControl Friend WithEvents RichEditControl1 As DevExpress.XtraRichEdit.RichEditControl Friend WithEvents DocumentViewer1 As Controls.DocumentViewer.DocumentViewer - Friend WithEvents RibbonControl1 As DevExpress.XtraBars.Ribbon.RibbonControl - Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup - Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar - Friend WithEvents RibbonPage2 As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents bbtnitmMarkRead As DevExpress.XtraBars.BarButtonItem - Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem + Friend WithEvents btnCloseForm As DevExpress.XtraBars.BarButtonItem + Friend WithEvents lbStatus As DevExpress.XtraBars.BarStaticItem + Friend WithEvents btnMarkAsRead As DevExpress.XtraBars.BarButtonItem End Class diff --git a/GUIs.Common/frmNotification_Startup.en.resx b/GUIs.Common/frmNotification_Startup.en.resx new file mode 100644 index 00000000..45cc7ef3 --- /dev/null +++ b/GUIs.Common/frmNotification_Startup.en.resx @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Close messages + + + Mark as read + + + Actions + + + Home + + + Messages + + \ No newline at end of file diff --git a/GUIs.Common/frmNotification_Startup.fr.resx b/GUIs.Common/frmNotification_Startup.fr.resx new file mode 100644 index 00000000..d978203f --- /dev/null +++ b/GUIs.Common/frmNotification_Startup.fr.resx @@ -0,0 +1,135 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + Fermer les messages + + + Marquer comme lu + + + Début + + + Fonctions + + + Messages + + \ No newline at end of file diff --git a/GUIs.Common/frmNotification_Startup.resx b/GUIs.Common/frmNotification_Startup.resx index 0df402f6..6096810f 100644 --- a/GUIs.Common/frmNotification_Startup.resx +++ b/GUIs.Common/frmNotification_Startup.resx @@ -117,251 +117,262 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - - Left + + $this + + + DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + lbStatus - - 0, 158 + + 444, 36 - - 248, 559 + + 0, 632 - - + + RibbonControl + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + Als gelesen markieren + + + SplitContainerControl1.Panel1 + + + DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl1 + + + + + + + 1 + + 0 - - ListBoxControl1 + + SplitContainerControl1.Panel2 + + + 21, 45 + + + + 1 + + + RibbonPageGroup1 + + + -1 DevExpress.XtraEditors.ListBoxControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - $this + + DocumentViewer1 - + + Panel2 + + + DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + btnCloseForm + + + 1050, 22 + + 2 - - 682, 211 + + 400, 322 - - RibbonControl1 + + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - + DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - $this + + 0 - - 4 + + Hinweise schließen - - 269, 425 + + 329, 331 - - 1 + + -1 - - False + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RichEditControl1 + + 0, 0 - - DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + frmNotification_Startup2 - - $this + + - - 1 + + 0 - - Hinweise schließen + + $this - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAM0DAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIxMTU7fQoJ - LlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5HcmVlbntmaWxsOiMwMzlD - MjM7fQoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjU7fQoJLnN0MXtkaXNwbGF5Om5vbmU7fQoJLnN0MntkaXNwbGF5OmlubGluZTtmaWxsOiMw - MzlDMjM7fQoJLnN0M3tkaXNwbGF5OmlubGluZTtmaWxsOiNEMTFDMUM7fQoJLnN0NHtkaXNwbGF5Omlu - bGluZTtmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0KICA8ZyBpZD0iQ2xvc2UiPg0KICAgIDxwYXRoIGQ9 - Ik0xNiwyQzguMywyLDIsOC4zLDIsMTZzNi4zLDE0LDE0LDE0czE0LTYuMywxNC0xNFMyMy43LDIsMTYs - MnogTTIzLjcsMjEuN2MwLjQsMC40LDAuNCwxLDAsMS40bC0wLjYsMC42ICAgYy0wLjQsMC40LTEsMC40 - LTEuNCwwTDE2LDE4bC01LjcsNS43Yy0wLjQsMC40LTEsMC40LTEuNCwwbC0wLjYtMC42Yy0wLjQtMC40 - LTAuNC0xLDAtMS40TDE0LDE2bC01LjctNS43Yy0wLjQtMC40LTAuNC0xLDAtMS40ICAgbDAuNi0wLjZj - MC40LTAuNCwxLTAuNCwxLjQsMEwxNiwxNGw1LjctNS43YzAuNC0wLjQsMS0wLjQsMS40LDBsMC42LDAu - NmMwLjQsMC40LDAuNCwxLDAsMS40TDE4LDE2TDIzLjcsMjEuN3oiIGNsYXNzPSJSZWQiIC8+DQogIDwv - Zz4NCjwvc3ZnPgs= - - - - Als gelesen markieren + + btnMarkAsRead - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAKMCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku - WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAz - OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh - Y2l0eTowLjc1O30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl - Pg0KICA8ZyBpZD0iQ2hlY2tCb3giPg0KICAgIDxwYXRoIGQ9Ik0yNyw0SDVDNC41LDQsNCw0LjUsNCw1 - djIyYzAsMC41LDAuNSwxLDEsMWgyMmMwLjUsMCwxLTAuNSwxLTFWNUMyOCw0LjUsMjcuNSw0LDI3LDR6 - IE0xNCwyMmwtNi02bDItMmw0LDQgICBsOC04bDIsMkwxNCwyMnoiIGNsYXNzPSJHcmVlbiIgLz4NCiAg - PC9nPg0KPC9zdmc+Cw== - - - - 0, 0 + + -1 Start - - 1134, 158 + + 255, 474 - - 0, 717 + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - 1134, 22 + + RichEditControl1 - - RibbonStatusBar1 + + 2 - - DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + 0 - - $this + + ListBoxControl1 - - 3 + + RibbonStatusBar - - RibbonControl1 + + -1 - - DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + -1 - - $this + + 1050, 654 - - 4 + + 0 - - Funktionen + + 6, 13 - - DocumentViewer1 + + SplitContainerControl1 DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.8.0.0, Culture=neutral, PublicKeyToken=null - - $this + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - 0 + + - - RibbonPage2 + + SplitContainerControl1.Panel2 - - True - - - 6, 13 + + SplitContainerControl1.Panel1 - - 1134, 739 - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAAkDAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iQ29tcGF0aWJpbGl0eSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5l - dyAwIDAgMzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlllbGxvd3tmaWxsOiNGRkIx - MTU7fQoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQo8L3N0eWxlPg0K - ICA8cGF0aCBkPSJNMTYuNCwxMS40YzAuNi0wLjksMS41LTEuNCwyLjYtMS40czIuMSwwLjUsMi42LDEu - NEwyMiwxMlY0SDNDMi40LDQsMiwzLjYsMiwzYzAtMC42LDAuNC0xLDEtMWgxOVYxICBjMC0wLjYtMC40 - LTEtMS0xSDNDMS4zLDAsMCwxLjMsMCwzdjIwYzAsMS43LDEuMywzLDMsM2g0LjRMMTYuNCwxMS40eiIg - Y2xhc3M9IkJsdWUiIC8+DQogIDxwYXRoIGQ9Ik0xOC4xLDEyLjVMOC4xLDI4LjZDNy43LDI5LjIsOC4z - LDMwLDkuMSwzMGgxOS45YzAuOCwwLDEuMy0wLjgsMC45LTEuNGwtOS45LTE2LjEgIEMxOS41LDExLjgs - MTguNSwxMS44LDE4LjEsMTIuNXoiIGNsYXNzPSJZZWxsb3ciIC8+DQogIDxwYXRoIGQ9Ik0yMCwyNGgt - MnYtOGgyVjI0eiBNMjAsMjZoLTJ2MmgyVjI2eiIgY2xhc3M9IkJsYWNrIiAvPg0KPC9zdmc+Cw== - - - - CenterScreen + + SplitContainerControl1 - - Hinweise + + frmNotification_Startup2 + + + RibbonPage1 - - BarButtonItem1 + + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + Funktionen - - bbtnitmMarkRead + + Fill - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + 1050, 158 - - BarStaticItem1 + + 1 - - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + 0 - - RibbonPage1 + + 0, 0 - - DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + lbStatus - - RibbonPageGroup1 + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + -1 - - RibbonPage2 + + 1 - - DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + Panel1 - - frmNotification_Startup + + $this - - DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + SplitContainerControl1.Panel2 + + + -1 + + + -1 + + 1050, 474 + + + 0, 158 + + + Fill + + + True + + + fr + \ No newline at end of file diff --git a/GUIs.Common/frmNotification_Startup.vb b/GUIs.Common/frmNotification_Startup.vb index 357df3cb..a127cc14 100644 --- a/GUIs.Common/frmNotification_Startup.vb +++ b/GUIs.Common/frmNotification_Startup.vb @@ -1,17 +1,22 @@ Imports System.Drawing Imports System.Threading +Imports DigitalData.Controls.DocumentViewer Imports DigitalData.Modules.EDMI.API Imports DigitalData.Modules.Logging -Imports DigitalData.Modules.ZooFlow Imports DigitalData.Modules.ZooFlow.Constants -Public Class frmNotification_Startup - Private ReadOnly NotificationItems As New List(Of NotificationItem) - Private oDTNotifications As DataTable + +Public Class frmNotification_Startup2 Private ReadOnly Property LogConfig As LogConfig Private ReadOnly Property Logger As Logger - Private ReadOnly Environment As Environment - Private GDPictureKey As String - Private MyCaption As String + + Private ReadOnly _NotificationsTable As DataTable + + + + Private ReadOnly _Environment As DigitalData.Modules.ZooFlow.Environment + Private ReadOnly _GDPictureKey As String + Private ReadOnly _FormCaption As String + Private NOTIFY_ID As Integer Private Property OperationMode As OperationMode Private Client As Client @@ -24,21 +29,21 @@ Public Class frmNotification_Startup Return Title End Function End Class - Public Sub New(DTNotifications As DataTable, pLogConfig As LogConfig, pGDPictureKey As String, pCaption As String, pEnvironment As Environment) - oDTNotifications = DTNotifications + Public Sub New(DTNotifications As DataTable, pLogConfig As LogConfig, pGDPictureKey As String, pCaption As String, pEnvironment As DigitalData.Modules.ZooFlow.Environment) + _NotificationsTable = DTNotifications LogConfig = pLogConfig Logger = pLogConfig.GetLogger() - GDPictureKey = pGDPictureKey - MyCaption = pCaption - Environment = pEnvironment + _GDPictureKey = pGDPictureKey + _FormCaption = pCaption + _Environment = pEnvironment ' Dieser Aufruf ist für den Designer erforderlich. 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 + 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 @@ -50,29 +55,16 @@ Public Class frmNotification_Startup Private Sub frmNotification_Startup_Load(sender As Object, e As EventArgs) Handles Me.Load Try - DocumentViewer1.Init(LogConfig, GDPictureKey) + DocumentViewer1.Init(LogConfig, _GDPictureKey) OperationMode = GetOperationMode() - Client = Environment.Service.Client - Me.Text = MyCaption - If oDTNotifications.Rows.Count = 1 Then + Client = _Environment.Service.Client + Me.Text = _FormCaption + If _NotificationsTable.Rows.Count = 1 Then Me.ListBoxControl1.Visible = False - Load_Profile(oDTNotifications.Rows(0).Item("GUID")) + Load_Profile(_NotificationsTable.Rows(0).Item("GUID")) Else - - For Each oRow As DataRow In oDTNotifications.Rows - NotificationItems.Add(New NotificationItem With { - .Id = CInt(oRow.Item("GUID")), - .Title = oRow.Item("TITLE").ToString - }) - Next - - ' ListBoxControl1.Items.Clear() - 'ListBoxControl1.Items.AddRange(NotificationItems) - - - - ListBoxControl1.DataSource = oDTNotifications + ListBoxControl1.DataSource = _NotificationsTable ListBoxControl1.ValueMember = "GUID" ListBoxControl1.DisplayMember = "TITLE" End If @@ -87,19 +79,20 @@ Public Class frmNotification_Startup RichEditControl1.Visible = False Dim oType As String, oMSG_STRING As String, oMarkasRead As Boolean - If oDTNotifications.Rows.Count = 1 Then - oType = oDTNotifications.Rows(0).Item("DISPLAY_TYPE") - oMSG_STRING = oDTNotifications.Rows(0).Item("MSG_STRING") - oMarkasRead = oDTNotifications.Rows(0).Item("VALIDATE_READ") - NOTIFY_ID = oDTNotifications.Rows(0).Item("GUID") + If _NotificationsTable.Rows.Count = 1 Then + Dim oRow As DataRow = _NotificationsTable.Rows(0) + oType = oRow.Item("DISPLAY_TYPE") + oMSG_STRING = oRow.Item("MSG_STRING") + oMarkasRead = oRow.Item("VALIDATE_READ") + NOTIFY_ID = oRow.Item("GUID") Else Dim oCount As Integer = 0 - For Each orow As DataRow In oDTNotifications.Rows + For Each oRow As DataRow In _NotificationsTable.Rows If oIndex = oCount Then - oType = orow.Item("DISPLAY_TYPE") - oMSG_STRING = orow.Item("MSG_STRING") - oMarkasRead = orow.Item("VALIDATE_READ") - NOTIFY_ID = orow.Item("GUID") + oType = oRow.Item("DISPLAY_TYPE") + oMSG_STRING = oRow.Item("MSG_STRING") + oMarkasRead = oRow.Item("VALIDATE_READ") + NOTIFY_ID = oRow.Item("GUID") Exit For Else oCount += 1 @@ -123,9 +116,9 @@ Public Class frmNotification_Startup End If End If If oMarkasRead = True Then - bbtnitmMarkRead.Visibility = DevExpress.XtraBars.BarItemVisibility.Always + btnMarkAsRead.Visibility = DevExpress.XtraBars.BarItemVisibility.Always Else - bbtnitmMarkRead.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + btnMarkAsRead.Visibility = DevExpress.XtraBars.BarItemVisibility.Never End If Catch ex As Exception @@ -145,36 +138,31 @@ Public Class frmNotification_Startup End If End Sub - Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem1.ItemClick + Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnCloseForm.ItemClick Me.Close() End Sub - Private Sub bbtnitmMarkRead_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmMarkRead.ItemClick + Private Sub btnMarkAsRead_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnMarkAsRead.ItemClick Dim oSuccess As Boolean = True Try - Dim oInsert = $"INSERT INTO [dbo].[TBDD_NOTIFICATIONS_USER_HISTORY] - ([NOTIFY_ID] - ,[USR_ID]) - VALUES - ({NOTIFY_ID} - ,{Environment.User.UserId})" + Dim oSQL = $"INSERT INTO [dbo].[TBDD_NOTIFICATIONS_USER_HISTORY] ([NOTIFY_ID], [USR_ID]) VALUES ({NOTIFY_ID} ,{_Environment.User.UserId})" If OperationMode = OperationMode.ZooFlow Or OperationMode = OperationMode.WithAppServer Then - Dim oResponse = Client.ExecuteNonQueryFromECM(oInsert) + Dim oResponse = Client.ExecuteNonQueryFromECM(oSQL) If Not oResponse.OK Then oSuccess = False End If Else - oSuccess = Environment.Database.ExecuteNonQuery(oInsert) + oSuccess = _Environment.Database.ExecuteNonQuery(oSQL) End If If oSuccess = False Then - BarStaticItem1.Caption = "Error while setting History!" - BarStaticItem1.ItemAppearance.Normal.BackColor = Color.Red + lbStatus.Caption = "Error while setting History!" + lbStatus.ItemAppearance.Normal.BackColor = Color.Red Else - BarStaticItem1.Caption = "History successfully saved!" - BarStaticItem1.ItemAppearance.Normal.BackColor = Color.Green - If oDTNotifications.Rows.Count = 1 Then + lbStatus.Caption = "History successfully saved!" + lbStatus.ItemAppearance.Normal.BackColor = Color.Green + If _NotificationsTable.Rows.Count = 1 Then Me.Close() End If End If @@ -188,7 +176,7 @@ Public Class frmNotification_Startup Private Function GetOperationMode() As OperationMode Dim oOperationMode As OperationMode - If Environment.Service.Client?.IsOnline AndAlso Environment.Service.Address <> String.Empty Then + If _Environment.Service.Client?.IsOnline AndAlso _Environment.Service.Address <> String.Empty Then oOperationMode = OperationMode.WithAppServer Else oOperationMode = OperationMode.NoAppServer