Zooflow: Redesign for frmFlowForm

GUIs.ZooFlow/frmFlowForm.vb

@@ -251,11 +251,11 @@ Public Class frmFlowForm
             'Dim oSQL = My.Queries.Common.FNIDB_GET_SEARCH_PROFILES(My.Application.User.UserId, My.Application.User.Language)
             'Dim oDatatable As DataTable = My.Database.GetDatatableIDB(oSQL)
 
-            PictureBoxSearch1.Visible = False
+            PictureBoxSearch.Visible = False
             For Each oRow As DataRow In My.Tables.DTIDB_COMMON_SQL.Rows
                 If oRow.Item("TITLE") = SQLCMD_FLOW_SEARCH_BASE Then
                     IDBSearchActive = True
-                    PictureBoxSearch1.Visible = True
+                    PictureBoxSearch.Visible = True
                 End If
             Next
             'If Not IsNothing(oDatatable) Then
@@ -368,11 +368,11 @@ Public Class frmFlowForm
                 pnlQuicksearch1.Visible = True
                 lblQuicksearch1.Text = oRow.Item("CAT_STRING")
             ElseIf oRow.Item("CAT_TITLE") = "QUICKSEARCH1_POS" Then
-                If oRow.Item("CAT_STRING") = "Top" Then
-                    pnlQuicksearch1.Dock = DockStyle.Top
-                ElseIf oRow.Item("CAT_STRING") = "Bottom" Then
-                    pnlQuicksearch1.Dock = DockStyle.Bottom
-                End If
+                'If oRow.Item("CAT_STRING") = "Top" Then
+                '    pnlQuicksearch1.Dock = DockStyle.Top
+                'ElseIf oRow.Item("CAT_STRING") = "Bottom" Then
+                '    pnlQuicksearch1.Dock = DockStyle.Bottom
+                'End If
             End If
         Next
     End Function
@@ -525,7 +525,7 @@ Public Class frmFlowForm
         Cursor = Cursors.Default
     End Sub
 
-    Private Sub PictureBoxSearch1_Click(sender As Object, e As EventArgs) Handles PictureBoxSearch1.Click
+    Private Sub PictureBoxSearch1_Click(sender As Object, e As EventArgs) Handles PictureBoxSearch.Click
         Open_FlowSearch()
     End Sub
 
@@ -542,12 +542,13 @@ Public Class frmFlowForm
 
     Private Sub frmFlowForm_DragEnter(sender As Object, e As DragEventArgs) Handles MyBase.DragEnter
         If My.Application.GlobixDropAreaStyle = "PROGRESSIVE" Then
-            PictureBoxDragDrop.Image = My.Resources._1_LOGO_ZOO_FLOW_DROP3
+            'PictureBoxDragDrop.Image = My.Resources._1_LOGO_ZOO_FLOW_DROP3
+            SvgImageBox1.SvgImage = My.Resources.ZooFlow_Sidebar_TOP_Drop
         Else
-            PictureBoxDragDrop.Image = My.Resources._1_LOGO_ZOO_FLOW_DROP2
+            'PictureBoxDragDrop.Image = My.Resources._1_LOGO_ZOO_FLOW_DROP2
+            SvgImageBox1.SvgImage = My.Resources.ZooFlow_Sidebar_TOP_Drop
         End If
 
-
         e.Effect = DragDropEffects.Copy
         Drag_Enter(sender, e)
     End Sub
@@ -557,18 +558,11 @@ Public Class frmFlowForm
     End Sub
 
     Private Sub frmFlowForm_DragLeave(sender As Object, e As EventArgs) Handles Me.DragLeave
-        PictureBoxDragDrop.Image = My.Resources._1_LOGO_ZOO_FLOW1
+        'PictureBoxDragDrop.Image = My.Resources._1_LOGO_ZOO_FLOW1
+        SvgImageBox1.SvgImage = My.Resources.ZooFlow_Sidebar_TOP
     End Sub
 
