diff --git a/Controls.RegexEditor/My Project/licenses.licx b/Controls.RegexEditor/My Project/licenses.licx index e69de29b..773d16c2 100644 --- a/Controls.RegexEditor/My Project/licenses.licx +++ b/Controls.RegexEditor/My Project/licenses.licx @@ -0,0 +1 @@ +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/GUIs.ClipboardWatcher/frmMatch.vb b/GUIs.ClipboardWatcher/frmMatch.vb index a9eb9e83..710dd8c6 100644 --- a/GUIs.ClipboardWatcher/frmMatch.vb +++ b/GUIs.ClipboardWatcher/frmMatch.vb @@ -5,7 +5,6 @@ Imports System.Windows.Forms Imports DevExpress.XtraEditors Imports DigitalData.GUIs.Common Imports DigitalData.Modules.Logging -Imports DigitalData.Modules.Language Imports DigitalData.Modules.ZooFlow Imports DigitalData.Modules.ZooFlow.Params Imports DigitalData.Modules.ZooFlow.Constants diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb index a1b8d727..f6343cf1 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb @@ -225,9 +225,12 @@ Public Class frmDocumentResultList SwitchDetailContainerHorizontal.Visibility = BarItemVisibility.Never End If - If OperationMode = OperationMode.NoAppServer Then - panelContainerStatus.Visibility = Docking.DockVisibility.Hidden - End If + ' 31.10.23 / JJ + ' Hide panelContainerStatus in all cases + panelContainerStatus.Visibility = Docking.DockVisibility.Hidden + 'If OperationMode = OperationMode.NoAppServer Then + ' panelContainerStatus.Visibility = Docking.DockVisibility.Hidden + 'End If UpdateTotalResults() LoadGridDataAndLayout() diff --git a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.Designer.vb b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.Designer.vb index 1e724258..86425ae3 100644 --- a/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.Designer.vb +++ b/GUIs.Common/ObjectPropertyDialog/frmObjectPropertyDialog.Designer.vb @@ -127,7 +127,7 @@ Partial Class frmObjectPropertyDialog Me.TabFormControl1.Pages.Add(Me.TabPageAttributes) Me.TabFormControl1.Pages.Add(Me.TabPageObject) Me.TabFormControl1.Pages.Add(Me.TabPageHistory) - Me.TabFormControl1.SelectedPage = Me.TabPageObject + Me.TabFormControl1.SelectedPage = Me.TabPageAttributes Me.TabFormControl1.ShowAddPageButton = False Me.TabFormControl1.ShowTabCloseButtons = False Me.TabFormControl1.Size = New System.Drawing.Size(572, 71) @@ -540,7 +540,7 @@ Partial Class frmObjectPropertyDialog Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(572, 605) - Me.Controls.Add(Me.TabFormContentContainer2) + Me.Controls.Add(Me.TabFormContentContainer1) Me.Controls.Add(Me.TabFormControl1) Me.IconOptions.SvgImage = CType(resources.GetObject("frmObjectPropertyDialog.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.Name = "frmObjectPropertyDialog" diff --git a/GUIs.Test.TestGUI/TestGUI.vbproj b/GUIs.Test.TestGUI/TestGUI.vbproj index 5dc632e0..3b46931b 100644 --- a/GUIs.Test.TestGUI/TestGUI.vbproj +++ b/GUIs.Test.TestGUI/TestGUI.vbproj @@ -82,6 +82,10 @@ ..\..\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll + + False + ..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll + ..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll diff --git a/GUIs.Test.TestGUI/frmDocView.Designer.vb b/GUIs.Test.TestGUI/frmDocView.Designer.vb index 48185186..16318107 100644 --- a/GUIs.Test.TestGUI/frmDocView.Designer.vb +++ b/GUIs.Test.TestGUI/frmDocView.Designer.vb @@ -24,18 +24,20 @@ Partial Class frmDocView Private Sub InitializeComponent() Me.Panel1 = New System.Windows.Forms.Panel() Me.Button2 = New System.Windows.Forms.Button() + Me.Button5 = New System.Windows.Forms.Button() + Me.Button4 = New System.Windows.Forms.Button() Me.Button3 = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button() Me.TextBox1 = New System.Windows.Forms.TextBox() Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() - Me.Button4 = New System.Windows.Forms.Button() Me.Panel1.SuspendLayout() Me.SuspendLayout() ' 'Panel1 ' Me.Panel1.Controls.Add(Me.Button2) + Me.Panel1.Controls.Add(Me.Button5) Me.Panel1.Controls.Add(Me.Button4) Me.Panel1.Controls.Add(Me.Button3) Me.Panel1.Controls.Add(Me.Button1) @@ -55,6 +57,24 @@ Partial Class frmDocView Me.Button2.Text = "Unload File" Me.Button2.UseVisualStyleBackColor = True ' + 'Button5 + ' + Me.Button5.Location = New System.Drawing.Point(749, 10) + Me.Button5.Name = "Button5" + Me.Button5.Size = New System.Drawing.Size(75, 23) + Me.Button5.TabIndex = 1 + Me.Button5.Text = "Clone" + Me.Button5.UseVisualStyleBackColor = True + ' + 'Button4 + ' + Me.Button4.Location = New System.Drawing.Point(830, 10) + Me.Button4.Name = "Button4" + Me.Button4.Size = New System.Drawing.Size(75, 23) + Me.Button4.TabIndex = 1 + Me.Button4.Text = "Save" + Me.Button4.UseVisualStyleBackColor = True + ' 'Button3 ' Me.Button3.Location = New System.Drawing.Point(911, 10) @@ -93,15 +113,6 @@ Partial Class frmDocView Me.DocumentViewer1.Size = New System.Drawing.Size(1079, 463) Me.DocumentViewer1.TabIndex = 0 ' - 'Button4 - ' - Me.Button4.Location = New System.Drawing.Point(830, 10) - Me.Button4.Name = "Button4" - Me.Button4.Size = New System.Drawing.Size(75, 23) - Me.Button4.TabIndex = 1 - Me.Button4.Text = "Save" - Me.Button4.UseVisualStyleBackColor = True - ' 'frmDocView ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) @@ -125,4 +136,5 @@ Partial Class frmDocView Friend WithEvents Button2 As Button Friend WithEvents Button3 As Button Friend WithEvents Button4 As Button + Friend WithEvents Button5 As Button End Class diff --git a/GUIs.Test.TestGUI/frmDocView.vb b/GUIs.Test.TestGUI/frmDocView.vb index b047fd16..453a0bcb 100644 --- a/GUIs.Test.TestGUI/frmDocView.vb +++ b/GUIs.Test.TestGUI/frmDocView.vb @@ -1,8 +1,12 @@ Imports DigitalData.Modules.Logging +Imports DigitalData.Modules.Interfaces +Imports GdPicture14 Public Class frmDocView Private LogConfig As LogConfig + Private Const GDPICTURE_KEY = "21182889975216572111813147150675976632" + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click If String.IsNullOrEmpty(TextBox1.Text) Then If OpenFileDialog1.ShowDialog() = DialogResult.OK Then @@ -17,7 +21,7 @@ Public Class frmDocView Private Sub frmDocView_Load(sender As Object, e As EventArgs) Handles Me.Load LogConfig = New LogConfig(LogConfig.PathType.Temp) - DocumentViewer1.Init(LogConfig, "21182889975216572111813147150675976632") + DocumentViewer1.Init(LogConfig, GDPICTURE_KEY) End Sub Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click @@ -32,4 +36,16 @@ Public Class frmDocView Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click DocumentViewer1.Save() End Sub + + Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click + Dim licenseManager As New GdPicture14.LicenseManager() + licenseManager.RegisterKEY(GDPICTURE_KEY) + + Dim oPDFConverter = New PDFConverter(LogConfig) + Dim oResult = oPDFConverter.ConvertPDFADocumentToPDFDocument(TextBox1.Text, TextBox1.Text & ".cloned.pdf") + + If oResult = True Then + MsgBox("Document was successfully cloned!") + End If + End Sub End Class \ No newline at end of file diff --git a/Services.EmailService/Config.vb b/Services.EmailService/Config.vb index b1cd2d4a..dd4a8c1b 100644 --- a/Services.EmailService/Config.vb +++ b/Services.EmailService/Config.vb @@ -1,15 +1,6 @@ Imports DigitalData.Modules.Config.ConfigAttributes Public Class Config - - Public Property FirebirdServer As String = "" - - Public Property FirebirdDatabase As String = "" - - Public Property FirebirdUser As String = "" - - Public Property FirebirdPassword As String = "" - Public Property SQLServerConnectionString As String = "" diff --git a/Services.EmailService/EmailService.vb b/Services.EmailService/EmailService.vb index 1394ee35..123e0b73 100644 --- a/Services.EmailService/EmailService.vb +++ b/Services.EmailService/EmailService.vb @@ -59,14 +59,6 @@ Public Class EmailService _Logger.Info("Inititalize Databases") - If _Config.FirebirdServer <> String.Empty Then - _Firebird = New Firebird(_LogConfig, _Config.FirebirdServer, _Config.FirebirdDatabase, _Config.FirebirdUser, _Config.FirebirdPassword) - - If _Firebird._DBInitialized = False Then - _Logger.Warn("Firebird Connection could not be established. Check the Error Log") - End If - End If - If _Config.SQLServerConnectionString <> String.Empty Then _MSSQL = New MSSQLServer(_LogConfig, _Config.SQLServerConnectionString) @@ -91,7 +83,6 @@ Public Class EmailService _Logger.Debug("Inititalize Email") _limilab = New Limilab(_LogConfig) - _MailSender = New Mail.MailSender(_LogConfig) ' === Initialize Queue === @@ -153,11 +144,6 @@ Public Class EmailService Private Sub EmailQueue_DoWork(sender As Object, e As DoWorkEventArgs) Try - If _Firebird?._DBInitialized Then - _Logger.Debug("Starting Firebird Sending") - SendEmailFrom(DatabaseType.Firebird, Nothing) - End If - If _MSSQL?.DBInitialized Then _Logger.Debug("Starting MSSQL Sending") SendEmailFrom(DatabaseType.MSSQL, _MSSQL) @@ -345,6 +331,10 @@ Public Class EmailService _Logger.Debug("Preparing to send [{0}] mails..", oAccountQueue.Count) + ' ======= Initialize Sender ======= + + _MailSender = New Mail.MailSender(_LogConfig) + ' ======= Connect to server ======= Dim oOptions As New Mail.MailSession.MailSessionOptions() With {