Subject raus

Button Handling

EnvelopeGenerator.Common/Entities/EmailData.vb

@@ -16,7 +16,7 @@ Public Class EmailData
 
     Public Sub New(pEnvelope As Envelope, pReceiver As EnvelopeReceiver)
         EmailAdress = pReceiver.Email
-        EmailSubject = pEnvelope.Subject
+        EmailSubject = String.Empty
         Message = pEnvelope.Message
         ReferenceID = pEnvelope.Id
         ReferenceString = pEnvelope.Uuid

EnvelopeGenerator.Common/Entities/Envelope.vb

@@ -6,7 +6,6 @@
     Public Property Status As Constants.EnvelopeStatus = Constants.EnvelopeStatus.EnvelopeCreated
     Public Property Uuid As String = Guid.NewGuid.ToString()
 
-    Public Property Subject As String = My.Resources.Envelope.You_received_a_document_to_sign_
     Public Property Message As String = My.Resources.Envelope.Please_read_and_sign_this_document
 
     Public Property AddedWhen As Date

EnvelopeGenerator.Common/Models/CertificateModel.vb

@@ -31,7 +31,7 @@ Public Class CertificateModel
             Dim oCommand As New SqlCommand(oSql)
             oCommand.Parameters.Add("ENVELOPE_ID", SqlDbType.Int).Value = pEnvelope.Id
             oCommand.Parameters.Add("ENVELOPE_UUID", SqlDbType.NVarChar).Value = pEnvelope.Uuid
-            oCommand.Parameters.Add("ENVELOPE_SUBJECT", SqlDbType.NVarChar).Value = pEnvelope.Subject
+            oCommand.Parameters.Add("ENVELOPE_SUBJECT", SqlDbType.NVarChar).Value = String.Empty
             oCommand.Parameters.Add("CREATOR_ID", SqlDbType.Int).Value = pEnvelope.UserId
             oCommand.Parameters.Add("CREATOR_NAME", SqlDbType.NVarChar).Value = pEnvelope.User.FullName
             oCommand.Parameters.Add("CREATOR_EMAIL", SqlDbType.NVarChar).Value = pEnvelope.User.Email

EnvelopeGenerator.Common/Models/EnvelopeModel.vb

@@ -27,7 +27,6 @@ Public Class EnvelopeModel
             .Title = pRow.ItemEx("TITLE", ""),
             .ContractType = ObjectEx.ToEnum(Of Constants.ContractType)(pRow.ItemEx("CONTRACT_TYPE", Constants.ContractType.Contract.ToString())),
             .Uuid = pRow.ItemEx("ENVELOPE_UUID", ""),
-            .Subject = pRow.ItemEx("SUBJECT", ""),
             .Message = pRow.ItemEx("MESSAGE", ""),
             .UserId = pRow.ItemEx("USER_ID", 0),
             .Status = ObjectEx.ToEnum(Of Constants.EnvelopeStatus)(pRow.ItemEx("STATUS", Constants.EnvelopeStatus.EnvelopeCreated.ToString())),
@@ -120,10 +119,9 @@ Public Class EnvelopeModel
 
     Public Function Insert(pEnvelope As Envelope) As Boolean
         Try
-            Dim oSql = "INSERT INTO [dbo].[TBSIG_ENVELOPE] (SUBJECT, MESSAGE, ENVELOPE_UUID, STATUS, USER_ID, TITLE, CONTRACT_TYPE) "
+            Dim oSql = "INSERT INTO [dbo].[TBSIG_ENVELOPE] (MESSAGE, ENVELOPE_UUID, STATUS, USER_ID, TITLE, CONTRACT_TYPE) "
-            oSql += " VALUES (@SUBJECT, @MESSAGE, @UUID, @STATUS, @USER_ID, @TITLE, @CONTRACT_TYPE)"
+            oSql += " VALUES (@MESSAGE, @UUID, @STATUS, @USER_ID, @TITLE, @CONTRACT_TYPE)"
             Dim oCommand As New SqlCommand(oSql)
