From 6912f290cd705c20d0b7bfc89e3aee9656883e49 Mon Sep 17 00:00:00 2001 From: pitzm Date: Tue, 17 Feb 2026 15:18:33 +0100 Subject: [PATCH] Referenzen aktualisiert. GDPicture Lizenz&nuget --- GUIs.Monitor/Forms/frmMonitor.vb | 24 +-- GUIs.Monitor/Monitor.vbproj | 264 +++++++++++++++++++++++++++---- GUIs.Monitor/app.config | 50 +++++- GUIs.Monitor/packages.config | 26 +++ 4 files changed, 316 insertions(+), 48 deletions(-) diff --git a/GUIs.Monitor/Forms/frmMonitor.vb b/GUIs.Monitor/Forms/frmMonitor.vb index 7ade247..8dcf5e5 100644 --- a/GUIs.Monitor/Forms/frmMonitor.vb +++ b/GUIs.Monitor/Forms/frmMonitor.vb @@ -22,7 +22,6 @@ Imports DigitalData.GUIs.Monitor.Constants Imports DigitalData.Modules.Base Imports DigitalData.Modules.Config Imports DigitalData.Modules.Database -Imports DigitalData.Modules.Language.Utils Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Patterns @@ -104,7 +103,7 @@ Public Class frmMonitor Patterns = New Patterns2(LogConfig) FormHelper = New FormHelper(LogConfig, Me) ControlHelper = New Common.ControlHelper(LogConfig) - Workspace = New DocumentResultList.Workspace(Of Config)(LogConfig, ConfigManager, WorkspaceManager1) + Workspace = New DocumentResultList.Workspace(Of Config)(LogConfig, ConfigManager, WorkspaceManager1, "de-DE") SplitContainerBuilderHTML = New SplitContainerBuilder(LogConfig, Me, SplitContainerFileHTML) SplitContainerBuilderHTML.InitAutoResize() @@ -165,7 +164,8 @@ Public Class frmMonitor LoadSearches() - Dim oLicense = LoadGDPicture() + ' TODO - GDPicture Version konfigurierbar machen + Dim oLicense = LoadGDPicture("11.2024") For Each oGrid In SQLResultGrids AddHandler oGrid.Enter, Sub() @@ -194,8 +194,8 @@ Public Class frmMonitor End Try End Sub - Private Function LoadGDPicture() As String - Dim oSQL = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE'" + Private Function LoadGDPicture(pVersion As String) As String + Dim oSQL = "SELECT LICENSE FROM TBDD_3RD_PARTY_MODULES WHERE NAME = 'GDPICTURE' AND VERSION = '" + pVersion + "'" Return CStr(Database.GetScalarValue(oSQL)) End Function @@ -277,7 +277,7 @@ Public Class frmMonitor For Each oNode As TreeListNode In TreeListResults.Nodes ExpandNodes(oNode, Function(n) Dim oObjectValue = n.GetValue(oStateColumn) - Dim oValue As String = NotNull(oObjectValue.ToString, String.Empty) + Dim oValue As String = ObjectEx.NotNull(oObjectValue.ToString, String.Empty) Return oValue IsNot Nothing AndAlso (oValue = State.STATE_WARNING Or oValue = State.STATE_FAILURE) End Function) Next @@ -900,7 +900,7 @@ Public Class frmMonitor Try Dim oExtracted = ExtractTitle(oSQLCommand.Value) Dim oCommand = oExtracted.Item1 - Dim oTitle = NotNull(oExtracted.Item2, oSQLCommand.Key) + Dim oTitle = ObjectEx.NotNull(oExtracted.Item2, oSQLCommand.Key) Dim oTable As DataTable = Database.GetDatatable(oCommand) @@ -1004,7 +1004,7 @@ Public Class frmMonitor End Sub Private Sub ExpandCollapseNode(pNode As TreeListNode) - Dim oExpanded As TristateBoolean = NotNull(pNode.Item("EXPANDED"), TristateBoolean.Indeterminate) + Dim oExpanded As TristateBoolean = ObjectEx.NotNull(pNode.Item("EXPANDED"), TristateBoolean.Indeterminate) Select Case oExpanded Case TristateBoolean.False pNode.Collapse() @@ -1020,7 +1020,7 @@ Public Class frmMonitor Dim oTabPage = DirectCast(RichEditControl.Parent, XtraTabPage) oTabPage.PageVisible = True - oTabPage.Text = NotNull(Title, oTabPage.Text) + oTabPage.Text = ObjectEx.NotNull(Title, oTabPage.Text) XtraTabControlFileHTML.SelectedTabPage = oTabPage End Sub @@ -1030,7 +1030,7 @@ Public Class frmMonitor Dim oTabPage = DirectCast(DocumentViewer.Parent, XtraTabPage) oTabPage.PageVisible = True - oTabPage.Text = NotNull(Title, oTabPage.Text) + oTabPage.Text = ObjectEx.NotNull(Title, oTabPage.Text) XtraTabControlFileHTML.SelectedTabPage = oTabPage End Sub @@ -1043,7 +1043,7 @@ Public Class frmMonitor Dim oTabPage = DirectCast(GridControl.Parent, XtraTabPage) oTabPage.PageVisible = True - oTabPage.Text = $"{NotNull(Title, oTabPage.Text)} ({Table.Rows.Count})" + oTabPage.Text = $"{ObjectEx.NotNull(Title, oTabPage.Text)} ({Table.Rows.Count})" XtraTabControlSQL.SelectedTabPage = oTabPage End Sub @@ -1077,7 +1077,7 @@ Public Class frmMonitor Private Sub TreeListResults_CustomDrawNodeCell(sender As Object, e As DevExpress.XtraTreeList.CustomDrawNodeCellEventArgs) Dim oColumn = TreeListResults.Columns.Item("STATE") - Dim oState = NotNull(e.Node.GetValue(oColumn), Nothing) + Dim oState = ObjectEx.NotNull(e.Node.GetValue(oColumn), Nothing) If oState Is Nothing Then Exit Sub diff --git a/GUIs.Monitor/Monitor.vbproj b/GUIs.Monitor/Monitor.vbproj index 3d1a450..de09387 100644 --- a/GUIs.Monitor/Monitor.vbproj +++ b/GUIs.Monitor/Monitor.vbproj @@ -16,6 +16,8 @@ Off On + + AnyCPU @@ -46,19 +48,57 @@ ChartType_Line.ico - - - - - - - - - - - - - + + ..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll + + + False + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.BonusSkins.v21.2.dll + + + False + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Charts.v21.2.Core.dll + + + False + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Data.Desktop.v21.2.dll + + + False + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Data.v21.2.dll + + + False + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.DataVisualization.v21.2.Core.dll + + + False + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Dialogs.v21.2.Core.dll + + + False + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Office.v21.2.Core.dll + + + False + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Printing.v21.2.Core.dll + + + False + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.RichEdit.v21.2.Core.dll + + + False + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Spreadsheet.v21.2.Core.dll + + + False + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.Utils.v21.2.dll + + + False + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraBars.v21.2.dll + False D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraCharts.v21.2.dll @@ -71,56 +111,203 @@ False D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraCharts.v21.2.Wizard.dll - - - - - - - - - - ..\..\DDMonorepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll + + False + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraDialogs.v21.2.dll - + + False + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraEditors.v21.2.dll + + + False + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraGrid.v21.2.dll + + False - ..\..\DDMonorepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraLayout.v21.2.dll - + False - ..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraPrinting.v21.2.dll - + False - ..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraRichEdit.v21.2.dll - + False - ..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraSpreadsheet.v21.2.dll - + False - ..\..\DDModules\Language\bin\Debug\DigitalData.Modules.Language.dll + D:\ProgramFiles\DevExpress 21.2\Components\Bin\Framework\DevExpress.XtraTreeList.v21.2.dll + + + ..\..\..\2_DLL Projekte\DDMonoRepo\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll + + + False + ..\..\..\2_DLL Projekte\DDMonoRepo\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll + + + ..\..\..\2_DLL Projekte\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll + + + ..\..\..\2_DLL Projekte\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + + + ..\..\..\2_DLL Projekte\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + ..\..\..\2_DLL Projekte\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll - ..\..\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll + ..\..\..\2_DLL Projekte\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll + + + ..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll + + + ..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.CAD.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.CAD.DWG.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Common.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Document.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Email.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.HTML.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Imaging.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Imaging.Formats.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.OpenDocument.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.OpenXML.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.PDF.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.RTF.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.SVG.dll + + + ..\packages\GdPicture.14.3.18\lib\net462\GdPicture.NET.14.wia.gateway.dll + True + + + ..\packages\Microsoft.Bcl.AsyncInterfaces.8.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll + + + ..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll + + + ..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll ..\packages\NLog.5.0.5\lib\net46\NLog.dll + + ..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll + + + ..\packages\protobuf-net.3.2.46\lib\net462\protobuf-net.dll + + + ..\packages\protobuf-net.Core.3.2.46\lib\net462\protobuf-net.Core.dll + + + ..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll + + + ..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll + + + ..\packages\System.Collections.Immutable.8.0.0\lib\net462\System.Collections.Immutable.dll + + + ..\packages\System.IO.Packaging.8.0.1\lib\net462\System.IO.Packaging.dll + + + ..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll + + + + ..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll + + + + ..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll + + + ..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll + + + + ..\packages\System.Security.Cryptography.Pkcs.8.0.1\lib\net462\System.Security.Cryptography.Pkcs.dll + + + ..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.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 + + + ..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll + @@ -243,6 +430,13 @@ + + + + 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}". + + +