12.01.2024

2024-01-12 12:06:29 +01:00 · 2024-01-12 12:06:29 +01:00 · e0bbdf8c0e
commit e0bbdf8c0e
parent c8106f4fb0
12 changed files with 1129 additions and 1052 deletions
--- a/EnvelopeGenerator.Common/Entities/Envelope.vb
+++ b/EnvelopeGenerator.Common/Entities/Envelope.vb
@ -2,7 +2,7 @@
    Public Property Id As Integer = 0
    Public Property UserId As Integer
    Public Property Title As String = ""
-    Public Property EnvelopeType As Integer
+    Public Property EnvelopeTypeId As Integer
    Public Property ContractType As Integer
    Public Property Status As Constants.EnvelopeStatus = Constants.EnvelopeStatus.EnvelopeCreated
    Public Property Uuid As String = Guid.NewGuid.ToString()
@ -30,6 +30,13 @@
    Public Property Documents As New List(Of EnvelopeDocument)
    Public Property Receivers As New List(Of EnvelopeReceiver)
    Public Property History As New List(Of EnvelopeHistoryEntry)
+    Public Property EnvelopeType As EnvelopeType
+
+    Public ReadOnly Property EnvelopeTypeTitle As String
+        Get
+            Return EnvelopeType.Title
+        End Get
+    End Property

    Public ReadOnly Property IsAlreadySent As Boolean
        Get
--- a/EnvelopeGenerator.Common/Entities/EnvelopeDocument.vb
+++ b/EnvelopeGenerator.Common/Entities/EnvelopeDocument.vb
@ -17,4 +17,12 @@ Public Class EnvelopeDocument
    Public Property Filename As String

    Public Property Filepath As String
+
+    Public Property PageCount As Integer
+
+    Public ReadOnly Property PageCountTranslated As String
+        Get
+            Return $"{PageCount} Seiten"
+        End Get
+    End Property
 End Class
--- a/EnvelopeGenerator.Common/Models/EnvelopeModel.vb
+++ b/EnvelopeGenerator.Common/Models/EnvelopeModel.vb
@ -10,7 +10,7 @@ Public Class EnvelopeModel
    Private ReadOnly ReceiverModel As ReceiverModel
    Private ReadOnly HistoryModel As HistoryModel
    Private ReadOnly DocumentModel As DocumentModel
-
+    Private ReadOnly EnvelopeTypeModel As EnvelopeTypeModel

    Public Sub New(pState As State)
        MyBase.New(pState)
@ -19,13 +19,14 @@ Public Class EnvelopeModel
        ReceiverModel = New ReceiverModel(pState)
        DocumentModel = New DocumentModel(pState)
        HistoryModel = New HistoryModel(pState)
+        EnvelopeTypeModel = New EnvelopeTypeModel(pState)
    End Sub

    Private Function ToEnvelope(pRow As DataRow) As Envelope
        Dim oEnvelope = New Envelope() With {
            .Id = pRow.ItemEx("GUID", 0),
            .Title = pRow.ItemEx("TITLE", ""),
-            .EnvelopeType = pRow.ItemEx("ENVELOPE_TYPE", 0),
+            .EnvelopeTypeId = pRow.ItemEx("ENVELOPE_TYPE", 0),
            .ContractType = pRow.ItemEx("CONTRACT_TYPE", 0),
            .Uuid = pRow.ItemEx("ENVELOPE_UUID", ""),
            .Message = pRow.ItemEx("MESSAGE", ""),
@ -51,6 +52,7 @@ Public Class EnvelopeModel
        oEnvelope.Receivers = ReceiverModel.ListEnvelopeReceivers(oEnvelope.Id)
        oEnvelope.Documents = DocumentModel.List(oEnvelope.Id)
        oEnvelope.History = HistoryModel.List(oEnvelope.Id)
+        oEnvelope.EnvelopeType = EnvelopeTypeModel.GetById(oEnvelope.EnvelopeTypeId)

        Return oEnvelope
    End Function
@ -181,7 +183,7 @@ Public Class EnvelopeModel
            oCommand.Parameters.Add("MESSAGE", SqlDbType.NVarChar).Value = pEnvelope.Message
            oCommand.Parameters.Add("STATUS", SqlDbType.Int).Value = pEnvelope.Status
            oCommand.Parameters.Add("TITLE", SqlDbType.NVarChar).Value = pEnvelope.Title
-            oCommand.Parameters.Add("ENVELOPE_TYPE", SqlDbType.Int).Value = pEnvelope.EnvelopeType
+            oCommand.Parameters.Add("ENVELOPE_TYPE", SqlDbType.Int).Value = pEnvelope.EnvelopeTypeId
            oCommand.Parameters.Add("CONTRACT_TYPE", SqlDbType.Int).Value = pEnvelope.ContractType
            oCommand.Parameters.Add("LANGUAGE", SqlDbType.NVarChar).Value = pEnvelope.Language
            oCommand.Parameters.Add("CERTIFICATION_TYPE", SqlDbType.Int).Value = pEnvelope.CertificationType
--- a/EnvelopeGenerator.Common/Models/EnvelopeTypeModel.vb
+++ b/EnvelopeGenerator.Common/Models/EnvelopeTypeModel.vb
@ -25,6 +25,18 @@ Public Class EnvelopeTypeModel
        }
    End Function

+    Public Function GetById(pEnvelopeTypeId As Integer) As EnvelopeType
+        Dim oSql As String = $"SELECT * FROM TBSIG_ENVELOPE_TYPE WHERE GUID = {pEnvelopeTypeId}"
+        Dim oTable As DataTable = Database.GetDatatable(oSql)
+
+        If oTable.Rows.Count = 0 Then
+            Return Nothing
+        End If
+
+        Dim oRow = oTable.Rows.Item(0)
+        Return ToEnvelopeType(oRow)
+    End Function
+
    Public Function List() As IEnumerable(Of EnvelopeType)
        Dim oSql As String = $"SELECT * FROM TBSIG_ENVELOPE_TYPE"
        Dim oTable As DataTable = Database.GetDatatable(oSql)