-            oCommand.Parameters.Add("SUBJECT", SqlDbType.NVarChar).Value = String.Empty
             oCommand.Parameters.Add("MESSAGE", SqlDbType.NVarChar).Value = String.Empty
             oCommand.Parameters.Add("UUID", SqlDbType.NVarChar).Value = pEnvelope.Uuid
             oCommand.Parameters.Add("STATUS", SqlDbType.Int).Value = Constants.EnvelopeStatus.EnvelopeCreated
@@ -148,7 +146,6 @@ Public Class EnvelopeModel
     Public Function Update(pEnvelope As Envelope, pTransaction As SqlTransaction) As Boolean
         Try
             Dim oSql = "UPDATE [dbo].[TBSIG_ENVELOPE] SET "
-            oSql += " [SUBJECT] = @SUBJECT, "
             oSql += " [MESSAGE] = @MESSAGE, "
             oSql += " [STATUS] = @STATUS, "
             oSql += " [TITLE] = @TITLE, "
@@ -156,7 +153,6 @@ Public Class EnvelopeModel
             oSql += " [CHANGED_WHEN] = GETDATE() "
             oSql += " WHERE GUID = @ID AND USER_ID = @USER_ID"
             Dim oCommand As New SqlCommand(oSql)
-            oCommand.Parameters.Add("SUBJECT", SqlDbType.NVarChar).Value = pEnvelope.Subject
             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

EnvelopeGenerator.Common/Strings/Envelope.en.resx

@@ -183,9 +183,6 @@
   <data name="Missing Receivers" xml:space="preserve">
     <value>Missing Receivers</value>
   </data>
-  <data name="Missing Subject" xml:space="preserve">
-    <value>Missing Subject</value>
-  </data>
   <data name="Only one file is allowed" xml:space="preserve">
     <value>Only one file is allowed!</value>
   </data>

EnvelopeGenerator.Common/Strings/Envelope.resx

@@ -183,9 +183,6 @@
   <data name="Missing Receivers" xml:space="preserve">
     <value>Fehlende Empfänger</value>
   </data>
-  <data name="Missing Subject" xml:space="preserve">
-    <value>Fehlender Betreff</value>
-  </data>
   <data name="Only one file is allowed" xml:space="preserve">
     <value>Es ist nur eine Datei zulässig!</value>
   </data>

EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb

@@ -262,15 +262,6 @@ Namespace My.Resources
             End Get
         End Property
         
-        '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Fehlender Betreff ähnelt.
-        '''</summary>
-        Public Shared ReadOnly Property Missing_Subject() As String
-            Get
-                Return ResourceManager.GetString("Missing Subject", resourceCulture)
-            End Get
-        End Property
-        
         '''<summary>
         '''  Sucht eine lokalisierte Zeichenfolge, die Es ist nur eine Datei zulässig! ähnelt.
         '''</summary>

EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb

@@ -68,8 +68,9 @@ Partial Public Class frmEnvelopeEditor
         Me.colColor = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.RepositoryItemColorEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemColorEdit()
         Me.colEmail = New DevExpress.XtraGrid.Columns.GridColumn()
-        Me.RepositoryItemEmailEdit = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit()
+        Me.RepositoryItemComboBox1 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox()
         Me.colName = New DevExpress.XtraGrid.Columns.GridColumn()
+        Me.RepositoryItemEmailEdit = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit()
         Me.RepositoryItemPictureEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemPictureEdit()
         Me.RepositoryItemColorPickEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemColorPickEdit()
         Me.RepositoryItemImageEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemImageEdit()
@@ -79,16 +80,13 @@ Partial Public Class frmEnvelopeEditor
         Me.LayoutControlItem2 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.PanelControl2 = New DevExpress.XtraEditors.PanelControl()
         Me.LayoutControl1 = New DevExpress.XtraLayout.LayoutControl()
-        Me.txtSubject = New DevExpress.XtraEditors.TextEdit()
         Me.txtMessage = New DevExpress.XtraEditors.MemoEdit()
         Me.Root = New DevExpress.XtraLayout.LayoutControlGroup()
         Me.LayoutControlGroup1 = New DevExpress.XtraLayout.LayoutControlGroup()
