From ee0dc0b1ff7d310b0208c55afc7433b39c699aeb Mon Sep 17 00:00:00 2001 From: OlgunR Date: Wed, 26 Feb 2025 08:18:05 +0100 Subject: [PATCH 1/4] ro --- ConfigCreator/MonoRepoUtils.vbproj | 6 +++--- Controls.ChatAddUser/ChatAddUser.vbproj | 4 ++-- Controls.ChatControl/ChatControl.vbproj | 4 ++-- Controls.ChatNewConv/ChatNewConv.vbproj | 4 ++-- Controls.DocumentViewer/DocumentViewer.vbproj | 8 ++++---- Controls.RegexEditor/RegexEditor.vbproj | 4 ++-- DBCleaner/DBCleaner.vbproj | 8 ++++---- DBCleaner/packages.config | 2 +- GUIs.ClipboardWatcher/ClipboardWatcher.vbproj | 17 ++++++++++------- GUIs.Common/Common.vbproj | 18 +++++++++--------- GUIs.GlobalIndexer/GlobalIndexer.vbproj | 2 +- GUIs.Test.ADSyncTest/ADSyncTest.vbproj | 10 +++++----- .../GUIs.Test.EDMIBenchmark.vbproj | 4 ++-- .../GUIs.Test.GraphQLTest.vbproj | 10 +++++----- GUIs.Test.TestGUI/TestGUI.vbproj | 18 +++++++++--------- GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj | 10 +++++----- Service.EDMIService/EDMIService.vbproj | 18 +++++++++--------- Service.JobRunner/JobRunner.vbproj | 8 ++++---- Services.EmailService/DDEmailService.vbproj | 12 ++++++------ .../DDEDMLicenseService.vbproj | 4 ++-- 20 files changed, 87 insertions(+), 84 deletions(-) diff --git a/ConfigCreator/MonoRepoUtils.vbproj b/ConfigCreator/MonoRepoUtils.vbproj index 17a87333..b7ea8dc6 100644 --- a/ConfigCreator/MonoRepoUtils.vbproj +++ b/ConfigCreator/MonoRepoUtils.vbproj @@ -66,15 +66,15 @@ False - ..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll False - ..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll + ..\..\Modules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll False - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll diff --git a/Controls.ChatAddUser/ChatAddUser.vbproj b/Controls.ChatAddUser/ChatAddUser.vbproj index d042f300..12e5061e 100644 --- a/Controls.ChatAddUser/ChatAddUser.vbproj +++ b/Controls.ChatAddUser/ChatAddUser.vbproj @@ -61,11 +61,11 @@ False - ..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll False - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll diff --git a/Controls.ChatControl/ChatControl.vbproj b/Controls.ChatControl/ChatControl.vbproj index c16ac781..3a9a94f7 100644 --- a/Controls.ChatControl/ChatControl.vbproj +++ b/Controls.ChatControl/ChatControl.vbproj @@ -61,11 +61,11 @@ False - ..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll False - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll diff --git a/Controls.ChatNewConv/ChatNewConv.vbproj b/Controls.ChatNewConv/ChatNewConv.vbproj index 09c6bc2c..84c075cb 100644 --- a/Controls.ChatNewConv/ChatNewConv.vbproj +++ b/Controls.ChatNewConv/ChatNewConv.vbproj @@ -61,11 +61,11 @@ False - ..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll False - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll diff --git a/Controls.DocumentViewer/DocumentViewer.vbproj b/Controls.DocumentViewer/DocumentViewer.vbproj index 712da4c6..2ffa060d 100644 --- a/Controls.DocumentViewer/DocumentViewer.vbproj +++ b/Controls.DocumentViewer/DocumentViewer.vbproj @@ -77,19 +77,19 @@ False - ..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll + ..\..\Modules\Base\bin\Debug\DigitalData.Modules.Base.dll False - ..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll False - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll False - ..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll + ..\..\Modules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll ..\packages\GdPicture.14.2.90\lib\net462\GdPicture.NET.14.dll diff --git a/Controls.RegexEditor/RegexEditor.vbproj b/Controls.RegexEditor/RegexEditor.vbproj index 6a280522..dbc8426b 100644 --- a/Controls.RegexEditor/RegexEditor.vbproj +++ b/Controls.RegexEditor/RegexEditor.vbproj @@ -62,10 +62,10 @@ False - ..\..\DDModules\Language\bin\Debug\DigitalData.Modules.Language.dll + P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Language.dll - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll diff --git a/DBCleaner/DBCleaner.vbproj b/DBCleaner/DBCleaner.vbproj index 3c9ac82e..bb7643a7 100644 --- a/DBCleaner/DBCleaner.vbproj +++ b/DBCleaner/DBCleaner.vbproj @@ -50,14 +50,14 @@ - ..\Modules.Database\bin\Debug\DigitalData.Modules.Database.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll - ..\Modules.Logging\bin\Release\DigitalData.Modules.Logging.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll - - ..\packages\NLog.4.7.10\lib\net45\NLog.dll + + ..\packages\NLog.5.0.5\lib\net46\NLog.dll diff --git a/DBCleaner/packages.config b/DBCleaner/packages.config index 63f3075e..83b20bbc 100644 --- a/DBCleaner/packages.config +++ b/DBCleaner/packages.config @@ -1,4 +1,4 @@  - + \ No newline at end of file diff --git a/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj b/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj index fdc6a122..ebc1f0e3 100644 --- a/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj +++ b/GUIs.ClipboardWatcher/ClipboardWatcher.vbproj @@ -58,36 +58,39 @@ False + + ..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll + ..\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll False - ..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll + ..\..\Modules\Base\bin\Debug\DigitalData.Modules.Base.dll False - ..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll False - ..\..\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll + ..\..\Modules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll False - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll False - ..\..\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll + ..\..\Modules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll False - ..\..\DDModules\Windows\bin\Debug\DigitalData.Modules.Windows.dll + ..\..\Modules\Windows\bin\Debug\DigitalData.Modules.Windows.dll False - ..\..\DDModules\ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.dll + ..\..\Modules\Patterns\bin\Debug\DigitalData.Modules.ZooFlow.dll diff --git a/GUIs.Common/Common.vbproj b/GUIs.Common/Common.vbproj index fd3306c1..18b0191e 100644 --- a/GUIs.Common/Common.vbproj +++ b/GUIs.Common/Common.vbproj @@ -70,32 +70,32 @@ ..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll - ..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll + ..\..\Modules\Base\bin\Debug\DigitalData.Modules.Base.dll False - ..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll - ..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll - ..\..\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll + ..\..\Modules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll - ..\..\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll + P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Filesystem.dll - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll - ..\..\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll + ..\..\Modules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll - ..\..\DDModules\Windows\bin\Debug\DigitalData.Modules.Windows.dll + ..\..\Modules\Windows\bin\Debug\DigitalData.Modules.Windows.dll - ..\..\DDModules\ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.dll + ..\..\Modules\Patterns\bin\Debug\DigitalData.Modules.ZooFlow.dll ..\packages\GdPicture.14.2.90\lib\net462\GdPicture.NET.14.dll diff --git a/GUIs.GlobalIndexer/GlobalIndexer.vbproj b/GUIs.GlobalIndexer/GlobalIndexer.vbproj index e9eaf094..82a4da1c 100644 --- a/GUIs.GlobalIndexer/GlobalIndexer.vbproj +++ b/GUIs.GlobalIndexer/GlobalIndexer.vbproj @@ -60,7 +60,7 @@ False - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll diff --git a/GUIs.Test.ADSyncTest/ADSyncTest.vbproj b/GUIs.Test.ADSyncTest/ADSyncTest.vbproj index 2e0c1c7b..7ad3452f 100644 --- a/GUIs.Test.ADSyncTest/ADSyncTest.vbproj +++ b/GUIs.Test.ADSyncTest/ADSyncTest.vbproj @@ -49,19 +49,19 @@ - ..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll - ..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll - ..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll + ..\..\Modules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll - ..\..\DDModules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll + ..\..\Modules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll diff --git a/GUIs.Test.EDMIBenchmark/GUIs.Test.EDMIBenchmark.vbproj b/GUIs.Test.EDMIBenchmark/GUIs.Test.EDMIBenchmark.vbproj index 5aeb1d38..3e9ca62d 100644 --- a/GUIs.Test.EDMIBenchmark/GUIs.Test.EDMIBenchmark.vbproj +++ b/GUIs.Test.EDMIBenchmark/GUIs.Test.EDMIBenchmark.vbproj @@ -64,11 +64,11 @@ False - ..\..\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll + ..\..\Modules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll False - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll diff --git a/GUIs.Test.GraphQLTest/GUIs.Test.GraphQLTest.vbproj b/GUIs.Test.GraphQLTest/GUIs.Test.GraphQLTest.vbproj index d33bfb27..24381182 100644 --- a/GUIs.Test.GraphQLTest/GUIs.Test.GraphQLTest.vbproj +++ b/GUIs.Test.GraphQLTest/GUIs.Test.GraphQLTest.vbproj @@ -56,22 +56,22 @@ False - ..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll False - ..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll False - ..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll + ..\..\Modules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll False - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll - ..\..\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll + ..\..\Modules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll diff --git a/GUIs.Test.TestGUI/TestGUI.vbproj b/GUIs.Test.TestGUI/TestGUI.vbproj index fb32b4d5..fa476afd 100644 --- a/GUIs.Test.TestGUI/TestGUI.vbproj +++ b/GUIs.Test.TestGUI/TestGUI.vbproj @@ -83,32 +83,32 @@ ..\GUIs.Common\bin\Debug\DigitalData.GUIs.Common.dll - ..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll - ..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll - ..\..\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll + P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Filesystem.dll - ..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll + ..\..\Modules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll False - ..\..\DDModules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll + ..\..\Modules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll - ..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll + ..\..\Modules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll - ..\..\DDModules\Windows\bin\Debug\DigitalData.Modules.Windows.dll + ..\..\Modules\Windows\bin\Debug\DigitalData.Modules.Windows.dll - ..\..\DDModules\Windream\bin\Debug\DigitalData.Modules.Windream.dll + ..\..\Modules\Windream\bin\Debug\DigitalData.Modules.Windream.dll ..\GUIs.Test.ZUGFeRDTest\bin\Debug\GdPicture.NET.14.dll diff --git a/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj b/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj index 1d104d35..540927d6 100644 --- a/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj +++ b/GUIs.Test.ZUGFeRDTest/ZUGFeRDTest.vbproj @@ -52,23 +52,23 @@ False - ..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll False - ..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll False - ..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll + ..\..\Modules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll False - ..\..\DDModules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll + ..\..\Modules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll False - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll ..\packages\GdPicture.14.2.90\lib\net462\GdPicture.NET.14.dll diff --git a/Service.EDMIService/EDMIService.vbproj b/Service.EDMIService/EDMIService.vbproj index 2cd77fc8..ec2326c1 100644 --- a/Service.EDMIService/EDMIService.vbproj +++ b/Service.EDMIService/EDMIService.vbproj @@ -67,31 +67,31 @@ - ..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll + ..\..\Modules\Base\bin\Debug\DigitalData.Modules.Base.dll - ..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll - ..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll - ..\..\DDModules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll + ..\..\Modules\EDMIAPI\bin\Debug\DigitalData.Modules.EDMI.API.dll - ..\..\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll + P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Filesystem.dll - ..\..\DDModules\Language\bin\Debug\DigitalData.Modules.Language.dll + P:\Projekte DIGITAL DATA\DIGITAL DATA - Entwicklung\DLL_Bibliotheken\Digital Data\DigitalData.Modules.Language.dll - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll - ..\..\DDModules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll + ..\..\Modules\Patterns\bin\Debug\DigitalData.Modules.Patterns.dll - ..\..\DDModules\ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.dll + ..\..\Modules\Patterns\bin\Debug\DigitalData.Modules.ZooFlow.dll ..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll diff --git a/Service.JobRunner/JobRunner.vbproj b/Service.JobRunner/JobRunner.vbproj index faa52385..d1aea3a3 100644 --- a/Service.JobRunner/JobRunner.vbproj +++ b/Service.JobRunner/JobRunner.vbproj @@ -53,19 +53,19 @@ False - ..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll False - ..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll False - ..\..\DDModules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll + ..\..\Modules\Jobs\bin\Debug\DigitalData.Modules.Jobs.dll False - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll diff --git a/Services.EmailService/DDEmailService.vbproj b/Services.EmailService/DDEmailService.vbproj index b9c19b05..03b284fd 100644 --- a/Services.EmailService/DDEmailService.vbproj +++ b/Services.EmailService/DDEmailService.vbproj @@ -49,26 +49,26 @@ - ..\..\DDModules\Base\bin\Debug\DigitalData.Modules.Base.dll + ..\..\Modules\Base\bin\Debug\DigitalData.Modules.Base.dll - ..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Config.dll False - ..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll False - ..\..\DDModules\Encryption\bin\Debug\DigitalData.Modules.Encryption.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Encryption.dll False - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll False - ..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll + ..\..\Modules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll ..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll diff --git a/Services.LicenseService/DDEDMLicenseService.vbproj b/Services.LicenseService/DDEDMLicenseService.vbproj index 24f2898e..9dc77cbf 100644 --- a/Services.LicenseService/DDEDMLicenseService.vbproj +++ b/Services.LicenseService/DDEDMLicenseService.vbproj @@ -50,11 +50,11 @@ False - ..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Database.dll False - ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll + ..\..\Modules\Config\bin\Debug\DigitalData.Modules.Logging.dll From c0b5ae741df4f78bf1148867232929d747ca761d Mon Sep 17 00:00:00 2001 From: OlgunR Date: Mon, 2 Jun 2025 15:27:36 +0200 Subject: [PATCH 2/4] =?UTF-8?q?Unterst=C3=BCtzte=20Dateiformate=20werden?= =?UTF-8?q?=20nun=20von=20GDPicture=20angezeigt.=20Nicht=20unterst=C3=BCtz?= =?UTF-8?q?te=20(.Csv)=20von=20einem=20geeigneten=20Viewer.=20-=20Document?= =?UTF-8?q?Viewer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- Controls.DocumentViewer/DocumentViewer.vb | 19 ++----------------- GUIs.Test.TestGUI/TestGUI.vbproj | 4 +++- 2 files changed, 5 insertions(+), 18 deletions(-) diff --git a/Controls.DocumentViewer/DocumentViewer.vb b/Controls.DocumentViewer/DocumentViewer.vb index 647e87fe..e3d6b979 100644 --- a/Controls.DocumentViewer/DocumentViewer.vb +++ b/Controls.DocumentViewer/DocumentViewer.vb @@ -461,11 +461,7 @@ Public Class DocumentViewer Private Sub SetViewerMode(Extension As String) Select Case Extension.ToUpper - Case ".MSG" - _ViewerMode = ViewerMode.RichText - Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT" - _ViewerMode = ViewerMode.RichText - Case ".XLSX", ".XLS", "CSV" + Case "CSV" _ViewerMode = ViewerMode.Excel Case Else _ViewerMode = ViewerMode.GDPicture @@ -509,18 +505,7 @@ Public Class DocumentViewer SpreadsheetControl1.Dock = DockStyle.None Select Case oExtension.ToUpper - Case ".MSG" - Dim oEmlPath As String = _email.Convert_ToEml(FilePath) - _TempFiles.Add(oEmlPath) - DoLoadFile(oEmlPath) - - Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT" - RichEditControl1.LoadDocument(FilePath, GetDocumentFormat(oExtension)) - - RichEditControl1.Visible = True - RichEditControl1.Dock = DockStyle.Fill - - Case ".XLSX", ".XLS", ".CSV" + Case ".CSV" Dim oFormat = GetSpreadsheetFormat(oExtension) SpreadsheetControl1.LoadDocument(FilePath, oFormat) diff --git a/GUIs.Test.TestGUI/TestGUI.vbproj b/GUIs.Test.TestGUI/TestGUI.vbproj index 1b3a5d36..2de4c853 100644 --- a/GUIs.Test.TestGUI/TestGUI.vbproj +++ b/GUIs.Test.TestGUI/TestGUI.vbproj @@ -377,7 +377,9 @@ frmRelations.vb - + + Form + frmStart.vb From 18182245341a2cef76c8781a48f1d078efda3761 Mon Sep 17 00:00:00 2001 From: OlgunR Date: Tue, 3 Jun 2025 13:16:56 +0200 Subject: [PATCH 3/4] =?UTF-8?q?GdViewer=20Hintergrund=20wei=C3=9F=20gesetz?= =?UTF-8?q?t;=20ViewerMode.Richtext=20und=20Anh=C3=A4ngsel=20entfernt.=20-?= =?UTF-8?q?=20DocumentViewer?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../DocumentViewer.Designer.vb | 17 +-- Controls.DocumentViewer/DocumentViewer.vb | 110 +++--------------- GUIs.Test.TestGUI/frmDocView.vb | 3 +- 3 files changed, 16 insertions(+), 114 deletions(-) diff --git a/Controls.DocumentViewer/DocumentViewer.Designer.vb b/Controls.DocumentViewer/DocumentViewer.Designer.vb index 957b11a0..cd802e1d 100644 --- a/Controls.DocumentViewer/DocumentViewer.Designer.vb +++ b/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 diff --git a/Controls.DocumentViewer/DocumentViewer.vb b/Controls.DocumentViewer/DocumentViewer.vb index e3d6b979..2e0e8779 100644 --- a/Controls.DocumentViewer/DocumentViewer.vb +++ b/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 diff --git a/GUIs.Test.TestGUI/frmDocView.vb b/GUIs.Test.TestGUI/frmDocView.vb index 74c38d37..858c266a 100644 --- a/GUIs.Test.TestGUI/frmDocView.vb +++ b/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 From bf2570d89fbdaec69957e3dc95e8c3f5f1a59a0d Mon Sep 17 00:00:00 2001 From: OlgunR Date: Tue, 3 Jun 2025 14:25:01 +0200 Subject: [PATCH 4/4] v2.0.0.0 --- Controls.DocumentViewer/My Project/AssemblyInfo.vb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Controls.DocumentViewer/My Project/AssemblyInfo.vb b/Controls.DocumentViewer/My Project/AssemblyInfo.vb index 33d01303..da0d0fe9 100644 --- a/Controls.DocumentViewer/My Project/AssemblyInfo.vb +++ b/Controls.DocumentViewer/My Project/AssemblyInfo.vb @@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices ' übernehmen, indem Sie "*" eingeben: ' - - + +