--- a/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
+++ b/EnvelopeGenerator.Form/Controllers/EnvelopeEditorController.vb
@ -164,7 +164,8 @@ Public Class EnvelopeEditorController
                .Filename = oFileInfoTemp.Name,
                .Filepath = oFileInfoTemp.FullName,
                .FileNameOriginal = oFileInfo.Name,
-                .Thumbnail = Thumbnail.GetThumbnailFromPDFFile(oTempFilePath)
+                .Thumbnail = Thumbnail.GetThumbnailFromPDFFile(oTempFilePath),
+                .PageCount = Thumbnail.GetPageCount(oTempFilePath)
            }

            Return oDocument
@ -186,6 +187,15 @@ Public Class EnvelopeEditorController
        End Try
    End Function

+    Public Function GetPageCount(pDocumentPath As String) As Integer
+        Try
+            Return Thumbnail.GetPageCount(pDocumentPath)
+        Catch ex As Exception
+            Logger.Error(ex)
+            Return Nothing
+        End Try
+    End Function
+
    Public Overloads Function DeleteDocument(pDocument As EnvelopeDocument) As Boolean
        Dim oConnection As SqlConnection = Database.GetConnection
        Dim oTransaction As SqlTransaction = oConnection.BeginTransaction
--- a/EnvelopeGenerator.Form/Helper/Thumbnail.vb
+++ b/EnvelopeGenerator.Form/Helper/Thumbnail.vb
@ -19,6 +19,18 @@ Public Class Thumbnail

    End Sub

+    Public Function GetPageCount(pFilePath As String) As Integer
+        Try
+            GDViewer.DisplayFromFile(pFilePath)
+
+            Return GDViewer.PageCount
+
+        Catch ex As Exception
+            Logger.Error(ex)
+            Return Nothing
+        End Try
+    End Function
+
    Public Function GetThumbnailFromPDFFile(pFilePath As String) As Bitmap
        Try
            GDViewer.DisplayFromFile(pFilePath)
--- a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb
+++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb
@ -33,14 +33,17 @@ Partial Public Class frmEnvelopeEditor
        Dim TableColumnDefinition1 As DevExpress.XtraEditors.TableLayout.TableColumnDefinition = New DevExpress.XtraEditors.TableLayout.TableColumnDefinition()
        Dim TableRowDefinition1 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition()
        Dim TableRowDefinition2 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition()
+        Dim TableRowDefinition3 As DevExpress.XtraEditors.TableLayout.TableRowDefinition = New DevExpress.XtraEditors.TableLayout.TableRowDefinition()
        Dim TileViewItemElement1 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement()
        Dim TileViewItemElement2 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement()
+        Dim TileViewItemElement3 As DevExpress.XtraGrid.Views.Tile.TileViewItemElement = New DevExpress.XtraGrid.Views.Tile.TileViewItemElement()
        Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl()
        Me.LayoutControl3 = New DevExpress.XtraLayout.LayoutControl()
        Me.GridDocuments = New DevExpress.XtraGrid.GridControl()
        Me.ViewDocuments = New DevExpress.XtraGrid.Views.Tile.TileView()
        Me.colFilename = New DevExpress.XtraGrid.Columns.TileViewColumn()
        Me.colThumbnail = New DevExpress.XtraGrid.Columns.TileViewColumn()
+        Me.colPageCount = New DevExpress.XtraGrid.Columns.TileViewColumn()
        Me.RibbonControl1 = New DevExpress.XtraBars.Ribbon.RibbonControl()
        Me.btnSave = New DevExpress.XtraBars.BarButtonItem()
        Me.btnCancel = New DevExpress.XtraBars.BarButtonItem()
@ -50,12 +53,15 @@ Partial Public Class frmEnvelopeEditor
        Me.btnEditFields = New DevExpress.XtraBars.BarButtonItem()
        Me.btnDeleteReceiver = New DevExpress.XtraBars.BarButtonItem()
        Me.btnEditData = New DevExpress.XtraBars.BarButtonItem()
+        Me.txtCreatorEmailLabel = New DevExpress.XtraBars.BarStaticItem()
+        Me.txtEnvelopeIdLabel2 = New DevExpress.XtraBars.BarStaticItem()
        Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
        Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroupDocuments = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroupInvitation = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroupAddSignature = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
        Me.RibbonPageGroupReceiver = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
+        Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
        Me.LayoutControlGroup4 = New DevExpress.XtraLayout.LayoutControlGroup()
        Me.LayoutControlGroup5 = New DevExpress.XtraLayout.LayoutControlGroup()
        Me.LayoutControlItem5 = New DevExpress.XtraLayout.LayoutControlItem()
@ -88,6 +94,7 @@ Partial Public Class frmEnvelopeEditor
        Me.FrmEditorBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.EnvelopeDocumentBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
+        Me.txtEnvelopeIdLabel = New DevExpress.XtraBars.BarStaticItem()
        CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainerControl1.Panel1.SuspendLayout()
@ -148,37 +155,25 @@ Partial Public Class frmEnvelopeEditor
        '
        'SplitContainerControl1.Panel1
        '
-        resources.ApplyResources(Me.SplitContainerControl1.Panel1, "SplitContainerControl1.Panel1")
        Me.SplitContainerControl1.Panel1.Controls.Add(Me.LayoutControl3)
+        resources.ApplyResources(Me.SplitContainerControl1.Panel1, "SplitContainerControl1.Panel1")
        '
        'SplitContainerControl1.Panel2
        '
-        resources.ApplyResources(Me.SplitContainerControl1.Panel2, "SplitContainerControl1.Panel2")
        Me.SplitContainerControl1.Panel2.Controls.Add(Me.SplitContainerControl2)
+        resources.ApplyResources(Me.SplitContainerControl1.Panel2, "SplitContainerControl1.Panel2")
        Me.SplitContainerControl1.SplitterPosition = 251
        '
        'LayoutControl3
        '
