diff --git a/GUIs.Common/My Project/AssemblyInfo.vb b/GUIs.Common/My Project/AssemblyInfo.vb index faadfd51..7ff15d20 100644 --- a/GUIs.Common/My Project/AssemblyInfo.vb +++ b/GUIs.Common/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/GUIs.Common/frmNotification_Startup.Designer.vb b/GUIs.Common/frmNotification_Startup.Designer.vb index 95ed5db1..59c12e0f 100644 --- a/GUIs.Common/frmNotification_Startup.Designer.vb +++ b/GUIs.Common/frmNotification_Startup.Designer.vb @@ -31,6 +31,7 @@ Partial Class frmNotification_Startup Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() + Me.BarStaticItemPath = New DevExpress.XtraBars.BarStaticItem() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl1.Panel1.SuspendLayout() @@ -78,11 +79,14 @@ Partial Class frmNotification_Startup 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.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl.ExpandCollapseItem, Me.RibbonControl.SearchEditItem, Me.btnCloseForm, Me.lbStatus, Me.btnMarkAsRead, Me.BarStaticItemPath}) + Me.RibbonControl.MaxItemId = 5 Me.RibbonControl.Name = "RibbonControl" Me.RibbonControl.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1}) + Me.RibbonControl.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False] + Me.RibbonControl.ShowToolbarCustomizeItem = False Me.RibbonControl.StatusBar = Me.RibbonStatusBar + Me.RibbonControl.Toolbar.ShowCustomizeItem = False ' 'btnCloseForm ' @@ -128,6 +132,7 @@ Partial Class frmNotification_Startup ' resources.ApplyResources(Me.RibbonStatusBar, "RibbonStatusBar") Me.RibbonStatusBar.ItemLinks.Add(Me.lbStatus) + Me.RibbonStatusBar.ItemLinks.Add(Me.BarStaticItemPath) Me.RibbonStatusBar.Name = "RibbonStatusBar" Me.RibbonStatusBar.Ribbon = Me.RibbonControl ' @@ -137,14 +142,25 @@ Partial Class frmNotification_Startup Me.DocumentViewer1.FileLoaded = False Me.DocumentViewer1.Name = "DocumentViewer1" ' - 'frmNotification_Startup2 + 'BarStaticItemPath + ' + resources.ApplyResources(Me.BarStaticItemPath, "BarStaticItemPath") + Me.BarStaticItemPath.Id = 4 + Me.BarStaticItemPath.ImageOptions.ImageIndex = CType(resources.GetObject("BarStaticItem1.ImageOptions.ImageIndex"), Integer) + Me.BarStaticItemPath.ImageOptions.LargeImageIndex = CType(resources.GetObject("BarStaticItem1.ImageOptions.LargeImageIndex"), Integer) + Me.BarStaticItemPath.ImageOptions.SvgImage = CType(resources.GetObject("BarStaticItem1.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarStaticItemPath.Name = "BarStaticItemPath" + Me.BarStaticItemPath.Visibility = DevExpress.XtraBars.BarItemVisibility.Never + ' + '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 = CType(resources.GetObject("frmNotification_Startup.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.Name = "frmNotification_Startup" Me.Ribbon = Me.RibbonControl Me.StatusBar = Me.RibbonStatusBar CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).EndInit() @@ -171,4 +187,5 @@ Partial Class frmNotification_Startup Friend WithEvents btnCloseForm As DevExpress.XtraBars.BarButtonItem Friend WithEvents lbStatus As DevExpress.XtraBars.BarStaticItem Friend WithEvents btnMarkAsRead As DevExpress.XtraBars.BarButtonItem + Friend WithEvents BarStaticItemPath As DevExpress.XtraBars.BarStaticItem End Class diff --git a/GUIs.Common/frmNotification_Startup.en.resx b/GUIs.Common/frmNotification_Startup.en.resx index 45cc7ef3..206033b3 100644 --- a/GUIs.Common/frmNotification_Startup.en.resx +++ b/GUIs.Common/frmNotification_Startup.en.resx @@ -117,18 +117,72 @@ System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + -1 + + + -1 + + + + + + + + Close messages + + -1 + + + -1 + + + -1 + + + -1 + + + + Mark as read + + -1 + + + -1 + Actions Home + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIQCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLlJlZHtmaWxsOiNEMTFD + MUM7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7Zmls + bDojNzI3MjcyO30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuNzU7fQo8L3N0eWxl + Pg0KICA8ZyBpZD0iTWVzc2FnZSI+DQogICAgPHBhdGggZD0iTTI5LDZIM0MyLjUsNiwyLDYuNSwyLDd2 + MTZjMCwwLjUsMC41LDEsMSwxaDV2Nmw2LTZoMTVjMC41LDAsMS0wLjUsMS0xVjdDMzAsNi41LDI5LjUs + NiwyOSw2eiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L + + Messages diff --git a/GUIs.Common/frmNotification_Startup.fr.resx b/GUIs.Common/frmNotification_Startup.fr.resx index d978203f..47c1d4e0 100644 --- a/GUIs.Common/frmNotification_Startup.fr.resx +++ b/GUIs.Common/frmNotification_Startup.fr.resx @@ -123,12 +123,45 @@ Marquer comme lu - - Début + + BarStaticItem1 + + + + -1 + + + -1 + + + + Fonctions + + Début + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIQCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLlJlZHtmaWxsOiNEMTFD + MUM7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7Zmls + bDojNzI3MjcyO30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuNzU7fQo8L3N0eWxl + Pg0KICA8ZyBpZD0iTWVzc2FnZSI+DQogICAgPHBhdGggZD0iTTI5LDZIM0MyLjUsNiwyLDYuNSwyLDd2 + MTZjMCwwLjUsMC41LDEsMSwxaDV2Nmw2LTZoMTVjMC41LDAsMS0wLjUsMS0xVjdDMzAsNi41LDI5LjUs + NiwyOSw2eiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L + + Messages diff --git a/GUIs.Common/frmNotification_Startup.resx b/GUIs.Common/frmNotification_Startup.resx index 6096810f..ec8d7c46 100644 --- a/GUIs.Common/frmNotification_Startup.resx +++ b/GUIs.Common/frmNotification_Startup.resx @@ -126,6 +126,9 @@ lbStatus + + DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + 444, 36 @@ -142,6 +145,10 @@ Als gelesen markieren + + + -1 + SplitContainerControl1.Panel1 @@ -151,9 +158,15 @@ DevExpress.XtraBars.Ribbon.RibbonStatusBar, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + -1 + SplitContainerControl1 + + SplitContainerControl1 + @@ -161,6 +174,9 @@ 1 + + BarStaticItemPath + 0 @@ -170,7 +186,6 @@ 21, 45 - 1 @@ -189,6 +204,9 @@ Panel2 + + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.8.0.0, Culture=neutral, PublicKeyToken=null + DevExpress.XtraBars.Ribbon.RibbonForm, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -240,9 +258,6 @@ $this - - btnMarkAsRead - -1 @@ -261,6 +276,25 @@ 2 + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIQCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku + WWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLlJlZHtmaWxsOiNEMTFD + MUM7fQoJLldoaXRle2ZpbGw6I0ZGRkZGRjt9CgkuR3JlZW57ZmlsbDojMDM5QzIzO30KCS5zdDB7Zmls + bDojNzI3MjcyO30KCS5zdDF7b3BhY2l0eTowLjU7fQoJLnN0MntvcGFjaXR5OjAuNzU7fQo8L3N0eWxl + Pg0KICA8ZyBpZD0iTWVzc2FnZSI+DQogICAgPHBhdGggZD0iTTI5LDZIM0MyLjUsNiwyLDYuNSwyLDd2 + MTZjMCwwLjUsMC41LDEsMSwxaDV2Nmw2LTZoMTVjMC41LDAsMS0wLjUsMS0xVjdDMzAsNi41LDI5LjUs + NiwyOSw2eiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L + + 0 @@ -270,26 +304,26 @@ RibbonStatusBar - - -1 - -1 1050, 654 + + 0, 158 + 0 6, 13 - - SplitContainerControl1 + + 1050, 474 - - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=1.8.0.0, Culture=neutral, PublicKeyToken=null + + Fill DevExpress.XtraEditors.SplitGroupPanel, DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -307,20 +341,23 @@ SplitContainerControl1 - frmNotification_Startup2 - - - RibbonPage1 + frmNotification_Startup DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + RibbonPage1 + + + -1 + + + + Funktionen - - Fill - 1050, 158 @@ -360,11 +397,8 @@ -1 - - 1050, 474 - - - 0, 158 + + btnMarkAsRead Fill diff --git a/GUIs.Common/frmNotification_Startup.vb b/GUIs.Common/frmNotification_Startup.vb index 9031d7b6..50b90e06 100644 --- a/GUIs.Common/frmNotification_Startup.vb +++ b/GUIs.Common/frmNotification_Startup.vb @@ -59,7 +59,7 @@ Public Class frmNotification_Startup OperationMode = GetOperationMode() Client = _Environment.Service.Client Me.Text = _FormCaption - If _NotificationsTable.Rows.Count = 1 Then + If _NotificationsTable.Rows.Count <= 1 Then Me.ListBoxControl1.Visible = False Load_Profile(_NotificationsTable.Rows(0).Item("GUID")) Else @@ -105,15 +105,21 @@ Public Class frmNotification_Startup RichEditControl1.Text = oMSG_STRING RichEditControl1.Visible = True RichEditControl1.Dock = Windows.Forms.DockStyle.Fill + BarStaticItemPath.Visibility = DevExpress.XtraBars.BarItemVisibility.Never Else + BarStaticItemPath.Caption = oMSG_STRING If IO.File.Exists(oMSG_STRING) Then + BarStaticItemPath.Caption = oMSG_STRING + DocumentViewer1.LoadFile(oMSG_STRING) DocumentViewer1.Visible = True DocumentViewer1.Dock = Windows.Forms.DockStyle.Fill Else + BarStaticItemPath.Caption += " - FILE NOT EXISTING" Dim oMsgBox As New frmDialog("File not existing!", "Load Notification File", frmDialog.DialogType.Warning) oMsgBox.ShowDialog() End If + BarStaticItemPath.Visibility = DevExpress.XtraBars.BarItemVisibility.Always End If If oMarkasRead = True Then btnMarkAsRead.Visibility = DevExpress.XtraBars.BarItemVisibility.Always @@ -122,7 +128,7 @@ Public Class frmNotification_Startup End If Catch ex As Exception - Dim oMsgBox As New frmDialog(ex.Message, "Unexpected Error loading Message:", frmDialog.DialogType.Error) + Dim oMsgBox As New frmDialog(ex.Message, "Unexpected error loading message-form:", frmDialog.DialogType.Error) oMsgBox.ShowDialog() End Try End Sub