MS - Anpassung Detailview für JJ

2018-02-06 12:29:21 +01:00 · 2018-02-06 12:29:21 +01:00 · 6be485d4b5
commit 6be485d4b5
parent e6a162cfdf
15 changed files with 1814 additions and 150 deletions
--- a/.gitignore
+++ b/.gitignore
@ -154,3 +154,4 @@ $RECYCLE.BIN/

 # Mac desktop service store files
 .DS_Store
+/app/.vs/DD_PM_WINDREAM/v15/Server/sqlite3
--- a/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj
+++ b/app/DD_PM_WINDREAM/DD_PM_WINDREAM.vbproj
@ -109,6 +109,9 @@
    <Reference Include="Oracle.ManagedDataAccess">
      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Oracle.ManagedDataAccess.dll</HintPath>
    </Reference>
+    <Reference Include="PdfSharp-gdi">
+      <HintPath>P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\PdfSharp-gdi.dll</HintPath>
+    </Reference>
    <Reference Include="System" />
    <Reference Include="System.Data" />
    <Reference Include="System.Data.OracleClient" />
@ -166,6 +169,12 @@
    <Compile Include="frmAdminPasswort.vb">
      <SubType>Form</SubType>
    </Compile>
+    <Compile Include="frmAnnotations.Designer.vb">
+      <DependentUpon>frmAnnotations.vb</DependentUpon>
+    </Compile>
+    <Compile Include="frmAnnotations.vb">
+      <SubType>Form</SubType>
+    </Compile>
    <Compile Include="frmConnection.Designer.vb">
      <DependentUpon>frmConnection.vb</DependentUpon>
    </Compile>
@ -275,6 +284,9 @@
    <EmbeddedResource Include="frmAdminPasswort.resx">
      <DependentUpon>frmAdminPasswort.vb</DependentUpon>
    </EmbeddedResource>
+    <EmbeddedResource Include="frmAnnotations.resx">
+      <DependentUpon>frmAnnotations.vb</DependentUpon>
+    </EmbeddedResource>
    <EmbeddedResource Include="frmConnection.resx">
      <DependentUpon>frmConnection.vb</DependentUpon>
      <SubType>Designer</SubType>
--- a/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb
+++ b/app/DD_PM_WINDREAM/ModuleRuntimeVariables.vb
@ -5,6 +5,7 @@
    Public CURRENT_ProfilName As String
    Public CURRENT_HTML_DOC As String
    Public CURRENT_DOC_ID As Integer
+    Public CURRENT_DOC_PATH As String
    Public ERROR_STATE = ""
    Public USER_IS_ADMIN As Boolean = False
    Public CURRENT_USERID
--- a/Project/AssemblyInfo.vb
+++ b/Project/AssemblyInfo.vb
@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")> 

-<Assembly: AssemblyVersion("1.9.3.4")>
+<Assembly: AssemblyVersion("1.9.3.5")>
 <Assembly: AssemblyFileVersion("1.0.0.0")> 
--- a/app/DD_PM_WINDREAM/frmAnnotations.Designer.vb
+++ b/app/DD_PM_WINDREAM/frmAnnotations.Designer.vb
@ -0,0 +1,137 @@
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+Partial Class frmAnnotations
+    Inherits System.Windows.Forms.Form
+
+    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
+    <System.Diagnostics.DebuggerNonUserCode()> _
+    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.
+    <System.Diagnostics.DebuggerStepThrough()> _
+    Private Sub InitializeComponent()
+        Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmAnnotations))
+        Me.Button1 = New System.Windows.Forms.Button()
+        Me.Label1 = New System.Windows.Forms.Label()
+        Me.Label3 = New System.Windows.Forms.Label()
+        Me.Seitenzahl = New System.Windows.Forms.Label()
+        Me.txttitle = New System.Windows.Forms.TextBox()
+        Me.txtcontent = New System.Windows.Forms.TextBox()
+        Me.txtSeitenzahl = New System.Windows.Forms.TextBox()
+        Me.SuspendLayout()
+        '
+        'Button1
+        '
+        Me.Button1.Cursor = System.Windows.Forms.Cursors.Default
+        Me.Button1.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.add
+        Me.Button1.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
+        Me.Button1.Location = New System.Drawing.Point(447, 171)
+        Me.Button1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.Button1.Name = "Button1"
+        Me.Button1.Size = New System.Drawing.Size(173, 37)
+        Me.Button1.TabIndex = 0
+        Me.Button1.Text = "Annotation hinzufügen"
+        Me.Button1.TextAlign = System.Drawing.ContentAlignment.MiddleRight
+        Me.Button1.UseVisualStyleBackColor = True
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Location = New System.Drawing.Point(12, 28)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(38, 16)
+        Me.Label1.TabIndex = 1
+        Me.Label1.Text = "Titel:"
+        '
+        'Label3
+        '
+        Me.Label3.AutoSize = True
+        Me.Label3.Location = New System.Drawing.Point(12, 56)
+        Me.Label3.Name = "Label3"
+        Me.Label3.Size = New System.Drawing.Size(38, 16)
+        Me.Label3.TabIndex = 3
+        Me.Label3.Text = "Text:"
+        '
+        'Seitenzahl
+        '
+        Me.Seitenzahl.AutoSize = True
+        Me.Seitenzahl.Location = New System.Drawing.Point(12, 185)
+        Me.Seitenzahl.Name = "Seitenzahl"
+        Me.Seitenzahl.Size = New System.Drawing.Size(67, 16)
+        Me.Seitenzahl.TabIndex = 4
+        Me.Seitenzahl.Text = "Seitenzahl"
+        '
+        'txttitle
+        '
+        Me.txttitle.Location = New System.Drawing.Point(97, 25)
+        Me.txttitle.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.txttitle.Name = "txttitle"
+        Me.txttitle.Size = New System.Drawing.Size(344, 23)
+        Me.txttitle.TabIndex = 5
+        '
+        'txtcontent
+        '
+        Me.txtcontent.AcceptsReturn = True
+        Me.txtcontent.AcceptsTab = True
+        Me.txtcontent.Location = New System.Drawing.Point(97, 56)
+        Me.txtcontent.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.txtcontent.Multiline = True
+        Me.txtcontent.Name = "txtcontent"
+        Me.txtcontent.Size = New System.Drawing.Size(344, 119)
+        Me.txtcontent.TabIndex = 7
+        '
+        'txtSeitenzahl
+        '
+        Me.txtSeitenzahl.Location = New System.Drawing.Point(404, 185)
+        Me.txtSeitenzahl.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.txtSeitenzahl.Name = "txtSeitenzahl"
+        Me.txtSeitenzahl.Size = New System.Drawing.Size(37, 23)
+        Me.txtSeitenzahl.TabIndex = 8
+        Me.txtSeitenzahl.Text = "0"
+        '
+        'frmAnnotations
+        '
+        Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 16.0!)
+        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
+        Me.ClientSize = New System.Drawing.Size(629, 219)
+        Me.Controls.Add(Me.txtSeitenzahl)
+        Me.Controls.Add(Me.txtcontent)
+        Me.Controls.Add(Me.txttitle)
+        Me.Controls.Add(Me.Seitenzahl)
+        Me.Controls.Add(Me.Label3)
+        Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.Button1)
+        Me.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
+        Me.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
+        Me.MaximizeBox = False
+        Me.MinimizeBox = False
+        Me.Name = "frmAnnotations"
+        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
+        Me.Text = "Annotationen"
+        Me.TopMost = True
+        Me.ResumeLayout(False)
+        Me.PerformLayout()
+
+    End Sub
+
+    Friend WithEvents Button1 As Button
+    Friend WithEvents Label1 As Label
+    Friend WithEvents Label3 As Label
+    Friend WithEvents Seitenzahl As Label
+    Friend WithEvents txttitle As TextBox
+    Friend WithEvents txtcontent As TextBox
+    Friend WithEvents txtSeitenzahl As TextBox
+End Class
--- a/app/DD_PM_WINDREAM/frmAnnotations.resx
+++ b/app/DD_PM_WINDREAM/frmAnnotations.resx
--- a/app/DD_PM_WINDREAM/frmAnnotations.vb
+++ b/app/DD_PM_WINDREAM/frmAnnotations.vb
@ -0,0 +1,33 @@
+Imports PdfSharp.Pdf
+Imports PdfSharp.Pdf.Annotations
+Imports PdfSharp.Pdf.IO
+Imports PdfSharp.Drawing
+Public Class frmAnnotations
+    Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
+
+        Try
+            Dim doc As PdfDocument = PdfReader.Open(CURRENT_DOC_PATH, PdfDocumentOpenMode.Modify)
+            Dim firstPage As PdfPage = doc.Pages(txtSeitenzahl.Text)
+
+            Dim gfx As XGraphics = XGraphics.FromPdfPage(firstPage)
+            Dim rect As XRect = gfx.Transformer.WorldToDefaultPage(New XRect(New XPoint(30, 60), New XSize(30, 30)))
+
+            Dim annot As PdfTextAnnotation = New PdfTextAnnotation
+
+
+            annot.Title = txttitle.Text
+            'annot.Subject = txtsubject.Text
+            annot.Contents = txtcontent.Text
+            annot.Rectangle = New PdfRectangle(rect)
+
+
+            firstPage.Annotations.Add(annot)
+            doc.Save(CURRENT_DOC_PATH)
+            Me.Close()
+        Catch ex As Exception
+            MsgBox(ex.Message, MsgBoxStyle.Critical)
+        End Try
+
+
+    End Sub
+End Class
--- a/app/DD_PM_WINDREAM/frmKonfig.vb
+++ b/app/DD_PM_WINDREAM/frmKonfig.vb
@ -70,6 +70,7 @@ Public Class frmKonfig
            .Title = "Pfad zu PDF XChange Viewer.exe:"
            If .ShowDialog() = DialogResult.OK Then
                Me.txtpdfxchange.Text = .FileName
