From 6338cc3cf94decdfc175c7b169c8c892327c4ec5 Mon Sep 17 00:00:00 2001 From: Developer01 Date: Mon, 26 Oct 2026 17:00:33 +0100 Subject: [PATCH] Umbenennung zu DD_DocumentViewer MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Die Klasse `DocumentViewer` wurde in `DD_DocumentViewer` umbenannt, was sowohl die Klassendefinition als auch deren Verwendung in verschiedenen Dateien betrifft. Der `ComponentResourceManager` wurde entsprechend aktualisiert. Der `AssemblyName` wurde von `DigitalData.Controls.DocumentViewer` zu `DigitalData.Controls.DocumentViewerDD` geändert, ebenso die `DocumentationFile`-Eigenschaft. Die Attribute `AssemblyTitle` und `AssemblyProduct` in der `AssemblyInfo.vb` reflektieren nun den neuen Namen `DigitalData.DocumentViewerDD`. Das Copyright-Jahr wurde auf 2026 aktualisiert. In der `Common.vbproj`-Datei wurden nicht mehr benötigte `DevExpress`-Referenzen entfernt. Die Referenz auf `DigitalData.Controls.DocumentViewer` wurde durch `DigitalData.Controls.DocumentViewerDD` ersetzt. Die `SpecificVersion`-Eigenschaft für die `DigitalData.Modules.Filesystem`-Referenz wurde entfernt. In mehreren Designer-Dateien und Formularen wurde die Instanz von `DocumentViewer` auf `DD_DocumentViewer` geändert. --- .../DocumentViewer.Designer.vb | 4 +-- Controls.DocumentViewer/DocumentViewer.vb | 4 +-- Controls.DocumentViewer/DocumentViewer.vbproj | 6 ++--- .../My Project/AssemblyInfo.vb | 6 ++--- GUIs.Common/Common.vbproj | 26 +++---------------- .../frmDocumentResultList.Designer.vb | 4 +-- .../frmDocumentResultList.vb | 2 +- .../frmNotification_Startup.Designer.vb | 4 +-- GUIs.Common/frmNotification_Startup.vb | 2 +- GUIs.Test.TestGUI/frmDocView.Designer.vb | 4 +-- GUIs.Test.TestGUI/frmDocView.vb | 2 +- GUIs.Test.TestGUI/frmDocViewPure.Designer.vb | 4 +-- 12 files changed, 24 insertions(+), 44 deletions(-) diff --git a/Controls.DocumentViewer/DocumentViewer.Designer.vb b/Controls.DocumentViewer/DocumentViewer.Designer.vb index 3c077c22..5d4ac250 100644 --- a/Controls.DocumentViewer/DocumentViewer.Designer.vb +++ b/Controls.DocumentViewer/DocumentViewer.Designer.vb @@ -1,5 +1,5 @@  -Partial Class DocumentViewer +Partial Class DD_DocumentViewer Inherits System.Windows.Forms.UserControl 'UserControl überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. @@ -23,7 +23,7 @@ Partial Class DocumentViewer Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(DocumentViewer)) + Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(DD_DocumentViewer)) Me.OpenFileDialog = New System.Windows.Forms.OpenFileDialog() Me.BarManager1 = New DevExpress.XtraBars.BarManager(Me.components) Me.ToolbarDocumentViewer = New DevExpress.XtraBars.Bar() diff --git a/Controls.DocumentViewer/DocumentViewer.vb b/Controls.DocumentViewer/DocumentViewer.vb index 99af5180..57a539c2 100644 --- a/Controls.DocumentViewer/DocumentViewer.vb +++ b/Controls.DocumentViewer/DocumentViewer.vb @@ -8,7 +8,7 @@ Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Messaging Imports DigitalData.Modules.Config Imports MsgReader -Public Class DocumentViewer +Public Class DD_DocumentViewer Private Enum ZoomMode Zoom50 Zoom100 @@ -757,7 +757,7 @@ Public Class DocumentViewer _logger.Debug("LoadRichtextFile: Rufe RichEditControl1.LoadDocument auf – Pfad: [{0}], Format: [{1}]", oLoadPath, oFormat) RichEditControl1.LoadDocument(oLoadPath, oFormat) - + RichEditControl1.ReadOnly = True RichEditControl1.Visible = True RichEditControl1.Dock = DockStyle.Fill _ViewerMode = ViewerMode.Richtext diff --git a/Controls.DocumentViewer/DocumentViewer.vbproj b/Controls.DocumentViewer/DocumentViewer.vbproj index 91c0ad40..e54d0fe1 100644 --- a/Controls.DocumentViewer/DocumentViewer.vbproj +++ b/Controls.DocumentViewer/DocumentViewer.vbproj @@ -9,7 +9,7 @@ DigitalData.Controls.DocumentViewer - DigitalData.Controls.DocumentViewer + DigitalData.Controls.DocumentViewerDD 512 Windows v4.6.2 @@ -25,7 +25,7 @@ true true bin\Debug\ - DigitalData.Controls.DocumentViewer.xml + DigitalData.Controls.DocumentViewerDD.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 @@ -35,7 +35,7 @@ true true bin\Release\ - DigitalData.Controls.DocumentViewer.xml + DigitalData.Controls.DocumentViewerDD.xml 42016,41999,42017,42018,42019,42032,42036,42020,42021,42022 diff --git a/Controls.DocumentViewer/My Project/AssemblyInfo.vb b/Controls.DocumentViewer/My Project/AssemblyInfo.vb index 7a96ecf2..3bc4f6a6 100644 --- a/Controls.DocumentViewer/My Project/AssemblyInfo.vb +++ b/Controls.DocumentViewer/My Project/AssemblyInfo.vb @@ -8,11 +8,11 @@ Imports System.Runtime.InteropServices ' Werte der Assemblyattribute überprüfen - + - - + + diff --git a/GUIs.Common/Common.vbproj b/GUIs.Common/Common.vbproj index dc21bfa1..20180e65 100644 --- a/GUIs.Common/Common.vbproj +++ b/GUIs.Common/Common.vbproj @@ -54,75 +54,57 @@ False - False - False - False - False - False - False - False - False - False - False - False - False - False - False - False - False - - - False - ..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll + + ..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewerDD.dll ..\Controls.LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll @@ -146,8 +128,7 @@ False ..\..\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll - - False + ..\..\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll @@ -881,7 +862,6 @@ - diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb index 101cc2ae..a1eebf37 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb @@ -95,7 +95,7 @@ Partial Class frmDocumentResultList Me.GridControl3 = New DevExpress.XtraGrid.GridControl() Me.GridView3 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridView() Me.GridBand3 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand() - Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() + Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DD_DocumentViewer() Me.XtraSaveFileDialog = New DevExpress.XtraEditors.XtraSaveFileDialog(Me.components) Me.RibbonPageGroup6 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.DockManager1 = New DevExpress.XtraBars.Docking.DockManager(Me.components) @@ -999,7 +999,7 @@ Partial Class frmDocumentResultList Friend WithEvents GridView3 As DevExpress.XtraGrid.Views.BandedGrid.BandedGridView Friend WithEvents GridBand3 As DevExpress.XtraGrid.Views.BandedGrid.GridBand Friend WithEvents BarButtonItemExportGrid1 As DevExpress.XtraBars.BarButtonItem - Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer + Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DD_DocumentViewer Friend WithEvents BarStaticItem1 As DevExpress.XtraBars.BarStaticItem Friend WithEvents labelResultCount As DevExpress.XtraBars.BarStaticItem Friend WithEvents XtraSaveFileDialog As DevExpress.XtraEditors.XtraSaveFileDialog diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb index c208dc93..2aa1f708 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb @@ -202,7 +202,7 @@ Public Class frmDocumentResultList ' Initialize Viewer with GDPicture.NET License If Environment.Settings.GdPictureKey <> String.Empty Then - DocumentViewer1.Init(LogConfig, Environment.Settings.GdPictureKey, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With { + DocumentViewer1.Init(LogConfig, Environment.Settings.GdPictureKey, New DigitalData.Controls.DocumentViewer.DD_DocumentViewer.ToolbarSettings() With { .ShowPrintButton = True, .ShowRotateButton = True, .ShowFlipButton = True, diff --git a/GUIs.Common/frmNotification_Startup.Designer.vb b/GUIs.Common/frmNotification_Startup.Designer.vb index f1869874..9a6fdc5a 100644 --- a/GUIs.Common/frmNotification_Startup.Designer.vb +++ b/GUIs.Common/frmNotification_Startup.Designer.vb @@ -30,7 +30,7 @@ Partial Class frmNotification_Startup Me.RibbonPage1 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup1 = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() - Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() + Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DD_DocumentViewer() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl1.Panel1.SuspendLayout() @@ -167,7 +167,7 @@ Partial Class frmNotification_Startup Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl Friend WithEvents ListBoxControl1 As DevExpress.XtraEditors.ListBoxControl Friend WithEvents RichEditControl1 As DevExpress.XtraRichEdit.RichEditControl - Friend WithEvents DocumentViewer1 As Controls.DocumentViewer.DocumentViewer + Friend WithEvents DocumentViewer1 As Controls.DocumentViewer.DD_DocumentViewer Friend WithEvents btnCloseForm As DevExpress.XtraBars.BarButtonItem Friend WithEvents lbStatus As DevExpress.XtraBars.BarStaticItem Friend WithEvents btnMarkAsRead As DevExpress.XtraBars.BarButtonItem diff --git a/GUIs.Common/frmNotification_Startup.vb b/GUIs.Common/frmNotification_Startup.vb index 5cc978fb..eea056e3 100644 --- a/GUIs.Common/frmNotification_Startup.vb +++ b/GUIs.Common/frmNotification_Startup.vb @@ -55,7 +55,7 @@ Public Class frmNotification_Startup Private Sub frmNotification_Startup_Load(sender As Object, e As EventArgs) Handles Me.Load Try - DocumentViewer1.Init(LogConfig, _GDPictureKey, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With { + DocumentViewer1.Init(LogConfig, _GDPictureKey, New DigitalData.Controls.DocumentViewer.DD_DocumentViewer.ToolbarSettings() With { .ShowPrintButton = True, .ShowRotateButton = True, .ShowFlipButton = True, diff --git a/GUIs.Test.TestGUI/frmDocView.Designer.vb b/GUIs.Test.TestGUI/frmDocView.Designer.vb index 3fa4cad5..21a2c94c 100644 --- a/GUIs.Test.TestGUI/frmDocView.Designer.vb +++ b/GUIs.Test.TestGUI/frmDocView.Designer.vb @@ -30,7 +30,7 @@ Partial Class frmDocView Me.Button1 = New System.Windows.Forms.Button() Me.txtfilepath = New System.Windows.Forms.TextBox() Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() - Me.MyDocumentViewer = New DigitalData.Controls.DocumentViewer.DocumentViewer() + Me.MyDocumentViewer = New DigitalData.Controls.DocumentViewer.DD_DocumentViewer() Me.Panel1.SuspendLayout() Me.SuspendLayout() ' @@ -135,5 +135,5 @@ Partial Class frmDocView Friend WithEvents Button3 As Button Friend WithEvents Button4 As Button Friend WithEvents Button5 As Button - Friend WithEvents MyDocumentViewer As DigitalData.Controls.DocumentViewer.DocumentViewer + Friend WithEvents MyDocumentViewer As DigitalData.Controls.DocumentViewer.DD_DocumentViewer End Class diff --git a/GUIs.Test.TestGUI/frmDocView.vb b/GUIs.Test.TestGUI/frmDocView.vb index 5c8d9544..f1f4e26f 100644 --- a/GUIs.Test.TestGUI/frmDocView.vb +++ b/GUIs.Test.TestGUI/frmDocView.vb @@ -22,7 +22,7 @@ Public Class frmDocView Private Sub frmDocView_Load(sender As Object, e As EventArgs) Handles Me.Load LogConfig = New LogConfig(LogConfig.PathType.Temp) - MyDocumentViewer.Init(LogConfig, GDPICTURE_KEY, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With { + MyDocumentViewer.Init(LogConfig, GDPICTURE_KEY, New DigitalData.Controls.DocumentViewer.DD_DocumentViewer.ToolbarSettings() With { .ShowPrintButton = False, .ShowRotateButton = False, .ShowFlipButton = False diff --git a/GUIs.Test.TestGUI/frmDocViewPure.Designer.vb b/GUIs.Test.TestGUI/frmDocViewPure.Designer.vb index 51b9c632..c62da70d 100644 --- a/GUIs.Test.TestGUI/frmDocViewPure.Designer.vb +++ b/GUIs.Test.TestGUI/frmDocViewPure.Designer.vb @@ -23,7 +23,7 @@ Partial Class frmDocViewPure _ Private Sub InitializeComponent() Me.Button1 = New System.Windows.Forms.Button() - Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() + Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DD_DocumentViewer() Me.SuspendLayout() ' 'Button1 @@ -56,5 +56,5 @@ Partial Class frmDocViewPure End Sub Friend WithEvents Button1 As Button - Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer + Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DD_DocumentViewer End Class