MS3

2015-11-16 16:05:29 +01:00 · 2015-11-16 16:05:29 +01:00 · 9d1ff24567
commit 9d1ff24567
parent 69b738413a
4 changed files with 187 additions and 89 deletions
--- a/app/DD-Record-Organiser/frmForm_Constructor_Main.Designer.vb
+++ b/app/DD-Record-Organiser/frmForm_Constructor_Main.Designer.vb
@ -52,6 +52,10 @@ Partial Class frmForm_Constructor_Main
        Me.SplitContainerMain = New DevExpress.XtraEditors.SplitContainerControl()
        Me.SplitContainerTop = New DevExpress.XtraEditors.SplitContainerControl()
        Me.TreeViewMain = New System.Windows.Forms.TreeView()
+        Me.CMSEntity = New System.Windows.Forms.ContextMenuStrip(Me.components)
+        Me.ResetEbenenAuswahlToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.DateiimportEntitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
+        Me.FormularDesignerToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        Me.SplitContainerBottom = New DevExpress.XtraEditors.SplitContainerControl()
        Me.TCDetails = New DevExpress.XtraTab.XtraTabControl()
        Me.TabDetails = New DevExpress.XtraTab.XtraTabPage()
@ -105,9 +109,6 @@ Partial Class frmForm_Constructor_Main
        Me.VWPMO_WF_ACTIVEBindingSource = New System.Windows.Forms.BindingSource(Me.components)
        Me.VWPMO_WF_ACTIVETableAdapter = New DD_Record_Organiser.DD_DMSDataSetTableAdapters.VWPMO_WF_ACTIVETableAdapter()
        Me.TBPMO_FILES_USERBindingSource = New System.Windows.Forms.BindingSource(Me.components)
