From 48274219c99934e684cd28c651a1e8b94ce76ee7 Mon Sep 17 00:00:00 2001 From: OlgunR Date: Mon, 23 Jun 2025 08:51:35 +0200 Subject: [PATCH 1/4] =?UTF-8?q?push=20f=C3=BCr=20marlon?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controls.DocumentViewer/DocumentViewer.vb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Controls.DocumentViewer/DocumentViewer.vb b/Controls.DocumentViewer/DocumentViewer.vb index 3669daab..7e8de2d3 100644 --- a/Controls.DocumentViewer/DocumentViewer.vb +++ b/Controls.DocumentViewer/DocumentViewer.vb @@ -65,7 +65,7 @@ Public Class DocumentViewer Private Sub DocumentViewer_Load(sender As Object, e As EventArgs) Handles Me.Load UpdateMainUi() End Sub - + 'hallo Public Class ToolbarSettings Public Property ShowPrintButton As Boolean = True Public Property ShowFitWidthButton As Boolean = True From 46b120d3bd31f1bc5bc1283d5556d4895288ab70 Mon Sep 17 00:00:00 2001 From: OlgunR Date: Tue, 12 Aug 2025 10:22:54 +0200 Subject: [PATCH 2/4] =?UTF-8?q?Absturz=20bei=20Lookup=C3=A4nderungen=20wir?= =?UTF-8?q?d=20abgefangen=20-=20frmLookupGrid?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controls.LookupGrid/My Project/AssemblyInfo.vb | 4 ++-- Controls.LookupGrid/frmLookupGrid.vb | 14 ++++++++++---- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/Controls.LookupGrid/My Project/AssemblyInfo.vb b/Controls.LookupGrid/My Project/AssemblyInfo.vb index 3c468bb3..24865c0c 100644 --- a/Controls.LookupGrid/My Project/AssemblyInfo.vb +++ b/Controls.LookupGrid/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + + diff --git a/Controls.LookupGrid/frmLookupGrid.vb b/Controls.LookupGrid/frmLookupGrid.vb index 46f22a8d..ffad6cc9 100644 --- a/Controls.LookupGrid/frmLookupGrid.vb +++ b/Controls.LookupGrid/frmLookupGrid.vb @@ -98,10 +98,16 @@ Public Class frmLookupGrid _View.BestFitColumns() ' Datenspalte zusätzlich in der Breite anpassen - If _View.Columns.Count = 0 Then - Dim oDataColumn As GridColumn = _View.Columns.Item(_DataColumn) - oDataColumn.BestFit() - End If + Try + If _View.Columns.Count = 0 Then + Dim oDataColumn As GridColumn = _View.Columns.Item(_DataColumn) + oDataColumn.BestFit() + End If + Catch ex As ArgumentOutOfRangeException + + Catch ex As Exception + + End Try End Sub Private Sub frmLookupGrid_Shown(sender As Object, e As EventArgs) Handles Me.Shown BringToFront() From d2945cfc4cfef3206567e158777dfe75090db2cf Mon Sep 17 00:00:00 2001 From: Developer01 Date: Tue, 12 Aug 2025 16:46:05 +0200 Subject: [PATCH 3/4] Common Verweise aktualisieren --- GUIs.Common/Common.vbproj | 40 ++++++++++++------------------------- GUIs.Common/packages.config | 2 -- 2 files changed, 13 insertions(+), 29 deletions(-) diff --git a/GUIs.Common/Common.vbproj b/GUIs.Common/Common.vbproj index 18b0191e..3bb689c6 100644 --- a/GUIs.Common/Common.vbproj +++ b/GUIs.Common/Common.vbproj @@ -69,36 +69,35 @@ ..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll + + ..\Controls.LookupGrid\bin\Debug\DigitalData.Controls.LookupGrid.dll + - ..\..\Modules\Base\bin\Debug\DigitalData.Modules.Base.dll + ..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll - - False - ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll + + ..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll - ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll + ..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll - ..\..\Modules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll + ..\..\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll - P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Filesystem.dll + ..\..\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll - ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll + ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll - ..\..\Modules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll + ..\..\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll - ..\..\Modules\Windows\bin\Debug\DigitalData.Modules.Windows.dll + ..\..\DDModules\Windows\bin\Debug\DigitalData.Modules.Windows.dll - ..\..\Modules\Patterns\bin\Debug\DigitalData.Modules.ZooFlow.dll - - - ..\packages\GdPicture.14.2.90\lib\net462\GdPicture.NET.14.dll + ..\..\DDModules\ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.dll @@ -351,12 +350,6 @@ Settings.Designer.vb - - - {3DCD6D1A-C830-4241-B7E4-27430E7EA483} - LookupControl - - @@ -635,11 +628,4 @@ - - - - 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}". - - - \ No newline at end of file diff --git a/GUIs.Common/packages.config b/GUIs.Common/packages.config index e82426b8..37cb9210 100644 --- a/GUIs.Common/packages.config +++ b/GUIs.Common/packages.config @@ -1,6 +1,4 @@  - - \ No newline at end of file From 5a636f4046e9c0d1a94bc7c4e984acab610b4a5d Mon Sep 17 00:00:00 2001 From: Developer01 Date: Wed, 13 Aug 2025 09:53:44 +0200 Subject: [PATCH 4/4] Common Language entfernt --- Controls.DocumentViewer/DocumentViewer.resx | 40 +++++++++---------- Controls.DocumentViewer/DocumentViewer.vb | 3 +- GUIs.Common/ControlHelper.vb | 1 - .../DataResultList/frmDataResultList.vb | 1 - GUIs.Common/DocumentResultList/Watcher.vb | 1 - GUIs.Common/DocumentResultList/Workspace.vb | 2 - GUIs.Common/My Project/AssemblyInfo.vb | 8 ++-- 7 files changed, 25 insertions(+), 31 deletions(-) diff --git a/Controls.DocumentViewer/DocumentViewer.resx b/Controls.DocumentViewer/DocumentViewer.resx index 6c91d499..52330804 100644 --- a/Controls.DocumentViewer/DocumentViewer.resx +++ b/Controls.DocumentViewer/DocumentViewer.resx @@ -161,6 +161,26 @@ NC42LTAuOCw2LjUtMi4xbDcuOSw3LjljMC4zLDAuMywwLjksMC4zLDEuMiwwbDEuMi0xLjJDMzAuMSwy OC4yLDMwLjEsMjcuNiwyOS43LDI3LjN6IE00LDEzYzAtNSw0LTksOS05YzUsMCw5LDQsOSw5ICAgcy00 LDktOSw5QzgsMjIsNCwxOCw0LDEzeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L + + + + + AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 + LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl + dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/ + PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi + IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv + MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh + Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg + MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z + ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz + OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp + dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ilpvb20iPg0KICAgIDxwYXRoIGQ9Ik0yNy43LDI1LjNM + MjAuNSwxOGMxLTEuNCwxLjUtMy4yLDEuNS01YzAtNS00LTktOS05cy05LDQtOSw5YzAsNSw0LDksOSw5 + YzEuOSwwLDMuNi0wLjYsNS0xLjVsNy4zLDcuMyAgIGMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsMS4yLTEu + MkMyOC4xLDI2LjIsMjguMSwyNS42LDI3LjcsMjUuM3ogTTYsMTNjMC0zLjksMy4xLTcsNy03czcsMy4x + LDcsN2MwLDMuOS0zLjEsNy03LDdTNiwxNi45LDYsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4N + Cjwvc3ZnPgs= @@ -223,26 +243,6 @@ ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs= - - - - - AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40 - LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl - dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/ - PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi - IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv - MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh - Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg - MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z - ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz - OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp - dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ilpvb20iPg0KICAgIDxwYXRoIGQ9Ik0yNy43LDI1LjNM - MjAuNSwxOGMxLTEuNCwxLjUtMy4yLDEuNS01YzAtNS00LTktOS05cy05LDQtOSw5YzAsNSw0LDksOSw5 - YzEuOSwwLDMuNi0wLjYsNS0xLjVsNy4zLDcuMyAgIGMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsMS4yLTEu - MkMyOC4xLDI2LjIsMjguMSwyNS42LDI3LjcsMjUuM3ogTTYsMTNjMC0zLjksMy4xLTcsNy03czcsMy4x - LDcsN2MwLDMuOS0zLjEsNy03LDdTNiwxNi45LDYsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4N - Cjwvc3ZnPgs= diff --git a/Controls.DocumentViewer/DocumentViewer.vb b/Controls.DocumentViewer/DocumentViewer.vb index 4475608c..7a8fc141 100644 --- a/Controls.DocumentViewer/DocumentViewer.vb +++ b/Controls.DocumentViewer/DocumentViewer.vb @@ -99,10 +99,9 @@ Public Class DocumentViewer End If Try - _email = New Email2(pLogConfig) If pLicenseKey = String.Empty Then - _logger.Warn("License key was not provided during init!") + _logger.Warn("License key was not provided during init-process!") Return False End If _licenseKey = pLicenseKey diff --git a/GUIs.Common/ControlHelper.vb b/GUIs.Common/ControlHelper.vb index a5275218..855265f6 100644 --- a/GUIs.Common/ControlHelper.vb +++ b/GUIs.Common/ControlHelper.vb @@ -1,6 +1,5 @@ Imports System.Windows.Forms Imports DigitalData.Modules.Base -Imports DigitalData.Modules.Language Imports DigitalData.Modules.Logging Public Class ControlHelper diff --git a/GUIs.Common/DataResultList/frmDataResultList.vb b/GUIs.Common/DataResultList/frmDataResultList.vb index b0731bf0..c5e098b1 100644 --- a/GUIs.Common/DataResultList/frmDataResultList.vb +++ b/GUIs.Common/DataResultList/frmDataResultList.vb @@ -7,7 +7,6 @@ Imports DevExpress.XtraGrid.Views.Grid Imports DigitalData.Modules.Config Imports DigitalData.Modules.Logging Imports DigitalData.Modules.ZooFlow -Imports DigitalData.Modules.Language Imports DevExpress.XtraPrinting Imports DigitalData.GUIs.Common Imports System.ComponentModel diff --git a/GUIs.Common/DocumentResultList/Watcher.vb b/GUIs.Common/DocumentResultList/Watcher.vb index d47c7b17..3d55a0f6 100644 --- a/GUIs.Common/DocumentResultList/Watcher.vb +++ b/GUIs.Common/DocumentResultList/Watcher.vb @@ -3,7 +3,6 @@ Imports System.Text Imports System.Timers Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Base -Imports DigitalData.Modules.Language.DateTimeEx Namespace DocumentResultList Public Class Watcher diff --git a/GUIs.Common/DocumentResultList/Workspace.vb b/GUIs.Common/DocumentResultList/Workspace.vb index eee7fe91..c588140d 100644 --- a/GUIs.Common/DocumentResultList/Workspace.vb +++ b/GUIs.Common/DocumentResultList/Workspace.vb @@ -5,8 +5,6 @@ Imports DigitalData.Modules.Base Imports DigitalData.Modules.Config Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Filesystem -Imports DigitalData.Modules.Language - Namespace DocumentResultList Public Class Workspace(Of TConfig) Inherits BaseClass diff --git a/GUIs.Common/My Project/AssemblyInfo.vb b/GUIs.Common/My Project/AssemblyInfo.vb index 6c9cb4f9..538949f5 100644 --- a/GUIs.Common/My Project/AssemblyInfo.vb +++ b/GUIs.Common/My Project/AssemblyInfo.vb @@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices - - + + @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + +