diff --git a/Controls.DocumentViewer/DocumentViewer.Designer.vb b/Controls.DocumentViewer/DocumentViewer.Designer.vb index 3857551f..a6496ade 100644 --- a/Controls.DocumentViewer/DocumentViewer.Designer.vb +++ b/Controls.DocumentViewer/DocumentViewer.Designer.vb @@ -1,9 +1,9 @@ - _ + Partial Class DocumentViewer Inherits System.Windows.Forms.UserControl 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. - _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) Try If disposing AndAlso components IsNot Nothing Then @@ -20,13 +20,12 @@ Partial Class DocumentViewer 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. - _ + Private Sub InitializeComponent() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(DocumentViewer)) Me.GdViewer = New GdPicture14.GdViewer() Me.mainToolStrip = New System.Windows.Forms.ToolStrip() Me.btnPrint = New System.Windows.Forms.ToolStripButton() - Me.ToolStripSeparator3 = New System.Windows.Forms.ToolStripSeparator() Me.btnFitWidth = New System.Windows.Forms.ToolStripButton() Me.btnFitPage = New System.Windows.Forms.ToolStripButton() Me.ToolStripSeparator2 = New System.Windows.Forms.ToolStripSeparator() @@ -55,7 +54,7 @@ Partial Class DocumentViewer Me.ToolStripSeparator4 = New System.Windows.Forms.ToolStripSeparator() Me.btnSettings = New System.Windows.Forms.ToolStripButton() Me.statusbar = New System.Windows.Forms.StatusStrip() - Me.ToolStripStatusLabel1 = New System.Windows.Forms.ToolStripStatusLabel() + 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() @@ -139,7 +138,7 @@ Partial Class DocumentViewer Me.mainToolStrip.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) Me.mainToolStrip.GripStyle = System.Windows.Forms.ToolStripGripStyle.Hidden Me.mainToolStrip.ImageScalingSize = New System.Drawing.Size(24, 24) - Me.mainToolStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.btnPrint, Me.ToolStripSeparator3, Me.btnFitWidth, Me.btnFitPage, Me.ToolStripSeparator2, Me.btnMouseMode, Me.ToolStripSeparator6, Me.btnFirstPage, Me.btnPreviousPage, Me.tbCurrentPage, Me.lblPageCount, Me.btnNextPage, Me.btnLastPage, Me.ToolStripSeparator1, Me.btnZoomOut, Me.cbZoom, Me.btnZoomIn, Me.ToolStripSeparator5, Me.btnRotateLeft, Me.btnRotateRight, Me.btnFlipX, Me.btnFlipY, Me.ToolStripSeparator4, Me.btnSettings}) + Me.mainToolStrip.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.btnPrint, Me.btnFitWidth, Me.btnFitPage, Me.ToolStripSeparator2, Me.btnMouseMode, Me.ToolStripSeparator6, Me.btnFirstPage, Me.btnPreviousPage, Me.tbCurrentPage, Me.lblPageCount, Me.btnNextPage, Me.btnLastPage, Me.ToolStripSeparator1, Me.btnZoomOut, Me.cbZoom, Me.btnZoomIn, Me.ToolStripSeparator5, Me.btnRotateLeft, Me.btnRotateRight, Me.btnFlipX, Me.btnFlipY, Me.ToolStripSeparator4, Me.btnSettings}) Me.mainToolStrip.Location = New System.Drawing.Point(0, 0) Me.mainToolStrip.Name = "mainToolStrip" Me.mainToolStrip.Size = New System.Drawing.Size(1015, 31) @@ -156,12 +155,6 @@ Partial Class DocumentViewer Me.btnPrint.Size = New System.Drawing.Size(28, 28) Me.btnPrint.Text = "Print document" ' - 'ToolStripSeparator3 - ' - Me.ToolStripSeparator3.Margin = New System.Windows.Forms.Padding(10, 0, 10, 0) - Me.ToolStripSeparator3.Name = "ToolStripSeparator3" - Me.ToolStripSeparator3.Size = New System.Drawing.Size(6, 31) - ' 'btnFitWidth ' Me.btnFitWidth.DisplayStyle = System.Windows.Forms.ToolStripItemDisplayStyle.Image @@ -391,7 +384,7 @@ Partial Class DocumentViewer ' 'statusbar ' - Me.statusbar.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ToolStripStatusLabel1, Me.statusLabel}) + 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) @@ -399,15 +392,17 @@ Partial Class DocumentViewer Me.statusbar.TabIndex = 7 Me.statusbar.Text = "StatusStrip1" ' - 'ToolStripStatusLabel1 + 'infoLabel ' - Me.ToolStripStatusLabel1.Name = "ToolStripStatusLabel1" - Me.ToolStripStatusLabel1.Size = New System.Drawing.Size(0, 17) + 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(0, 17) + Me.statusLabel.Size = New System.Drawing.Size(66, 17) + Me.statusLabel.Text = "statusLabel" ' 'OpenFileDialog ' @@ -423,6 +418,7 @@ Partial Class DocumentViewer Me.RichEditControl1.Size = New System.Drawing.Size(249, 225) Me.RichEditControl1.TabIndex = 8 Me.RichEditControl1.Text = "RichEditControl1" + Me.RichEditControl1.Visible = False ' 'DocumentViewer ' @@ -446,7 +442,6 @@ Partial Class DocumentViewer Friend WithEvents GdViewer As GdPicture14.GdViewer Friend WithEvents mainToolStrip As ToolStrip Friend WithEvents btnPrint As ToolStripButton - Friend WithEvents ToolStripSeparator3 As ToolStripSeparator Friend WithEvents btnFitWidth As ToolStripButton Friend WithEvents btnFitPage As ToolStripButton Friend WithEvents ToolStripSeparator2 As ToolStripSeparator @@ -475,7 +470,7 @@ Partial Class DocumentViewer Friend WithEvents ToolStripSeparator4 As ToolStripSeparator Friend WithEvents btnSettings As ToolStripButton Friend WithEvents statusbar As StatusStrip - Friend WithEvents ToolStripStatusLabel1 As ToolStripStatusLabel + Friend WithEvents infoLabel As ToolStripStatusLabel Friend WithEvents statusLabel As ToolStripStatusLabel Friend WithEvents OpenFileDialog As OpenFileDialog Friend WithEvents RichEditControl1 As DevExpress.XtraRichEdit.RichEditControl diff --git a/Controls.DocumentViewer/DocumentViewer.resx b/Controls.DocumentViewer/DocumentViewer.resx index 55c9128f..22c8c65b 100644 --- a/Controls.DocumentViewer/DocumentViewer.resx +++ b/Controls.DocumentViewer/DocumentViewer.resx @@ -124,13 +124,13 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFgSURBVEhLvVVBTsMwEAwgLvwJfpFzbnlApCi5IL+iEqAI - TnwglbggHsItyiEPqEA5NNjsuF7qOFhxW8JII8+udne8baJEPhRFIYkKZ1mWo5OJmGnawiCEOKcBKhQH - G6RpermsgRBXC29wrzeQUuoB9snkGDjI4KZcq1NoxuxB7m9JknzhqRiGQV0XNfFBohinre2cG0ODXdfp - p4tmbvM8f4bBz6P3lwZm5qANmDDgwmPJ/wlz6Q3kyKDveyVWL9RQ6+Kd2V7bOTeGRm/btn6Duq5V0zQS - t8CqOG1t59wYGr1VVU0NluRogzlt59zYp/9nAy0MoH03snNu7NMYqBM2uSgU7lDWeJvxYVlTYmIChuK3 - XuJAvDM/zBQoYjy9vqtHh8gxcFt8pExrGGyDOZxsMLcBauM4vjCtYXA3cN9cjoFjN9iY/llkWfZJLWe7 - zkDQrcij3GCTGX4Qb02bgyj6BjVC3/dGvIT4AAAAAElFTkSuQmCC + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAFhSURBVEhLvVVBToRAEESNF/+kv+AKNx5AQuBi5hMe3JDo + yQ+w8WR8iCfCgQ9sdsNBnLFrdtodBgmzu2IllanudHdN70IIppDnuSQqnEVRDE4mYqZp84MQ4pIGKF8c + bZAkyfWyBkLcLLzBSm8gpdQD7JPJMXCUwV2xVufQjDmA3N+jKPrCU9H3vbrNK+JKohinre2cG0ODbdvq + pyuO488sy15g8PPo/aWBmdlrAyYMuPBU8n/CXHoDOTDouk6Jh1dqqHTx3uyg7ZwbQ6O3aZppg6qqVF3X + ErfAqjhtbefcGBq9ZVmODZbkYIM5befceEr/zwZaGEBP3cjOufGUxkCdsMlFvnCHssbbjA/LmhIjE9AX + v/USe+Kj+WHGQBHj+e1DPTlEjoHb4iNlWv1gG8zhbIO5DVAbhuGVafWDu4H75nIMnLrBxvTPIk3THbVc + 7Ds9Qbcij2KDTWa4Jd6bNgdB8A1sed+Z/8S0TAAAAABJRU5ErkJggg== @@ -154,87 +154,87 @@ iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 - YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHASURBVEhLnZM9LwRRGIU38VVp/AGdQqPQIDMjVH4AncRW - GhEh7IwoFIRGIqJUULIkmLsRHwUNCZGlUEtQ0hESwnXPeDeZuGfNrCd5cjP3vefM7uxOphx9ffkqxy/0 + YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHASURBVEhLnZM9LwRRGIU38VVp/AGVRqPQIDMjVH4AnWRV + GhEh7IwoFIRGIqLTULIkmLsRHwUNCZGlUEtQ0hESwnXPeDeZuGfNrCd5cjP3vefM7uxOphx9ffkqxy/0 u4EKvZy6b8qufniB0nP5K401ujb7mOMczks0mbbR/QYnp85Q9Nut01trD+I8clLxN+ZT7bGS3vkjPbtR jFY2R04qyuNNKpeF4fPbuwZY2TzS5KWK4/nhMg0a47B5pMlLFceZUBc0aIzD5hB5qeI4Y+qJBWEcNofI SxXHy6pPFoRx2DzS5KXKpnP6uJqGjN1TBX19+6RfzA+MFdfsHJQ6m9bByxoWiJtbPaf7JTuNUmdTusFB - 8eFfFi7uoptInQ37BngUA4sn2l871zPrRT2/eRWtuMY+e1RSZ5PmEaVR6myap/O1LFCpUmfTM7xXxwKV - KnU2P3/TlS8WSu/Kl9Rx/nqT05j4JjuBOmTBtCIvVRzXD4dYMK3ISxWnY2Knvj1QjyycJHLIS1V5XH83 - ywqSRE4qknF9tcRKyonzEk2PG4TjLSPbb6ywJOY4J5HK6ZoqNDpBuGDKboyvMW+wj7kcJWQy302FuJ6d - LkBBAAAAAElFTkSuQmCC + 8eFfFi7uoptInQ37BngU2cUT7a+d65n1op7fvIpWXGOfPSqps0nziNIodTbN0/laFqhUqbPpGd6rY4FK + lTqbn7/pyhcLpXflS+o4f73JaUx8k51AHbJgWpGXKo7rh0MsmFbkpYrTMbFT3x6oRxZOEjnkpao8rr87 + wAqSRE4qknF9tcRKyonzEk2PG4TjLSPbb6ywJOY4J5HK6ZoqNDpBuGDKboyvMW+wj7kcJWQy3xcBuJab + Sv3YAAAAAElFTkSuQmCC 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 - ZGBgYAAA4ZqJ8RwZ1lsAAAAASUVORK5CYII= + ZGBgYAAA+36Jhi0FcugAAAAASUVORK5CYII= iVBORw0KGgoAAAANSUhEUgAAABgAAAAYCAYAAADgdz34AAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8 YQUAAAAJcEhZcwAADsMAAA7DAcdvqGQAAAHCSURBVEhLYwCD+nomCINGwLZs0wmbss0hxmlnWKFC1AV2 - FZv/Q/EN2/JNKfb1+zmgUtQBtuUt/0AYZAmItijd9MyufHO5ff56AagSygC6BTC2TdGmN0AfdTpVbZaG - KiUPQIMHJ7asWPvFrmzzdJuKrWpQLaQBXD5AZ2tVbP5jU75ppVXpBhMGhv+MUO2EAT5DkdlwMc9Nf23L - N+yxr9jiQlQSB2kkC3tt/mtTuvmUbcWm8NDQVcxQ4zABuktxsZHF0Pl2pRtvAvNTumvxTm6osQiAVQOp - FsDZm54CcalF4Q4hqPHUtgDKLljzzrZ8YwPYApAAdXHrP+uKzfftKrakgS3A6Qo0NrIYOh/GtinbcNm+ + FZv/Q/EN2/JNKfb1+zmgUtQBtuXN/0AYZAmItijd9MyufHO5ff56AagSygC6BTC2TdGmN0AfdTpVbZaG + KiUPQIMHJ7asWPvFrmzzdJuKrWpQLaQBXD5AZ2tVbP5jU75ppVXpBhMGhv+MUO2EAT5DkdlwMY9Nf23L + N+yxr9jiQlQSB2kkC3tu/mtTuvmUbcWm8NDQVcxQ4zABuktxsZHF0Pl2pRtvAvNTumvxTm6osQiAVQOp + FsDZm54CcalF4Q4hqPHUtgDKLljzzrZ8YwPYApAAdXHLP+uKzfftKrakgS3A6Qo0NrIYOh/GtinbcNm+ YlOsR+42drDhIACSpBiXbT5iU7kpAFiOsUCNRQB8LkJmI4uBsHz8/N/W5Rt32JVucIQahR3ANBBtQdam nzZlG1fYlW8whBqBH4A0EoP189d/ty3fPBVYVKhDtRIH0F2Kyd74FlSq2lZtl4RqIQ1gN3Tzf1C9YFu2 - sdKmYosgVCl5AGQYCi7ZcBeUhrFme3IA3NXlm8/alm6OxprUKAHWpZsOAl3uRcPWBQmVB0mAgQEAsj+J - 8ff7OMIAAAAASUVORK5CYII= + sdKmYosgVCl5AGQYCi7ZcBeUhrFme3IA3NXlm8/alm6OxprUKAHWpZsOAl3uRcPWBQmVB0mAgQEAv7+J + hvKjV0wAAAAASUVORK5CYII= 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 @@ -307,19 +307,19 @@ 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 diff --git a/Controls.DocumentViewer/DocumentViewer.vb b/Controls.DocumentViewer/DocumentViewer.vb index 35668297..1ef57d2b 100644 --- a/Controls.DocumentViewer/DocumentViewer.vb +++ b/Controls.DocumentViewer/DocumentViewer.vb @@ -27,6 +27,8 @@ Public Class DocumentViewer ' List of all created temp files when converting msg files Private _TempFiles As New List(Of String) + Private _ViewOnly As Boolean = False + Private Sub DocumentViewer_Load(sender As Object, e As EventArgs) Handles Me.Load Dim zoomModes As New Dictionary(Of ZoomMode, String) From { {ZoomMode.Zoom50, "50%"}, @@ -79,16 +81,12 @@ Public Class DocumentViewer Exit Sub End If - '_logger.Info("Resetting Viewer.") - 'GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer - 'GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter + GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer + GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter - _logger.Info("Loading File.") DoLoadFile(filepath) - '_logger.Info("Updating UI.") - 'statusLabel.Text = _docPath - ' UpdateMainUi() + UpdateMainUi() End Sub Public Sub CloseDocument() @@ -96,6 +94,11 @@ Public Class DocumentViewer UpdateMainUi() End Sub + Public Sub SetViewOnly(Value As Boolean) + _ViewOnly = Value + UpdateMainUi() + End Sub + Public Sub DeleteTempFiles() For Each oFile In _TempFiles Try @@ -190,10 +193,7 @@ Public Class DocumentViewer End Function Private Sub UpdateMainUi() - Exit Sub - If GdViewer.PageCount = 0 Then - 'btnOpen.Enabled = True btnPrint.Enabled = False btnFirstPage.Enabled = False btnPreviousPage.Enabled = False @@ -214,7 +214,6 @@ Public Class DocumentViewer lblPageCount.Text = "/ 0" cbZoom.SelectedIndex = -1 Else - 'btnOpen.Enabled = False btnPrint.Enabled = True btnFirstPage.Enabled = True btnPreviousPage.Enabled = True @@ -233,6 +232,12 @@ Public Class DocumentViewer btnFlipY.Enabled = True UpdateaNavigationToolbar() End If + + If _ViewOnly Then + btnPrint.Visible = False + Else + btnPrint.Visible = True + End If End Sub Private Sub btnFirstPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles btnFirstPage.Click @@ -470,12 +475,17 @@ Public Class DocumentViewer heightInches = GdViewer.PageHeight / GdViewer.VerticalResolution End If - Me.ToolStripStatusLabel1.Text = "Typ: " + GetDocumentTypeLabel() + " - " + - "Seitengröße (zoll): " + Trim(Str(Math.Round(widthInches, 2))) + " × " + Trim(Str(Math.Round(heightInches, 2))) + " - " + - "Seitengröße (pixel): " + Trim(Str(GdViewer.PageWidth)) + " × " + Trim(Str(GdViewer.PageHeight)) + " - " + - "Horizontale Auflösung: " + Trim(Str(Math.Round(GdViewer.HorizontalResolution, 2))) + " DPI - " + - "Vertikale Auflösung: " + Trim(Str(Math.Round(GdViewer.VerticalResolution, 2))) + " DPI" + infoLabel.Text = "Typ: " + GetDocumentTypeLabel() + " - " + + "Seitengröße (zoll): " + Trim(Str(Math.Round(widthInches, 2))) + " × " + Trim(Str(Math.Round(heightInches, 2))) + " - " + + "Horizontale Auflösung: " + Trim(Str(Math.Round(GdViewer.HorizontalResolution, 2))) + " DPI - " + + "Vertikale Auflösung: " + Trim(Str(Math.Round(GdViewer.VerticalResolution, 2))) + " DPI" + + If _ViewOnly Then + statusLabel.Text = "" + Else + statusLabel.Text = _docPath + End If End Sub Private Sub btnFitWidth_Click(ByVal sender As Object, ByVal e As EventArgs) Handles btnFitWidth.Click diff --git a/GUIs.Test.DocumentViewerTest/Form2.vb b/GUIs.Test.DocumentViewerTest/Form2.vb index 3a3e8f96..635ab4f3 100644 --- a/GUIs.Test.DocumentViewerTest/Form2.vb +++ b/GUIs.Test.DocumentViewerTest/Form2.vb @@ -23,6 +23,8 @@ Public Class Form3 Logger.Info("DocumentViewer Form Loaded") DocumentViewer1.Init(LogConfig, Key) DocumentViewer1.LoadFile(FilePath) + DocumentViewer1.SetViewOnly(True) + Logger.Info("File Loaded") End Sub @@ -31,12 +33,9 @@ Public Class Form3 End Sub Private Sub Form2_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing - DocumentViewer1.Done() Logger.Info("Form closing") _frm4.Close() - - End Sub Private Sub Form3_Shown(sender As Object, e As EventArgs) Handles Me.Shown diff --git a/GUIs.Test.DocumentViewerTest/GUIs.Test.DocumentViewerTest.vbproj b/GUIs.Test.DocumentViewerTest/GUIs.Test.DocumentViewerTest.vbproj index 2c9fa542..3da771df 100644 --- a/GUIs.Test.DocumentViewerTest/GUIs.Test.DocumentViewerTest.vbproj +++ b/GUIs.Test.DocumentViewerTest/GUIs.Test.DocumentViewerTest.vbproj @@ -47,9 +47,6 @@ On - - ..\Controls.DocumentViewer\obj\Debug\DigitalData.Controls.DocumentViewer.dll - D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll @@ -157,6 +154,10 @@ + + {0958cddf-4a16-41f6-8837-8335f71d599c} + DocumentViewer + {903b2d7d-3b80-4be9-8713-7447b704e1b0} Logging