Commit für beide repositories, entfernen Bagetverweise

This reverts commit 0fe82815b8.

.gitignore

@@ -258,4 +258,13 @@ paket-files/
 
 # Python Tools for Visual Studio (PTVS)
 __pycache__/
-*.pyc
+*.pyc
+/GUIs.Test.ZUGFeRDTest/Form1.vb
+/GUIs.Test.ZUGFeRDTest/Form1.resx
+/GUIs.Test.ZUGFeRDTest/Form1.Designer.vb
+/GUIs.Test.ZUGFeRDTest/Form1.vb
+/GUIs.Test.ZUGFeRDTest/Form1.resx
+/GUIs.Test.ZUGFeRDTest/Form1.Designer.vb
+/GUIs.Test.ZUGFeRDTest/Form1.vb
+/GUIs.Test.ZUGFeRDTest/Form1.resx
+/GUIs.Test.ZUGFeRDTest/Form1.Designer.vb

Automation/App.config

@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8" ?>
-<configuration>
-    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
-    </startup>
-</configuration>

Automation/Automation.vbproj

@@ -1,139 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
-  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
-  <PropertyGroup>
-    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
-    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
-    <ProjectGuid>{483A3DA7-6F7A-4E57-B77F-ED33F4E280C5}</ProjectGuid>
-    <OutputType>WinExe</OutputType>
-    <StartupObject>Automation.My.MyApplication</StartupObject>
-    <RootNamespace>Automation</RootNamespace>
-    <AssemblyName>Automation</AssemblyName>
-    <FileAlignment>512</FileAlignment>
-    <MyType>WindowsForms</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
-    <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugSymbols>true</DebugSymbols>
-    <DebugType>full</DebugType>
-    <DefineDebug>true</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <OutputPath>bin\Debug\</OutputPath>
-    <DocumentationFile>Automation.xml</DocumentationFile>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
-    <PlatformTarget>AnyCPU</PlatformTarget>
-    <DebugType>pdbonly</DebugType>
-    <DefineDebug>false</DefineDebug>
-    <DefineTrace>true</DefineTrace>
-    <Optimize>true</Optimize>
-    <OutputPath>bin\Release\</OutputPath>
-    <DocumentationFile>Automation.xml</DocumentationFile>
-    <NoWarn>42016,41999,42017,42018,42019,42032,42036,42020,42021,42022</NoWarn>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionExplicit>On</OptionExplicit>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionCompare>Binary</OptionCompare>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionStrict>Off</OptionStrict>
-  </PropertyGroup>
-  <PropertyGroup>
-    <OptionInfer>On</OptionInfer>
-  </PropertyGroup>
-  <ItemGroup>
-    <Reference Include="GdPicture.NET.14">
-      <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET\GdPicture.NET.14.dll</HintPath>
-    </Reference>
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c" />
-    <Reference Include="System" />
-    <Reference Include="System.Data" />
-    <Reference Include="System.Deployment" />
-    <Reference Include="System.Drawing" />
-    <Reference Include="System.Windows.Forms" />
-    <Reference Include="System.Xml" />
-    <Reference Include="System.Core" />
-    <Reference Include="System.Xml.Linq" />
-    <Reference Include="System.Data.DataSetExtensions" />
-    <Reference Include="System.Net.Http" />
-    <Reference Include="UIAutomationClient" />
-    <Reference Include="UIAutomationTypes" />
-  </ItemGroup>
-  <ItemGroup>
-    <Import Include="Microsoft.VisualBasic" />
-    <Import Include="System" />
-    <Import Include="System.Collections" />
-    <Import Include="System.Collections.Generic" />
-    <Import Include="System.Data" />
-    <Import Include="System.Drawing" />
-    <Import Include="System.Diagnostics" />
-    <Import Include="System.Windows.Forms" />
-    <Import Include="System.Linq" />
-    <Import Include="System.Xml.Linq" />
-    <Import Include="System.Threading.Tasks" />
-  </ItemGroup>
-  <ItemGroup>
-    <Compile Include="ClassClipboard.vb" />
-    <Compile Include="Form1.vb">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="Form1.Designer.vb">
-      <DependentUpon>Form1.vb</DependentUpon>
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="My Project\AssemblyInfo.vb" />
-    <Compile Include="My Project\Application.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Application.myapp</DependentUpon>
-    </Compile>
-    <Compile Include="My Project\Resources.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DesignTime>True</DesignTime>
-      <DependentUpon>Resources.resx</DependentUpon>
-    </Compile>
-    <Compile Include="My Project\Settings.Designer.vb">
-      <AutoGen>True</AutoGen>
-      <DependentUpon>Settings.settings</DependentUpon>
-      <DesignTimeSharedInput>True</DesignTimeSharedInput>
-    </Compile>
-  </ItemGroup>
-  <ItemGroup>
-    <EmbeddedResource Include="Form1.resx">
-      <DependentUpon>Form1.vb</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="My Project\Resources.resx">
-      <Generator>VbMyResourcesResXFileCodeGenerator</Generator>
-      <LastGenOutput>Resources.Designer.vb</LastGenOutput>
-      <CustomToolNamespace>My.Resources</CustomToolNamespace>
-      <SubType>Designer</SubType>
-    </EmbeddedResource>
-  </ItemGroup>
-  <ItemGroup>
-    <None Include="My Project\Application.myapp">
-      <Generator>MyApplicationCodeGenerator</Generator>
-      <LastGenOutput>Application.Designer.vb</LastGenOutput>
-    </None>
-    <None Include="My Project\Settings.settings">
-      <Generator>SettingsSingleFileGenerator</Generator>
-      <CustomToolNamespace>My</CustomToolNamespace>
-      <LastGenOutput>Settings.Designer.vb</LastGenOutput>
-    </None>
-    <None Include="App.config" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
-      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
-      <Name>Logging</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Windows\Windows.vbproj">
-      <Project>{5efaef9b-90b9-4f05-9f70-f79ad77fff86}</Project>
-      <Name>Windows</Name>
-    </ProjectReference>
-  </ItemGroup>
-  <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
-</Project>

Automation/ClassClipboard.vb

@@ -1,68 +0,0 @@
-Imports System.Runtime.InteropServices
-Public Class ClassClipboardWatcher
-    Inherits NativeWindow
-    Implements IDisposable
-
-    Private Class Win32
-        <DllImport("user32", EntryPoint:="SetClipboardViewer")>
-        Public Shared Function SetClipboardViewer(ByVal hWnd As IntPtr) As IntPtr
-        End Function
-    End Class
-
-    Const WM_DRAWCLIPBOARD As Integer = &H308
-
-    Public Event ClipboardChanged As EventHandler(Of IDataObject)
-    Public Shared Singleton As New ClassClipboardWatcher
-
-    Private _handle As IntPtr
-
-    Private Sub New()
-        MyBase.CreateHandle(New CreateParams)
-        _handle = Win32.SetClipboardViewer(Handle)
-    End Sub
-
-    Protected Overrides Sub WndProc(ByRef m As Message)
-
-        Select Case m.Msg
-            Case WM_DRAWCLIPBOARD
-                Dim oData As IDataObject = Clipboard.GetDataObject
-                RaiseEvent ClipboardChanged(Me, oData)
-        End Select
-        MyBase.WndProc(m)
-    End Sub
-
-#Region "IDisposable Support"
-    ' Für diese Klasse ist korrekte Ressourcenbereinigung besonders wichtig, da 
-    ' mit systemübergreifenden Ressourcen gearbeitet wird
-
-    ' So ermitteln Sie überflüssige Aufrufe
-    Private disposedValue As Boolean = False
-
-    Protected Overridable Sub Dispose(ByVal disposing As Boolean)
-        If Not disposedValue Then
-            If disposing Then
-                ' TODO: Verwaltete Ressourcen freigeben, wenn sie explizit 
-                ' aufgerufen werden
-            End If
-            MyBase.DestroyHandle()
-            Dim H As IntPtr = Win32.SetClipboardViewer(_handle)
-        End If
-        disposedValue = True
-    End Sub
-
-    ' Dieser Code wird von Visual Basic hinzugefügt, um das Dispose-Muster 
-    ' richtig zu implementieren.
-    Public Sub Dispose() Implements IDisposable.Dispose
-        ' Sie sollten diesen Code nicht ändern, sondern stattdessen ihren
-        ' Bereinigungscode oben in 
-        ' Dispose(ByVal disposing As Boolean) einfügen.
-        Dispose(True)
-        GC.SuppressFinalize(Me)
-    End Sub
-
-    Protected Overrides Sub Finalize()
-        MyBase.Finalize()
-        Dispose(False)
-    End Sub
-#End Region
-End Class

Automation/Form1.Designer.vb

