Subject raus

Button Handling

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
-            RibbonPageGroupAddSignature.Enabled = False
-        Else
+        If ViewDocuments.RowCount > 0 And
+            ViewReceivers.SelectedRowsCount > 0 Then
             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