From 2304214073415cccb069b43b5777686072099149 Mon Sep 17 00:00:00 2001 From: Jonathan Jenne Date: Wed, 8 Jan 2020 13:57:05 +0100 Subject: [PATCH] documentviewer test --- .../Form1.Designer.vb | 12 ++ GUIs.Test.DocumentViewerTest/Form1.vb | 17 ++- .../Form2.Designer.vb | 2 +- GUIs.Test.DocumentViewerTest/Form2.vb | 2 +- .../Form4.Designer.vb | 49 +++++++ GUIs.Test.DocumentViewerTest/Form4.resx | 120 ++++++++++++++++++ GUIs.Test.DocumentViewerTest/Form4.vb | 40 ++++++ .../GUIs.Test.DocumentViewerTest.vbproj | 9 ++ 8 files changed, 247 insertions(+), 4 deletions(-) create mode 100644 GUIs.Test.DocumentViewerTest/Form4.Designer.vb create mode 100644 GUIs.Test.DocumentViewerTest/Form4.resx create mode 100644 GUIs.Test.DocumentViewerTest/Form4.vb diff --git a/GUIs.Test.DocumentViewerTest/Form1.Designer.vb b/GUIs.Test.DocumentViewerTest/Form1.Designer.vb index d4f299fe..b9109a3f 100644 --- a/GUIs.Test.DocumentViewerTest/Form1.Designer.vb +++ b/GUIs.Test.DocumentViewerTest/Form1.Designer.vb @@ -26,6 +26,7 @@ Partial Class Form1 Me.OpenFileDialog1 = New System.Windows.Forms.OpenFileDialog() Me.Button1 = New System.Windows.Forms.Button() Me.Button2 = New System.Windows.Forms.Button() + Me.Button3 = New System.Windows.Forms.Button() Me.SuspendLayout() ' 'TextBox1 @@ -57,11 +58,21 @@ Partial Class Form1 Me.Button2.Text = "Load Path" Me.Button2.UseVisualStyleBackColor = True ' + 'Button3 + ' + Me.Button3.Location = New System.Drawing.Point(711, 38) + Me.Button3.Name = "Button3" + Me.Button3.Size = New System.Drawing.Size(77, 23) + Me.Button3.TabIndex = 2 + Me.Button3.Text = "Load Path" + Me.Button3.UseVisualStyleBackColor = True + ' 'Form1 ' 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.Button3) Me.Controls.Add(Me.Button2) Me.Controls.Add(Me.Button1) Me.Controls.Add(Me.TextBox1) @@ -75,4 +86,5 @@ Partial Class Form1 Friend WithEvents OpenFileDialog1 As OpenFileDialog Friend WithEvents Button1 As Button Friend WithEvents Button2 As Button + Friend WithEvents Button3 As Button End Class diff --git a/GUIs.Test.DocumentViewerTest/Form1.vb b/GUIs.Test.DocumentViewerTest/Form1.vb index 61acbd4b..33cc0654 100644 --- a/GUIs.Test.DocumentViewerTest/Form1.vb +++ b/GUIs.Test.DocumentViewerTest/Form1.vb @@ -1,7 +1,7 @@ Imports DigitalData.Modules.Logging Public Class Form1 - Private oSubform As Form2 + Private oSubform As Form3 Private Sub Button1_Click(sender As Object, e As EventArgs) Handles Button1.Click Dim oResult = OpenFileDialog1.ShowDialog() @@ -14,7 +14,20 @@ Public Class Form1 Try Dim oKey = "0467389434974657969312056" Dim oLogConfig As New LogConfig(LogConfig.PathType.CurrentDirectory) - Dim oSubform As New Form2(oLogConfig, oKey) + Dim oSubform As New Form3(oLogConfig, oKey) + + oSubform.FilePath = TextBox1.Text + oSubform.Show() + Catch ex As Exception + MsgBox(ex.Message) + End Try + End Sub + + Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click + Try + Dim oKey = "0467389434974657969312056" + Dim oLogConfig As New LogConfig(LogConfig.PathType.CurrentDirectory) + Dim oSubform As New Form4(oLogConfig, oKey) oSubform.FilePath = TextBox1.Text oSubform.Show() diff --git a/GUIs.Test.DocumentViewerTest/Form2.Designer.vb b/GUIs.Test.DocumentViewerTest/Form2.Designer.vb index 570729cc..de9b35dd 100644 --- a/GUIs.Test.DocumentViewerTest/Form2.Designer.vb +++ b/GUIs.Test.DocumentViewerTest/Form2.Designer.vb @@ -1,5 +1,5 @@  _ -Partial Class Form2 +Partial Class Form3 Inherits System.Windows.Forms.Form 'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen. diff --git a/GUIs.Test.DocumentViewerTest/Form2.vb b/GUIs.Test.DocumentViewerTest/Form2.vb index 08004a54..9d5d6366 100644 --- a/GUIs.Test.DocumentViewerTest/Form2.vb +++ b/GUIs.Test.DocumentViewerTest/Form2.vb @@ -1,7 +1,7 @@ Imports System.ComponentModel Imports DigitalData.Modules.Logging -Public Class Form2 +Public Class Form3 Public FilePath As String Private Key As String Private LogConfig As LogConfig diff --git a/GUIs.Test.DocumentViewerTest/Form4.Designer.vb b/GUIs.Test.DocumentViewerTest/Form4.Designer.vb new file mode 100644 index 00000000..c018cd6d --- /dev/null +++ b/GUIs.Test.DocumentViewerTest/Form4.Designer.vb @@ -0,0 +1,49 @@ + _ +Partial Class Form4 + 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.SuspendLayout() + ' + 'DocumentViewer1 + ' + Me.DocumentViewer1.Dock = System.Windows.Forms.DockStyle.Fill + Me.DocumentViewer1.Location = New System.Drawing.Point(0, 0) + Me.DocumentViewer1.Name = "DocumentViewer1" + Me.DocumentViewer1.Size = New System.Drawing.Size(1056, 555) + Me.DocumentViewer1.TabIndex = 0 + ' + 'Form4 + ' + Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!) + Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font + Me.ClientSize = New System.Drawing.Size(1056, 555) + Me.Controls.Add(Me.DocumentViewer1) + Me.Name = "Form4" + Me.Text = "Form4" + Me.ResumeLayout(False) + + End Sub + + Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer +End Class diff --git a/GUIs.Test.DocumentViewerTest/Form4.resx b/GUIs.Test.DocumentViewerTest/Form4.resx new file mode 100644 index 00000000..1af7de15 --- /dev/null +++ b/GUIs.Test.DocumentViewerTest/Form4.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.DocumentViewerTest/Form4.vb b/GUIs.Test.DocumentViewerTest/Form4.vb new file mode 100644 index 00000000..4c43ca71 --- /dev/null +++ b/GUIs.Test.DocumentViewerTest/Form4.vb @@ -0,0 +1,40 @@ +Imports System.ComponentModel +Imports DigitalData.Modules.Logging + +Public Class Form4 + Public FilePath As String + Private Key As String + Private LogConfig As LogConfig + Private Logger As Logger + + Public Sub New(LogConfig As LogConfig, Key As String) + ' Dieser Aufruf ist für den Designer erforderlich. + InitializeComponent() + + ' Fügen Sie Initialisierungen nach dem InitializeComponent()-Aufruf hinzu. + Me.LogConfig = LogConfig + Me.Key = Key + End Sub + + Private Sub Form2_Load(sender As Object, e As EventArgs) Handles MyBase.Load + Logger = LogConfig.GetLogger + Logger.Info("DocumentViewer Form Loaded") + DocumentViewer1.Init(LogConfig, Key) + DocumentViewer1.LoadFile(FilePath) + Logger.Info("File Loaded") + End Sub + + Private Sub Form2_FormClosed(sender As Object, e As FormClosedEventArgs) Handles Me.FormClosed + Logger.Info("Form closed") + End Sub + + Private Sub Form2_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing + + DocumentViewer1.Done() + Logger.Info("Form closing") + + + End Sub + + +End Class \ No newline at end of file diff --git a/GUIs.Test.DocumentViewerTest/GUIs.Test.DocumentViewerTest.vbproj b/GUIs.Test.DocumentViewerTest/GUIs.Test.DocumentViewerTest.vbproj index 37b2c1e2..b33234a8 100644 --- a/GUIs.Test.DocumentViewerTest/GUIs.Test.DocumentViewerTest.vbproj +++ b/GUIs.Test.DocumentViewerTest/GUIs.Test.DocumentViewerTest.vbproj @@ -103,6 +103,12 @@ Form + + Form4.vb + + + Form + True @@ -126,6 +132,9 @@ Form2.vb + + Form4.vb + VbMyResourcesResXFileCodeGenerator Resources.Designer.vb