-        resources.ApplyResources(Me.LayoutControl3, "LayoutControl3")
        Me.LayoutControl3.Controls.Add(Me.GridDocuments)
+        resources.ApplyResources(Me.LayoutControl3, "LayoutControl3")
        Me.LayoutControl3.Name = "LayoutControl3"
        Me.LayoutControl3.Root = Me.LayoutControlGroup4
        '
        'GridDocuments
        '
        resources.ApplyResources(Me.GridDocuments, "GridDocuments")
-        Me.GridDocuments.EmbeddedNavigator.AccessibleDescription = resources.GetString("GridDocuments.EmbeddedNavigator.AccessibleDescription")
-        Me.GridDocuments.EmbeddedNavigator.AccessibleName = resources.GetString("GridDocuments.EmbeddedNavigator.AccessibleName")
-        Me.GridDocuments.EmbeddedNavigator.AllowHtmlTextInToolTip = CType(resources.GetObject("GridDocuments.EmbeddedNavigator.AllowHtmlTextInToolTip"), DevExpress.Utils.DefaultBoolean)
-        Me.GridDocuments.EmbeddedNavigator.Anchor = CType(resources.GetObject("GridDocuments.EmbeddedNavigator.Anchor"), System.Windows.Forms.AnchorStyles)
-        Me.GridDocuments.EmbeddedNavigator.BackgroundImage = CType(resources.GetObject("GridDocuments.EmbeddedNavigator.BackgroundImage"), System.Drawing.Image)
-        Me.GridDocuments.EmbeddedNavigator.BackgroundImageLayout = CType(resources.GetObject("GridDocuments.EmbeddedNavigator.BackgroundImageLayout"), System.Windows.Forms.ImageLayout)
-        Me.GridDocuments.EmbeddedNavigator.ImeMode = CType(resources.GetObject("GridDocuments.EmbeddedNavigator.ImeMode"), System.Windows.Forms.ImeMode)
-        Me.GridDocuments.EmbeddedNavigator.MaximumSize = CType(resources.GetObject("GridDocuments.EmbeddedNavigator.MaximumSize"), System.Drawing.Size)
-        Me.GridDocuments.EmbeddedNavigator.TextLocation = CType(resources.GetObject("GridDocuments.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation)
-        Me.GridDocuments.EmbeddedNavigator.ToolTip = resources.GetString("GridDocuments.EmbeddedNavigator.ToolTip")
-        Me.GridDocuments.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("GridDocuments.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType)
-        Me.GridDocuments.EmbeddedNavigator.ToolTipTitle = resources.GetString("GridDocuments.EmbeddedNavigator.ToolTipTitle")
        Me.GridDocuments.MainView = Me.ViewDocuments
        Me.GridDocuments.MenuManager = Me.RibbonControl1
        Me.GridDocuments.Name = "GridDocuments"
@ -186,21 +181,18 @@ Partial Public Class frmEnvelopeEditor
        '
        'ViewDocuments
        '
-        Me.ViewDocuments.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colFilename, Me.colThumbnail})
+        Me.ViewDocuments.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colFilename, Me.colThumbnail, Me.colPageCount})
        Me.ViewDocuments.GridControl = Me.GridDocuments
        Me.ViewDocuments.Name = "ViewDocuments"
        Me.ViewDocuments.OptionsTiles.ItemSize = New System.Drawing.Size(200, 290)
        Me.ViewDocuments.OptionsTiles.Orientation = System.Windows.Forms.Orientation.Vertical
        Me.ViewDocuments.TileColumns.Add(TableColumnDefinition1)
-        '
-        '
-        '
-        Me.ViewDocuments.TileHtmlTemplate.Styles = resources.GetString("ViewDocuments.TileHtmlTemplate.Styles")
-        Me.ViewDocuments.TileHtmlTemplate.Template = resources.GetString("ViewDocuments.TileHtmlTemplate.Template")
-        TableRowDefinition1.Length.Value = 152.0R
-        TableRowDefinition2.Length.Value = 20.0R
+        TableRowDefinition1.Length.Value = 226.0R
+        TableRowDefinition2.Length.Value = 25.0R
+        TableRowDefinition3.Length.Value = 25.0R
        Me.ViewDocuments.TileRows.Add(TableRowDefinition1)
        Me.ViewDocuments.TileRows.Add(TableRowDefinition2)
+        Me.ViewDocuments.TileRows.Add(TableRowDefinition3)
        TileViewItemElement1.Appearance.Normal.Options.UseTextOptions = True
        TileViewItemElement1.Appearance.Normal.TextOptions.Trimming = DevExpress.Utils.Trimming.EllipsisCharacter
        TileViewItemElement1.Column = Me.colFilename
@ -214,9 +206,15 @@ Partial Public Class frmEnvelopeEditor
        TileViewItemElement2.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze
        resources.ApplyResources(TileViewItemElement2, "TileViewItemElement2")
        TileViewItemElement2.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
+        TileViewItemElement3.Column = Me.colPageCount
+        TileViewItemElement3.ImageOptions.ImageAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
+        TileViewItemElement3.ImageOptions.ImageScaleMode = DevExpress.XtraEditors.TileItemImageScaleMode.Squeeze
+        TileViewItemElement3.RowIndex = 2
+        resources.ApplyResources(TileViewItemElement3, "TileViewItemElement3")
+        TileViewItemElement3.TextAlignment = DevExpress.XtraEditors.TileItemContentAlignment.MiddleCenter
        Me.ViewDocuments.TileTemplate.Add(TileViewItemElement1)
        Me.ViewDocuments.TileTemplate.Add(TileViewItemElement2)
-        resources.ApplyResources(Me.ViewDocuments, "ViewDocuments")
+        Me.ViewDocuments.TileTemplate.Add(TileViewItemElement3)
        '
        'colFilename
        '
@ -230,29 +228,30 @@ Partial Public Class frmEnvelopeEditor
        Me.colThumbnail.FieldName = "Thumbnail"
        Me.colThumbnail.Name = "colThumbnail"
        '
