diff --git a/GUIs.Test.EDMIBenchmark/Form1.vb b/GUIs.Test.EDMIBenchmark/Form1.vb index cd35bc0d..f4f9fc13 100644 --- a/GUIs.Test.EDMIBenchmark/Form1.vb +++ b/GUIs.Test.EDMIBenchmark/Form1.vb @@ -61,8 +61,8 @@ Public Class Form1 AddLogMessage($"Importing {oFileInfo.Name}... ({FormatBytes(oFileInfo.Length)})") - Dim oObjectId As Long = Await _Client.ImportFileAsync(oFileInfo.FullName, "WichtigesDokument", 1, 0) - AddLogMessage($"File with Id [{oObjectId}] imported!") + 'Dim oObjectId As Long = Await _Client.ImportFileAsync(oFileInfo.FullName, "WichtigesDokument", 1, 0) + 'AddLogMessage($"File with Id [{oObjectId}] imported!") oCountFiles += 1 oSW.Stop() AddLogMessage($"Import Time: {FormatTime(oSW.ElapsedMilliseconds)}") diff --git a/GUIs.Test.TestGUI/My Project/Application.Designer.vb b/GUIs.Test.TestGUI/My Project/Application.Designer.vb index ac66efcf..9942632e 100644 --- a/GUIs.Test.TestGUI/My Project/Application.Designer.vb +++ b/GUIs.Test.TestGUI/My Project/Application.Designer.vb @@ -32,7 +32,7 @@ Namespace My _ Protected Overrides Sub OnCreateMainForm() - Me.MainForm = Global.TestGUI.frmStart + Me.MainForm = Global.TestGUI.frmDocViewPure End Sub End Class End Namespace diff --git a/GUIs.Test.TestGUI/My Project/Application.myapp b/GUIs.Test.TestGUI/My Project/Application.myapp index a1da81d5..19b75e50 100644 --- a/GUIs.Test.TestGUI/My Project/Application.myapp +++ b/GUIs.Test.TestGUI/My Project/Application.myapp @@ -1,7 +1,7 @@  true - frmStart + frmDocViewPure false 0 true diff --git a/GUIs.Test.TestGUI/My Project/licenses.licx b/GUIs.Test.TestGUI/My Project/licenses.licx index c0ffb89a..8918c8d4 100644 --- a/GUIs.Test.TestGUI/My Project/licenses.licx +++ b/GUIs.Test.TestGUI/My Project/licenses.licx @@ -1,6 +1,7 @@ -DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraWizard.WizardControl, DevExpress.XtraWizard.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.LookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraWizard.WizardControl, DevExpress.XtraWizard.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/GUIs.Test.TestGUI/TestGUI.vbproj b/GUIs.Test.TestGUI/TestGUI.vbproj index cc9c41cf..427e3b5e 100644 --- a/GUIs.Test.TestGUI/TestGUI.vbproj +++ b/GUIs.Test.TestGUI/TestGUI.vbproj @@ -51,10 +51,30 @@ My Project\app.manifest + + + + + + + + + + + + + + + + + + False + D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll + ..\packages\Microsoft.Extensions.Logging.Abstractions.2.1.1\lib\netstandard2.0\Microsoft.Extensions.Logging.Abstractions.dll @@ -125,6 +145,18 @@ Form + + frmDocView.vb + + + Form + + + frmDocViewPure.vb + + + Form + frmFilesystem.vb @@ -166,6 +198,7 @@ True Application.myapp + True True @@ -185,6 +218,12 @@ frmConfigTest.vb + + frmDocView.vb + + + frmDocViewPure.vb + frmFilesystem.vb @@ -229,6 +268,10 @@ + + {0958cddf-4a16-41f6-8837-8335f71d599c} + DocumentViewer + {3dcd6d1a-c830-4241-b7e4-27430e7ea483} LookupControl diff --git a/GUIs.Test.TestGUI/frmDocView.Designer.vb b/GUIs.Test.TestGUI/frmDocView.Designer.vb new file mode 100644 index 00000000..b6da649b --- /dev/null +++ b/GUIs.Test.TestGUI/frmDocView.Designer.vb @@ -0,0 +1,92 @@ + _ +Partial Class frmDocView + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() + Me.Panel1 = New System.Windows.Forms.Panel() + Me.TextBox1 = New System.Windows.Forms.TextBox() + Me.Button1 = New System.Windows.Forms.Button() + Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() + Me.Panel1.SuspendLayout() + Me.SuspendLayout() + ' + 'DocumentViewer1 + ' + Me.DocumentViewer1.Dock = System.Windows.Forms.DockStyle.Bottom + Me.DocumentViewer1.FileLoaded = False + Me.DocumentViewer1.Location = New System.Drawing.Point(0, 43) + Me.DocumentViewer1.Name = "DocumentViewer1" + Me.DocumentViewer1.Size = New System.Drawing.Size(1079, 463) + Me.DocumentViewer1.TabIndex = 0 + ' + 'Panel1 + ' + Me.Panel1.Controls.Add(Me.Button1) + Me.Panel1.Controls.Add(Me.TextBox1) + Me.Panel1.Dock = System.Windows.Forms.DockStyle.Fill + Me.Panel1.Location = New System.Drawing.Point(0, 0) + Me.Panel1.Name = "Panel1" + Me.Panel1.Size = New System.Drawing.Size(1079, 43) + Me.Panel1.TabIndex = 1 + ' + 'TextBox1 + ' + Me.TextBox1.Location = New System.Drawing.Point(12, 12) + Me.TextBox1.Name = "TextBox1" + Me.TextBox1.Size = New System.Drawing.Size(846, 20) + Me.TextBox1.TabIndex = 0 + ' + 'Button1 + ' + Me.Button1.Location = New System.Drawing.Point(864, 10) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(75, 23) + Me.Button1.TabIndex = 1 + Me.Button1.Text = "Open File" + Me.Button1.UseVisualStyleBackColor = True + ' + 'OpenFileDialog1 + ' + Me.OpenFileDialog1.FileName = "OpenFileDialog1" + ' + 'frmDocView + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(1079, 506) + Me.Controls.Add(Me.Panel1) + Me.Controls.Add(Me.DocumentViewer1) + Me.Name = "frmDocView" + Me.Text = "frmDocView" + Me.Panel1.ResumeLayout(False) + Me.Panel1.PerformLayout() + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer + Friend WithEvents Panel1 As Panel + Friend WithEvents Button1 As Button + Friend WithEvents TextBox1 As TextBox + Friend WithEvents OpenFileDialog1 As OpenFileDialog +End Class diff --git a/GUIs.Test.TestGUI/frmDocView.resx b/GUIs.Test.TestGUI/frmDocView.resx new file mode 100644 index 00000000..33c7f672 --- /dev/null +++ b/GUIs.Test.TestGUI/frmDocView.resx @@ -0,0 +1,123 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + 17, 17 + + \ No newline at end of file diff --git a/GUIs.Test.TestGUI/frmDocView.vb b/GUIs.Test.TestGUI/frmDocView.vb new file mode 100644 index 00000000..0c51674e --- /dev/null +++ b/GUIs.Test.TestGUI/frmDocView.vb @@ -0,0 +1,16 @@ +Imports DigitalData.Modules.Logging + +Public Class frmDocView + Private LogConfig As LogConfig + + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + If OpenFileDialog1.ShowDialog() = DialogResult.OK Then + DocumentViewer1.LoadFile(OpenFileDialog1.FileName) + End If + End Sub + + Private Sub frmDocView_Load(sender As Object, e As EventArgs) Handles Me.Load + LogConfig = New LogConfig(LogConfig.PathType.Temp) + DocumentViewer1.Init(LogConfig, "21182889975216572111813147150675976632") + End Sub +End Class \ No newline at end of file diff --git a/GUIs.Test.TestGUI/frmDocViewPure.Designer.vb b/GUIs.Test.TestGUI/frmDocViewPure.Designer.vb new file mode 100644 index 00000000..fdbabb49 --- /dev/null +++ b/GUIs.Test.TestGUI/frmDocViewPure.Designer.vb @@ -0,0 +1,61 @@ + _ +Partial Class frmDocViewPure + Inherits System.Windows.Forms.Form + + 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. + _ + Protected Overrides Sub Dispose(ByVal disposing As Boolean) + Try + If disposing AndAlso components IsNot Nothing Then + components.Dispose() + End If + Finally + MyBase.Dispose(disposing) + End Try + End Sub + + 'Wird vom Windows Form-Designer benötigt. + Private components As System.ComponentModel.IContainer + + 'Hinweis: Die folgende Prozedur ist für den Windows Form-Designer erforderlich. + 'Das Bearbeiten ist mit dem Windows Form-Designer möglich. + 'Das Bearbeiten mit dem Code-Editor ist nicht möglich. + _ + Private Sub InitializeComponent() + Me.SpreadsheetControl1 = New DevExpress.XtraSpreadsheet.SpreadsheetControl() + Me.Button1 = New System.Windows.Forms.Button() + Me.SuspendLayout() + ' + 'SpreadsheetControl1 + ' + Me.SpreadsheetControl1.Location = New System.Drawing.Point(228, 101) + Me.SpreadsheetControl1.Name = "SpreadsheetControl1" + Me.SpreadsheetControl1.Size = New System.Drawing.Size(400, 200) + Me.SpreadsheetControl1.TabIndex = 0 + Me.SpreadsheetControl1.Text = "SpreadsheetControl1" + ' + 'Button1 + ' + Me.Button1.Location = New System.Drawing.Point(546, 25) + Me.Button1.Name = "Button1" + Me.Button1.Size = New System.Drawing.Size(75, 23) + Me.Button1.TabIndex = 1 + Me.Button1.Text = "unload" + Me.Button1.UseVisualStyleBackColor = True + ' + 'frmDocViewPure + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(800, 450) + Me.Controls.Add(Me.Button1) + Me.Controls.Add(Me.SpreadsheetControl1) + Me.Name = "frmDocViewPure" + Me.Text = "frmDocViewPure" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents SpreadsheetControl1 As DevExpress.XtraSpreadsheet.SpreadsheetControl + Friend WithEvents Button1 As Button +End Class diff --git a/GUIs.Test.TestGUI/frmDocViewPure.resx b/GUIs.Test.TestGUI/frmDocViewPure.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/GUIs.Test.TestGUI/frmDocViewPure.resx @@ -0,0 +1,120 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + text/microsoft-resx + + + 2.0 + + + System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + + System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089 + + \ No newline at end of file diff --git a/GUIs.Test.TestGUI/frmDocViewPure.vb b/GUIs.Test.TestGUI/frmDocViewPure.vb new file mode 100644 index 00000000..012a6d02 --- /dev/null +++ b/GUIs.Test.TestGUI/frmDocViewPure.vb @@ -0,0 +1,15 @@ +Imports GdPicture14 + +Public Class frmDocViewPure + Private Sub frmDocViewPure_Load(sender As Object, e As EventArgs) Handles MyBase.Load + SpreadsheetControl1.LoadDocument("E:\35MB.xlsx") + + End Sub + + Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click + SpreadsheetControl1.Document.Dispose() + SpreadsheetControl1.Dispose() + SpreadsheetControl1 = Nothing + + End Sub +End Class \ No newline at end of file diff --git a/GUIs.Test.TestGUI/frmStart.Designer.vb b/GUIs.Test.TestGUI/frmStart.Designer.vb index 4bb83fcf..85f55445 100644 --- a/GUIs.Test.TestGUI/frmStart.Designer.vb +++ b/GUIs.Test.TestGUI/frmStart.Designer.vb @@ -27,6 +27,7 @@ Partial Class frmStart Me.Button3 = New System.Windows.Forms.Button() Me.Button4 = New System.Windows.Forms.Button() Me.Button5 = New System.Windows.Forms.Button() + Me.Button6 = New System.Windows.Forms.Button() Me.SuspendLayout() ' 'Button1 @@ -71,14 +72,24 @@ Partial Class frmStart Me.Button5.Name = "Button5" Me.Button5.Size = New System.Drawing.Size(236, 60) Me.Button5.TabIndex = 2 - Me.Button5.Text = "Button5" + Me.Button5.Text = "Checksum" Me.Button5.UseVisualStyleBackColor = True ' + 'Button6 + ' + Me.Button6.Location = New System.Drawing.Point(12, 326) + Me.Button6.Name = "Button6" + Me.Button6.Size = New System.Drawing.Size(236, 60) + Me.Button6.TabIndex = 2 + Me.Button6.Text = "DocView" + Me.Button6.UseVisualStyleBackColor = True + ' 'frmStart ' Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font Me.ClientSize = New System.Drawing.Size(800, 450) + Me.Controls.Add(Me.Button6) Me.Controls.Add(Me.Button5) Me.Controls.Add(Me.Button4) Me.Controls.Add(Me.Button3) @@ -95,4 +106,5 @@ Partial Class frmStart Friend WithEvents Button3 As Button Friend WithEvents Button4 As Button Friend WithEvents Button5 As Button + Friend WithEvents Button6 As Button End Class diff --git a/GUIs.Test.TestGUI/frmStart.vb b/GUIs.Test.TestGUI/frmStart.vb index ce2fcd0f..77259d3a 100644 --- a/GUIs.Test.TestGUI/frmStart.vb +++ b/GUIs.Test.TestGUI/frmStart.vb @@ -22,4 +22,8 @@ Public Class frmStart Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click frmChecksum.Show() End Sub + + Private Sub Button6_Click(sender As Object, e As EventArgs) Handles Button6.Click + frmDocView.Show() + End Sub End Class \ No newline at end of file