-        Me.LayoutControlItem1 = New DevExpress.XtraLayout.LayoutControlItem()
         Me.LayoutControlItem3 = New DevExpress.XtraLayout.LayoutControlItem()
         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.RepositoryItemComboBox1 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox()
         CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainerControl1.Panel1.SuspendLayout()
@@ -117,6 +115,7 @@ Partial Public Class frmEnvelopeEditor
         CType(Me.EnvelopeReceiverBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.ViewReceivers, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RepositoryItemColorEdit1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RepositoryItemEmailEdit, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RepositoryItemPictureEdit1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RepositoryItemColorPickEdit1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -129,15 +128,12 @@ Partial Public Class frmEnvelopeEditor
         Me.PanelControl2.SuspendLayout()
         CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.LayoutControl1.SuspendLayout()
-        CType(Me.txtSubject.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.txtMessage.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.Root, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.FrmEditorBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.EnvelopeDocumentBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'SplashScreenManager1
@@ -436,18 +432,24 @@ Partial Public Class frmEnvelopeEditor
         Me.colEmail.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.[False]
         resources.ApplyResources(Me.colEmail, "colEmail")
         '
+        'RepositoryItemComboBox1
+        '
+        resources.ApplyResources(Me.RepositoryItemComboBox1, "RepositoryItemComboBox1")
+        Me.RepositoryItemComboBox1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("RepositoryItemComboBox1.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))})
+        Me.RepositoryItemComboBox1.Name = "RepositoryItemComboBox1"
+        '
+        'colName
+        '
+        resources.ApplyResources(Me.colName, "colName")
+        Me.colName.FieldName = "Name"
+        Me.colName.Name = "colName"
+        Me.colName.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.[False]
+        '
         'RepositoryItemEmailEdit
         '
         resources.ApplyResources(Me.RepositoryItemEmailEdit, "RepositoryItemEmailEdit")
         Me.RepositoryItemEmailEdit.Name = "RepositoryItemEmailEdit"
         '
-        'colName
-        '
-        Me.colName.FieldName = "Name"
-        Me.colName.Name = "colName"
-        Me.colName.OptionsColumn.AllowSort = DevExpress.Utils.DefaultBoolean.[False]
-        resources.ApplyResources(Me.colName, "colName")
-        '
         'RepositoryItemPictureEdit1
         '
         Me.RepositoryItemPictureEdit1.Name = "RepositoryItemPictureEdit1"
@@ -507,19 +509,11 @@ Partial Public Class frmEnvelopeEditor
         '
         'LayoutControl1
         '
-        Me.LayoutControl1.Controls.Add(Me.txtSubject)
         Me.LayoutControl1.Controls.Add(Me.txtMessage)
         resources.ApplyResources(Me.LayoutControl1, "LayoutControl1")
         Me.LayoutControl1.Name = "LayoutControl1"
         Me.LayoutControl1.Root = Me.Root
         '
-        'txtSubject
-        '
-        resources.ApplyResources(Me.txtSubject, "txtSubject")
-        Me.txtSubject.MenuManager = Me.RibbonControl1
-        Me.txtSubject.Name = "txtSubject"
-        Me.txtSubject.StyleController = Me.LayoutControl1
-        '
         'txtMessage
         '
         resources.ApplyResources(Me.txtMessage, "txtMessage")
@@ -539,31 +533,20 @@ Partial Public Class frmEnvelopeEditor
         '
         'LayoutControlGroup1
         '
-        Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem3})
+        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)
         resources.ApplyResources(Me.LayoutControlGroup1, "LayoutControlGroup1")
         '
-        'LayoutControlItem1
-        '
-        Me.LayoutControlItem1.Control = Me.txtSubject
-        Me.LayoutControlItem1.Location = New System.Drawing.Point(0, 0)
-        Me.LayoutControlItem1.Name = "LayoutControlItem1"
-        Me.LayoutControlItem1.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem1.Size = New System.Drawing.Size(873, 56)
-        resources.ApplyResources(Me.LayoutControlItem1, "LayoutControlItem1")
-        Me.LayoutControlItem1.TextLocation = DevExpress.Utils.Locations.Top
-        Me.LayoutControlItem1.TextSize = New System.Drawing.Size(45, 13)
-        '
         'LayoutControlItem3
         '
         Me.LayoutControlItem3.Control = Me.txtMessage
