diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb
index f56bdaa5..7adf8935 100644
--- a/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb
+++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.Designer.vb
@@ -56,6 +56,7 @@ Partial Public Class frmEnvelopeEditor
Me.txtCreatorEmailLabel = New DevExpress.XtraBars.BarStaticItem()
Me.txtEnvelopeIdLabel2 = New DevExpress.XtraBars.BarStaticItem()
Me.BarButtonItem1 = New DevExpress.XtraBars.BarButtonItem()
+ Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem()
Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage()
Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
Me.RibbonPageGroupDocuments = New DevExpress.XtraBars.Ribbon.RibbonPageGroup()
@@ -238,9 +239,9 @@ Partial Public Class frmEnvelopeEditor
'RibbonControl1
'
Me.RibbonControl1.ExpandCollapseItem.Id = 0
- Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.btnSave, Me.btnCancel, Me.btnNewFile, Me.btnDeleteFile, Me.btnSendEnvelope, Me.btnEditFields, Me.btnDeleteReceiver, Me.btnEditData, Me.txtCreatorEmailLabel, Me.txtEnvelopeIdLabel2, Me.BarButtonItem1})
+ Me.RibbonControl1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.RibbonControl1.ExpandCollapseItem, Me.RibbonControl1.SearchEditItem, Me.btnSave, Me.btnCancel, Me.btnNewFile, Me.btnDeleteFile, Me.btnSendEnvelope, Me.btnEditFields, Me.btnDeleteReceiver, Me.btnEditData, Me.txtCreatorEmailLabel, Me.txtEnvelopeIdLabel2, Me.BarButtonItem1, Me.BarStaticItem1})
resources.ApplyResources(Me.RibbonControl1, "RibbonControl1")
- Me.RibbonControl1.MaxItemId = 13
+ Me.RibbonControl1.MaxItemId = 14
Me.RibbonControl1.Name = "RibbonControl1"
Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
Me.RibbonControl1.ShowApplicationButton = DevExpress.Utils.DefaultBoolean.[False]
@@ -329,6 +330,11 @@ Partial Public Class frmEnvelopeEditor
Me.BarButtonItem1.Id = 12
Me.BarButtonItem1.Name = "BarButtonItem1"
'
+ 'BarStaticItem1
+ '
+ Me.BarStaticItem1.Id = 13
+ Me.BarStaticItem1.Name = "BarStaticItem1"
+ '
'RibbonPage1
'
Me.RibbonPage1.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup1, Me.RibbonPageGroupDocuments, Me.RibbonPageGroupInvitation, Me.RibbonPageGroupAddSignature, Me.RibbonPageGroupReceiver})
@@ -373,6 +379,7 @@ Partial Public Class frmEnvelopeEditor
'
Me.RibbonStatusBar1.ItemLinks.Add(Me.txtCreatorEmailLabel)
Me.RibbonStatusBar1.ItemLinks.Add(Me.txtEnvelopeIdLabel2)
+ Me.RibbonStatusBar1.ItemLinks.Add(Me.BarStaticItem1)
resources.ApplyResources(Me.RibbonStatusBar1, "RibbonStatusBar1")
Me.RibbonStatusBar1.Name = "RibbonStatusBar1"
Me.RibbonStatusBar1.Ribbon = Me.RibbonControl1
@@ -767,6 +774,7 @@ Partial Public Class frmEnvelopeEditor
Friend WithEvents txtEnvelopeIdLabel2 As DevExpress.XtraBars.BarStaticItem
Friend WithEvents colPageCount As DevExpress.XtraGrid.Columns.TileViewColumn
Friend WithEvents BarButtonItem1 As DevExpress.XtraBars.BarButtonItem
+ Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem
#End Region
diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx
index 970894a5..f83640e4 100644
--- a/EnvelopeGenerator.Form/frmEnvelopeEditor.resx
+++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.resx
@@ -1043,6 +1043,12 @@
DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
+ BarStaticItem1
+
+
+ DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+
RibbonPage1
diff --git a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
index 2b83f201..67bb7898 100644
--- a/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
+++ b/EnvelopeGenerator.Form/frmEnvelopeEditor.vb
@@ -330,27 +330,29 @@ Partial Public Class frmEnvelopeEditor
MsgBox(Resources.Envelope.Envelope_could_not_be_sent, MsgBoxStyle.Critical, Text)
Else
If MsgBox(Resources.Envelope.Envelope_Invitations_Sent, MsgBoxStyle.Information Or MsgBoxStyle.OkOnly, Text) = MsgBoxResult.Ok Then
- If DOCUMENT_PATH_MOVE_AFTSEND <> String.Empty Then
- If My.Settings.NetUse_PW <> String.Empty And My.Settings.NetUse_Usr <> String.Empty Then
- Dim oDecrypted = Decryption.Decrypt(My.Settings.NetUse_PW)
- For Each odoc In Controller.Envelope.Documents 'envelope ist leer!
- Directory2Delete = ""
- CopyFileWithNetUse(odoc.Filepath, DOCUMENT_PATH_MOVE_AFTSEND, My.Settings.NetUse_Usr, My.Settings.NetUse_PW)
- If Directory2Delete <> String.Empty Then
- Logger.Debug("Now Deleting SourcePath: {0} ...", Directory2Delete)
- Try
- System.IO.Directory.Delete(Directory2Delete, True)
- Logger.Debug("Successfully deleted Sourcepath!")
- Catch ex As Exception
- Logger.Warn("Unexpected Error while deleting SourcePath {0}", Directory2Delete)
- Logger.Warn("ErrorMessage: {0}", ex.Message)
- End Try
+ 'If DOCUMENT_PATH_MOVE_AFTSEND <> String.Empty Then
+ ' If My.Settings.NetUse_PW <> String.Empty And My.Settings.NetUse_Usr <> String.Empty Then
+ ' Dim oDecrypted = Decryption.Decrypt(My.Settings.NetUse_PW)
+ ' For Each odoc In Controller.Envelope.Documents 'envelope ist leer!
+ ' Directory2Delete = ""
+ ' If CopyFileWithNetUse(odoc.Filepath, DOCUMENT_PATH_MOVE_AFTSEND, My.Settings.NetUse_Usr, My.Settings.NetUse_PW) = False Then
+ ' BarStaticItem1.Caption = "ERROR while copying files to DMZ! Check Your log!"
+ ' End If
+ ' If Directory2Delete <> String.Empty Then
+ ' Logger.Debug("Now Deleting SourcePath: {0} ...", Directory2Delete)
+ ' Try
+ ' System.IO.Directory.Delete(Directory2Delete, True)
+ ' Logger.Debug("Successfully deleted Sourcepath!")
+ ' Catch ex As Exception
+ ' Logger.Warn("Unexpected Error while deleting SourcePath {0}", Directory2Delete)
+ ' Logger.Warn("ErrorMessage: {0}", ex.Message)
+ ' End Try
- End If
- Next
- End If
+ ' End If
+ ' Next
+ ' End If
- End If
+ 'End If
Me.Close()
End If
End If
@@ -397,7 +399,7 @@ Partial Public Class frmEnvelopeEditor
Else
Logger.Warn("Error while connecting to network-path: " & pDestinationPath)
- MsgBox("Error while connecting to network: " & pDestinationPath, MsgBoxStyle.Critical, "Unexpected error in CopyFileWithNetUse")
+ 'MsgBox("Error while connecting to network: " & pDestinationPath, MsgBoxStyle.Critical, "Unexpected error in CopyFileWithNetUse")
Return False
End If
End Using