+        'colPageCount
+        '
+        resources.ApplyResources(Me.colPageCount, "colPageCount")
+        Me.colPageCount.FieldName = "PageCountTranslated"
+        Me.colPageCount.Name = "colPageCount"
+        '
        'RibbonControl1
        '
-        resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
        Me.RibbonControl1.ExpandCollapseItem.Id = 0
-        Me.RibbonControl1.ExpandCollapseItem.ImageOptions.ImageIndex = CType(resources.GetObject("RibbonControl1.ExpandCollapseItem.ImageOptions.ImageIndex"), Integer)
-        Me.RibbonControl1.ExpandCollapseItem.ImageOptions.LargeImageIndex = CType(resources.GetObject("RibbonControl1.ExpandCollapseItem.ImageOptions.LargeImageIndex"), Integer)
-        Me.RibbonControl1.ExpandCollapseItem.ImageOptions.SvgImage = CType(resources.GetObject("RibbonControl1.ExpandCollapseItem.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
-        Me.RibbonControl1.ExpandCollapseItem.SearchTags = resources.GetString("RibbonControl1.ExpandCollapseItem.SearchTags")
-        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.btnSave, Me.btnCancel, Me.btnNewFile, Me.btnDeleteFile, Me.btnSendEnvelope, Me.btnEditFields, Me.btnDeleteReceiver, Me.btnEditData})
-        Me.RibbonControl1.MaxItemId = 10
+        Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.btnSave, Me.btnCancel, Me.btnNewFile, Me.btnDeleteFile, Me.btnSendEnvelope, Me.btnEditFields, Me.btnDeleteReceiver, Me.btnEditData, Me.txtCreatorEmailLabel, Me.txtEnvelopeIdLabel2})
+        resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
+        Me.RibbonControl1.MaxItemId = 12
        Me.RibbonControl1.Name = "RibbonControl1"
        Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
        Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
        Me.RibbonControl1.ShowPageHeadersMode = DevExpress.XtraBars.Ribbon.ShowPageHeadersMode.Hide
        Me.RibbonControl1.ShowToolbarCustomizeItem = False
+        Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
        Me.RibbonControl1.Toolbar.ShowCustomizeItem = False
        '
        'btnSave
        '
        resources.ApplyResources(Me.btnSave, "btnSave")
        Me.btnSave.Id = 1