-        Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 56)
+        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, 182)
+        Me.LayoutControlItem3.Size = New System.Drawing.Size(873, 238)
         resources.ApplyResources(Me.LayoutControlItem3, "LayoutControlItem3")
         Me.LayoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top
         Me.LayoutControlItem3.TextSize = New System.Drawing.Size(45, 13)
@@ -582,12 +565,6 @@ Partial Public Class frmEnvelopeEditor
         Me.OpenFileDialog1.FileName = "OpenFileDialog1"
         resources.ApplyResources(Me.OpenFileDialog1, "OpenFileDialog1")
         '
-        'RepositoryItemComboBox1
-        '
-        resources.ApplyResources(Me.RepositoryItemComboBox1, "RepositoryItemComboBox1")
-        Me.RepositoryItemComboBox1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(CType(resources.GetObject("RepositoryItemComboBox1.Buttons"), DevExpress.XtraEditors.Controls.ButtonPredefines))})
-        Me.RepositoryItemComboBox1.Name = "RepositoryItemComboBox1"
-        '
         'frmEnvelopeEditor
         '
         resources.ApplyResources(Me, "$this")
@@ -625,6 +602,7 @@ Partial Public Class frmEnvelopeEditor
         CType(Me.EnvelopeReceiverBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.ViewReceivers, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.RepositoryItemColorEdit1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.RepositoryItemEmailEdit, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.RepositoryItemPictureEdit1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.RepositoryItemColorPickEdit1, System.ComponentModel.ISupportInitialize).EndInit()
@@ -637,15 +615,12 @@ Partial Public Class frmEnvelopeEditor
         Me.PanelControl2.ResumeLayout(False)
         CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.LayoutControl1.ResumeLayout(False)