-        Me.CMSEntity = New System.Windows.Forms.ContextMenuStrip(Me.components)
-        Me.ResetEbenenAuswahlToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
-        Me.DateiimportEntitätToolStripMenuItem = New System.Windows.Forms.ToolStripMenuItem()
        CType(Me.grvwGrid, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.GridControlMain, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.ContextMenuGrid.SuspendLayout()
@ -118,6 +119,7 @@ Partial Class frmForm_Constructor_Main
        Me.SplitContainerMain.SuspendLayout()
        CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainerTop.SuspendLayout()
+        Me.CMSEntity.SuspendLayout()
        CType(Me.SplitContainerBottom, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SplitContainerBottom.SuspendLayout()
        CType(Me.TCDetails, System.ComponentModel.ISupportInitialize).BeginInit()
@ -137,7 +139,6 @@ Partial Class frmForm_Constructor_Main
        CType(Me.VWPMO_WF_USER_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
        CType(Me.TBPMO_FILES_USERBindingSource, System.ComponentModel.ISupportInitialize).BeginInit()
-        Me.CMSEntity.SuspendLayout()
        Me.SuspendLayout()
        '
        'grvwGrid
@ -378,6 +379,7 @@ Partial Class frmForm_Constructor_Main
        '
        Me.TreeViewMain.BackColor = System.Drawing.SystemColors.GradientInactiveCaption
        Me.TreeViewMain.BorderStyle = System.Windows.Forms.BorderStyle.FixedSingle
+        Me.TreeViewMain.ContextMenuStrip = Me.CMSEntity
        Me.TreeViewMain.Dock = System.Windows.Forms.DockStyle.Fill
        Me.TreeViewMain.Font = New System.Drawing.Font("Segoe UI", 9.75!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
        Me.TreeViewMain.FullRowSelect = True
@ -387,6 +389,31 @@ Partial Class frmForm_Constructor_Main
        Me.TreeViewMain.Size = New System.Drawing.Size(283, 270)
        Me.TreeViewMain.TabIndex = 0
        '
+        'CMSEntity
+        '
+        Me.CMSEntity.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ResetEbenenAuswahlToolStripMenuItem, Me.DateiimportEntitätToolStripMenuItem, Me.FormularDesignerToolStripMenuItem})
+        Me.CMSEntity.Name = "ContextMenuStrip2"
+        Me.CMSEntity.Size = New System.Drawing.Size(195, 70)
+        '
+        'ResetEbenenAuswahlToolStripMenuItem
+        '
+        Me.ResetEbenenAuswahlToolStripMenuItem.Name = "ResetEbenenAuswahlToolStripMenuItem"
+        Me.ResetEbenenAuswahlToolStripMenuItem.Size = New System.Drawing.Size(194, 22)
+        Me.ResetEbenenAuswahlToolStripMenuItem.Text = "Reset Ebenen-Auswahl"
+        '
+        'DateiimportEntitätToolStripMenuItem
+        '
+        Me.DateiimportEntitätToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.folder_Open_32xMD
+        Me.DateiimportEntitätToolStripMenuItem.Name = "DateiimportEntitätToolStripMenuItem"
+        Me.DateiimportEntitätToolStripMenuItem.Size = New System.Drawing.Size(194, 22)
+        Me.DateiimportEntitätToolStripMenuItem.Text = "Dateiimport Entität"
+        '
+        'FormularDesignerToolStripMenuItem
+        '
+        Me.FormularDesignerToolStripMenuItem.Name = "FormularDesignerToolStripMenuItem"
+        Me.FormularDesignerToolStripMenuItem.Size = New System.Drawing.Size(194, 22)
+        Me.FormularDesignerToolStripMenuItem.Text = "Formular-Designer"
+        '
        'SplitContainerBottom
        '
        Me.SplitContainerBottom.Collapsed = True
@ -845,25 +872,6 @@ Partial Class frmForm_Constructor_Main
        Me.TBPMO_FILES_USERBindingSource.DataMember = "TBPMO_FILES_USER"
        Me.TBPMO_FILES_USERBindingSource.DataSource = Me.DD_DMSDataSet
        '
-        'CMSEntity
-        '
-        Me.CMSEntity.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.ResetEbenenAuswahlToolStripMenuItem, Me.DateiimportEntitätToolStripMenuItem})
-        Me.CMSEntity.Name = "ContextMenuStrip2"
-        Me.CMSEntity.Size = New System.Drawing.Size(195, 48)
-        '
-        'ResetEbenenAuswahlToolStripMenuItem
-        '
-        Me.ResetEbenenAuswahlToolStripMenuItem.Name = "ResetEbenenAuswahlToolStripMenuItem"
-        Me.ResetEbenenAuswahlToolStripMenuItem.Size = New System.Drawing.Size(194, 22)
-        Me.ResetEbenenAuswahlToolStripMenuItem.Text = "Reset Ebenen-Auswahl"
-        '
-        'DateiimportEntitätToolStripMenuItem
-        '
-        Me.DateiimportEntitätToolStripMenuItem.Image = Global.DD_Record_Organiser.My.Resources.Resources.folder_Open_32xMD
-        Me.DateiimportEntitätToolStripMenuItem.Name = "DateiimportEntitätToolStripMenuItem"
-        Me.DateiimportEntitätToolStripMenuItem.Size = New System.Drawing.Size(194, 22)
-        Me.DateiimportEntitätToolStripMenuItem.Text = "Dateiimport Entität"
-        '
        'frmForm_Constructor_Main
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
@ -885,6 +893,7 @@ Partial Class frmForm_Constructor_Main
        Me.SplitContainerMain.ResumeLayout(False)
        CType(Me.SplitContainerTop, System.ComponentModel.ISupportInitialize).EndInit()
        Me.SplitContainerTop.ResumeLayout(False)
+        Me.CMSEntity.ResumeLayout(False)
        CType(Me.SplitContainerBottom, System.ComponentModel.ISupportInitialize).EndInit()
        Me.SplitContainerBottom.ResumeLayout(False)
        CType(Me.TCDetails, System.ComponentModel.ISupportInitialize).EndInit()
