jj 07.03.2016 - fix loading background image

app/DD-Record-Organiser/ClassInit.vb

@@ -51,33 +51,6 @@ Public Class ClassInit
     End Sub
 
 
-
-    Public Sub InitInterface(mainForm As frmMain)
-
-        Dim SQL As String = "SELECT BACKGROUND_IMAGE, PRODUCT_NAME1 FROM TBDD_MODULES WHERE NAME = 'Record-Organizer'"
-        Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL)
-
-        If dt.Rows.Count > 0 Then
-
-            Dim row As DataRow = dt.Rows(0)
-
-            If Not IsDBNull(row.Item("BACKGROUND_IMAGE")) Then
-                Dim bimage() As Byte = CType(row.Item("BACKGROUND_IMAGE"), Byte())
-                Dim image As Bitmap = ByteArrayToBitmap(bimage)
-
-                mainForm.SetWindowBackground(image)
-            End If
-
-            If Not IsDBNull(row.Item("PRODUCT_NAME1")) Then
-                Dim title As String = row.Item("PRODUCT_NAME1")
-
-                mainForm.SetWindowTitle(title)
-            End If
-
-        End If
-
-    End Sub
-
     Public Sub InitUserLogin()
         Dim sql = sql_UserID
         sql = sql.Replace("@user", Environment.UserName)

app/DD-Record-Organiser/frmMain.vb

@@ -67,6 +67,9 @@ Public Class frmMain
             'Dim splash As New frmSplash()
             'splash.ShowDialog()
 
+            ' MainForm Hintergrund laden
+            SetBackgroundImage()
+
             Me.Text = Application.ProductName
             LabelVersion.Caption = String.Format("Version {0}", My.Application.Info.Version.ToString)
             LabelUser.Caption = Environment.UserName
@@ -151,28 +154,20 @@ Public Class frmMain
             "CHANGED_WHEN, MENU_IMG, SHORT_TITLE, LANGUAGE, " & _
             "'CONSTR_MENUE' + CONVERT(VARCHAR(5), GUID) as OBECTNAME FROM TBPMO_FORM_CONSTRUCTOR where GUID in (SELECT CONSTRUCT_ID FROM TBPMO_CONSTRUCTOR_USER WHERE HOME_MENUE = 0 AND USER_ID = {2}) ORDER BY SEQUENCE_MENU", USER_LANGUAGE, CURRENT_SCREEN_ID, USER_GUID)
             Dim dt As DataTable = ClassDatabase.Return_Datatable(SQL2)
-            Dim image2 As Bitmap = LoadNoImage()
-
-            Try
-                If Not IsNothing(groupQuickAccessForm) Then
-                    Do While 0 < groupQuickAccessForm.ItemLinks.Count
-                        groupQuickAccessForm.ItemLinks.Remove(groupQuickAccessForm.ItemLinks(0))
-                    Loop
-                End If
-            Catch ex As Exception
-
-            End Try
-
-
 
             If dt.Rows.Count <> 0 Then
 
                 For Each row As DataRow In dt.Rows
-                    If Not IsDBNull(row.Item("MENU_IMG")) Then
+                    Dim image As Bitmap = Nothing
+
+                    If IsDBNull(row.Item("MENU_IMG")) Then
+                        image = LoadNoImage()
+                    Else
                         Dim bimg() As Byte = row.Item("MENU_IMG")
                         Dim bitmap As Bitmap = ByteArrayToBitmap(bimg)
-                        image2 = bitmap
+                        image = bitmap
                     End If
+
                     Dim title = row.Item("FORM_TITLE")
                     If title = "CAPTION (OBJ) NOT TRANSLATED" Then
                         Dim objectname = row.Item("OBECTNAME")
@@ -191,11 +186,11 @@ Public Class frmMain
                     item.RibbonStyle = RibbonItemStyles.Large
                     item.Caption = title
                     item.Tag = tag
-                    item.Glyph = image2
+                    item.Glyph = image
 
                     AddHandler item.ItemClick, AddressOf ToolbarButtonItemClick
                     groupQuickAccessForm2.ItemLinks.Add(item)
-                 
+
                 Next
 
             End If
@@ -373,24 +368,16 @@ Public Class frmMain
         Next
     End Sub
 
-    Delegate Sub SetWindowTitleDelegate(t As String)
+    Private Sub SetBackgroundImage()
-    Public Sub SetWindowTitle(t As String)
+        Dim SQL As String = "SELECT BACKGROUND_IMAGE FROM TBDD_MODULES WHERE NAME = 'Record-Organizer'"
-        If Me.InvokeRequired Then
+        Dim bimage() As Byte = ClassDatabase.Execute_Scalar(SQL)
-            Dim d As New SetWindowTitleDelegate(AddressOf SetWindowTitle)
-            Me.Invoke(d, New Object() {t})
-        Else
-            Me.Text = t
-        End If
-    End Sub
 
-    Delegate Sub SetWindowBackgroundDelegate(i As Bitmap)
+        If Not IsDBNull(bimage) Then
-    Public Sub SetWindowBackground(i As Bitmap)
+
-        If Me.InvokeRequired Then
+            Dim image As Bitmap = ByteArrayToBitmap(bimage)
-            Dim d As New SetWindowBackgroundDelegate(AddressOf SetWindowBackground)
+            Me.BackgroundImage = image
-            Me.Invoke(d, New Object() {i})
-        Else
-            Me.BackgroundImage = i
             Me.BackgroundImageLayout = ImageLayout.Center
+
         End If
     End Sub
 
@@ -625,7 +612,7 @@ Public Class frmMain
             'If USER_LANGUAGE = "de-DE" Then
             '    MsgBox("Global Indexer wird nun geschlossen, weil keine neue Lizenzdaten eingegeben wurden!", MsgBoxStyle.Information)
             'Else
-            MsgBox("Global Indexer will now be closed, cause no new license was updated!", MsgBoxStyle.Information)
+            MsgBox("Record Organizer will now be closed, cause no new license was updated!", MsgBoxStyle.Information)
             'End If
             Me.Close()
         Else

app/DD-Record-Organiser/frmSplash.vb

@@ -83,6 +83,7 @@ Public NotInheritable Class frmSplash
             System.Threading.Thread.Sleep(500)
 
             bw.ReportProgress(CalcProgress(5), "Initializing Frontend")
+            ' InitInterface wurde in frmMain integriert
             'Init.InitInterface(mainForm)
 
             System.Threading.Thread.Sleep(500)