diff --git a/EnvelopeGenerator.Common/Strings/Envelope.en.resx b/EnvelopeGenerator.Common/Strings/Envelope.en.resx index f2584a3b..f1604e1e 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope.en.resx +++ b/EnvelopeGenerator.Common/Strings/Envelope.en.resx @@ -120,6 +120,9 @@ Do you really want to delete this envelope? + + Do you really want to remove this document? + Do you want to delete the selected recipient? @@ -169,10 +172,10 @@ Missing Documents - Missing at least one Element + Missing at least one Element. - For Receiver {0} you need at least one Element + For Receiver {0} you need at least one Element. Missing Message diff --git a/EnvelopeGenerator.Common/Strings/Envelope.resx b/EnvelopeGenerator.Common/Strings/Envelope.resx index 7483b5e5..54b37892 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope.resx +++ b/EnvelopeGenerator.Common/Strings/Envelope.resx @@ -120,6 +120,9 @@ Wollen Sie diesen Umschlag wirklich löschen? + + Wollen Sie dieses Dokument wirklich entfernen? + Wollen Sie den ausgewählten Empfänger löschen? @@ -169,10 +172,10 @@ Fehlendes Dokument - Es muss mindestens ein Signaturfeld gesetzt werden + Es muss mindestens ein Signaturfeld gesetzt werden. - Für den Empfänger {0} gibt es noch kein Signaturfeld + Für den Empfänger {0} gibt es noch kein Signaturfeld. Fehlende Nachricht diff --git a/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb b/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb index 55915e47..6d65057c 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb +++ b/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb @@ -73,6 +73,15 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Wollen Sie dieses Dokument wirklich entfernen? ähnelt. + ''' + Public Shared ReadOnly Property Do_you_really_want_to_remove_this_document() As String + Get + Return ResourceManager.GetString("Do you really want to remove this document", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Wollen Sie den ausgewählten Empfänger löschen? ähnelt. ''' @@ -218,7 +227,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die Es muss mindestens ein Signaturfeld gesetzt werden ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die Es muss mindestens ein Signaturfeld gesetzt werden. ähnelt. ''' Public Shared ReadOnly Property Missing_Elements() As String Get @@ -227,7 +236,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die Für den Empfänger {0} gibt es noch kein Signaturfeld ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die Für den Empfänger {0} gibt es noch kein Signaturfeld. ähnelt. ''' Public Shared ReadOnly Property Missing_Elements_for_Receiver() As String Get diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb index 71e118f8..f402a629 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb @@ -52,8 +52,8 @@ Partial Public Class frmEnvelopeEditor Me.btnEditData = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup2 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() - Me.RibbonPageGroup3 = 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.LayoutControlGroup4 = New DevExpress.XtraLayout.LayoutControlGroup() @@ -282,7 +282,7 @@ Partial Public Class frmEnvelopeEditor ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroup2, Me.RibbonPageGroup3, Me.RibbonPageGroupAddSignature, Me.RibbonPageGroupReceiver}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroupDocuments, Me.RibbonPageGroupInvitation, Me.RibbonPageGroupAddSignature, Me.RibbonPageGroupReceiver}) Me.RibbonPage1.Name = "RibbonPage1" resources.ApplyResources(Me.RibbonPage1, "RibbonPage1") ' @@ -294,19 +294,19 @@ Partial Public Class frmEnvelopeEditor Me.RibbonPageGroup1.Name = "RibbonPageGroup1" resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1") ' - 'RibbonPageGroup2 + 'RibbonPageGroupDocuments ' - Me.RibbonPageGroup2.ItemLinks.Add(Me.btnNewFile) - Me.RibbonPageGroup2.ItemLinks.Add(Me.btnDeleteFile) - Me.RibbonPageGroup2.Name = "RibbonPageGroup2" - resources.ApplyResources(Me.RibbonPageGroup2, "RibbonPageGroup2") + Me.RibbonPageGroupDocuments.ItemLinks.Add(Me.btnNewFile) + Me.RibbonPageGroupDocuments.ItemLinks.Add(Me.btnDeleteFile) + Me.RibbonPageGroupDocuments.Name = "RibbonPageGroupDocuments" + resources.ApplyResources(Me.RibbonPageGroupDocuments, "RibbonPageGroupDocuments") ' - 'RibbonPageGroup3 + 'RibbonPageGroupInvitation ' - Me.RibbonPageGroup3.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far - Me.RibbonPageGroup3.ItemLinks.Add(Me.btnSendEnvelope) - Me.RibbonPageGroup3.Name = "RibbonPageGroup3" - resources.ApplyResources(Me.RibbonPageGroup3, "RibbonPageGroup3") + Me.RibbonPageGroupInvitation.Alignment = DevExpress.XtraBars.Ribbon.RibbonPageGroupAlignment.Far + Me.RibbonPageGroupInvitation.ItemLinks.Add(Me.btnSendEnvelope) + Me.RibbonPageGroupInvitation.Name = "RibbonPageGroupInvitation" + resources.ApplyResources(Me.RibbonPageGroupInvitation, "RibbonPageGroupInvitation") ' 'RibbonPageGroupAddSignature ' @@ -661,11 +661,11 @@ Partial Public Class frmEnvelopeEditor Friend WithEvents btnSave As DevExpress.XtraBars.BarButtonItem Friend WithEvents btnCancel As DevExpress.XtraBars.BarButtonItem Friend WithEvents btnNewFile As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroupDocuments As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents btnDeleteFile As DevExpress.XtraBars.BarButtonItem Friend WithEvents OpenFileDialog1 As OpenFileDialog Friend WithEvents btnSendEnvelope As DevExpress.XtraBars.BarButtonItem - Friend WithEvents RibbonPageGroup3 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageGroupInvitation As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents btnEditFields As DevExpress.XtraBars.BarButtonItem Friend WithEvents RibbonPageGroupAddSignature As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents PanelControl1 As PanelControl diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx index 19d5a20c..67c000af 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx @@ -347,10 +347,10 @@ Umschlag - + Dateien - + Prozess @@ -912,16 +912,16 @@ DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageGroup2 + + RibbonPageGroupDocuments - + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageGroup3 + + RibbonPageGroupInvitation - + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb index 1d03537b..32327cab 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb @@ -88,20 +88,14 @@ Partial Public Class frmEnvelopeEditor SetFormTitle(Controller.Envelope.Title) End Sub - Private Sub SetFormReadonly() - RibbonPageGroup1.Enabled = False - RibbonPageGroup2.Enabled = False - RibbonPageGroup3.Enabled = False - RibbonPageGroupReceiver.Enabled = False - btnEditFields.Enabled = False - txtSubject.Properties.ReadOnly = True - txtMessage.Properties.ReadOnly = True - ViewReceivers.OptionsBehavior.ReadOnly = True - ViewDocuments.OptionsBehavior.ReadOnly = True - End Sub - Private Sub btnDeleteFile_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles btnDeleteFile.ItemClick If ViewDocuments.GetSelectedRows().Count > 0 Then + + Dim oMessage = Resources.Envelope.Do_you_really_want_to_remove_this_document + If MsgBox(oMessage, MsgBoxStyle.Question Or MsgBoxStyle.YesNo, Text) = MsgBoxResult.No Then + Exit Sub + End If + Dim oDocument As EnvelopeDocument = DirectCast(ViewDocuments.GetFocusedRow(), EnvelopeDocument) If Controller.DeleteDocument(oDocument) Then Documents.Remove(oDocument) @@ -363,6 +357,7 @@ Partial Public Class frmEnvelopeEditor Private Sub frmEnvelopeEditor_Shown(sender As Object, e As EventArgs) Handles Me.Shown RibbonPageGroupAddSignature_Enabled() RibbonPageGroupReceiver_Enable() + SendEnvelopeButton_Enable() End Sub Private Sub RibbonPageGroupAddSignature_Enabled() If ViewDocuments.GetSelectedRows().Count = 0 Then @@ -381,13 +376,24 @@ Partial Public Class frmEnvelopeEditor End Sub Private Sub DocumentButtons_Enable() - If ViewDocuments.SelectedRowsCount = 0 Then + If ViewDocuments.RowCount = 0 Then btnNewFile.Enabled = True btnDeleteFile.Enabled = False Else btnNewFile.Enabled = False btnDeleteFile.Enabled = True End If + + RibbonPageGroupAddSignature_Enabled() + End Sub + + Private Sub SendEnvelopeButton_Enable() + If ViewDocuments.RowCount > 0 And + ViewReceivers.SelectedRowsCount > 0 Then + btnSendEnvelope.Enabled = True + Else + btnSendEnvelope.Enabled = False + End If End Sub Private Sub SetFormTitle(pTitle As String) @@ -407,10 +413,12 @@ Partial Public Class frmEnvelopeEditor Private Sub ViewReceivers_RowCountChanged(sender As Object, e As EventArgs) Handles ViewReceivers.RowCountChanged RibbonPageGroupReceiver_Enable() + SendEnvelopeButton_Enable() End Sub Private Sub ViewDocuments_RowCountChanged(sender As Object, e As EventArgs) Handles ViewDocuments.RowCountChanged DocumentButtons_Enable() + SendEnvelopeButton_Enable() End Sub End Class