diff --git a/Controls.DocumentViewer/DocumentViewer.vbproj b/Controls.DocumentViewer/DocumentViewer.vbproj
index d3ee68cb..67a830e8 100644
--- a/Controls.DocumentViewer/DocumentViewer.vbproj
+++ b/Controls.DocumentViewer/DocumentViewer.vbproj
@@ -15,6 +15,8 @@
v4.6.2
true
+
+
AnyCPU
@@ -89,9 +91,8 @@
False
..\..\DDModules\Messaging\bin\Debug\DigitalData.Modules.Messaging.dll
-
- False
- D:\ProgramFiles\GdPicture.net 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll
+
+ ..\packages\GdPicture.14.2.89\lib\net462\GdPicture.NET.14.dll
@@ -237,4 +238,11 @@
+
+
+
+ Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".
+
+
+
\ No newline at end of file
diff --git a/Controls.DocumentViewer/My Project/AssemblyInfo.vb b/Controls.DocumentViewer/My Project/AssemblyInfo.vb
index c55eb9f2..d01b7623 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:
'
-
-
+
+
diff --git a/Controls.DocumentViewer/packages.config b/Controls.DocumentViewer/packages.config
index 37cb9210..34624729 100644
--- a/Controls.DocumentViewer/packages.config
+++ b/Controls.DocumentViewer/packages.config
@@ -1,4 +1,6 @@
+
+
\ No newline at end of file
diff --git a/GUIs.Common/Common.vbproj b/GUIs.Common/Common.vbproj
index cb324c36..d459ee71 100644
--- a/GUIs.Common/Common.vbproj
+++ b/GUIs.Common/Common.vbproj
@@ -12,6 +12,8 @@
Windows
v4.6.2
+
+
true
@@ -92,8 +94,8 @@
..\..\DDModules\ZooFlow\bin\Debug\DigitalData.Modules.ZooFlow.dll
-
- D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll
+
+ ..\packages\GdPicture.14.2.89\lib\net462\GdPicture.NET.14.dll
@@ -634,4 +636,11 @@
+
+
+
+ Dieses Projekt verweist auf mindestens ein NuGet-Paket, das auf diesem Computer fehlt. Verwenden Sie die Wiederherstellung von NuGet-Paketen, um die fehlenden Dateien herunterzuladen. Weitere Informationen finden Sie unter "http://go.microsoft.com/fwlink/?LinkID=322105". Die fehlende Datei ist "{0}".
+
+
+
\ No newline at end of file
diff --git a/GUIs.Common/My Project/AssemblyInfo.vb b/GUIs.Common/My Project/AssemblyInfo.vb
index 302fc464..de78293c 100644
--- a/GUIs.Common/My Project/AssemblyInfo.vb
+++ b/GUIs.Common/My Project/AssemblyInfo.vb
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
' übernehmen, indem Sie "*" eingeben:
'
-
-
+
+
diff --git a/GUIs.Common/packages.config b/GUIs.Common/packages.config
index 37cb9210..34624729 100644
--- a/GUIs.Common/packages.config
+++ b/GUIs.Common/packages.config
@@ -1,4 +1,6 @@
+
+
\ No newline at end of file
diff --git a/GUIs.Test.TestGUI/App.config b/GUIs.Test.TestGUI/App.config
index d9614f15..3ef3e859 100644
--- a/GUIs.Test.TestGUI/App.config
+++ b/GUIs.Test.TestGUI/App.config
@@ -31,6 +31,10 @@
+
+
+
+
diff --git a/GUIs.Test.TestGUI/TestGUI.vbproj b/GUIs.Test.TestGUI/TestGUI.vbproj
index cd5dc077..eb52f8c7 100644
--- a/GUIs.Test.TestGUI/TestGUI.vbproj
+++ b/GUIs.Test.TestGUI/TestGUI.vbproj
@@ -73,7 +73,8 @@
-
+
+ False
..\Controls.DocumentViewer\bin\Debug\DigitalData.Controls.DocumentViewer.dll
diff --git a/GUIs.Test.TestGUI/frmDocView.Designer.vb b/GUIs.Test.TestGUI/frmDocView.Designer.vb
index 16318107..71c94244 100644
--- a/GUIs.Test.TestGUI/frmDocView.Designer.vb
+++ b/GUIs.Test.TestGUI/frmDocView.Designer.vb
@@ -30,7 +30,7 @@ Partial Class frmDocView
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.MyDocumentViewer = New DigitalData.Controls.DocumentViewer.DocumentViewer()
Me.Panel1.SuspendLayout()
Me.SuspendLayout()
'
@@ -106,19 +106,19 @@ Partial Class frmDocView
'
'DocumentViewer1
'
- Me.DocumentViewer1.Dock = System.Windows.Forms.DockStyle.Fill
- 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
+ Me.MyDocumentViewer.Dock = System.Windows.Forms.DockStyle.Fill
+ Me.MyDocumentViewer.FileLoaded = False
+ Me.MyDocumentViewer.Location = New System.Drawing.Point(0, 43)
+ Me.MyDocumentViewer.Name = "DocumentViewer1"
+ Me.MyDocumentViewer.Size = New System.Drawing.Size(1079, 463)
+ Me.MyDocumentViewer.TabIndex = 0
'
'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.DocumentViewer1)
+ Me.Controls.Add(Me.MyDocumentViewer)
Me.Controls.Add(Me.Panel1)
Me.Name = "frmDocView"
Me.Text = "frmDocView"
@@ -128,7 +128,7 @@ Partial Class frmDocView
End Sub
- Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer
+ Friend WithEvents MyDocumentViewer As DigitalData.Controls.DocumentViewer.DocumentViewer
Friend WithEvents Panel1 As Panel
Friend WithEvents Button1 As Button
Friend WithEvents TextBox1 As TextBox
diff --git a/GUIs.Test.TestGUI/frmDocView.vb b/GUIs.Test.TestGUI/frmDocView.vb
index ae3d787c..89b2996c 100644
--- a/GUIs.Test.TestGUI/frmDocView.vb
+++ b/GUIs.Test.TestGUI/frmDocView.vb
@@ -11,17 +11,17 @@ Public Class frmDocView
If String.IsNullOrEmpty(TextBox1.Text) Then
If OpenFileDialog1.ShowDialog() = DialogResult.OK Then
TextBox1.Text = OpenFileDialog1.FileName
- DocumentViewer1.LoadFile(TextBox1.Text)
+ MyDocumentViewer.LoadFile(TextBox1.Text)
End If
Else
- DocumentViewer1.LoadFile(TextBox1.Text)
+ MyDocumentViewer.LoadFile(TextBox1.Text)
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, GDPICTURE_KEY, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With {
+ MyDocumentViewer.Init(LogConfig, GDPICTURE_KEY, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With {
.ShowPrintButton = False,
.ShowRotateButton = False,
.ShowFlipButton = False,
@@ -30,16 +30,16 @@ Public Class frmDocView
End Sub
Private Sub Button2_Click(sender As Object, e As EventArgs) Handles Button2.Click
- DocumentViewer1.Done()
+ MyDocumentViewer.Done()
End Sub
Private Sub Button3_Click(sender As Object, e As EventArgs) Handles Button3.Click
- If DocumentViewer1.AddAnnotation("Some Text") Then
+ If MyDocumentViewer.AddAnnotation("Some Text") Then
End If
End Sub
Private Sub Button4_Click(sender As Object, e As EventArgs) Handles Button4.Click
- DocumentViewer1.Save()
+ MyDocumentViewer.Save()
End Sub
Private Sub Button5_Click(sender As Object, e As EventArgs) Handles Button5.Click