-        Me.btnSave.ImageOptions.ImageIndex = CType(resources.GetObject("btnSave.ImageOptions.ImageIndex"), Integer)
-        Me.btnSave.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnSave.ImageOptions.LargeImageIndex"), Integer)
        Me.btnSave.ImageOptions.SvgImage = CType(resources.GetObject("btnSave.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.btnSave.Name = "btnSave"
        '
@ -260,8 +259,6 @@ Partial Public Class frmEnvelopeEditor
        '
        resources.ApplyResources(Me.btnCancel, "btnCancel")
        Me.btnCancel.Id = 2
-        Me.btnCancel.ImageOptions.ImageIndex = CType(resources.GetObject("btnCancel.ImageOptions.ImageIndex"), Integer)
-        Me.btnCancel.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnCancel.ImageOptions.LargeImageIndex"), Integer)
        Me.btnCancel.ImageOptions.SvgImage = CType(resources.GetObject("btnCancel.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.btnCancel.Name = "btnCancel"
        '
@ -269,8 +266,6 @@ Partial Public Class frmEnvelopeEditor
        '
        resources.ApplyResources(Me.btnNewFile, "btnNewFile")
        Me.btnNewFile.Id = 3
-        Me.btnNewFile.ImageOptions.ImageIndex = CType(resources.GetObject("btnNewFile.ImageOptions.ImageIndex"), Integer)
-        Me.btnNewFile.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnNewFile.ImageOptions.LargeImageIndex"), Integer)
        Me.btnNewFile.ImageOptions.SvgImage = CType(resources.GetObject("btnNewFile.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.btnNewFile.Name = "btnNewFile"
        '
@ -278,8 +273,6 @@ Partial Public Class frmEnvelopeEditor
        '
        resources.ApplyResources(Me.btnDeleteFile, "btnDeleteFile")
        Me.btnDeleteFile.Id = 4
-        Me.btnDeleteFile.ImageOptions.ImageIndex = CType(resources.GetObject("btnDeleteFile.ImageOptions.ImageIndex"), Integer)
-        Me.btnDeleteFile.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnDeleteFile.ImageOptions.LargeImageIndex"), Integer)
        Me.btnDeleteFile.ImageOptions.SvgImage = CType(resources.GetObject("btnDeleteFile.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.btnDeleteFile.Name = "btnDeleteFile"
        '
@ -287,8 +280,6 @@ Partial Public Class frmEnvelopeEditor
        '
        resources.ApplyResources(Me.btnSendEnvelope, "btnSendEnvelope")
        Me.btnSendEnvelope.Id = 6
-        Me.btnSendEnvelope.ImageOptions.ImageIndex = CType(resources.GetObject("btnSendEnvelope.ImageOptions.ImageIndex"), Integer)
-        Me.btnSendEnvelope.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnSendEnvelope.ImageOptions.LargeImageIndex"), Integer)
        Me.btnSendEnvelope.ImageOptions.SvgImage = CType(resources.GetObject("btnSendEnvelope.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.btnSendEnvelope.Name = "btnSendEnvelope"
        '
@ -296,8 +287,6 @@ Partial Public Class frmEnvelopeEditor
        '
        resources.ApplyResources(Me.btnEditFields, "btnEditFields")
        Me.btnEditFields.Id = 7
-        Me.btnEditFields.ImageOptions.ImageIndex = CType(resources.GetObject("btnEditFields.ImageOptions.ImageIndex"), Integer)
-        Me.btnEditFields.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnEditFields.ImageOptions.LargeImageIndex"), Integer)
        Me.btnEditFields.ImageOptions.SvgImage = CType(resources.GetObject("btnEditFields.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.btnEditFields.Name = "btnEditFields"
        '
@ -305,8 +294,6 @@ Partial Public Class frmEnvelopeEditor
        '
        resources.ApplyResources(Me.btnDeleteReceiver, "btnDeleteReceiver")
        Me.btnDeleteReceiver.Id = 8
-        Me.btnDeleteReceiver.ImageOptions.ImageIndex = CType(resources.GetObject("btnDeleteReceiver.ImageOptions.ImageIndex"), Integer)
-        Me.btnDeleteReceiver.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnDeleteReceiver.ImageOptions.LargeImageIndex"), Integer)
        Me.btnDeleteReceiver.ImageOptions.SvgImage = CType(resources.GetObject("btnDeleteReceiver.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.btnDeleteReceiver.Name = "btnDeleteReceiver"
        '
@ -314,11 +301,27 @@ Partial Public Class frmEnvelopeEditor
        '
        resources.ApplyResources(Me.btnEditData, "btnEditData")
        Me.btnEditData.Id = 9
-        Me.btnEditData.ImageOptions.ImageIndex = CType(resources.GetObject("btnEditData.ImageOptions.ImageIndex"), Integer)
-        Me.btnEditData.ImageOptions.LargeImageIndex = CType(resources.GetObject("btnEditData.ImageOptions.LargeImageIndex"), Integer)
        Me.btnEditData.ImageOptions.SvgImage = CType(resources.GetObject("btnEditData.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.btnEditData.Name = "btnEditData"
        '
+        'txtCreatorEmailLabel
+        '
+        resources.ApplyResources(Me.txtCreatorEmailLabel, "txtCreatorEmailLabel")
+        Me.txtCreatorEmailLabel.Id = 10
+        Me.txtCreatorEmailLabel.ImageOptions.SvgImage = CType(resources.GetObject("txtCreatorEmailLabel.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.txtCreatorEmailLabel.Name = "txtCreatorEmailLabel"
+        Me.txtCreatorEmailLabel.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
+        Me.txtCreatorEmailLabel.Tag = "Absender Email: {0}"
+        '
+        'txtEnvelopeIdLabel2
+        '
+        resources.ApplyResources(Me.txtEnvelopeIdLabel2, "txtEnvelopeIdLabel2")
+        Me.txtEnvelopeIdLabel2.Id = 11
+        Me.txtEnvelopeIdLabel2.ImageOptions.SvgImage = CType(resources.GetObject("txtEnvelopeIdLabel2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.txtEnvelopeIdLabel2.Name = "txtEnvelopeIdLabel2"
+        Me.txtEnvelopeIdLabel2.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
+        Me.txtEnvelopeIdLabel2.Tag = "Umschlag-ID: {0}"
+        '
        'RibbonPage1
        '
        Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroupDocuments, Me.RibbonPageGroupInvitation, Me.RibbonPageGroupAddSignature, Me.RibbonPageGroupReceiver})
@ -359,32 +362,38 @@ Partial Public Class frmEnvelopeEditor
        Me.RibbonPageGroupReceiver.Name = "RibbonPageGroupReceiver"
        resources.ApplyResources(Me.RibbonPageGroupReceiver, "RibbonPageGroupReceiver")
        '
+        'RibbonStatusBar1
+        '
+        Me.RibbonStatusBar1.ItemLinks.Add(Me.txtCreatorEmailLabel)
+        Me.RibbonStatusBar1.ItemLinks.Add(Me.txtEnvelopeIdLabel2)
+        resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1")
+        Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
+        Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
+        '
        'LayoutControlGroup4
        '
-        resources.ApplyResources(Me.LayoutControlGroup4, "LayoutControlGroup4")
        Me.LayoutControlGroup4.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
        Me.LayoutControlGroup4.GroupBordersVisible = False
        Me.LayoutControlGroup4.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup5})
        Me.LayoutControlGroup4.Name = "LayoutControlGroup4"
        Me.LayoutControlGroup4.Padding = New DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0)
-        Me.LayoutControlGroup4.Size = New System.Drawing.Size(251, 552)
+        Me.LayoutControlGroup4.Size = New System.Drawing.Size(251, 530)
        Me.LayoutControlGroup4.TextVisible = False
        '
        'LayoutControlGroup5
        '
-        resources.ApplyResources(Me.LayoutControlGroup5, "LayoutControlGroup5")
        Me.LayoutControlGroup5.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem5})
        Me.LayoutControlGroup5.Location = New System.Drawing.Point(0, 0)
        Me.LayoutControlGroup5.Name = "LayoutControlGroup5"
-        Me.LayoutControlGroup5.Size = New System.Drawing.Size(251, 552)
+        Me.LayoutControlGroup5.Size = New System.Drawing.Size(251, 530)
+        resources.ApplyResources(Me.LayoutControlGroup5, "LayoutControlGroup5")
        '
        'LayoutControlItem5
        '
-        resources.ApplyResources(Me.LayoutControlItem5, "LayoutControlItem5")
        Me.LayoutControlItem5.Control = Me.GridDocuments
        Me.LayoutControlItem5.Location = New System.Drawing.Point(0, 0)
        Me.LayoutControlItem5.Name = "LayoutControlItem5"
-        Me.LayoutControlItem5.Size = New System.Drawing.Size(227, 507)
+        Me.LayoutControlItem5.Size = New System.Drawing.Size(227, 485)
        Me.LayoutControlItem5.TextSize = New System.Drawing.Size(0, 0)
        Me.LayoutControlItem5.TextVisible = False
        '
@ -396,44 +405,32 @@ Partial Public Class frmEnvelopeEditor
        '
        'SplitContainerControl2.Panel1
        '
-        resources.ApplyResources(Me.SplitContainerControl2.Panel1, "SplitContainerControl2.Panel1")
        Me.SplitContainerControl2.Panel1.Controls.Add(Me.PanelControl1)
+        resources.ApplyResources(Me.SplitContainerControl2.Panel1, "SplitContainerControl2.Panel1")
        '
        'SplitContainerControl2.Panel2
        '
-        resources.ApplyResources(Me.SplitContainerControl2.Panel2, "SplitContainerControl2.Panel2")
        Me.SplitContainerControl2.Panel2.Controls.Add(Me.PanelControl2)
+        resources.ApplyResources(Me.SplitContainerControl2.Panel2, "SplitContainerControl2.Panel2")
        Me.SplitContainerControl2.SplitterPosition = 253
        '
        'PanelControl1
        '
-        resources.ApplyResources(Me.PanelControl1, "PanelControl1")
        Me.PanelControl1.Controls.Add(Me.LayoutControl2)
+        resources.ApplyResources(Me.PanelControl1, "PanelControl1")
        Me.PanelControl1.Name = "PanelControl1"
        '
        'LayoutControl2
        '
-        resources.ApplyResources(Me.LayoutControl2, "LayoutControl2")
        Me.LayoutControl2.Controls.Add(Me.GridReceivers)
+        resources.ApplyResources(Me.LayoutControl2, "LayoutControl2")
        Me.LayoutControl2.Name = "LayoutControl2"
        Me.LayoutControl2.Root = Me.LayoutControlGroup2
        '
        'GridReceivers
        '
-        resources.ApplyResources(Me.GridReceivers, "GridReceivers")
        Me.GridReceivers.DataSource = Me.EnvelopeReceiverBindingSource
-        Me.GridReceivers.EmbeddedNavigator.AccessibleDescription = resources.GetString("GridReceivers.EmbeddedNavigator.AccessibleDescription")
-        Me.GridReceivers.EmbeddedNavigator.AccessibleName = resources.GetString("GridReceivers.EmbeddedNavigator.AccessibleName")
-        Me.GridReceivers.EmbeddedNavigator.AllowHtmlTextInToolTip = CType(resources.GetObject("GridReceivers.EmbeddedNavigator.AllowHtmlTextInToolTip"), DevExpress.Utils.DefaultBoolean)
-        Me.GridReceivers.EmbeddedNavigator.Anchor = CType(resources.GetObject("GridReceivers.EmbeddedNavigator.Anchor"), System.Windows.Forms.AnchorStyles)
-        Me.GridReceivers.EmbeddedNavigator.BackgroundImage = CType(resources.GetObject("GridReceivers.EmbeddedNavigator.BackgroundImage"), System.Drawing.Image)
-        Me.GridReceivers.EmbeddedNavigator.BackgroundImageLayout = CType(resources.GetObject("GridReceivers.EmbeddedNavigator.BackgroundImageLayout"), System.Windows.Forms.ImageLayout)
-        Me.GridReceivers.EmbeddedNavigator.ImeMode = CType(resources.GetObject("GridReceivers.EmbeddedNavigator.ImeMode"), System.Windows.Forms.ImeMode)
-        Me.GridReceivers.EmbeddedNavigator.MaximumSize = CType(resources.GetObject("GridReceivers.EmbeddedNavigator.MaximumSize"), System.Drawing.Size)
-        Me.GridReceivers.EmbeddedNavigator.TextLocation = CType(resources.GetObject("GridReceivers.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation)
-        Me.GridReceivers.EmbeddedNavigator.ToolTip = resources.GetString("GridReceivers.EmbeddedNavigator.ToolTip")
-        Me.GridReceivers.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("GridReceivers.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType)
-        Me.GridReceivers.EmbeddedNavigator.ToolTipTitle = resources.GetString("GridReceivers.EmbeddedNavigator.ToolTipTitle")
+        resources.ApplyResources(Me.GridReceivers, "GridReceivers")
        Me.GridReceivers.MainView = Me.ViewReceivers
        Me.GridReceivers.MenuManager = Me.RibbonControl1
        Me.GridReceivers.Name = "GridReceivers"
@ -448,7 +445,6 @@ Partial Public Class frmEnvelopeEditor
        'ViewReceivers
        '
        Me.ViewReceivers.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.Simple
-        resources.ApplyResources(Me.ViewReceivers, "ViewReceivers")
        Me.ViewReceivers.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colColor, Me.colEmail, Me.colName, Me.colAccessCode})
        Me.ViewReceivers.GridControl = Me.GridReceivers
        Me.ViewReceivers.Name = "ViewReceivers"
@ -473,7 +469,6 @@ Partial Public Class frmEnvelopeEditor
        Me.colColor.OptionsColumn.AllowShowHide = False
        Me.colColor.OptionsColumn.AllowSize = False
        Me.colColor.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.[False]
-        Me.colColor.Summary.AddRange(New DevExpress.XtraGrid.GridSummaryItem() {New DevExpress.XtraGrid.GridColumnSummaryItem()})
        '
        'RepositoryItemColorEdit1
        '
@ -483,11 +478,11 @@ Partial Public Class frmEnvelopeEditor
        '
        'colEmail
        '
-        resources.ApplyResources(Me.colEmail, "colEmail")
        Me.colEmail.ColumnEdit = Me.RepositoryItemComboBox1
        Me.colEmail.FieldName = "Email"
        Me.colEmail.Name = "colEmail"
        Me.colEmail.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.[False]
+        resources.ApplyResources(Me.colEmail, "colEmail")
        '
        'RepositoryItemComboBox1
        '
@ -501,14 +496,12 @@ Partial Public Class frmEnvelopeEditor
        Me.colName.FieldName = "Name"
        Me.colName.Name = "colName"
        Me.colName.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.[False]
-        Me.colName.Summary.AddRange(New DevExpress.XtraGrid.GridSummaryItem() {New DevExpress.XtraGrid.GridColumnSummaryItem()})
        '
        'colAccessCode
        '
        resources.ApplyResources(Me.colAccessCode, "colAccessCode")
        Me.colAccessCode.FieldName = "AccessCode"
        Me.colAccessCode.Name = "colAccessCode"
-        Me.colAccessCode.Summary.AddRange(New DevExpress.XtraGrid.GridSummaryItem() {New DevExpress.XtraGrid.GridColumnSummaryItem()})
        '
        'RepositoryItemEmailEdit
        '
@ -541,7 +534,6 @@ Partial Public Class frmEnvelopeEditor
        '
        'LayoutControlGroup2
        '
-        resources.ApplyResources(Me.LayoutControlGroup2, "LayoutControlGroup2")
        Me.LayoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
        Me.LayoutControlGroup2.GroupBordersVisible = False
        Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup3})
@ -552,15 +544,14 @@ Partial Public Class frmEnvelopeEditor
        '
        'LayoutControlGroup3
        '
-        resources.ApplyResources(Me.LayoutControlGroup3, "LayoutControlGroup3")
        Me.LayoutControlGroup3.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem2})
        Me.LayoutControlGroup3.Location = New System.Drawing.Point(0, 0)
        Me.LayoutControlGroup3.Name = "LayoutControlGroup3"
        Me.LayoutControlGroup3.Size = New System.Drawing.Size(899, 249)
+        resources.ApplyResources(Me.LayoutControlGroup3, "LayoutControlGroup3")
        '
        'LayoutControlItem2
        '
-        resources.ApplyResources(Me.LayoutControlItem2, "LayoutControlItem2")
        Me.LayoutControlItem2.Control = Me.GridReceivers
        Me.LayoutControlItem2.Location = New System.Drawing.Point(0, 0)
        Me.LayoutControlItem2.Name = "LayoutControlItem2"
@ -570,14 +561,14 @@ Partial Public Class frmEnvelopeEditor
        '
        'PanelControl2
        '
-        resources.ApplyResources(Me.PanelControl2, "PanelControl2")
        Me.PanelControl2.Controls.Add(Me.LayoutControl1)
+        resources.ApplyResources(Me.PanelControl2, "PanelControl2")
        Me.PanelControl2.Name = "PanelControl2"
        '
        'LayoutControl1
        '
-        resources.ApplyResources(Me.LayoutControl1, "LayoutControl1")
        Me.LayoutControl1.Controls.Add(Me.txtMessage)
+        resources.ApplyResources(Me.LayoutControl1, "LayoutControl1")
        Me.LayoutControl1.Name = "LayoutControl1"
        Me.LayoutControl1.Root = Me.Root
        '
@ -586,38 +577,39 @@ Partial Public Class frmEnvelopeEditor
        resources.ApplyResources(Me.txtMessage, "txtMessage")
        Me.txtMessage.MenuManager = Me.RibbonControl1
        Me.txtMessage.Name = "txtMessage"
+        Me.txtMessage.Properties.Appearance.Font = CType(resources.GetObject("txtMessage.Properties.Appearance.Font"), System.Drawing.Font)
+        Me.txtMessage.Properties.Appearance.Options.UseFont = True
        Me.txtMessage.StyleController = Me.LayoutControl1
        '
        'Root
        '
-        resources.ApplyResources(Me.Root, "Root")
        Me.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
        Me.Root.GroupBordersVisible = False
        Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup1})
        Me.Root.Name = "Root"
        Me.Root.Padding = New DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0)
-        Me.Root.Size = New System.Drawing.Size(899, 285)
+        Me.Root.Size = New System.Drawing.Size(899, 263)
        Me.Root.TextVisible = False
        '
        'LayoutControlGroup1
        '
-        resources.ApplyResources(Me.LayoutControlGroup1, "LayoutControlGroup1")
        Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem3})
        Me.LayoutControlGroup1.Location = New System.Drawing.Point(0, 0)
        Me.LayoutControlGroup1.Name = "LayoutControlGroup1"
        Me.LayoutControlGroup1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlGroup1.Size = New System.Drawing.Size(899, 285)
+        Me.LayoutControlGroup1.Size = New System.Drawing.Size(899, 263)
+        resources.ApplyResources(Me.LayoutControlGroup1, "LayoutControlGroup1")
        '
        'LayoutControlItem3
        '
-        resources.ApplyResources(Me.LayoutControlItem3, "LayoutControlItem3")
        Me.LayoutControlItem3.Control = Me.txtMessage
        Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 0)
        Me.LayoutControlItem3.Name = "LayoutControlItem3"
        Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem3.Size = New System.Drawing.Size(873, 238)
+        Me.LayoutControlItem3.Size = New System.Drawing.Size(873, 216)
+        resources.ApplyResources(Me.LayoutControlItem3, "LayoutControlItem3")
        Me.LayoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top
-        Me.LayoutControlItem3.TextSize = New System.Drawing.Size(45, 13)
+        Me.LayoutControlItem3.TextSize = New System.Drawing.Size(49, 13)
        '
        'FrmEditorBindingSource
        '
@ -633,15 +625,28 @@ Partial Public Class frmEnvelopeEditor
        Me.OpenFileDialog1.FileName = "OpenFileDialog1"
        resources.ApplyResources(Me.OpenFileDialog1, "OpenFileDialog1")
        '
+        'txtEnvelopeIdLabel
+        '
+        resources.ApplyResources(Me.txtEnvelopeIdLabel, "txtEnvelopeIdLabel")
+        Me.txtEnvelopeIdLabel.Id = 9
+        Me.txtEnvelopeIdLabel.ImageOptions.ImageIndex = CType(resources.GetObject("txtEnvelopeIdLabel.ImageOptions.ImageIndex"), Integer)
+        Me.txtEnvelopeIdLabel.ImageOptions.LargeImageIndex = CType(resources.GetObject("txtEnvelopeIdLabel.ImageOptions.LargeImageIndex"), Integer)
+        Me.txtEnvelopeIdLabel.ImageOptions.SvgImage = CType(resources.GetObject("txtEnvelopeIdLabel.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.txtEnvelopeIdLabel.Name = "txtEnvelopeIdLabel"
+        Me.txtEnvelopeIdLabel.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph
+        Me.txtEnvelopeIdLabel.Tag = "Envelope-ID: {0}"
+        '
        'frmEnvelopeEditor
        '
        resources.ApplyResources(Me, "$this")
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
        Me.Controls.Add(Me.SplitContainerControl1)
+        Me.Controls.Add(Me.RibbonStatusBar1)
        Me.Controls.Add(Me.RibbonControl1)
        Me.IconOptions.SvgImage = CType(resources.GetObject("frmEnvelopeEditor.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
        Me.Name = "frmEnvelopeEditor"
        Me.Ribbon = Me.RibbonControl1
+        Me.StatusBar = Me.RibbonStatusBar1
        CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).EndInit()
        Me.SplitContainerControl1.Panel1.ResumeLayout(False)
        CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).EndInit()
@ -747,6 +752,11 @@ Partial Public Class frmEnvelopeEditor
    Friend WithEvents RepositoryItemPictureEdit2 As Repository.RepositoryItemPictureEdit
    Friend WithEvents RepositoryItemComboBox1 As Repository.RepositoryItemComboBox
    Friend WithEvents colAccessCode As DevExpress.XtraGrid.Columns.GridColumn
+    Friend WithEvents RibbonStatusBar1 As DevExpress.XtraBars.Ribbon.RibbonStatusBar
+    Friend WithEvents txtCreatorEmailLabel As DevExpress.XtraBars.BarStaticItem
+    Friend WithEvents txtEnvelopeIdLabel As DevExpress.XtraBars.BarStaticItem
+    Friend WithEvents txtEnvelopeIdLabel2 As DevExpress.XtraBars.BarStaticItem
+    Friend WithEvents colPageCount As DevExpress.XtraGrid.Columns.TileViewColumn

 #End Region

--- a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx
+++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx
--- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
+++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
@ -83,6 +83,7 @@ Partial Public Class frmEnvelopeEditor
            For Each docItem As EnvelopeDocument In Documents
                If docItem.Thumbnail Is Nothing Then
                    docItem.Thumbnail = Controller.CreateThumbnail(docItem.Filepath)
+                    docItem.PageCount = Controller.GetPageCount(docItem.Filepath)
                End If
            Next

@ -103,6 +104,9 @@ Partial Public Class frmEnvelopeEditor

        SetAccessCodeColumnVisible()

+        txtEnvelopeIdLabel2.Caption = String.Format(txtEnvelopeIdLabel2.Tag.ToString, Controller.Envelope.Id)
+        txtCreatorEmailLabel.Caption = String.Format(txtCreatorEmailLabel.Tag.ToString, Controller.Envelope.User.Email)
+
        SetFormTitle(Controller.Envelope.Title)
    End Sub

--- a/EnvelopeGenerator.Form/frmEnvelopeMainData.vb
+++ b/EnvelopeGenerator.Form/frmEnvelopeMainData.vb
@ -59,7 +59,10 @@ Public Class frmEnvelopeMainData
            cmbEnvelopeType.EditValue = oType
        Else
            ' This will trigger loading values from the type
-            cmbEnvelopeType.SelectedIndex = Convert.ToInt32(Envelope.EnvelopeType) - 1
+            cmbEnvelopeType.EditValue = Envelope.EnvelopeType
+            ' cmbEnvelopeType.SelectedIndex = Convert.ToInt32(Envelope.EnvelopeType) - 1
+            ' cmbEnvelopeType.SelectedIndex = Envelope.Type.Id - 1
+            ' cmbEnvelopeType.SelectedItem = cmbEnvelopeType.Properties.Items.Cast(Of EnvelopeType).Where(Function(i) i.Id = Envelope.EnvelopeType.Id).SingleOrDefault()

            ' Now we can override these values with the values from envelope
            txtTitle.EditValue = Envelope.Title
@ -90,8 +93,11 @@ Public Class frmEnvelopeMainData
            Return
        End If

+        Dim oEnvelopeType = DirectCast(cmbEnvelopeType.EditValue, EnvelopeType)
+
        Envelope.Title = txtTitle.EditValue.ToString
-        Envelope.EnvelopeType = DirectCast(cmbEnvelopeType.EditValue, EnvelopeType).Id
+        Envelope.EnvelopeType = oEnvelopeType
+        Envelope.EnvelopeTypeId = oEnvelopeType.Id
        Envelope.CertificationType = cmbCertificationType.SelectedIndex + 1
        Envelope.Language = cmbLanguage.EditValue
        Envelope.UseAccessCode = chkUseAccessCode.EditValue
--- a/EnvelopeGenerator.Form/frmFieldEditor.vb
+++ b/EnvelopeGenerator.Form/frmFieldEditor.vb
@ -74,7 +74,12 @@ Partial Public Class frmFieldEditor
    End Sub

    Private Sub InitializeViewer()
-        DocumentViewer1.Init(LogConfig, GDPictureKey)
+        DocumentViewer1.Init(LogConfig, GDPictureKey, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings With {
+            .ShowFlipButton = False,
+            .ShowPrintButton = False,
+            .ShowRotateButton = False,
+            .ShowSettingButton = False
+        })
        DocumentViewer1.LoadFile(Document.Filepath)

        If DocumentViewer1.PdfViewer IsNot Nothing Then
--- a/EnvelopeGenerator.Form/frmMain.Designer.vb
+++ b/EnvelopeGenerator.Form/frmMain.Designer.vb
@ -258,7 +258,7 @@ Partial Class frmMain
        'colContractType
        '
        resources.ApplyResources(Me.colContractType, "colContractType")
-        Me.colContractType.FieldName = "ContractTypeTranslated"
+        Me.colContractType.FieldName = "EnvelopeTypeTitle"
        Me.colContractType.Name = "colContractType"
        '
        'colStatus
@ -536,7 +536,7 @@ Partial Class frmMain
        'GridColumn3
        '
        resources.ApplyResources(Me.GridColumn3, "GridColumn3")
-        Me.GridColumn3.FieldName = "ContractTypeTranslated"
+        Me.GridColumn3.FieldName = "EnvelopeTypeTitle"
        Me.GridColumn3.Name = "GridColumn3"
        '
        'GridColumn4