-        CType(Me.txtSubject.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.txtMessage.Properties, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.Root, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlGroup1, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.LayoutControlItem1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.LayoutControlItem3, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.FrmEditorBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.EnvelopeDocumentBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -662,9 +637,7 @@ Partial Public Class frmEnvelopeEditor
     Friend WithEvents Root As LayoutControlGroup
     Friend WithEvents GridReceivers As DevExpress.XtraGrid.GridControl
     Friend WithEvents ViewReceivers As DevExpress.XtraGrid.Views.Grid.GridView
-    Friend WithEvents txtSubject As TextEdit
     Friend WithEvents txtMessage As MemoEdit
-    Friend WithEvents LayoutControlItem1 As LayoutControlItem
     Friend WithEvents LayoutControlItem3 As LayoutControlItem
     Friend WithEvents colFilename As DevExpress.XtraGrid.Columns.TileViewColumn
     Friend WithEvents btnSave As DevExpress.XtraBars.BarButtonItem

EnvelopeGenerator.Form/frmEnvelopeEditor.resx

@@ -504,6 +504,9 @@
   <data name="colEmail.Width" type="System.Int32, mscorlib">
     <value>362</value>
   </data>
+  <data name="colName.Caption" xml:space="preserve">
+    <value>Anrede Email</value>
+  </data>
   <data name="colName.Visible" type="System.Boolean, mscorlib">
     <value>True</value>
   </data>
@@ -621,32 +624,11 @@
   <data name="&gt;&gt;SplitContainerControl2.Panel1.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
-  <data name="txtSubject.Location" type="System.Drawing.Point, System.Drawing">
+  <data name="txtMessage.Location" type="System.Drawing.Point, System.Drawing">
     <value>23, 60</value>
   </data>
-  <data name="txtSubject.Size" type="System.Drawing.Size, System.Drawing">
-    <value>853, 20</value>
-  </data>
-  <data name="txtSubject.TabIndex" type="System.Int32, mscorlib">
-    <value>0</value>
-  </data>
-  <data name="&gt;&gt;txtSubject.Name" xml:space="preserve">
-    <value>txtSubject</value>
-  </data>
-  <data name="&gt;&gt;txtSubject.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="&gt;&gt;txtSubject.Parent" xml:space="preserve">
-    <value>LayoutControl1</value>
-  </data>
-  <data name="&gt;&gt;txtSubject.ZOrder" xml:space="preserve">
-    <value>4</value>
-  </data>
-  <data name="txtMessage.Location" type="System.Drawing.Point, System.Drawing">
-    <value>23, 116</value>
-  </data>
   <data name="txtMessage.Size" type="System.Drawing.Size, System.Drawing">
-    <value>853, 146</value>
+    <value>853, 202</value>
   </data>
   <data name="txtMessage.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>
@@ -661,7 +643,7 @@
     <value>LayoutControl1</value>
   </data>
   <data name="&gt;&gt;txtMessage.ZOrder" xml:space="preserve">
-    <value>5</value>
+    <value>4</value>
   </data>
   <data name="LayoutControl1.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
     <value>Fill</value>
@@ -669,9 +651,6 @@
   <data name="LayoutControl1.Location" type="System.Drawing.Point, System.Drawing">
     <value>2, 2</value>
   </data>
-  <data name="LayoutControlItem1.Text" xml:space="preserve">
-    <value>Betreff</value>
-  </data>
   <data name="LayoutControlItem3.Text" xml:space="preserve">
     <value>Nachricht</value>
   </data>
@@ -990,11 +969,11 @@
   <data name="&gt;&gt;colEmail.Type" xml:space="preserve">
     <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;RepositoryItemEmailEdit.Name" xml:space="preserve">
+  <data name="&gt;&gt;RepositoryItemComboBox1.Name" xml:space="preserve">
-    <value>RepositoryItemEmailEdit</value>
+    <value>RepositoryItemComboBox1</value>
   </data>
-  <data name="&gt;&gt;RepositoryItemEmailEdit.Type" xml:space="preserve">
+  <data name="&gt;&gt;RepositoryItemComboBox1.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+    <value>DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="&gt;&gt;colName.Name" xml:space="preserve">
     <value>colName</value>
@@ -1002,6 +981,12 @@
   <data name="&gt;&gt;colName.Type" xml:space="preserve">
     <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;RepositoryItemEmailEdit.Name" xml:space="preserve">
+    <value>RepositoryItemEmailEdit</value>
+  </data>
+  <data name="&gt;&gt;RepositoryItemEmailEdit.Type" xml:space="preserve">
+    <value>DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;RepositoryItemPictureEdit1.Name" xml:space="preserve">
     <value>RepositoryItemPictureEdit1</value>
   </data>
@@ -1056,12 +1041,6 @@
   <data name="&gt;&gt;LayoutControlGroup1.Type" xml:space="preserve">
     <value>DevExpress.XtraLayout.LayoutControlGroup, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;LayoutControlItem1.Name" xml:space="preserve">
-    <value>LayoutControlItem1</value>
-  </data>
-  <data name="&gt;&gt;LayoutControlItem1.Type" xml:space="preserve">
-    <value>DevExpress.XtraLayout.LayoutControlItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="&gt;&gt;LayoutControlItem3.Name" xml:space="preserve">
     <value>LayoutControlItem3</value>
   </data>
@@ -1086,12 +1065,6 @@
   <data name="&gt;&gt;OpenFileDialog1.Type" xml:space="preserve">
     <value>System.Windows.Forms.OpenFileDialog, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </data>
-  <data name="&gt;&gt;RepositoryItemComboBox1.Name" xml:space="preserve">
-    <value>RepositoryItemComboBox1</value>
-  </data>
-  <data name="&gt;&gt;RepositoryItemComboBox1.Type" xml:space="preserve">
-    <value>DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>frmEnvelopeEditor</value>
   </data>

EnvelopeGenerator.Form/frmEnvelopeEditor.vb

@@ -57,7 +57,6 @@ Partial Public Class frmEnvelopeEditor
             If oResult = DialogResult.OK Then
                 Controller.Envelope.Title = oDataForm.EnvelopeTitle
                 Controller.Envelope.ContractType = oDataForm.EnvelopeContractType
-                Controller.Envelope.Subject += " " + oDataForm.EnvelopeTitle
             Else
                 Controller.DeleteEnvelopeFromDisk(Controller.Envelope)
                 Me.Close()
@@ -80,7 +79,6 @@ Partial Public Class frmEnvelopeEditor
         End If
 
         txtMessage.EditValue = Controller.Envelope.Message
-        txtSubject.EditValue = Controller.Envelope.Subject
 
         GridDocuments.DataSource = Documents
         GridReceivers.DataSource = Receivers
@@ -174,15 +172,10 @@ Partial Public Class frmEnvelopeEditor
     End Function
 
     Private Function ValidateEnvelope() As List(Of String)
-        Dim oSubject = GetEditValueFromTextControl(txtSubject)
         Dim oMessage = GetEditValueFromTextControl(txtMessage)
 
         Dim oErrors As New List(Of String)
 
-        If String.IsNullOrWhiteSpace(oSubject) Then
-            oErrors.Add(Resources.Envelope.Missing_Subject)
-        End If
-
         If String.IsNullOrWhiteSpace(oMessage) Then
             oErrors.Add(Resources.Envelope.Missing_Message)
         End If
@@ -205,7 +198,6 @@ Partial Public Class frmEnvelopeEditor
     End Function
 
     Private Function SaveEnvelope(pWithValidation As Boolean) As Boolean
-        Dim oSubject = GetEditValueFromTextControl(txtSubject)
         Dim oMessage = GetEditValueFromTextControl(txtMessage)
 
         ' Ensure all receivers are saved
@@ -220,7 +212,6 @@ Partial Public Class frmEnvelopeEditor
         End If
 
         Dim oEnvelope = Controller.Envelope
-        oEnvelope.Subject = oSubject
         oEnvelope.Message = oMessage
         oEnvelope.Documents = Documents.ToList
 
@@ -364,10 +355,11 @@ Partial Public Class frmEnvelopeEditor
         SendEnvelopeButton_Enable()
     End Sub
     Private Sub RibbonPageGroupAddSignature_Enabled()
-        If ViewDocuments.GetSelectedRows().Count = 0 Then
+        If ViewDocuments.RowCount > 0 And
-            RibbonPageGroupAddSignature.Enabled = False
+            ViewReceivers.SelectedRowsCount > 0 Then
-        Else
             RibbonPageGroupAddSignature.Enabled = True
+        Else
+            RibbonPageGroupAddSignature.Enabled = False
         End If
     End Sub
 
@@ -387,8 +379,6 @@ Partial Public Class frmEnvelopeEditor
             btnNewFile.Enabled = False
             btnDeleteFile.Enabled = True
         End If
-
-        RibbonPageGroupAddSignature_Enabled()
     End Sub
 
     Private Sub SendEnvelopeButton_Enable()
@@ -418,11 +408,13 @@ Partial Public Class frmEnvelopeEditor
     Private Sub ViewReceivers_RowCountChanged(sender As Object, e As EventArgs) Handles ViewReceivers.RowCountChanged
         RibbonPageGroupReceiver_Enable()
         SendEnvelopeButton_Enable()
+        RibbonPageGroupAddSignature_Enabled()
     End Sub
 
     Private Sub ViewDocuments_RowCountChanged(sender As Object, e As EventArgs) Handles ViewDocuments.RowCountChanged
         DocumentButtons_Enable()
         SendEnvelopeButton_Enable()
+        RibbonPageGroupAddSignature_Enabled()
     End Sub
 
 End Class

EnvelopeGenerator.Form/frmMain.Designer.vb

@@ -45,7 +45,6 @@ Partial Class frmMain
         Me.colContractType = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colStatus = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colTitle = New DevExpress.XtraGrid.Columns.GridColumn()
-        Me.colSubject = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.colAddedWhen = New DevExpress.XtraGrid.Columns.GridColumn()
         Me.RibbonControl = New DevExpress.XtraBars.Ribbon.RibbonControl()
         Me.btnCreateEnvelope = New DevExpress.XtraBars.BarButtonItem()
@@ -227,7 +226,7 @@ Partial Class frmMain
         '
         'ViewEnvelopes
         '
-        Me.ViewEnvelopes.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colEnvelopeId, Me.colContractType, Me.colStatus, Me.colTitle, Me.colSubject, Me.colAddedWhen})
+        Me.ViewEnvelopes.Columns.AddRange(New DevExpress.XtraGrid.Columns.GridColumn() {Me.colEnvelopeId, Me.colContractType, Me.colStatus, Me.colTitle, Me.colAddedWhen})
         Me.ViewEnvelopes.GridControl = Me.GridEnvelopes
         Me.ViewEnvelopes.Name = "ViewEnvelopes"
         Me.ViewEnvelopes.OptionsBehavior.Editable = False
