diff --git a/Controls.DocumentViewer/DocumentViewer.Designer.vb b/Controls.DocumentViewer/DocumentViewer.Designer.vb index d835097a..5cf2b0c8 100644 --- a/Controls.DocumentViewer/DocumentViewer.Designer.vb +++ b/Controls.DocumentViewer/DocumentViewer.Designer.vb @@ -64,6 +64,7 @@ Partial Class DocumentViewer Me.PrintDocument1 = New System.Drawing.Printing.PrintDocument() Me.lbFileNotLoaded = New DevExpress.XtraEditors.LabelControl() Me.RichEditControl1 = New DevExpress.XtraRichEdit.RichEditControl() + Me.lblInfo = New System.Windows.Forms.Label() CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.RepositoryItemTextEdit3, System.ComponentModel.ISupportInitialize).BeginInit() @@ -422,7 +423,7 @@ Partial Class DocumentViewer ' 'SpreadsheetControl1 ' - Me.SpreadsheetControl1.Location = New System.Drawing.Point(147, 190) + Me.SpreadsheetControl1.Location = New System.Drawing.Point(83, 177) Me.SpreadsheetControl1.MenuManager = Me.BarManager1 Me.SpreadsheetControl1.Name = "SpreadsheetControl1" Me.SpreadsheetControl1.ReadOnly = True @@ -453,17 +454,28 @@ Partial Class DocumentViewer ' 'RichEditControl1 ' - Me.RichEditControl1.Location = New System.Drawing.Point(571, 238) + Me.RichEditControl1.Location = New System.Drawing.Point(447, 271) Me.RichEditControl1.MenuManager = Me.BarManager1 Me.RichEditControl1.Name = "RichEditControl1" Me.RichEditControl1.Size = New System.Drawing.Size(400, 200) Me.RichEditControl1.TabIndex = 5 Me.RichEditControl1.Visible = False ' + 'lblInfo + ' + Me.lblInfo.AutoSize = True + Me.lblInfo.ForeColor = System.Drawing.Color.Red + Me.lblInfo.Location = New System.Drawing.Point(18, 558) + Me.lblInfo.Name = "lblInfo" + Me.lblInfo.Size = New System.Drawing.Size(39, 13) + Me.lblInfo.TabIndex = 10 + Me.lblInfo.Text = "Label1" + ' 'DocumentViewer ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.Controls.Add(Me.lblInfo) Me.Controls.Add(Me.RichEditControl1) Me.Controls.Add(Me.lbFileNotLoaded) Me.Controls.Add(Me.SpreadsheetControl1) @@ -526,4 +538,5 @@ Partial Class DocumentViewer Friend WithEvents btnSearch As DevExpress.XtraBars.BarButtonItem Friend WithEvents btnSearch2 As DevExpress.XtraBars.BarButtonItem Friend WithEvents RichEditControl1 As DevExpress.XtraRichEdit.RichEditControl + Friend WithEvents lblInfo As Label End Class diff --git a/Controls.DocumentViewer/DocumentViewer.resx b/Controls.DocumentViewer/DocumentViewer.resx index 6c91d499..52330804 100644 --- a/Controls.DocumentViewer/DocumentViewer.resx +++ b/Controls.DocumentViewer/DocumentViewer.resx @@ -161,6 +161,26 @@ NC42LTAuOCw2LjUtMi4xbDcuOSw3LjljMC4zLDAuMywwLjksMC4zLDEuMiwwbDEuMi0xLjJDMzAuMSwy OC4yLDMwLjEsMjcuNiwyOS43LDI3LjN6IE00LDEzYzAtNSw0LTksOS05YzUsMCw5LDQsOSw5ICAgcy00 LDktOSw5QzgsMjIsNCwxOCw0LDEzeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ilpvb20iPg0KICAgIDxwYXRoIGQ9Ik0yNy43LDI1LjNM + MjAuNSwxOGMxLTEuNCwxLjUtMy4yLDEuNS01YzAtNS00LTktOS05cy05LDQtOSw5YzAsNSw0LDksOSw5 + YzEuOSwwLDMuNi0wLjYsNS0xLjVsNy4zLDcuMyAgIGMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsMS4yLTEu + MkMyOC4xLDI2LjIsMjguMSwyNS42LDI3LjcsMjUuM3ogTTYsMTNjMC0zLjksMy4xLTcsNy03czcsMy4x + LDcsN2MwLDMuOS0zLjEsNy03LDdTNiwxNi45LDYsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4N + Cjwvc3ZnPgs= @@ -223,26 +243,6 @@ ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz - OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp - dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ilpvb20iPg0KICAgIDxwYXRoIGQ9Ik0yNy43LDI1LjNM - MjAuNSwxOGMxLTEuNCwxLjUtMy4yLDEuNS01YzAtNS00LTktOS05cy05LDQtOSw5YzAsNSw0LDksOSw5 - YzEuOSwwLDMuNi0wLjYsNS0xLjVsNy4zLDcuMyAgIGMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsMS4yLTEu - MkMyOC4xLDI2LjIsMjguMSwyNS42LDI3LjcsMjUuM3ogTTYsMTNjMC0zLjksMy4xLTcsNy03czcsMy4x - LDcsN2MwLDMuOS0zLjEsNy03LDdTNiwxNi45LDYsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4N - Cjwvc3ZnPgs= diff --git a/Controls.DocumentViewer/DocumentViewer.vb b/Controls.DocumentViewer/DocumentViewer.vb index fd710e27..431dba5e 100644 --- a/Controls.DocumentViewer/DocumentViewer.vb +++ b/Controls.DocumentViewer/DocumentViewer.vb @@ -59,6 +59,7 @@ Public Class DocumentViewer Private _FilePath As String Private _FileInfo As FileInfo Private _FileLoadMode As FileLoadMode = FileLoadMode.File + Private _ViewOverride As String = "" ' List of all created temp files when converting msg files Private _TempFiles As New List(Of String) @@ -79,6 +80,7 @@ Public Class DocumentViewer End Class Public Property FileLoaded As Boolean = False + Public Property Viewer_ForceTemporaryMode As Boolean = False Public ReadOnly Property AnnotationsSaved As Boolean Get Return Not _AnnotationsPending @@ -464,8 +466,9 @@ Public Class DocumentViewer _logger.Warn($"Unexpected error in FreeFile: {ex.Message}") End Try End Sub - Private Function DoLoadFile(FilePath As String) As Boolean + Private Function DoLoadFile(FilePath As String, Optional ViewOverride As String = "") As Boolean Try + lblInfo.Visible = False Dim oFileInfo = New FileInfo(FilePath) Dim oExtension As String = oFileInfo.Extension.ToUpper @@ -477,42 +480,177 @@ Public Class DocumentViewer SpreadsheetControl1.Dock = DockStyle.None RichEditControl1.Dock = DockStyle.None - Select Case oExtension.ToUpper - Case ".CSV" - Dim oFormat = GetSpreadsheetFormat(oExtension) - SpreadsheetControl1.LoadDocument(FilePath, oFormat) + Dim override_Spreadsheet As Boolean = False + If oExtension.ToLower = ".xlsx" Then + If oFileInfo.Length > 15000 Then + _logger.Info("Override") + override_Spreadsheet = True + End If + End If - Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange() - oRange.AutoFitColumns() + If ViewOverride = "Richtext" Then + RichEditControl1.LoadDocument(FilePath, GetDocumentFormat(oExtension)) + RichEditControl1.Visible = True + GdViewer.Visible = False + RichEditControl1.Dock = DockStyle.Fill + _ViewOverride = "Richtext" + _ViewerMode = ViewerMode.Richtext + lblInfo.Visible = True + lblInfo.Text = "This docx-file contains a generic error and will be displayed in a reduced viewer. Please try to open the file in WORD" + ElseIf override_Spreadsheet = True Then + Dim oFormat = GetSpreadsheetFormat(oExtension) + SpreadsheetControl1.LoadDocument(FilePath, oFormat) - SpreadsheetControl1.Visible = True - GdViewer.Visible = False - SpreadsheetControl1.Dock = DockStyle.Fill - Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT" - RichEditControl1.LoadDocument(FilePath, GetDocumentFormat(oExtension)) + Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange() + oRange.AutoFitColumns() - RichEditControl1.Visible = True - GdViewer.Visible = False - RichEditControl1.Dock = DockStyle.Fill - Case Else - GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer - GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter - GdViewer.ForceTemporaryMode = True - GdViewer.AnnotationDropShadow = True - GdViewer.BackColor = Color.White + SpreadsheetControl1.Visible = True + GdViewer.Visible = False + SpreadsheetControl1.Dock = DockStyle.Fill + Else + _ViewOverride = "" + Select Case oExtension.ToUpper + Case ".CSV" + Dim oFormat = GetSpreadsheetFormat(oExtension) + SpreadsheetControl1.LoadDocument(FilePath, oFormat) - If GdViewer.DisplayFromFile(FilePath) <> GdPictureStatus.OK Then + Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange() + oRange.AutoFitColumns() - Dim oFileName = IO.Path.GetFileName(FilePath) - lbFileNotLoaded.Text = String.Format("Datei konnte nicht geladen werden:{0}{1}", vbCrLf, oFileName) - lbFileNotLoaded.Visible = True - Else - If GdViewer.Visible = False Then - GdViewer.Visible = True + SpreadsheetControl1.Visible = True + GdViewer.Visible = False + SpreadsheetControl1.Dock = DockStyle.Fill + + 'Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT" + ' RichEditControl1.LoadDocument(FilePath, GetDocumentFormat(oExtension)) + + ' RichEditControl1.Visible = True + ' GdViewer.Visible = False + ' RichEditControl1.Dock = DockStyle.Fill + Case Else + Select Case oExtension.ToUpper + Case ".EML", ".DOC", ".DOCX", ".XLS", ".XLSX", ".ODT", ".RTF", ".TXT" + GdViewer.ForceTemporaryMode = False + End Select + + GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer + GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter + If Viewer_ForceTemporaryMode = True Then + GdViewer.ForceTemporaryMode = True End If - End If - End Select + GdViewer.AnnotationDropShadow = True + GdViewer.BackColor = Color.White + + Dim oGDPState As GdPicture14.GdPictureStatus = GdViewer.DisplayFromFile(FilePath) + If oGDPState <> GdPictureStatus.OK Then + _logger.Warn($"GdPictureStatus is [{oGDPState}]") + If oExtension.ToUpper = ".DOCX" And oGDPState = GdPictureStatus.GenericError Then + DoLoadFile(FilePath, "Richtext") + Else + Dim oFileName = IO.Path.GetFileName(FilePath) + lbFileNotLoaded.Text = String.Format("Datei konnte nicht geladen werden:{0}{1}", vbCrLf, oFileName) + lbFileNotLoaded.Visible = True + End If + + Else + If GdViewer.Visible = False Then + GdViewer.Visible = True + End If + End If + + End Select + End If + If _ViewOverride = "Richtext" Then + _ViewerMode = ViewerMode.Richtext + End If + + + Return True + Catch ex As Exception + _logger.Error(ex) + Return False + End Try + End Function + Private Function DoLoadFile(FilePath As String) As Boolean + Try + lblInfo.Visible = False + Dim oFileInfo = New FileInfo(FilePath) + Dim oExtension As String = oFileInfo.Extension.ToUpper + + lbFileNotLoaded.Visible = False + + SpreadsheetControl1.Visible = False + RichEditControl1.Visible = False + + SpreadsheetControl1.Dock = DockStyle.None + RichEditControl1.Dock = DockStyle.None + Dim Override_SSheet_Filesize As Boolean = False + If oExtension.ToLower = ".xlsx" Then + If oFileInfo.Length > 100000 Then + _logger.Info("Override Spreadsheet as xlsx is too big") + Override_SSheet_Filesize = True + End If + End If + If Override_SSheet_Filesize Then + Dim oFormat = GetSpreadsheetFormat(oExtension) + SpreadsheetControl1.LoadDocument(FilePath, oFormat) + + Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange() + oRange.AutoFitColumns() + + SpreadsheetControl1.Visible = True + GdViewer.Visible = False + SpreadsheetControl1.Dock = DockStyle.Fill + Else + Select Case oExtension.ToUpper + Case ".CSV" + Dim oFormat = GetSpreadsheetFormat(oExtension) + SpreadsheetControl1.LoadDocument(FilePath, oFormat) + + Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange() + oRange.AutoFitColumns() + + SpreadsheetControl1.Visible = True + GdViewer.Visible = False + SpreadsheetControl1.Dock = DockStyle.Fill + Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT" + RichEditControl1.LoadDocument(FilePath, GetDocumentFormat(oExtension)) + + RichEditControl1.Visible = True + GdViewer.Visible = False + RichEditControl1.Dock = DockStyle.Fill + Case Else + + GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer + GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter + If Viewer_ForceTemporaryMode = True Then + GdViewer.ForceTemporaryMode = True + End If + + GdViewer.AnnotationDropShadow = True + GdViewer.BackColor = Color.White + + Dim oGDPState As GdPicture14.GdPictureStatus = GdViewer.DisplayFromFile(FilePath) + If oGDPState <> GdPictureStatus.OK Then + _logger.Warn($"GdPictureStatus is [{oGDPState}]") + If oExtension.ToUpper = ".DOCX" And oGDPState = GdPictureStatus.GenericError Then + DoLoadFile(FilePath, "Richtext") + Else + Dim oFileName = IO.Path.GetFileName(FilePath) + lbFileNotLoaded.Text = String.Format("Datei konnte nicht geladen werden:{0}{1}", vbCrLf, oFileName) + lbFileNotLoaded.Visible = True + End If + + Else + If GdViewer.Visible = False Then + GdViewer.Visible = True + End If + End If + + End Select + End If + UpdateMainUi() @@ -568,6 +706,41 @@ Public Class DocumentViewer Return False End Try End Function + Private Function StreamFile(Stream As Stream, Extension As String) As Boolean + Try + + SpreadsheetControl1.Visible = False + SpreadsheetControl1.Dock = DockStyle.None + + Select Case Extension.ToUpper + + Case ".CSV" + SpreadsheetControl1.LoadDocument(Stream, GetSpreadsheetFormat(Extension)) + + Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange() + oRange.AutoFitColumns() + + SpreadsheetControl1.Visible = True + SpreadsheetControl1.Dock = DockStyle.Fill + + Case Else + GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer + GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter + GdViewer.ForceTemporaryMode = True + GdViewer.AnnotationDropShadow = True + + GdViewer.DisplayFromStream(Stream) + + End Select + + UpdateMainUi() + + Return True + Catch ex As Exception + _logger.Error(ex) + Return False + End Try + End Function Private Function GetSpreadsheetFormat(Extension) As Spreadsheet.DocumentFormat Dim oFormat As Spreadsheet.DocumentFormat = Spreadsheet.DocumentFormat.Undefined diff --git a/Controls.DocumentViewer/My Project/AssemblyInfo.vb b/Controls.DocumentViewer/My Project/AssemblyInfo.vb index 4e9d3218..549bd01d 100644 --- a/Controls.DocumentViewer/My Project/AssemblyInfo.vb +++ b/Controls.DocumentViewer/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Controls.SnapPanel/My Project/AssemblyInfo.vb b/Controls.SnapPanel/My Project/AssemblyInfo.vb index becaa04b..43d36dc4 100644 --- a/Controls.SnapPanel/My Project/AssemblyInfo.vb +++ b/Controls.SnapPanel/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' indem Sie "*" wie unten gezeigt eingeben: ' - - + + diff --git a/Controls.SnapPanel/SnapPanel.vb b/Controls.SnapPanel/SnapPanel.vb index 9225b058..ec2cac17 100644 --- a/Controls.SnapPanel/SnapPanel.vb +++ b/Controls.SnapPanel/SnapPanel.vb @@ -1,20 +1,28 @@ Imports System.Drawing Imports System.Windows.Forms + + Public Class ClassSnapPanel Inherits Panel Private _ShowGrid As Boolean = True Private _GridSize As Integer = 16 + Private _NeedsScrollUpdate As Boolean = False + Public Sub New() - Me.AutoScroll = True ' Scrollbars aktivieren + Me.AutoScroll = True + Me.DoubleBuffered = True ' Flackern reduzieren End Sub + Public Property GridSize As Integer Get Return _GridSize End Get Set(value As Integer) - _GridSize = value - Refresh() + If value > 0 AndAlso value <> _GridSize Then + _GridSize = value + Invalidate() + End If End Set End Property @@ -23,55 +31,146 @@ Public Class ClassSnapPanel Return _ShowGrid End Get Set(value As Boolean) - _ShowGrid = value - Refresh() + If value <> _ShowGrid Then + _ShowGrid = value + Invalidate() + End If End Set End Property Protected Overrides Sub OnControlAdded(e As ControlEventArgs) - AddHandler e.Control.LocationChanged, AddressOf AlignToGrid - AddHandler e.Control.DragDrop, AddressOf AlignToGrid MyBase.OnControlAdded(e) - UpdateScrollArea() + AddHandler e.Control.LocationChanged, AddressOf AlignToGrid + AddHandler e.Control.MouseUp, AddressOf AlignToGrid + ScheduleScrollUpdate() End Sub Protected Overrides Sub OnControlRemoved(e As ControlEventArgs) - RemoveHandler e.Control.LocationChanged, AddressOf AlignToGrid - RemoveHandler e.Control.DragDrop, AddressOf AlignToGrid MyBase.OnControlRemoved(e) - UpdateScrollArea() + RemoveHandler e.Control.LocationChanged, AddressOf AlignToGrid + RemoveHandler e.Control.MouseUp, AddressOf AlignToGrid + ScheduleScrollUpdate() End Sub - Protected Overrides Sub OnPaint(e As System.Windows.Forms.PaintEventArgs) - If _ShowGrid Then - ControlPaint.DrawGrid(e.Graphics, ClientRectangle, New Size(_GridSize, _GridSize), BackColor) - End If + Protected Overrides Sub OnLayout(levent As LayoutEventArgs) + MyBase.OnLayout(levent) + ScheduleScrollUpdate() + End Sub + + Protected Overrides Sub OnPaint(e As PaintEventArgs) MyBase.OnPaint(e) + + If Not Me.DesignMode AndAlso _ShowGrid Then + Dim scrollOffset As Point = Me.AutoScrollPosition + Dim gridRect As New Rectangle(-scrollOffset.X, -scrollOffset.Y, Me.ClientSize.Width, Me.ClientSize.Height) + ControlPaint.DrawGrid(e.Graphics, gridRect, New Size(_GridSize, _GridSize), Me.BackColor) + End If End Sub Private Sub AlignToGrid(sender As Object, e As EventArgs) - If _ShowGrid Then - Dim item As Control = CType(sender, Control) - Dim x As Integer = Math.Round(item.Left / _GridSize) * _GridSize - Dim y As Integer = Math.Round(item.Top / _GridSize) * _GridSize - item.Location = New Point(x, y) - UpdateScrollArea() + If Not _ShowGrid OrElse Me.DesignMode Then Return + + Dim ctrl As Control = CType(sender, Control) + Dim x As Integer = Math.Floor(ctrl.Left / _GridSize) * _GridSize + Dim y As Integer = Math.Floor(ctrl.Top / _GridSize) * _GridSize + ctrl.Location = New Point(x, y) + ScheduleScrollUpdate() + End Sub + + Private Sub ScheduleScrollUpdate() + If Not _NeedsScrollUpdate Then + _NeedsScrollUpdate = True + BeginInvoke(New MethodInvoker(Sub() + UpdateScrollArea() + _NeedsScrollUpdate = False + End Sub)) End If End Sub + Private Sub UpdateScrollArea() Dim maxWidth As Integer = 0 Dim maxHeight As Integer = 0 - ' Größte X- und Y-Koordinate der enthaltenen Controls bestimmen - For Each ctrl As Control In Controls - Dim right As Integer = ctrl.Right - Dim bottom As Integer = ctrl.Bottom - - If right > maxWidth Then maxWidth = right - If bottom > maxHeight Then maxHeight = bottom + For Each ctrl As Control In Me.Controls + maxWidth = Math.Max(maxWidth, ctrl.Right) + maxHeight = Math.Max(maxHeight, ctrl.Bottom) Next - ' Scrollbereich setzen Me.AutoScrollMinSize = New Size(maxWidth, maxHeight) End Sub End Class + +'Public Class ClassSnapPanel +' Inherits Panel + +' Private _ShowGrid As Boolean = True +' Private _GridSize As Integer = 16 +' Public Sub New() +' Me.AutoScroll = True ' Scrollbars aktivieren +' End Sub +' Public Property GridSize As Integer +' Get +' Return _GridSize +' End Get +' Set(value As Integer) +' _GridSize = value +' Refresh() +' End Set +' End Property + +' Public Property ShowGrid As Boolean +' Get +' Return _ShowGrid +' End Get +' Set(value As Boolean) +' _ShowGrid = value +' Refresh() +' End Set +' End Property + +' Protected Overrides Sub OnControlAdded(e As ControlEventArgs) +' AddHandler e.Control.LocationChanged, AddressOf AlignToGrid +' AddHandler e.Control.DragDrop, AddressOf AlignToGrid +' MyBase.OnControlAdded(e) +' UpdateScrollArea() +' End Sub + +' Protected Overrides Sub OnControlRemoved(e As ControlEventArgs) +' RemoveHandler e.Control.LocationChanged, AddressOf AlignToGrid +' RemoveHandler e.Control.DragDrop, AddressOf AlignToGrid +' MyBase.OnControlRemoved(e) +' UpdateScrollArea() +' End Sub +' Protected Overrides Sub OnPaint(e As System.Windows.Forms.PaintEventArgs) +' If _ShowGrid Then +' ControlPaint.DrawGrid(e.Graphics, ClientRectangle, New Size(_GridSize, _GridSize), BackColor) +' End If +' MyBase.OnPaint(e) +' End Sub + +' Private Sub AlignToGrid(sender As Object, e As EventArgs) +' If _ShowGrid Then +' Dim item As Control = CType(sender, Control) +' Dim x As Integer = Math.Round(item.Left / _GridSize) * _GridSize +' Dim y As Integer = Math.Round(item.Top / _GridSize) * _GridSize +' item.Location = New Point(x, y) +' UpdateScrollArea() +' End If +' End Sub +' Private Sub UpdateScrollArea() +' Dim maxWidth As Integer = 0 +' Dim maxHeight As Integer = 0 + +' ' Größte X- und Y-Koordinate der enthaltenen Controls bestimmen +' For Each ctrl As Control In Controls +' Dim right As Integer = ctrl.Right +' Dim bottom As Integer = ctrl.Bottom + +' If right > maxWidth Then maxWidth = right +' If bottom > maxHeight Then maxHeight = bottom +' Next + +' ' Scrollbereich setzen +' Me.AutoScrollMinSize = New Size(maxWidth, maxHeight) +' End Sub +'End Class diff --git a/GUIs.Common/Common.vbproj b/GUIs.Common/Common.vbproj index 1db8604c..e75de04d 100644 --- a/GUIs.Common/Common.vbproj +++ b/GUIs.Common/Common.vbproj @@ -132,68 +132,68 @@ ..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.CAD.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.CAD.DWG.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Common.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Document.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Email.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.HTML.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Imaging.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Imaging.Formats.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.OpenDocument.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.OpenXML.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.PDF.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.RTF.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.SVG.dll - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.wia.gateway.dll True @@ -209,6 +209,12 @@ ..\packages\Microsoft.IdentityModel.Abstractions.6.22.0\lib\net461\Microsoft.IdentityModel.Abstractions.dll + + ..\packages\GdPicture.14.3.19\lib\net462\NativeSDK.Settings.dll + + + ..\packages\GdPicture.14.3.19\lib\net462\NativeSDK.Settings.Edition.dll + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -821,8 +827,8 @@ - + - + \ No newline at end of file diff --git a/GUIs.Common/app.config b/GUIs.Common/app.config index 9081ad45..9e43e045 100644 --- a/GUIs.Common/app.config +++ b/GUIs.Common/app.config @@ -103,6 +103,22 @@ + + + + + + + + + + + + + + + + diff --git a/GUIs.Common/packages.config b/GUIs.Common/packages.config index 8abe7a31..5d3992cc 100644 --- a/GUIs.Common/packages.config +++ b/GUIs.Common/packages.config @@ -6,8 +6,8 @@ - - + + diff --git a/GUIs.Test.TestGUI/My Project/licenses.licx b/GUIs.Test.TestGUI/My Project/licenses.licx index e69de29b..78d6cc83 100644 --- a/GUIs.Test.TestGUI/My Project/licenses.licx +++ b/GUIs.Test.TestGUI/My Project/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/GUIs.Test.TestGUI/TestGUI.vbproj b/GUIs.Test.TestGUI/TestGUI.vbproj index 9469e29a..a03ed34b 100644 --- a/GUIs.Test.TestGUI/TestGUI.vbproj +++ b/GUIs.Test.TestGUI/TestGUI.vbproj @@ -78,8 +78,7 @@ - - False + ..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll diff --git a/GUIs.Test.TestGUI/frmDocView.vb b/GUIs.Test.TestGUI/frmDocView.vb index 64366cab..5c8d9544 100644 --- a/GUIs.Test.TestGUI/frmDocView.vb +++ b/GUIs.Test.TestGUI/frmDocView.vb @@ -12,6 +12,7 @@ Public Class frmDocView If OpenFileDialog1.ShowDialog() = DialogResult.OK Then txtfilepath.Text = OpenFileDialog1.FileName MyDocumentViewer.LoadFile(txtfilepath.Text) + txtfilepath.Text = "" End If Else MyDocumentViewer.LoadFile(txtfilepath.Text) diff --git a/GUIs.Test.TestGUI/frmDocViewPure.Designer.vb b/GUIs.Test.TestGUI/frmDocViewPure.Designer.vb index b00c6a6a..51b9c632 100644 --- a/GUIs.Test.TestGUI/frmDocViewPure.Designer.vb +++ b/GUIs.Test.TestGUI/frmDocViewPure.Designer.vb @@ -22,18 +22,10 @@ Partial Class frmDocViewPure 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. _ Private Sub InitializeComponent() - Me.SpreadsheetControl1 = New DevExpress.XtraSpreadsheet.SpreadsheetControl() Me.Button1 = New System.Windows.Forms.Button() + Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() Me.SuspendLayout() ' - 'SpreadsheetControl1 - ' - Me.SpreadsheetControl1.Location = New System.Drawing.Point(349, 187) - Me.SpreadsheetControl1.Name = "SpreadsheetControl1" - Me.SpreadsheetControl1.Size = New System.Drawing.Size(400, 200) - Me.SpreadsheetControl1.TabIndex = 0 - Me.SpreadsheetControl1.Text = "SpreadsheetControl1" - ' 'Button1 ' Me.Button1.Location = New System.Drawing.Point(546, 25) @@ -43,19 +35,26 @@ Partial Class frmDocViewPure Me.Button1.Text = "unload" Me.Button1.UseVisualStyleBackColor = True ' + 'DocumentViewer1 + ' + Me.DocumentViewer1.FileLoaded = False + Me.DocumentViewer1.Location = New System.Drawing.Point(12, 54) + Me.DocumentViewer1.Name = "DocumentViewer1" + Me.DocumentViewer1.Size = New System.Drawing.Size(661, 386) + Me.DocumentViewer1.TabIndex = 2 + ' 'frmDocViewPure ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(800, 450) + Me.Controls.Add(Me.DocumentViewer1) Me.Controls.Add(Me.Button1) - Me.Controls.Add(Me.SpreadsheetControl1) Me.Name = "frmDocViewPure" Me.Text = "frmDocViewPure" Me.ResumeLayout(False) End Sub - - Friend WithEvents SpreadsheetControl1 As DevExpress.XtraSpreadsheet.SpreadsheetControl Friend WithEvents Button1 As Button + Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer End Class diff --git a/GUIs.Test.TestGUI/frmDocViewPure.vb b/GUIs.Test.TestGUI/frmDocViewPure.vb index 2fa3fe66..0b55c54c 100644 --- a/GUIs.Test.TestGUI/frmDocViewPure.vb +++ b/GUIs.Test.TestGUI/frmDocViewPure.vb @@ -2,7 +2,6 @@ Public Class frmDocViewPure Private Sub frmDocViewPure_Load(sender As Object, e As EventArgs) Handles MyBase.Load - SpreadsheetControl1.LoadDocument("E:\35MB.xlsx") End Sub @@ -10,7 +9,7 @@ Public Class frmDocViewPure 'SpreadsheetControl1.Document.Dispose() 'SpreadsheetControl1.Dispose() 'SpreadsheetControl1 = Nothing - SpreadsheetControl1.CreateNewDocument() + ' SpreadsheetControl1.CreateNewDocument() GC.Collect() End Sub End Class \ No newline at end of file diff --git a/GUIs.Test.ZUGFeRDTest/App.config b/GUIs.Test.ZUGFeRDTest/App.config index 69334236..9b511643 100644 --- a/GUIs.Test.ZUGFeRDTest/App.config +++ b/GUIs.Test.ZUGFeRDTest/App.config @@ -137,7 +137,15 @@ - + + + + + + + + + diff --git a/GUIs.Test.ZUGFeRDTest/Form1.Designer.vb b/GUIs.Test.ZUGFeRDTest/Form1.Designer.vb index 5c3c6b11..1eef804d 100644 --- a/GUIs.Test.ZUGFeRDTest/Form1.Designer.vb +++ b/GUIs.Test.ZUGFeRDTest/Form1.Designer.vb @@ -41,6 +41,7 @@ Partial Class Form1 Me.GroupBox5 = New System.Windows.Forms.GroupBox() Me.btWriteBinary = New System.Windows.Forms.Button() Me.OpenFileDialog2 = New System.Windows.Forms.OpenFileDialog() + Me.Button1 = New System.Windows.Forms.Button() Me.GroupBox1.SuspendLayout() Me.GroupBox2.SuspendLayout() Me.GroupBox3.SuspendLayout() @@ -105,7 +106,7 @@ Partial Class Form1 Me.GroupBox1.Controls.Add(Me.btRunJob) Me.GroupBox1.Location = New System.Drawing.Point(12, 12) Me.GroupBox1.Name = "GroupBox1" - Me.GroupBox1.Size = New System.Drawing.Size(360, 92) + Me.GroupBox1.Size = New System.Drawing.Size(252, 92) Me.GroupBox1.TabIndex = 7 Me.GroupBox1.TabStop = False Me.GroupBox1.Text = "Run Job like in eInvoice Service" @@ -116,7 +117,7 @@ Partial Class Form1 Me.ButtonValidateXMLOnly.Name = "ButtonValidateXMLOnly" Me.ButtonValidateXMLOnly.Size = New System.Drawing.Size(221, 23) Me.ButtonValidateXMLOnly.TabIndex = 4 - Me.ButtonValidateXMLOnly.Text = "Run XML Job (spez. Configuration)" + Me.ButtonValidateXMLOnly.Text = "XML Job (Sichtbeleg)" Me.ButtonValidateXMLOnly.UseVisualStyleBackColor = True ' 'GroupBox2 @@ -211,11 +212,21 @@ Partial Class Form1 Me.OpenFileDialog2.FileName = "OpenFileDialog2" Me.OpenFileDialog2.Filter = "XML files (*.xml)|*.xml" ' + 'Button1 + ' + Me.Button1.Location = New System.Drawing.Point(270, 31) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(75, 23) + Me.Button1.TabIndex = 4 + Me.Button1.Text = "LogFolder" + Me.Button1.UseVisualStyleBackColor = True + ' 'Form1 ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(916, 633) + Me.Controls.Add(Me.Button1) Me.Controls.Add(Me.GroupBox5) Me.Controls.Add(Me.GroupBox4) Me.Controls.Add(Me.GroupBox3) @@ -254,4 +265,5 @@ Partial Class Form1 Friend WithEvents btWriteBinary As Button Friend WithEvents ButtonValidateXMLOnly As Button Friend WithEvents OpenFileDialog2 As OpenFileDialog + Friend WithEvents Button1 As Button End Class diff --git a/GUIs.Test.ZUGFeRDTest/Form1.vb b/GUIs.Test.ZUGFeRDTest/Form1.vb index dd355b4b..950ee575 100644 --- a/GUIs.Test.ZUGFeRDTest/Form1.vb +++ b/GUIs.Test.ZUGFeRDTest/Form1.vb @@ -373,4 +373,8 @@ Public Class Form1 End Select End Function + + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + Process.Start(_logConfig.LogDirectory) + End Sub End Class diff --git a/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj b/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj index 04517ee9..40d5966c 100644 --- a/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj +++ b/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj @@ -50,6 +50,9 @@ On + + ..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll + ..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll @@ -71,71 +74,80 @@ ..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.CAD.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.CAD.DWG.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Common.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Document.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Email.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.HTML.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Imaging.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Imaging.Formats.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.OpenDocument.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.OpenXML.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.PDF.dll - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.RTF.dll + + + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.SVG.dll - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll + ..\packages\GdPicture.14.3.19\lib\net462\GdPicture.NET.14.wia.gateway.dll True - - ..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll - + + ..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + + ..\packages\GdPicture.14.3.19\lib\net462\NativeSDK.Settings.dll + + + ..\packages\GdPicture.14.3.19\lib\net462\NativeSDK.Settings.Edition.dll + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll @@ -161,17 +173,11 @@ ..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll - - ..\packages\System.CodeDom.8.0.0\lib\net462\System.CodeDom.dll - ..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll - - ..\packages\System.Data.SqlClient.4.8.6\lib\net461\System.Data.SqlClient.dll - @@ -200,8 +206,8 @@ ..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll - - ..\packages\System.Text.Json.8.0.5\lib\net462\System.Text.Json.dll + + ..\packages\System.Text.Json.8.0.6\lib\net462\System.Text.Json.dll ..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll @@ -281,11 +287,11 @@ - + - This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. + Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}". - + \ No newline at end of file diff --git a/GUIs.Test.ZUGFeRDTest/packages.config b/GUIs.Test.ZUGFeRDTest/packages.config index 154ae63f..e93f4cb0 100644 --- a/GUIs.Test.ZUGFeRDTest/packages.config +++ b/GUIs.Test.ZUGFeRDTest/packages.config @@ -4,8 +4,8 @@ - - + + @@ -18,17 +18,14 @@ - - - - + \ No newline at end of file diff --git a/WEBSERVICES/ZUGFeRDRESTService/Controllers/ValidationController.cs b/WEBSERVICES/ZUGFeRDRESTService/Controllers/ValidationController.cs index c1a7e580..0ac2c0e8 100644 --- a/WEBSERVICES/ZUGFeRDRESTService/Controllers/ValidationController.cs +++ b/WEBSERVICES/ZUGFeRDRESTService/Controllers/ValidationController.cs @@ -465,7 +465,7 @@ namespace ZUGFeRDRESTService.Controllers var language = "de-DE"; var searchTitle = "ZUGFERD_Rejection_" + pErrorCode + "_Web"; - var messageItem = _RecjectionMessageList.Where(i => i.Title.Equals(searchTitle, StringComparison.OrdinalIgnoreCase) && i.Language == language).FirstOrDefault(); + var messageItem = _RecjectionMessageList.Where(i => i.Title.Equals(searchTitle, StringComparison.OrdinalIgnoreCase) && i.Language.Equals(language, StringComparison.OrdinalIgnoreCase)).FirstOrDefault(); if (messageItem != null) { _logger.Info("GetRejectionMessage() - messageItem: '" + messageItem.String1 + "'");