+                PDFXChangeViewer = .FileName
                SaveMySettingsValue("PDFXChangeViewer", txtpdfxchange.Text)
            End If
        End With
--- a/app/DD_PM_WINDREAM/frmMain.Designer.vb
+++ b/app/DD_PM_WINDREAM/frmMain.Designer.vb
@ -60,6 +60,8 @@ Partial Class frmMain
        Me.TBPM_PROFILE_FILESBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.TBPM_PROFILE_FILESTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_PROFILE_FILESTableAdapter()
        Me.TimerReminder = New System.Windows.Forms.Timer(Me.components)
+        Me.GridControlProfile = New DevExpress.XtraGrid.GridControl()
+        Me.GridViewProfile = New DevExpress.XtraGrid.Views.Grid.GridView()
        CType(Me.DD_DMSLiteDataSet, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TBPM_PROFILEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.ToolStrip1.SuspendLayout()
@ -69,18 +71,19 @@ Partial Class frmMain
        CType(Me.TBPM_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TBPM_KONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TBPM_PROFILE_FILESBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridControlProfile, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.GridViewProfile, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'ListViewProfile
        '
        Me.ListViewProfile.Columns.AddRange(New System.Windows.Forms.ColumnHeader() {Me.ProfilJob, Me.DocumentNumber, Me.Profilname})
-        Me.ListViewProfile.Dock = System.Windows.Forms.DockStyle.Fill
        Me.ListViewProfile.Font = New System.Drawing.Font("Verdana", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.ListViewProfile.FullRowSelect = True
-        Me.ListViewProfile.Location = New System.Drawing.Point(0, 25)
+        Me.ListViewProfile.Location = New System.Drawing.Point(714, 37)
        Me.ListViewProfile.Name = "ListViewProfile"
        Me.ListViewProfile.ShowItemToolTips = True
-        Me.ListViewProfile.Size = New System.Drawing.Size(889, 326)
+        Me.ListViewProfile.Size = New System.Drawing.Size(163, 101)
        Me.ListViewProfile.SmallImageList = Me.ImageListProfile
        Me.ListViewProfile.TabIndex = 1
        Me.ListViewProfile.UseCompatibleStateImageBehavior = False
@ -201,7 +204,7 @@ Partial Class frmMain
        Me.tstrpbtn_Config.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.puzzle2
        Me.tstrpbtn_Config.ImageTransparentColor = System.Drawing.Color.Magenta
        Me.tstrpbtn_Config.Name = "tstrpbtn_Config"
-        Me.tstrpbtn_Config.Size = New System.Drawing.Size(139, 22)
+        Me.tstrpbtn_Config.Size = New System.Drawing.Size(138, 22)
        Me.tstrpbtn_Config.Text = "Verwaltungs-Konsole"
        Me.tstrpbtn_Config.Visible = False
        '
@ -234,7 +237,7 @@ Partial Class frmMain
            Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom), System.Windows.Forms.ToolStripStatusLabelBorderSides)
        Me.tsstlblUser.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.user
        Me.tsstlblUser.Name = "tsstlblUser"
-        Me.tsstlblUser.Size = New System.Drawing.Size(141, 20)
+        Me.tsstlblUser.Size = New System.Drawing.Size(140, 20)
        Me.tsstlblUser.Text = "ToolStripStatusLabel1"
        '
        'tslblLicenses
@ -263,11 +266,12 @@ Partial Class frmMain
            Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Right) _
            Or System.Windows.Forms.ToolStripStatusLabelBorderSides.Bottom), System.Windows.Forms.ToolStripStatusLabelBorderSides)
        Me.tslblVersion.Name = "tslblVersion"
-        Me.tslblVersion.Size = New System.Drawing.Size(125, 20)
+        Me.tslblVersion.Size = New System.Drawing.Size(124, 20)
        Me.tslblVersion.Text = "ToolStripStatusLabel1"
        '
        'Panel1
        '
+        Me.Panel1.Controls.Add(Me.GridControlProfile)
        Me.Panel1.Controls.Add(Me.ListViewProfile)
        Me.Panel1.Controls.Add(Me.ToolStrip1)
        Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill
@ -326,6 +330,43 @@ Partial Class frmMain
        'TimerReminder
        '
        '
