From 8d91dcdb4394ca37d98a54b654102aab86ca26b0 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Mon, 23 Mar 2020 12:06:51 +0100 Subject: [PATCH] DocumentViewer: Version 1.0.1.0 --- .../DocumentViewer.Designer.vb | 36 +---- Controls.DocumentViewer/DocumentViewer.resx | 138 +++++++++--------- Controls.DocumentViewer/DocumentViewer.vb | 66 +++------ .../My Project/AssemblyInfo.vb | 2 +- GUIs.Test.DocumentViewerTest/Form1.vb | 20 ++- 5 files changed, 108 insertions(+), 154 deletions(-) diff --git a/Controls.DocumentViewer/DocumentViewer.Designer.vb b/Controls.DocumentViewer/DocumentViewer.Designer.vb index 9d82beb5..895e1d6f 100644 --- a/Controls.DocumentViewer/DocumentViewer.Designer.vb +++ b/Controls.DocumentViewer/DocumentViewer.Designer.vb @@ -53,14 +53,11 @@ Partial Class DocumentViewer Me.btnFlipY = New System.Windows.Forms.ToolStripButton() Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator() Me.btnSettings = New System.Windows.Forms.ToolStripButton() - Me.statusbar = New System.Windows.Forms.StatusStrip() - Me.infoLabel = New System.Windows.Forms.ToolStripStatusLabel() - Me.statusLabel = New System.Windows.Forms.ToolStripStatusLabel() Me.OpenFileDialog = New System.Windows.Forms.OpenFileDialog() Me.RichEditControl1 = New DevExpress.XtraRichEdit.RichEditControl() Me.SpreadsheetControl1 = New DevExpress.XtraSpreadsheet.SpreadsheetControl() + Me.PrintDocument1 = New System.Drawing.Printing.PrintDocument() Me.mainToolStrip.SuspendLayout() - Me.statusbar.SuspendLayout() Me.SuspendLayout() ' 'GdViewer @@ -126,7 +123,7 @@ Partial Class DocumentViewer Me.GdViewer.ScrollLargeChange = CType(50, Short) Me.GdViewer.ScrollSmallChange = CType(1, Short) Me.GdViewer.SilentMode = True - Me.GdViewer.Size = New System.Drawing.Size(1015, 537) + Me.GdViewer.Size = New System.Drawing.Size(1015, 559) Me.GdViewer.TabIndex = 0 Me.GdViewer.ViewRotation = System.Drawing.RotateFlipType.RotateNoneFlipNone Me.GdViewer.Zoom = 1.0R @@ -383,28 +380,6 @@ Partial Class DocumentViewer Me.btnSettings.Size = New System.Drawing.Size(28, 28) Me.btnSettings.Text = "Viewer settings" ' - 'statusbar - ' - Me.statusbar.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.infoLabel, Me.statusLabel}) - Me.statusbar.Location = New System.Drawing.Point(0, 568) - Me.statusbar.Name = "statusbar" - Me.statusbar.Size = New System.Drawing.Size(1015, 22) - Me.statusbar.SizingGrip = False - Me.statusbar.TabIndex = 7 - Me.statusbar.Text = "StatusStrip1" - ' - 'infoLabel - ' - Me.infoLabel.Name = "infoLabel" - Me.infoLabel.Size = New System.Drawing.Size(56, 17) - Me.infoLabel.Text = "infoLabel" - ' - 'statusLabel - ' - Me.statusLabel.Name = "statusLabel" - Me.statusLabel.Size = New System.Drawing.Size(66, 17) - Me.statusLabel.Text = "statusLabel" - ' 'OpenFileDialog ' Me.OpenFileDialog.FileName = "OpenFileDialog1" @@ -438,14 +413,11 @@ Partial Class DocumentViewer Me.Controls.Add(Me.SpreadsheetControl1) Me.Controls.Add(Me.RichEditControl1) Me.Controls.Add(Me.GdViewer) - Me.Controls.Add(Me.statusbar) Me.Controls.Add(Me.mainToolStrip) Me.Name = "DocumentViewer" Me.Size = New System.Drawing.Size(1015, 590) Me.mainToolStrip.ResumeLayout(False) Me.mainToolStrip.PerformLayout() - Me.statusbar.ResumeLayout(False) - Me.statusbar.PerformLayout() Me.ResumeLayout(False) Me.PerformLayout() @@ -481,10 +453,8 @@ Partial Class DocumentViewer Friend WithEvents btnFlipY As ToolStripButton Friend WithEvents ToolStripSeparator4 As ToolStripSeparator Friend WithEvents btnSettings As ToolStripButton - Friend WithEvents statusbar As StatusStrip - Friend WithEvents infoLabel As ToolStripStatusLabel - Friend WithEvents statusLabel As ToolStripStatusLabel Friend WithEvents OpenFileDialog As OpenFileDialog Friend WithEvents RichEditControl1 As DevExpress.XtraRichEdit.RichEditControl Friend WithEvents SpreadsheetControl1 As DevExpress.XtraSpreadsheet.SpreadsheetControl + Friend WithEvents PrintDocument1 As Printing.PrintDocument End Class diff --git a/Controls.DocumentViewer/DocumentViewer.resx b/Controls.DocumentViewer/DocumentViewer.resx index 967f33a5..c110dc57 100644 --- a/Controls.DocumentViewer/DocumentViewer.resx +++ b/Controls.DocumentViewer/DocumentViewer.resx @@ -124,13 +124,13 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFgSURBVEhLvVVBToRAEESNF/+kv+DEgRsPICFwMfMGLwYv - evIDs0fjQ0wIB56w0XAQZ+yanXaHQcLsrlhJZao73V3TuxCiOZRlqYgaZ1VVo5OJmGnbwiCEOKcBOhQH - G2RZdrmugRBXK2/wYDZQSpkB7snkGDjI4Kba6FNox+xB7q9JknzhqRiGQV+XknivUIzT1W7Oj6HBruvM - 05Wm6WdRFM8w+Hn0/tLAzhyMARMGXHgs+T9hrr2BGhn0fa/FnaQGaYp3Znvt5vwYGr1t284bSCl10zQK - t8CqOF3t5vwYGr11XU8N1uRogyXt5vx4Tv/PBkZYQM/dyM358ZzGQJNwyUWh8IeyxtuMD8uGEhMTMBS/ - 9RIHYm1/mClQxHh6edOPHpFj4Lb4SNnWMLgGSzjZYGkD1MZxfGFbw+Bv4L+5HAPHbrC1/YvI8/yDWs52 - nYGgW5FHtcUmC3wn3to2D1H0DRIt3n90sPmTAAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFhSURBVEhLvVVBToRAEESNF/+kv+DChRsPICFwMfMFLwa9 + 6MkHyB6NDzGEA1/Y7IaDOGPX7LQ7DBJmd8VKKlPd6e6a3oUQTCHPc0lUOIuiGJxMxEzT5gchxDkNUL44 + 2CBJkstlDYS4WniDR72BlFIPsE8mx8BBBjfFSp1CM2YPcn+PougLT0Xf9+o6r4j3EsU4bW3n3BgabNtW + P11xHH9mWfYCg59H7y8NzMxeGzBhwIXHkv8T5tIbyIFB13VK3L1SQ6WLd2Z7befcGBq9TdNMG1RVpeq6 + lrgFVsVpazvnxtDoLctybLAkBxvMaTvnxlP6fzbQwgB66kZ2zo2nNAbqhE0u8oU7lDXeZnxYVpQYmYC+ + +K2X2BMfzA8zBooYz28f6skhcgzcFh8p0+oH22AOJxvMbYDaMAwvTKsf3A3cN5dj4NgN1qZ/Fmmabqnl + bNfpCboVeRRrbDLDDfHWtDkIgm9JZN4hj8l62wAAAABJRU5ErkJggg== @@ -154,87 +154,87 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHBSURBVEhLnZM9LwRRGIU38VVp/AGJUqPQIDMjVH4AnYRK - IyKEnRGFgtBIRBRKSpYEczcbHwUNCZGlUEtQ0hESwnXPeDeZuGfNrCd5cjP3vefM7uxOphx9fbkqx8/3 - u4EKvay6bxpY+/ACpedzVxprdG32Mcc5nJdoMm1j+w1OVp2h6Lfbp7fWHsR55KTib8ynKrCS3oUjPbdZ - jFY2R04qyuNNKZeF4fPbuwZY2TzS5KWK4/nhCg0a47B5pMlLFceZVBc0aIzD5hB5qeI44+qJBWEcNofI - SxXH61efLAjjsHmkyUuVTefMcTUNGbun8/r69km/mB8YK67ZOSh1Nq1DlzUsEDe7dk73S3Yapc6mdIOD - 4sO/zF/cRTeROhv2DfAoBpZOtL9+rmc3inph6ypacY199qikzibNI0qj1Nk0z+RqWaBSpc6mZ6RQxwKV - KnU2P3/T1S8WSu/ql9Rx/nqT05j4JjuBOmTBtCIvVRzXD4dZMK3ISxWnY3K3vj1QjyycJHLIS1V5XH9v - kBUkiZxUJOP6apmVlBPnJZoeNwgnWkZ33lhhScxxTiKV0zWdb3SCcNGU3RhfY95gH3M5SshkvgGoyriE - 9kg28AAAAABJRU5ErkJggg== + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHASURBVEhLnZM9LwRRGIU38VVp/AHRahQaZGaEyg+gIqHS + iAhhZ0ShIDQSEYmWkiXB3I34KGhIiCyFWoKSjpAQrnvGu8nEPWtmPcmTm7nvPWd2Z3cypejpyVU4fr7P + DVToZdV9Q//qhxcoPZe70lija7OPOc7hvESTaRndr3Oy6gxFv906vbX2IM4jJxV/Yz7VHivpnj/SsxuF + aGVz5KSiNN6kclkYPr+9a4CVzSNNXqo4nh8u06AxDptHmrxUcZwJdUGDxjhsDpGXKo4zpp5YEMZhc4i8 + VHG8XvXJgjAOm0eavFTZtE8fV9KQsXMqr69vn/SL+YGx4pqdg1Jn0zx4WcUCcbOr53S/aLtR6myKNzgo + PPzL/MVddBOps2HfAI+if/FE+2vnema9oOc3r6IV19hnj0rqbNI8ojRKnU3jdK6aBcpV6my6hvdqWKBc + pc7m52+68sVC6V35kjrOX29yGhPfZCdQhyyYVuSliuP64RALphV5qeK0TezUtgbqkYWTRA55qSqN6+8O + sIIkkZOKZFxfLbGSUuK8RNPjBuF408j2GyssijnOSaR8Oqby9U4QLpiyG+NrzBvsYy5HCZnMN4QSuH4A + HIXWAAAAAElFTkSuQmCC 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 - ZGBgYAAASTmIRRBkor0AAAAASUVORK5CYII= + ZGBgYAAAYx2H2ukKpvoAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHCSURBVEhLYwCD+nomCINGwLZs0wmbss0hxmlnWKFC1AV2 - FZv/Q/EN2/JNKfb1+zmgUtQBtuUN/0AYZAmItijd9MyufHO5ff56AagSygC6BTC2TdGmN0AfdTpVbZaG - KiUPQIMHJ7asWPvFrmzzdJuKrWpQLaQBXD5AZ2tVbP5jU75ppVXpBhMGhv+MUO2EAT5DkdlwMddNf23L - N+yxr9jiQlQSB2kkC7tt/mtTuvmUbcWm8NDQVcxQ4zABuktxsZHF0Pl2pRtvAvNTumvxTm6osQiAVQOp - FsDZm54CcalF4Q4hqPHUtgDKLljzzrZ8YwPYApAAdXHjP+uKzfftKrakgS3A6Qo0NrIYOh/GtinbcNm+ + FZv/Q/EN2/JNKfb1+zmgUtQBtuX1/0AYZAmItijd9MyufHO5ff56AagSygC6BTC2TdGmN0AfdTpVbZaG + KiUPQIMHJ7asWPvFrmzzdJuKrWpQLaQBXD5AZ2tVbP5jU75ppVXpBhMGhv+MUO2EAT5DkdlwMZdNf23L + N+yxr9jiQlQSB2kkC7tu/mtTuvmUbcWm8NDQVcxQ4zABuktxsZHF0Pl2pRtvAvNTumvxTm6osQiAVQOp + FsDZm54CcalF4Q4hqPHUtgDKLljzzrZ8YwPYApAAdXHDP+uKzfftKrakgS3A6Qo0NrIYOh/GtinbcNm+ YlOsR+42drDhIACSpBiXbT5iU7kpAFiOsUCNRQB8LkJmI4uBsHz8/N/W5Rt32JVucIQahR3ANBBtQdam nzZlG1fYlW8whBqBH4A0EoP189d/ty3fPBVYVKhDtRIH0F2Kyd74FlSq2lZtl4RqIQ1gN3Tzf1C9YFu2 - sdKmYosgVCl5AGQYCi7ZcBeUhrFme3IA3NXlm8/alm6OxprUKAHWpZsOAl3uRcPWBQmVB0mAgQEA6D+I - RTXTAxQAAAAASUVORK5CYII= + sdKmYosgVCl5AGQYCi7ZcBeUhrFme3IA3NXlm8/alm6OxprUKAHWpZsOAl3uRcPWBQmVB0mAgQEA9b+H + 2hvhANgAAAAASUVORK5CYII= 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 @@ -307,25 +307,25 @@ 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 - - 128, 20 - 233, 25 + + 368, 25 + \ No newline at end of file diff --git a/Controls.DocumentViewer/DocumentViewer.vb b/Controls.DocumentViewer/DocumentViewer.vb index 681a36dd..969f06c0 100644 --- a/Controls.DocumentViewer/DocumentViewer.vb +++ b/Controls.DocumentViewer/DocumentViewer.vb @@ -3,9 +3,9 @@ Imports System.Globalization Imports System.Text.RegularExpressions Imports DigitalData.Modules.Logging Imports Independentsoft.Msg -Imports DevExpress.Spreadsheet.DocumentFormat Imports DevExpress.Spreadsheet Imports GdPicture14 +Imports DevExpress Public Class DocumentViewer Private Enum ZoomMode @@ -69,9 +69,7 @@ Public Class DocumentViewer ''' Terminate Viewer, freeing up resources and deleting temp files ''' Public Sub Done() - _logger.Warn("Called Done, removing temp files") DeleteTempFiles() - 'Dispose() End Sub ''' @@ -132,28 +130,37 @@ Public Class DocumentViewer Dim oTempFileName = IO.Path.GetTempFileName() oMime.Save(oTempFileName, True) - RichEditControl1.LoadDocument(oTempFileName, DevExpress.XtraRichEdit.DocumentFormat.Mht) + RichEditControl1.LoadDocument(oTempFileName, XtraRichEdit.DocumentFormat.Mht) _TempFiles.Add(oTempFileName) RichEditControl1.Visible = True RichEditControl1.Dock = DockStyle.Fill - Me.infoLabel.Text = "Type: " & "MSG Email File" - Case ".EML" - RichEditControl1.LoadDocument(FilePath, DevExpress.XtraRichEdit.DocumentFormat.Mht) + Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT" + Dim oFormat As XtraRichEdit.DocumentFormat = XtraRichEdit.DocumentFormat.Undefined + + Select Case oExtension.ToUpper + Case ".EML" : oFormat = XtraRichEdit.DocumentFormat.Mht + Case ".DOC" : oFormat = XtraRichEdit.DocumentFormat.Doc + Case ".DOCX" : oFormat = XtraRichEdit.DocumentFormat.OpenXml + Case ".ODT" : oFormat = XtraRichEdit.DocumentFormat.OpenDocument + Case ".RTF" : oFormat = XtraRichEdit.DocumentFormat.Rtf + Case ".TXT" : oFormat = XtraRichEdit.DocumentFormat.PlainText + End Select + + RichEditControl1.LoadDocument(FilePath, oFormat) RichEditControl1.Visible = True RichEditControl1.Dock = DockStyle.Fill - Me.infoLabel.Text = "Type: " & "EML Email File" Case ".XLSX", ".XLS", "CSV" - Dim oFormat As DevExpress.Spreadsheet.DocumentFormat = Undefined + Dim oFormat As Spreadsheet.DocumentFormat = Spreadsheet.DocumentFormat.Undefined Select Case oExtension.ToUpper - Case "XLSX" : oFormat = Xlsx - Case "XLS" : oFormat = Xls - Case "CSV" : oFormat = Csv + Case "XLSX" : oFormat = Spreadsheet.DocumentFormat.Xlsx + Case "XLS" : oFormat = Spreadsheet.DocumentFormat.Xls + Case "CSV" : oFormat = Spreadsheet.DocumentFormat.Csv End Select SpreadsheetControl1.LoadDocument(FilePath, oFormat) @@ -164,22 +171,11 @@ Public Class DocumentViewer SpreadsheetControl1.Visible = True SpreadsheetControl1.Dock = DockStyle.Fill - Me.infoLabel.Text = "Type: " & "Excel/CSV File" Case Else - _logger.Info("Displaying file {0}", FilePath) - mainToolStrip.Visible = True GdViewer.DisplayFromFile(FilePath) - - Me.infoLabel.Text = "Type: " & GetDocumentTypeLabel() End Select - - If _hide_file_info_from_user Then - statusLabel.Text = String.Empty - Else - statusLabel.Text = "Path: " & FilePath - End If Catch ex As Exception _logger.Error(ex) End Try @@ -197,25 +193,6 @@ Public Class DocumentViewer UpdateMainUi() End Sub - Private Function GetDocumentTypeLabel() As String - Dim result As String = "" - Select Case GdViewer.GetDocumentType() - Case DocumentType.DocumentTypeBitmap - result = "Imagefile" - Case DocumentType.DocumentTypeMetaFile - result = "Metafile" - Case DocumentType.DocumentTypePDF - result = "PDF" - Case DocumentType.DocumentTypeSVG - result = "SVG" - Case DocumentType.DocumentTypeTXT - result = "textfile" - Case DocumentType.DocumentTypeUnknown - result = "Unknown" - End Select - Return result - End Function - ''' ''' Configures the viewer to hide the file path to the end-user. ''' @@ -558,9 +535,4 @@ Public Class DocumentViewer MagnifierToolStripMenuItem.Checked = True GdViewer.Focus() End Sub - - 'Private Sub DocumentViewer_Disposed(sender As Object, e As EventArgs) Handles Me.Disposed - ' _logger.Warn("Disposing GDViewer") - ' GdViewer.Dispose() - 'End Sub End Class diff --git a/Controls.DocumentViewer/My Project/AssemblyInfo.vb b/Controls.DocumentViewer/My Project/AssemblyInfo.vb index 81972474..61fc2499 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/GUIs.Test.DocumentViewerTest/Form1.vb b/GUIs.Test.DocumentViewerTest/Form1.vb index 0aaf2df7..1ff04497 100644 --- a/GUIs.Test.DocumentViewerTest/Form1.vb +++ b/GUIs.Test.DocumentViewerTest/Form1.vb @@ -4,6 +4,18 @@ Imports GdPicture14 Public Class Form1 Private oSubform As Form3 + Private LogConfig As LogConfig + + Private Sub Form1_Load(sender As Object, e As EventArgs) Handles Me.Load + Dim oLogConfig As New LogConfig(LogConfig.PathType.CustomPath, + Application.StartupPath, + Nothing, + My.Application.Info.CompanyName, + My.Application.Info.ProductName) + + LogConfig = oLogConfig + End Sub + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click Dim oResult = OpenFileDialog1.ShowDialog() @@ -14,8 +26,7 @@ Public Class Form1 Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click Try Dim oKey = "0467389434974657969312056" - Dim oLogConfig As New LogConfig(LogConfig.PathType.CurrentDirectory) - Dim oSubform As New Form3(oLogConfig, oKey) + Dim oSubform As New Form3(LogConfig, oKey) oSubform.FilePath = TextBox1.Text oSubform.Show() @@ -27,8 +38,7 @@ Public Class Form1 Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click Try Dim oKey = "0467389434974657969312056" - Dim oLogConfig As New LogConfig(LogConfig.PathType.CurrentDirectory) - Dim oSubform As New Form4(oLogConfig, oKey) + Dim oSubform As New Form4(LogConfig, oKey) oSubform.FilePath = TextBox1.Text oSubform.Show() @@ -76,4 +86,6 @@ Public Class Form1 End If End Using End Sub + + End Class