This commit is contained in:
Jonathan Jenne 2023-12-18 11:54:55 +01:00
parent 386ccb7ce4
commit b17e9135bd
9 changed files with 56 additions and 40 deletions

View File

@ -0,0 +1 @@
DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

View File

@ -5,7 +5,6 @@ Imports System.Windows.Forms
Imports DevExpress.XtraEditors Imports DevExpress.XtraEditors
Imports DigitalData.GUIs.Common Imports DigitalData.GUIs.Common
Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.Language
Imports DigitalData.Modules.ZooFlow Imports DigitalData.Modules.ZooFlow
Imports DigitalData.Modules.ZooFlow.Params Imports DigitalData.Modules.ZooFlow.Params
Imports DigitalData.Modules.ZooFlow.Constants Imports DigitalData.Modules.ZooFlow.Constants

View File

@ -225,9 +225,12 @@ Public Class frmDocumentResultList
SwitchDetailContainerHorizontal.Visibility = BarItemVisibility.Never SwitchDetailContainerHorizontal.Visibility = BarItemVisibility.Never
End If End If
If OperationMode = OperationMode.NoAppServer Then ' 31.10.23 / JJ
' Hide panelContainerStatus in all cases
panelContainerStatus.Visibility = Docking.DockVisibility.Hidden panelContainerStatus.Visibility = Docking.DockVisibility.Hidden
End If 'If OperationMode = OperationMode.NoAppServer Then
' panelContainerStatus.Visibility = Docking.DockVisibility.Hidden
'End If
UpdateTotalResults() UpdateTotalResults()
LoadGridDataAndLayout() LoadGridDataAndLayout()

View File

