MERGE
This commit is contained in:
commit
3d20a9b401
@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
|
|||||||
' indem Sie "*" wie unten gezeigt eingeben:
|
' indem Sie "*" wie unten gezeigt eingeben:
|
||||||
' <Assembly: AssemblyVersion("1.0.*")>
|
' <Assembly: AssemblyVersion("1.0.*")>
|
||||||
|
|
||||||
<Assembly: AssemblyVersion("1.3.4.0")>
|
<Assembly: AssemblyVersion("1.3.5.0")>
|
||||||
<Assembly: AssemblyFileVersion("1.3.4.0")>
|
<Assembly: AssemblyFileVersion("1.3.5.0")>
|
||||||
|
|||||||
@ -138,6 +138,9 @@
|
|||||||
<data name="Envelope could not be sent" xml:space="preserve">
|
<data name="Envelope could not be sent" xml:space="preserve">
|
||||||
<value>Envelope could not be sent!</value>
|
<value>Envelope could not be sent!</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="Envelope successfully sent" xml:space="preserve">
|
||||||
|
<value>The invitations were successfully prepared for dispatch.</value>
|
||||||
|
</data>
|
||||||
<data name="Error sending the envelope" xml:space="preserve">
|
<data name="Error sending the envelope" xml:space="preserve">
|
||||||
<value>Error sending the envelope:</value>
|
<value>Error sending the envelope:</value>
|
||||||
</data>
|
</data>
|
||||||
|
|||||||
@ -138,6 +138,9 @@
|
|||||||
<data name="Envelope could not be sent" xml:space="preserve">
|
<data name="Envelope could not be sent" xml:space="preserve">
|
||||||
<value>Umschlag konnte nicht gesendet werden!</value>
|
<value>Umschlag konnte nicht gesendet werden!</value>
|
||||||
</data>
|
</data>
|
||||||
|
<data name="Envelope successfully sent" xml:space="preserve">
|
||||||
|
<value>Die Einladungen wurden erfolgreich zum Versand bereitgestellt.</value>
|
||||||
|
</data>
|
||||||
<data name="Error sending the envelope" xml:space="preserve">
|
<data name="Error sending the envelope" xml:space="preserve">
|
||||||
<value>Fehler beim Senden des Umschlags:</value>
|
<value>Fehler beim Senden des Umschlags:</value>
|
||||||
</data>
|
</data>
|
||||||
|
|||||||
@ -117,7 +117,7 @@ Namespace My.Resources
|
|||||||
Return ResourceManager.GetString("Envelope already sent", resourceCulture)
|
Return ResourceManager.GetString("Envelope already sent", resourceCulture)
|
||||||
End Get
|
End Get
|
||||||
End Property
|
End Property
|
||||||
|
|
||||||
'''<summary>
|
'''<summary>
|
||||||
''' Sucht eine lokalisierte Zeichenfolge, die Umschlag konnte nicht gesendet werden! ähnelt.
|
''' Sucht eine lokalisierte Zeichenfolge, die Umschlag konnte nicht gesendet werden! ähnelt.
|
||||||
'''</summary>
|
'''</summary>
|
||||||
@ -126,7 +126,24 @@ Namespace My.Resources
|
|||||||
Return ResourceManager.GetString("Envelope could not be sent", resourceCulture)
|
Return ResourceManager.GetString("Envelope could not be sent", resourceCulture)
|
||||||
End Get
|
End Get
|
||||||
End Property
|
End Property
|
||||||
|
'''<summary>
|
||||||
|
''' Sucht eine lokalisierte Zeichenfolge, die Umschlag konnte nicht gesendet werden! ähnelt.
|
||||||
|
'''</summary>
|
||||||
|
Public Shared ReadOnly Property Envelope_Invitations_Sent() As String
|
||||||
|
Get
|
||||||
|
Return ResourceManager.GetString("Envelope successfully sent", resourceCulture)
|
||||||
|
End Get
|
||||||
|
End Property
|
||||||
|
|
||||||
|
'''<summary>
|
||||||
|
''' Sucht eine lokalisierte Zeichenfolge, die Die Einladungen wurden erfolgreich zum Versand bereitgestellt. ähnelt.
|
||||||
|
'''</summary>
|
||||||
|
Public Shared ReadOnly Property Envelope_successfully_sent() As String
|
||||||
|
Get
|
||||||
|
Return ResourceManager.GetString("Envelope successfully sent", resourceCulture)
|
||||||
|
End Get
|
||||||
|
End Property
|
||||||
|
|
||||||
'''<summary>
|
'''<summary>
|
||||||
''' Sucht eine lokalisierte Zeichenfolge, die Fehler beim Senden des Umschlags: ähnelt.
|
''' Sucht eine lokalisierte Zeichenfolge, die Fehler beim Senden des Umschlags: ähnelt.
|
||||||
'''</summary>
|
'''</summary>
|
||||||
|
|||||||
@ -164,7 +164,7 @@ Namespace My.Resources
|
|||||||
End Property
|
End Property
|
||||||
|
|
||||||
'''<summary>
|
'''<summary>
|
||||||
''' Sucht eine lokalisierte Zeichenfolge, die Teil signiert ähnelt.
|
''' Sucht eine lokalisierte Zeichenfolge, die Teil-Signiert ähnelt.
|
||||||
'''</summary>
|
'''</summary>
|
||||||
Friend Shared ReadOnly Property EnvelopePartlySigned() As String
|
Friend Shared ReadOnly Property EnvelopePartlySigned() As String
|
||||||
Get
|
Get
|
||||||
|
|||||||
@ -151,7 +151,7 @@
|
|||||||
<value>Gelöscht</value>
|
<value>Gelöscht</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="EnvelopePartlySigned" xml:space="preserve">
|
<data name="EnvelopePartlySigned" xml:space="preserve">
|
||||||
<value>Teil signiert</value>
|
<value>Teil-Signiert</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="EnvelopeQueued" xml:space="preserve">
|
<data name="EnvelopeQueued" xml:space="preserve">
|
||||||
<value>Umschlag in Queue</value>
|
<value>Umschlag in Queue</value>
|
||||||
|
|||||||
@ -247,7 +247,7 @@
|
|||||||
</value>
|
</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="btnSendEnvelope.Caption" xml:space="preserve">
|
<data name="btnSendEnvelope.Caption" xml:space="preserve">
|
||||||
<value>Umschlag senden</value>
|
<value>Einladungen versenden</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="btnSendEnvelope.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
<data name="btnSendEnvelope.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||||
<value>
|
<value>
|
||||||
|
|||||||
@ -302,6 +302,8 @@ Partial Public Class frmEnvelopeEditor
|
|||||||
|
|
||||||
If Controller.SendEnvelope() = False Then
|
If Controller.SendEnvelope() = False Then
|
||||||
MsgBox(Resources.Envelope.Envelope_could_not_be_sent, MsgBoxStyle.Critical, Text)
|
MsgBox(Resources.Envelope.Envelope_could_not_be_sent, MsgBoxStyle.Critical, Text)
|
||||||
|
Else
|
||||||
|
MsgBox(Resources.Envelope.Envelope_Invitations_Sent, MsgBoxStyle.Information, Text)
|
||||||
End If
|
End If
|
||||||
End Sub
|
End Sub
|
||||||
|
|
||||||
|
|||||||
18
EnvelopeGenerator.Form/frmMain.Designer.vb
generated
18
EnvelopeGenerator.Form/frmMain.Designer.vb
generated
@ -42,7 +42,7 @@ Partial Class frmMain
|
|||||||
Me.btnEditEnvelope = New DevExpress.XtraBars.BarButtonItem()
|
Me.btnEditEnvelope = New DevExpress.XtraBars.BarButtonItem()
|
||||||
Me.btnDeleteEnvelope = New DevExpress.XtraBars.BarButtonItem()
|
Me.btnDeleteEnvelope = New DevExpress.XtraBars.BarButtonItem()
|
||||||
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
|
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.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar()
|
||||||
Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage()
|
Me.XtraTabPage2 = New DevExpress.XtraTab.XtraTabPage()
|
||||||
Me.GridCompleted = New DevExpress.XtraGrid.GridControl()
|
Me.GridCompleted = New DevExpress.XtraGrid.GridControl()
|
||||||
@ -223,17 +223,17 @@ Partial Class frmMain
|
|||||||
'
|
'
|
||||||
'RibbonPage1
|
'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"
|
Me.RibbonPage1.Name = "RibbonPage1"
|
||||||
resources.ApplyResources(Me.RibbonPage1, "RibbonPage1")
|
resources.ApplyResources(Me.RibbonPage1, "RibbonPage1")
|
||||||
'
|
'
|
||||||
'RibbonPageGroup1
|
'RibbonPageEnvelopeActions
|
||||||
'
|
'
|
||||||
Me.RibbonPageGroup1.ItemLinks.Add(Me.btnCreateEnvelope)
|
Me.RibbonPageEnvelopeActions.ItemLinks.Add(Me.btnCreateEnvelope)
|
||||||
Me.RibbonPageGroup1.ItemLinks.Add(Me.btnEditEnvelope)
|
Me.RibbonPageEnvelopeActions.ItemLinks.Add(Me.btnEditEnvelope)
|
||||||
Me.RibbonPageGroup1.ItemLinks.Add(Me.btnDeleteEnvelope)
|
Me.RibbonPageEnvelopeActions.ItemLinks.Add(Me.btnDeleteEnvelope)
|
||||||
Me.RibbonPageGroup1.Name = "RibbonPageGroup1"
|
Me.RibbonPageEnvelopeActions.Name = "RibbonPageEnvelopeActions"
|
||||||
resources.ApplyResources(Me.RibbonPageGroup1, "RibbonPageGroup1")
|
resources.ApplyResources(Me.RibbonPageEnvelopeActions, "RibbonPageEnvelopeActions")
|
||||||
'
|
'
|
||||||
'RibbonStatusBar
|
'RibbonStatusBar
|
||||||
'
|
'
|
||||||
@ -324,7 +324,7 @@ Partial Class frmMain
|
|||||||
|
|
||||||
Friend WithEvents RibbonControl As DevExpress.XtraBars.Ribbon.RibbonControl
|
Friend WithEvents RibbonControl As DevExpress.XtraBars.Ribbon.RibbonControl
|
||||||
Friend WithEvents RibbonPage1 As DevExpress.XtraBars.Ribbon.RibbonPage
|
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 RibbonStatusBar As DevExpress.XtraBars.Ribbon.RibbonStatusBar
|
||||||
Friend WithEvents btnCreateEnvelope As DevExpress.XtraBars.BarButtonItem
|
Friend WithEvents btnCreateEnvelope As DevExpress.XtraBars.BarButtonItem
|
||||||
Friend WithEvents GridEnvelopes As DevExpress.XtraGrid.GridControl
|
Friend WithEvents GridEnvelopes As DevExpress.XtraGrid.GridControl
|
||||||
|
|||||||
@ -318,7 +318,7 @@
|
|||||||
<data name="RibbonControl.Location" type="System.Drawing.Point, System.Drawing">
|
<data name="RibbonControl.Location" type="System.Drawing.Point, System.Drawing">
|
||||||
<value>0, 0</value>
|
<value>0, 0</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="RibbonPageGroup1.Text" xml:space="preserve">
|
<data name="RibbonPageEnvelopeActions.Text" xml:space="preserve">
|
||||||
<value>Funktionen</value>
|
<value>Funktionen</value>
|
||||||
</data>
|
</data>
|
||||||
<data name="RibbonPage1.Text" xml:space="preserve">
|
<data name="RibbonPage1.Text" xml:space="preserve">
|
||||||
@ -688,10 +688,10 @@
|
|||||||
<data name=">>RibbonPage1.Type" xml:space="preserve">
|
<data name=">>RibbonPage1.Type" xml:space="preserve">
|
||||||
<value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
<value>DevExpress.XtraBars.Ribbon.RibbonPage, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>RibbonPageGroup1.Name" xml:space="preserve">
|
<data name=">>RibbonPageEnvelopeActions.Name" xml:space="preserve">
|
||||||
<value>RibbonPageGroup1</value>
|
<value>RibbonPageEnvelopeActions</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>RibbonPageGroup1.Type" xml:space="preserve">
|
<data name=">>RibbonPageEnvelopeActions.Type" xml:space="preserve">
|
||||||
<value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
<value>DevExpress.XtraBars.Ribbon.RibbonPageGroup, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
|
||||||
</data>
|
</data>
|
||||||
<data name=">>ViewCompleted.Name" xml:space="preserve">
|
<data name=">>ViewCompleted.Name" xml:space="preserve">
|
||||||
|
|||||||
@ -160,4 +160,13 @@ Public Class frmMain
|
|||||||
' Cleanup Methods
|
' Cleanup Methods
|
||||||
TempFiles.CleanUp()
|
TempFiles.CleanUp()
|
||||||
End Sub
|
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
|
End Class
|
||||||
Loading…
x
Reference in New Issue
Block a user