GdViewer Hintergrund weiß gesetzt; ViewerMode.Richtext und Anhängsel entfernt. - DocumentViewer

Controls.DocumentViewer/DocumentViewer.Designer.vb

@@ -26,7 +26,6 @@ Partial Class DocumentViewer
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(DocumentViewer))
         Me.GdViewer = New GdPicture14.GdViewer()
         Me.OpenFileDialog = New System.Windows.Forms.OpenFileDialog()
-        Me.RichEditControl1 = New DevExpress.XtraRichEdit.RichEditControl()
         Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components)
         Me.ToolbarDocumentViewer = New DevExpress.XtraBars.Bar()
         Me.buttonPrint = New DevExpress.XtraBars.BarButtonItem()
@@ -98,6 +97,7 @@ Partial Class DocumentViewer
         Me.GdViewer.DrawPageBorders = True
         Me.GdViewer.EnableDeferredPainting = True
         Me.GdViewer.EnabledProgressBar = True
+        Me.GdViewer.EnableFuzzySearch = False
         Me.GdViewer.EnableICM = False
         Me.GdViewer.EnableMenu = True
         Me.GdViewer.EnableMouseWheel = True
@@ -152,19 +152,6 @@ Partial Class DocumentViewer
         '
         Me.OpenFileDialog.FileName = "OpenFileDialog1"
         '
-        'RichEditControl1
-        '
-        Me.RichEditControl1.Location = New System.Drawing.Point(616, 270)
-        Me.RichEditControl1.MenuManager = Me.BarManager1
-        Me.RichEditControl1.Name = "RichEditControl1"
-        Me.RichEditControl1.Options.HorizontalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden
-        Me.RichEditControl1.Options.VerticalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden
-        Me.RichEditControl1.ReadOnly = True
-        Me.RichEditControl1.Size = New System.Drawing.Size(249, 161)
-        Me.RichEditControl1.TabIndex = 0
-        Me.RichEditControl1.TabStop = False
-        Me.RichEditControl1.Visible = False
-        '
         'BarManager1
         '
         Me.BarManager1.Bars.AddRange(New DevExpress.XtraBars.Bar() {Me.ToolbarDocumentViewer})
@@ -468,7 +455,6 @@ Partial Class DocumentViewer
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.Controls.Add(Me.lbFileNotLoaded)
-        Me.Controls.Add(Me.RichEditControl1)
         Me.Controls.Add(Me.SpreadsheetControl1)
         Me.Controls.Add(Me.GdViewer)
         Me.Controls.Add(Me.barDockControlLeft)
@@ -491,7 +477,6 @@ Partial Class DocumentViewer
 
     Friend WithEvents GdViewer As GdPicture14.GdViewer
     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
     Friend WithEvents BarManager1 As DevExpress.XtraBars.BarManager

Controls.DocumentViewer/DocumentViewer.vb

@@ -22,7 +22,6 @@ Public Class DocumentViewer
 
     Private Enum ViewerMode
         GDPicture
-        RichText
         Excel
     End Enum
 
@@ -287,12 +286,6 @@ Public Class DocumentViewer
         _Config.Save()
     End Sub
 
-    Private Sub RichEditControl1_SizeChanged(sender As Object, e As EventArgs) Handles RichEditControl1.SizeChanged
-        Dim oControlWidth = RichEditControl1.Width - 100
-        Dim oPageWidth = Units.DocumentsToPixelsF(RichEditControl1.Document.Sections(0).Page.Width, RichEditControl1.DpiX)
-        RichEditControl1.Views.PrintLayoutView.ZoomFactor = oControlWidth / oPageWidth
-    End Sub
-
     Private Sub btnOpen_Click(sender As Object, e As EventArgs)
         GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
         GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
@@ -309,21 +302,13 @@ Public Class DocumentViewer
     End Sub
 
     Private Sub btnPreviousPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonPrevPage.ItemClick