@ -910,7 +919,6 @@ Partial Class frmForm_Constructor_Main
        CType(Me.VWPMO_WF_USER_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.VWPMO_WF_ACTIVEBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
        CType(Me.TBPMO_FILES_USERBindingSource, System.ComponentModel.ISupportInitialize).EndInit()
-        Me.CMSEntity.ResumeLayout(False)
        Me.ResumeLayout(False)
        Me.PerformLayout()

@ -997,4 +1005,5 @@ Partial Class frmForm_Constructor_Main
    Friend WithEvents ResetEbenenAuswahlToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
    Friend WithEvents DateiimportEntitätToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
    Friend WithEvents tsslblWorkflowstate As System.Windows.Forms.ToolStripStatusLabel
+    Friend WithEvents FormularDesignerToolStripMenuItem As System.Windows.Forms.ToolStripMenuItem
 End Class
--- a/app/DD-Record-Organiser/frmForm_Constructor_Main.resx
+++ b/app/DD-Record-Organiser/frmForm_Constructor_Main.resx
@ -118,7 +118,7 @@
    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
  </resheader>
  <metadata name="ContextMenuGrid.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>477, 15</value>
+    <value>463, 11</value>
  </metadata>
  <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
  <data name="NavButtonHome.Glyph" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -151,6 +151,9 @@
  <metadata name="StatusStrip_Main.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 17</value>
  </metadata>
+  <metadata name="CMSEntity.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>17, 93</value>
+  </metadata>
  <data name="AxObjectListControl.OcxState" mimetype="application/x-microsoft.net.object.binary.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFdTeXN0ZW0uV2luZG93cy5Gb3JtcywgVmVyc2lvbj00LjAuMC4w
@ -160,10 +163,7 @@
 </value>
  </data>
  <metadata name="ToolStripDokumente.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1157, 15</value>
-  </metadata>
-  <metadata name="ToolStripEdit.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>773, 15</value>
+    <value>1143, 11</value>
  </metadata>
  <data name="ToolStripDropDownButton2.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
@ -178,14 +178,17 @@
        DwcIdDRYJUwiAB0yTe/NNUuIXy/etxLLTTpKAAAAAElFTkSuQmCC
 </value>
  </data>
+  <metadata name="ToolStripEdit.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
+    <value>759, 11</value>
+  </metadata>
  <metadata name="BindingSource_Entity.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>162, 11</value>
  </metadata>
  <metadata name="DD_ECMAdmin.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>342, 15</value>
+    <value>328, 11</value>
  </metadata>
  <metadata name="ImageCollection1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>626, 15</value>
+    <value>612, 11</value>
  </metadata>
  <assembly alias="DevExpress.Utils.v15.1" name="DevExpress.Utils.v15.1, Version=15.1.7.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
  <data name="ImageCollection1.ImageStream" type="DevExpress.Utils.ImageCollectionStreamer, DevExpress.Utils.v15.1" mimetype="application/x-microsoft.net.object.bytearray.base64">
@ -196,13 +199,13 @@
 </value>
  </data>
  <metadata name="ttToolTip.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>894, 15</value>
+    <value>880, 11</value>
  </metadata>
  <metadata name="ContextMenuDetails.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>995, 15</value>
+    <value>981, 11</value>
  </metadata>
  <metadata name="DD_DMSDataSet.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>1322, 15</value>
+    <value>1308, 11</value>
  </metadata>
  <metadata name="VWPMO_WF_USER_ACTIVEBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>17, 54</value>
@ -225,7 +228,4 @@
  <metadata name="TBPMO_FILES_USERBindingSource.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
    <value>1222, 54</value>
  </metadata>
-  <metadata name="CMSEntity.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
-    <value>17, 93</value>
-  </metadata>
 </root>
--- a/app/DD-Record-Organiser/frmForm_Constructor_Main.vb
+++ b/app/DD-Record-Organiser/frmForm_Constructor_Main.vb
@ -104,9 +104,6 @@ Public Class frmForm_Constructor_Main
        Me.Cursor = Cursors.WaitCursor

        Init_Grid_Control()
-
-      
-
        Try

            'SplitCont_Details.Collapsed = True
@ -123,7 +120,11 @@ Public Class frmForm_Constructor_Main
            End If
            Load_Tree_View(CONSTRUCTORID)
            FORM_LOADED = True
-
+            If USER_IS_ADMIN = True Then
+                FormularDesignerToolStripMenuItem.Visible = True
+            Else
+                FormularDesignerToolStripMenuItem.Visible = False
+            End If
        Catch ex As System.Exception
            MsgBox("Error while Loading Form" & vbNewLine & ex.Message, MsgBoxStyle.Critical)
            System.Windows.Forms.MessageBox.Show(ex.Message)
@ -1635,55 +1636,80 @@ Public Class frmForm_Constructor_Main

                    AxObjectListControl.SetIconMode(True)
                    AxObjectListControl.RemoveAllColumnHeader()
+                    Me.AxObjectListControl.SetSession(ClassWindream.oSession, "", "")
+                    'Change the status icon
+                    'ICON STATES:
+                    Me.AxObjectListControl.SetStatusIcon(0)
+                    'Change the icon
+                    Me.AxObjectListControl.SetStatusIcon(2)
+
                    Try
                        Dim sql_ResultList = "select * from TBPMO_WINDREAM_RESULTLIST_CONFIG where guid = 1"
                        Dim DT As DataTable = ClassDatabase.Return_Datatable(sql_ResultList, "GET RESULTLIST KONFIG")
-                        If Not DT Is Nothing Then
+                        If Not DT Is Nothing And DT.Rows.Count = 1 Then
+                            Dim anzparam As Integer = 1
+                            For Each Column As DataColumn In DT.Columns
+                                If Column.ColumnName.StartsWith("COLUMN") And Column.ColumnName.EndsWith("WIDTH") = False Then
+                                    Dim sql = String.Format("select {0} from TBPMO_WINDREAM_RESULTLIST_CONFIG Where GUID = 1", Column.ColumnName)
+                                    Dim ColumnName = ClassDatabase.Execute_Scalar(sql, True)
+                                    If Not IsDBNull(ColumnName) Then
+                                        If Not IsDBNull(ColumnName) Or IsNothing(ColumnName) Or ColumnName <> "" Or ColumnName <> "{}" Then
+                                            'Jetzt die Spalten aus Array hinzufügen und Breite konfigurieren
+                                            sql = String.Format("select COLUMN{0}_WIDTH from TBPMO_WINDREAM_RESULTLIST_CONFIG Where GUID = 1", anzparam)
+                                            Dim Width = ClassDatabase.Execute_Scalar(sql, True)
+                                            If IsNothing(Width) Or IsDBNull(Width) Then
+                                                Width = 200
+                                            End If
+                                            'You need to use the column name here
+                                            'Please note that some attributes or indices will not be displayed
+                                            'Try not to add the same header twice, it will throw cause problems if you do that
+                                            Me.AxObjectListControl.AddColumnHeader(ColumnName, Width)
+                                            anzparam += 1
+                                        End If
+                                    End If
+                                End If
+                            Next
+                        Else
+                            Dim param As New List(Of String)
+                            'The file name
+                            param.Add("szLongName")
+                            'The document-Type
+                            param.Add("szText39")
+                            'Versionsnummer
+                            param.Add("dwVersionNumber")
+                            'Datumsangaben
+                            param.Add("dwCreationDate")
+                            param.Add("dwCreation_Time")
+
+                            'Add all search params
+                            For Each spar As String In param
+                                Dim width As Integer = 200
+                                Select Case spar
+                                    Case "szLongName"
+                                        'Dateiname
+                                        width = 300
+                                    Case "szText39"
+                                        'Dokumentart
+                                        width = 160
+                                    Case "dwCreationDate"
+                                        'Erstelldatum
+                                        width = 90
+                                    Case "dwCreation_Time"
+                                        'Erstell-Zeit
+                                        width = 120
+                                End Select
+                                'You need to use the column name here
+                                'Please note that some attributes or indices will not be displayed
+                                'Try not to add the same header twice, it will throw cause problems if you do that
+                                Me.AxObjectListControl.AddColumnHeader(spar, width)
+                            Next

                        End If
-                    Catch ex As Exception
+            Catch ex As Exception
+                MsgBox("Unexpected Error in Construct windreamResultList: " & vbNewLine & ex.Message, MsgBoxStyle.Critical)
+            End Try

-                    End Try
-
-                    Dim param As New List(Of String)
-                    'The file name
-                    param.Add("szLongName")
-                    'The document-Type
-                    param.Add("szText39")
-                    'Versionsnummer
-                    param.Add("dwVersionNumber")
-                    'Datumsangaben
-                    param.Add("dwCreationDate")
-                    param.Add("dwCreation_Time")
-                    Me.AxObjectListControl.SetSession(ClassWindream.oSession, "", "")
-                    'Change the satus icon
-                    'ICON STATES:
-                    Me.AxObjectListControl.SetStatusIcon(0)
-
-                    'Change the icon
-                    Me.AxObjectListControl.SetStatusIcon(2)
-                    'Add all search params
-                    For Each spar As String In param
-                        Dim width As Integer = 200
-                        Select Case spar
-                            Case "szLongName"
-                                'Dateiname
-                                width = 300
-                            Case "szText39"
-                                'Dokumentart
-                                width = 160
-                            Case "dwCreationDate"
-                                'Erstelldatum
-                                width = 90
-                            Case "dwCreation_Time"
-                                'Erstell-Zeit
-                                width = 120
-                        End Select
-                        'You need to use the column name here
-                        'Please note that some attributes or indices will not be displayed
-                        'Try not to add the same header twice, it will throw cause problems if you do that
-                        Me.AxObjectListControl.AddColumnHeader(spar, width)
-                    Next
+                  
                    If LogErrorsOnly = False Then ClassLogger.Add(">> AxObjectListControl geladen ", False)
                    'Execute the search
                    Dim results As WMObjects = windreamSucheErgebnisse
@ -2137,4 +2163,25 @@ Public Class frmForm_Constructor_Main
    Private Sub ZeigeRecordLogsToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles ZeigeRecordLogsToolStripMenuItem.Click
        frmRecord_Changes.ShowDialog()
    End Sub
+
+    Private Sub FormularDesignerToolStripMenuItem_Click(sender As Object, e As EventArgs) Handles FormularDesignerToolStripMenuItem.Click
+        Try
+            Dim SelectedNode As TreeNode = TryCast(TreeViewMain.SelectedNode, TreeNode)
+            If SelectedNode IsNot Nothing Then
+                Dim FormId As Integer = SelectedNode.Tag
+                If FormId > 0 Then
+                    CURRENT_FORM_ID = FormId
+                    Cursor = Cursors.WaitCursor
+                    OpenFormLevelDesigner()
+                    Cursor = Cursors.Default
+                End If
+            End If
+        Catch ex As Exception
+            MsgBox("Unexpected Error in Open Designer: " & ex.Message, MsgBoxStyle.Critical)
+        End Try
+    End Sub
+
+    Private Sub frmForm_Constructor_Main_MaximizedBoundsChanged(sender As Object, e As EventArgs) Handles Me.MaximizedBoundsChanged
+
+    End Sub
 End Class
--- a/app/DD-Record-Organiser/frmSplash.Designer.vb
+++ b/app/DD-Record-Organiser/frmSplash.Designer.vb
@ -31,7 +31,12 @@ Partial Class frmSplash
        Me.lblStatus = New System.Windows.Forms.Label()
        Me.pbStatus = New System.Windows.Forms.ProgressBar()
        Me.TableLayoutPanel1 = New System.Windows.Forms.TableLayoutPanel()
+        Me.PictureBox1 = New System.Windows.Forms.PictureBox()
+        Me.PictureBox2 = New System.Windows.Forms.PictureBox()
+        Me.Label1 = New System.Windows.Forms.Label()
        Me.TableLayoutPanel1.SuspendLayout()
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).BeginInit()
        Me.SuspendLayout()
        '
        'Version