+        'GridControlProfile
+        '
+        Me.GridControlProfile.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.GridControlProfile.Location = New System.Drawing.Point(12, 37)
+        Me.GridControlProfile.MainView = Me.GridViewProfile
+        Me.GridControlProfile.Name = "GridControlProfile"
+        Me.GridControlProfile.Size = New System.Drawing.Size(682, 311)
+        Me.GridControlProfile.TabIndex = 3
+        Me.GridControlProfile.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridViewProfile})
+        '
+        'GridViewProfile
+        '
+        Me.GridViewProfile.Appearance.EvenRow.BackColor = System.Drawing.Color.Cyan
+        Me.GridViewProfile.Appearance.EvenRow.Options.UseBackColor = True
+        Me.GridViewProfile.Appearance.Row.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.GridViewProfile.Appearance.Row.Options.UseFont = True
+        Me.GridViewProfile.GridControl = Me.GridControlProfile
+        Me.GridViewProfile.GroupPanelText = "Ziehen Sie Spaltenüberschriften in diesen Bereich um nach diesen gruppieren zu la" &
+    "ssen"
+        Me.GridViewProfile.Name = "GridViewProfile"
+        Me.GridViewProfile.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridViewProfile.OptionsBehavior.AllowDeleteRows = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridViewProfile.OptionsBehavior.Editable = False
+        Me.GridViewProfile.OptionsBehavior.ReadOnly = True
+        Me.GridViewProfile.OptionsClipboard.CopyColumnHeaders = DevExpress.Utils.DefaultBoolean.[False]
+        Me.GridViewProfile.OptionsCustomization.AllowGroup = False
+        Me.GridViewProfile.OptionsSelection.EnableAppearanceFocusedCell = False
+        Me.GridViewProfile.OptionsSelection.EnableAppearanceFocusedRow = False
+        Me.GridViewProfile.OptionsSelection.EnableAppearanceHideSelection = False
+        Me.GridViewProfile.OptionsSelection.MultiSelect = True
+        Me.GridViewProfile.OptionsSelection.MultiSelectMode = DevExpress.XtraGrid.Views.Grid.GridMultiSelectMode.CellSelect
+        Me.GridViewProfile.OptionsView.ColumnAutoWidth = False
+        Me.GridViewProfile.OptionsView.EnableAppearanceEvenRow = True
+        Me.GridViewProfile.OptionsView.ShowAutoFilterRow = True
+        Me.GridViewProfile.OptionsView.ShowGroupPanel = False
+        Me.GridViewProfile.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[True]
+        '
        'frmMain
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(9.0!, 21.0!)
@ -351,6 +392,8 @@ Partial Class frmMain
        CType(Me.TBPM_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.TBPM_KONFIGURATIONBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.TBPM_PROFILE_FILESBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridControlProfile, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.GridViewProfile, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()

@ -391,4 +434,6 @@ Partial Class frmMain
    Friend WithEvents Profilname As System.Windows.Forms.ColumnHeader
    Friend WithEvents tslblVersion As System.Windows.Forms.ToolStripStatusLabel
    Friend WithEvents TimerReminder As System.Windows.Forms.Timer
+    Friend WithEvents GridControlProfile As DevExpress.XtraGrid.GridControl
+    Friend WithEvents GridViewProfile As DevExpress.XtraGrid.Views.Grid.GridView
 End Class
--- a/app/DD_PM_WINDREAM/frmMain.resx
+++ b/app/DD_PM_WINDREAM/frmMain.resx
@ -125,7 +125,7 @@
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
        LCBDdWx0dXJlPW5ldXRyYWwsIFB1YmxpY0tleVRva2VuPWI3N2E1YzU2MTkzNGUwODkFAQAAACZTeXN0
        ZW0uV2luZG93cy5Gb3Jtcy5JbWFnZUxpc3RTdHJlYW1lcgEAAAAERGF0YQcCAgAAAAkDAAAADwMAAADw
-        CAAAAk1TRnQBSQFMAgEBAgEAAcgBAQHIAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
+        CAAAAk1TRnQBSQFMAgEBAgEAAdABAQHQAQEBEAEAARABAAT/AQkBAAj/AUIBTQE2AQQGAAE2AQQCAAEo
        AwABQAMAARADAAEBAQABCAYAAQQYAAGAAgABgAMAAoABAAGAAwABgAEAAYABAAKAAgADwAEAAcAB3AHA
        AQAB8AHKAaYBAAEzBQABMwEAATMBAAEzAQACMwIAAxYBAAMcAQADIgEAAykBAANVAQADTQEAA0IBAAM5
        AQABgAF8Af8BAAJQAf8BAAGTAQAB1gEAAf8B7AHMAQABxgHWAe8BAAHWAucBAAGQAakBrQIAAf8BMwMA
--- a/app/DD_PM_WINDREAM/frmMain.vb
+++ b/app/DD_PM_WINDREAM/frmMain.vb
@ -7,6 +7,7 @@ Public Class frmMain
    Private _windreamPM As ClassPMWindream
    Private UserLoggedin As Integer = 0
    Private PROFILE_COUNT As Integer = 0
+    Private DTPROFIL As DataTable
    Private Sub frmProfiles_FormClosing(sender As Object, e As System.Windows.Forms.FormClosingEventArgs) Handles Me.FormClosing
        Try
            TBPM_USERTableAdapter.cmdLoginOut(False, Environment.MachineName, Environment.UserName)
@ -141,7 +142,42 @@ Public Class frmMain
    Sub LoadProfile_PM()
        Try
            If Me.Visible = True And frmProfileDesigner.Visible = False Then
+                DTPROFIL = ClassDatabase.Return_Datatable("SELECT * FROM TBPM_PROFILE WHERE GUID = " & CURRENT_ProfilGUID)
                PROFILE_COUNT = 0
+                Dim sql = String.Format("Select T.PROFIL_ID, T.TITLE as 'Profil/Schritt', NO_OF_DOCUMENTS AS 'Anzahl Dateien',ISNULL([dbo].[FNPM_LASTWORKUSER_PROFIL] ( T.PROFIL_ID),'') as 'Letzter Bearbeiter' from VWPM_PROFILE_USER T" &
+                " Where(ACTIVE = 1) And (UPPER(USERNAME) = UPPER('{0}')) Order By PRIORITY", Environment.UserName)
+                Dim DTGRID As DataTable = ClassDatabase.Return_Datatable(sql, True)
+                If Not IsNothing(DTGRID) Then
+                    GridControlProfile.DataSource = DTGRID
+                    Try
+                        GridViewProfile.Columns.Item("PROFIL_ID").Visible = False
+                    Catch ex As Exception
+
+                    End Try
+                    'Detail-Daten laden
+                    Dim SQL_DETAILS
+                    Try
+                        SQL_DETAILS = DTPROFIL.Rows(0).Item("DETAIL_SQL")
+                    Catch ex As Exception
+                        SQL_DETAILS = String.Empty
+                    End Try
+                    If SQL_DETAILS <> String.Empty Then
+                        Dim DT_DETAILS As DataTable = ClassDatabase.Return_Datatable(SQL_DETAILS, True)
+
+                    End If
+
+
+                Else
+                    GridControlProfile.DataSource = Nothing
+                    Try
+                        GridViewProfile.Columns.Clear()
+                    Catch ex As Exception
+
+                    End Try
+                End If
+
+
+
                Me.VWPM_PROFILE_USERTableAdapter.FillByActive(Me.DD_DMSLiteDataSet.VWPM_PROFILE_USER, Environment.UserName)
                Dim DT As DataTable = DD_DMSLiteDataSet.Tables("VWPM_PROFILE_USER")
                If LogErrorsOnly = False Then ClassLogger.Add("", False)
--- a/app/DD_PM_WINDREAM/frmValidator.Designer.vb
+++ b/app/DD_PM_WINDREAM/frmValidator.Designer.vb
@ -39,7 +39,6 @@ Partial Class frmValidator
        Me.VWPM_PROFILE_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.DD_DMSLiteDataSet = New DD_PM_WINDREAM.DD_DMSLiteDataSet()
        Me.btnSave = New System.Windows.Forms.Button()
-        Me.btnNavigatornext = New System.Windows.Forms.Button()
        Me.DESCRIPTIONLabel = New System.Windows.Forms.Label()
        Me.GroupBox1 = New System.Windows.Forms.GroupBox()
        Me.Label2 = New System.Windows.Forms.Label()
@ -47,7 +46,6 @@ Partial Class frmValidator
        Me.txtErstellt = New System.Windows.Forms.TextBox()
        Me.txtDateipfad = New System.Windows.Forms.TextBox()
        Me.pnldesigner = New System.Windows.Forms.Panel()
-        Me.btnDelete = New System.Windows.Forms.Button()
        Me.VWPM_PROFILE_USERTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.VWPM_PROFILE_USERTableAdapter()
        Me.TableAdapterManager = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TableAdapterManager()
        Me.TBPM_CONNECTIONTableAdapter = New DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.TBPM_CONNECTIONTableAdapter()
@ -137,6 +135,10 @@ Partial Class frmValidator
        Me.txtBetreff = New System.Windows.Forms.TextBox()
        Me.SplitContainer1 = New System.Windows.Forms.SplitContainer()
        Me.grpbxMailBody = New System.Windows.Forms.GroupBox()
+        Me.ToolStrip1 = New System.Windows.Forms.ToolStrip()
+        Me.ToolStripButtonJumpFile = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripButtonDeleteFile = New System.Windows.Forms.ToolStripButton()
+        Me.ToolStripButtonAnnotation = New System.Windows.Forms.ToolStripButton()
        CType(Me.BarAndDockingController3, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.BarAndDockingController2, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.BarAndDockingController1, System.ComponentModel.ISupportInitialize).BeginInit()
@ -168,6 +170,7 @@ Partial Class frmValidator
        Me.SplitContainer1.Panel2.SuspendLayout()
        Me.SplitContainer1.SuspendLayout()
        Me.grpbxMailBody.SuspendLayout()
+        Me.ToolStrip1.SuspendLayout()
        Me.SuspendLayout()
        '
        'BarAndDockingController3
@ -225,16 +228,14 @@ Partial Class frmValidator
        Me.Panel1.ContextMenuStrip = Me.ContextMenuStrip1
        Me.Panel1.Controls.Add(Me.TITLELabel1)
        Me.Panel1.Controls.Add(Me.btnSave)
-        Me.Panel1.Controls.Add(Me.btnNavigatornext)
        Me.Panel1.Controls.Add(Me.DESCRIPTIONLabel)
        Me.Panel1.Controls.Add(Me.GroupBox1)
        Me.Panel1.Controls.Add(Me.pnldesigner)
-        Me.Panel1.Controls.Add(Me.btnDelete)
        Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill
        Me.Panel1.Location = New System.Drawing.Point(0, 0)
        Me.Panel1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
        Me.Panel1.Name = "Panel1"
-        Me.Panel1.Size = New System.Drawing.Size(477, 621)
+        Me.Panel1.Size = New System.Drawing.Size(477, 593)
        Me.Panel1.TabIndex = 24
        '
        'ContextMenuStrip1
@ -288,7 +289,7 @@ Partial Class frmValidator
        Me.btnSave.Font = New System.Drawing.Font("Tahoma", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.btnSave.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.flag_pink
        Me.btnSave.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnSave.Location = New System.Drawing.Point(7, 564)
+        Me.btnSave.Location = New System.Drawing.Point(7, 536)
        Me.btnSave.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
        Me.btnSave.Name = "btnSave"
        Me.btnSave.Size = New System.Drawing.Size(450, 50)
@ -296,21 +297,6 @@ Partial Class frmValidator
        Me.btnSave.Text = "Validierung speichern  - Nächstes  Dokument"
        Me.btnSave.UseVisualStyleBackColor = True
        '
-        'btnNavigatornext
-        '
-        Me.btnNavigatornext.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.btnNavigatornext.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.Nextrequest_10302
-        Me.btnNavigatornext.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnNavigatornext.Location = New System.Drawing.Point(287, 119)
-        Me.btnNavigatornext.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
-        Me.btnNavigatornext.Name = "btnNavigatornext"
-        Me.btnNavigatornext.Size = New System.Drawing.Size(171, 35)
-        Me.btnNavigatornext.TabIndex = 3
-        Me.btnNavigatornext.TabStop = False
-        Me.btnNavigatornext.Text = "Datei überspringen"
-        Me.btnNavigatornext.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnNavigatornext.UseVisualStyleBackColor = True
-        '
        'DESCRIPTIONLabel
        '
        Me.DESCRIPTIONLabel.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
@ -331,7 +317,7 @@ Partial Class frmValidator
        Me.GroupBox1.Controls.Add(Me.txtErstellt)
        Me.GroupBox1.Controls.Add(Me.txtDateipfad)
        Me.GroupBox1.Font = New System.Drawing.Font("Tahoma", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.GroupBox1.Location = New System.Drawing.Point(9, 428)
+        Me.GroupBox1.Location = New System.Drawing.Point(9, 400)
        Me.GroupBox1.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
        Me.GroupBox1.Name = "GroupBox1"
        Me.GroupBox1.Padding = New System.Windows.Forms.Padding(3, 4, 3, 4)
@ -397,27 +383,12 @@ Partial Class frmValidator
            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
        Me.pnldesigner.AutoScroll = True
        Me.pnldesigner.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
-        Me.pnldesigner.Location = New System.Drawing.Point(8, 162)
+        Me.pnldesigner.Location = New System.Drawing.Point(8, 119)
        Me.pnldesigner.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
        Me.pnldesigner.Name = "pnldesigner"
-        Me.pnldesigner.Size = New System.Drawing.Size(450, 258)
+        Me.pnldesigner.Size = New System.Drawing.Size(450, 273)
        Me.pnldesigner.TabIndex = 18
        '
-        'btnDelete
-        '
-        Me.btnDelete.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.delete_12x12
-        Me.btnDelete.ImageAlign = System.Drawing.ContentAlignment.MiddleLeft
-        Me.btnDelete.Location = New System.Drawing.Point(8, 119)
-        Me.btnDelete.Margin = New System.Windows.Forms.Padding(3, 4, 3, 4)
-        Me.btnDelete.Name = "btnDelete"
-        Me.btnDelete.Size = New System.Drawing.Size(117, 35)
-        Me.btnDelete.TabIndex = 21
-        Me.btnDelete.TabStop = False
-        Me.btnDelete.Text = "Löschen"
-        Me.btnDelete.TextAlign = System.Drawing.ContentAlignment.MiddleRight
-        Me.btnDelete.UseVisualStyleBackColor = True
-        Me.btnDelete.Visible = False
-        '
        'VWPM_PROFILE_USERTableAdapter
        '
        Me.VWPM_PROFILE_USERTableAdapter.ClearBeforeFill = True
@ -977,8 +948,10 @@ Partial Class frmValidator
        '
        'SplitContainer1
        '
-        Me.SplitContainer1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.SplitContainer1.Location = New System.Drawing.Point(0, 0)
+        Me.SplitContainer1.Anchor = CType((((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Bottom) _
+            Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.SplitContainer1.Location = New System.Drawing.Point(0, 28)
        Me.SplitContainer1.Name = "SplitContainer1"
        '
        'SplitContainer1.Panel1
@ -990,7 +963,7 @@ Partial Class frmValidator
        Me.SplitContainer1.Panel2.Controls.Add(Me.grpbxMailBody)
        Me.SplitContainer1.Panel2.Controls.Add(Me.pnlpdf)
        Me.SplitContainer1.Panel2.Controls.Add(Me.grpBetreff)
-        Me.SplitContainer1.Size = New System.Drawing.Size(962, 621)
+        Me.SplitContainer1.Size = New System.Drawing.Size(962, 593)
        Me.SplitContainer1.SplitterDistance = 477
        Me.SplitContainer1.TabIndex = 37
        '
@ -1005,11 +978,46 @@ Partial Class frmValidator
        Me.grpbxMailBody.TabStop = False
        Me.grpbxMailBody.Text = "Body:"
        '
+        'ToolStrip1
+        '
+        Me.ToolStrip1.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.ToolStrip1.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripButtonJumpFile, Me.ToolStripButtonDeleteFile, Me.ToolStripButtonAnnotation})
+        Me.ToolStrip1.Location = New System.Drawing.Point(0, 0)
+        Me.ToolStrip1.Name = "ToolStrip1"
+        Me.ToolStrip1.Size = New System.Drawing.Size(962, 25)
+        Me.ToolStrip1.TabIndex = 42
+        Me.ToolStrip1.Text = "ToolStrip1"
+        '
+        'ToolStripButtonJumpFile
+        '
+        Me.ToolStripButtonJumpFile.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.Nextrequest_10302
+        Me.ToolStripButtonJumpFile.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButtonJumpFile.Name = "ToolStripButtonJumpFile"
+        Me.ToolStripButtonJumpFile.Size = New System.Drawing.Size(165, 22)
+        Me.ToolStripButtonJumpFile.Text = "Datei überspringen (F4)"
+        '
+        'ToolStripButtonDeleteFile
+        '
+        Me.ToolStripButtonDeleteFile.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.delete_12x12
+        Me.ToolStripButtonDeleteFile.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButtonDeleteFile.Name = "ToolStripButtonDeleteFile"
+        Me.ToolStripButtonDeleteFile.Size = New System.Drawing.Size(106, 22)
+        Me.ToolStripButtonDeleteFile.Text = "Datei löschen"
+        '
+        'ToolStripButtonAnnotation
+        '
+        Me.ToolStripButtonAnnotation.Image = Global.DD_PM_WINDREAM.My.Resources.Resources.flag_orange
+        Me.ToolStripButtonAnnotation.ImageTransparentColor = System.Drawing.Color.Magenta
+        Me.ToolStripButtonAnnotation.Name = "ToolStripButtonAnnotation"
+        Me.ToolStripButtonAnnotation.Size = New System.Drawing.Size(105, 22)
+        Me.ToolStripButtonAnnotation.Text = "Annotationen"
+        '
        'frmValidator
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(7.0!, 17.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.ClientSize = New System.Drawing.Size(962, 643)
+        Me.Controls.Add(Me.ToolStrip1)
        Me.Controls.Add(Me.SplitContainer1)
        Me.Controls.Add(Me.StatusStrip1)
        Me.Controls.Add(Me.barDockControlLeft)
@ -1060,6 +1068,8 @@ Partial Class frmValidator
        Me.SplitContainer1.ResumeLayout(False)
        Me.grpbxMailBody.ResumeLayout(False)
        Me.grpbxMailBody.PerformLayout()
+        Me.ToolStrip1.ResumeLayout(False)
+        Me.ToolStrip1.PerformLayout()
        Me.ResumeLayout(False)
        Me.PerformLayout()

@ -1071,7 +1081,6 @@ Partial Class frmValidator
    Friend WithEvents Panel1 As System.Windows.Forms.Panel
    Friend WithEvents TITLELabel1 As System.Windows.Forms.Label
    Friend WithEvents btnSave As System.Windows.Forms.Button
-    Friend WithEvents btnNavigatornext As System.Windows.Forms.Button
    Friend WithEvents DESCRIPTIONLabel As System.Windows.Forms.Label
    Friend WithEvents GroupBox1 As System.Windows.Forms.GroupBox
    Friend WithEvents Label2 As System.Windows.Forms.Label
@ -1079,7 +1088,6 @@ Partial Class frmValidator
    Friend WithEvents txtErstellt As System.Windows.Forms.TextBox
    Friend WithEvents txtDateipfad As System.Windows.Forms.TextBox
    Friend WithEvents pnldesigner As System.Windows.Forms.Panel
-    Friend WithEvents btnDelete As System.Windows.Forms.Button
    Friend WithEvents DD_DMSLiteDataSet As DD_PM_WINDREAM.DD_DMSLiteDataSet
    Friend WithEvents VWPM_PROFILE_USERBindingSource As System.Windows.Forms.BindingSource
    Friend WithEvents VWPM_PROFILE_USERTableAdapter As DD_PM_WINDREAM.DD_DMSLiteDataSetTableAdapters.VWPM_PROFILE_USERTableAdapter
@ -1177,4 +1185,8 @@ Partial Class frmValidator
    Friend WithEvents BarAndDockingController3 As DevExpress.XtraBars.BarAndDockingController
    Friend WithEvents SplitContainer1 As System.Windows.Forms.SplitContainer
    Friend WithEvents grpbxMailBody As System.Windows.Forms.GroupBox
+    Friend WithEvents ToolStrip1 As ToolStrip
+    Friend WithEvents ToolStripButtonJumpFile As ToolStripButton
+    Friend WithEvents ToolStripButtonDeleteFile As ToolStripButton
+    Friend WithEvents ToolStripButtonAnnotation As ToolStripButton
 End Class
--- a/app/DD_PM_WINDREAM/frmValidator.resx
+++ b/app/DD_PM_WINDREAM/frmValidator.resx
@ -204,6 +204,9 @@
  <metadata name="$this.TrayHeight" type="System.Int32, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
    <value>197</value>
  </metadata>
+  <metadata name="ToolStrip1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>134, 251</value>
+  </metadata>
  <metadata name="StatusStrip3.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 251</value>
  </metadata>
--- a/app/DD_PM_WINDREAM/frmValidator.vb
+++ b/app/DD_PM_WINDREAM/frmValidator.vb
@ -17,6 +17,7 @@ Public Class frmValidator
    Dim PROFIL_VEKTORINDEX
    Dim PROFIL_LOGINDEX
    Dim Right_Delete As Boolean
+    Dim DTPROFIL As DataTable

    Dim Delimiter As String

@ -297,6 +298,7 @@ Public Class frmValidator
            Me.Size = My.Settings.frmValidatorSize
        End If
        Try
+            DTPROFIL = ClassDatabase.Return_Datatable("SELECT * FROM TBPM_PROFILE WHERE GUID = " & CURRENT_ProfilGUID)
            TBPM_FILES_USER_NOT_INDEXEDTableAdapter.Connection.ConnectionString = MyConnectionString
            TBPM_PROFILE_CONTROLSTableAdapter.Connection.ConnectionString = MyConnectionString
            TBPM_CONNECTIONTableAdapter.Connection.ConnectionString = MyConnectionString
@ -362,9 +364,9 @@ Public Class frmValidator
                    If LogErrorsOnly = False Then ClassLogger.Add(" >> PROFIL_sortbynewest: " & PROFIL_sortbynewest.ToString, False)
                    'Delete Button anzeigen ja/nein
                    If Right_Delete = True Then
-                        Me.btnDelete.Visible = True
+                        Me.ToolStripButtonDeleteFile.Enabled = True
                    Else
-                        Me.btnDelete.Visible = False
+                        Me.ToolStripButtonDeleteFile.Enabled = False
                    End If

                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Right_Delete: " & Right_Delete.ToString, False)
@ -861,7 +863,7 @@ Public Class frmValidator
                    ClassLogger.Add("Unexpected Error in Eventhandler Variable SQL Result - ERROR: " & ex.Message)
                End Try
                If box.Name = last_control.Name Then
-                    Abschluss()
+                    ' Abschluss()
                Else
                    SendKeys.Send("{TAB}")
                End If
@ -1063,10 +1065,12 @@ Public Class frmValidator
            Else
                newGUID = TBPM_PROFILE_FILESTableAdapter.cmdGetNextFile_GUID(CURRENT_ProfilGUID, OLD_Document_Path, Environment.UserName)
            End If
-
+            Document_Path = ""
+            CURRENT_DOC_PATH = ""
            If newGUID > 0 Then
                If LogErrorsOnly = False Then ClassLogger.Add(" >> newGUID: " & newGUID.ToString, False)
                Document_Path = TBPM_PROFILE_FILESTableAdapter.CmdGetFilePath_2_GUID(newGUID)
+                CURRENT_DOC_PATH = Document_Path
                If LogErrorsOnly = False Then ClassLogger.Add(" >> Document_Path: " & Document_Path, False)

                If LogErrorsOnly = False Then ClassLogger.Add(" >> Überprüfen ob File existiert?", False)
@ -1079,6 +1083,8 @@ Public Class frmValidator
                        Dim Del = "DELETE FROM TBPM_PROFILE_FILES where GUID = " & newGUID
                        ClassDatabase.Execute_non_Query(Del, True)
                        errmessage = "Die windream-Datei existiert nicht!"
+                        Document_Path = ""
+                        CURRENT_DOC_PATH = ""
                        Return 0
                    End If
                Loop
@ -1225,67 +1231,11 @@ Public Class frmValidator
                        Me.grpbxMailBody.Visible = False
                        Me.grpBetreff.Visible = False

-                        If Viewer = "uviewer" Then
-                            pdfxchange = False
-                            sumatra = False
-                            If Document_Path.ToLower.EndsWith(".msg") Then
-                                Show_Email()
-                            Else
-                                ShowFile_UniversalViewer(Document_Path)
-                            End If
-                        ElseIf Viewer = "docview" Then
-                            PdfControls_visible(False)
-                            If Document_Path.ToLower.EndsWith(".pdf") And vpdfviewer <> "none" Then
-                                Select Case vpdfviewer
-                                    Case "internal"
-                                        PdfViewer1.LoadDocument(Document_Path)
-                                        If LogErrorsOnly = False Then ClassLogger.Add(" >> Internal Viewer Path: " & Document_Path, False)
-                                        PdfControls_visible(True)
-                                        Me.Size = My.Settings.frmValidation_Size_PDFViewer
-                                        PdfViewer1.ZoomMode = PDFViewer_ZoomMode
-                                        pdfxchange = False
-                                        sumatra = False
-                                    Case "pdfxchange"
-                                        Open_PDFXCHANGE(Document_Path)
-                                        pdfxchange = True
-                                        sumatra = False
-                                        System.Threading.Thread.Sleep(1000)
-                                        Me.Size = My.Settings.frmValidatorSize
-                                    Case "sumatra"
-                                        Open_Sumatra(Document_Path)
-                                        sumatra = True
-                                        pdfxchange = False
-                                        System.Threading.Thread.Sleep(1000)
-                                        Me.Size = My.Settings.frmValidatorSize
-                                    Case "system"
-                                        sumatra = False
-                                        pdfxchange = False
-                                        Open_PDF_withStandard()
-                                        System.Threading.Thread.Sleep(1000)
-                                        Me.Size = My.Settings.frmValidatorSize
-                                End Select
-                            ElseIf Document_Path.ToLower.EndsWith(".msg") Then
-                                Show_Email()
-                            Else
-                                Me.Size = My.Settings.frmValidatorSize
-                                pdfxchange = False
-                                sumatra = False
-                                DocView = Nothing
-                                DocView = CreateObject("WMPViewXNG.Viewer")
-                                ' open the viewer
-                                viewer_string = aktivesDokument.aPath.ToString
-                                DocView.ViewFile(viewer_string)
-                            End If
+                        load_Viewer
+                        If Document_Path.ToLower.EndsWith(".pdf") Then
+                            ToolStripButtonAnnotation.Visible = True
                        Else
-                            PdfControls_visible(False)
-                            Me.Size = My.Settings.frmValidatorSize
-                            pdfxchange = False
-                            sumatra = False
-                            DocView = Nothing
-                            DocView = CreateObject("WMPViewXNG.Viewer")
-                            ' open the viewer
-                            viewer_string = aktivesDokument.aPath.ToString
-                            DocView.ViewFile(viewer_string)
+                            ToolStripButtonAnnotation.Visible = False
                        End If

                        If LogErrorsOnly = False Then ClassLogger.Add(" >> Viewer geladen", False)
@ -1348,6 +1298,70 @@ Public Class frmValidator
            frmError.ShowDialog()
        End Try
    End Sub
+    Sub load_viewer()
+        If Viewer = "uviewer" Then
+            pdfxchange = False
+            sumatra = False
+            If Document_Path.ToLower.EndsWith(".msg") Then
+                Show_Email()
+            Else
+                ShowFile_UniversalViewer(Document_Path)
+            End If
+        ElseIf Viewer = "docview" Then
+            PdfControls_visible(False)
+            If Document_Path.ToLower.EndsWith(".pdf") And vpdfviewer <> "none" Then
+                Select Case vpdfviewer
+                    Case "internal"
+                        PdfViewer1.LoadDocument(Document_Path)
+                        If LogErrorsOnly = False Then ClassLogger.Add(" >> Internal Viewer Path: " & Document_Path, False)
+                        PdfControls_visible(True)
+                        Me.Size = My.Settings.frmValidation_Size_PDFViewer
+                        PdfViewer1.ZoomFactor = PDFViewer_ZoomMode
+                        pdfxchange = False
+                        sumatra = False
+                    Case "pdfxchange"
+                        Open_PDFXCHANGE(Document_Path)
+                        pdfxchange = True
+                        sumatra = False
+                        System.Threading.Thread.Sleep(1000)
+                        Me.Size = My.Settings.frmValidatorSize
+                    Case "sumatra"
+                        Open_Sumatra(Document_Path)
+                        sumatra = True
+                        pdfxchange = False
+                        System.Threading.Thread.Sleep(1000)
+                        Me.Size = My.Settings.frmValidatorSize
+                    Case "system"
+                        sumatra = False
+                        pdfxchange = False
+                        Open_PDF_withStandard()
+                        System.Threading.Thread.Sleep(1000)
+                        Me.Size = My.Settings.frmValidatorSize
+                End Select
+            ElseIf Document_Path.ToLower.EndsWith(".msg") Then
+                Show_Email()
+            Else
+                Me.Size = My.Settings.frmValidatorSize
+                pdfxchange = False
+                sumatra = False
+                DocView = Nothing
+                DocView = CreateObject("WMPViewXNG.Viewer")
+                ' open the viewer
+                viewer_string = aktivesDokument.aPath.ToString
+                DocView.ViewFile(viewer_string)
+            End If
+        Else
+            PdfControls_visible(False)
+            Me.Size = My.Settings.frmValidatorSize
+            pdfxchange = False
+            sumatra = False
+            DocView = Nothing
+            DocView = CreateObject("WMPViewXNG.Viewer")
+            ' open the viewer
+            viewer_string = aktivesDokument.aPath.ToString
+            DocView.ViewFile(viewer_string)
+        End If
+    End Sub
    Sub Show_Email()
        Try
            Me.grpBetreff.Dock = DockStyle.Top
@ -1952,36 +1966,116 @@ Public Class frmValidator
                    'TBPM_PROFILE_FILESTableAdapter.CmdSETWORK(False, "", Document_ID)
                    ''Das Dokument 
                    'TBPM_PROFILE_FILESTableAdapter.CmdSetEdit(Document_ID)
+                    Dim WORK_HISTORY_ENTRY = Nothing

-                    Close_document_viewer()
+                    Try
+                        WORK_HISTORY_ENTRY = DTPROFIL.Rows(0).Item("WORK_HISTORY_ENTRY")
+                        If IsDBNull(WORK_HISTORY_ENTRY) Then
+                            WORK_HISTORY_ENTRY = Nothing
+                        End If
+                    Catch ex As Exception
+                        WORK_HISTORY_ENTRY = Nothing
+                    End Try


-                    'wenn Move2Folder aktiviert wurde
-                    If Move2Folder <> "" Then
-                        idxerr_message = allgFunk.Move2Folder(Document_Path, Move2Folder, CURRENT_ProfilGUID)
-                        If idxerr_message <> "" Then
-                            My.Settings.errormessage = "Fehler bei Move2Folder:" & vbNewLine & idxerr_message
-                            My.Settings.Save()
-                            frmError.ShowDialog()
-                            _error = True
+                    If Not IsNothing(WORK_HISTORY_ENTRY) Then
+                        If WORK_HISTORY_ENTRY <> String.Empty Then
+                            Dim preg As String = "\[%{1}[a-zA-Z0-9\!\$\&\/\(\)\=\?\,\.\-\;\:_öÖüÜäÄ\#\'\+\*\~\{\}\@\€\<\>\ ]+]{1}"
+                            ' einen Regulären Ausdruck laden
+                            Dim regulärerAusdruck As System.Text.RegularExpressions.Regex = New System.Text.RegularExpressions.Regex(preg)
+                            ' die Vorkommen im SQL-String auslesen
+                            Dim elemente As System.Text.RegularExpressions.MatchCollection = regulärerAusdruck.Matches(WORK_HISTORY_ENTRY)
+                            '####
+                            ' alle Vorkommen innerhalbd er Namenkonvention durchlaufen
+                            For Each element As System.Text.RegularExpressions.Match In elemente
+                                Try
+                                    If LogErrorsOnly = False Then ClassLogger.Add(" >> element in RegeX WORK_HISTORY_ENTRY: " & element.Value, False)
+                                    Dim CTRL_ID = element.Value.Substring(2, element.Value.Length - 3)
+                                    CTRL_ID = CTRL_ID.Replace("CTRLID", "")
+                                    Dim value_from_control
+                                    For Each inctrl As Control In Me.pnldesigner.Controls
+                                        If IsNothing(inctrl.Tag) Then
+                                            Continue For
+                                        End If
+                                        If inctrl.Tag = CTRL_ID Then
+                                            '######
+                                            Dim Type As String = inctrl.GetType.ToString
+                                            Select Case Type
+                                                Case "System.Windows.Forms.TextBox"
+                                                    Try
+                                                        value_from_control = inctrl.Text
+                                                    Catch ex As Exception
+                                                        value_from_control = String.Empty
+                                                    End Try
+
+                                                Case "System.Windows.Forms.ComboBox"
+                                                    Dim cmb As ComboBox = inctrl
+                                                    Try
+                                                        value_from_control = cmb.SelectedValue
+                                                    Catch ex As Exception
+                                                        value_from_control = String.Empty
+                                                    End Try
+                                                Case "System.Windows.Forms.DateTimePicker"
+                                                    Dim dtp As DateTimePicker = inctrl
+                                                    Try
+                                                        value_from_control = dtp.Value.ToString
+                                                    Catch ex As Exception
+                                                        value_from_control = String.Empty
+                                                    End Try
+
+                                                Case "System.Windows.Forms.CheckBox"
+                                                    Dim chk As CheckBox = inctrl
+                                                    Try
+                                                        value_from_control = chk.Checked
+                                                    Catch ex As Exception
+                                                        value_from_control = String.Empty
+                                                    End Try
+                                            End Select
+
+                                        End If
+                                    Next
+                                    If Not IsNothing(value_from_control) And value_from_control <> String.Empty Then
+                                        WORK_HISTORY_ENTRY = WORK_HISTORY_ENTRY.ToString.Replace(element.Value, value_from_control)
+                                    End If
+                                Catch ex As Exception
+                                    ClassLogger.Add("Unexpected Error in Checking control values for WORK_HISTORY_ENTRY - ERROR: " & ex.Message)
+                                End Try
+                            Next
+                        Else
+                            WORK_HISTORY_ENTRY = ""
                        End If
                    End If
-                    'Validierungsfile löschen wenn vorhanden
-                    allgFunk.Delete_xffres(Document_Path)
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Delete_xffres ausgeführt", False)
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> All Input clear", False)
-                    Anzahl_validierte_Dok += 1
-                    'tstrlbl_Info.Text = "Anzahl Dateien: " & TBPM_PROFILE_FILESTableAdapter.cmdGet_Anzahl(PROFIL_ID)
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Anzahl hochgesetzt", False)
-                    If LogErrorsOnly = False Then ClassLogger.Add(" >> Validierung erfolgreich abgeschlossen", False)
-                    ClassLogger.Add("", False)
+                    sql = String.Format("INSERT INTO TBPM_FILES_WORK_HISTORY (PROFIL_ID, DOC_ID,WORKED_BY) VALUES ({0},{1},{'2'})", CURRENT_ProfilGUID, CURRENT_DOC_ID, Environment.UserName)
+                        ClassDatabase.Execute_non_Query(sql)
+                        Close_document_viewer()

-                    'Das nächste Dokument laden
-                    Load_Next_Document(False)

-                    set_foreground()
-                    If first_control Is Nothing = False Then first_control.Focus()
-                End If
+                        'wenn Move2Folder aktiviert wurde
+                        If Move2Folder <> "" Then
+                            idxerr_message = allgFunk.Move2Folder(Document_Path, Move2Folder, CURRENT_ProfilGUID)
+                            If idxerr_message <> "" Then
+                                My.Settings.errormessage = "Fehler bei Move2Folder:" & vbNewLine & idxerr_message
+                                My.Settings.Save()
+                                frmError.ShowDialog()
+                                _error = True
+                            End If
+                        End If
+                        'Validierungsfile löschen wenn vorhanden
+                        allgFunk.Delete_xffres(Document_Path)
+                        If LogErrorsOnly = False Then ClassLogger.Add(" >> Delete_xffres ausgeführt", False)
+                        If LogErrorsOnly = False Then ClassLogger.Add(" >> All Input clear", False)
+                        Anzahl_validierte_Dok += 1
+                        'tstrlbl_Info.Text = "Anzahl Dateien: " & TBPM_PROFILE_FILESTableAdapter.cmdGet_Anzahl(PROFIL_ID)
+                        If LogErrorsOnly = False Then ClassLogger.Add(" >> Anzahl hochgesetzt", False)
+                        If LogErrorsOnly = False Then ClassLogger.Add(" >> Validierung erfolgreich abgeschlossen", False)
+                        ClassLogger.Add("", False)
+
+                        'Das nächste Dokument laden
+                        Load_Next_Document(False)
+
+                        set_foreground()
+                        If first_control Is Nothing = False Then first_control.Focus()
+                    End If

            Catch ex As Exception
                My.Settings.errormessage = "Unvorhergesehener Fehler bei Abschluss:" & ex.Message
@ -2514,7 +2608,7 @@ Public Class frmValidator
        End If
    End Sub

-    Private Sub btnNavigatornext_MouseDown(sender As System.Object, e As System.Windows.Forms.MouseEventArgs) Handles btnNavigatornext.MouseDown
+    Private Sub btnNavigatornext_MouseDown(sender As System.Object, e As System.Windows.Forms.MouseEventArgs)
        If e.Button = Windows.Forms.MouseButtons.Left Then
            navStep = "next"
        End If
@ -2547,8 +2641,7 @@ Public Class frmValidator


    End Sub
-
-    Private Sub btnNavigatornext_Click(sender As System.Object, e As System.EventArgs) Handles btnNavigatornext.Click
+    Sub Datei_ueberspringen()
        Try
            If LogErrorsOnly = False Then ClassLogger.Add(" >> Dokument überspringen", False)
            Close_document_viewer()
@ -2562,10 +2655,9 @@ Public Class frmValidator
        Catch ex As Exception
            MsgBox("Fehler bei Überspringen:" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
        End Try
-
    End Sub

-    Private Sub btnDelete_Click(sender As System.Object, e As System.EventArgs) Handles btnDelete.Click
+    Private Sub delete_active_File()
        Try
            Dim result As MsgBoxResult
            result = MessageBox.Show("Sind Sie sicher dass Sie dieses Dokument unwiderruflich löschen wollen?" & vbNewLine & "Danach wird die nächste Datei angezeigt!", "Bestätigung erforderlich:", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
@ -2615,7 +2707,7 @@ Public Class frmValidator
    Private Const SEE_MASK_NOCLOSEPROCESS = &H40
    Private Const SEE_MASK_FLAG_NO_UI = &H400
    Public Const SW_SHOW As Short = 5
-    <DllImport("Shell32", CharSet:=CharSet.Auto, SetLastError:=True)> _
+    <DllImport("Shell32", CharSet:=CharSet.Auto, SetLastError:=True)>
    Public Shared Function ShellExecuteEx(ByRef lpExecInfo As SHELLEXECUTEINFO) As Boolean
    End Function
    Public Structure SHELLEXECUTEINFO
@ -2699,10 +2791,11 @@ Public Class frmValidator

    Private Sub PdfViewer1_ZoomChanged_1(sender As Object, e As DevExpress.XtraPdfViewer.PdfZoomChangedEventArgs) Handles PdfViewer1.ZoomChanged
        If Not PdfViewer1.ZoomMode = DevExpress.XtraPdfViewer.PdfZoomMode.Custom Then
-            SaveMySettingsValue("PDFViewer_ZoomMode", PdfViewer1.ZoomMode)
-            PDFViewer_ZoomMode = PdfViewer1.ZoomMode
-        End If

+        End If
+        Dim sdds = PdfViewer1.ZoomFactor
+        SaveMySettingsValue("PDFViewer_ZoomMode", PdfViewer1.ZoomFactor)
+        PDFViewer_ZoomMode = PdfViewer1.ZoomFactor
    End Sub

    Private Sub ToolStripDropDownButton1_Click(sender As Object, e As EventArgs) Handles ToolStripDropDownButton1.Click
@ -2714,10 +2807,21 @@ Public Class frmValidator
            btnSave.Enabled = False
            Abschluss()
            btnSave.Enabled = True
+        ElseIf e.KeyCode = Keys.F4 Then
+            Datei_ueberspringen()
        End If
    End Sub

-    Private Sub Button1_Click(sender As Object, e As EventArgs)
+    Private Sub ToolStripButton1_Click(sender As Object, e As EventArgs) Handles ToolStripButtonJumpFile.Click
+        Datei_ueberspringen()
+    End Sub

+    Private Sub ToolStripButtonDeleteFile_Click(sender As Object, e As EventArgs) Handles ToolStripButtonDeleteFile.Click
+        delete_active_File()
+    End Sub
+
+    Private Sub ToolStripButtonAnnotation_Click(sender As Object, e As EventArgs) Handles ToolStripButtonAnnotation.Click
+        frmAnnotations.ShowDialog()
+        load_viewer()
    End Sub
 End Class
--- a/app/Setup/Product.wxs
+++ b/app/Setup/Product.wxs
@ -58,13 +58,17 @@
      </Component>

      <Component Id="ReleaseNotes" Guid="D1496E4D-98C2-4849-9914-DB47D47CC6BE">
+
        <File Id="ReleaseNote" Name="Release Notes.txt" Source="P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DD_MODULE\DD Process Manager\Release_Notes.txt" KeyPath="yes">
        </File>
+
      </Component>

      <Component Id="WindreamLibs" Guid="4D11FC99-50D9-4E54-B18A-8885C9112646">
        <File Id="WINDREAMLibDLL" Name="Interop.WINDREAMLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WINDREAMLib.dll" KeyPath="yes"/>
        <File Id="WMOTOOLLib" Name="Interop.WMOTOOLLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOTOOLLib.dll"/>
+        <File Id="WMOSRCHLib" Name="Interop.WMOSRCHLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOSRCHLib.dll"/>
+        <File Id="WMOBRWSLib" Name="Interop.WMOBRWSLib.dll" Source="P:\Visual Studio Projekte\Bibliotheken\windream\Interop.WMOBRWSLib.dll"/>
      </Component>

      <Component Id="IndependentsoftLibs" Guid="C3B3BB48-DB41-4419-A4B8-0E4DC5E8856B">
@ -79,6 +83,10 @@
        <File Id="Oracle.ManagedDataAccess" Name="Oracle.ManagedDataAccess.dll" Source="P:\Visual Studio Projekte\Bibliotheken\Oracle.ManagedDataAccess.dll" KeyPath="yes"/>
      </Component>
      
+       <Component Id="PDFsharp" Guid="9cd1cfb7-3f84-4a8b-aa51-642b723fcd70">
+        <File Id="PdfSharpgdi" Name="PdfSharp-gdi.dll" Source="P:\Visual Studio Projekte\Bibliotheken\PdfSharp-gdi.dll" KeyPath="yes"/>
+      </Component>
+      
      <Component Id="DevExpressLibs" Guid="CB40DAAE-348E-4BD3-B275-9A526EB8F191">
        <File Id="DevExpress.Data.v15.2" Name="DevExpress.Data.v15.2.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Data.v15.2.dll" KeyPath="yes"/>
        <File Id="DevExpress.Pdf.v15.2.Core" Name="DevExpress.Pdf.v15.2.Core.dll" Source="D:\ProgramFiles\DevExpress 15.2\Bin\Framework\DevExpress.Pdf.v15.2.Core.dll"/>
@ -128,6 +136,7 @@
      <ComponentRef Id="WindreamLibs" />
      <ComponentRef Id="DDLibs" />
      <ComponentRef Id="Oracle" />
+      <ComponentRef Id="PDFsharp" />
      <ComponentRef Id="IndependentsoftLibs" />
      <ComponentRef Id="DevExpressLibs" />
      <ComponentRef Id="ProgramMenuDir" />