ZooFlow: Include more databasewithfallback calls in zooflow

GUIs.ZooFlow/frmFlowForm.vb

@@ -159,7 +159,7 @@ Public Class frmFlowForm
         AddHandler Watcher.ClipboardChanged, AddressOf Watcher_ClipboardChanged
 
         Dim oSQL = My.Queries.Common.FNIDB_GET_SEARCH_PROFILES(My.Application.User.UserId, My.Application.User.Language)
-        Dim oDatatable As DataTable = My.DatabaseIDB.GetDatatable(oSQL)
+        Dim oDatatable As DataTable = My.Database.GetDatatableIDB(oSQL)
         PictureBoxSearch1.Visible = False
         If Not IsNothing(oDatatable) OrElse oDatatable.Rows.Count > 0 Then
             IDBSearchActive = True
@@ -275,7 +275,7 @@ Public Class frmFlowForm
 
         Try
             Dim oSql As String = "SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'SCAN' AND USER_ID = " & My.Application.User.UserId
-            Dim oFolderwatchScanPath = My.DatabaseECM.GetScalarValue(oSql)
+            Dim oFolderwatchScanPath = My.Database.GetScalarValueECM(oSql)
 
             oFolderwatchScanPath = IIf(IsDBNull(oFolderwatchScanPath), "", oFolderwatchScanPath)
 
@@ -308,21 +308,6 @@ Public Class frmFlowForm
         'TODO: Refresh Data
     End Sub
 
-    'Private Sub frmFlowForm_MouseLeave(sender As Object, e As EventArgs) Handles MyBase.MouseLeave
-    '    Opacity = OPACITY_HIDDEN
-    'End Sub
-
-    'Private Sub frmFlowForm_MouseEnter(sender As Object, e As EventArgs) Handles Me.MouseEnter
-    '    Opacity = OPACITY_SHOWN
-    'End Sub
-
-    'Private Sub frmFlowForm_MouseMove(ByVal sender As Object, ByVal e As MouseEventArgs) Handles Me.MouseMove, PictureBoxDragDrop.MouseMove
-    '    If e.Button = MouseButtons.Left Then
-    '        NativeMethods.ReleaseCapture()
-    '        NativeMethods.SendMessage(Handle, NativeMethods.WM_NCLBUTTONDOWN, NativeMethods.HTCAPTION, 0)
-    '    End If
-    'End Sub
-
     Private Sub frmFlowForm_KeyDown(ByVal sender As Object, ByVal e As KeyEventArgs)
         If e.KeyCode = Keys.Escape Then
             If ESCHitCount > 0 Then
@@ -338,7 +323,7 @@ Public Class frmFlowForm
     End Sub
 
     Sub ExitZooflow()
-        Dim oResult As DialogResult = MessageBox.Show("Exit Zooflow", "Are you sure you want to close ZooFlow?", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
+        Dim oResult As DialogResult = MessageBox.Show("Are you sure you want to close ZooFlow?", "Exit Zooflow", MessageBoxButtons.YesNo, MessageBoxIcon.Question)
         If oResult = DialogResult.Yes Then
             Close()
         Else
@@ -506,7 +491,7 @@ Public Class frmFlowForm
         End If
 
         'Erstmal alles löschen
-        My.DatabaseECM.ExecuteNonQuery("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')")
+        My.Database.ExecuteNonQueryECM("DELETE FROM TBGI_FILES_USER WHERE UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')")
 
         If FileDrop.Drop_File(e) = True Then
             TimerCheckDroppedFiles.Start()
@@ -529,7 +514,7 @@ Public Class frmFlowForm
     End Sub
     Private Async Function Globix_Check_Dropped_Files() As Threading.Tasks.Task
         Try
-            Await My.DatabaseECM.ExecuteNonQueryAsync($"DELETE FROM TBGI_FILES_USER WHERE WORKED = 1 AND UPPER(USER@WORK) = UPPER('{Environment.UserName}')")
+            Await My.Database.ExecuteNonQueryECMAsync($"DELETE FROM TBGI_FILES_USER WHERE WORKED = 1 AND UPPER(USER@WORK) = UPPER('{Environment.UserName}')")
             Dim i As Integer
 
             For Each pFile As String In FileDrop.files_dropped
@@ -546,7 +531,7 @@ Public Class frmFlowForm
 
             Dim sql As String = "SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')"
             My.Application.Globix.DTACTUAL_FILES = Nothing
-            My.Application.Globix.DTACTUAL_FILES = Await My.DatabaseECM.GetDatatableAsync(sql)
+            My.Application.Globix.DTACTUAL_FILES = Await My.Database.GetDatatableECMAsync(sql)
             My.Application.Globix.ABORT_INDEXING = False
 
             Dim oOnlyFilesFromFilesystem = True
@@ -560,7 +545,7 @@ Public Class frmFlowForm
             If My.Application.Globix.DTACTUAL_FILES.Rows.Count > 1 And oOnlyFilesFromFilesystem = False Then
                 frmGlobix_IndexFileList.ShowDialog()
                 My.Application.Globix.DTACTUAL_FILES = Nothing
-                My.Application.Globix.DTACTUAL_FILES = My.DatabaseECM.GetDatatable(sql)
+                My.Application.Globix.DTACTUAL_FILES = My.Database.GetDatatableECM(sql)
             End If
 
             For Each oRow As DataRow In My.Application.Globix.DTACTUAL_FILES.Rows
@@ -733,7 +718,7 @@ Public Class frmFlowForm
             If My.Application.Globix.Folderwatchstarted = True Or My.UIConfig.Globix.FolderWatchScanStarted = True Then
                 'Prüfen ob alle Files abgearbeitet wurden
                 Dim sql = "SELECT * FROM TBGI_FILES_USER WHERE WORKED = 0 AND HANDLE_TYPE like '%|FW%' AND UPPER(USER@WORK) = UPPER('" & Environment.UserName & "')"
-                My.Application.Globix.DTACTUAL_FILES = My.DatabaseECM.GetDatatable(sql)
+                My.Application.Globix.DTACTUAL_FILES = My.Database.GetDatatableECM(sql)
 
                 If My.Application.Globix.DTACTUAL_FILES.Rows.Count > 0 Then
                     My.Application.Globix.ABORT_INDEXING = False
@@ -759,7 +744,7 @@ Public Class frmFlowForm
                             Else
                                 Logger.Info(" File not existing - Row will be deleted!")
                                 Dim oDel = String.Format("DELETE FROM TBGI_FILES_USER WHERE GUID = {0}", FILEGUID)
-                                My.DatabaseECM.ExecuteNonQuery(oDel)
+                                My.Database.ExecuteNonQueryECM(oDel)
                             End If
                         Else
                             Logger.Info(" file '" & row.Item(1).ToString & "' could not be opened exclusively - fileInUse!")