merge
This commit is contained in:
@@ -72,7 +72,6 @@ Public Class frmFlowForm
|
||||
ABN_FULLSCREENAPP
|
||||
ABN_WINDOWARRANGE
|
||||
End Enum
|
||||
Public LOAD_SIDEBAR_DATA As Boolean = False
|
||||
#End Region
|
||||
#Region "Sidebar Enum Properties Register"
|
||||
Protected Overrides Sub WndProc(ByRef m As System.Windows.Forms.Message)
|
||||
@@ -243,7 +242,7 @@ Public Class frmFlowForm
|
||||
End If
|
||||
|
||||
' === Setup Timers ===
|
||||
AddHandler TimerRefreshSidebarData.Tick, AddressOf TimerRefreshSidebarData_Tick
|
||||
AddHandler TimerRefreshSidebarData.Tick, AddressOf TimerRefreshData_Tick
|
||||
TimerRefreshSidebarData.Enabled = True
|
||||
|
||||
' === Setup Event Handlers ===
|
||||
@@ -260,7 +259,12 @@ Public Class frmFlowForm
|
||||
End If
|
||||
Next
|
||||
|
||||
Load_Recent_Files
|
||||
Dim oSql = $"SELECT TOP 10 * FROM VWIDB_DOCRESULT_DE WHERE [Changed who] = '{My.Application.User.UserName}' ORDER BY [Changed when] DESC"
|
||||
Dim AccessedFilesTable = Await My.Database.GetDatatableIDBAsync(oSql)
|
||||
|
||||
GridControl1.DataSource = AccessedFilesTable
|
||||
colPrimary.FieldName = "DisplayFileName"
|
||||
colSecondary.FieldName = "Changed when"
|
||||
|
||||
If My.Application.ModulesActive.Contains(MODULE_CLIPBOARDWATCHER) Then
|
||||
Try
|
||||
@@ -391,18 +395,7 @@ Public Class frmFlowForm
|
||||
SHAppBarMessage(ABMsg.ABM_REMOVE, AppDeskData)
|
||||
End If
|
||||
End Sub
|
||||
Async Sub Load_Recent_Files()
|
||||
Try
|
||||
Dim oSql = $"SELECT TOP 10 * FROM VWIDB_DOCRESULT_DE WHERE [Changed who] = '{My.Application.User.UserName}' ORDER BY [Changed when] DESC"
|
||||
Dim AccessedFilesTable = Await My.Database.GetDatatableIDBAsync(oSql)
|
||||
|
||||
GridControl1.DataSource = AccessedFilesTable
|
||||
colPrimary.FieldName = "DisplayFileName"
|
||||
colSecondary.FieldName = "Changed when"
|
||||
Catch ex As Exception
|
||||
ShowErrorMessage(ex)
|
||||
End Try
|
||||
End Sub
|
||||
Public Sub Init_Folderwatch()
|
||||
Try
|
||||
Dim oSql As String = "SELECT FOLDER_PATH FROM TBGI_FOLDERWATCH_USER WHERE FOLDER_TYPE = 'DEFAULT' AND USER_ID = " & My.Application.User.UserId
|
||||
@@ -470,6 +463,10 @@ Public Class frmFlowForm
|
||||
|
||||
End Sub
|
||||
|
||||
Private Sub TimerRefreshData_Tick(sender As Object, e As EventArgs)
|
||||
'TODO: Refresh Data
|
||||
End Sub
|
||||
|
||||
Private Sub frmFlowForm_KeyDown(ByVal sender As Object, ByVal e As KeyEventArgs)
|
||||
If e.KeyCode = Keys.Escape Then
|
||||
If RunningTask IsNot Nothing Then
|
||||
@@ -545,11 +542,11 @@ Public Class frmFlowForm
|
||||
|
||||
Private Sub frmFlowForm_DragEnter(sender As Object, e As DragEventArgs) Handles MyBase.DragEnter
|
||||
If My.Application.GlobixDropAreaStyle = "PROGRESSIVE" Then
|
||||
PictureEdit2.Image = My.Resources._1_LOGO_ZOO_FLOW_DROP3
|
||||
'PictureEdit2.Image = My.Resources.ZooFlow_drop_drag
|
||||
'PictureBoxDragDrop.Image = My.Resources._1_LOGO_ZOO_FLOW_DROP3
|
||||
PictureEdit2.Image = My.Resources.ZOOFLOW_DRAG_PROGRESSIVE
|
||||
Else
|
||||
'PictureBoxDragDrop.Image = My.Resources._1_LOGO_ZOO_FLOW_DROP2
|
||||
PictureEdit2.Image = My.Resources.ZooFlow_drop_drag
|
||||
PictureEdit2.Image = My.Resources.ZOOFLOW_DRAG_NORMAL
|
||||
End If
|
||||
|
||||
e.Effect = DragDropEffects.Copy
|
||||
@@ -562,7 +559,7 @@ Public Class frmFlowForm
|
||||
|
||||
Private Sub frmFlowForm_DragLeave(sender As Object, e As EventArgs) Handles Me.DragLeave
|
||||
'PictureBoxDragDrop.Image = My.Resources._1_LOGO_ZOO_FLOW1
|
||||
PictureEdit2.Image = My.Resources.ZooFlow_drop
|
||||
PictureEdit2.Image = My.Resources.ZOOFLOW_DEFAULT
|
||||
End Sub
|
||||
|
||||
Private Sub PictureBoxAbo_Click(sender As Object, e As EventArgs)
|
||||
@@ -622,7 +619,7 @@ Public Class frmFlowForm
|
||||
Exit Function
|
||||
End If
|
||||
|
||||
PictureEdit2.Image = My.Resources.ZooFlow_drop
|
||||
PictureEdit2.Image = My.Resources.ZOOFLOW_DEFAULT
|
||||
|
||||
'Erstmal alles löschen
|
||||
My.Database.ExecuteNonQueryECM("DELETE FROM TBGI_FILES_USER WHERE USER@WORK = '" & My.Application.User.UserName & "'")
|
||||
@@ -1245,12 +1242,5 @@ Public Class frmFlowForm
|
||||
End Try
|
||||
End If
|
||||
End Sub
|
||||
|
||||
Private Sub TimerRefreshSidebarData_Tick(sender As Object, e As EventArgs) Handles TimerRefreshSidebarData.Tick
|
||||
If LOAD_SIDEBAR_DATA = True Then
|
||||
Load_Recent_Files()
|
||||
End If
|
||||
|
||||
End Sub
|
||||
End Class
|
||||
|
||||
|
||||
Reference in New Issue
Block a user