-    Private Sub PictureBoxAbo_MouseEnter(sender As Object, e As EventArgs) Handles PictureBoxAbo.MouseEnter
-        PictureBoxAbo.Image = My.Resources._2_ZOO_FLOW_Abo_MouseOver
-    End Sub
-
-    Private Sub PictureBoxAbo_MouseLeave(sender As Object, e As EventArgs) Handles PictureBoxAbo.MouseLeave
-        PictureBoxAbo.Image = My.Resources._2_ZOO_FLOW_Abo
-    End Sub
-
-    Private Sub PictureBoxAbo_Click(sender As Object, e As EventArgs) Handles PictureBoxAbo.Click
+    Private Sub PictureBoxAbo_Click(sender As Object, e As EventArgs)
         Cursor = Cursors.WaitCursor
         If TheFormIsAlreadyLoaded("frmPreSearch") Then
             Cursor = Cursors.Default
@@ -622,7 +616,7 @@ Public Class frmFlowForm
         End If
     End Sub
 
-    Private Sub PictureBox1_DragEnter(sender As Object, e As DragEventArgs) Handles PictureBoxDragDrop.DragEnter
+    Private Sub PictureBox1_DragEnter(sender As Object, e As DragEventArgs)
         Drag_Enter(sender, e)
     End Sub
 
@@ -661,7 +655,7 @@ Public Class frmFlowForm
         End If
     End Function
 
-    Private Async Sub PictureBox1_DragDrop(sender As Object, e As DragEventArgs) Handles PictureBoxDragDrop.DragDrop
+    Private Async Sub PictureBox1_DragDrop(sender As Object, e As DragEventArgs)
         Await DragDropForm(e)
     End Sub
 
@@ -711,7 +705,8 @@ Public Class frmFlowForm
                 If IO.File.Exists(My.Application.Globix.CurrentWorkfile.FilePath) = True And
                     My.Application.Globix.DTACTUAL_FILES.Rows.Count > 0 Then
                     Globix_Open_IndexDialog()
-                    PictureBoxDragDrop.Image = My.Resources._1_LOGO_ZOO_FLOW1
+
+                    SvgImageBox1.SvgImage = My.Resources.ZooFlow_Sidebar_TOP
                 End If
             Next
         Catch ex As Exception
@@ -1225,7 +1220,7 @@ Public Class frmFlowForm
             End Try
         End If
     End Function
-    Private Async Function PictureEdit1_Click(sender As Object, e As EventArgs) As Threading.Tasks.Task Handles PictureEdit1.Click
+    Private Async Function PictureEdit1_Click(sender As Object, e As EventArgs) As Task Handles PictureBoxSearch.Click
         If TextEdit1.Text = String.Empty Then
             Open_FlowSearch()
             Return
@@ -1282,6 +1277,20 @@ Public Class frmFlowForm
         End Try
     End Sub
 
+    Private Sub PictureBoxSearch_MouseEnter(sender As Object, e As EventArgs) Handles PictureBoxSearch.MouseEnter
+        PictureBoxSearch.SvgImage = My.Resources.FLOW_Sidebar_Search_aktiv
+    End Sub
 
+    Private Sub PictureBoxSearch_MouseLeave(sender As Object, e As EventArgs) Handles PictureBoxSearch.MouseLeave
+        PictureBoxSearch.SvgImage = My.Resources.FLOW_Sidebar_Search_inaktiv
+    End Sub
+
+    Private Sub PictureBoxPM_MouseEnter(sender As Object, e As EventArgs) Handles PictureBoxPM.MouseEnter
+        PictureBoxPM.SvgImage = My.Resources.FLOW_Sidebar_Task_aktiv
+    End Sub
+
+    Private Sub PictureBoxPM_MouseLeave(sender As Object, e As EventArgs) Handles PictureBoxPM.MouseLeave
+        PictureBoxPM.SvgImage = My.Resources.FLOW_Sidebar_Task_inaktiv
+    End Sub
 End Class