@ -127,7 +127,7 @@ Partial Class frmObjectPropertyDialog
Me.TabFormControl1.Pages.Add(Me.TabPageAttributes) Me.TabFormControl1.Pages.Add(Me.TabPageAttributes)
Me.TabFormControl1.Pages.Add(Me.TabPageObject) Me.TabFormControl1.Pages.Add(Me.TabPageObject)
Me.TabFormControl1.Pages.Add(Me.TabPageHistory) Me.TabFormControl1.Pages.Add(Me.TabPageHistory)
Me.TabFormControl1.SelectedPage = Me.TabPageObject Me.TabFormControl1.SelectedPage = Me.TabPageAttributes
Me.TabFormControl1.ShowAddPageButton = False Me.TabFormControl1.ShowAddPageButton = False
Me.TabFormControl1.ShowTabCloseButtons = False Me.TabFormControl1.ShowTabCloseButtons = False
Me.TabFormControl1.Size = New System.Drawing.Size(572, 71) 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.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.ClientSize = New System.Drawing.Size(572, 605) Me.ClientSize = New System.Drawing.Size(572, 605)
Me.Controls.Add(Me.TabFormContentContainer2) Me.Controls.Add(Me.TabFormContentContainer1)
Me.Controls.Add(Me.TabFormControl1) Me.Controls.Add(Me.TabFormControl1)
Me.IconOptions.SvgImage = CType(resources.GetObject("frmObjectPropertyDialog.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) Me.IconOptions.SvgImage = CType(resources.GetObject("frmObjectPropertyDialog.IconOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
Me.Name = "frmObjectPropertyDialog" Me.Name = "frmObjectPropertyDialog"

View File

@ -82,6 +82,10 @@
<Reference Include="DigitalData.Modules.Filesystem"> <Reference Include="DigitalData.Modules.Filesystem">
<HintPath>..\..\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath> <HintPath>..\..\DDModules\Filesystem\bin\Debug\DigitalData.Modules.Filesystem.dll</HintPath>
</Reference> </Reference>
<Reference Include="DigitalData.Modules.Interfaces, Version=1.12.0.0, Culture=neutral, processorArchitecture=MSIL">
<SpecificVersion>False</SpecificVersion>
<HintPath>..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
</Reference>
<Reference Include="DigitalData.Modules.Logging"> <Reference Include="DigitalData.Modules.Logging">
<HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath> <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
</Reference> </Reference>

View File

@ -24,18 +24,20 @@ Partial Class frmDocView
Private Sub InitializeComponent() Private Sub InitializeComponent()
Me.Panel1 = New System.Windows.Forms.Panel() Me.Panel1 = New System.Windows.Forms.Panel()
Me.Button2 = New System.Windows.Forms.Button() 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.Button3 = New System.Windows.Forms.Button()
Me.Button1 = New System.Windows.Forms.Button() Me.Button1 = New System.Windows.Forms.Button()
Me.TextBox1 = New System.Windows.Forms.TextBox() Me.TextBox1 = New System.Windows.Forms.TextBox()
Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog()
Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer()
Me.Button4 = New System.Windows.Forms.Button()
Me.Panel1.SuspendLayout() Me.Panel1.SuspendLayout()
Me.SuspendLayout() Me.SuspendLayout()
' '
'Panel1 'Panel1
' '
Me.Panel1.Controls.Add(Me.Button2) Me.Panel1.Controls.Add(Me.Button2)
Me.Panel1.Controls.Add(Me.Button5)
Me.Panel1.Controls.Add(Me.Button4) Me.Panel1.Controls.Add(Me.Button4)
Me.Panel1.Controls.Add(Me.Button3) Me.Panel1.Controls.Add(Me.Button3)
Me.Panel1.Controls.Add(Me.Button1) Me.Panel1.Controls.Add(Me.Button1)
@ -55,6 +57,24 @@ Partial Class frmDocView
Me.Button2.Text = "Unload File" Me.Button2.Text = "Unload File"
Me.Button2.UseVisualStyleBackColor = True 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 'Button3
' '
Me.Button3.Location = New System.Drawing.Point(911, 10) 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.Size = New System.Drawing.Size(1079, 463)
Me.DocumentViewer1.TabIndex = 0 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 'frmDocView
' '
Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@ -125,4 +136,5 @@ Partial Class frmDocView
Friend WithEvents Button2 As Button Friend WithEvents Button2 As Button
Friend WithEvents Button3 As Button Friend WithEvents Button3 As Button
Friend WithEvents Button4 As Button Friend WithEvents Button4 As Button
Friend WithEvents Button5 As Button
End Class End Class

View File

@ -1,8 +1,12 @@
Imports DigitalData.Modules.Logging Imports DigitalData.Modules.Logging
Imports DigitalData.Modules.Interfaces
Imports GdPicture14
Public Class frmDocView Public Class frmDocView
Private LogConfig As LogConfig Private LogConfig As LogConfig
Private Const GDPICTURE_KEY = "21182889975216572111813147150675976632"
Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click
If String.IsNullOrEmpty(TextBox1.Text) Then If String.IsNullOrEmpty(TextBox1.Text) Then
If OpenFileDialog1.ShowDialog() = DialogResult.OK 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 Private Sub frmDocView_Load(sender As Object, e As EventArgs) Handles Me.Load
LogConfig = New LogConfig(LogConfig.PathType.Temp) LogConfig = New LogConfig(LogConfig.PathType.Temp)
DocumentViewer1.Init(LogConfig, "21182889975216572111813147150675976632") DocumentViewer1.Init(LogConfig, GDPICTURE_KEY)
End Sub End Sub
Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click 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 Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
DocumentViewer1.Save() DocumentViewer1.Save()
End Sub 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 End Class

View File

@ -1,15 +1,6 @@
Imports DigitalData.Modules.Config.ConfigAttributes Imports DigitalData.Modules.Config.ConfigAttributes
Public Class Config Public Class Config
<ConnectionString>
Public Property FirebirdServer As String = ""
<ConnectionString>
Public Property FirebirdDatabase As String = ""
<ConnectionString>
Public Property FirebirdUser As String = ""
<ConnectionString>
Public Property FirebirdPassword As String = ""
<ConnectionString> <ConnectionString>
Public Property SQLServerConnectionString As String = "" Public Property SQLServerConnectionString As String = ""
<ConnectionString> <ConnectionString>

View File

@ -59,14 +59,6 @@ Public Class EmailService
_Logger.Info("Inititalize Databases") _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 If _Config.SQLServerConnectionString <> String.Empty Then
_MSSQL = New MSSQLServer(_LogConfig, _Config.SQLServerConnectionString) _MSSQL = New MSSQLServer(_LogConfig, _Config.SQLServerConnectionString)
@ -91,7 +83,6 @@ Public Class EmailService
_Logger.Debug("Inititalize Email") _Logger.Debug("Inititalize Email")
_limilab = New Limilab(_LogConfig) _limilab = New Limilab(_LogConfig)
_MailSender = New Mail.MailSender(_LogConfig)
' === Initialize Queue === ' === Initialize Queue ===
@ -153,11 +144,6 @@ Public Class EmailService
Private Sub EmailQueue_DoWork(sender As Object, e As DoWorkEventArgs) Private Sub EmailQueue_DoWork(sender As Object, e As DoWorkEventArgs)
Try Try
If _Firebird?._DBInitialized Then
_Logger.Debug("Starting Firebird Sending")
SendEmailFrom(DatabaseType.Firebird, Nothing)
End If
If _MSSQL?.DBInitialized Then If _MSSQL?.DBInitialized Then
_Logger.Debug("Starting MSSQL Sending") _Logger.Debug("Starting MSSQL Sending")
SendEmailFrom(DatabaseType.MSSQL, _MSSQL) SendEmailFrom(DatabaseType.MSSQL, _MSSQL)
@ -345,6 +331,10 @@ Public Class EmailService
_Logger.Debug("Preparing to send [{0}] mails..", oAccountQueue.Count) _Logger.Debug("Preparing to send [{0}] mails..", oAccountQueue.Count)
' ======= Initialize Sender =======
_MailSender = New Mail.MailSender(_LogConfig)
' ======= Connect to server ======= ' ======= Connect to server =======
Dim oOptions As New Mail.MailSession.MailSessionOptions() With { Dim oOptions As New Mail.MailSession.MailSessionOptions() With {