diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index 64753c9e..39f9b5dd 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -1030,6 +1030,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property FLOW_Sidebar_Search_inaktiv1() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("FLOW_Sidebar_Search_inaktiv1", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -1050,6 +1060,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property FLOW_Sidebar_Task_inaktiv1() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("FLOW_Sidebar_Task_inaktiv1", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' @@ -1510,6 +1530,36 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property ZOOFLOW_DEFAULT() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("ZOOFLOW_DEFAULT", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property ZOOFLOW_DRAG_NORMAL() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("ZOOFLOW_DRAG_NORMAL", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. + ''' + Friend ReadOnly Property ZOOFLOW_DRAG_PROGRESSIVE() As System.Drawing.Bitmap + Get + Dim obj As Object = ResourceManager.GetObject("ZOOFLOW_DRAG_PROGRESSIVE", resourceCulture) + Return CType(obj,System.Drawing.Bitmap) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap. ''' diff --git a/GUIs.ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx index b0cafd65..9bceadb1 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -193,8 +193,8 @@ ..\Resources\DD_Icons_ICO_PMANAGER_256px.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\ZOOFLOW_DRAG_NORMAL.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a ..\Resources\2_ZOO_FLOW_Abo.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -322,6 +322,9 @@ ..\Resources\ZooFlow_G_DevExpress.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\FLOW_Sidebar_Task_inaktiv1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\1_LOGO_ZOO_FLOW.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -349,6 +352,9 @@ ..\Resources\doublenext.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\ZOOFLOW_DEFAULT.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\actions_check2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -463,6 +469,9 @@ ..\Resources\Compare_RefreshScriptPreview.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\new3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\actions_check.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -478,12 +487,18 @@ ..\Resources\4_GLOBIX_AKTIV_ZOO.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ZOOFLOW_DRAG_PROGRESSIVE.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\documentproperties.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\StatusAnnotations_Information_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\renamedatasource.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\actions_addcircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -577,7 +592,7 @@ ..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\new3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\FLOW_Sidebar_Search_inaktiv1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/FLOW_Sidebar_Search_inaktiv1.svg b/GUIs.ZooFlow/Resources/FLOW_Sidebar_Search_inaktiv1.svg new file mode 100644 index 00000000..28d329dc --- /dev/null +++ b/GUIs.ZooFlow/Resources/FLOW_Sidebar_Search_inaktiv1.svg @@ -0,0 +1,62 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/GUIs.ZooFlow/Resources/FLOW_Sidebar_Task_inaktiv1.svg b/GUIs.ZooFlow/Resources/FLOW_Sidebar_Task_inaktiv1.svg new file mode 100644 index 00000000..3e0c3362 --- /dev/null +++ b/GUIs.ZooFlow/Resources/FLOW_Sidebar_Task_inaktiv1.svg @@ -0,0 +1,55 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/GUIs.ZooFlow/Resources/ZOOFLOW_DEFAULT.png b/GUIs.ZooFlow/Resources/ZOOFLOW_DEFAULT.png new file mode 100644 index 00000000..8e7472d8 Binary files /dev/null and b/GUIs.ZooFlow/Resources/ZOOFLOW_DEFAULT.png differ diff --git a/GUIs.ZooFlow/Resources/ZOOFLOW_DRAG_NORMAL.png b/GUIs.ZooFlow/Resources/ZOOFLOW_DRAG_NORMAL.png new file mode 100644 index 00000000..281e62ce Binary files /dev/null and b/GUIs.ZooFlow/Resources/ZOOFLOW_DRAG_NORMAL.png differ diff --git a/GUIs.ZooFlow/Resources/ZOOFLOW_DRAG_PROGRESSIVE.png b/GUIs.ZooFlow/Resources/ZOOFLOW_DRAG_PROGRESSIVE.png new file mode 100644 index 00000000..bb04cbab Binary files /dev/null and b/GUIs.ZooFlow/Resources/ZOOFLOW_DRAG_PROGRESSIVE.png differ diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index 1919b7e5..d0b11977 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -1098,6 +1098,11 @@ + + + + + diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb index 83c48a80..3d53c170 100644 --- a/GUIs.ZooFlow/frmFlowForm.Designer.vb +++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb @@ -169,7 +169,7 @@ Partial Class frmFlowForm Me.PictureBoxPM.Name = "PictureBoxPM" Me.PictureBoxPM.Size = New System.Drawing.Size(158, 50) Me.PictureBoxPM.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Zoom - Me.PictureBoxPM.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.FLOW_Sidebar_Task_inaktiv + Me.PictureBoxPM.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.FLOW_Sidebar_Task_inaktiv1 Me.PictureBoxPM.TabIndex = 14 Me.PictureBoxPM.Text = "SvgImageBox1" Me.ToolTip1.SetToolTip(Me.PictureBoxPM, "ProcessManager - Workflow") @@ -184,7 +184,7 @@ Partial Class frmFlowForm Me.PictureBoxSearch.Name = "PictureBoxSearch" Me.PictureBoxSearch.Size = New System.Drawing.Size(158, 50) Me.PictureBoxSearch.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Zoom - Me.PictureBoxSearch.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.FLOW_Sidebar_Search_inaktiv + Me.PictureBoxSearch.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.FLOW_Sidebar_Search_inaktiv1 Me.PictureBoxSearch.TabIndex = 13 Me.PictureBoxSearch.Text = "X" Me.ToolTip1.SetToolTip(Me.PictureBoxSearch, "FlowSearch öffnen") diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 9613bb73..8d486721 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -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