From fb069d0ee263f01de2ae0168ad287c71b82c735e Mon Sep 17 00:00:00 2001 From: Developer01 Date: Thu, 27 Mar 2025 17:16:50 +0100 Subject: [PATCH] MS --- .../EnvelopeGenerator.Form.vbproj | 5 +-- EnvelopeGenerator.Form/frmFieldEditor.vb | 43 +++++++++++-------- EnvelopeGenerator.Form/packages.config | 1 + .../EnvelopeGenerator.Test.vbproj | 31 +++++++------ EnvelopeGenerator.Test/README.txt | 5 --- EnvelopeGenerator.Test/app.config | 12 +++++- EnvelopeGenerator.Test/packages.config | 10 +++-- 7 files changed, 64 insertions(+), 43 deletions(-) delete mode 100644 EnvelopeGenerator.Test/README.txt diff --git a/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj b/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj index fdfe181a..2f6c16a4 100644 --- a/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj +++ b/EnvelopeGenerator.Form/EnvelopeGenerator.Form.vbproj @@ -77,9 +77,8 @@ - - False - ..\..\2_DLL Projekte\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll + + ..\packages\DigitalData.Controls.DocumentViewer.1.9.7\lib\net462\DigitalData.Controls.DocumentViewer.dll ..\..\2_DLL Projekte\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll diff --git a/EnvelopeGenerator.Form/frmFieldEditor.vb b/EnvelopeGenerator.Form/frmFieldEditor.vb index c8646c06..84533ce2 100644 --- a/EnvelopeGenerator.Form/frmFieldEditor.vb +++ b/EnvelopeGenerator.Form/frmFieldEditor.vb @@ -74,25 +74,32 @@ Partial Public Class frmFieldEditor End Sub Private Sub InitializeViewer() - DocumentViewer1.Init(LogConfig, MS_GDPICTUREKEY, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings With { - .ShowFlipButton = False, - .ShowPrintButton = False, - .ShowRotateButton = False, - .ShowSettingButton = False - }) - DocumentViewer1.LoadFile(Document.Filepath) - - If DocumentViewer1.PdfViewer IsNot Nothing Then - GDViewer = DocumentViewer1.PdfViewer - AddHandler GDViewer.BeforeAnnotationAddedByUser, AddressOf Viewer_BeforeAnnotationAddedByUser - AddHandler GDViewer.AnnotationAddedByUser, AddressOf Viewer_AnnotationAddedByUser - AddHandler GDViewer.AnnotationMoved, AddressOf Viewer_AnnotationMoved - - Manager = GDViewer.GetAnnotationManager() - Manager.InitFromGdViewer(GDViewer) - Else + Try + DocumentViewer1.Init(LogConfig, MS_GDPICTUREKEY, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings With { + .ShowFlipButton = False, + .ShowPrintButton = False, + .ShowRotateButton = False, + .ShowSettingButton = False + }) + DocumentViewer1.LoadFile(Document.Filepath) + + If DocumentViewer1.PdfViewer IsNot Nothing Then + GDViewer = DocumentViewer1.PdfViewer + AddHandler GDViewer.BeforeAnnotationAddedByUser, AddressOf Viewer_BeforeAnnotationAddedByUser + AddHandler GDViewer.AnnotationAddedByUser, AddressOf Viewer_AnnotationAddedByUser + AddHandler GDViewer.AnnotationMoved, AddressOf Viewer_AnnotationMoved + + Manager = GDViewer.GetAnnotationManager() + Manager.InitFromGdViewer(GDViewer) + Else + Logger.Warn("Viewer could not be initialized!") + End If + Catch ex As Exception Logger.Warn("Viewer could not be initialized!") - End If + Logger.Error(ex) + MsgBox("Viewer could not be initialized!" & vbNewLine & ex.Message) + End Try + End Sub Private Sub Viewer_AnnotationMoved(AnnotationIdx As Integer) diff --git a/EnvelopeGenerator.Form/packages.config b/EnvelopeGenerator.Form/packages.config index 230877b7..ee5069d7 100644 --- a/EnvelopeGenerator.Form/packages.config +++ b/EnvelopeGenerator.Form/packages.config @@ -1,6 +1,7 @@  + diff --git a/EnvelopeGenerator.Test/EnvelopeGenerator.Test.vbproj b/EnvelopeGenerator.Test/EnvelopeGenerator.Test.vbproj index bceca4c1..6fabe974 100644 --- a/EnvelopeGenerator.Test/EnvelopeGenerator.Test.vbproj +++ b/EnvelopeGenerator.Test/EnvelopeGenerator.Test.vbproj @@ -64,9 +64,6 @@ - - ..\..\2_DLL Projekte\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll - ..\packages\DigitalData.Modules.Base.1.3.8\lib\net462\DigitalData.Modules.Base.dll @@ -82,6 +79,9 @@ ..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll + + ..\packages\DigitalData.Modules.Messaging.1.9.8\lib\net462\DigitalData.Modules.Messaging.dll + ..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll @@ -170,6 +170,12 @@ ..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + ..\packages\Microsoft.Identity.Client.4.55.0\lib\net461\Microsoft.Identity.Client.dll + + + ..\packages\Microsoft.IdentityModel.Abstractions.6.22.0\lib\net461\Microsoft.IdentityModel.Abstractions.dll + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -191,15 +197,18 @@ ..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll + + ..\packages\S22.Imap.3.6.0.0\lib\net40\S22.Imap.dll + ..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll - - ..\packages\System.CodeDom.8.0.0\lib\net462\System.CodeDom.dll + + ..\packages\System.CodeDom.9.0.0\lib\net462\System.CodeDom.dll - - ..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll + + ..\packages\System.Collections.Immutable.9.0.0\lib\net462\System.Collections.Immutable.dll @@ -207,9 +216,10 @@ ..\packages\System.Data.Odbc.6.0.1\lib\net461\System.Data.Odbc.dll + - - ..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll + + ..\packages\System.IO.Packaging.9.0.0\lib\net462\System.IO.Packaging.dll @@ -333,9 +343,6 @@ EnvelopeGenerator.Common - - - diff --git a/EnvelopeGenerator.Test/README.txt b/EnvelopeGenerator.Test/README.txt deleted file mode 100644 index 58cbced4..00000000 --- a/EnvelopeGenerator.Test/README.txt +++ /dev/null @@ -1,5 +0,0 @@ -BASE MODULE -=========== - -This module is intended for often used constants and datastructures. -Therefor it is important that this module does not have any dependencies on other modules!! \ No newline at end of file diff --git a/EnvelopeGenerator.Test/app.config b/EnvelopeGenerator.Test/app.config index ffebf761..388a7b10 100644 --- a/EnvelopeGenerator.Test/app.config +++ b/EnvelopeGenerator.Test/app.config @@ -77,7 +77,7 @@ - + @@ -89,7 +89,7 @@ - + @@ -99,6 +99,14 @@ + + + + + + + + diff --git a/EnvelopeGenerator.Test/packages.config b/EnvelopeGenerator.Test/packages.config index f5290bd0..b52ef3b1 100644 --- a/EnvelopeGenerator.Test/packages.config +++ b/EnvelopeGenerator.Test/packages.config @@ -6,6 +6,7 @@ + @@ -16,6 +17,8 @@ + + @@ -24,11 +27,12 @@ + - - + + - +