diff --git a/EnvelopeGenerator.Common/My Project/AssemblyInfo.vb b/EnvelopeGenerator.Common/My Project/AssemblyInfo.vb index 20792f4f..492c3838 100644 --- a/EnvelopeGenerator.Common/My Project/AssemblyInfo.vb +++ b/EnvelopeGenerator.Common/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' indem Sie "*" wie unten gezeigt eingeben: ' - - + + diff --git a/EnvelopeGenerator.Common/Strings/Envelope.en.resx b/EnvelopeGenerator.Common/Strings/Envelope.en.resx index c098c017..afe8ac66 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope.en.resx +++ b/EnvelopeGenerator.Common/Strings/Envelope.en.resx @@ -138,6 +138,9 @@ Envelope could not be sent! + + The invitations were successfully prepared for dispatch. + Error sending the envelope: diff --git a/EnvelopeGenerator.Common/Strings/Envelope.resx b/EnvelopeGenerator.Common/Strings/Envelope.resx index 67e947c8..1fbaa141 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope.resx +++ b/EnvelopeGenerator.Common/Strings/Envelope.resx @@ -138,6 +138,9 @@ Umschlag konnte nicht gesendet werden! + + Die Einladungen wurden erfolgreich zum Versand bereitgestellt. + Fehler beim Senden des Umschlags: diff --git a/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb b/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb index 48131381..bbc0356f 100644 --- a/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb +++ b/EnvelopeGenerator.Common/Strings/Envelope1.Designer.vb @@ -117,7 +117,7 @@ Namespace My.Resources Return ResourceManager.GetString("Envelope already sent", resourceCulture) End Get End Property - + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Umschlag konnte nicht gesendet werden! ähnelt. ''' @@ -126,7 +126,24 @@ Namespace My.Resources Return ResourceManager.GetString("Envelope could not be sent", resourceCulture) End Get End Property - + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Umschlag konnte nicht gesendet werden! ähnelt. + ''' + Public Shared ReadOnly Property Envelope_Invitations_Sent() As String + Get + Return ResourceManager.GetString("Envelope successfully sent", resourceCulture) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Zeichenfolge, die Die Einladungen wurden erfolgreich zum Versand bereitgestellt. ähnelt. + ''' + Public Shared ReadOnly Property Envelope_successfully_sent() As String + Get + Return ResourceManager.GetString("Envelope successfully sent", resourceCulture) + End Get + End Property + ''' ''' Sucht eine lokalisierte Zeichenfolge, die Fehler beim Senden des Umschlags: ähnelt. ''' diff --git a/EnvelopeGenerator.Common/Strings/Model.Designer.vb b/EnvelopeGenerator.Common/Strings/Model.Designer.vb index c2262429..cb486028 100644 --- a/EnvelopeGenerator.Common/Strings/Model.Designer.vb +++ b/EnvelopeGenerator.Common/Strings/Model.Designer.vb @@ -164,7 +164,7 @@ Namespace My.Resources End Property ''' - ''' Sucht eine lokalisierte Zeichenfolge, die Teil signiert ähnelt. + ''' Sucht eine lokalisierte Zeichenfolge, die Teil-Signiert ähnelt. ''' Friend Shared ReadOnly Property EnvelopePartlySigned() As String Get diff --git a/EnvelopeGenerator.Common/Strings/Model.resx b/EnvelopeGenerator.Common/Strings/Model.resx index f4f29ef5..1cb6d2ac 100644 --- a/EnvelopeGenerator.Common/Strings/Model.resx +++ b/EnvelopeGenerator.Common/Strings/Model.resx @@ -151,7 +151,7 @@ Gelöscht - Teil signiert + Teil-Signiert Umschlag in Queue diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx index 519992ca..110c88a0 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx @@ -247,7 +247,7 @@ - Umschlag senden + Einladungen versenden diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb index 30d53cae..e46cd77d 100644 --- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb +++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb @@ -302,6 +302,8 @@ Partial Public Class frmEnvelopeEditor If Controller.SendEnvelope() = False Then MsgBox(Resources.Envelope.Envelope_could_not_be_sent, MsgBoxStyle.Critical, Text) + Else + MsgBox(Resources.Envelope.Envelope_Invitations_Sent, MsgBoxStyle.Information, Text) End If End Sub diff --git a/EnvelopeGenerator.Form/frmMain.Designer.vb b/EnvelopeGenerator.Form/frmMain.Designer.vb index 2c5306b6..9e5f47e7 100644 --- a/EnvelopeGenerator.Form/frmMain.Designer.vb +++ b/EnvelopeGenerator.Form/frmMain.Designer.vb @@ -42,7 +42,7 @@ Partial Class frmMain Me.btnEditEnvelope = New DevExpress.XtraBars.BarButtonItem() Me.btnDeleteEnvelope = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() - Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() + Me.RibbonPageEnvelopeActions = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage() Me.GridCompleted = New DevExpress.XtraGrid.GridControl() @@ -223,17 +223,17 @@ Partial Class frmMain ' 'RibbonPage1 ' - Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1}) + Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageEnvelopeActions}) Me.RibbonPage1.Name = "RibbonPage1" resources.ApplyResources(Me.RibbonPage1, "RibbonPage1") ' - 'RibbonPageGroup1 + 'RibbonPageEnvelopeActions ' - Me.RibbonPageGroup1.ItemLinks.Add(Me.btnCreateEnvelope) - Me.RibbonPageGroup1.ItemLinks.Add(Me.btnEditEnvelope) - Me.RibbonPageGroup1.ItemLinks.Add(Me.btnDeleteEnvelope) - Me.RibbonPageGroup1.Name = "RibbonPageGroup1" - resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1") + Me.RibbonPageEnvelopeActions.ItemLinks.Add(Me.btnCreateEnvelope) + Me.RibbonPageEnvelopeActions.ItemLinks.Add(Me.btnEditEnvelope) + Me.RibbonPageEnvelopeActions.ItemLinks.Add(Me.btnDeleteEnvelope) + Me.RibbonPageEnvelopeActions.Name = "RibbonPageEnvelopeActions" + resources.ApplyResources(Me.RibbonPageEnvelopeActions, "RibbonPageEnvelopeActions") ' 'RibbonStatusBar ' @@ -324,7 +324,7 @@ Partial Class frmMain Friend WithEvents RibbonControl As DevExpress.XtraBars.Ribbon.RibbonControl Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage - Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup + Friend WithEvents RibbonPageEnvelopeActions As DevExpress.XtraBars.Ribbon.RibbonPageGroup Friend WithEvents RibbonStatusBar As DevExpress.XtraBars.Ribbon.RibbonStatusBar Friend WithEvents btnCreateEnvelope As DevExpress.XtraBars.BarButtonItem Friend WithEvents GridEnvelopes As DevExpress.XtraGrid.GridControl diff --git a/EnvelopeGenerator.Form/frmMain.resx b/EnvelopeGenerator.Form/frmMain.resx index a63495cd..0b737eca 100644 --- a/EnvelopeGenerator.Form/frmMain.resx +++ b/EnvelopeGenerator.Form/frmMain.resx @@ -318,7 +318,7 @@ 0, 0 - + Funktionen @@ -688,10 +688,10 @@ DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - RibbonPageGroup1 + + RibbonPageEnvelopeActions - + DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/EnvelopeGenerator.Form/frmMain.vb b/EnvelopeGenerator.Form/frmMain.vb index a5415680..1fd89a6f 100644 --- a/EnvelopeGenerator.Form/frmMain.vb +++ b/EnvelopeGenerator.Form/frmMain.vb @@ -160,4 +160,13 @@ Public Class frmMain ' Cleanup Methods TempFiles.CleanUp() End Sub + + Private Sub XtraTabControl1_SelectedPageChanged(sender As Object, e As DevExpress.XtraTab.TabPageChangedEventArgs) Handles XtraTabControl1.SelectedPageChanged + Select Case XtraTabControl1.SelectedTabPageIndex + Case 1 + RibbonPageEnvelopeActions.Enabled = False + Case 0 + RibbonPageEnvelopeActions.Enabled = True + End Select + End Sub End Class \ No newline at end of file