@ -63,9 +68,9 @@ Partial Class frmSplash
        Me.ApplicationTitle.Anchor = System.Windows.Forms.AnchorStyles.None
        Me.ApplicationTitle.BackColor = System.Drawing.Color.Transparent
        Me.ApplicationTitle.Font = New System.Drawing.Font("Segoe UI", 18.0!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
-        Me.ApplicationTitle.Location = New System.Drawing.Point(343, 210)
+        Me.ApplicationTitle.Location = New System.Drawing.Point(298, 222)
        Me.ApplicationTitle.Name = "ApplicationTitle"
-        Me.ApplicationTitle.Size = New System.Drawing.Size(219, 136)
+        Me.ApplicationTitle.Size = New System.Drawing.Size(264, 33)
        Me.ApplicationTitle.TabIndex = 0
        Me.ApplicationTitle.Text = "Anwendungstitel"
        Me.ApplicationTitle.TextAlign = System.Drawing.ContentAlignment.BottomLeft
@ -96,7 +101,7 @@ Partial Class frmSplash
        Me.TableLayoutPanel1.ColumnStyles.Add(New System.Windows.Forms.ColumnStyle())
        Me.TableLayoutPanel1.Controls.Add(Me.Copyright, 0, 1)
        Me.TableLayoutPanel1.Controls.Add(Me.Version, 0, 0)
-        Me.TableLayoutPanel1.Location = New System.Drawing.Point(343, 349)
+        Me.TableLayoutPanel1.Location = New System.Drawing.Point(304, 258)
        Me.TableLayoutPanel1.Name = "TableLayoutPanel1"
        Me.TableLayoutPanel1.RowCount = 2
        Me.TableLayoutPanel1.RowStyles.Add(New System.Windows.Forms.RowStyle(System.Windows.Forms.SizeType.Percent, 50.0!))
@ -105,18 +110,50 @@ Partial Class frmSplash
        Me.TableLayoutPanel1.Size = New System.Drawing.Size(219, 42)
        Me.TableLayoutPanel1.TabIndex = 2
        '
+        'PictureBox1
+        '
+        Me.PictureBox1.Image = Global.DD_Record_Organiser.My.Resources.Resources.windream_Logo_transparent
+        Me.PictureBox1.Location = New System.Drawing.Point(303, 322)
+        Me.PictureBox1.Name = "PictureBox1"
+        Me.PictureBox1.Size = New System.Drawing.Size(112, 52)
+        Me.PictureBox1.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
+        Me.PictureBox1.TabIndex = 3
+        Me.PictureBox1.TabStop = False
+        '
+        'PictureBox2
+        '
+        Me.PictureBox2.Image = Global.DD_Record_Organiser.My.Resources.Resources.DD_Icons_ADDI
+        Me.PictureBox2.Location = New System.Drawing.Point(0, 0)
+        Me.PictureBox2.Name = "PictureBox2"
+        Me.PictureBox2.Size = New System.Drawing.Size(481, 417)
+        Me.PictureBox2.SizeMode = System.Windows.Forms.PictureBoxSizeMode.Zoom
+        Me.PictureBox2.TabIndex = 4
+        Me.PictureBox2.TabStop = False
+        '
+        'Label1
+        '
+        Me.Label1.AutoSize = True
+        Me.Label1.Font = New System.Drawing.Font("Segoe UI", 8.25!, System.Drawing.FontStyle.Regular, System.Drawing.GraphicsUnit.Point, CType(0, Byte))
+        Me.Label1.Location = New System.Drawing.Point(301, 306)
+        Me.Label1.Name = "Label1"
+        Me.Label1.Size = New System.Drawing.Size(222, 13)
+        Me.Label1.TabIndex = 5
+        Me.Label1.Text = "Diese Software nutzt für ECM-Funktionen"
+        '
        'frmSplash
        '
        Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
        Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
-        Me.BackgroundImage = Global.DD_Record_Organiser.My.Resources.Resources.DD_Icons_ADDI
        Me.BackgroundImageLayout = System.Windows.Forms.ImageLayout.Center
        Me.ClientSize = New System.Drawing.Size(574, 417)
        Me.ControlBox = False
+        Me.Controls.Add(Me.Label1)
+        Me.Controls.Add(Me.ApplicationTitle)
+        Me.Controls.Add(Me.PictureBox1)
        Me.Controls.Add(Me.TableLayoutPanel1)
        Me.Controls.Add(Me.lblStatus)
-        Me.Controls.Add(Me.ApplicationTitle)
        Me.Controls.Add(Me.pbStatus)
+        Me.Controls.Add(Me.PictureBox2)
        Me.DoubleBuffered = True
        Me.FormBorderStyle = System.Windows.Forms.FormBorderStyle.FixedSingle
        Me.MaximizeBox = False
@ -126,6 +163,8 @@ Partial Class frmSplash
        Me.StartPosition = System.Windows.Forms.FormStartPosition.CenterScreen
        Me.TransparencyKey = System.Drawing.Color.White
        Me.TableLayoutPanel1.ResumeLayout(False)
+        CType(Me.PictureBox1, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.PictureBox2, System.ComponentModel.ISupportInitialize).EndInit()
        Me.ResumeLayout(False)
        Me.PerformLayout()

@ -133,5 +172,8 @@ Partial Class frmSplash
    Friend WithEvents lblStatus As System.Windows.Forms.Label
    Friend WithEvents pbStatus As System.Windows.Forms.ProgressBar
    Friend WithEvents TableLayoutPanel1 As System.Windows.Forms.TableLayoutPanel
+    Friend WithEvents PictureBox1 As System.Windows.Forms.PictureBox
+    Friend WithEvents PictureBox2 As System.Windows.Forms.PictureBox
+    Friend WithEvents Label1 As System.Windows.Forms.Label

 End Class