@@ -257,12 +256,6 @@ Partial Class frmMain
         Me.colTitle.FieldName = "Title"
         Me.colTitle.Name = "colTitle"
         '
-        'colSubject
-        '
-        resources.ApplyResources(Me.colSubject, "colSubject")
-        Me.colSubject.FieldName = "Subject"
-        Me.colSubject.Name = "colSubject"
-        '
         'colAddedWhen
         '
         resources.ApplyResources(Me.colAddedWhen, "colAddedWhen")
@@ -542,7 +535,6 @@ Partial Class frmMain
     Friend WithEvents btnEditEnvelope As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents btnDeleteEnvelope As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents colTitle As DevExpress.XtraGrid.Columns.GridColumn
-    Friend WithEvents colSubject As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents colAddedWhen As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents colContractType As DevExpress.XtraGrid.Columns.GridColumn
     Friend WithEvents colStatus As DevExpress.XtraGrid.Columns.GridColumn

EnvelopeGenerator.Form/frmMain.resx

@@ -258,18 +258,6 @@
   <data name="colTitle.Width" type="System.Int32, mscorlib">
     <value>352</value>
   </data>
-  <data name="colSubject.Caption" xml:space="preserve">
-    <value>Betreff</value>
-  </data>
-  <data name="colSubject.Visible" type="System.Boolean, mscorlib">
-    <value>True</value>
-  </data>
-  <data name="colSubject.VisibleIndex" type="System.Int32, mscorlib">
-    <value>3</value>
-  </data>
-  <data name="colSubject.Width" type="System.Int32, mscorlib">
-    <value>352</value>
-  </data>
   <data name="colAddedWhen.Caption" xml:space="preserve">
     <value>Erstellt am</value>
   </data>