@@ -1,235 +0,0 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
-Partial Class Form1
-    Inherits System.Windows.Forms.Form
-
-    'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()>
-    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.
-    <System.Diagnostics.DebuggerStepThrough()>
-    Private Sub InitializeComponent()
-        Me.components = New System.ComponentModel.Container()
-        Me.Timer1 = New System.Windows.Forms.Timer(Me.components)
-        Me.TextBox1 = New System.Windows.Forms.TextBox()
-        Me.Label4 = New System.Windows.Forms.Label()
-        Me.Label5 = New System.Windows.Forms.Label()
-        Me.Label6 = New System.Windows.Forms.Label()
-        Me.Label7 = New System.Windows.Forms.Label()
-        Me.TextBox9 = New System.Windows.Forms.TextBox()
-        Me.TextBox10 = New System.Windows.Forms.TextBox()
-        Me.TextBox11 = New System.Windows.Forms.TextBox()
-        Me.TextBox12 = New System.Windows.Forms.TextBox()
-        Me.Label21 = New System.Windows.Forms.Label()
-        Me.TextBox6 = New System.Windows.Forms.TextBox()
-        Me.TextBox7 = New System.Windows.Forms.TextBox()
-        Me.TextBox8 = New System.Windows.Forms.TextBox()
-        Me.ComboBox1 = New System.Windows.Forms.ComboBox()
-        Me.Label1 = New System.Windows.Forms.Label()
-        Me.TextBox3 = New System.Windows.Forms.TextBox()
-        Me.Label3 = New System.Windows.Forms.Label()
-        Me.SuspendLayout()
-        '
-        'TextBox1
-        '
-        Me.TextBox1.Font = New System.Drawing.Font("Microsoft Sans Serif", 8.25!)
-        Me.TextBox1.Location = New System.Drawing.Point(12, 12)
-        Me.TextBox1.Name = "TextBox1"
-        Me.TextBox1.Size = New System.Drawing.Size(100, 20)
-        Me.TextBox1.TabIndex = 0
-        Me.TextBox1.Text = "Top Left"
-        '
-        'Label4
-        '
-        Me.Label4.AutoSize = True
-        Me.Label4.Location = New System.Drawing.Point(183, 105)
-        Me.Label4.Name = "Label4"
-        Me.Label4.Size = New System.Drawing.Size(25, 13)
-        Me.Label4.TabIndex = 6
-        Me.Label4.Text = "Left"
-        '
-        'Label5
-        '
-        Me.Label5.AutoSize = True
-        Me.Label5.Location = New System.Drawing.Point(183, 183)
-        Me.Label5.Name = "Label5"
-        Me.Label5.Size = New System.Drawing.Size(40, 13)
-        Me.Label5.TabIndex = 6
-        Me.Label5.Text = "Bottom"
-        '
-        'Label6
-        '
-        Me.Label6.AutoSize = True
-        Me.Label6.Location = New System.Drawing.Point(183, 157)
-        Me.Label6.Name = "Label6"
-        Me.Label6.Size = New System.Drawing.Size(26, 13)
-        Me.Label6.TabIndex = 6
-        Me.Label6.Text = "Top"
-        '
-        'Label7
-        '
-        Me.Label7.AutoSize = True
-        Me.Label7.Location = New System.Drawing.Point(183, 131)
-        Me.Label7.Name = "Label7"
-        Me.Label7.Size = New System.Drawing.Size(32, 13)
-        Me.Label7.TabIndex = 6
-        Me.Label7.Text = "Right"
-        '
-        'TextBox9
-        '
-        Me.TextBox9.Location = New System.Drawing.Point(231, 102)
-        Me.TextBox9.Name = "TextBox9"
-        Me.TextBox9.Size = New System.Drawing.Size(100, 20)
-        Me.TextBox9.TabIndex = 1
-        '
-        'TextBox10
-        '
-        Me.TextBox10.Location = New System.Drawing.Point(231, 180)
-        Me.TextBox10.Name = "TextBox10"
-        Me.TextBox10.Size = New System.Drawing.Size(100, 20)
-        Me.TextBox10.TabIndex = 2
-        '
-        'TextBox11
-        '
-        Me.TextBox11.Location = New System.Drawing.Point(231, 154)
-        Me.TextBox11.Name = "TextBox11"
-        Me.TextBox11.Size = New System.Drawing.Size(100, 20)
-        Me.TextBox11.TabIndex = 3
-        '
-        'TextBox12
-        '
-        Me.TextBox12.Location = New System.Drawing.Point(231, 128)
-        Me.TextBox12.Name = "TextBox12"
-        Me.TextBox12.Size = New System.Drawing.Size(100, 20)
-        Me.TextBox12.TabIndex = 4
-        '
-        'Label21
-        '
-        Me.Label21.AutoSize = True
-        Me.Label21.Location = New System.Drawing.Point(183, 77)
-        Me.Label21.Name = "Label21"
-        Me.Label21.Size = New System.Drawing.Size(115, 13)
-        Me.Label21.TabIndex = 8
-        Me.Label21.Text = "CURRENT CONTROL"
-        '
-        'TextBox6
-        '
-        Me.TextBox6.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Left), System.Windows.Forms.AnchorStyles)
-        Me.TextBox6.Location = New System.Drawing.Point(12, 298)
-        Me.TextBox6.Name = "TextBox6"
-        Me.TextBox6.Size = New System.Drawing.Size(100, 20)
-        Me.TextBox6.TabIndex = 0
-        Me.TextBox6.Text = "Bottom Left"
-        '
-        'TextBox7
-        '
-        Me.TextBox7.Anchor = CType((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.TextBox7.Location = New System.Drawing.Point(255, 12)
-        Me.TextBox7.Name = "TextBox7"
-        Me.TextBox7.Size = New System.Drawing.Size(100, 20)
-        Me.TextBox7.TabIndex = 0
-        Me.TextBox7.Text = "TopRight"
-        '
-        'TextBox8
-        '
-        Me.TextBox8.Anchor = CType((System.Windows.Forms.AnchorStyles.Bottom Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
-        Me.TextBox8.Location = New System.Drawing.Point(255, 298)
-        Me.TextBox8.Name = "TextBox8"
-        Me.TextBox8.Size = New System.Drawing.Size(100, 20)
-        Me.TextBox8.TabIndex = 0
-        Me.TextBox8.Text = "BottomRight"
-        '
-        'ComboBox1
-        '
-        Me.ComboBox1.FormattingEnabled = True
-        Me.ComboBox1.Items.AddRange(New Object() {"TopLeft", "TopRight", "BottomLeft", "BottomRight"})
-        Me.ComboBox1.Location = New System.Drawing.Point(30, 102)
-        Me.ComboBox1.Name = "ComboBox1"
-        Me.ComboBox1.Size = New System.Drawing.Size(121, 21)
-        Me.ComboBox1.TabIndex = 9
-        '
-        'Label1
-        '
-        Me.Label1.AutoSize = True
-        Me.Label1.Location = New System.Drawing.Point(27, 86)
-        Me.Label1.Name = "Label1"
-        Me.Label1.Size = New System.Drawing.Size(41, 13)
-        Me.Label1.TabIndex = 8
-        Me.Label1.Text = "Anchor"
-        '
-        'TextBox3
-        '
-        Me.TextBox3.Location = New System.Drawing.Point(231, 206)
-        Me.TextBox3.Name = "TextBox3"
-        Me.TextBox3.Size = New System.Drawing.Size(100, 20)
-        Me.TextBox3.TabIndex = 2
-        '
-        'Label3
-        '
-        Me.Label3.AutoSize = True
-        Me.Label3.Location = New System.Drawing.Point(183, 209)
-        Me.Label3.Name = "Label3"
-        Me.Label3.Size = New System.Drawing.Size(41, 13)
-        Me.Label3.TabIndex = 6
-        Me.Label3.Text = "Anchor"
-        '
-        'Form1
-        '
-        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
-        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.ClientSize = New System.Drawing.Size(367, 330)
-        Me.Controls.Add(Me.ComboBox1)
-        Me.Controls.Add(Me.Label1)
-        Me.Controls.Add(Me.Label21)
-        Me.Controls.Add(Me.Label7)
-        Me.Controls.Add(Me.Label6)
-        Me.Controls.Add(Me.Label3)
-        Me.Controls.Add(Me.Label5)
-        Me.Controls.Add(Me.Label4)
-        Me.Controls.Add(Me.TextBox12)
-        Me.Controls.Add(Me.TextBox3)
-        Me.Controls.Add(Me.TextBox11)
-        Me.Controls.Add(Me.TextBox10)
-        Me.Controls.Add(Me.TextBox9)
-        Me.Controls.Add(Me.TextBox6)
-        Me.Controls.Add(Me.TextBox8)
-        Me.Controls.Add(Me.TextBox7)
-        Me.Controls.Add(Me.TextBox1)
-        Me.Name = "Form1"
-        Me.Text = "Form1"
-        Me.ResumeLayout(False)
-        Me.PerformLayout()
-
-    End Sub
-    Friend WithEvents Timer1 As Timer
-    Friend WithEvents TextBox1 As TextBox
-    Friend WithEvents Label4 As Label
-    Friend WithEvents Label5 As Label
-    Friend WithEvents Label6 As Label
-    Friend WithEvents Label7 As Label
-    Friend WithEvents TextBox9 As TextBox
-    Friend WithEvents TextBox10 As TextBox
-    Friend WithEvents TextBox11 As TextBox
-    Friend WithEvents TextBox12 As TextBox
-    Friend WithEvents Label21 As Label
-    Friend WithEvents TextBox6 As TextBox
-    Friend WithEvents TextBox7 As TextBox
-    Friend WithEvents TextBox8 As TextBox
-    Friend WithEvents ComboBox1 As ComboBox
-    Friend WithEvents Label1 As Label
-    Friend WithEvents TextBox3 As TextBox
-    Friend WithEvents Label3 As Label
-End Class

Automation/Form1.resx

@@ -1,123 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <metadata name="Timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 17</value>
-  </metadata>
-</root>

Automation/Form1.vb

@@ -1,48 +0,0 @@
-Imports System.Runtime.InteropServices
-Imports DigitalData.Modules.Logging
-Imports DigitalData.Modules.Windows
-
-Public Class Form1
-    Private Logger As Logger
-    Private LogConfig As LogConfig
-
-    Private Watcher As ClassClipboardWatcher
-    Private Window As Window
-
-    Private CurrentAnchor As Window.Anchor = Window.Anchor.TopLeft
-
-    Private Sub Form1_Load(sender As Object, e As EventArgs) Handles MyBase.Load
-        Timer1.Interval = 1000
-        Timer1.Enabled = True
-
-        LogConfig = New LogConfig(LogConfig.PathType.AppData)
-        Logger = LogConfig.GetLogger()
-        Window = New Window(LogConfig)
-
-        Watcher = ClassClipboardWatcher.Singleton
-        AddHandler Watcher.ClipboardChanged, AddressOf Watcher_ClipboardChanged
-    End Sub
-
-    Private Sub Watcher_ClipboardChanged(sender As Object, e As IDataObject)
-        Dim oControl As Window.RectangleInfo = Window.GetFocusedControlLocation(Handle, CurrentAnchor)
-
-        TextBox9.Text = oControl.Left
-        TextBox12.Text = oControl.Right
-        TextBox11.Text = oControl.Top
-        TextBox10.Text = oControl.Bottom
-        TextBox3.Text = ComboBox1.Text.ToUpper
-    End Sub
-
-    Private Sub ComboBox1_SelectedIndexChanged(sender As Object, e As EventArgs) Handles ComboBox1.SelectedIndexChanged
-        Select Case ComboBox1.Text
-            Case "TopLeft"
-                CurrentAnchor = Window.Anchor.TopLeft
-            Case "TopRight"
-                CurrentAnchor = Window.Anchor.TopRight
-            Case "BottomLeft"
-                CurrentAnchor = Window.Anchor.BottomLeft
-            Case "BottomRight"
-                CurrentAnchor = Window.Anchor.BottomRight
-        End Select
-    End Sub
-End Class

Automation/My Project/Application.Designer.vb

@@ -1,38 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     This code was generated by a tool.
-'     Runtime Version:4.0.30319.42000
-'
-'     Changes to this file may cause incorrect behavior and will be lost if
-'     the code is regenerated.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-
-Namespace My
-
-    'NOTE: This file is auto-generated; do not modify it directly.  To make changes,
-    ' or if you encounter build errors in this file, go to the Project Designer
-    ' (go to Project Properties or double-click the My Project node in
-    ' Solution Explorer), and make changes on the Application tab.
-    '
-    Partial Friend Class MyApplication
-
-        <Global.System.Diagnostics.DebuggerStepThroughAttribute()> _
-        Public Sub New()
-            MyBase.New(Global.Microsoft.VisualBasic.ApplicationServices.AuthenticationMode.Windows)
-            Me.IsSingleInstance = false
-            Me.EnableVisualStyles = true
-            Me.SaveMySettingsOnExit = true
-            Me.ShutDownStyle = Global.Microsoft.VisualBasic.ApplicationServices.ShutdownMode.AfterMainFormCloses
-        End Sub
-
-        <Global.System.Diagnostics.DebuggerStepThroughAttribute()> _
-        Protected Overrides Sub OnCreateMainForm()
-            Me.MainForm = Global.Automation.Form1
-        End Sub
-    End Class
-End Namespace

Automation/My Project/Application.myapp

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<MyApplicationData xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
-  <MySubMain>true</MySubMain>
-  <MainForm>Form1</MainForm>
-  <SingleInstance>false</SingleInstance>
-  <ShutdownMode>0</ShutdownMode>
-  <EnableVisualStyles>true</EnableVisualStyles>
-  <AuthenticationMode>0</AuthenticationMode>
-  <ApplicationType>0</ApplicationType>
-  <SaveMySettingsOnExit>true</SaveMySettingsOnExit>
-</MyApplicationData>

Automation/My Project/AssemblyInfo.vb

@@ -1,35 +0,0 @@
-Imports System
-Imports System.Reflection
-Imports System.Runtime.InteropServices
-
-' Allgemeine Informationen über eine Assembly werden über die folgenden
-' Attribute gesteuert. Ändern Sie diese Attributwerte, um die Informationen zu ändern,
-' die einer Assembly zugeordnet sind.
-
-' Werte der Assemblyattribute überprüfen
-
-<Assembly: AssemblyTitle("Automation")>
-<Assembly: AssemblyDescription("")>
-<Assembly: AssemblyCompany("")>
-<Assembly: AssemblyProduct("Automation")>
-<Assembly: AssemblyCopyright("Copyright ©  2019")>
-<Assembly: AssemblyTrademark("")>
-
-<Assembly: ComVisible(False)>
-
-'Die folgende GUID bestimmt die ID der Typbibliothek, wenn dieses Projekt für COM verfügbar gemacht wird.
-<Assembly: Guid("16c2bbbe-7473-425e-96db-3029055c432d")>
-
-' Versionsinformationen für eine Assembly bestehen aus den folgenden vier Werten:
-'
-'      Hauptversion
-'      Nebenversion
-'      Buildnummer
-'      Revision
-'
-' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
-' übernehmen, indem Sie "*" eingeben:
-' <Assembly: AssemblyVersion("1.0.*")>
-
-<Assembly: AssemblyVersion("1.0.0.0")>
-<Assembly: AssemblyFileVersion("1.0.0.0")>

Automation/My Project/Resources.Designer.vb

@@ -1,62 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     This code was generated by a tool.
-'     Runtime Version:4.0.30319.42000
-'
-'     Changes to this file may cause incorrect behavior and will be lost if
-'     the code is regenerated.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-
-Namespace My.Resources
-
-    'This class was auto-generated by the StronglyTypedResourceBuilder
-    'class via a tool like ResGen or Visual Studio.
-    'To add or remove a member, edit your .ResX file then rerun ResGen
-    'with the /str option, or rebuild your VS project.
-    '''<summary>
-    '''  A strongly-typed resource class, for looking up localized strings, etc.
-    '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0"), _
-     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
-     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
-     Global.Microsoft.VisualBasic.HideModuleNameAttribute()> _
-    Friend Module Resources
-
-        Private resourceMan As Global.System.Resources.ResourceManager
-
-        Private resourceCulture As Global.System.Globalization.CultureInfo
-
-        '''<summary>
-        '''  Returns the cached ResourceManager instance used by this class.
-        '''</summary>
-        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-        Friend ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
-            Get
-                If Object.ReferenceEquals(resourceMan, Nothing) Then
-                    Dim temp As Global.System.Resources.ResourceManager = New Global.System.Resources.ResourceManager("Automation.Resources", GetType(Resources).Assembly)
-                    resourceMan = temp
-                End If
-                Return resourceMan
-            End Get
-        End Property
-
-        '''<summary>
-        '''  Overrides the current thread's CurrentUICulture property for all
-        '''  resource lookups using this strongly typed resource class.
-        '''</summary>
-        <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-        Friend Property Culture() As Global.System.Globalization.CultureInfo
-            Get
-                Return resourceCulture
-            End Get
-            Set(ByVal value As Global.System.Globalization.CultureInfo)
-                resourceCulture = value
-            End Set
-        End Property
-    End Module
-End Namespace

Automation/My Project/Resources.resx

@@ -1,117 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>

Automation/My Project/Settings.Designer.vb

@@ -1,73 +0,0 @@
-'------------------------------------------------------------------------------
-' <auto-generated>
-'     This code was generated by a tool.
-'     Runtime Version:4.0.30319.42000
-'
-'     Changes to this file may cause incorrect behavior and will be lost if
-'     the code is regenerated.
-' </auto-generated>
-'------------------------------------------------------------------------------
-
-Option Strict On
-Option Explicit On
-
-
-Namespace My
-
-    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(), _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "11.0.0.0"), _
-     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-    Partial Friend NotInheritable Class MySettings
-        Inherits Global.System.Configuration.ApplicationSettingsBase
-
-        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings), MySettings)
-
-#Region "My.Settings Auto-Save Functionality"
-#If _MyType = "WindowsForms" Then
-        Private Shared addedHandler As Boolean
-
-        Private Shared addedHandlerLockObject As New Object
-
-        <Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)> _
-        Private Shared Sub AutoSaveSettings(ByVal sender As Global.System.Object, ByVal e As Global.System.EventArgs)
-            If My.Application.SaveMySettingsOnExit Then
-                My.Settings.Save()
-            End If
-        End Sub
-#End If
-#End Region
-
-        Public Shared ReadOnly Property [Default]() As MySettings
-            Get
-
-#If _MyType = "WindowsForms" Then
-                   If Not addedHandler Then
-                        SyncLock addedHandlerLockObject
-                            If Not addedHandler Then
-                                AddHandler My.Application.Shutdown, AddressOf AutoSaveSettings
-                                addedHandler = True
-                            End If
-                        End SyncLock
-                    End If
-#End If
-                Return defaultInstance
-            End Get
-        End Property
-    End Class
-End Namespace
-
-Namespace My
-
-    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(), _
-     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(), _
-     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()> _
-    Friend Module MySettingsProperty
-
-        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")> _
-        Friend ReadOnly Property Settings() As Global.Automation.My.MySettings
-            Get
-                Return Global.Automation.My.MySettings.Default
-            End Get
-        End Property
-    End Module
-End Namespace

Automation/My Project/Settings.settings

@@ -1,7 +0,0 @@
-<?xml version='1.0' encoding='utf-8'?>
-<SettingsFile xmlns="http://schemas.microsoft.com/VisualStudio/2004/01/settings" CurrentProfile="(Default)" UseMySettingsClassName="true">
-  <Profiles>
-    <Profile Name="(Default)" />
-  </Profiles>
-  <Settings />
-</SettingsFile>

ConfigCreator/App.config

@@ -1,8 +1,8 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <configSections>
     <sectionGroup name="applicationSettings" type="System.Configuration.ApplicationSettingsGroup, System">
-      <section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+      <section name="DevExpress.LookAndFeel.Design.AppSettings" type="System.Configuration.ClientSettingsSection, System, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false"/>
     </sectionGroup>
   </configSections>
   <applicationSettings>
@@ -41,19 +41,19 @@
         <value></value>
       </setting>
       <setting name="CustomPaletteCollection" serializeAs="Xml">
-        <value />
+        <value/>
       </setting>
     </DevExpress.LookAndFeel.Design.AppSettings>
   </applicationSettings>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/>
   </startup>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
+        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+</configuration>

ConfigCreator/MonoRepoUtils.vbproj

@@ -11,9 +11,10 @@
     <AssemblyName>DigitalData.GUIs.MonoRepoUtils</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>WindowsForms</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
     <Deterministic>true</Deterministic>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -52,13 +53,29 @@
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DevExpress.Dialogs.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Printing.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Sparkline.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Data.Desktop.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraDialogs.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
+    <Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="DigitalData.Modules.Config, Version=1.1.4.1, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\Config\bin\Debug\DigitalData.Modules.Config.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Interfaces, Version=1.7.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\Interfaces\bin\Debug\DigitalData.Modules.Interfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
     <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Data" />
@@ -134,24 +151,6 @@
     </None>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Modules.Config\Config.vbproj">
-      <Project>{44982f9b-6116-44e2-85d0-f39650b1ef99}</Project>
-      <Name>Config</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Modules.Interfaces\Interfaces.vbproj">
-      <Project>{ab6f09bf-e794-4f6a-94bb-c97c0ba84d64}</Project>
-      <Name>Interfaces</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
-      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
-      <Name>Logging</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Services.ZUGFeRDService\DDZUGFeRDService.vbproj">
-      <Project>{7deec36e-ea5f-4711-ad1e-fd8894f4ad77}</Project>
-      <Name>DDZUGFeRDService</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="Resources\defaultprinter.svg" />
   </ItemGroup>
@@ -162,5 +161,11 @@
     <Content Include="mail.ico" />
     <None Include="Resources\save as.svg" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Services.ZUGFeRDService\DDZUGFeRDService.vbproj">
+      <Project>{7deec36e-ea5f-4711-ad1e-fd8894f4ad77}</Project>
+      <Name>DDZUGFeRDService</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>

ConfigCreator/My Project/Resources.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
      Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _

ConfigCreator/My Project/Settings.Designer.vb

@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase

ConfigCreator/My Project/licenses.licx

@@ -0,0 +1,4 @@
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

ConfigCreator/frmStart.Designer.vb

@@ -58,6 +58,16 @@ Partial Class frmStart
         Me.XtraTabPage1 = New DevExpress.XtraTab.XtraTabPage()
         Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage()
         Me.BehaviorManager1 = New DevExpress.Utils.Behaviors.BehaviorManager(Me.components)
+        Me.XtraTabPage3 = New DevExpress.XtraTab.XtraTabPage()
+        Me.LayoutControl3 = New DevExpress.XtraLayout.LayoutControl()
+        Me.LayoutControlGroup2 = New DevExpress.XtraLayout.LayoutControlGroup()
+        Me.MemoEdit2 = New DevExpress.XtraEditors.MemoEdit()
+        Me.LayoutControlItem11 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.btnOpenDirectory = New DevExpress.XtraEditors.SimpleButton()
+        Me.LayoutControlItem12 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.TextEdit1 = New DevExpress.XtraEditors.TextEdit()
+        Me.LayoutControlItem13 = New DevExpress.XtraLayout.LayoutControlItem()
+        Me.XtraFolderBrowserDialog1 = New DevExpress.XtraEditors.XtraFolderBrowserDialog(Me.components)
         CType(Me.ComboBoxEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.LayoutControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.LayoutControl1.SuspendLayout()
@@ -89,15 +99,24 @@ Partial Class frmStart
         CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.XtraTabPage1.SuspendLayout()
         CType(Me.BehaviorManager1, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.XtraTabPage3.SuspendLayout()
+        CType(Me.LayoutControl3, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.LayoutControl3.SuspendLayout()
+        CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.MemoEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem12, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.LayoutControlItem13, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'ComboBoxEdit1
         '
-        Me.ComboBoxEdit1.Location = New System.Drawing.Point(108, 20)
+        Me.ComboBoxEdit1.Location = New System.Drawing.Point(117, 20)
         Me.ComboBoxEdit1.Name = "ComboBoxEdit1"
         Me.ComboBoxEdit1.Properties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
         Me.ComboBoxEdit1.Properties.Items.AddRange(New Object() {"ZUGFERD_SERVICE"})
-        Me.ComboBoxEdit1.Size = New System.Drawing.Size(742, 20)
+        Me.ComboBoxEdit1.Size = New System.Drawing.Size(733, 20)
         Me.ComboBoxEdit1.StyleController = Me.LayoutControl1
         Me.ComboBoxEdit1.TabIndex = 0
         '
@@ -110,7 +129,7 @@ Partial Class frmStart
         Me.LayoutControl1.Location = New System.Drawing.Point(0, 0)
         Me.LayoutControl1.Name = "LayoutControl1"
         Me.LayoutControl1.Root = Me.Root
-        Me.LayoutControl1.Size = New System.Drawing.Size(1099, 391)
+        Me.LayoutControl1.Size = New System.Drawing.Size(1099, 390)
         Me.LayoutControl1.TabIndex = 1
         Me.LayoutControl1.Text = "LayoutControl1"
         '
@@ -120,7 +139,7 @@ Partial Class frmStart
         Me.MemoEdit1.Name = "MemoEdit1"
         Me.MemoEdit1.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 12.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.MemoEdit1.Properties.Appearance.Options.UseFont = True
-        Me.MemoEdit1.Size = New System.Drawing.Size(1059, 293)
+        Me.MemoEdit1.Size = New System.Drawing.Size(1059, 292)
         Me.MemoEdit1.StyleController = Me.LayoutControl1
         Me.MemoEdit1.TabIndex = 5
         '
@@ -139,7 +158,7 @@ Partial Class frmStart
         Me.Root.GroupBordersVisible = False
         Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem1, Me.LayoutControlItem2, Me.LayoutControlItem3})
         Me.Root.Name = "Root"
-        Me.Root.Size = New System.Drawing.Size(1099, 391)
+        Me.Root.Size = New System.Drawing.Size(1099, 390)
         Me.Root.TextVisible = False
         '
         'LayoutControlItem1
@@ -168,7 +187,7 @@ Partial Class frmStart
         Me.LayoutControlItem3.Location = New System.Drawing.Point(0, 42)
         Me.LayoutControlItem3.Name = "LayoutControlItem3"
         Me.LayoutControlItem3.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem3.Size = New System.Drawing.Size(1079, 329)
+        Me.LayoutControlItem3.Size = New System.Drawing.Size(1079, 328)
         Me.LayoutControlItem3.Text = "Config Template"
         Me.LayoutControlItem3.TextLocation = DevExpress.Utils.Locations.Top
         Me.LayoutControlItem3.TextSize = New System.Drawing.Size(85, 13)
@@ -177,9 +196,9 @@ Partial Class frmStart
         '
         Me.FluentDesignFormContainer1.Controls.Add(Me.XtraTabControl1)
         Me.FluentDesignFormContainer1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.FluentDesignFormContainer1.Location = New System.Drawing.Point(0, 159)
+        Me.FluentDesignFormContainer1.Location = New System.Drawing.Point(0, 160)
         Me.FluentDesignFormContainer1.Name = "FluentDesignFormContainer1"
-        Me.FluentDesignFormContainer1.Size = New System.Drawing.Size(1101, 414)
+        Me.FluentDesignFormContainer1.Size = New System.Drawing.Size(1101, 413)
         Me.FluentDesignFormContainer1.TabIndex = 2
         '
         'XtraTabControl1
@@ -188,15 +207,15 @@ Partial Class frmStart
         Me.XtraTabControl1.Location = New System.Drawing.Point(0, 0)
         Me.XtraTabControl1.Name = "XtraTabControl1"
         Me.XtraTabControl1.SelectedTabPage = Me.XtraTabPage2
-        Me.XtraTabControl1.Size = New System.Drawing.Size(1101, 414)
+        Me.XtraTabControl1.Size = New System.Drawing.Size(1101, 413)
         Me.XtraTabControl1.TabIndex = 0
-        Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage2, Me.XtraTabPage1})
+        Me.XtraTabControl1.TabPages.AddRange(New DevExpress.XtraTab.XtraTabPage() {Me.XtraTabPage2, Me.XtraTabPage1, Me.XtraTabPage3})
         '
         'XtraTabPage2
         '
         Me.XtraTabPage2.Controls.Add(Me.LayoutControl2)
         Me.XtraTabPage2.Name = "XtraTabPage2"
-        Me.XtraTabPage2.Size = New System.Drawing.Size(1099, 391)
+        Me.XtraTabPage2.Size = New System.Drawing.Size(1099, 390)
         Me.XtraTabPage2.Text = "EmailSignature Generator"
         '
         'LayoutControl2
@@ -212,18 +231,18 @@ Partial Class frmStart
         Me.LayoutControl2.Location = New System.Drawing.Point(0, 0)
         Me.LayoutControl2.Name = "LayoutControl2"
         Me.LayoutControl2.Root = Me.LayoutControlGroup1
-        Me.LayoutControl2.Size = New System.Drawing.Size(1099, 391)
+        Me.LayoutControl2.Size = New System.Drawing.Size(1099, 390)
         Me.LayoutControl2.TabIndex = 0
         Me.LayoutControl2.Text = "LayoutControl2"
         '
         'txxTemplate
         '
-        Me.txxTemplate.Location = New System.Drawing.Point(135, 140)
+        Me.txxTemplate.Location = New System.Drawing.Point(144, 140)
         Me.txxTemplate.MenuManager = Me.RibbonControl1
         Me.txxTemplate.Name = "txxTemplate"
         Me.txxTemplate.Properties.Appearance.Font = New System.Drawing.Font("Consolas", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
         Me.txxTemplate.Properties.Appearance.Options.UseFont = True
-        Me.txxTemplate.Size = New System.Drawing.Size(944, 231)
+        Me.txxTemplate.Size = New System.Drawing.Size(935, 230)
         Me.txxTemplate.StyleController = Me.LayoutControl2
         Me.txxTemplate.TabIndex = 4
         '
@@ -235,7 +254,7 @@ Partial Class frmStart
         Me.RibbonControl1.MaxItemId = 4
         Me.RibbonControl1.Name = "RibbonControl1"
         Me.RibbonControl1.Pages.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPage() {Me.RibbonPage1})
-        Me.RibbonControl1.Size = New System.Drawing.Size(1101, 159)
+        Me.RibbonControl1.Size = New System.Drawing.Size(1101, 160)
         Me.RibbonControl1.StatusBar = Me.RibbonStatusBar1
         '
         'BarButtonItem1
@@ -273,37 +292,37 @@ Partial Class frmStart
         '
         'txtBannerUrl
         '
-        Me.txtBannerUrl.Location = New System.Drawing.Point(135, 20)
+        Me.txtBannerUrl.Location = New System.Drawing.Point(144, 20)
         Me.txtBannerUrl.MenuManager = Me.RibbonControl1
         Me.txtBannerUrl.Name = "txtBannerUrl"
-        Me.txtBannerUrl.Size = New System.Drawing.Size(361, 20)
+        Me.txtBannerUrl.Size = New System.Drawing.Size(352, 20)
         Me.txtBannerUrl.StyleController = Me.LayoutControl2
         Me.txtBannerUrl.TabIndex = 5
         '
         'txtTrackingUrl
         '
-        Me.txtTrackingUrl.Location = New System.Drawing.Point(631, 20)
+        Me.txtTrackingUrl.Location = New System.Drawing.Point(640, 20)
         Me.txtTrackingUrl.MenuManager = Me.RibbonControl1
         Me.txtTrackingUrl.Name = "txtTrackingUrl"
-        Me.txtTrackingUrl.Size = New System.Drawing.Size(448, 20)
+        Me.txtTrackingUrl.Size = New System.Drawing.Size(439, 20)
         Me.txtTrackingUrl.StyleController = Me.LayoutControl2
         Me.txtTrackingUrl.TabIndex = 6
         '
         'txtOutputPath
         '
-        Me.txtOutputPath.Location = New System.Drawing.Point(631, 60)
+        Me.txtOutputPath.Location = New System.Drawing.Point(640, 60)
         Me.txtOutputPath.MenuManager = Me.RibbonControl1
         Me.txtOutputPath.Name = "txtOutputPath"
-        Me.txtOutputPath.Size = New System.Drawing.Size(448, 20)
+        Me.txtOutputPath.Size = New System.Drawing.Size(439, 20)
         Me.txtOutputPath.StyleController = Me.LayoutControl2
         Me.txtOutputPath.TabIndex = 7
         '
         'txtADGroup
         '
-        Me.txtADGroup.Location = New System.Drawing.Point(135, 60)
+        Me.txtADGroup.Location = New System.Drawing.Point(144, 60)
         Me.txtADGroup.MenuManager = Me.RibbonControl1
         Me.txtADGroup.Name = "txtADGroup"
-        Me.txtADGroup.Size = New System.Drawing.Size(361, 20)
+        Me.txtADGroup.Size = New System.Drawing.Size(352, 20)
         Me.txtADGroup.StyleController = Me.LayoutControl2
         Me.txtADGroup.TabIndex = 8
         '
@@ -321,10 +340,10 @@ Partial Class frmStart
         '
         'txtADRoot
         '
-        Me.txtADRoot.Location = New System.Drawing.Point(135, 100)
+        Me.txtADRoot.Location = New System.Drawing.Point(144, 100)
         Me.txtADRoot.MenuManager = Me.RibbonControl1
         Me.txtADRoot.Name = "txtADRoot"
-        Me.txtADRoot.Size = New System.Drawing.Size(361, 20)
+        Me.txtADRoot.Size = New System.Drawing.Size(352, 20)
         Me.txtADRoot.StyleController = Me.LayoutControl2
         Me.txtADRoot.TabIndex = 10
         '
@@ -334,7 +353,7 @@ Partial Class frmStart
         Me.LayoutControlGroup1.GroupBordersVisible = False
         Me.LayoutControlGroup1.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem4, Me.LayoutControlItem5, Me.LayoutControlItem6, Me.LayoutControlItem8, Me.LayoutControlItem7, Me.LayoutControlItem9, Me.LayoutControlItem10})
         Me.LayoutControlGroup1.Name = "LayoutControlGroup1"
-        Me.LayoutControlGroup1.Size = New System.Drawing.Size(1099, 391)
+        Me.LayoutControlGroup1.Size = New System.Drawing.Size(1099, 390)
         Me.LayoutControlGroup1.TextVisible = False
         '
         'LayoutControlItem4
@@ -343,7 +362,7 @@ Partial Class frmStart
         Me.LayoutControlItem4.Location = New System.Drawing.Point(0, 120)
         Me.LayoutControlItem4.Name = "LayoutControlItem4"
         Me.LayoutControlItem4.Padding = New DevExpress.XtraLayout.Utils.Padding(10, 10, 10, 10)
-        Me.LayoutControlItem4.Size = New System.Drawing.Size(1079, 251)
+        Me.LayoutControlItem4.Size = New System.Drawing.Size(1079, 250)
         Me.LayoutControlItem4.Text = "HTML Template"
         Me.LayoutControlItem4.TextSize = New System.Drawing.Size(112, 13)
         '
@@ -410,7 +429,7 @@ Partial Class frmStart
         '
         Me.XtraTabPage1.Controls.Add(Me.LayoutControl1)
         Me.XtraTabPage1.Name = "XtraTabPage1"
-        Me.XtraTabPage1.Size = New System.Drawing.Size(1099, 391)
+        Me.XtraTabPage1.Size = New System.Drawing.Size(1099, 390)
         Me.XtraTabPage1.Text = "ConfigCreator"
         '
         'RibbonPage2
@@ -418,6 +437,91 @@ Partial Class frmStart
         Me.RibbonPage2.Name = "RibbonPage2"
         Me.RibbonPage2.Text = "RibbonPage2"
         '
+        'XtraTabPage3
+        '
+        Me.XtraTabPage3.Controls.Add(Me.LayoutControl3)
+        Me.XtraTabPage3.Name = "XtraTabPage3"
+        Me.XtraTabPage3.Size = New System.Drawing.Size(1099, 390)
+        Me.XtraTabPage3.Text = "XtraTabPage3"
+        '
+        'LayoutControl3
+        '
+        Me.LayoutControl3.Controls.Add(Me.MemoEdit2)
+        Me.LayoutControl3.Controls.Add(Me.btnOpenDirectory)
+        Me.LayoutControl3.Controls.Add(Me.TextEdit1)
+        Me.LayoutControl3.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.LayoutControl3.Location = New System.Drawing.Point(0, 0)
+        Me.LayoutControl3.Name = "LayoutControl3"
+        Me.LayoutControl3.Root = Me.LayoutControlGroup2
+        Me.LayoutControl3.Size = New System.Drawing.Size(1099, 390)
+        Me.LayoutControl3.TabIndex = 1
+        Me.LayoutControl3.Text = "LayoutControl3"
+        '
+        'LayoutControlGroup2
+        '
+        Me.LayoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.[True]
+        Me.LayoutControlGroup2.GroupBordersVisible = False
+        Me.LayoutControlGroup2.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlItem11, Me.LayoutControlItem13, Me.LayoutControlItem12})
+        Me.LayoutControlGroup2.Name = "LayoutControlGroup2"
+        Me.LayoutControlGroup2.Size = New System.Drawing.Size(1099, 390)
+        Me.LayoutControlGroup2.TextVisible = False
+        '
+        'MemoEdit2
+        '
+        Me.MemoEdit2.Location = New System.Drawing.Point(131, 38)
+        Me.MemoEdit2.MenuManager = Me.RibbonControl1
+        Me.MemoEdit2.Name = "MemoEdit2"
+        Me.MemoEdit2.Size = New System.Drawing.Size(956, 340)
+        Me.MemoEdit2.StyleController = Me.LayoutControl3
+        Me.MemoEdit2.TabIndex = 4
+        '
+        'LayoutControlItem11
+        '
+        Me.LayoutControlItem11.Control = Me.MemoEdit2
+        Me.LayoutControlItem11.Location = New System.Drawing.Point(0, 26)
+        Me.LayoutControlItem11.Name = "LayoutControlItem11"
+        Me.LayoutControlItem11.Size = New System.Drawing.Size(1079, 344)
+        Me.LayoutControlItem11.TextSize = New System.Drawing.Size(107, 13)
+        '
+        'btnOpenDirectory
+        '
+        Me.btnOpenDirectory.Location = New System.Drawing.Point(966, 12)
+        Me.btnOpenDirectory.Name = "btnOpenDirectory"
+        Me.btnOpenDirectory.Size = New System.Drawing.Size(121, 22)
+        Me.btnOpenDirectory.StyleController = Me.LayoutControl3
+        Me.btnOpenDirectory.TabIndex = 5
+        Me.btnOpenDirectory.Text = "SimpleButton3"
+        '
+        'LayoutControlItem12
+        '
+        Me.LayoutControlItem12.Control = Me.btnOpenDirectory
+        Me.LayoutControlItem12.Location = New System.Drawing.Point(954, 0)
+        Me.LayoutControlItem12.Name = "LayoutControlItem12"
+        Me.LayoutControlItem12.Size = New System.Drawing.Size(125, 26)
+        Me.LayoutControlItem12.TextSize = New System.Drawing.Size(0, 0)
+        Me.LayoutControlItem12.TextVisible = False
+        '
+        'TextEdit1
+        '
+        Me.TextEdit1.Location = New System.Drawing.Point(131, 12)
+        Me.TextEdit1.MenuManager = Me.RibbonControl1
+        Me.TextEdit1.Name = "TextEdit1"
+        Me.TextEdit1.Size = New System.Drawing.Size(831, 20)
+        Me.TextEdit1.StyleController = Me.LayoutControl3
+        Me.TextEdit1.TabIndex = 6
+        '
+        'LayoutControlItem13
+        '
+        Me.LayoutControlItem13.Control = Me.TextEdit1
+        Me.LayoutControlItem13.Location = New System.Drawing.Point(0, 0)
+        Me.LayoutControlItem13.Name = "LayoutControlItem13"
+        Me.LayoutControlItem13.Size = New System.Drawing.Size(954, 26)
+        Me.LayoutControlItem13.TextSize = New System.Drawing.Size(107, 13)
+        '
+        'XtraFolderBrowserDialog1
+        '
+        Me.XtraFolderBrowserDialog1.SelectedPath = "XtraFolderBrowserDialog1"
+        '
         'frmStart
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@@ -462,6 +566,15 @@ Partial Class frmStart
         CType(Me.LayoutControlItem10, System.ComponentModel.ISupportInitialize).EndInit()
         Me.XtraTabPage1.ResumeLayout(False)
         CType(Me.BehaviorManager1, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.XtraTabPage3.ResumeLayout(False)
+        CType(Me.LayoutControl3, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.LayoutControl3.ResumeLayout(False)
+        CType(Me.LayoutControlGroup2, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.MemoEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem11, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem12, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.TextEdit1.Properties, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.LayoutControlItem13, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -503,4 +616,14 @@ Partial Class frmStart
     Friend WithEvents BehaviorManager1 As DevExpress.Utils.Behaviors.BehaviorManager
     Friend WithEvents BarButtonItem2 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents RibbonPageGroup1 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
+    Friend WithEvents XtraTabPage3 As DevExpress.XtraTab.XtraTabPage
+    Friend WithEvents LayoutControl3 As DevExpress.XtraLayout.LayoutControl
+    Friend WithEvents MemoEdit2 As MemoEdit
+    Friend WithEvents btnOpenDirectory As SimpleButton
+    Friend WithEvents TextEdit1 As TextEdit
+    Friend WithEvents LayoutControlGroup2 As DevExpress.XtraLayout.LayoutControlGroup
+    Friend WithEvents LayoutControlItem11 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlItem13 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents LayoutControlItem12 As DevExpress.XtraLayout.LayoutControlItem
+    Friend WithEvents XtraFolderBrowserDialog1 As XtraFolderBrowserDialog
 End Class

ConfigCreator/frmStart.resx

@@ -120,4 +120,7 @@
   <metadata name="BehaviorManager1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
+  <metadata name="XtraFolderBrowserDialog1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>171, 17</value>
+  </metadata>
 </root>

ConfigCreator/frmStart.vb

@@ -4,6 +4,7 @@ Imports DigitalData.Modules.Config
 Imports DigitalData.Modules.Logging
 Imports DigitalData.Modules.Interfaces
 Imports DigitalData.GUIs.MonoRepoUtils.Config
+Imports System.Text
 
 Public Class frmStart
     Private Const ZUGFERD_SERVICE = "ZUGFERD_SERVICE"
@@ -113,4 +114,22 @@ Public Class frmStart
     Private Sub BarButtonItem2_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonItem2.ItemClick
         SaveSettings()
     End Sub
+
+    Private Sub btnOpenDirectory_Click(sender As Object, e As EventArgs) Handles btnOpenDirectory.Click
+        Dim oResult = XtraFolderBrowserDialog1.ShowDialog()
+
+        If oResult = DialogResult.OK Then
+            Dim oPath = XtraFolderBrowserDialog1.SelectedPath
+            Dim oFiles = IO.Directory.GetFiles(oPath, "*.dll")
+            Dim oStringBuilder As New StringBuilder()
+
+            For Each oFile In oFiles
+                Dim oFileInfo = New FileInfo(oFile)
+                Dim oText = $"<File Id=""{oFileInfo.Name}"" Name=""{oFileInfo.Name}"" KeyPath=""no"" Checksum=""yes"" />"
+                oStringBuilder.Append($"{oText}{vbNewLine}")
+            Next
+
+            MemoEdit2.EditValue = oStringBuilder.ToString
+        End If
+    End Sub
 End Class

Controls.ChatAddUser/ChatAddUser.vbproj

@@ -10,7 +10,7 @@
     <AssemblyName>DigitalData.Controls.ChatAddUser</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -59,9 +59,17 @@
     <Reference Include="DigitalData.Controls.LookupGrid">
       <HintPath>..\Controls.LookupGrid\obj\Debug\DigitalData.Controls.LookupGrid.dll</HintPath>
     </Reference>
+    <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="System" />
@@ -100,6 +108,7 @@
     <Compile Include="My Project\Application.Designer.vb">
       <AutoGen>True</AutoGen>
       <DependentUpon>Application.myapp</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <Compile Include="ChatAddUser.vb">
       <SubType>UserControl</SubType>
@@ -146,16 +155,6 @@
   <ItemGroup>
     <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Modules.Database\Database.vbproj">
-      <Project>{eaf0ea75-5fa7-485d-89c7-b2d843b03a96}</Project>
-      <Name>Database</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
-      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
-      <Name>Logging</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
     <None Include="Resources\crop.php.jpeg" />

Controls.ChatAddUser/My Project/AssemblyInfo.vb

@@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("")>
 <Assembly: AssemblyProduct("ChatControl")>
-<Assembly: AssemblyCopyright("Copyright ©  2020")>
-<Assembly: AssemblyTrademark("")>
+<Assembly: AssemblyCopyright("Copyright ©  2023")>
+<Assembly: AssemblyTrademark("1.0.1.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices
 ' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 ' indem Sie "*" wie unten gezeigt eingeben:
 
-<Assembly: AssemblyVersion("1.0.0.0")>
-<Assembly: AssemblyFileVersion("1.0.0.0")>
+<Assembly: AssemblyVersion("1.0.1.0")>
+<Assembly: AssemblyFileVersion("1.0.1.0")>

Controls.ChatAddUser/My Project/Resources.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
      Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _

Controls.ChatAddUser/My Project/Settings.Designer.vb

@@ -13,17 +13,17 @@ Option Explicit On
 
 
 Namespace My
-    
-    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0"),  _
-     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+
+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0"),
+     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
-        
-        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
-        
+
+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings)
+
 #Region "Automatische My.Settings-Speicherfunktion"
-#If _MyType = "WindowsForms" Then
+#If _MYTYPE = "WindowsForms" Then
     Private Shared addedHandler As Boolean
 
     Private Shared addedHandlerLockObject As New Object
@@ -36,11 +36,11 @@ Namespace My
     End Sub
 #End If
 #End Region
-        
+
         Public Shared ReadOnly Property [Default]() As MySettings
             Get
-                
-#If _MyType = "WindowsForms" Then
+
+#If _MYTYPE = "WindowsForms" Then
                If Not addedHandler Then
                     SyncLock addedHandlerLockObject
                         If Not addedHandler Then
@@ -57,13 +57,13 @@ Namespace My
 End Namespace
 
 Namespace My
-    
-    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _
-     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
+
+    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>
     Friend Module MySettingsProperty
-        
-        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
+
+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>
         Friend ReadOnly Property Settings() As Global.DigitalData.Controls.ChatAddUser.My.MySettings
             Get
                 Return Global.DigitalData.Controls.ChatAddUser.My.MySettings.Default

Controls.ChatAddUser/My Project/licenses.licx

@@ -0,0 +1 @@
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

Controls.ChatAddUser/app.config

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
+        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>

Controls.ChatAddUser/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.7.10" targetFramework="net461" />
+  <package id="NLog" version="5.0.5" targetFramework="net462" />
 </packages>

Controls.ChatControl/ChatControl.vbproj

@@ -10,7 +10,7 @@
     <AssemblyName>DigitalData.Controls.ChatControl</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -59,9 +59,17 @@
     <Reference Include="DigitalData.Controls.LookupGrid">
       <HintPath>..\Controls.LookupGrid\obj\Debug\DigitalData.Controls.LookupGrid.dll</HintPath>
     </Reference>
+    <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="System" />
@@ -100,6 +108,7 @@
     <Compile Include="My Project\Application.Designer.vb">
       <AutoGen>True</AutoGen>
       <DependentUpon>Application.myapp</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <Compile Include="ChatControl.vb">
       <SubType>UserControl</SubType>
@@ -122,6 +131,7 @@
   <ItemGroup>
     <EmbeddedResource Include="ChatControl.resx">
       <DependentUpon>ChatControl.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="My Project\licenses.licx" />
     <EmbeddedResource Include="My Project\Resources.resx">
@@ -146,20 +156,6 @@
   <ItemGroup>
     <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Controls.ChatAddUser\ChatAddUser.vbproj">
-      <Project>{f0a807cc-be14-4b5b-9200-27c16156bd8a}</Project>
-      <Name>ChatAddUser</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Modules.Database\Database.vbproj">
-      <Project>{eaf0ea75-5fa7-485d-89c7-b2d843b03a96}</Project>
-      <Name>Database</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
-      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
-      <Name>Logging</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
     <None Include="Resources\crop.php.jpeg" />
@@ -182,5 +178,11 @@
   <ItemGroup>
     <None Include="Resources\action_add_16xLG.png" />
   </ItemGroup>
+  <ItemGroup>
+    <ProjectReference Include="..\Controls.ChatAddUser\ChatAddUser.vbproj">
+      <Project>{f0a807cc-be14-4b5b-9200-27c16156bd8a}</Project>
+      <Name>ChatAddUser</Name>
+    </ProjectReference>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
 </Project>

Controls.ChatControl/My Project/AssemblyInfo.vb

@@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("")>
 <Assembly: AssemblyProduct("ChatControl")>
-<Assembly: AssemblyCopyright("Copyright ©  2020")>
-<Assembly: AssemblyTrademark("")>
+<Assembly: AssemblyCopyright("Copyright ©  2023")>
+<Assembly: AssemblyTrademark("1.0.1.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices
 ' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 ' indem Sie "*" wie unten gezeigt eingeben:
 
-<Assembly: AssemblyVersion("1.0.0.0")>
-<Assembly: AssemblyFileVersion("1.0.0.0")>
+<Assembly: AssemblyVersion("1.0.1.0")>
+<Assembly: AssemblyFileVersion("1.0.1.0")>

Controls.ChatControl/My Project/Resources.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
      Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _

Controls.ChatControl/My Project/Settings.Designer.vb

@@ -13,17 +13,17 @@ Option Explicit On
 
 
 Namespace My
-    
-    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0"),  _
-     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+
+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0"),
+     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
-        
-        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
-        
+
+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings)
+
 #Region "Automatische My.Settings-Speicherfunktion"
-#If _MyType = "WindowsForms" Then
+#If _MYTYPE = "WindowsForms" Then
     Private Shared addedHandler As Boolean
 
     Private Shared addedHandlerLockObject As New Object
@@ -36,11 +36,11 @@ Namespace My
     End Sub
 #End If
 #End Region
-        
+
         Public Shared ReadOnly Property [Default]() As MySettings
             Get
-                
-#If _MyType = "WindowsForms" Then
+
+#If _MYTYPE = "WindowsForms" Then
                If Not addedHandler Then
                     SyncLock addedHandlerLockObject
                         If Not addedHandler Then
@@ -57,13 +57,13 @@ Namespace My
 End Namespace
 
 Namespace My
-    
-    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _
-     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
+
+    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>
     Friend Module MySettingsProperty
-        
-        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
+
+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>
         Friend ReadOnly Property Settings() As Global.DigitalData.Controls.ChatControl.My.MySettings
             Get
                 Return Global.DigitalData.Controls.ChatControl.My.MySettings.Default

Controls.ChatControl/app.config

@@ -1,11 +1,15 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
+        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0"/>
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="NLog" publicKeyToken="5120e14c03d0593c" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.0.0" newVersion="4.0.0.0" />
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" /></startup></configuration>

Controls.ChatControl/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.7.10" targetFramework="net461" />
+  <package id="NLog" version="5.0.5" targetFramework="net462" />
 </packages>

Controls.ChatNewConv/ChatNewConv.vbproj

@@ -10,7 +10,7 @@
     <AssemblyName>DigitalData.Controls.ChatNewConv</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <Deterministic>true</Deterministic>
     <TargetFrameworkProfile />
   </PropertyGroup>
@@ -59,9 +59,17 @@
     <Reference Include="DigitalData.Controls.LookupGrid">
       <HintPath>..\Controls.LookupGrid\obj\Debug\DigitalData.Controls.LookupGrid.dll</HintPath>
     </Reference>
+    <Reference Include="DigitalData.Modules.Database, Version=2.2.7.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\Database\bin\Debug\DigitalData.Modules.Database.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Logging, Version=2.5.4.2, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="System" />
@@ -100,6 +108,7 @@
     <Compile Include="My Project\Application.Designer.vb">
       <AutoGen>True</AutoGen>
       <DependentUpon>Application.myapp</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <Compile Include="ChatNewConv.vb">
       <SubType>UserControl</SubType>
@@ -146,16 +155,6 @@
   <ItemGroup>
     <Service Include="{94E38DFF-614B-4cbd-B67C-F211BB35CE8B}" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Modules.Database\Database.vbproj">
-      <Project>{eaf0ea75-5fa7-485d-89c7-b2d843b03a96}</Project>
-      <Name>Database</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
-      <Project>{903b2d7d-3b80-4be9-8713-7447b704e1b0}</Project>
-      <Name>Logging</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
     <None Include="Resources\crop.php.jpeg" />

Controls.ChatNewConv/My Project/AssemblyInfo.vb

@@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("")>
 <Assembly: AssemblyProduct("ChatControl")>
-<Assembly: AssemblyCopyright("Copyright ©  2020")>
-<Assembly: AssemblyTrademark("")>
+<Assembly: AssemblyCopyright("Copyright ©  2023")>
+<Assembly: AssemblyTrademark("1.0.1.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -30,5 +30,5 @@ Imports System.Runtime.InteropServices
 ' Sie können alle Werte angeben oder Standardwerte für die Build- und Revisionsnummern verwenden,
 ' indem Sie "*" wie unten gezeigt eingeben:
 
-<Assembly: AssemblyVersion("1.0.0.0")>
-<Assembly: AssemblyFileVersion("1.0.0.0")>
+<Assembly: AssemblyVersion("1.0.1.0")>
+<Assembly: AssemblyFileVersion("1.0.1.0")>

Controls.ChatNewConv/My Project/Resources.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
      Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _

Controls.ChatNewConv/My Project/Settings.Designer.vb

@@ -13,17 +13,17 @@ Option Explicit On
 
 
 Namespace My
-    
-    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.4.0.0"),  _
-     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
+
+    <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0"),
+     Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase
-        
-        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()),MySettings)
-        
+
+        Private Shared defaultInstance As MySettings = CType(Global.System.Configuration.ApplicationSettingsBase.Synchronized(New MySettings()), MySettings)
+
 #Region "Automatische My.Settings-Speicherfunktion"
-#If _MyType = "WindowsForms" Then
+#If _MYTYPE = "WindowsForms" Then
     Private Shared addedHandler As Boolean
 
     Private Shared addedHandlerLockObject As New Object
@@ -36,11 +36,11 @@ Namespace My
     End Sub
 #End If
 #End Region
-        
+
         Public Shared ReadOnly Property [Default]() As MySettings
             Get
-                
-#If _MyType = "WindowsForms" Then
+
+#If _MYTYPE = "WindowsForms" Then
                If Not addedHandler Then
                     SyncLock addedHandlerLockObject
                         If Not addedHandler Then
@@ -57,13 +57,13 @@ Namespace My
 End Namespace
 
 Namespace My
-    
-    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),  _
-     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
-     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
+
+    <Global.Microsoft.VisualBasic.HideModuleNameAttribute(),
+     Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),
+     Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>
     Friend Module MySettingsProperty
-        
-        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>  _
+
+        <Global.System.ComponentModel.Design.HelpKeywordAttribute("My.Settings")>
         Friend ReadOnly Property Settings() As Global.DigitalData.Controls.ChatNewConv.My.MySettings
             Get
                 Return Global.DigitalData.Controls.ChatNewConv.My.MySettings.Default

Controls.ChatNewConv/app.config

@@ -1,11 +1,11 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
   <runtime>
     <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
       <dependentAssembly>
-        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
+        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral"/>
+        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0"/>
       </dependentAssembly>
     </assemblyBinding>
   </runtime>
-</configuration>
+<startup><supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2"/></startup></configuration>

Controls.ChatNewConv/packages.config

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.7.10" targetFramework="net461" />
+  <package id="NLog" version="5.0.5" targetFramework="net462" />
 </packages>

Controls.DocumentViewer/App.config

@@ -1,6 +1,61 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-    <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
-    </startup>
+  <configSections>
+    <!-- For more information on Entity Framework configuration, visit http://go.microsoft.com/fwlink/?LinkID=237468 -->
+    <section name="entityFramework" type="System.Data.Entity.Internal.ConfigFile.EntityFrameworkSection, EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" requirePermission="false" />
+  </configSections>
+  <startup>
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.2" />
+  </startup>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="Newtonsoft.Json" publicKeyToken="30ad4fe6b2a6aeed" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-13.0.0.0" newVersion="13.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.2.0" newVersion="4.0.2.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Runtime.CompilerServices.Unsafe" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-6.0.1.0" newVersion="6.0.1.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Buffers" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.4.0" newVersion="4.0.4.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Collections.Immutable" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Numerics.Vectors" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.1.5.0" newVersion="4.1.5.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="FirebirdSql.Data.FirebirdClient" publicKeyToken="3750abcc3150b00c" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-7.5.0.0" newVersion="7.5.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Security.Cryptography.Pkcs" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.IO.Packaging" publicKeyToken="b03f5f7f11d50a3a" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
+      <dependentAssembly>
+        <assemblyIdentity name="System.Text.Json" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-9.0.0.0" newVersion="9.0.0.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+  <entityFramework>
+    <providers>
+      <provider invariantName="System.Data.SqlClient" type="System.Data.Entity.SqlServer.SqlProviderServices, EntityFramework.SqlServer" />
+      <provider invariantName="FirebirdSql.Data.FirebirdClient" type="EntityFramework.Firebird.FbProviderServices, EntityFramework.Firebird" />
+    </providers>
+    <defaultConnectionFactory type="EntityFramework.Firebird.FbConnectionFactory, EntityFramework.Firebird" />
+  </entityFramework>
 </configuration>

Controls.DocumentViewer/Classes/Annotations.vb

@@ -0,0 +1,70 @@
+Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.Logging
+Imports GdPicture14
+Imports GdPicture14.Annotations
+
+Public Class Annotations
+    Inherits BaseClass
+
+    Private Const DEFAULT_LEFT = 10
+    Private Const DEFAULT_TOP = 10
+    Private Const DEFAULT_WIDTH = 200
+    Private Const DEFAULT_HEIGHT = 50
+
+    Public Sub New(pLogConfig As LogConfig)
+        MyBase.New(pLogConfig)
+    End Sub
+
+    Public Function AddAnnotationInteractive(pGDViewer As GdViewer, pText As String) As Boolean
+        pGDViewer.AddTextAnnotationInteractive(pText, Color.Black, "Arial", Drawing.FontStyle.Bold Or Drawing.FontStyle.Underline, 12, True, Color.Red, Color.White, 1, 0)
+        If pGDViewer.GetStat = GdPictureStatus.OK Then
+            Return True
+        Else
+            Return False
+        End If
+    End Function
+
+    Public Function AddAnnotation(pGDViewer As GdViewer, pText As String) As Boolean
+        Try
+            Dim oStatus As GdPictureStatus = GdPictureStatus.OK
+            Using oManager As AnnotationManager = pGDViewer.GetAnnotationManager()
+                If oManager.InitFromGdViewer(pGDViewer) = GdPictureStatus.OK AndAlso oManager.PageCount > 0 AndAlso oManager.SelectPage(1) = GdPictureStatus.OK Then
+                    Using oAnnotation As AnnotationText = oManager.AddTextAnnot(0, 0, 0, 0, pText)
+                        If oManager.GetStat = GdPictureStatus.OK AndAlso oAnnotation IsNot Nothing Then
+                            oAnnotation.Alignment = StringAlignment.Near
+                            oAnnotation.Author = Environment.UserName
+                            oAnnotation.Fill = True
+                            oAnnotation.FillColor = Color.LightYellow
+                            oAnnotation.FontSize = 16
+                            oAnnotation.ForeColor = Color.Black
+                            oAnnotation.Opacity = 0.7F
+                            oAnnotation.StrokeColor = Color.Yellow
+                            oAnnotation.Top = DEFAULT_TOP
+                            oAnnotation.Left = DEFAULT_LEFT
+                            oAnnotation.Width = DEFAULT_WIDTH
+                            oAnnotation.Height = DEFAULT_HEIGHT
+                            oAnnotation.Text = pText
+
+                            'pGDViewer.ann
+
+                            If oManager.SaveAnnotationsToPage() = GdPictureStatus.OK Then
+                                oManager.BurnAnnotationsToPage(True)
+                            End If
+                        End If
+                    End Using
+                End If
+                oStatus = oManager.GetStat()
+            End Using
+
+            If oStatus = GdPictureStatus.OK Then
+                Return True
+            Else
+                Return False
+            End If
+        Catch ex As Exception
+            Return False
+        End Try
+    End Function
+
+
+End Class

Controls.DocumentViewer/Classes/Search.vb

@@ -0,0 +1,137 @@
+Imports DigitalData.Modules.Base
+Imports DigitalData.Modules.Logging
+Imports GdPicture14
+
+Public Class Search
+    Inherits BaseClass
+
+    Public Property SearchQuery As String = ""
+    Public Property CaseSensitive As Boolean = False
+    Public Property WholeWords As Boolean = False
+
+    Private _Viewer As GdViewer = Nothing
+    Private _AnnotationManager As New AnnotationManager()
+
+    Private _CurrentPage As Integer = 0
+    Private _CurrentQuery As String = ""
+    Private _CurrentOccurrenceCount = 0
+    Private _CurrentSelectedOccurrence = 0
+
+    Public Sub New(pLogConfig As LogConfig, pGDViewer As GdViewer)
+        MyBase.New(pLogConfig)
+        _Viewer = pGDViewer
+        _AnnotationManager.InitFromGdViewer(pGDViewer)
+
+        AddHandler _Viewer.PageDisplayed, AddressOf Viewer_PageDisplayed
+    End Sub
+
+    Public Sub SearchAll(pQuery As String)
+        ' Exit, if query has not changed
+        If _CurrentQuery = pQuery Then
+            Exit Sub
+        End If
+
+        ' Save query
+        _CurrentQuery = pQuery
+
+        ' Reset previous highlights, then search for the new query
+        _Viewer.RemoveAllRegions()
+        DoSearchText()
+
+        ' Select the next occurrence
+        NextHighlight()
+    End Sub
+
+    Public Sub NextHighlight()
+        ' This also applies when the page has *NO* occurrences, so 0 = 0
+        If _CurrentOccurrenceCount = _CurrentSelectedOccurrence Then
+            Dim oCount = 0
+            ' If there are no occurrences on the current page, got to the *next page*
+            While _CurrentOccurrenceCount = _CurrentSelectedOccurrence And _CurrentPage <= _Viewer.PageCount
+                oCount += 1
+                If _CurrentPage = _Viewer.PageCount Then
+                    _Viewer.DisplayFirstPage()
+                Else
+                    _Viewer.DisplayNextPage()
+                End If
+                If oCount > 333 Then
+                    Exit While
+                End If
+            End While
+
+            ' Safeguard against selecting a non-existing occurrence on the last page
+            If _CurrentOccurrenceCount > 0 Then
+                SelectHighlight(1)
+            Else
+                ' Disable next button
+            End If
+        Else
+            ' Otherwise just select the next occurrence
+            SelectHighlight(_CurrentSelectedOccurrence + 1)
+        End If
+    End Sub
+
+    Public Sub PrevHighlight()
+        If _CurrentOccurrenceCount = 0 Or _CurrentSelectedOccurrence = 1 Then
+            Dim oCount = 0
+            While (_CurrentOccurrenceCount = 0 Or _CurrentSelectedOccurrence = 1) And _CurrentPage >= 1
+                oCount += 1
+                If _CurrentPage = 1 Then
+                    _Viewer.DisplayLastPage()
+                Else
+                    _Viewer.DisplayPreviousPage()
+                End If
+                If oCount > 333 Then
+                    Exit While
+                End If
+            End While
+
+            If _CurrentOccurrenceCount > 0 Then
+                SelectHighlight(_CurrentOccurrenceCount)
+            End If
+
+        Else
+            ' Otherwise just select the previous occurrence
+            SelectHighlight(_CurrentSelectedOccurrence - 1)
+        End If
+    End Sub
+
+    Private Sub SelectHighlight(pOccurrence As Integer)
+        Dim oFound = _Viewer.SearchText(_CurrentQuery, pOccurrence, CaseSensitive, WholeWords)
+        If _Viewer.GetStat() = GdPictureStatus.OK And _Viewer.IsRect() Then
+            _Viewer.RectIsEditable = False
+            _Viewer.CenterOnRect()
+
+            _CurrentSelectedOccurrence = pOccurrence
+        Else
+            _CurrentSelectedOccurrence = 0
+        End If
+    End Sub
+
+    Private Sub Viewer_PageDisplayed()
+        If _CurrentPage <> _Viewer.CurrentPage Then
+            _CurrentPage = _Viewer.CurrentPage
+
+            If _CurrentQuery.Length > 0 Then
+                DoSearchText()
+            End If
+        End If
+    End Sub
+
+    Private Sub DoSearchText()
+
+
+        _Viewer.SearchText(_CurrentQuery, 0, CaseSensitive, WholeWords)
+
+        Dim oRegionCount = _Viewer.RegionCount()
+        For index = 1 To oRegionCount
+            Dim oId = _Viewer.GetRegionID(index)
+            _Viewer.SetRegionEditable(oId, False)
+        Next
+
+
+        _CurrentOccurrenceCount = _Viewer.GetTextOccurrenceCount(_CurrentPage, _CurrentQuery, CaseSensitive, WholeWords)
+        _CurrentSelectedOccurrence = 0
+    End Sub
+
+End Class

Controls.DocumentViewer/DocumentViewer.Designer.vb

@@ -46,21 +46,31 @@ Partial Class DocumentViewer
         Me.buttonNextPage = New DevExpress.XtraBars.BarButtonItem()
         Me.buttonLastPage = New DevExpress.XtraBars.BarButtonItem()
         Me.buttonSettings = New DevExpress.XtraBars.BarButtonItem()
+        Me.txtSearch = New DevExpress.XtraBars.BarEditItem()
+        Me.RepositoryItemTextEdit3 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit()
+        Me.btnSearch2 = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnPrevHighlight = New DevExpress.XtraBars.BarButtonItem()
+        Me.btnNextHighlight = New DevExpress.XtraBars.BarButtonItem()
         Me.barDockControlTop = New DevExpress.XtraBars.BarDockControl()
         Me.barDockControlBottom = New DevExpress.XtraBars.BarDockControl()
         Me.barDockControlLeft = New DevExpress.XtraBars.BarDockControl()
         Me.barDockControlRight = New DevExpress.XtraBars.BarDockControl()
         Me.BarStaticItem1 = New DevExpress.XtraBars.BarStaticItem()
+        Me.btnSearch = New DevExpress.XtraBars.BarButtonItem()
         Me.RepositoryItemTextEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemTextEdit()
         Me.RepositoryItemColorEdit1 = New DevExpress.XtraEditors.Repository.RepositoryItemColorEdit()
         Me.RepositoryItemComboBox1 = New DevExpress.XtraEditors.Repository.RepositoryItemComboBox()
+        Me.RepositoryItemSearchControl1 = New DevExpress.XtraEditors.Repository.RepositoryItemSearchControl()
         Me.SpreadsheetControl1 = New DevExpress.XtraSpreadsheet.SpreadsheetControl()
         Me.PrintDocument1 = New System.Drawing.Printing.PrintDocument()
+        Me.lbFileNotLoaded = New DevExpress.XtraEditors.LabelControl()
         CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.RepositoryItemTextEdit3, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RepositoryItemColorEdit1, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.RepositoryItemSearchControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SuspendLayout()
         '
         'GdViewer
@@ -88,6 +98,7 @@ Partial Class DocumentViewer
         Me.GdViewer.DrawPageBorders = True
         Me.GdViewer.EnableDeferredPainting = True
         Me.GdViewer.EnabledProgressBar = True
+        Me.GdViewer.EnableFuzzySearch = False
         Me.GdViewer.EnableICM = False
         Me.GdViewer.EnableMenu = True
         Me.GdViewer.EnableMouseWheel = True
@@ -129,8 +140,9 @@ Partial Class DocumentViewer
         Me.GdViewer.ScrollLargeChange = CType(50, Short)
         Me.GdViewer.ScrollSmallChange = CType(1, Short)
         Me.GdViewer.SilentMode = True
-        Me.GdViewer.Size = New System.Drawing.Size(1015, 557)
+        Me.GdViewer.Size = New System.Drawing.Size(1012, 557)
         Me.GdViewer.TabIndex = 0
+        Me.GdViewer.TabStop = False
         Me.GdViewer.ViewRotation = System.Drawing.RotateFlipType.RotateNoneFlipNone
         Me.GdViewer.Zoom = 1.0R
         Me.GdViewer.ZoomCenterAtMousePosition = False
@@ -143,15 +155,15 @@ Partial Class DocumentViewer
         '
         'RichEditControl1
         '
-        Me.RichEditControl1.Location = New System.Drawing.Point(735, 377)
+        Me.RichEditControl1.Location = New System.Drawing.Point(616, 270)
         Me.RichEditControl1.MenuManager = Me.BarManager1
         Me.RichEditControl1.Name = "RichEditControl1"
         Me.RichEditControl1.Options.HorizontalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden
         Me.RichEditControl1.Options.VerticalRuler.Visibility = DevExpress.XtraRichEdit.RichEditRulerVisibility.Hidden
         Me.RichEditControl1.ReadOnly = True
         Me.RichEditControl1.Size = New System.Drawing.Size(249, 161)
-        Me.RichEditControl1.TabIndex = 8
-        Me.RichEditControl1.Text = "RichEditControl1"
+        Me.RichEditControl1.TabIndex = 0
+        Me.RichEditControl1.TabStop = False
         Me.RichEditControl1.Visible = False
         '
         'BarManager1
@@ -162,10 +174,10 @@ Partial Class DocumentViewer
         Me.BarManager1.DockControls.Add(Me.barDockControlLeft)
         Me.BarManager1.DockControls.Add(Me.barDockControlRight)
         Me.BarManager1.Form = Me
-        Me.BarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.buttonPrint, Me.buttonFitPage, Me.buttonFitWidth, Me.buttonZoomIn, Me.buttonZoomOut, Me.buttonRotateRight, Me.buttonRotateLeft, Me.buttonFlipX, Me.buttonFlipY, Me.buttonSettings, Me.buttonPrevPage, Me.buttonNextPage, Me.buttonFirstPage, Me.buttonLastPage, Me.txtCurrentPage, Me.BarStaticItem1, Me.labelPageCount})
+        Me.BarManager1.Items.AddRange(New DevExpress.XtraBars.BarItem() {Me.buttonPrint, Me.buttonFitPage, Me.buttonFitWidth, Me.buttonZoomIn, Me.buttonZoomOut, Me.buttonRotateRight, Me.buttonRotateLeft, Me.buttonFlipX, Me.buttonFlipY, Me.buttonSettings, Me.buttonPrevPage, Me.buttonNextPage, Me.buttonFirstPage, Me.buttonLastPage, Me.txtCurrentPage, Me.BarStaticItem1, Me.labelPageCount, Me.txtSearch, Me.btnPrevHighlight, Me.btnNextHighlight, Me.btnSearch, Me.btnSearch2})
         Me.BarManager1.MainMenu = Me.ToolbarDocumentViewer
-        Me.BarManager1.MaxItemId = 25
-        Me.BarManager1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2, Me.RepositoryItemColorEdit1, Me.RepositoryItemComboBox1})
+        Me.BarManager1.MaxItemId = 34
+        Me.BarManager1.RepositoryItems.AddRange(New DevExpress.XtraEditors.Repository.RepositoryItem() {Me.RepositoryItemTextEdit1, Me.RepositoryItemTextEdit2, Me.RepositoryItemColorEdit1, Me.RepositoryItemComboBox1, Me.RepositoryItemSearchControl1, Me.RepositoryItemTextEdit3})
         '
         'ToolbarDocumentViewer
         '
@@ -173,7 +185,7 @@ Partial Class DocumentViewer
         Me.ToolbarDocumentViewer.DockCol = 0
         Me.ToolbarDocumentViewer.DockRow = 0
         Me.ToolbarDocumentViewer.DockStyle = DevExpress.XtraBars.BarDockStyle.Top
-        Me.ToolbarDocumentViewer.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.buttonPrint), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonFitWidth), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonFitPage), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonZoomIn), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonZoomOut), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonRotateLeft), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonRotateRight), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonFlipX), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonFlipY), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonFirstPage), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonPrevPage), New DevExpress.XtraBars.LinkPersistInfo(Me.txtCurrentPage), New DevExpress.XtraBars.LinkPersistInfo(Me.labelPageCount), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonNextPage), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonLastPage), New DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, Me.buttonSettings, DevExpress.XtraBars.BarItemPaintStyle.Standard)})
+        Me.ToolbarDocumentViewer.LinksPersistInfo.AddRange(New DevExpress.XtraBars.LinkPersistInfo() {New DevExpress.XtraBars.LinkPersistInfo(Me.buttonPrint), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonFitWidth), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonFitPage), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonZoomIn), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonZoomOut), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonRotateLeft), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonRotateRight), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonFlipX), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonFlipY), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonFirstPage), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonPrevPage), New DevExpress.XtraBars.LinkPersistInfo(Me.txtCurrentPage), New DevExpress.XtraBars.LinkPersistInfo(Me.labelPageCount), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonNextPage), New DevExpress.XtraBars.LinkPersistInfo(Me.buttonLastPage), New DevExpress.XtraBars.LinkPersistInfo(DevExpress.XtraBars.BarLinkUserDefines.PaintStyle, Me.buttonSettings, DevExpress.XtraBars.BarItemPaintStyle.Standard), New DevExpress.XtraBars.LinkPersistInfo(Me.txtSearch), New DevExpress.XtraBars.LinkPersistInfo(Me.btnSearch2), New DevExpress.XtraBars.LinkPersistInfo(Me.btnPrevHighlight), New DevExpress.XtraBars.LinkPersistInfo(Me.btnNextHighlight)})
         Me.ToolbarDocumentViewer.OptionsBar.AllowCollapse = True
         Me.ToolbarDocumentViewer.OptionsBar.AllowQuickCustomization = False
         Me.ToolbarDocumentViewer.OptionsBar.DrawDragBorder = False
@@ -192,7 +204,7 @@ Partial Class DocumentViewer
         '
         Me.buttonFitWidth.Caption = "An Breite anpassen"
         Me.buttonFitWidth.Id = 2
-        Me.buttonFitWidth.ImageOptions.SvgImage = CType(resources.GetObject("buttonFitWidth.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.buttonFitWidth.ImageOptions.SvgImage = Global.DigitalData.Controls.DocumentViewer.My.Resources.Resources.fittowidth
         Me.buttonFitWidth.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25)
         Me.buttonFitWidth.Name = "buttonFitWidth"
         '
@@ -200,7 +212,7 @@ Partial Class DocumentViewer
         '
         Me.buttonFitPage.Caption = "An Seite Anpassen"
         Me.buttonFitPage.Id = 1
-        Me.buttonFitPage.ImageOptions.SvgImage = CType(resources.GetObject("buttonFitPage.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.buttonFitPage.ImageOptions.SvgImage = Global.DigitalData.Controls.DocumentViewer.My.Resources.Resources.fittopage
         Me.buttonFitPage.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25)
         Me.buttonFitPage.Name = "buttonFitPage"
         '
@@ -208,7 +220,7 @@ Partial Class DocumentViewer
         '
         Me.buttonZoomIn.Caption = "Zoom +"
         Me.buttonZoomIn.Id = 3
-        Me.buttonZoomIn.ImageOptions.SvgImage = CType(resources.GetObject("buttonZoomIn.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.buttonZoomIn.ImageOptions.SvgImage = Global.DigitalData.Controls.DocumentViewer.My.Resources.Resources.zoomin
         Me.buttonZoomIn.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25)
         Me.buttonZoomIn.Name = "buttonZoomIn"
         '
@@ -224,7 +236,7 @@ Partial Class DocumentViewer
         '
         Me.buttonRotateLeft.Caption = "Drehen -90 Grad"
         Me.buttonRotateLeft.Id = 6
-        Me.buttonRotateLeft.ImageOptions.SvgImage = CType(resources.GetObject("buttonRotateLeft.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.buttonRotateLeft.ImageOptions.SvgImage = Global.DigitalData.Controls.DocumentViewer.My.Resources.Resources.rotatecounterclockwise
         Me.buttonRotateLeft.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25)
         Me.buttonRotateLeft.Name = "buttonRotateLeft"
         '
@@ -232,7 +244,7 @@ Partial Class DocumentViewer
         '
         Me.buttonRotateRight.Caption = "Drehen 90 Grad"
         Me.buttonRotateRight.Id = 5
-        Me.buttonRotateRight.ImageOptions.SvgImage = CType(resources.GetObject("buttonRotateRight.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.buttonRotateRight.ImageOptions.SvgImage = Global.DigitalData.Controls.DocumentViewer.My.Resources.Resources.rotateclockwise
         Me.buttonRotateRight.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25)
         Me.buttonRotateRight.Name = "buttonRotateRight"
         '
@@ -240,7 +252,7 @@ Partial Class DocumentViewer
         '
         Me.buttonFlipX.Caption = "Spiegeln Horizontal"
         Me.buttonFlipX.Id = 7
-        Me.buttonFlipX.ImageOptions.SvgImage = CType(resources.GetObject("buttonFlipX.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.buttonFlipX.ImageOptions.SvgImage = Global.DigitalData.Controls.DocumentViewer.My.Resources.Resources.flipimage_horizontal
         Me.buttonFlipX.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25)
         Me.buttonFlipX.Name = "buttonFlipX"
         '
@@ -248,7 +260,7 @@ Partial Class DocumentViewer
         '
         Me.buttonFlipY.Caption = "Spiegeln Vertikal"
         Me.buttonFlipY.Id = 8
-        Me.buttonFlipY.ImageOptions.SvgImage = CType(resources.GetObject("buttonFlipY.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.buttonFlipY.ImageOptions.SvgImage = Global.DigitalData.Controls.DocumentViewer.My.Resources.Resources.flipimage_vertical
         Me.buttonFlipY.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25)
         Me.buttonFlipY.Name = "buttonFlipY"
         '
@@ -256,7 +268,7 @@ Partial Class DocumentViewer
         '
         Me.buttonFirstPage.Caption = "Erste Seite"
         Me.buttonFirstPage.Id = 13
-        Me.buttonFirstPage.ImageOptions.SvgImage = CType(resources.GetObject("buttonFirstPage.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.buttonFirstPage.ImageOptions.SvgImage = Global.DigitalData.Controls.DocumentViewer.My.Resources.Resources.doublefirst
         Me.buttonFirstPage.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25)
         Me.buttonFirstPage.Name = "buttonFirstPage"
         '
@@ -264,7 +276,7 @@ Partial Class DocumentViewer
         '
         Me.buttonPrevPage.Caption = "Zurück"
         Me.buttonPrevPage.Id = 11
-        Me.buttonPrevPage.ImageOptions.SvgImage = CType(resources.GetObject("buttonPrevPage.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.buttonPrevPage.ImageOptions.SvgImage = Global.DigitalData.Controls.DocumentViewer.My.Resources.Resources.prev
         Me.buttonPrevPage.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25)
         Me.buttonPrevPage.Name = "buttonPrevPage"
         '
@@ -292,7 +304,7 @@ Partial Class DocumentViewer
         '
         Me.buttonNextPage.Caption = "Vor"
         Me.buttonNextPage.Id = 12
-        Me.buttonNextPage.ImageOptions.SvgImage = CType(resources.GetObject("buttonNextPage.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.buttonNextPage.ImageOptions.SvgImage = Global.DigitalData.Controls.DocumentViewer.My.Resources.Resources._next
         Me.buttonNextPage.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25)
         Me.buttonNextPage.Name = "buttonNextPage"
         '
@@ -300,17 +312,54 @@ Partial Class DocumentViewer
         '
         Me.buttonLastPage.Caption = "Letzte Seite"
         Me.buttonLastPage.Id = 14
-        Me.buttonLastPage.ImageOptions.SvgImage = CType(resources.GetObject("buttonLastPage.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.buttonLastPage.ImageOptions.SvgImage = Global.DigitalData.Controls.DocumentViewer.My.Resources.Resources.doublelast
         Me.buttonLastPage.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25)
         Me.buttonLastPage.Name = "buttonLastPage"
         '
         'buttonSettings
         '
+        Me.buttonSettings.Alignment = DevExpress.XtraBars.BarItemLinkAlignment.Right
         Me.buttonSettings.Caption = "Einstellungen"
         Me.buttonSettings.Id = 9
-        Me.buttonSettings.ImageOptions.SvgImage = CType(resources.GetObject("buttonSettings.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.buttonSettings.ImageOptions.SvgImage = Global.DigitalData.Controls.DocumentViewer.My.Resources.Resources.viewsettings
         Me.buttonSettings.ImageOptions.SvgImageSize = New System.Drawing.Size(25, 25)
         Me.buttonSettings.Name = "buttonSettings"
+        Me.buttonSettings.Visibility = DevExpress.XtraBars.BarItemVisibility.Never
+        '
+        'txtSearch
+        '
+        Me.txtSearch.Caption = "Suchtext"
+        Me.txtSearch.Edit = Me.RepositoryItemTextEdit3
+        Me.txtSearch.Id = 27
+        Me.txtSearch.Name = "txtSearch"
+        '
+        'RepositoryItemTextEdit3
+        '
+        Me.RepositoryItemTextEdit3.AutoHeight = False
+        Me.RepositoryItemTextEdit3.Name = "RepositoryItemTextEdit3"
+        '
+        'btnSearch2
+        '
+        Me.btnSearch2.Caption = "Text suchen"
+        Me.btnSearch2.Id = 32
+        Me.btnSearch2.ImageOptions.SvgImage = CType(resources.GetObject("btnSearch2.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.btnSearch2.Name = "btnSearch2"
+        '
+        'btnPrevHighlight
+        '
+        Me.btnPrevHighlight.Caption = "Vorheriges Ergebnis"
+        Me.btnPrevHighlight.Enabled = False
+        Me.btnPrevHighlight.Id = 28
+        Me.btnPrevHighlight.ImageOptions.SvgImage = CType(resources.GetObject("btnPrevHighlight.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.btnPrevHighlight.Name = "btnPrevHighlight"
+        '
+        'btnNextHighlight
+        '
+        Me.btnNextHighlight.Caption = "Nächstes Ergebnis"
+        Me.btnNextHighlight.Enabled = False
+        Me.btnNextHighlight.Id = 29
+        Me.btnNextHighlight.ImageOptions.SvgImage = CType(resources.GetObject("btnNextHighlight.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.btnNextHighlight.Name = "btnNextHighlight"
         '
         'barDockControlTop
         '
@@ -318,7 +367,7 @@ Partial Class DocumentViewer
         Me.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top
         Me.barDockControlTop.Location = New System.Drawing.Point(0, 0)
         Me.barDockControlTop.Manager = Me.BarManager1
-        Me.barDockControlTop.Size = New System.Drawing.Size(1015, 33)
+        Me.barDockControlTop.Size = New System.Drawing.Size(1012, 33)
         '
         'barDockControlBottom
         '
@@ -326,7 +375,7 @@ Partial Class DocumentViewer
         Me.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom
         Me.barDockControlBottom.Location = New System.Drawing.Point(0, 590)
         Me.barDockControlBottom.Manager = Me.BarManager1
-        Me.barDockControlBottom.Size = New System.Drawing.Size(1015, 0)
+        Me.barDockControlBottom.Size = New System.Drawing.Size(1012, 0)
         '
         'barDockControlLeft
         '
@@ -340,7 +389,7 @@ Partial Class DocumentViewer
         '
         Me.barDockControlRight.CausesValidation = False
         Me.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right
-        Me.barDockControlRight.Location = New System.Drawing.Point(1015, 33)
+        Me.barDockControlRight.Location = New System.Drawing.Point(1012, 33)
         Me.barDockControlRight.Manager = Me.BarManager1
         Me.barDockControlRight.Size = New System.Drawing.Size(0, 557)
         '
@@ -350,6 +399,13 @@ Partial Class DocumentViewer
         Me.BarStaticItem1.Id = 17
         Me.BarStaticItem1.Name = "BarStaticItem1"
         '
+        'btnSearch
+        '
+        Me.btnSearch.Caption = "Search"
+        Me.btnSearch.Id = 31
+        Me.btnSearch.ImageOptions.SvgImage = CType(resources.GetObject("btnSearch.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage)
+        Me.btnSearch.Name = "btnSearch"
+        '
         'RepositoryItemTextEdit1
         '
         Me.RepositoryItemTextEdit1.AutoHeight = False
@@ -371,35 +427,64 @@ Partial Class DocumentViewer
         Me.RepositoryItemComboBox1.Items.AddRange(New Object() {"Arrow", "Text"})
         Me.RepositoryItemComboBox1.Name = "RepositoryItemComboBox1"
         '
+        'RepositoryItemSearchControl1
+        '
+        Me.RepositoryItemSearchControl1.AutoHeight = False
+        Me.RepositoryItemSearchControl1.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Repository.ClearButton(), New DevExpress.XtraEditors.Repository.SearchButton()})
+        Me.RepositoryItemSearchControl1.Name = "RepositoryItemSearchControl1"
+        '
         'SpreadsheetControl1
         '
-        Me.SpreadsheetControl1.Location = New System.Drawing.Point(461, 377)
+        Me.SpreadsheetControl1.Location = New System.Drawing.Point(316, 270)
         Me.SpreadsheetControl1.MenuManager = Me.BarManager1
         Me.SpreadsheetControl1.Name = "SpreadsheetControl1"
         Me.SpreadsheetControl1.ReadOnly = True
         Me.SpreadsheetControl1.Size = New System.Drawing.Size(268, 161)
-        Me.SpreadsheetControl1.TabIndex = 9
+        Me.SpreadsheetControl1.TabIndex = 0
+        Me.SpreadsheetControl1.TabStop = False
         Me.SpreadsheetControl1.Text = "SpreadsheetControl1"
         Me.SpreadsheetControl1.Visible = False
         '
+        'lbFileNotLoaded
+        '
+        Me.lbFileNotLoaded.Anchor = CType(((System.Windows.Forms.AnchorStyles.Top Or System.Windows.Forms.AnchorStyles.Left) _
+            Or System.Windows.Forms.AnchorStyles.Right), System.Windows.Forms.AnchorStyles)
+        Me.lbFileNotLoaded.Appearance.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.lbFileNotLoaded.Appearance.Options.UseFont = True
+        Me.lbFileNotLoaded.Appearance.Options.UseTextOptions = True
+        Me.lbFileNotLoaded.Appearance.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center
+        Me.lbFileNotLoaded.Appearance.TextOptions.VAlignment = DevExpress.Utils.VertAlignment.Center
+        Me.lbFileNotLoaded.AutoEllipsis = True
+        Me.lbFileNotLoaded.AutoSizeMode = DevExpress.XtraEditors.LabelAutoSizeMode.None
+        Me.lbFileNotLoaded.Location = New System.Drawing.Point(3, 74)
+        Me.lbFileNotLoaded.Name = "lbFileNotLoaded"
+        Me.lbFileNotLoaded.Size = New System.Drawing.Size(1006, 72)
+        Me.lbFileNotLoaded.TabIndex = 0
+        Me.lbFileNotLoaded.Tag = ""
+        Me.lbFileNotLoaded.Text = "Die Datei konnte nicht geladen werden"
+        Me.lbFileNotLoaded.Visible = False
+        '
         'DocumentViewer
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.Controls.Add(Me.SpreadsheetControl1)
+        Me.Controls.Add(Me.lbFileNotLoaded)
         Me.Controls.Add(Me.RichEditControl1)
+        Me.Controls.Add(Me.SpreadsheetControl1)
         Me.Controls.Add(Me.GdViewer)
         Me.Controls.Add(Me.barDockControlLeft)
         Me.Controls.Add(Me.barDockControlRight)
         Me.Controls.Add(Me.barDockControlBottom)
         Me.Controls.Add(Me.barDockControlTop)
         Me.Name = "DocumentViewer"
-        Me.Size = New System.Drawing.Size(1015, 590)
+        Me.Size = New System.Drawing.Size(1012, 590)
         CType(Me.BarManager1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.RepositoryItemTextEdit2, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.RepositoryItemTextEdit3, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.RepositoryItemTextEdit1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.RepositoryItemColorEdit1, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.RepositoryItemComboBox1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.RepositoryItemSearchControl1, System.ComponentModel.ISupportInitialize).EndInit()
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -437,4 +522,12 @@ Partial Class DocumentViewer
     Friend WithEvents RepositoryItemColorEdit1 As DevExpress.XtraEditors.Repository.RepositoryItemColorEdit
     Friend WithEvents RepositoryItemComboBox1 As DevExpress.XtraEditors.Repository.RepositoryItemComboBox
     Friend WithEvents labelPageCount As DevExpress.XtraBars.BarStaticItem
+    Friend WithEvents txtSearch As DevExpress.XtraBars.BarEditItem
+    Friend WithEvents RepositoryItemTextEdit3 As DevExpress.XtraEditors.Repository.RepositoryItemTextEdit
+    Friend WithEvents btnPrevHighlight As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents btnNextHighlight As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents RepositoryItemSearchControl1 As DevExpress.XtraEditors.Repository.RepositoryItemSearchControl
+    Friend WithEvents lbFileNotLoaded As DevExpress.XtraEditors.LabelControl
+    Friend WithEvents btnSearch As DevExpress.XtraBars.BarButtonItem
+    Friend WithEvents btnSearch2 As DevExpress.XtraBars.BarButtonItem
 End Class

Controls.DocumentViewer/DocumentViewer.resx

@@ -126,7 +126,7 @@
   <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
   <data name="buttonPrint.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
         dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAOcCAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -142,70 +142,11 @@
         MSwwLjksMiwyLDJoNHY0aDE2di00aDRjMS4xLDAsMi0wLjksMi0yVjEyQzMwLDEwLjksMjkuMSwxMCwy
         OCwxMHogTTIyLDI0djJ2MkgxMHYtMnYtMnYtNGgxMlYyNHoiIGlkPSJQcmludCIgY2xhc3M9IkJsYWNr
         IiAvPg0KICA8L2c+DQo8L3N2Zz4L
-</value>
-  </data>
-  <data name="buttonFitWidth.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANcCAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgdmlld0JveD0iMCAwIDIw
-        IDIwIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJFYmVuZV8xIj4NCiAgPGRl
-        ZnM+DQogICAgPHN0eWxlPi5jbHMtMXtmaWxsOiNhNTI0MzE7fS5jbHMtMntmaWxsOiM2NDYzNjM7fTwv
-        c3R5bGU+DQogIDwvZGVmcz4NCiAgPHBvbHlnb24gcG9pbnRzPSIyLjkyMSAwLjg5MyAyLjkyMSAxLjg5
-        MyAzLjkyMSAxLjg5MyA0LjAzOCAxLjg5MyA0LjAzOCAxNC40MzYgMy45MjEgMTQuNDM2IDIuOTIxIDE0
-        LjQzNiAyLjkyMSAxNS40MzYgNS4wMzggMTUuNDM2IDUuMDM4IDAuODkzIDIuOTIxIDAuODkzIiBjbGFz
-        cz0iY2xzLTEiIC8+DQogIDxwb2x5Z29uIHBvaW50cz0iNi41MzggMTYuOTg5IDYuNTM4IDE5LjEwNyA3
-        LjYgMTkuMTA3IDcuNiAxOC4xMDcgNy41OTkgMTguMTA3IDcuNTk5IDE3Ljk4OSA3LjYgMTcuOTg5IDE2
-        LjAxOCAxNy45ODkgMTYuMDE4IDE4LjEwNyAxNi4wMTggMTkuMTA3IDE3LjA3OSAxOS4xMDcgMTcuMDc5
-        IDE2Ljk4OSA2LjUzOCAxNi45ODkiIGNsYXNzPSJjbHMtMSIgLz4NCiAgPHBhdGggZD0iTTExLjM3Mjks
-        Mi44OTM1bDMuNzA2MywzLjQ5MzRWMTMuNDM2SDguNTM4MVYyLjg5MzVoMi44MzQ4bS43OTQxLTJINi41
-        MzgxVjE1LjQzNkgxNy4wNzkyVjUuNTIzN0wxMi4xNjcuODkzNVoiIGNsYXNzPSJjbHMtMiIgLz4NCjwv
-        c3ZnPgs=
-</value>
-  </data>
-  <data name="buttonFitPage.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAJcCAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgdmlld0JveD0iMCAwIDIw
-        IDIwIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJFYmVuZV8xIj4NCiAgPGRl
-        ZnM+DQogICAgPHN0eWxlPi5jbHMtMXtmaWxsOiM3MDZmNmY7fTwvc3R5bGU+DQogIDwvZGVmcz4NCiAg
-        PHJlY3QgeD0iNi4wNTg2IiB5PSI3LjYwNzUiIHdpZHRoPSI3Ljg4MzgiIGhlaWdodD0iMS41MDgxIiBy
-        eD0iMCIgcnk9IjAiIGNsYXNzPSJjbHMtMSIgLz4NCiAgPHJlY3QgeD0iNi4wNTg2IiB5PSIxMC44ODQ0
-        IiB3aWR0aD0iNy44ODM4IiBoZWlnaHQ9IjEuNTA4MSIgcng9IjAiIHJ5PSIwIiBjbGFzcz0iY2xzLTEi
-        IC8+DQogIDxyZWN0IHg9IjYuMDU4NiIgeT0iMTQuMTYxOSIgd2lkdGg9IjcuODgzOCIgaGVpZ2h0PSIx
-        LjUwODEiIHJ4PSIwIiByeT0iMCIgY2xhc3M9ImNscy0xIiAvPg0KICA8cmVjdCB4PSI2LjA1ODYiIHk9
-        IjQuMzMiIHdpZHRoPSIzLjc3OTMiIGhlaWdodD0iMS41MDgxIiByeD0iMCIgcnk9IjAiIGNsYXNzPSJj
-        bHMtMSIgLz4NCiAgPHBhdGggZD0iTTE3LDE5LjEwNjVIM1YuODkzNWg4Ljc1MUwxNyw2LjE3MVpNNSwx
-        Ny4wOTU2SDE1VjcuMDAzNkwxMC45MjI5LDIuOTA0NEg1WiIgY2xhc3M9ImNscy0xIiAvPg0KPC9zdmc+
-        Cw==
-</value>
-  </data>
-  <data name="buttonZoomIn.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAPMCAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
-        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
-        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
-        Y2U9InByZXNlcnZlIiBpZD0iWm9vbV9JbiIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
-        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsYWNre2ZpbGw6IzcyNzI3Mjt9Cgku
-        Qmx1ZXtmaWxsOiMxMTc3RDc7fQo8L3N0eWxlPg0KICA8cG9seWdvbiBwb2ludHM9IjE4LDEyIDE0LDEy
-        IDE0LDggMTIsOCAxMiwxMiA4LDEyIDgsMTQgMTIsMTQgMTIsMTggMTQsMTggMTQsMTQgMTgsMTQgIiBj
-        bGFzcz0iQmx1ZSIgLz4NCiAgPHBhdGggZD0iTTI5LjcsMjcuM0wyMiwxOS42YzAsMC0wLjEtMC4xLTAu
-        MS0wLjFjMS4zLTEuOCwyLjEtNC4xLDIuMS02LjVjMC02LjEtNC45LTExLTExLTExQzYuOSwyLDIsNi45
-        LDIsMTMgIHM0LjksMTEsMTEsMTFjMi40LDAsNC43LTAuOCw2LjUtMi4xYzAsMCwwLDAuMSwwLjEsMC4x
-        bDcuNyw3LjdjMC4zLDAuMywwLjksMC4zLDEuMiwwbDEuMi0xLjJDMzAuMSwyOC4yLDMwLjEsMjcuNiwy
-        OS43LDI3LjN6ICAgTTQsMTNjMC01LDQtOSw5LTljNSwwLDksNCw5LDlzLTQsOS05LDlDOCwyMiw0LDE4
-        LDQsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQo8L3N2Zz4L
 </value>
   </data>
   <data name="buttonZoomOut.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
         dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAM8CAAAC77u/
         PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
@@ -222,140 +163,86 @@
         LDktOSw5QzgsMjIsNCwxOCw0LDEzeiIgY2xhc3M9IkJsYWNrIiAvPg0KICA8L2c+DQo8L3N2Zz4L
 </value>
   </data>
-  <data name="buttonRotateLeft.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+  <data name="btnPrevHighlight.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
     <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
         LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHIBAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgdmlld0JveD0iMCAwIDIw
-        IDIwIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJFYmVuZV8xIj4NCiAgPGRl
-        ZnM+DQogICAgPHN0eWxlPi5jbHMtMXtmaWxsOiNhNTI0MzE7fTwvc3R5bGU+DQogIDwvZGVmcz4NCiAg
-        PHBhdGggZD0iTTExLjI5MiwxOC42OTh2LTJBNi42OTgsNi42OTgsMCwxLDAsNC41OTM4LDEwaC0yQTgu
-        Njk4Myw4LjY5ODMsMCwxLDEsMTEuMjkyLDE4LjY5OFoiIGNsYXNzPSJjbHMtMSIgLz4NCiAgPHBvbHls
-        aW5lIHBvaW50cz0iMC4wMSAxMCAzLjU2NiAxNC45MjQgNy4xMjIgMTAiIGNsYXNzPSJjbHMtMSIgLz4N
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIQCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs
+        YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy
+        Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl
+        Pg0KICA8ZyBpZD0iQmFja3dhcmQiPg0KICAgIDxwYXRoIGQ9Ik0xNiwyQzguMywyLDIsOC4zLDIsMTZz
+        Ni4zLDE0LDE0LDE0czE0LTYuMywxNC0xNFMyMy43LDIsMTYsMnogTTI0LDE4aC04djZsLTgtOGw4LTh2
+        Nmg4VjE4eiIgY2xhc3M9IkdyZWVuIiAvPg0KICA8L2c+DQo8L3N2Zz4L
+</value>
+  </data>
+  <data name="btnNextHighlight.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIcCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLlJlZHtmaWxsOiNEMTFDMUM7fQoJLkJs
+        YWNre2ZpbGw6IzcyNzI3Mjt9CgkuQmx1ZXtmaWxsOiMxMTc3RDc7fQoJLkdyZWVue2ZpbGw6IzAzOUMy
+        Mzt9CgkuWWVsbG93e2ZpbGw6I0ZGQjExNTt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQoJLnN0MntvcGFjaXR5OjAuMjU7fQo8L3N0eWxl
+        Pg0KICA8ZyBpZD0iRm9yd2FyZF8xXyI+DQogICAgPHBhdGggZD0iTTE2LDJDOC4zLDIsMiw4LjMsMiwx
+        NnM2LjMsMTQsMTQsMTRzMTQtNi4zLDE0LTE0UzIzLjcsMiwxNiwyeiBNMTYsMjR2LTZIOHYtNGg4Vjhs
+        OCw4TDE2LDI0eiIgY2xhc3M9IkdyZWVuIiAvPg0KICA8L2c+DQo8L3N2Zz4L
+</value>
+  </data>
+  <data name="btnSearch.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAFQEAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkdyZWVue2ZpbGw6IzAzOUMyMzt9Cgku
+        QmxhY2t7ZmlsbDojNzI3MjcyO30KCS5SZWR7ZmlsbDojRDExQzFDO30KCS5ZZWxsb3d7ZmlsbDojRkZC
+        MTE1O30KCS5CbHVle2ZpbGw6IzExNzdENzt9CgkuV2hpdGV7ZmlsbDojRkZGRkZGO30KCS5zdDB7b3Bh
+        Y2l0eTowLjU7fQoJLnN0MXtvcGFjaXR5OjAuNzU7fQo8L3N0eWxlPg0KICA8ZyBpZD0iRW5hYmxlU2Vh
+        cmNoIj4NCiAgICA8cGF0aCBkPSJNMTQuNSwxNy44QzEwLjgsMTcuMSw4LDEzLjksOCwxMGMwLTQuNCwz
+        LjYtOCw4LThzOCwzLjYsOCw4YzAsMS41LTAuNCwyLjgtMS4xLDRjMCwwLDAuMSwwLDAuMSwwICAgYzAu
+        NywwLDEuNCwwLjEsMi4xLDAuMmMwLjYtMS4zLDAuOS0yLjcsMC45LTQuMmMwLTUuNS00LjUtMTAtMTAt
+        MTBDMTAuNSwwLDYsNC41LDYsMTBjMCwyLjEsMC43LDQuMSwxLjgsNS43bC03LjUsNy42ICAgYy0wLjQs
+        MC4zLTAuNCwwLjksMCwxLjNsMS4yLDEuMmMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsNy42LTcuNmMwLjks
+        MC42LDEuOSwxLjEsMi45LDEuNEMxMy42LDE5LDE0LDE4LjQsMTQuNSwxNy44eiIgY2xhc3M9IkJsdWUi
+        IC8+DQogICAgPHBhdGggZD0iTTIzLDE2Yy00LjQsMC04LjEsMy05LDdjMC45LDQsNC42LDcsOSw3YzQu
+        NCwwLDguMS0zLDktN0MzMS4xLDE5LDI3LjQsMTYsMjMsMTZ6IE0yMywyOGMtMy4zLDAtNi4xLTItNy01
+        ICAgYzAuOS0zLDMuNy01LDctNXM2LjEsMiw3LDVDMjkuMSwyNiwyNi4zLDI4LDIzLDI4eiBNMjMsMjZj
+        LTEuNywwLTMtMS4zLTMtM3MxLjMtMywzLTNzMywxLjMsMywzUzI0LjcsMjYsMjMsMjZ6IiBjbGFzcz0i
+        QmxhY2siIC8+DQogIDwvZz4NCjwvc3ZnPgs=
+</value>
+  </data>
+  <data name="btnSearch2.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
+    <value>
+        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIxLjIsIFZlcnNpb249MjEuMi40
+        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
+        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANoCAAAC77u/
+        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgeD0iMHB4IiB5PSIwcHgi
+        IHZpZXdCb3g9IjAgMCAzMiAzMiIgdmVyc2lvbj0iMS4xIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcv
+        MjAwMC9zdmciIHhtbG5zOnhsaW5rPSJodHRwOi8vd3d3LnczLm9yZy8xOTk5L3hsaW5rIiB4bWw6c3Bh
+        Y2U9InByZXNlcnZlIiBpZD0iTGF5ZXJfMSIgc3R5bGU9ImVuYWJsZS1iYWNrZ3JvdW5kOm5ldyAwIDAg
+        MzIgMzIiPg0KICA8c3R5bGUgdHlwZT0idGV4dC9jc3MiPgoJLkJsdWV7ZmlsbDojMTE3N0Q3O30KCS5Z
+        ZWxsb3d7ZmlsbDojRkZCMTE1O30KCS5CbGFja3tmaWxsOiM3MjcyNzI7fQoJLkdyZWVue2ZpbGw6IzAz
+        OUMyMzt9CgkuUmVke2ZpbGw6I0QxMUMxQzt9Cgkuc3Qwe29wYWNpdHk6MC43NTt9Cgkuc3Qxe29wYWNp
+        dHk6MC41O30KPC9zdHlsZT4NCiAgPGcgaWQ9Ilpvb20iPg0KICAgIDxwYXRoIGQ9Ik0yNy43LDI1LjNM
+        MjAuNSwxOGMxLTEuNCwxLjUtMy4yLDEuNS01YzAtNS00LTktOS05cy05LDQtOSw5YzAsNSw0LDksOSw5
+        YzEuOSwwLDMuNi0wLjYsNS0xLjVsNy4zLDcuMyAgIGMwLjMsMC4zLDAuOSwwLjMsMS4yLDBsMS4yLTEu
+        MkMyOC4xLDI2LjIsMjguMSwyNS42LDI3LjcsMjUuM3ogTTYsMTNjMC0zLjksMy4xLTcsNy03czcsMy4x
+        LDcsN2MwLDMuOS0zLjEsNy03LDdTNiwxNi45LDYsMTN6IiBjbGFzcz0iQmxhY2siIC8+DQogIDwvZz4N
         Cjwvc3ZnPgs=
-</value>
-  </data>
-  <data name="buttonRotateRight.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAHMBAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgdmlld0JveD0iMCAwIDIw
-        IDIwIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJFYmVuZV8xIj4NCiAgPGRl
-        ZnM+DQogICAgPHN0eWxlPi5jbHMtMXtmaWxsOiNhNTI0MzE7fTwvc3R5bGU+DQogIDwvZGVmcz4NCiAg
-        PHBhdGggZD0iTTguNzA4LDE4LjY5OHYtMkE2LjY5OCw2LjY5OCwwLDEsMSwxNS40MDYyLDEwaDJBOC42
-        OTgzLDguNjk4MywwLDEsMCw4LjcwOCwxOC42OThaIiBjbGFzcz0iY2xzLTEiIC8+DQogIDxwb2x5bGlu
-        ZSBwb2ludHM9IjE5Ljk5IDEwIDE2LjQzNCAxNC45MjQgMTIuODc4IDEwIiBjbGFzcz0iY2xzLTEiIC8+
-        DQo8L3N2Zz4L
-</value>
-  </data>
-  <data name="buttonFlipX.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIIBAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgdmlld0JveD0iMCAwIDIw
-        IDIwIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJFYmVuZV8xIj4NCiAgPGRl
-        ZnM+DQogICAgPHN0eWxlPi5jbHMtMXtmaWxsOiNhNTI0MzE7fS5jbHMtMntmaWxsOiM2NDYzNjM7fTwv
-        c3R5bGU+DQogIDwvZGVmcz4NCiAgPHJlY3QgeD0iMi45ODk3IiB5PSIyLjk5MDEiIHdpZHRoPSI3LjAx
-        MDMiIGhlaWdodD0iMTQuMDIiIHJ4PSIwIiByeT0iMCIgY2xhc3M9ImNscy0xIiAvPg0KICA8cGF0aCBk
-        PSJNMTkuMDEsMTkuMDFILjk5Vi45OUgxOS4wMVpNMi45OSwxNy4wMUgxNy4wMVYyLjk5SDIuOTlaIiBj
-        bGFzcz0iY2xzLTIiIC8+DQo8L3N2Zz4L
-</value>
-  </data>
-  <data name="buttonFlipY.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAIABAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgdmlld0JveD0iMCAwIDIw
-        IDIwIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJFYmVuZV8xIj4NCiAgPGRl
-        ZnM+DQogICAgPHN0eWxlPi5jbHMtMXtmaWxsOiNhNTI0MzE7fS5jbHMtMntmaWxsOiM2NDYzNjM7fTwv
-        c3R5bGU+DQogIDwvZGVmcz4NCiAgPHJlY3QgeD0iMi45ODk3IiB5PSIyLjk5IiB3aWR0aD0iMTQuMDIw
-        NSIgaGVpZ2h0PSI3LjAxIiByeD0iMCIgcnk9IjAiIGNsYXNzPSJjbHMtMSIgLz4NCiAgPHBhdGggZD0i
-        TTE5LjAxLDE5LjAxSC45OVYuOTlIMTkuMDFaTTIuOTksMTcuMDFIMTcuMDFWMi45OUgyLjk5WiIgY2xh
-        c3M9ImNscy0yIiAvPg0KPC9zdmc+Cw==
-</value>
-  </data>
-  <data name="buttonFirstPage.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAANUBAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgdmlld0JveD0iMCAwIDIw
-        IDIwIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJFYmVuZV8xIj4NCiAgPGRl
-        ZnM+DQogICAgPHN0eWxlPi5jbHMtMXtmaWxsOiNhNTI0MzE7fTwvc3R5bGU+DQogIDwvZGVmcz4NCiAg
-        PHBhdGggZD0iTTIwLDIwLDYuNjY2NywxMC4wMDA3LDIwLDBaIiBjbGFzcz0iY2xzLTEiIC8+DQogIDxw
-        YXRoIGQ9Ik0xMy4zMzMzLDE1VjVsLTYuNjY2Niw1WiIgY2xhc3M9ImNscy0xIiAvPg0KICA8cG9seWdv
-        biBwb2ludHM9IjEyLjYzIDE2LjQwNSA1Ljk2MyAxMS40MDUgNC4wOTEgMTAuMDAxIDUuOTYzIDguNTk2
-        IDEyLjYzIDMuNTk2IDEzLjMzMyAzLjA2OCAxMy4zMzMgMCAwIDEwLjAwMSAxMy4zMzMgMjAgMTMuMzMz
-        IDE2LjkzMiAxMi42MyAxNi40MDUiIGNsYXNzPSJjbHMtMSIgLz4NCjwvc3ZnPgs=
-</value>
-  </data>
-  <data name="buttonPrevPage.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAP8AAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgdmlld0JveD0iMCAwIDIw
-        IDIwIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJFYmVuZV8xIj4NCiAgPGRl
-        ZnM+DQogICAgPHN0eWxlPi5jbHMtMXtmaWxsOiNhNTI0MzE7fTwvc3R5bGU+DQogIDwvZGVmcz4NCiAg
-        PHBhdGggZD0iTTE2LjY2NjcsMjAsMy4zMzMzLDEwLjAwMDcsMTYuNjY2NywwWiIgY2xhc3M9ImNscy0x
-        IiAvPg0KPC9zdmc+Cw==
-</value>
-  </data>
-  <data name="buttonNextPage.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAP0AAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgdmlld0JveD0iMCAwIDIw
-        IDIwIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJFYmVuZV8xIj4NCiAgPGRl
-        ZnM+DQogICAgPHN0eWxlPi5jbHMtMXtmaWxsOiNhNTI0MzE7fTwvc3R5bGU+DQogIDwvZGVmcz4NCiAg
-        PHBhdGggZD0iTTMuMzMzMywyMGwxMy4zMzM0LTkuOTk5M0wzLjMzMzMsMFoiIGNsYXNzPSJjbHMtMSIg
-        Lz4NCjwvc3ZnPgs=
-</value>
-  </data>
-  <data name="buttonLastPage.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAM4BAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgdmlld0JveD0iMCAwIDIw
-        IDIwIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJFYmVuZV8xIj4NCiAgPGRl
-        ZnM+DQogICAgPHN0eWxlPi5jbHMtMXtmaWxsOiNhNTI0MzE7fTwvc3R5bGU+DQogIDwvZGVmcz4NCiAg
-        PHBhdGggZD0iTTAsMjBsMTMuMzMzMy05Ljk5OTNMMCwwWiIgY2xhc3M9ImNscy0xIiAvPg0KICA8cGF0
-        aCBkPSJNNi42NjY3LDE1VjVsNi42NjY2LDVaIiBjbGFzcz0iY2xzLTEiIC8+DQogIDxwb2x5Z29uIHBv
-        aW50cz0iNy4zNyAxNi40MDUgMTQuMDM3IDExLjQwNSAxNS45MDkgMTAuMDAxIDE0LjAzNyA4LjU5NiA3
-        LjM3IDMuNTk2IDYuNjY3IDMuMDY4IDYuNjY3IDAgMjAgMTAuMDAxIDYuNjY3IDIwIDYuNjY3IDE2Ljkz
-        MiA3LjM3IDE2LjQwNSIgY2xhc3M9ImNscy0xIiAvPg0KPC9zdmc+Cw==
-</value>
-  </data>
-  <data name="buttonSettings.ImageOptions.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
-    <value>
-        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjE5LjIsIFZlcnNpb249MTkuMi4z
-        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl
-        dkV4cHJlc3MuVXRpbHMuU3ZnLlN2Z0ltYWdlAQAAAAREYXRhBwICAAAACQMAAAAPAwAAAGQEAAAC77u/
-        PD94bWwgdmVyc2lvbj0nMS4wJyBlbmNvZGluZz0nVVRGLTgnPz4NCjxzdmcgdmlld0JveD0iMCAwIDIw
-        IDIwIiB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIGlkPSJFYmVuZV8xIj4NCiAgPGRl
-        ZnM+DQogICAgPHN0eWxlPi5jbHMtMXtmaWxsOiNhNTI0MzE7fTwvc3R5bGU+DQogIDwvZGVmcz4NCiAg
-        PHBhdGggZD0iTTE5LjY5NDEsMTAuOTM3M0E3Ljc5NjcsNy43OTY3LDAsMCwwLDE5Ljc0MzUsMTBhNy43
-        OTczLDcuNzk3MywwLDAsMC0uMDQ5NC0uOTM3NEwxNi44NDUyLDguMDM5YTcuMDYsNy4wNiwwLDAsMC0u
-        NjI5MS0xLjUwNDhsMS4yOTUxLTIuNzI1NmE4Ljk4OTMsOC45ODkzLDAsMCwwLTEuMzItMS4zMzIxbC0y
-        LjcyNTcsMS4yOTVhNy4zOSw3LjM5LDAsMCwwLTEuNTE3LS42MTY2TDEwLjkzNzQuMzA1OEE3LjgxOTIs
-        Ny44MTkyLDAsMCwwLDEwLC4yNTY1YTcuODE5Miw3LjgxOTIsMCwwLDAtLjkzNzQuMDQ5M0w4LjA1MTIs
-        My4xNTQ5YTcuMzksNy4zOSwwLDAsMC0xLjUxNy42MTY2TDMuODA4NSwyLjQ3NjVhOC45ODkzLDguOTg5
-        MywwLDAsMC0xLjMyLDEuMzMyMUwzLjc4MzksNi41MzQyQTYuNDgwNiw2LjQ4MDYsMCwwLDAsMy4xNTQ4
-        LDguMDM5TC4zMDU5LDkuMDYyNkE3Ljc5NzMsNy43OTczLDAsMCwwLC4yNTY1LDEwYTcuNzk2Nyw3Ljc5
-        NjcsMCwwLDAsLjA0OTQuOTM3M2wyLjg0ODksMS4wMTE0YTYuNDc5MSw2LjQ3OTEsMCwwLDAsLjYyOTEs
-        MS41MDQ2TDIuNDg4OCwxNi4xOTE0YTkuNTQ3Miw5LjU0NzIsMCwwLDAsMS4zMiwxLjMybDIuNzI1Ny0x
-        LjI5NWE4LjIwMTQsOC4yMDE0LDAsMCwwLDEuNTE3LjYyOWwxLjAxMTQsMi44NDlBNy44MTksNy44MTks
-        MCwwLDAsMTAsMTkuNzQzNWE3LjgxOSw3LjgxOSwwLDAsMCwuOTM3NC0uMDQ5NGwxLjAxMTQtMi44NDlh
-        OC4yMDE0LDguMjAxNCwwLDAsMCwxLjUxNy0uNjI5bDIuNzI1NywxLjI5NWE5LjU0NzIsOS41NDcyLDAs
-        MCwwLDEuMzItMS4zMmwtMS4yOTUxLTIuNzM4MWE3LjA1NzksNy4wNTc5LDAsMCwwLC42MjkxLTEuNTA0
-        NlpNMTAsMTQuMTNBNC4xMzMxLDQuMTMzMSwwLDEsMSwxNC4xMzMxLDkuOTk3LDQuMTMzMiw0LjEzMzIs
-        MCwwLDEsMTAsMTQuMTNaIiBjbGFzcz0iY2xzLTEiIC8+DQo8L3N2Zz4L
 </value>
   </data>
   <metadata name="PrintDocument1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">

Controls.DocumentViewer/DocumentViewer.vb

@@ -1,11 +1,7 @@
 Imports System.IO
-Imports System.ComponentModel
-Imports System.Globalization
-Imports System.Text.RegularExpressions
 Imports DevExpress
 Imports DevExpress.Spreadsheet
 Imports DevExpress.XtraRichEdit.Commands
-Imports DevExpress.XtraRichEdit
 Imports DevExpress.Office.Utils
 Imports GdPicture14
 Imports DigitalData.Modules.Logging
@@ -30,19 +26,39 @@ Public Class DocumentViewer
         Excel
     End Enum
 
-    Private _ViewerMode As ViewerMode
-    Private _currentSearchOccurence As Integer = 0
-    Private _toggleGamma As Boolean = True
-    Private _licenseKey As String = String.Empty
-    Private _licenseManager As New GdPicture14.LicenseManager()
+    Private Enum FileLoadMode
+        File
+        Stream
+    End Enum
+
+    Public ReadOnly Property PdfViewer As GdViewer
+        Get
+            Return GdViewer
+        End Get
+    End Property
+
     Private _logConfig As LogConfig
     Private _logger As Logger
-    Private _email As Email2
     Private _Config As ConfigManager(Of Config)
+    Private _email As Email2
+
+    Private _ViewerMode As ViewerMode
+
+    Private _licenseKey As String = String.Empty
+    Private _licenseManager As New GdPicture14.LicenseManager()
+
+    Private _Search As Search
+    Private _Annotations As Annotations
+    Private _AnnotationsPending As Boolean = False
+
+    Private _ToolbarSettings As New ToolbarSettings
 
     Private _hide_file_info_from_user As Boolean = False
+
+    Private _FileStream As Stream
     Private _FilePath As String
-    Private _Fileinfo As FileInfo
+    Private _FileInfo As FileInfo
+    Private _FileLoadMode As FileLoadMode = FileLoadMode.File
 
     ' List of all created temp files when converting msg files
     Private _TempFiles As New List(Of String)
@@ -51,28 +67,96 @@ Public Class DocumentViewer
         UpdateMainUi()
     End Sub
 
+    Public Class ToolbarSettings
+        Public Property ShowPrintButton As Boolean = True
+        Public Property ShowFitWidthButton As Boolean = True
+        Public Property ShowFitPageButton As Boolean = True
+        Public Property ShowZoomButton As Boolean = True
+        Public Property ShowRotateButton As Boolean = True
+        Public Property ShowFlipButton As Boolean = True
+        Public Property ShowSearchButton As Boolean = True
+        Public Property ShowSettingButton As Boolean = True
+    End Class
 
     Public Property FileLoaded As Boolean = False
+    Public ReadOnly Property AnnotationsSaved As Boolean
+        Get
+            Return Not _AnnotationsPending
+        End Get
+    End Property
 
     ''' <summary>
     ''' Initialize the Viewer
     ''' </summary>
     ''' <param name="pLogConfig">A LogConfig object</param>
     ''' <param name="pLicenseKey">The GDPicture.NET License Key</param>
-    Public Sub Init(pLogConfig As LogConfig, pLicenseKey As String)
+    Public Sub Init(pLogConfig As LogConfig, pLicenseKey As String, pToolbarSettings As ToolbarSettings)
         _logConfig = pLogConfig
         _logger = pLogConfig.GetLogger()
         _email = New Email2(pLogConfig)
         _licenseKey = pLicenseKey
         _licenseManager.RegisterKEY(_licenseKey)
+        _Annotations = New Annotations(pLogConfig)
+        _Search = New Search(pLogConfig, GdViewer)
+        _ToolbarSettings = pToolbarSettings
 
         Dim oConfigPath = ConfigPath()
         _Config = New ConfigManager(Of Config)(pLogConfig, oConfigPath)
     End Sub
 
-    Private Function ConfigPath() As String
-        Return Path.Combine(Application.UserAppDataPath, "DocumentViewer")
-    End Function
+    Public Sub Init(pLogConfig As LogConfig, pLicenseKey As String)
+        Init(pLogConfig, pLicenseKey, New ToolbarSettings())
+    End Sub
+
+    ''' <summary>
+    ''' Load a file from a path and display it
+    ''' </summary>
+    Public Sub LoadFile(FilePath As String)
+        FileLoaded = False
+
+        If _licenseKey = String.Empty Then
+            _logger.Warn("License key was not provided. File {0} not loaded.", FilePath)
+            Exit Sub
+        End If
+
+        If FilePath Is Nothing OrElse FilePath.Trim().Length = 0 Then
+            _logger.Warn("FilePath was not provided. File not loaded.")
+            Exit Sub
+        End If
+
+        _FilePath = FilePath
+        _FileLoadMode = FileLoadMode.File
+        _FileInfo = New FileInfo(FilePath)
+
+        _logger.Info("Loading File [{0}] from Filesystem", FilePath)
+        FileLoaded = DoLoadFile(FilePath)
+
+        SetViewerMode(_FileInfo.Extension)
+        UpdateMainUi()
+    End Sub
+
+    ''' <summary>
+    ''' Load a file from a stream and display it
+    ''' </summary>
+    Public Sub LoadFile(FileName As String, Stream As Stream)
+        FileLoaded = False
+
+        If _licenseKey = String.Empty Then
+            _logger.Warn("License key was not provided. File [{0}] not loaded.", FileName)
+            Exit Sub
+        End If
+
+        Dim oExtension As String = FileName.Substring(FileName.LastIndexOf("."))
+
+        _FileStream = Stream
+        _FileLoadMode = FileLoadMode.Stream
+
+        _logger.Info("Loading file [{0}] from Stream", FileName)
+        FileLoaded = DoLoadFile(Stream, oExtension)
+
+        SetViewerMode(oExtension)
+        UpdateMainUi()
+    End Sub
 
     ''' <summary>
     ''' Terminate Viewer, freeing up resources and deleting temp files
@@ -93,255 +177,55 @@ Public Class DocumentViewer
         End Try
     End Sub
 
-    ''' <summary>
-    ''' Load a file and display it
-    ''' </summary>
-    ''' <param name="FilePath"></param>
-    Public Sub LoadFile(FilePath As String)
-        FileLoaded = False
+    Public Function AddAnnotation(pText As String) As Boolean
+        Dim oFontStyle = FontStyle.Regular
+        Dim oFontColor = Color.Black
+        Dim oFontFamily = "Arial"
+        Dim oFontSize = 8
+        Dim oBorderColor = Color.Red
+        Dim oBackColor = Color.LightYellow
+        Dim oOpacity = 1.0F
+        Dim oRotation = 0.0F
 
-        If _licenseKey = String.Empty Then
-            _logger.Warn("License key was not provided. File {0} not loaded.", FilePath)
-            Exit Sub
+        GdViewer.AddTextAnnotationInteractive(pText, oFontColor, oFontFamily, oFontStyle, oFontSize, Fill:=True, oBorderColor, oBackColor, oOpacity, oRotation)
+        _AnnotationsPending = True
+
+        Return True
+    End Function
+
+    Public Function Save() As Boolean
+        Dim oSaveResult As GdPictureStatus = GdPictureStatus.OK
+
+        If GdViewer.BurnAnnotationsToPage(True, False) = GdPictureStatus.OK Then
+            If _FileLoadMode = FileLoadMode.Stream Then
+                oSaveResult = GdViewer.SaveDocumentToPDF(_FileStream)
+            Else
+                oSaveResult = GdViewer.SaveDocumentToPDF(_FilePath)
+            End If
         End If
 
-        If FilePath Is Nothing OrElse FilePath.Trim().Length = 0 Then
-            _logger.Warn("FilePath was not provided. File not loaded.")
-            Exit Sub
+        If oSaveResult = GdPictureStatus.OK Then
+            _AnnotationsPending = False
+            Return True
+        Else
+            Return False
         End If
-
-        _logger.Info("Loading File {0}", FilePath)
-
-        FileLoaded = DoLoadFile(FilePath)
-        _FilePath = FilePath
-        _Fileinfo = New FileInfo(FilePath)
-
-        SetViewerMode(_Fileinfo.Extension)
-        UpdateMainUi()
-    End Sub
-
-    Public Sub LoadFile(FileName As String, Stream As Stream)
-        FileLoaded = False
-
-        If _licenseKey = String.Empty Then
-            _logger.Warn("License key was not provided. File [{0}] not loaded.", FileName)
-            Exit Sub
-        End If
-
-        Dim oExtension As String = FileName.Substring(FileName.LastIndexOf("."))
-
-        _logger.Info("Loading File [{0}]", FileName)
-
-        FileLoaded = DoLoadFile(Stream, oExtension)
-
-        SetViewerMode(oExtension)
-        UpdateMainUi()
-    End Sub
+    End Function
 
     Public Sub CloseDocument()
         Try
             GdViewer.CloseDocument()
+
+            _FileInfo = Nothing
+            _FilePath = Nothing
+            _FileStream = Nothing
+
             UpdateMainUi()
         Catch ex As Exception
             _logger.Error(ex)
         End Try
     End Sub
 
-    Public Sub DeleteTempFiles()
-        For Each oFile In _TempFiles
-            Try
-                _logger.Debug("Deleting temp file [{0}]", oFile)
-                File.Delete(oFile)
-            Catch ex As Exception
-                _logger.Warn("Could not delete temp file [{0}]", oFile)
-            End Try
-        Next
-    End Sub
-
-    Private Sub SetViewerMode(Extension As String)
-        Select Case Extension.ToUpper
-            Case ".MSG"
-                _ViewerMode = ViewerMode.RichText
-            Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
-                _ViewerMode = ViewerMode.RichText
-            Case ".XLSX", ".XLS", "CSV"
-                _ViewerMode = ViewerMode.Excel
-            Case Else
-                _ViewerMode = ViewerMode.GDPicture
-        End Select
-    End Sub
-
-
-    Private Sub FreeFile()
-        Try
-            If Len(_FilePath) = 0 OrElse _Fileinfo Is Nothing Then
-                Exit Sub
-            End If
-            Dim oExtension As String = _Fileinfo.Extension.ToUpper
-            Select Case _ViewerMode
-                Case ViewerMode.RichText
-                    _logger.Debug("Closing RichText Editor")
-                    RichEditControl1.CreateNewDocument()
-
-                Case ViewerMode.Excel
-                    _logger.Debug("Closing Excel Editor")
-                    SpreadsheetControl1.CreateNewDocument()
-
-                Case Else
-                    _logger.Debug("Closing GDPicture Viewer")
-                    GdViewer.CloseDocument()
-
-            End Select
-        Catch ex As Exception
-            _logger.Warn($"Unexpected error in FreeFile: {ex.Message}")
-        End Try
-    End Sub
-    Private Function DoLoadFile(FilePath As String) As Boolean
-        Try
-            Dim oFileInfo = New FileInfo(FilePath)
-            Dim oExtension As String = oFileInfo.Extension.ToUpper
-
-            RichEditControl1.Visible = False
-            RichEditControl1.Dock = DockStyle.None
-
-            SpreadsheetControl1.Visible = False
-            SpreadsheetControl1.Dock = DockStyle.None
-
-            Select Case oExtension.ToUpper
-                Case ".MSG"
-                    Dim oEmlPath As String = _email.Convert_ToEml(FilePath)
-                    _TempFiles.Add(oEmlPath)
-                    DoLoadFile(oEmlPath)
-
-                Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
-                    RichEditControl1.LoadDocument(FilePath, GetDocumentFormat(oExtension))
-
-                    RichEditControl1.Visible = True
-                    RichEditControl1.Dock = DockStyle.Fill
-
-                Case ".XLSX", ".XLS", ".CSV"
-                    Dim oFormat = GetSpreadsheetFormat(oExtension)
-                    SpreadsheetControl1.LoadDocument(FilePath, oFormat)
-
-                    Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
-                    oRange.AutoFitColumns()
-
-                    SpreadsheetControl1.Visible = True
-                    SpreadsheetControl1.Dock = DockStyle.Fill
-
-                Case Else
-                    'ToolbarDocumentViewer.Visible = True
-
-                    GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
-                    GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
-
-                    GdViewer.DisplayFromFile(FilePath)
-            End Select
-
-            UpdateMainUi()
-
-            Return True
-        Catch ex As Exception
-            _logger.Error(ex)
-            Return False
-        End Try
-    End Function
-
-    Private Function DoLoadFile(Stream As Stream, Extension As String) As Boolean
-        Try
-            RichEditControl1.Visible = False
-            RichEditControl1.Dock = DockStyle.None
-
-            SpreadsheetControl1.Visible = False
-            SpreadsheetControl1.Dock = DockStyle.None
-
-            Select Case Extension.ToUpper
-                Case ".MSG"
-
-                    Dim oTempFileName = Path.Combine(IO.Path.GetTempPath(), Guid.NewGuid.ToString & ".msg")
-                    Using oFileStream As New FileStream(oTempFileName, FileMode.Create)
-                        Stream.Seek(0, SeekOrigin.Begin)
-                        Stream.CopyTo(oFileStream)
-                        Stream.Flush()
-                    End Using
-
-                    Dim oEmlPath As String = _email.Convert_ToEml(oTempFileName)
-                    DoLoadFile(oEmlPath)
-
-                Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
-                    RichEditControl1.LoadDocument(Stream, GetDocumentFormat(Extension))
-
-                    RichEditControl1.ActiveViewType = XtraRichEdit.RichEditViewType.PrintLayout
-                    RichEditControl1.Visible = True
-                    RichEditControl1.Dock = DockStyle.Fill
-
-                Case ".XLSX", ".XLS", ".CSV"
-                    SpreadsheetControl1.LoadDocument(Stream, GetSpreadsheetFormat(Extension))
-
-                    Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
-                    oRange.AutoFitColumns()
-
-                    SpreadsheetControl1.Visible = True
-                    SpreadsheetControl1.Dock = DockStyle.Fill
-
-                Case Else
-                    'ToolbarDocumentViewer.Visible = True
-
-                    GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
-                    GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
-
-                    GdViewer.DisplayFromStream(Stream)
-            End Select
-
-            UpdateMainUi()
-
-            Return True
-        Catch ex As Exception
-            _logger.Error(ex)
-            Return False
-        End Try
-    End Function
-
-    Private Function GetSpreadsheetFormat(Extension) As Spreadsheet.DocumentFormat
-        Dim oFormat As Spreadsheet.DocumentFormat = Spreadsheet.DocumentFormat.Undefined
-
-        Select Case Extension.ToUpper
-            Case ".XLSX" : oFormat = Spreadsheet.DocumentFormat.Xlsx
-            Case ".XLS" : oFormat = Spreadsheet.DocumentFormat.Xls
-            Case ".CSV" : oFormat = Spreadsheet.DocumentFormat.Csv
-        End Select
-
-        Return oFormat
-    End Function
-
-    Private Function GetDocumentFormat(Extension) As XtraRichEdit.DocumentFormat
-        Dim oFormat As XtraRichEdit.DocumentFormat = XtraRichEdit.DocumentFormat.Undefined
-
-        Select Case Extension.ToUpper
-            Case ".EML" : oFormat = XtraRichEdit.DocumentFormat.Mht
-            Case ".DOC" : oFormat = XtraRichEdit.DocumentFormat.Doc
-            Case ".DOCX" : oFormat = XtraRichEdit.DocumentFormat.OpenXml
-            Case ".ODT" : oFormat = XtraRichEdit.DocumentFormat.OpenDocument
-            Case ".RTF" : oFormat = XtraRichEdit.DocumentFormat.Rtf
-            Case ".TXT" : oFormat = XtraRichEdit.DocumentFormat.PlainText
-        End Select
-
-        Return oFormat
-    End Function
-
-
-    Private Sub btnOpen_Click(sender As Object, e As EventArgs)
-        GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
-        GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
-
-        If OpenFileDialog.ShowDialog() = DialogResult.OK Then
-            GdViewer.DisplayFromFile(OpenFileDialog.FileName)
-        End If
-
-        GdViewer.Focus()
-        UpdateMainUi()
-    End Sub
-
     ''' <summary>
     ''' Configures the viewer to hide the file path to the end-user.
     ''' </summary>
@@ -377,74 +261,41 @@ Public Class DocumentViewer
         SetViewOnly(ViewOnly)
     End Sub
 
-    Private Sub UpdateMainUi()
 
-        Select Case _Config?.Config?.PageFit
-            Case Config.PageFitSetting.FitPage
-                FitToPage()
 
-            Case Config.PageFitSetting.FitWidth
-                FitToWidth()
 
-        End Select
 
-        Select Case _ViewerMode
-            Case ViewerMode.GDPicture
-                buttonPrint.Enabled = True
-                buttonFitWidth.Enabled = True
-                buttonFitPage.Enabled = True
-                buttonZoomIn.Enabled = True
-                buttonZoomOut.Enabled = True
-                buttonRotateLeft.Enabled = True
-                buttonRotateRight.Enabled = True
-                buttonFlipX.Enabled = True
-                buttonFlipY.Enabled = True
-                buttonFirstPage.Enabled = True
-                buttonPrevPage.Enabled = True
-                buttonNextPage.Enabled = True
-                buttonLastPage.Enabled = True
-                buttonSettings.Enabled = True
-                txtCurrentPage.Enabled = True
-
-            Case ViewerMode.RichText
-                buttonFitPage.Enabled = True
-                buttonZoomIn.Enabled = True
-                buttonZoomOut.Enabled = True
-                buttonFitWidth.Enabled = True
-                buttonNextPage.Enabled = True
-                buttonPrevPage.Enabled = True
-
-                buttonPrint.Enabled = False
-                buttonRotateLeft.Enabled = False
-                buttonRotateRight.Enabled = False
-                buttonFlipX.Enabled = False
-                buttonFlipY.Enabled = False
-                buttonFirstPage.Enabled = False
-                buttonLastPage.Enabled = False
-                buttonSettings.Enabled = False
-                txtCurrentPage.Enabled = False
-
-            Case ViewerMode.Excel
-                buttonPrint.Enabled = False
-                buttonFitWidth.Enabled = False
-                buttonFitPage.Enabled = False
-                buttonZoomIn.Enabled = False
-                buttonZoomOut.Enabled = False
-                buttonRotateLeft.Enabled = False
-                buttonRotateRight.Enabled = False
-                buttonFlipX.Enabled = False
-                buttonFlipY.Enabled = False
-                buttonFirstPage.Enabled = False
-                buttonPrevPage.Enabled = False
-                buttonNextPage.Enabled = False
-                buttonLastPage.Enabled = False
-                buttonSettings.Enabled = False
-                txtCurrentPage.Enabled = False
-
-        End Select
+#Region "Form Events"
 
+    Private Sub btnFitWidth_Click(ByVal sender As Object, ByVal e As EventArgs) Handles buttonFitWidth.ItemClick
+        FitToWidth()
+        _Config.Config.PageFit = Config.PageFitSetting.FitWidth
+        _Config.Save()
     End Sub
 
+    Private Sub btnFitPage_Click(ByVal sender As Object, ByVal e As EventArgs) Handles buttonFitPage.ItemClick
+        FitToPage()
+        _Config.Config.PageFit = Config.PageFitSetting.FitPage
+        _Config.Save()
+    End Sub
+
+    Private Sub RichEditControl1_SizeChanged(sender As Object, e As EventArgs) Handles RichEditControl1.SizeChanged
+        Dim oControlWidth = RichEditControl1.Width - 100
+        Dim oPageWidth = Units.DocumentsToPixelsF(RichEditControl1.Document.Sections(0).Page.Width, RichEditControl1.DpiX)
+        RichEditControl1.Views.PrintLayoutView.ZoomFactor = oControlWidth / oPageWidth
+    End Sub
+
+    Private Sub btnOpen_Click(sender As Object, e As EventArgs)
+        GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
+        GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
+
+        If OpenFileDialog.ShowDialog() = DialogResult.OK Then
+            GdViewer.DisplayFromFile(OpenFileDialog.FileName)
+        End If
+
+        GdViewer.Focus()
+        UpdateMainUi()
+    End Sub
     Private Sub btnFirstPage_Click(ByVal sender As System.Object, ByVal e As EventArgs) Handles buttonFirstPage.ItemClick
         GdViewer.DisplayFirstPage()
     End Sub
@@ -553,6 +404,12 @@ Public Class DocumentViewer
         End Using
         UpdateaNavigationToolbar()
     End Sub
+#End Region
+
+#Region "Private Functions"
+    Private Function ConfigPath() As String
+        Return Path.Combine(Application.UserAppDataPath, "DocumentViewer")
+    End Function
 
     Private Sub UpdateaNavigationToolbar()
         Try
@@ -583,17 +440,113 @@ Public Class DocumentViewer
         End Try
     End Sub
 
-    Private Sub btnFitWidth_Click(ByVal sender As Object, ByVal e As EventArgs) Handles buttonFitWidth.ItemClick
-        FitToWidth()
-        _Config.Config.PageFit = Config.PageFitSetting.FitWidth
-        _Config.Save()
+    Public Sub DeleteTempFiles()
+        For Each oFile In _TempFiles
+            Try
+                _logger.Debug("Deleting temp file [{0}]", oFile)
+                File.Delete(oFile)
+            Catch ex As Exception
+                _logger.Warn("Could not delete temp file [{0}]", oFile)
+            End Try
+        Next
     End Sub
 
-    Private Sub btnFitPage_Click(ByVal sender As Object, ByVal e As EventArgs) Handles buttonFitPage.ItemClick
-        FitToPage()
-        _Config.Config.PageFit = Config.PageFitSetting.FitPage
-        _Config.Save()
+    Private Sub SetViewerMode(Extension As String)
+        Select Case Extension.ToUpper
+            Case ".MSG"
+                _ViewerMode = ViewerMode.RichText
+            Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
+                _ViewerMode = ViewerMode.RichText
+            Case ".XLSX", ".XLS", "CSV"
+                _ViewerMode = ViewerMode.Excel
+            Case Else
+                _ViewerMode = ViewerMode.GDPicture
+        End Select
     End Sub
+    Private Sub FreeFile()
+        Try
+            If Len(_FilePath) = 0 OrElse _FileInfo Is Nothing Then
+                Exit Sub
+            End If
+            Dim oExtension As String = _FileInfo.Extension.ToUpper
+            Select Case _ViewerMode
+                Case ViewerMode.RichText
+                    _logger.Debug("Closing RichText Editor")
+                    RichEditControl1.CreateNewDocument()
+
+                Case ViewerMode.Excel
+                    _logger.Debug("Closing Excel Editor")
+                    SpreadsheetControl1.CreateNewDocument()
+
+                Case Else
+                    _logger.Debug("Closing GDPicture Viewer")
+                    GdViewer.CloseDocument()
+
+            End Select
+        Catch ex As Exception
+            _logger.Warn($"Unexpected error in FreeFile: {ex.Message}")
+        End Try
+    End Sub
+    Private Function DoLoadFile(FilePath As String) As Boolean
+        Try
+            _logger.Debug($"Starting DoLoadFile with [{FilePath}] ...")
+            Dim oFileInfo = New FileInfo(FilePath)
+            Dim oExtension As String = oFileInfo.Extension.ToUpper
+
+            lbFileNotLoaded.Visible = False
+
+            RichEditControl1.Visible = False
+            RichEditControl1.Dock = DockStyle.None
+
+            SpreadsheetControl1.Visible = False
+            SpreadsheetControl1.Dock = DockStyle.None
+
+            Select Case oExtension.ToUpper
+                Case ".MSG"
+                    'msg is converted to eml and then displayed in GDPicture
+                    Dim oEmlPath As String = _email.Convert_ToEml(FilePath)
+                    _TempFiles.Add(oEmlPath)
+                    DoLoadFile(oEmlPath)
+
+                Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
+                    RichEditControl1.LoadDocument(FilePath, GetDocumentFormat(oExtension))
+
+                    RichEditControl1.Visible = True
+                    RichEditControl1.Dock = DockStyle.Fill
+
+                Case ".XLSX", ".XLS", ".CSV"
+                    Dim oFormat = GetSpreadsheetFormat(oExtension)
+                    SpreadsheetControl1.LoadDocument(FilePath, oFormat)
+
+                    Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
+                    oRange.AutoFitColumns()
+
+                    SpreadsheetControl1.Visible = True
+                    SpreadsheetControl1.Dock = DockStyle.Fill
+
+                Case Else
+                    _logger.Debug($"Loading GDViewer with extension [{oExtension}] ...")
+                    GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
+                    GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
+                    GdViewer.ForceTemporaryMode = True
+                    GdViewer.AnnotationDropShadow = True
+
+                    If GdViewer.DisplayFromFile(FilePath) <> GdPictureStatus.OK Then
+                        Dim oFileName = IO.Path.GetFileName(FilePath)
+                        lbFileNotLoaded.Text = String.Format("Datei konnte nicht geladen werden:{0}{1}", vbCrLf, oFileName)
+                        lbFileNotLoaded.Visible = True
+                    End If
+
+            End Select
+
+            UpdateMainUi()
+
+            Return True
+        Catch ex As Exception
+            _logger.Error(ex)
+            Return False
+        End Try
+    End Function
 
     Private Sub FitToPage()
         If _ViewerMode = ViewerMode.GDPicture Then
@@ -613,9 +566,215 @@ Public Class DocumentViewer
         End If
     End Sub
 
-    Private Sub RichEditControl1_SizeChanged(sender As Object, e As EventArgs) Handles RichEditControl1.SizeChanged
-        Dim oControlWidth = RichEditControl1.Width - 100
-        Dim oPageWidth = Units.DocumentsToPixelsF(RichEditControl1.Document.Sections(0).Page.Width, RichEditControl1.DpiX)
-        RichEditControl1.Views.PrintLayoutView.ZoomFactor = oControlWidth / oPageWidth
+    Private Function DoLoadFile(Stream As Stream, Extension As String) As Boolean
+        Try
+            RichEditControl1.Visible = False
+            RichEditControl1.Dock = DockStyle.None
+
+            SpreadsheetControl1.Visible = False
+            SpreadsheetControl1.Dock = DockStyle.None
+
+            Select Case Extension.ToUpper
+                Case ".MSG"
+
+                    Dim oTempFileName = Path.Combine(IO.Path.GetTempPath(), Guid.NewGuid.ToString & ".msg")
+                    Using oFileStream As New FileStream(oTempFileName, FileMode.Create)
+                        Stream.Seek(0, SeekOrigin.Begin)
+                        Stream.CopyTo(oFileStream)
+                        Stream.Flush()
+                    End Using
+
+                    Dim oEmlPath As String = _email.Convert_ToEml(oTempFileName)
+                    DoLoadFile(oEmlPath)
+
+                Case ".EML", ".DOC", ".DOCX", ".ODT", ".RTF", ".TXT"
+                    RichEditControl1.LoadDocument(Stream, GetDocumentFormat(Extension))
+
+                    RichEditControl1.ActiveViewType = XtraRichEdit.RichEditViewType.PrintLayout
+                    RichEditControl1.Visible = True
+                    RichEditControl1.Dock = DockStyle.Fill
+
+                Case ".XLSX", ".XLS", ".CSV"
+                    SpreadsheetControl1.LoadDocument(Stream, GetSpreadsheetFormat(Extension))
+
+                    Dim oRange = SpreadsheetControl1.ActiveWorksheet.GetUsedRange()
+                    oRange.AutoFitColumns()
+
+                    SpreadsheetControl1.Visible = True
+                    SpreadsheetControl1.Dock = DockStyle.Fill
+
+                Case Else
+                    GdViewer.ZoomMode = ViewerZoomMode.ZoomModeWidthViewer
+                    GdViewer.DocumentAlignment = ViewerDocumentAlignment.DocumentAlignmentTopCenter
+                    GdViewer.ForceTemporaryMode = True
+                    GdViewer.AnnotationDropShadow = True
+
+                    GdViewer.DisplayFromStream(Stream)
+
+            End Select
+
+            UpdateMainUi()
+
+            Return True
+        Catch ex As Exception
+            _logger.Error(ex)
+            Return False
+        End Try
+    End Function
+
+    Private Function GetSpreadsheetFormat(Extension) As Spreadsheet.DocumentFormat
+        Dim oFormat As Spreadsheet.DocumentFormat = Spreadsheet.DocumentFormat.Undefined
+
+        Select Case Extension.ToUpper
+            Case ".XLSX" : oFormat = Spreadsheet.DocumentFormat.Xlsx
+            Case ".XLS" : oFormat = Spreadsheet.DocumentFormat.Xls
+            Case ".CSV" : oFormat = Spreadsheet.DocumentFormat.Csv
+        End Select
+
+        Return oFormat
+    End Function
+
+    Private Function GetDocumentFormat(Extension) As XtraRichEdit.DocumentFormat
+        Dim oFormat As XtraRichEdit.DocumentFormat = XtraRichEdit.DocumentFormat.Undefined
+
+        Select Case Extension.ToUpper
+            Case ".EML" : oFormat = XtraRichEdit.DocumentFormat.Mht
+            Case ".DOC" : oFormat = XtraRichEdit.DocumentFormat.Doc
+            Case ".DOCX" : oFormat = XtraRichEdit.DocumentFormat.OpenXml
+            Case ".ODT" : oFormat = XtraRichEdit.DocumentFormat.OpenDocument
+            Case ".RTF" : oFormat = XtraRichEdit.DocumentFormat.Rtf
+            Case ".TXT" : oFormat = XtraRichEdit.DocumentFormat.PlainText
+        End Select
+
+        Return oFormat
+    End Function
+
+    Private Function ToVisibility(pBoolean As Boolean) As XtraBars.BarItemVisibility
+        If (pBoolean = True) Then
+            Return XtraBars.BarItemVisibility.Always
+        Else
+            Return XtraBars.BarItemVisibility.Never
+        End If
+    End Function
+
+    Private Sub UpdateMainUi()
+
+        Select Case _Config?.Config?.PageFit
+            Case Config.PageFitSetting.FitPage
+                FitToPage()
+
+            Case Config.PageFitSetting.FitWidth
+                FitToWidth()
+
+        End Select
+
+        If _FileStream Is Nothing And _FilePath Is Nothing Then
+            lbFileNotLoaded.Visible = False
+        End If
+
+        Select Case _ViewerMode
+            Case ViewerMode.GDPicture
+                ToolbarDocumentViewer.Visible = True
+
+                buttonPrint.Visibility = ToVisibility(_ToolbarSettings.ShowPrintButton)
+                buttonFitWidth.Visibility = ToVisibility(_ToolbarSettings.ShowFitWidthButton)
+                buttonFitPage.Visibility = ToVisibility(_ToolbarSettings.ShowFitPageButton)
+                buttonZoomIn.Visibility = ToVisibility(_ToolbarSettings.ShowZoomButton)
+                buttonZoomOut.Visibility = ToVisibility(_ToolbarSettings.ShowZoomButton)
+                buttonRotateLeft.Visibility = ToVisibility(_ToolbarSettings.ShowRotateButton)
+                buttonRotateRight.Visibility = ToVisibility(_ToolbarSettings.ShowRotateButton)
+                buttonFlipX.Visibility = ToVisibility(_ToolbarSettings.ShowFlipButton)
+                buttonFlipY.Visibility = ToVisibility(_ToolbarSettings.ShowFlipButton)
+                buttonSettings.Visibility = ToVisibility(_ToolbarSettings.ShowSettingButton)
+                txtSearch.Visibility = ToVisibility(_ToolbarSettings.ShowSearchButton)
+                btnSearch2.Visibility = ToVisibility(_ToolbarSettings.ShowSearchButton)
+                btnNextHighlight.Visibility = ToVisibility(_ToolbarSettings.ShowSearchButton)
+                btnPrevHighlight.Visibility = ToVisibility(_ToolbarSettings.ShowSearchButton)
+                buttonFirstPage.Visibility = ToVisibility(True)
+                buttonPrevPage.Visibility = ToVisibility(True)
+                buttonNextPage.Visibility = ToVisibility(True)
+                buttonLastPage.Visibility = ToVisibility(True)
+                txtCurrentPage.Visibility = ToVisibility(True)
+
+            Case ViewerMode.RichText
+                ToolbarDocumentViewer.Visible = True
+
+                buttonFitWidth.Visibility = ToVisibility(_ToolbarSettings.ShowFitWidthButton)
+                buttonFitPage.Visibility = ToVisibility(_ToolbarSettings.ShowFitPageButton)
+                buttonZoomIn.Visibility = ToVisibility(_ToolbarSettings.ShowZoomButton)
+                buttonZoomOut.Visibility = ToVisibility(_ToolbarSettings.ShowZoomButton)
+                buttonNextPage.Visibility = ToVisibility(True)
+                buttonPrevPage.Visibility = ToVisibility(True)
+                buttonPrint.Visibility = ToVisibility(False)
+                buttonRotateLeft.Visibility = ToVisibility(False)
+                buttonRotateRight.Visibility = ToVisibility(False)
+                buttonFlipX.Visibility = ToVisibility(False)
+                buttonFlipY.Visibility = ToVisibility(False)
+                buttonFirstPage.Visibility = ToVisibility(False)
+                buttonLastPage.Visibility = ToVisibility(False)
+                buttonSettings.Visibility = ToVisibility(False)
+                txtCurrentPage.Visibility = ToVisibility(False)
+                txtSearch.Visibility = ToVisibility(False)
+                btnSearch2.Visibility = ToVisibility(False)
+                btnNextHighlight.Visibility = ToVisibility(False)
+                btnPrevHighlight.Visibility = ToVisibility(False)
+
+            Case ViewerMode.Excel
+                ToolbarDocumentViewer.Visible = False
+
+                buttonPrint.Visibility = ToVisibility(False)
+                buttonFitWidth.Visibility = ToVisibility(False)
+                buttonFitPage.Visibility = ToVisibility(False)
+                buttonZoomIn.Visibility = ToVisibility(False)
+                buttonZoomOut.Visibility = ToVisibility(False)
+                buttonRotateLeft.Visibility = ToVisibility(False)
+                buttonRotateRight.Visibility = ToVisibility(False)
+                buttonFlipX.Visibility = ToVisibility(False)
+                buttonFlipY.Visibility = ToVisibility(False)
+                buttonFirstPage.Visibility = ToVisibility(False)
+                buttonPrevPage.Visibility = ToVisibility(False)
+                buttonNextPage.Visibility = ToVisibility(False)
+                buttonLastPage.Visibility = ToVisibility(False)
+                buttonSettings.Visibility = ToVisibility(False)
+                txtCurrentPage.Visibility = ToVisibility(False)
+                txtSearch.Visibility = ToVisibility(False)
+                btnSearch2.Visibility = ToVisibility(False)
+                btnNextHighlight.Visibility = ToVisibility(False)
+                btnPrevHighlight.Visibility = ToVisibility(False)
+
+
+
+        End Select
     End Sub
+
+    Private Sub btnSearch2_ItemClick(sender As Object, e As XtraBars.ItemClickEventArgs) Handles btnSearch2.ItemClick
+        If Not String.IsNullOrEmpty(txtSearch.EditValue) Then
+            _Search.SearchAll(txtSearch.EditValue?.ToString)
+
+        End If
+    End Sub
+
+    Private Sub btnPrevHighlight_ItemClick(sender As Object, e As XtraBars.ItemClickEventArgs) Handles btnPrevHighlight.ItemClick
+        _Search.PrevHighlight()
+    End Sub
+
+    Private Sub btnNextHighlight_ItemClick(sender As Object, e As XtraBars.ItemClickEventArgs) Handles btnNextHighlight.ItemClick
+        _Search.NextHighlight()
+    End Sub
+
+    Private Sub txtSearch_EditValueChanged(sender As Object, e As EventArgs) Handles txtSearch.EditValueChanged
+        If String.IsNullOrEmpty(txtSearch.EditValue) Then
+            btnPrevHighlight.Enabled = False
+            btnNextHighlight.Enabled = False
+
+        Else
+            btnPrevHighlight.Enabled = True
+            btnNextHighlight.Enabled = True
+        End If
+    End Sub
+#End Region
+
+
+
+
 End Class

Controls.DocumentViewer/DocumentViewer.vbproj

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Project ToolsVersion="15.0" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.props" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" />
   <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
   <PropertyGroup>
     <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
@@ -12,8 +13,11 @@
     <AssemblyName>DigitalData.Controls.DocumentViewer</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
+    <NuGetPackageImportStamp>
+    </NuGetPackageImportStamp>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -48,6 +52,9 @@
     <OptionInfer>On</OptionInfer>
   </PropertyGroup>
   <ItemGroup>
+    <Reference Include="BouncyCastle.Cryptography, Version=2.0.0.0, Culture=neutral, PublicKeyToken=072edcf4a5328938, processorArchitecture=MSIL">
+      <HintPath>..\packages\BouncyCastle.Cryptography.2.5.0\lib\net461\BouncyCastle.Cryptography.dll</HintPath>
+    </Reference>
     <Reference Include="DevExpress.Charts.v21.2.Core, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.DataAccess.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
@@ -72,26 +79,204 @@
     <Reference Include="DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraSpreadsheet.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
-    <Reference Include="GdPicture.NET.14">
-      <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET (.NET Framework 4.5)\GdPicture.NET.14.dll</HintPath>
+    <Reference Include="DigitalData.Modules.Base, Version=1.3.8.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DigitalData.Modules.Base.1.3.8\lib\net462\DigitalData.Modules.Base.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Config, Version=1.3.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DigitalData.Modules.Config.1.3.0\lib\net462\DigitalData.Modules.Config.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Database, Version=2.3.5.4, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DigitalData.Modules.Database.2.3.5.4\lib\net462\DigitalData.Modules.Database.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Encryption, Version=1.3.1.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DigitalData.Modules.Encryption.1.3.1\lib\net462\DigitalData.Modules.Encryption.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Logging, Version=2.6.5.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DigitalData.Modules.Logging.2.6.5\lib\net462\DigitalData.Modules.Logging.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Messaging, Version=1.9.8.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\DigitalData.Modules.Messaging.1.9.8\lib\net462\DigitalData.Modules.Messaging.dll</HintPath>
+    </Reference>
+    <Reference Include="DocumentFormat.OpenXml, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
+      <HintPath>..\packages\DocumentFormat.OpenXml.3.2.0\lib\net46\DocumentFormat.OpenXml.dll</HintPath>
+    </Reference>
+    <Reference Include="DocumentFormat.OpenXml.Framework, Version=3.2.0.0, Culture=neutral, PublicKeyToken=8fb06cb64d019a17, processorArchitecture=MSIL">
+      <HintPath>..\packages\DocumentFormat.OpenXml.Framework.3.2.0\lib\net46\DocumentFormat.OpenXml.Framework.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework.Firebird, Version=6.4.0.0, Culture=neutral, PublicKeyToken=42d22d092898e5f8, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.Firebird.6.4.0\lib\net452\EntityFramework.Firebird.dll</HintPath>
+    </Reference>
+    <Reference Include="EntityFramework.SqlServer, Version=6.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089, processorArchitecture=MSIL">
+      <HintPath>..\packages\EntityFramework.6.4.4\lib\net45\EntityFramework.SqlServer.dll</HintPath>
+    </Reference>
+    <Reference Include="FirebirdSql.Data.FirebirdClient, Version=7.5.0.0, Culture=neutral, PublicKeyToken=3750abcc3150b00c, processorArchitecture=MSIL">
+      <HintPath>..\packages\FirebirdSql.Data.FirebirdClient.7.5.0\lib\net452\FirebirdSql.Data.FirebirdClient.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.barcode.1d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.1d.writer.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.barcode.2d.writer, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.barcode.2d.writer.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.CAD, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.CAD.DWG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.CAD.DWG.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Common, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Common.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Document, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Document.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Email, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Email.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.HTML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.HTML.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Formats, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Formats.Conversion, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Formats.Conversion.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.Imaging.Rendering, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.Imaging.Rendering.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.MSOfficeBinary, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.MSOfficeBinary.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenDocument, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenDocument.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenXML, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.OpenXML.Templating, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.OpenXML.Templating.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.PDF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.PDF.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.RTF, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.RTF.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.SVG, Version=14.3.3.0, Culture=neutral, PublicKeyToken=f52a2e60ad468dbb, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.SVG.dll</HintPath>
+    </Reference>
+    <Reference Include="GdPicture.NET.14.wia.gateway, Version=1.0.0.0, Culture=neutral, PublicKeyToken=6973b5c22dcf45f7, processorArchitecture=MSIL">
+      <HintPath>..\packages\GdPicture.14.3.3\lib\net462\GdPicture.NET.14.wia.gateway.dll</HintPath>
+      <EmbedInteropTypes>True</EmbedInteropTypes>
+    </Reference>
+    <Reference Include="Microsoft.Bcl.AsyncInterfaces, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.AsyncInterfaces.9.0.0\lib\net462\Microsoft.Bcl.AsyncInterfaces.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.Bcl.Cryptography, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Bcl.Cryptography.9.0.0\lib\net462\Microsoft.Bcl.Cryptography.dll</HintPath>
     </Reference>
     <Reference Include="Microsoft.CSharp" />
-    <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
-      <HintPath>..\packages\NLog.4.7.10\lib\net45\NLog.dll</HintPath>
+    <Reference Include="Microsoft.Identity.Client, Version=4.55.0.0, Culture=neutral, PublicKeyToken=0a613f4dd989e8ae, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.Identity.Client.4.55.0\lib\net461\Microsoft.Identity.Client.dll</HintPath>
+    </Reference>
+    <Reference Include="Microsoft.IdentityModel.Abstractions, Version=6.22.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.IdentityModel.Abstractions.6.22.0\lib\net461\Microsoft.IdentityModel.Abstractions.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json, Version=13.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.13.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="Newtonsoft.Json.Bson, Version=1.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
+      <HintPath>..\packages\Newtonsoft.Json.Bson.1.0.2\lib\net45\Newtonsoft.Json.Bson.dll</HintPath>
+    </Reference>
+    <Reference Include="NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
+      <HintPath>..\packages\NLog.5.0.5\lib\net46\NLog.dll</HintPath>
+    </Reference>
+    <Reference Include="OpenMcdf, Version=2.4.1.0, Culture=neutral, PublicKeyToken=fdbb1629d7c00800, processorArchitecture=MSIL">
+      <HintPath>..\packages\OpenMcdf.2.4.1\lib\net40\OpenMcdf.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
+    <Reference Include="protobuf-net, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.3.2.46\lib\net462\protobuf-net.dll</HintPath>
+    </Reference>
+    <Reference Include="protobuf-net.Core, Version=3.0.0.0, Culture=neutral, PublicKeyToken=257b51d87d2e4d67, processorArchitecture=MSIL">
+      <HintPath>..\packages\protobuf-net.Core.3.2.46\lib\net462\protobuf-net.Core.dll</HintPath>
+    </Reference>
+    <Reference Include="RtfPipe, Version=2.0.7677.4303, Culture=neutral, PublicKeyToken=5f6ab4ce530296d2, processorArchitecture=MSIL">
+      <HintPath>..\packages\RtfPipe.2.0.7677.4303\lib\net45\RtfPipe.dll</HintPath>
+    </Reference>
+    <Reference Include="S22.Imap, Version=3.6.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <HintPath>..\packages\S22.Imap.3.6.0.0\lib\net40\S22.Imap.dll</HintPath>
+    </Reference>
     <Reference Include="System" />
+    <Reference Include="System.Buffers, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Buffers.4.6.0\lib\net462\System.Buffers.dll</HintPath>
+    </Reference>
+    <Reference Include="System.CodeDom, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.CodeDom.9.0.0\lib\net462\System.CodeDom.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Collections.Immutable, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Collections.Immutable.9.0.0\lib\net462\System.Collections.Immutable.dll</HintPath>
+    </Reference>
+    <Reference Include="System.ComponentModel.DataAnnotations" />
     <Reference Include="System.Configuration" />
     <Reference Include="System.Data" />
+    <Reference Include="System.Data.Odbc, Version=6.0.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Data.Odbc.6.0.1\lib\net461\System.Data.Odbc.dll</HintPath>
+    </Reference>
     <Reference Include="System.Deployment" />
     <Reference Include="System.Drawing" />
+    <Reference Include="System.IdentityModel" />
     <Reference Include="System.IO.Compression" />
+    <Reference Include="System.IO.Packaging, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Packaging.9.0.0\lib\net462\System.IO.Packaging.dll</HintPath>
+    </Reference>
+    <Reference Include="System.IO.Pipelines, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.IO.Pipelines.9.0.0\lib\net462\System.IO.Pipelines.dll</HintPath>
+    </Reference>
     <Reference Include="System.Management" />
+    <Reference Include="System.Memory, Version=4.0.2.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Memory.4.6.0\lib\net462\System.Memory.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Net.Http.Formatting, Version=6.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35, processorArchitecture=MSIL">
+      <HintPath>..\packages\Microsoft.AspNet.WebApi.Client.6.0.0\lib\net45\System.Net.Http.Formatting.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Numerics" />
+    <Reference Include="System.Numerics.Vectors, Version=4.1.5.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Numerics.Vectors.4.6.0\lib\net462\System.Numerics.Vectors.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Runtime.CompilerServices.Unsafe, Version=6.0.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Runtime.CompilerServices.Unsafe.6.1.0\lib\net462\System.Runtime.CompilerServices.Unsafe.dll</HintPath>
+    </Reference>
     <Reference Include="System.Runtime.Serialization" />
     <Reference Include="System.Security" />
+    <Reference Include="System.Security.Cryptography.Pkcs, Version=9.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Security.Cryptography.Pkcs.9.0.0\lib\net462\System.Security.Cryptography.Pkcs.dll</HintPath>
+    </Reference>
     <Reference Include="System.ServiceModel" />
+    <Reference Include="System.Text.Encodings.Web, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Encodings.Web.9.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Text.Json, Version=9.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Text.Json.9.0.0\lib\net462\System.Text.Json.dll</HintPath>
+    </Reference>
+    <Reference Include="System.Threading.Tasks.Extensions, Version=4.2.0.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.Threading.Tasks.Extensions.4.5.4\lib\net461\System.Threading.Tasks.Extensions.dll</HintPath>
+    </Reference>
     <Reference Include="System.Transactions" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Windows.Forms" />
     <Reference Include="System.Xml" />
     <Reference Include="System.Core" />
@@ -114,6 +299,7 @@
     <Import Include="System.Threading.Tasks" />
   </ItemGroup>
   <ItemGroup>
+    <Compile Include="Classes\Annotations.vb" />
     <Compile Include="Config.vb" />
     <Compile Include="DocumentViewer.Designer.vb">
       <DependentUpon>DocumentViewer.vb</DependentUpon>
@@ -143,6 +329,7 @@
       <DependentUpon>Settings.settings</DependentUpon>
       <DesignTimeSharedInput>True</DesignTimeSharedInput>
     </Compile>
+    <Compile Include="Classes\Search.vb" />
   </ItemGroup>
   <ItemGroup>
     <EmbeddedResource Include="DocumentViewer.resx">
@@ -171,20 +358,6 @@
     </None>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Modules.Config\Config.vbproj">
-      <Project>{44982f9b-6116-44e2-85d0-f39650b1ef99}</Project>
-      <Name>Config</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Modules.Logging\Logging.vbproj">
-      <Project>{903B2D7D-3B80-4BE9-8713-7447B704E1B0}</Project>
-      <Name>Logging</Name>
-    </ProjectReference>
-    <ProjectReference Include="..\Modules.Messaging\Messaging.vbproj">
-      <Project>{af664d85-0a4b-4bab-a2f8-83110c06553a}</Project>
-      <Name>Messaging</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
     <None Include="Resources\ZooFlow-10.svg" />
@@ -199,24 +372,32 @@
     <None Include="Resources\tooltips1.svg" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="GdPicture.NET.14.filters.64.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="GdPicture.NET.14.filters.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="GdPicture.NET.14.image.gdimgplug.64.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="GdPicture.NET.14.image.gdimgplug.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="GdPicture.NET.14.Imaging.Rendering.Skia.64.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
-    <Content Include="GdPicture.NET.14.Imaging.Rendering.Skia.dll">
-      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
-    </Content>
+    <None Include="Resources\viewsettings.svg" />
+    <None Include="Resources\next.svg" />
+    <None Include="Resources\prev.svg" />
+    <None Include="Resources\doublelast.svg" />
+    <None Include="Resources\doublefirst.svg" />
+    <None Include="Resources\flipimage_vertical.svg" />
+    <None Include="Resources\flipimage_horizontal.svg" />
+    <None Include="Resources\zoomin.svg" />
+    <None Include="Resources\fittopage.svg" />
+    <None Include="Resources\fittowidth.svg" />
+    <None Include="Resources\rotateclockwise.svg" />
+    <None Include="Resources\rotatecounterclockwise.svg" />
+  </ItemGroup>
+  <ItemGroup>
+    <Content Include="MailLicense.xml" />
+    <Content Include="README.txt" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.VisualBasic.targets" />
+  <Target Name="EnsureNuGetPackageBuildImports" BeforeTargets="PrepareForBuild">
+    <PropertyGroup>
+      <ErrorText>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}".</ErrorText>
+    </PropertyGroup>
+    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.props')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.props'))" />
+    <Error Condition="!Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\EntityFramework.6.4.4\build\EntityFramework.targets'))" />
+    <Error Condition="!Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" Text="$([System.String]::Format('$(ErrorText)', '..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets'))" />
+  </Target>
+  <Import Project="..\packages\EntityFramework.6.4.4\build\EntityFramework.targets" Condition="Exists('..\packages\EntityFramework.6.4.4\build\EntityFramework.targets')" />
+  <Import Project="..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets" Condition="Exists('..\packages\GdPicture.runtimes.windows.14.3.3\build\net462\GdPicture.runtimes.windows.targets')" />
 </Project>

Controls.DocumentViewer/My Project/AssemblyInfo.vb

@@ -8,11 +8,11 @@ Imports System.Runtime.InteropServices
 
 ' Werte der Assemblyattribute überprüfen
 
-<Assembly: AssemblyTitle("DocumentViewer")>
-<Assembly: AssemblyDescription("")>
-<Assembly: AssemblyCompany("")>
-<Assembly: AssemblyProduct("DocumentViewer")>
-<Assembly: AssemblyCopyright("Copyright © 2022")>
+<Assembly: AssemblyTitle("DigitalData.DocumentViewer")>
+<Assembly: AssemblyDescription("Stellt den Digital Data DocumentViewer für Applikationen zur Verfügung")>
+<Assembly: AssemblyCompany("Digutal Data GmbH, Heuchelheim")>
+<Assembly: AssemblyProduct("DigitalData.DocumentViewer")>
+<Assembly: AssemblyCopyright("Copyright © 2025")>
 <Assembly: AssemblyTrademark("")>
 
 <Assembly: ComVisible(False)>
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("1.7.0.1")>
-<Assembly: AssemblyFileVersion("1.7.0.1")>
+<Assembly: AssemblyVersion("1.9.8.0")>
+<Assembly: AssemblyFileVersion("1.9.8.0")>

Controls.DocumentViewer/My Project/Resources.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
      Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _
@@ -60,6 +60,76 @@ Namespace My.Resources
             End Set
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property _next() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("next", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property doublefirst() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("doublefirst", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property doublelast() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("doublelast", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property fittopage() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("fittopage", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property fittowidth() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("fittowidth", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property flipimage_horizontal() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("flipimage_horizontal", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property flipimage_vertical() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("flipimage_vertical", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>
@@ -70,6 +140,36 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property prev() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("prev", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property rotateclockwise() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("rotateclockwise", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property rotatecounterclockwise() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("rotatecounterclockwise", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>
@@ -90,6 +190,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property viewsettings() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("viewsettings", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>
@@ -99,5 +209,15 @@ Namespace My.Resources
                 Return CType(obj,DevExpress.Utils.Svg.SvgImage)
             End Get
         End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property zoomin() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("zoomin", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
     End Module
 End Namespace

Controls.DocumentViewer/My Project/Resources.resx

@@ -118,16 +118,52 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="tooltips" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\tooltips.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="ZooFlow-10" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ZooFlow-10.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
-  <data name="floatingobjectoutlinecolor" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\floatingobjectoutlinecolor.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="doublelast" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\doublelast.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="tooltips1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\tooltips1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="doublefirst" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\doublefirst.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="flipimage_vertical" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\flipimage_vertical.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="rotatecounterclockwise" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\rotatecounterclockwise.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="tooltips" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\tooltips.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="fittopage" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\fittopage.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="fittowidth" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\fittowidth.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="floatingobjectoutlinecolor" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\floatingobjectoutlinecolor.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="next" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\next.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="flipimage_horizontal" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\flipimage_horizontal.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="zoomin" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\zoomin.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="prev" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\prev.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="ZooFlow-10" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\ZooFlow-10.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="rotateclockwise" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\rotateclockwise.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="viewsettings" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\viewsettings.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
 </root>

Controls.DocumentViewer/My Project/Settings.Designer.vb

@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "16.8.1.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.9.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase

Controls.DocumentViewer/My Project/licenses.licx

@@ -1,5 +1,5 @@
-DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

Controls.DocumentViewer/My Project/licenses.licx.bak

@@ -1,5 +1,5 @@
-DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.BarManager, DevExpress.XtraBars.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.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraSpreadsheet.SpreadsheetControl, DevExpress.XtraSpreadsheet.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemTextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemComboBox, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.BarManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

Controls.DocumentViewer/Resources/doublefirst.svg

@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Blue{fill:#1177D7;}
+</style>
+  <path d="M10.4,15.6c-0.5-0.3-0.5-0.8,0-1.1L20,7.2V4.6c0-0.6-0.4-0.8-0.9-0.5L6.4,14.5c-0.5,0.3-0.5,0.7,0,1.1  l12.7,10.3c0.5,0.3,0.9,0.1,0.9-0.5v-2.6L10.4,15.6z" class="Blue" />
+  <path d="M14.4,14.5c-0.5,0.3-0.5,0.8,0,1.1l14.7,10.3c0.5,0.3,0.9,0.1,0.9-0.5V4.6c0-0.6-0.4-0.8-0.9-0.5L14.4,14.5z" class="Blue" />
+  <path d="M3,26H1c-0.6,0-1-0.4-1-1V5c0-0.6,0.4-1,1-1h2c0.6,0,1,0.4,1,1v20C4,25.6,3.6,26,3,26z" class="Blue" />
+</svg>

Controls.DocumentViewer/Resources/doublelast.svg

@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Blue{fill:#1177D7;}
+</style>
+  <path d="M21.6,14.4c0.5,0.3,0.5,0.8,0,1.1L12,22.7v2.6c0,0.6,0.4,0.8,0.9,0.5l12.7-10.4c0.5-0.3,0.5-0.7,0-1.1  L12.9,4.1C12.4,3.8,12,4,12,4.6v2.6L21.6,14.4z" class="Blue" />
+  <path d="M17.6,15.5c0.5-0.3,0.5-0.8,0-1.1L2.9,4.1C2.4,3.8,2,4,2,4.6v20.7c0,0.6,0.4,0.8,0.9,0.5L17.6,15.5z" class="Blue" />
+  <path d="M29,4h2c0.6,0,1,0.4,1,1v20c0,0.6-0.4,1-1,1h-2c-0.6,0-1-0.4-1-1V5C28,4.4,28.4,4,29,4z" class="Blue" />
+</svg>

Controls.DocumentViewer/Resources/fittopage.svg

@@ -4,15 +4,14 @@
 	.Black{fill:#727272;}
 	.Yellow{fill:#FFB115;}
 	.Blue{fill:#1177D7;}
-	.Green{fill:#039C23;}
 	.Red{fill:#D11C1C;}
 	.White{fill:#FFFFFF;}
-	.st0{opacity:0.75;}
+	.Green{fill:#039C23;}
+	.st0{fill:#727272;}
 	.st1{opacity:0.5;}
-	.st2{opacity:0.25;}
+	.st2{opacity:0.75;}
 </style>
-  <g id="Export">
-    <path d="M10,12H6V6h4V12z M22,12v6v9c0,0.6-0.4,1-1,1H1c-0.6,0-1-0.4-1-1V7c0-0.6,0.4-1,1-1h3v8h14v-2H22z M18,18H4   v6h14V18z" class="Black" />
-    <polygon points="16,10 24,10 24,14 32,8 24,2 24,6 16,6  " class="Green" />
+  <g id="FitToPage">
+    <path d="M29,2H3C2.5,2,2,2.5,2,3v26c0,0.5,0.5,1,1,1h26c0.5,0,1-0.5,1-1V3C30,2.5,29.5,2,29,2z M28,28H4V4h24V28z    M14,26H6v-8l3,3l3-3l2,2l-3,3L14,26z M18,26l3-3l-3-3l2-2l3,3l3-3v8H18z M9,11l-3,3V6h8l-3,3l3,3l-2,2L9,11z M18,12l3-3l-3-3h8v8   l-3-3l-3,3L18,12z" class="Black" />
   </g>
 </svg>

Controls.DocumentViewer/Resources/fittowidth.svg

@@ -0,0 +1,21 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Black{fill:#737374;}
+	.Yellow{fill:#FCB01B;}
+	.Green{fill:#129C49;}
+	.Blue{fill:#387CB7;}
+	.Red{fill:#D02127;}
+	.White{fill:#FFFFFF;}
+	.st0{opacity:0.5;}
+	.st1{opacity:0.75;}
+	.st2{opacity:0.25;}
+	.st3{display:none;fill:#737374;}
+</style>
+  <path d="M23,2H9C8.5,2,8,2.5,8,3v24c0,0.5,0.5,1,1,1h14c0.5,0,1-0.5,1-1V3C24,2.5,23.5,2,23,2z M22,26H10V4h12V26z" class="Black" />
+  <polygon points="6,16 6,14 6,10 1,15 6,20 " class="Blue" />
+  <polygon points="26,16 26,14 26,10 31,15 26,20 " class="Blue" />
+  <g class="st0">
+    <path d="M20,10h-8V8h8V10z M20,12h-8v2h8V12z M20,16h-8v2h8V16z M20,20h-8v2h8V20z" class="Black" />
+  </g>
+</svg>

Controls.DocumentViewer/Resources/flipimage_horizontal.svg

@@ -12,5 +12,9 @@
 	.st2{opacity:0.25;}
 	.st3{display:none;fill:#737374;}
 </style>
-  <path d="M18.8,16l8.9-8.9c0.4-0.4,0.4-1,0-1.4l-1.4-1.4c-0.4-0.4-1-0.4-1.4,0L16,13.2L7.1,4.3c-0.4-0.4-1-0.4-1.4,0  L4.3,5.7c-0.4,0.4-0.4,1,0,1.4l8.9,8.9l-8.9,8.9c-0.4,0.4-0.4,1,0,1.4l1.4,1.4c0.4,0.4,1,0.4,1.4,0l8.9-8.9l8.9,8.9  c0.4,0.4,1,0.4,1.4,0l1.4-1.4c0.4-0.4,0.4-1,0-1.4L18.8,16z" class="Red" />
+  <path d="M16,6h-2V2h2V6z M16,8h-2v4h2V8z M16,14h-2v4h2V14z M16,20h-2v4h2V20z M16,26h-2v4h2V26z" class="Black" />
+  <g class="st0">
+    <polygon points="10,6 10,26 0,16  " class="Black" />
+  </g>
+  <polygon points="20,6 20,26 30,16 " class="Blue" />
 </svg>

Controls.DocumentViewer/Resources/flipimage_vertical.svg

@@ -0,0 +1,20 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Black{fill:#737374;}
+	.Yellow{fill:#FCB01B;}
+	.Green{fill:#129C49;}
+	.Blue{fill:#387CB7;}
+	.Red{fill:#D02127;}
+	.White{fill:#FFFFFF;}
+	.st0{opacity:0.5;}
+	.st1{opacity:0.75;}
+	.st2{opacity:0.25;}
+	.st3{display:none;fill:#737374;}
+</style>
+  <path d="M14,14h4v2h-4V14z M8,16h4v-2H8V16z M2,16h4v-2H2V16z M20,16h4v-2h-4V16z M26,14v2h4v-2H26z" class="Black" />
+  <g class="st0">
+    <polygon points="16,0 6,10 26,10  " class="Black" />
+  </g>
+  <polygon points="6,20 16,30 26,20 " class="Blue" />
+</svg>

Controls.DocumentViewer/Resources/next.svg

@@ -2,14 +2,6 @@
 <svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
   <style type="text/css">
 	.Blue{fill:#1177D7;}
-	.Yellow{fill:#FFB115;}
-	.Black{fill:#727272;}
-	.Green{fill:#039C23;}
-	.Red{fill:#D11C1C;}
-	.st0{opacity:0.75;}
-	.st1{opacity:0.5;}
 </style>
-  <g id="Check">
-    <polygon points="27,5 11,21 5,15 2,18 11,27 30,8  " class="Green" />
-  </g>
+  <path d="M8.9,4.1C8.4,3.8,8,4.1,8,4.7v22.6c0,0.7,0.4,0.9,0.9,0.5l16.7-11.3c0.5-0.3,0.5-0.9,0-1.2L8.9,4.1z" class="Blue" />
 </svg>

Controls.DocumentViewer/Resources/prev.svg

@@ -0,0 +1,7 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Blue{fill:#1177D7;}
+</style>
+  <path d="M23.1,4.1c0.5-0.3,0.9,0,0.9,0.5v22.6c0,0.7-0.4,0.9-0.9,0.5L6.4,16.6c-0.5-0.3-0.5-0.9,0-1.2L23.1,4.1z" class="Blue" />
+</svg>

Controls.DocumentViewer/Resources/rotateclockwise.svg

@@ -9,7 +9,7 @@
 	.White{fill:#FFFFFF;}
 	.st0{opacity:0.75;}
 </style>
-  <g id="PreviousView">
-    <path d="M16,2C8.3,2,2,8.3,2,16s6.3,14,14,14s14-6.3,14-14S23.7,2,16,2z M24,18h-8v6l-8-8l8-8v6h8V18z" class="Blue" />
+  <g id="RotateClockwise">
+    <path d="M18.6,22.6C17.3,23.5,15.7,24,14,24c-4.4,0-8-3.6-8-8s3.6-8,8-8s8,3.6,8,8h-5l7,7l7-7h-5c0-6.6-5.4-12-12-12   S2,9.4,2,16c0,6.6,5.4,12,12,12c2.8,0,5.4-1,7.4-2.6L18.6,22.6z" class="Green" />
   </g>
 </svg>

Controls.DocumentViewer/Resources/rotatecounterclockwise.svg

@@ -7,13 +7,9 @@
 	.Green{fill:#039C23;}
 	.Black{fill:#727272;}
 	.White{fill:#FFFFFF;}
-	.st0{opacity:0.5;}
-	.st1{display:none;}
-	.st2{display:inline;fill:#039C23;}
-	.st3{display:inline;fill:#D11C1C;}
-	.st4{display:inline;fill:#727272;}
+	.st0{opacity:0.75;}
 </style>
-  <g id="MarkComplete">
-    <polygon points="27,4 11,20 5,14 2,17 11,26 30,7  " class="Green" />
+  <g id="RotateCounterclockwise">
+    <path d="M18,4C11.4,4,6,9.4,6,16H1l7,7l7-7h-5c0-4.4,3.6-8,8-8s8,3.6,8,8s-3.6,8-8,8c-1.7,0-3.3-0.5-4.6-1.4   l-2.9,2.9c2,1.6,4.6,2.6,7.4,2.6c6.6,0,12-5.4,12-12C30,9.4,24.6,4,18,4z" class="Green" />
   </g>
 </svg>

Controls.DocumentViewer/Resources/viewsettings.svg

@@ -0,0 +1,17 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Layer_1" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Red{fill:#D11C1C;}
+	.Black{fill:#727272;}
+	.Blue{fill:#1177D7;}
+	.Green{fill:#039C23;}
+	.Yellow{fill:#FFB115;}
+	.White{fill:#FFFFFF;}
+	.st0{opacity:0.5;}
+	.st1{opacity:0.75;}
+	.st2{opacity:0.25;}
+</style>
+  <g id="ViewSettings_1_">
+    <path d="M32,9V7l-2.5-0.6C29.4,6,29.2,5.6,29,5.2l1.5-2.1l-1.6-1.6L26.8,3c-0.4-0.2-0.8-0.4-1.2-0.5L25,0h-2   l-0.6,2.5C22,2.6,21.6,2.8,21.2,3l-2-1.5l-1.7,1.7l1.5,2c-0.2,0.4-0.4,0.8-0.5,1.2L16,7v2l2.5,0.6c0.1,0.4,0.3,0.8,0.5,1.2   l-1.5,2.1l1.6,1.6l2.1-1.5c0.4,0.2,0.8,0.4,1.2,0.5L23,16h2l0.6-2.5c0.4-0.1,0.8-0.3,1.2-0.5l2.1,1.5l1.6-1.6L29,10.8   c0.2-0.4,0.4-0.8,0.5-1.2L32,9z M24,10c-1.1,0-2-0.9-2-2c0-1.1,0.9-2,2-2s2,0.9,2,2C26,9.1,25.1,10,24,10z M18,21   c0-0.3,0-0.6-0.1-0.8l2.1-1.8l-0.8-1.9l-2.7,0.2c-0.3-0.4-0.7-0.8-1.2-1.2l0.2-2.7L13.6,12l-1.8,2.1C11.6,14,11.3,14,11,14   s-0.6,0-0.8,0.1L8.4,12l-1.9,0.8l0.2,2.7c-0.4,0.3-0.8,0.7-1.2,1.2l-2.7-0.2L2,18.4l2.1,1.8C4,20.4,4,20.7,4,21s0,0.6,0.1,0.8   L2,23.6l0.8,1.9l2.7-0.2c0.3,0.4,0.7,0.8,1.2,1.2l-0.2,2.7L8.4,30l1.8-2.1c0.3,0,0.5,0.1,0.8,0.1s0.6,0,0.8-0.1l1.8,2.1l1.9-0.8   l-0.2-2.7c0.4-0.3,0.8-0.7,1.2-1.2l2.7,0.2l0.8-1.9l-2.1-1.8C18,21.6,18,21.3,18,21z M11,24c-1.7,0-3-1.3-3-3s1.3-3,3-3s3,1.3,3,3   S12.7,24,11,24z" class="Black" />
+  </g>
+</svg>

Controls.DocumentViewer/Resources/zoomin.svg

@@ -0,0 +1,9 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<svg x="0px" y="0px" viewBox="0 0 32 32" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xml:space="preserve" id="Zoom_In" style="enable-background:new 0 0 32 32">
+  <style type="text/css">
+	.Black{fill:#727272;}
+	.Blue{fill:#1177D7;}
+</style>
+  <polygon points="18,12 14,12 14,8 12,8 12,12 8,12 8,14 12,14 12,18 14,18 14,14 18,14 " class="Blue" />
+  <path d="M29.7,27.3L22,19.6c0,0-0.1-0.1-0.1-0.1c1.3-1.8,2.1-4.1,2.1-6.5c0-6.1-4.9-11-11-11C6.9,2,2,6.9,2,13  s4.9,11,11,11c2.4,0,4.7-0.8,6.5-2.1c0,0,0,0.1,0.1,0.1l7.7,7.7c0.3,0.3,0.9,0.3,1.2,0l1.2-1.2C30.1,28.2,30.1,27.6,29.7,27.3z   M4,13c0-5,4-9,9-9c5,0,9,4,9,9s-4,9-9,9C8,22,4,18,4,13z" class="Black" />
+</svg>

Controls.DocumentViewer/packages.config

@@ -1,4 +1,49 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="NLog" version="4.7.10" targetFramework="net461" />
+  <package id="BouncyCastle.Cryptography" version="2.5.0" targetFramework="net462" />
+  <package id="DigitalData.Modules.Base" version="1.3.8" targetFramework="net462" />
+  <package id="DigitalData.Modules.Config" version="1.3.0" targetFramework="net462" />
+  <package id="DigitalData.Modules.Database" version="2.3.5.4" targetFramework="net462" />
+  <package id="DigitalData.Modules.Encryption" version="1.3.1" targetFramework="net462" />
+  <package id="DigitalData.Modules.Logging" version="2.6.5" targetFramework="net462" />
+  <package id="DigitalData.Modules.Messaging" version="1.9.8" targetFramework="net462" />
+  <package id="DocumentFormat.OpenXml" version="3.2.0" targetFramework="net462" />
+  <package id="DocumentFormat.OpenXml.Framework" version="3.2.0" targetFramework="net462" />
+  <package id="EntityFramework" version="6.4.4" targetFramework="net462" />
+  <package id="EntityFramework.Firebird" version="6.4.0" targetFramework="net462" />
+  <package id="FirebirdSql.Data.FirebirdClient" version="7.5.0" targetFramework="net462" />
+  <package id="GdPicture" version="14.3.3" targetFramework="net462" />
+  <package id="GdPicture.runtimes.windows" version="14.3.3" targetFramework="net462" />
+  <package id="Microsoft.AspNet.WebApi.Client" version="6.0.0" targetFramework="net462" />
+  <package id="Microsoft.Bcl.AsyncInterfaces" version="9.0.0" targetFramework="net462" />
+  <package id="Microsoft.Bcl.Cryptography" version="9.0.0" targetFramework="net462" />
+  <package id="Microsoft.CSharp" version="4.7.0" targetFramework="net462" />
+  <package id="Microsoft.Identity.Client" version="4.55.0" targetFramework="net462" />
+  <package id="Microsoft.IdentityModel.Abstractions" version="6.22.0" targetFramework="net462" />
+  <package id="Microsoft.VisualBasic" version="10.3.0" targetFramework="net462" />
+  <package id="Newtonsoft.Json" version="13.0.3" targetFramework="net462" />
+  <package id="Newtonsoft.Json.Bson" version="1.0.2" targetFramework="net462" />
+  <package id="NLog" version="5.0.5" targetFramework="net461" />
+  <package id="NuGet.CommandLine" version="6.13.2" targetFramework="net462" developmentDependency="true" />
+  <package id="OpenMcdf" version="2.4.1" targetFramework="net462" />
+  <package id="protobuf-net" version="3.2.46" targetFramework="net462" />
+  <package id="protobuf-net.Core" version="3.2.46" targetFramework="net462" />
+  <package id="RtfPipe" version="2.0.7677.4303" targetFramework="net462" />
+  <package id="S22.Imap" version="3.6.0.0" targetFramework="net462" />
+  <package id="System.Buffers" version="4.6.0" targetFramework="net462" />
+  <package id="System.CodeDom" version="9.0.0" targetFramework="net462" />
+  <package id="System.Collections.Immutable" version="9.0.0" targetFramework="net462" />
+  <package id="System.Data.Odbc" version="6.0.1" targetFramework="net462" />
+  <package id="System.Formats.Asn1" version="9.0.0" targetFramework="net462" />
+  <package id="System.IO.Packaging" version="9.0.0" targetFramework="net462" />
+  <package id="System.IO.Pipelines" version="9.0.0" targetFramework="net462" />
+  <package id="System.Management" version="9.0.0" targetFramework="net462" />
+  <package id="System.Memory" version="4.6.0" targetFramework="net462" />
+  <package id="System.Numerics.Vectors" version="4.6.0" targetFramework="net462" />
+  <package id="System.Runtime.CompilerServices.Unsafe" version="6.1.0" targetFramework="net462" />
+  <package id="System.Security.Cryptography.Pkcs" version="9.0.0" targetFramework="net462" />
+  <package id="System.Text.Encodings.Web" version="9.0.0" targetFramework="net462" />
+  <package id="System.Text.Json" version="9.0.0" targetFramework="net462" />
+  <package id="System.Threading.Tasks.Extensions" version="4.5.4" targetFramework="net462" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
 </packages>

Controls.LookupGrid/LookupControl.vbproj

@@ -10,7 +10,8 @@
     <AssemblyName>DigitalData.Controls.LookupGrid</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.6.2</TargetFrameworkVersion>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <DebugSymbols>true</DebugSymbols>
@@ -104,6 +105,7 @@
     <Compile Include="My Project\Application.Designer.vb">
       <AutoGen>True</AutoGen>
       <DependentUpon>Application.myapp</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <Compile Include="My Project\Resources.Designer.vb">
       <AutoGen>True</AutoGen>
@@ -133,11 +135,18 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
+    <EmbeddedResource Include="frmLookupGrid.aa.resx">
+      <DependentUpon>frmLookupGrid.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmLookupGrid.en.resx">
       <DependentUpon>frmLookupGrid.vb</DependentUpon>
     </EmbeddedResource>
+    <EmbeddedResource Include="frmLookupGrid.fr.resx">
+      <DependentUpon>frmLookupGrid.vb</DependentUpon>
+    </EmbeddedResource>
     <EmbeddedResource Include="frmLookupGrid.resx">
       <DependentUpon>frmLookupGrid.vb</DependentUpon>
+      <SubType>Designer</SubType>
     </EmbeddedResource>
     <EmbeddedResource Include="LookupControl3.resx">
       <DependentUpon>LookupControl3.vb</DependentUpon>
@@ -154,6 +163,7 @@
       <LastGenOutput>Strings.en.Designer.vb</LastGenOutput>
       <CustomToolNamespace>My.Resources</CustomToolNamespace>
     </EmbeddedResource>
+    <EmbeddedResource Include="Resources\Strings.fr.resx" />
     <EmbeddedResource Include="Resources\Strings.resx">
       <CustomToolNamespace>My.Resources</CustomToolNamespace>
       <Generator>ResXFileCodeGenerator</Generator>

Controls.LookupGrid/LookupControl3.vb

@@ -15,6 +15,8 @@ Imports DevExpress.XtraGrid.Columns
 Public Class LookupControl3
     Inherits GridLookUpEdit
 
+    Private Const TAG_BUTTON_LOOKUP_FORM = "openLookupForm"
+
     <DesignerSerializationVisibility(DesignerSerializationVisibility.Content)>
     Public Shadows ReadOnly Property Properties As RepositoryItemLookupControl3
         Get
@@ -36,33 +38,21 @@ Public Class LookupControl3
         e.Cancel = True
     End Sub
 
-    Friend WithEvents fProperties As RepositoryItemGridLookUpEdit
-    Friend WithEvents fPropertiesView As DevExpress.XtraGrid.Views.Grid.GridView
-
-    Private Sub InitializeComponent()
-        Me.fProperties = New DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit()
-        Me.fPropertiesView = New DevExpress.XtraGrid.Views.Grid.GridView()
-        CType(Me.fProperties, System.ComponentModel.ISupportInitialize).BeginInit()
-        CType(Me.fPropertiesView, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.SuspendLayout()
-        '
-        'fProperties
-        '
-        Me.fProperties.Buttons.AddRange(New DevExpress.XtraEditors.Controls.EditorButton() {New DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)})
-        Me.fProperties.Name = "fProperties"
-        Me.fProperties.PopupView = Me.fPropertiesView
-        '
-        'fPropertiesView
-        '
-        Me.fPropertiesView.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus
-        Me.fPropertiesView.Name = "fPropertiesView"
-        Me.fPropertiesView.OptionsSelection.EnableAppearanceFocusedCell = False
-        Me.fPropertiesView.OptionsView.ShowGroupPanel = False
-        CType(Me.fProperties, System.ComponentModel.ISupportInitialize).EndInit()
-        CType(Me.fPropertiesView, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.ResumeLayout(False)
+    Private Sub LookupControl3_KeyUp(sender As Object, e As KeyEventArgs) Handles Me.KeyUp
+        If e.KeyCode = Keys.F2 Then
+            Dim oLookup As LookupControl3 = sender
+            Dim oButton As EditorButton = oLookup.Properties.Buttons.
+                Where(Function(b) b.Tag = TAG_BUTTON_LOOKUP_FORM).
+                SingleOrDefault()
 
+            If oButton IsNot Nothing Then
+                oLookup.PerformClick(oButton)
+            End If
+        End If
     End Sub
+
+    Shadows WithEvents fProperties As RepositoryItemGridLookUpEdit
+    Friend WithEvents fPropertiesView As DevExpress.XtraGrid.Views.Grid.GridView
 End Class
 
 <UserRepositoryItem("RegisterLookupControl3")>

Controls.LookupGrid/My Project/AssemblyInfo.vb

@@ -12,8 +12,8 @@ Imports System.Runtime.InteropServices
 <Assembly: AssemblyDescription("")>
 <Assembly: AssemblyCompany("Digital Data")>
 <Assembly: AssemblyProduct("LookupGrid")>
-<Assembly: AssemblyCopyright("Copyright © 2022")>
-<Assembly: AssemblyTrademark("3.3.0.0")>
+<Assembly: AssemblyCopyright("Copyright © 2024")>
+<Assembly: AssemblyTrademark("3.4.0.0")>
 
 <Assembly: ComVisible(False)>
 
@@ -31,5 +31,5 @@ Imports System.Runtime.InteropServices
 ' übernehmen, indem Sie "*" eingeben:
 ' <Assembly: AssemblyVersion("1.0.*")>
 
-<Assembly: AssemblyVersion("3.3.0.0")>
-<Assembly: AssemblyFileVersion("3.3.0.0")>
+<Assembly: AssemblyVersion("3.4.4.0")>
+<Assembly: AssemblyFileVersion("3.4.4.0")>

Controls.LookupGrid/My Project/Resources.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "15.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
      Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _

Controls.LookupGrid/My Project/Settings.Designer.vb

@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.4.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase

Controls.LookupGrid/My Project/licenses.licx

@@ -1,3 +1,3 @@
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
 DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

Controls.LookupGrid/My Project/licenses.licx.bak

@@ -1,4 +1,3 @@
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.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.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.Repository.RepositoryItemLookUpEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.Repository.RepositoryItemGridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.GridLookUpEdit, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

Controls.LookupGrid/Resources/Strings.Designer.vb

@@ -1,10 +1,10 @@
 '------------------------------------------------------------------------------
 ' <auto-generated>
-'     Dieser Code wurde von einem Tool generiert.
-'     Laufzeitversion:4.0.30319.42000
+'     This code was generated by a tool.
+'     Runtime Version:4.0.30319.42000
 '
-'     Änderungen an dieser Datei können falsches Verhalten verursachen und gehen verloren, wenn
-'     der Code erneut generiert wird.
+'     Changes to this file may cause incorrect behavior and will be lost if
+'     the code is regenerated.
 ' </auto-generated>
 '------------------------------------------------------------------------------
 
@@ -15,14 +15,14 @@ Imports System
 
 Namespace My.Resources
     
-    'Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
-    '-Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
-    'Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
-    'mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
+    'This class was auto-generated by the StronglyTypedResourceBuilder
+    'class via a tool like ResGen or Visual Studio.
+    'To add or remove a member, edit your .ResX file then rerun ResGen
+    'with the /str option, or rebuild your VS project.
     '''<summary>
-    '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
+    '''  A strongly-typed resource class, for looking up localized strings, etc.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute()>  _
     Friend Class Strings
@@ -37,7 +37,7 @@ Namespace My.Resources
         End Sub
         
         '''<summary>
-        '''  Gibt die zwischengespeicherte ResourceManager-Instanz zurück, die von dieser Klasse verwendet wird.
+        '''  Returns the cached ResourceManager instance used by this class.
         '''</summary>
         <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
         Friend Shared ReadOnly Property ResourceManager() As Global.System.Resources.ResourceManager
@@ -51,8 +51,8 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Überschreibt die CurrentUICulture-Eigenschaft des aktuellen Threads für alle
-        '''  Ressourcenzuordnungen, die diese stark typisierte Ressourcenklasse verwenden.
+        '''  Overrides the current thread's CurrentUICulture property for all
+        '''  resource lookups using this strongly typed resource class.
         '''</summary>
         <Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
         Friend Shared Property Culture() As Global.System.Globalization.CultureInfo
@@ -65,7 +65,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Keine Datensätze ausgewählt ähnelt.
+        '''  Looks up a localized string similar to Keine Datensätze ausgewählt.
         '''</summary>
         Friend Shared ReadOnly Property LookupControl_NoRecords() As String
             Get
@@ -74,7 +74,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die {0} Datensätze ausgewählt ähnelt.
+        '''  Looks up a localized string similar to {0} Datensätze ausgewählt.
         '''</summary>
         Friend Shared ReadOnly Property LookupControl_NRecords() As String
             Get
@@ -83,7 +83,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Bitte wählen Sie einen Wert aus: ähnelt.
+        '''  Looks up a localized string similar to Bitte wählen Sie einen Wert aus:.
         '''</summary>
         Friend Shared ReadOnly Property PopupForm_Text() As String
             Get
@@ -92,7 +92,7 @@ Namespace My.Resources
         End Property
         
         '''<summary>
-        '''  Sucht eine lokalisierte Zeichenfolge, die Bitte wählen Sie einen oder mehrere Werte aus: ähnelt.
+        '''  Looks up a localized string similar to Bitte wählen Sie einen oder mehrere Werte aus:.
         '''</summary>
         Friend Shared ReadOnly Property PopupForm_TextMultiselect() As String
             Get

Controls.LookupGrid/Resources/Strings.fr.resx

@@ -117,8 +117,16 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="database_link" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\database_link.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="LookupControl_NoRecords" xml:space="preserve">
+    <value>Aucun record sélectionné</value>
+  </data>
+  <data name="LookupControl_NRecords" xml:space="preserve">
+    <value>{0} records sélectionnés</value>
+  </data>
+  <data name="PopupForm_Text" xml:space="preserve">
+    <value>Veuillez sélectionner une valeur :</value>
+  </data>
+  <data name="PopupForm_TextMultiselect" xml:space="preserve">
+    <value>Veuillez sélectionner une ou plusieurs valeurs :</value>
   </data>
 </root>

Controls.LookupGrid/frmLookupGrid.Designer.vb

@@ -1,9 +1,9 @@
-<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()> _
+<Global.Microsoft.VisualBasic.CompilerServices.DesignerGenerated()>
 Partial Class frmLookupGrid
     Inherits DevExpress.XtraEditors.XtraForm
 
     'Das Formular überschreibt den Löschvorgang, um die Komponentenliste zu bereinigen.
-    <System.Diagnostics.DebuggerNonUserCode()> _
+    <System.Diagnostics.DebuggerNonUserCode()>
     Protected Overrides Sub Dispose(ByVal disposing As Boolean)
         Try
             If disposing AndAlso components IsNot Nothing Then
@@ -20,7 +20,7 @@ Partial Class frmLookupGrid
     '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.
-    <System.Diagnostics.DebuggerStepThrough()> _
+    <System.Diagnostics.DebuggerStepThrough()>
     Private Sub InitializeComponent()
         Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmLookupGrid))
         Me.gridLookup = New DevExpress.XtraGrid.GridControl()
@@ -36,6 +36,12 @@ Partial Class frmLookupGrid
         'gridLookup
         '
         resources.ApplyResources(Me.gridLookup, "gridLookup")
+        Me.gridLookup.EmbeddedNavigator.AllowHtmlTextInToolTip = CType(resources.GetObject("gridLookup.EmbeddedNavigator.AllowHtmlTextInToolTip"), DevExpress.Utils.DefaultBoolean)
+        Me.gridLookup.EmbeddedNavigator.Anchor = CType(resources.GetObject("gridLookup.EmbeddedNavigator.Anchor"), System.Windows.Forms.AnchorStyles)
+        Me.gridLookup.EmbeddedNavigator.BackgroundImageLayout = CType(resources.GetObject("gridLookup.EmbeddedNavigator.BackgroundImageLayout"), System.Windows.Forms.ImageLayout)
+        Me.gridLookup.EmbeddedNavigator.ImeMode = CType(resources.GetObject("gridLookup.EmbeddedNavigator.ImeMode"), System.Windows.Forms.ImeMode)
+        Me.gridLookup.EmbeddedNavigator.TextLocation = CType(resources.GetObject("gridLookup.EmbeddedNavigator.TextLocation"), DevExpress.XtraEditors.NavigatorButtonsTextLocation)
+        Me.gridLookup.EmbeddedNavigator.ToolTipIconType = CType(resources.GetObject("gridLookup.EmbeddedNavigator.ToolTipIconType"), DevExpress.Utils.ToolTipIconType)
         Me.gridLookup.MainView = Me.viewLookup
         Me.gridLookup.Name = "gridLookup"
         Me.gridLookup.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.viewLookup})
@@ -68,6 +74,8 @@ Partial Class frmLookupGrid
         '
         'frmLookupGrid
         '
+        Me.Appearance.BackColor = System.Drawing.Color.White
+        Me.Appearance.Options.UseBackColor = True
         resources.ApplyResources(Me, "$this")
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.Controls.Add(Me.gridLookup)

Controls.LookupGrid/frmLookupGrid.aa.resx

@@ -118,31 +118,44 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="TextBox" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\TextBox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="gridLookup.EmbeddedNavigator.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
   </data>
-  <data name="iconfinder_Gowalla_324477" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\iconfinder_Gowalla_324477.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="gridLookup.EmbeddedNavigator.AccessibleName" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
   </data>
-  <data name="DatePicker" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\DatePicker.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="gridLookup.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v21.2">
+    <value>Default</value>
   </data>
-  <data name="ComboBox" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ComboBox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="gridLookup.EmbeddedNavigator.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left</value>
   </data>
-  <data name="user_16xLG" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\user_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="gridLookup.EmbeddedNavigator.BackgroundImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
   </data>
-  <data name="CheckBox" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\CheckBox.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="gridLookup.EmbeddedNavigator.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
+    <value>Tile</value>
   </data>
-  <data name="ampel_gelb" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ampel-gelb.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <data name="gridLookup.EmbeddedNavigator.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>Inherit</value>
   </data>
-  <data name="ampel_gruen" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ampel-gruen.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+  <data name="gridLookup.EmbeddedNavigator.MaximumSize" type="System.Drawing.Size, System.Drawing">
+    <value>0, 0</value>
   </data>
-  <data name="ampel_rot" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\ampel-rot.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  <assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="gridLookup.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v21.2">
+    <value>Center</value>
+  </data>
+  <data name="gridLookup.EmbeddedNavigator.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="gridLookup.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v21.2">
+    <value>None</value>
+  </data>
+  <data name="gridLookup.EmbeddedNavigator.ToolTipTitle" xml:space="preserve">
+    <value />
   </data>
 </root>

Controls.LookupGrid/frmLookupGrid.en.resx

@@ -117,12 +117,49 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="btnClear.Text" xml:space="preserve">
-    <value>Clear</value>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="gridLookup.EmbeddedNavigator.AccessibleDescription" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="gridLookup.EmbeddedNavigator.AccessibleName" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="gridLookup.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v21.2">
+    <value>Default</value>
+  </data>
+  <data name="gridLookup.EmbeddedNavigator.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Left</value>
+  </data>
+  <data name="gridLookup.EmbeddedNavigator.BackgroundImage" type="System.Resources.ResXNullRef, System.Windows.Forms">
+    <value />
+  </data>
+  <data name="gridLookup.EmbeddedNavigator.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
+    <value>Tile</value>
+  </data>
+  <data name="gridLookup.EmbeddedNavigator.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>Inherit</value>
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
-  <data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
-    <value>390, 293</value>
+  <data name="gridLookup.EmbeddedNavigator.MaximumSize" type="System.Drawing.Size, System.Drawing">
+    <value>0, 0</value>
+  </data>
+  <assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="gridLookup.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v21.2">
+    <value>Center</value>
+  </data>
+  <data name="gridLookup.EmbeddedNavigator.ToolTip" xml:space="preserve">
+    <value />
+  </data>
+  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="gridLookup.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v21.2">
+    <value>None</value>
+  </data>
+  <data name="gridLookup.EmbeddedNavigator.ToolTipTitle" xml:space="preserve">
+    <value />
+  </data>
+  <data name="btnClear.Text" xml:space="preserve">
+    <value>Clear</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
     <value>Choose a value:</value>

Controls.LookupGrid/frmLookupGrid.fr.resx

@@ -117,10 +117,10 @@
   <resheader name="writer">
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
-  <data name="TileGroupDocuments.Text" xml:space="preserve">
-    <value>Documents</value>
+  <data name="btnClear.Text" xml:space="preserve">
+    <value>Vider</value>
   </data>
   <data name="$this.Text" xml:space="preserve">
-    <value>Clipboard Watcher - {0} Profile gefunden</value>
+    <value>Choisissez une valeur :</value>
   </data>
 </root>

Controls.LookupGrid/frmLookupGrid.resx

@@ -118,15 +118,36 @@
     <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
   <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
-  <data name="gridLookup.Dock" type="System.Windows.Forms.DockStyle, System.Windows.Forms">
-    <value>Fill</value>
+  <data name="gridLookup.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Top, Bottom, Left, Right</value>
+  </data>
+  <assembly alias="DevExpress.Data.v21.2" name="DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="gridLookup.EmbeddedNavigator.AllowHtmlTextInToolTip" type="DevExpress.Utils.DefaultBoolean, DevExpress.Data.v21.2">
+    <value>True</value>
+  </data>
+  <data name="gridLookup.EmbeddedNavigator.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>None</value>
+  </data>
+  <data name="gridLookup.EmbeddedNavigator.BackgroundImageLayout" type="System.Windows.Forms.ImageLayout, System.Windows.Forms">
+    <value>None</value>
+  </data>
+  <data name="gridLookup.EmbeddedNavigator.ImeMode" type="System.Windows.Forms.ImeMode, System.Windows.Forms">
+    <value>NoControl</value>
+  </data>
+  <assembly alias="DevExpress.XtraEditors.v21.2" name="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="gridLookup.EmbeddedNavigator.TextLocation" type="DevExpress.XtraEditors.NavigatorButtonsTextLocation, DevExpress.XtraEditors.v21.2">
+    <value>None</value>
+  </data>
+  <assembly alias="DevExpress.Utils.v21.2" name="DevExpress.Utils.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+  <data name="gridLookup.EmbeddedNavigator.ToolTipIconType" type="DevExpress.Utils.ToolTipIconType, DevExpress.Utils.v21.2">
+    <value>Application</value>
   </data>
   <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
   <data name="gridLookup.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 0</value>
+    <value>12, 2</value>
   </data>
   <data name="gridLookup.Size" type="System.Drawing.Size, System.Drawing">
-    <value>388, 221</value>
+    <value>469, 260</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="gridLookup.TabIndex" type="System.Int32, mscorlib">
@@ -144,11 +165,14 @@
   <data name="&gt;&gt;gridLookup.ZOrder" xml:space="preserve">
     <value>0</value>
   </data>
+  <data name="btnOK.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
+    <value>Bottom, Left</value>
+  </data>
   <data name="btnOK.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 6</value>
+    <value>3, 10</value>
   </data>
   <data name="btnOK.Size" type="System.Drawing.Size, System.Drawing">
-    <value>117, 23</value>
+    <value>117, 32</value>
   </data>
   <data name="btnOK.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -169,13 +193,13 @@
     <value>0</value>
   </data>
   <data name="btnClear.Anchor" type="System.Windows.Forms.AnchorStyles, System.Windows.Forms">
-    <value>Top, Right</value>
+    <value>Bottom, Left</value>
   </data>
   <data name="btnClear.Location" type="System.Drawing.Point, System.Drawing">
-    <value>240, 6</value>
+    <value>135, 10</value>
   </data>
   <data name="btnClear.Size" type="System.Drawing.Size, System.Drawing">
-    <value>136, 23</value>
+    <value>117, 32</value>
   </data>
   <data name="btnClear.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -199,10 +223,13 @@
     <value>Bottom</value>
   </data>
   <data name="Panel1.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 221</value>
+    <value>0, 271</value>
+  </data>
+  <data name="Panel1.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>6, 6, 6, 6</value>
   </data>
   <data name="Panel1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>388, 40</value>
+    <value>493, 45</value>
   </data>
   <data name="Panel1.TabIndex" type="System.Int32, mscorlib">
     <value>1</value>
@@ -226,7 +253,7 @@
     <value>6, 13</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>388, 261</value>
+    <value>493, 316</value>
   </data>
   <data name="$this.MinimumSize" type="System.Drawing.Size, System.Drawing">
     <value>390, 293</value>

Controls.LookupGrid/frmLookupGrid.vb

@@ -22,6 +22,8 @@ Public Class frmLookupGrid
     Private _Grid As GridControl
     Private ReadOnly _R As Resources.ResourceManager = My.Resources.Strings.ResourceManager
 
+    Private colCheckbox As GridColumn
+
 #Region "Form Events"
     Private Sub frmLookupGrid_Load(sender As Object, e As EventArgs) Handles Me.Load
         _View = viewLookup
@@ -57,12 +59,12 @@ Public Class frmLookupGrid
 
         If MultiSelect Then
             ' Selected Spalte anpassen
-            Dim oCheckboxColumn = _View.Columns.Item(0)
+            colCheckbox = _View.Columns.Item(0)
             'oCheckboxColumn.Visible = False
-            oCheckboxColumn.Caption = " "
-            oCheckboxColumn.MaxWidth = 30
-            oCheckboxColumn.MinWidth = 30
-            oCheckboxColumn.OptionsColumn.AllowFocus = False
+            colCheckbox.Caption = " "
+            colCheckbox.MaxWidth = 30
+            colCheckbox.MinWidth = 30
+            colCheckbox.OptionsColumn.AllowFocus = False
 
 
             Text = _R.GetString("PopupForm_TextMultiselect")
@@ -96,8 +98,10 @@ Public Class frmLookupGrid
         _View.BestFitColumns()
 
         ' Datenspalte zusätzlich in der Breite anpassen
-        Dim oDataColumn As GridColumn = _View.Columns.Item(_DataColumn)
-        oDataColumn.BestFit()
+        If _View.Columns.Count = 0 Then
+            Dim oDataColumn As GridColumn = _View.Columns.Item(_DataColumn)
+            oDataColumn.BestFit()
+        End If
     End Sub
     Private Sub frmLookupGrid_Shown(sender As Object, e As EventArgs) Handles Me.Shown
         BringToFront()
@@ -105,14 +109,24 @@ Public Class frmLookupGrid
 #End Region
 #Region "Button Events"
     Private Sub btnOK_Click(sender As Object, e As EventArgs) Handles btnOK.Click
-        SaveSelectedValues()
+        SaveAndClose()
+    End Sub
+
+    Private Sub btnClear_Click(sender As Object, e As EventArgs) Handles btnClear.Click
+        ClearAndClose()
+    End Sub
+
+    Private Sub ClearAndClose()
+        SelectedValues = New List(Of String)
 
         DialogResult = DialogResult.OK
         Close()
     End Sub
 
-    Private Sub btnClear_Click(sender As Object, e As EventArgs) Handles btnClear.Click
-        SelectedValues = New List(Of String)
+    Private Sub SaveAndClose()
+        ' Make sure the currently focused row's state is saved
+        viewLookup.PostEditor()
+        SaveSelectedValues()
 
         DialogResult = DialogResult.OK
         Close()
@@ -128,17 +142,29 @@ Public Class frmLookupGrid
     End Sub
 
     Private Sub HandleCustomKeys(e As KeyEventArgs)
-        If e.KeyCode = Keys.Escape Then
-            Close()
+        Select Case e.KeyCode
+            Case Keys.Escape
+                Close()
 
-        ElseIf e.KeyCode = Keys.F2 Then
-            ' Make sure the currently focused row's state is saved
-            viewLookup.PostEditor()
-            SaveSelectedValues()
+            Case Keys.F2
+                SaveAndClose()
 
-            DialogResult = DialogResult.OK
-            Close()
-        End If
+            Case Keys.Back
+                ClearAndClose()
+
+            Case Keys.Space
+                If MultiSelect Then
+                    Dim oHandle = viewLookup.FocusedRowHandle
+                    If oHandle >= 0 Then
+                        Dim oIsChecked = viewLookup.GetRowCellValue(oHandle, colCheckbox)
+                        If oIsChecked Then
+                            viewLookup.SetRowCellValue(oHandle, colCheckbox, False)
+                        Else
+                            viewLookup.SetRowCellValue(oHandle, colCheckbox, True)
+                        End If
+                    End If
+                End If
+        End Select
     End Sub
 #End Region
 #Region "View Events"

Controls.RegexEditor/App.config

@@ -1,6 +1,6 @@
-<?xml version="1.0" encoding="utf-8" ?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
     <startup>
-        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+        <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
     </startup>
-</configuration>
+</configuration>

Controls.RegexEditor/My Project/Resources.Designer.vb

@@ -22,7 +22,7 @@ Namespace My.Resources
     '''<summary>
     '''  Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     '''</summary>
-    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "16.0.0.0"),  _
+    <Global.System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0"),  _
      Global.System.Diagnostics.DebuggerNonUserCodeAttribute(),  _
      Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
      Global.Microsoft.VisualBasic.HideModuleNameAttribute()>  _

Controls.RegexEditor/My Project/Settings.Designer.vb

@@ -15,7 +15,7 @@ Option Explicit On
 Namespace My
     
     <Global.System.Runtime.CompilerServices.CompilerGeneratedAttribute(),  _
-     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "15.7.0.0"),  _
+     Global.System.CodeDom.Compiler.GeneratedCodeAttribute("Microsoft.VisualStudio.Editors.SettingsDesigner.SettingsSingleFileGenerator", "17.3.0.0"),  _
      Global.System.ComponentModel.EditorBrowsableAttribute(Global.System.ComponentModel.EditorBrowsableState.Advanced)>  _
     Partial Friend NotInheritable Class MySettings
         Inherits Global.System.Configuration.ApplicationSettingsBase

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

Controls.RegexEditor/My Project/licenses.licx.bak

@@ -1,3 +1 @@
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

Controls.RegexEditor/RegexEditor.vbproj

@@ -12,8 +12,9 @@
     <AssemblyName>DigitalData.Controls.RegexEditor</AssemblyName>
     <FileAlignment>512</FileAlignment>
     <MyType>Windows</MyType>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <AutoGenerateBindingRedirects>true</AutoGenerateBindingRedirects>
+    <TargetFrameworkProfile />
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
     <PlatformTarget>AnyCPU</PlatformTarget>
@@ -55,11 +56,16 @@
     <Reference Include="DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
     <Reference Include="DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
     </Reference>
     <Reference Include="DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL">
       <SpecificVersion>False</SpecificVersion>
-      
+    </Reference>
+    <Reference Include="DigitalData.Modules.Language, Version=1.6.0.0, Culture=neutral, processorArchitecture=MSIL">
+      <SpecificVersion>False</SpecificVersion>
+      <HintPath>..\..\DDModules\Language\bin\Debug\DigitalData.Modules.Language.dll</HintPath>
+    </Reference>
+    <Reference Include="DigitalData.Modules.Logging">
+      <HintPath>..\..\DDModules\Logging\bin\Debug\DigitalData.Modules.Logging.dll</HintPath>
     </Reference>
     <Reference Include="PresentationCore" />
     <Reference Include="System" />
@@ -95,6 +101,7 @@
     <Compile Include="My Project\Application.Designer.vb">
       <AutoGen>True</AutoGen>
       <DependentUpon>Application.myapp</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <Compile Include="My Project\Resources.Designer.vb">
       <AutoGen>True</AutoGen>
@@ -138,12 +145,6 @@
     </None>
     <None Include="App.config" />
   </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Modules.Language\Language.vbproj">
-      <Project>{d3c8cfed-d6f6-43a8-9bdf-454145d0352f}</Project>
-      <Name>Language</Name>
-    </ProjectReference>
-  </ItemGroup>
   <ItemGroup>
     <None Include="Resources\actions_check.svg" />
   </ItemGroup>

Controls.SQLEditor/My Project/Resources.Designer.vb

@@ -120,6 +120,26 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property autoarrange() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("autoarrange", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property bo_contract() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("bo_contract", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>
@@ -170,6 +190,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property editdatasource2() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("editdatasource2", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>
@@ -180,6 +210,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property handtool() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("handtool", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>
@@ -200,6 +240,16 @@ Namespace My.Resources
             End Get
         End Property
         
+        '''<summary>
+        '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
+        '''</summary>
+        Friend ReadOnly Property togglefieldcodes() As DevExpress.Utils.Svg.SvgImage
+            Get
+                Dim obj As Object = ResourceManager.GetObject("togglefieldcodes", resourceCulture)
+                Return CType(obj,DevExpress.Utils.Svg.SvgImage)
+            End Get
+        End Property
+        
         '''<summary>
         '''  Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage.
         '''</summary>

Controls.SQLEditor/My Project/Resources.resx

@@ -124,8 +124,8 @@
   <data name="removegroupheader" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\removegroupheader.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="actions_user" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_user.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="togglefieldcodes" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\togglefieldcodes.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="editdatasource" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\editdatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -139,23 +139,38 @@
   <data name="highimportance" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\highimportance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="actions_database" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_database.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="autoarrange" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\autoarrange.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="cleartablestyle" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\cleartablestyle.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="handtool" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\handtool.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="electronics_desktopmac" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\electronics_desktopmac.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="editdatasource2" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\editdatasource2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="clearall" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\clearall.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="actions_database2" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\actions_database2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="updatedataextract3" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\updatedataextract3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
+  <data name="actions_database1" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_database1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="updatedataextract1" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\updatedataextract1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="updatedataextract3" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\updatedataextract3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="actions_user" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_user.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
   <data name="actions_checkcircled" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\actions_checkcircled.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
@@ -166,10 +181,10 @@
   <data name="updatedataextract" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\updatedataextract.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="actions_database1" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\actions_database1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="actions_database" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\actions_database.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="cleartablestyle" type="System.Resources.ResXFileRef, System.Windows.Forms">
-    <value>..\Resources\cleartablestyle.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  <data name="bo_contract" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\bo_contract.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
 </root>

Controls.SQLEditor/My Project/licenses.licx

@@ -1,5 +0,0 @@
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a

Controls.SQLEditor/My Project/licenses.licx.bak

@@ -1,6 +1,5 @@
-DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v19.2, Version=19.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
-DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v19.2, Version=19.2.3.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.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraRichEdit.RichEditControl, DevExpress.XtraRichEdit.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a
+DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a