-        If _ViewerMode = ViewerMode.GDPicture Then
-            GdViewer.DisplayPreviousPage()
-        ElseIf _ViewerMode = ViewerMode.RichText Then
-            Dim oCmd As New PreviousPageCommand(RichEditControl1)
-            oCmd.Execute()
-        End If
+        _ViewerMode = ViewerMode.GDPicture
+        GdViewer.DisplayPreviousPage()
     End Sub
 
     Private Sub btnNextPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonNextPage.ItemClick
-        If _ViewerMode = ViewerMode.GDPicture Then
-            GdViewer.DisplayNextPage()
-        ElseIf _ViewerMode = ViewerMode.RichText Then
-            Dim oCmd As New NextPageCommand(RichEditControl1)
-            oCmd.Execute()
-        End If
+        _ViewerMode = ViewerMode.GDPicture
+        GdViewer.DisplayNextPage()
     End Sub
 
     Private Sub btnLastPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonLastPage.ItemClick
@@ -352,21 +337,13 @@ Public Class DocumentViewer
     End Sub
 
     Private Sub btnZoomOut_Click(sender As Object, e As EventArgs) Handles buttonZoomOut.ItemClick
-        If _ViewerMode = ViewerMode.GDPicture Then
-            GdViewer.ZoomOUT()
-        ElseIf _ViewerMode = ViewerMode.RichText Then
-            Dim oCmd As New ZoomOutCommand(RichEditControl1)
-            oCmd.Execute()
-        End If
+        _ViewerMode = ViewerMode.GDPicture
+        GdViewer.ZoomOUT()
     End Sub
 
     Private Sub btnZoomIn_Click(sender As Object, e As EventArgs) Handles buttonZoomIn.ItemClick
-        If _ViewerMode = ViewerMode.GDPicture Then
-            GdViewer.ZoomIN()
-        ElseIf _ViewerMode = ViewerMode.RichText Then
-            Dim oCmd As New ZoomInCommand(RichEditControl1)
-            oCmd.Execute()
-        End If
+        _ViewerMode = ViewerMode.GDPicture
+        GdViewer.ZoomIN()
     End Sub
 
     Private Sub btnPrint_Click(sender As Object, e As EventArgs) Handles buttonPrint.ItemClick
@@ -474,18 +451,12 @@ Public Class DocumentViewer
             End If
             Dim oExtension As String = _FileInfo.Extension.ToUpper
             Select Case _ViewerMode
-                Case ViewerMode.RichText
-                    _logger.Debug("Closing RichText Editor")
-                    RichEditControl1.CreateNewDocument()
-
                 Case ViewerMode.Excel
                     _logger.Debug("Closing Excel Editor")
                     SpreadsheetControl1.CreateNewDocument()
-
                 Case Else
                     _logger.Debug("Closing GDPicture Viewer")
                     GdViewer.CloseDocument()
-
             End Select
         Catch ex As Exception
             _logger.Warn($"Unexpected error in FreeFile: {ex.Message}")
@@ -498,9 +469,6 @@ Public Class DocumentViewer
 
             lbFileNotLoaded.Visible = False
 
-            RichEditControl1.Visible = False
-            RichEditControl1.Dock = DockStyle.None
-
             SpreadsheetControl1.Visible = False
             SpreadsheetControl1.Dock = DockStyle.None
 
@@ -520,6 +488,7 @@ Public Class DocumentViewer
                     GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
                     GdViewer.ForceTemporaryMode = True
                     GdViewer.AnnotationDropShadow = True
+                    GdViewer.BackColor = Color.White
 
                     If GdViewer.DisplayFromFile(FilePath) <> GdPictureStatus.OK Then
                         Dim oFileName = IO.Path.GetFileName(FilePath)
@@ -539,52 +508,24 @@ Public Class DocumentViewer
     End Function
 
     Private Sub FitToPage()
-        If _ViewerMode = ViewerMode.GDPicture Then
-            GdViewer.ZoomMode = ViewerZoomMode.ZoomModeFitToViewer
-        ElseIf _ViewerMode = ViewerMode.RichText Then
-            Dim oCmd As New FitToPageCommand(RichEditControl1)
-            oCmd.Execute()
-        End If
+        _ViewerMode = ViewerMode.GDPicture
+        GdViewer.ZoomMode = ViewerZoomMode.ZoomModeFitToViewer
     End Sub
 
     Private Sub FitToWidth()