@@ -277,7 +265,7 @@
     <value>True</value>
   </data>
   <data name="colAddedWhen.VisibleIndex" type="System.Int32, mscorlib">
-    <value>4</value>
+    <value>3</value>
   </data>
   <data name="colAddedWhen.Width" type="System.Int32, mscorlib">
     <value>118</value>
@@ -898,12 +886,6 @@
   <data name="&gt;&gt;colTitle.Type" xml:space="preserve">
     <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;colSubject.Name" xml:space="preserve">
-    <value>colSubject</value>
-  </data>
-  <data name="&gt;&gt;colSubject.Type" xml:space="preserve">
-    <value>DevExpress.XtraGrid.Columns.GridColumn, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="&gt;&gt;colAddedWhen.Name" xml:space="preserve">
     <value>colAddedWhen</value>
   </data>

EnvelopeGenerator.Form/frmMain.vb

@@ -192,9 +192,13 @@ Public Class frmMain
             Case 1
                 btnEditEnvelope.Enabled = False
                 btnDeleteEnvelope.Enabled = False
+                btnContactReceiver.Enabled = False
+                btnShowDocument.Enabled = False
             Case 0
                 btnEditEnvelope.Enabled = True
                 btnDeleteEnvelope.Enabled = True
+                btnContactReceiver.Enabled = True
+                btnShowDocument.Enabled = True
         End Select
     End Sub