diff --git a/GUIs.Common/Common.vbproj b/GUIs.Common/Common.vbproj index de823af7..5436581d 100644 --- a/GUIs.Common/Common.vbproj +++ b/GUIs.Common/Common.vbproj @@ -285,6 +285,7 @@ frmNotification_Startup.vb + Designer frmNotification_Startup.vb @@ -613,5 +614,8 @@ + + + \ 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 98b3d6de..63d6575c 100644 --- a/GUIs.Common/My Project/Resources.Designer.vb +++ b/GUIs.Common/My Project/Resources.Designer.vb @@ -90,6 +90,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property about() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("about", 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 20cf055b..003883a2 100644 --- a/GUIs.Common/My Project/Resources.resx +++ b/GUIs.Common/My Project/Resources.resx @@ -121,8 +121,8 @@ ..\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\editcolors.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 @@ -136,6 +136,9 @@ ..\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 @@ -151,6 +154,9 @@ ..\Resources\business_world2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\Open_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\grid.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -160,8 +166,11 @@ ..\Resources\jpg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\autoarrange1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\xls.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\check1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\insertpagecount.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -181,9 +190,6 @@ ..\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 @@ -193,12 +199,12 @@ ..\Resources\refreshallpivottable.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\enablescrolling.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\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 @@ -211,17 +217,14 @@ ..\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\save.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\groupheader.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 +241,11 @@ ..\Resources\categorize.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\zoom_more.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + + ..\Resources\singlepageview.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,8 +253,8 @@ ..\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\private.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 @@ -256,17 +262,17 @@ ..\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\autoarrange1.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\actions_database3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\filterquery.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -277,8 +283,8 @@ ..\Resources\tiff.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\private.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\business_world1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -292,22 +298,19 @@ ..\Resources\handtool1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\zoom_more.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\open.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\ppt.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\actions_user1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - ..\Resources\Article_32x32.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\dwg.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\_blank.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\check1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\about.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/Resources/about.svg b/GUIs.Common/Resources/about.svg new file mode 100644 index 00000000..1f67213d --- /dev/null +++ b/GUIs.Common/Resources/about.svg @@ -0,0 +1,19 @@ + + + + + + + \ No newline at end of file diff --git a/GUIs.Common/frmNotification_Startup.Designer.vb b/GUIs.Common/frmNotification_Startup.Designer.vb index 95ed5db1..42223066 100644 --- a/GUIs.Common/frmNotification_Startup.Designer.vb +++ b/GUIs.Common/frmNotification_Startup.Designer.vb @@ -43,19 +43,20 @@ Partial Class frmNotification_Startup ' 'SplitContainerControl1 ' + Me.SplitContainerControl1.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel1 resources.ApplyResources(Me.SplitContainerControl1, "SplitContainerControl1") Me.SplitContainerControl1.Name = "SplitContainerControl1" ' 'SplitContainerControl1.Panel1 ' - resources.ApplyResources(Me.SplitContainerControl1.Panel1, "SplitContainerControl1.Panel1") Me.SplitContainerControl1.Panel1.Controls.Add(Me.ListBoxControl1) + resources.ApplyResources(Me.SplitContainerControl1.Panel1, "SplitContainerControl1.Panel1") ' 'SplitContainerControl1.Panel2 ' - resources.ApplyResources(Me.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") Me.SplitContainerControl1.SplitterPosition = 255 ' 'ListBoxControl1 @@ -65,31 +66,33 @@ Partial Class frmNotification_Startup ' 'RichEditControl1 ' + Me.RichEditControl1.ActiveViewType = DevExpress.XtraRichEdit.RichEditViewType.Simple + Me.RichEditControl1.LayoutUnit = DevExpress.XtraRichEdit.DocumentLayoutUnit.Pixel resources.ApplyResources(Me.RichEditControl1, "RichEditControl1") Me.RichEditControl1.MenuManager = Me.RibbonControl Me.RichEditControl1.Name = "RichEditControl1" + Me.RichEditControl1.ReadOnly = True ' '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}) + resources.ApplyResources(Me.RibbonControl, "RibbonControl") Me.RibbonControl.MaxItemId = 4 Me.RibbonControl.Name = "RibbonControl" Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl.ShowDisplayOptionsMenuButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide + Me.RibbonControl.ShowToolbarCustomizeItem = False Me.RibbonControl.StatusBar = Me.RibbonStatusBar + Me.RibbonControl.Toolbar.ShowCustomizeItem = False ' '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" ' @@ -97,17 +100,12 @@ Partial Class frmNotification_Startup ' 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" ' @@ -119,32 +117,34 @@ Partial Class frmNotification_Startup ' 'RibbonPageGroup1 ' - Me.RibbonPageGroup1.ItemLinks.Add(Me.btnCloseForm) Me.RibbonPageGroup1.ItemLinks.Add(Me.btnMarkAsRead) + Me.RibbonPageGroup1.ItemLinks.Add(Me.btnCloseForm) Me.RibbonPageGroup1.Name = "RibbonPageGroup1" resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1") ' 'RibbonStatusBar ' - resources.ApplyResources(Me.RibbonStatusBar, "RibbonStatusBar") Me.RibbonStatusBar.ItemLinks.Add(Me.lbStatus) + resources.ApplyResources(Me.RibbonStatusBar, "RibbonStatusBar") Me.RibbonStatusBar.Name = "RibbonStatusBar" Me.RibbonStatusBar.Ribbon = Me.RibbonControl ' 'DocumentViewer1 ' - resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1") Me.DocumentViewer1.FileLoaded = False + resources.ApplyResources(Me.DocumentViewer1, "DocumentViewer1") Me.DocumentViewer1.Name = "DocumentViewer1" ' - 'frmNotification_Startup2 + 'frmNotification_Startup ' resources.ApplyResources(Me, "$this") Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.Controls.Add(Me.SplitContainerControl1) Me.Controls.Add(Me.RibbonStatusBar) Me.Controls.Add(Me.RibbonControl) - Me.Name = "frmNotification_Startup2" + Me.IconOptions.SvgImage = Global.DigitalData.GUIs.Common.My.Resources.Resources.about + Me.MinimizeBox = False + Me.Name = "frmNotification_Startup" Me.Ribbon = Me.RibbonControl Me.StatusBar = Me.RibbonStatusBar CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).EndInit() diff --git a/GUIs.Common/frmNotification_Startup.fr.resx b/GUIs.Common/frmNotification_Startup.fr.resx index d978203f..cc7abdb0 100644 --- a/GUIs.Common/frmNotification_Startup.fr.resx +++ b/GUIs.Common/frmNotification_Startup.fr.resx @@ -123,12 +123,12 @@ Marquer comme lu - - Début - Fonctions + + Début + Messages diff --git a/GUIs.Common/frmNotification_Startup.resx b/GUIs.Common/frmNotification_Startup.resx index 6096810f..220edc12 100644 --- a/GUIs.Common/frmNotification_Startup.resx +++ b/GUIs.Common/frmNotification_Startup.resx @@ -117,262 +117,226 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 - - $this - - - DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - lbStatus + + + Fill - - 444, 36 + + 0, 132 - - 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 - - - SplitContainerControl1.Panel2 - - - 21, 45 - - - - 1 - - - RibbonPageGroup1 - - - -1 - - - DevExpress.XtraEditors.ListBoxControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - DocumentViewer1 - - - Panel2 - - - DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - btnCloseForm - - - 1050, 22 - - - 2 - - - 400, 322 - - - 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 - - - 0 - - - Hinweise schließen - - - 329, 331 - - - -1 - - - DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + Fill 0, 0 - - frmNotification_Startup2 - - - - - - 0 - - - $this - - - btnMarkAsRead - - - -1 - - - Start - - 255, 474 + 255, 500 - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - RichEditControl1 - - - 2 - - + + 0 ListBoxControl1 - - RibbonStatusBar - - - -1 - - - -1 - - - 1050, 654 - - - 0 - - - 6, 13 - - - SplitContainerControl1 - - - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.8.0.0, Culture=neutral, PublicKeyToken=null - - - DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - - - - SplitContainerControl1.Panel2 + + DevExpress.XtraEditors.ListBoxControl, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a SplitContainerControl1.Panel1 - - SplitContainerControl1 - - - frmNotification_Startup2 - - - RibbonPage1 - - - DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - Funktionen - - - Fill - - - 1050, 158 - - - 1 - - + 0 - - 0, 0 - - - lbStatus - - - DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - - -1 - - - 1 - Panel1 + + SplitContainerControl1.Panel1 + + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl1 + + + 0 + + + 21, 45 + + + Hinweise schließen + + + Status + + + Als gelesen markieren + + + 0, 0 + + + Funktionen + + + Start + + + 1050, 132 + + + 0, 632 + + + 1050, 22 + + + RibbonStatusBar + + + DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 1 + + + RibbonControl + + + DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + $this + + 2 + + + 400, 322 + + + 1 + + + RichEditControl1 + + + DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + SplitContainerControl1.Panel2 + + + 0 + + + 444, 36 + + + 329, 331 + + + 0 + + + DocumentViewer1 + + + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.8.0.0, Culture=neutral, PublicKeyToken=null + + + SplitContainerControl1.Panel2 + + + 1 + + + Panel2 + SplitContainerControl1.Panel2 - - -1 + + DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - -1 + + SplitContainerControl1 + + + 1 - 1050, 474 + 1050, 500 - - 0, 158 + + 2 - - Fill + + SplitContainerControl1 + + + DevExpress.XtraEditors.SplitContainerControl, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + $this + + + 0 True - - fr - + + 6, 13 + + + 1050, 654 + + + frmNotification_Startup2 + + + btnCloseForm + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + lbStatus + + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + btnMarkAsRead + + + DevExpress.XtraBars.BarButtonItem, 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 + + + 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/frmNotification_Startup.vb b/GUIs.Common/frmNotification_Startup.vb index 9031d7b6..85b7b857 100644 --- a/GUIs.Common/frmNotification_Startup.vb +++ b/GUIs.Common/frmNotification_Startup.vb @@ -5,21 +5,30 @@ Imports DigitalData.Modules.EDMI.API Imports DigitalData.Modules.Logging Imports DigitalData.Modules.ZooFlow.Constants + Public Class frmNotification_Startup Private ReadOnly Property LogConfig As LogConfig Private ReadOnly Property Logger As Logger 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 ReadOnly FormHelper As FormHelper + + Private CurrentNotificationId As Integer + Private Property OperationMode As OperationMode Private Client As Client + + Private Const COL_GUID As String = "GUID" + Private Const COL_TITLE As String = "TITLE" + + Private Const TYPE_MESSAGE = "MESSAGE" + Private Const TYPE_FILE = "FILE" + Friend Class NotificationItem Public Id As Integer Public Title As String @@ -29,28 +38,25 @@ 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 DigitalData.Modules.ZooFlow.Environment) - _NotificationsTable = DTNotifications + + Public Sub New() + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + End Sub + + 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. + InitializeComponent() + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. LogConfig = pLogConfig Logger = pLogConfig.GetLogger() + FormHelper = New FormHelper(pLogConfig, Me) + + _NotificationsTable = pNotificationsTable _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 - 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 @@ -61,60 +67,80 @@ Public Class frmNotification_Startup Me.Text = _FormCaption If _NotificationsTable.Rows.Count = 1 Then Me.ListBoxControl1.Visible = False - Load_Profile(_NotificationsTable.Rows(0).Item("GUID")) + Load_Profile(_NotificationsTable.Rows(0).Item(COL_GUID)) Else ListBoxControl1.DataSource = _NotificationsTable - ListBoxControl1.ValueMember = "GUID" - ListBoxControl1.DisplayMember = "TITLE" + ListBoxControl1.ValueMember = COL_GUID + ListBoxControl1.DisplayMember = COL_TITLE End If Catch ex As Exception - Dim oMsgBox As New frmDialog(ex.Message, "Unexpected Error loading form:", frmDialog.DialogType.Error) - oMsgBox.ShowDialog() + 'Dim oMsgBox As New frmDialog(ex.Message, "Unexpected Error loading form:", frmDialog.DialogType.Error) + 'oMsgBox.ShowDialog() + + FormHelper.ShowErrorMessage(ex.Message, "Unexpected error loading form") 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 + Dim oType As String, oMessage As String, oMarkasRead As Boolean - 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 _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") - Exit For - Else - oCount += 1 - End If - Next + Dim oRow = _NotificationsTable.AsEnumerable. + Where(Function(row) row.Item(COL_GUID) = oIndex). + FirstOrDefault() + + If oRow Is Nothing Then + FormHelper.ShowWarningMessage("Notification with Guid [{0}] could not be loaded!", "Unexpected error loading message") + Exit Sub End If - If oType = "MESSAGE" Then - RichEditControl1.Text = oMSG_STRING + oType = oRow.Item("DISPLAY_TYPE") + oMessage = oRow.Item("MSG_STRING") + oMarkasRead = oRow.Item("VALIDATE_READ") + CurrentNotificationId = oRow.Item(COL_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") + ' CurrentNotificationId = oRow.Item(COL_GUID) + 'Else + ' Dim oCount As Integer = 0 + ' 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") + ' CurrentNotificationId = oRow.Item(COL_GUID) + ' Exit For + ' Else + ' oCount += 1 + ' End If + + ' Next + 'End If + + If oType = TYPE_MESSAGE Then + RichEditControl1.Text = oMessage RichEditControl1.Visible = True RichEditControl1.Dock = Windows.Forms.DockStyle.Fill - Else - If IO.File.Exists(oMSG_STRING) Then - DocumentViewer1.LoadFile(oMSG_STRING) + + ElseIf oType = TYPE_FILE Then + If IO.File.Exists(oMessage) Then + DocumentViewer1.LoadFile(oMessage) 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 btnMarkAsRead.Visibility = DevExpress.XtraBars.BarItemVisibility.Always Else @@ -122,20 +148,23 @@ Public Class frmNotification_Startup End If Catch ex As Exception - Dim oMsgBox As New frmDialog(ex.Message, "Unexpected Error loading Message:", frmDialog.DialogType.Error) - oMsgBox.ShowDialog() + FormHelper.ShowErrorMessage(ex.Message, "Unexpected error loading message") 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 + If ListBoxControl1.SelectedItem Is Nothing Then + Exit Sub End If + + Try + Dim oRowView As DataRowView = ListBoxControl1.SelectedItem + Dim oGuid = oRowView.Row.Item(COL_GUID) + + Load_Profile(oGuid) + Catch ex As Exception + FormHelper.ShowErrorMessage(ex.Message, "Unexpected error switching notifications") + End Try End Sub Private Sub BarButtonItem1_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnCloseForm.ItemClick @@ -143,15 +172,14 @@ Public Class frmNotification_Startup End Sub Private Sub btnMarkAsRead_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnMarkAsRead.ItemClick - Dim oSuccess As Boolean = True Try - Dim oSQL = $"INSERT INTO [dbo].[TBDD_NOTIFICATIONS_USER_HISTORY] ([NOTIFY_ID], [USR_ID]) VALUES ({NOTIFY_ID} ,{_Environment.User.UserId})" + Dim oSuccess As Boolean = True + Dim oSQL = $"INSERT INTO [dbo].[TBDD_NOTIFICATIONS_USER_HISTORY] ([NOTIFY_ID], [USR_ID]) VALUES ({CurrentNotificationId} ,{_Environment.User.UserId})" If OperationMode = OperationMode.ZooFlow Or OperationMode = OperationMode.WithAppServer Then Dim oResponse = Client.ExecuteNonQueryFromECM(oSQL) - If Not oResponse.OK Then - oSuccess = False - End If + oSuccess = oResponse.OK + Else oSuccess = _Environment.Database.ExecuteNonQuery(oSQL) @@ -167,11 +195,9 @@ Public Class frmNotification_Startup 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 + FormHelper.ShowErrorMessage(ex.Message, "Unexpected error writing history") + End Try End Sub Private Function GetOperationMode() As OperationMode Dim oOperationMode As OperationMode diff --git a/GUIs.Test.TestGUI/TestGUI.vbproj b/GUIs.Test.TestGUI/TestGUI.vbproj index bf9f35fc..46610d70 100644 --- a/GUIs.Test.TestGUI/TestGUI.vbproj +++ b/GUIs.Test.TestGUI/TestGUI.vbproj @@ -79,6 +79,7 @@ ..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + ..\..\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll @@ -94,6 +95,10 @@ ..\..\DDModules\Windream\bin\Debug\DigitalData.Modules.Windream.dll + + False + ..\..\DDModules\ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.dll + False D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll diff --git a/GUIs.Test.TestGUI/frmMail.vb b/GUIs.Test.TestGUI/frmMail.vb index b65924a3..878c93b2 100644 --- a/GUIs.Test.TestGUI/frmMail.vb +++ b/GUIs.Test.TestGUI/frmMail.vb @@ -31,4 +31,8 @@ Public Class frmMail End If End Using End Sub + + Private Sub frmMail_Load(sender As Object, e As EventArgs) Handles MyBase.Load + + End Sub End Class \ No newline at end of file diff --git a/GUIs.Test.TestGUI/frmStart.Designer.vb b/GUIs.Test.TestGUI/frmStart.Designer.vb index 673304ef..4db4bd07 100644 --- a/GUIs.Test.TestGUI/frmStart.Designer.vb +++ b/GUIs.Test.TestGUI/frmStart.Designer.vb @@ -33,6 +33,7 @@ Partial Class frmStart Me.Button9 = New System.Windows.Forms.Button() Me.Button10 = New System.Windows.Forms.Button() Me.btnObjectProperties = New System.Windows.Forms.Button() + Me.Button11 = New System.Windows.Forms.Button() Me.SuspendLayout() ' 'Button1 @@ -134,6 +135,15 @@ Partial Class frmStart Me.btnObjectProperties.Text = "Object Properties" Me.btnObjectProperties.UseVisualStyleBackColor = True ' + 'Button11 + ' + Me.Button11.Location = New System.Drawing.Point(254, 326) + Me.Button11.Name = "Button11" + Me.Button11.Size = New System.Drawing.Size(236, 60) + Me.Button11.TabIndex = 2 + Me.Button11.Text = "Notification Startup" + Me.Button11.UseVisualStyleBackColor = True + ' 'frmStart ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -142,6 +152,7 @@ Partial Class frmStart Me.Controls.Add(Me.Button10) Me.Controls.Add(Me.Button9) Me.Controls.Add(Me.Button6) + Me.Controls.Add(Me.Button11) Me.Controls.Add(Me.btnObjectProperties) Me.Controls.Add(Me.Button5) Me.Controls.Add(Me.Button4) @@ -167,4 +178,5 @@ Partial Class frmStart Friend WithEvents Button9 As Button Friend WithEvents Button10 As Button Friend WithEvents btnObjectProperties As Button + Friend WithEvents Button11 As Button End Class diff --git a/GUIs.Test.TestGUI/frmStart.vb b/GUIs.Test.TestGUI/frmStart.vb index 3f7bc298..ab982f95 100644 --- a/GUIs.Test.TestGUI/frmStart.vb +++ b/GUIs.Test.TestGUI/frmStart.vb @@ -65,4 +65,29 @@ Public Class frmStart Dim oForm As New frmObjectProperties(LogConfig, Database) oForm.ShowDialog() End Sub + + Private Sub Button11_Click(sender As Object, e As EventArgs) Handles Button11.Click + Dim oClient = New DigitalData.Modules.EDMI.API.Client(LogConfig, "172.24.12.39:9000") + oClient.Connect() + + Dim oEnv = New DigitalData.Modules.ZooFlow.Environment() + oEnv.Service.Client = oClient + oEnv.Database = Database + + Dim oTable As New DataTable + oTable.Columns.AddRange(New List(Of DataColumn) From { + New DataColumn("GUID", GetType(Integer)), + New DataColumn("TITLE"), + New DataColumn("DISPLAY_TYPE"), + New DataColumn("MSG_STRING"), + New DataColumn("VALIDATE_READ", GetType(Boolean)) + }.ToArray) + + oTable.Rows.Add("1", "Public Service Announcement", "MESSAGE", "This is an Important Message from the Management!", 1) + oTable.Rows.Add("2", "Public Service Announcement", "MESSAGE", "This is another Important Message from the Management!", 0) + oTable.AcceptChanges() + + Dim oForm As New frmNotification_Startup(oTable, LogConfig, "", "Test Notification", oEnv) + oForm.Show() + End Sub End Class \ No newline at end of file