-        If _ViewerMode = ViewerMode.GDPicture Then
-            GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
-        ElseIf _ViewerMode = ViewerMode.RichText Then
-            Dim oCmd As New FitWidthCommand(RichEditControl1)
-            oCmd.Execute()
-        End If
+        _ViewerMode = ViewerMode.GDPicture
+        GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
     End Sub
 
     Private Function DoLoadFile(Stream As Stream, Extension As String) As Boolean
         Try
-            RichEditControl1.Visible = False
-            RichEditControl1.Dock = DockStyle.None
 
             SpreadsheetControl1.Visible = False
             SpreadsheetControl1.Dock = DockStyle.None
 
             Select Case Extension.ToUpper
-                Case ".MSG"
 
-                    Dim oTempFileName = Path.Combine(IO.Path.GetTempPath(), Guid.NewGuid.ToString & ".msg")
-                    Using oFileStream As New FileStream(oTempFileName, FileMode.Create)
-                        Stream.Seek(0, SeekOrigin.Begin)
-                        Stream.CopyTo(oFileStream)
-                        Stream.Flush()
-                    End Using
-
-                    Dim oEmlPath As String = _email.Convert_ToEml(oTempFileName)
-                    DoLoadFile(oEmlPath)
-
-                Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
-                    RichEditControl1.LoadDocument(Stream, GetDocumentFormat(Extension))
-
-                    RichEditControl1.ActiveViewType = XtraRichEdit.RichEditViewType.PrintLayout
-                    RichEditControl1.Visible = True
-                    RichEditControl1.Dock = DockStyle.Fill
-
-                Case ".XLSX", ".XLS", ".CSV"
+                Case ".CSV"
                     SpreadsheetControl1.LoadDocument(Stream, GetSpreadsheetFormat(Extension))
 
                     Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
@@ -686,29 +627,6 @@ Public Class DocumentViewer
                 buttonLastPage.Visibility = ToVisibility(True)
                 txtCurrentPage.Visibility = ToVisibility(True)
 
-            Case ViewerMode.RichText
-                ToolbarDocumentViewer.Visible = True
-
-                buttonFitWidth.Visibility = ToVisibility(_ToolbarSettings.ShowFitWidthButton)
-                buttonFitPage.Visibility = ToVisibility(_ToolbarSettings.ShowFitPageButton)
-                buttonZoomIn.Visibility = ToVisibility(_ToolbarSettings.ShowZoomButton)
-                buttonZoomOut.Visibility = ToVisibility(_ToolbarSettings.ShowZoomButton)
-                buttonNextPage.Visibility = ToVisibility(True)
-                buttonPrevPage.Visibility = ToVisibility(True)
-                buttonPrint.Visibility = ToVisibility(False)
-                buttonRotateLeft.Visibility = ToVisibility(False)
-                buttonRotateRight.Visibility = ToVisibility(False)
-                buttonFlipX.Visibility = ToVisibility(False)
-                buttonFlipY.Visibility = ToVisibility(False)
-                buttonFirstPage.Visibility = ToVisibility(False)
-                buttonLastPage.Visibility = ToVisibility(False)
-                buttonSettings.Visibility = ToVisibility(False)
-                txtCurrentPage.Visibility = ToVisibility(False)
-                txtSearch.Visibility = ToVisibility(False)
-                btnSearch2.Visibility = ToVisibility(False)
-                btnNextHighlight.Visibility = ToVisibility(False)
-                btnPrevHighlight.Visibility = ToVisibility(False)
-
             Case ViewerMode.Excel
                 ToolbarDocumentViewer.Visible = False
 

GUIs.Test.TestGUI/frmDocView.vb

@@ -24,8 +24,7 @@ Public Class frmDocView
         MyDocumentViewer.Init(LogConfig, GDPICTURE_KEY, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With {
             .ShowPrintButton = False,
             .ShowRotateButton = False,
-            .ShowFlipButton = False,
-            .ShowSettingButton = False
+            .ShowFlipButton = False
         })
     End Sub