diff --git a/GUIs.ZooFlow/My Project/Resources.Designer.vb b/GUIs.ZooFlow/My Project/Resources.Designer.vb index a6947243..64753c9e 100644 --- a/GUIs.ZooFlow/My Project/Resources.Designer.vb +++ b/GUIs.ZooFlow/My Project/Resources.Designer.vb @@ -180,6 +180,16 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property _new() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("new", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' @@ -1150,6 +1160,36 @@ Namespace My.Resources End Get End Property + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property new1() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("new1", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property new2() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("new2", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + + ''' + ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. + ''' + Friend ReadOnly Property new3() As DevExpress.Utils.Svg.SvgImage + Get + Dim obj As Object = ResourceManager.GetObject("new3", resourceCulture) + Return CType(obj,DevExpress.Utils.Svg.SvgImage) + End Get + End Property + ''' ''' Sucht eine lokalisierte Ressource vom Typ DevExpress.Utils.Svg.SvgImage. ''' diff --git a/GUIs.ZooFlow/My Project/Resources.resx b/GUIs.ZooFlow/My Project/Resources.resx index 6b33dc08..b0cafd65 100644 --- a/GUIs.ZooFlow/My Project/Resources.resx +++ b/GUIs.ZooFlow/My Project/Resources.resx @@ -304,8 +304,8 @@ ..\Resources\actions_options.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\2_ZOO_FLOW_Abo_MouseOver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\new.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\bo_appearance.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -391,9 +391,6 @@ ..\Resources\ZooFlow_drop_drag.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\ZooFlow_Sidebar_TOP.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - ..\Resources\actions_deletecircled6.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -424,6 +421,9 @@ ..\Resources\del5.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\new1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\ZooFlow_Sidebar_TOP_Drop.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -481,6 +481,9 @@ ..\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\actions_addcircled4.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -499,8 +502,8 @@ ..\Resources\action_add_16xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a - - ..\Resources\StatusAnnotations_Information_16xLG_color.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\ZooFlow_Sidebar_TOP.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a ..\Resources\ZooFlow_Sidebar_individuelle_suche.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -511,6 +514,9 @@ ..\Resources\bo_validation.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + ..\Resources\new2.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + ..\Resources\1_LOGO_ZOO_FLOW1.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a @@ -526,6 +532,12 @@ ..\Resources\gear_32xLG.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + + ..\Resources\managedatasource3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + + ..\Resources\2_ZOO_FLOW_Abo_MouseOver.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a + ..\Resources\doublenext1.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a @@ -565,7 +577,7 @@ ..\Resources\del3.svg;DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - ..\Resources\managedatasource3.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 \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/new.svg b/GUIs.ZooFlow/Resources/new.svg new file mode 100644 index 00000000..4a85a96a --- /dev/null +++ b/GUIs.ZooFlow/Resources/new.svg @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/new1.svg b/GUIs.ZooFlow/Resources/new1.svg new file mode 100644 index 00000000..4a85a96a --- /dev/null +++ b/GUIs.ZooFlow/Resources/new1.svg @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/new2.svg b/GUIs.ZooFlow/Resources/new2.svg new file mode 100644 index 00000000..4a85a96a --- /dev/null +++ b/GUIs.ZooFlow/Resources/new2.svg @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/Resources/new3.svg b/GUIs.ZooFlow/Resources/new3.svg new file mode 100644 index 00000000..4a85a96a --- /dev/null +++ b/GUIs.ZooFlow/Resources/new3.svg @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/GUIs.ZooFlow/ZooFlow.vbproj b/GUIs.ZooFlow/ZooFlow.vbproj index aa866084..835b5aef 100644 --- a/GUIs.ZooFlow/ZooFlow.vbproj +++ b/GUIs.ZooFlow/ZooFlow.vbproj @@ -1100,6 +1100,10 @@ + + + + diff --git a/GUIs.ZooFlow/frmFlowForm.Designer.vb b/GUIs.ZooFlow/frmFlowForm.Designer.vb index 1a5224f2..0cc2f90d 100644 --- a/GUIs.ZooFlow/frmFlowForm.Designer.vb +++ b/GUIs.ZooFlow/frmFlowForm.Designer.vb @@ -68,6 +68,11 @@ Partial Class frmFlowForm Me.Panel1 = New System.Windows.Forms.Panel() Me.PictureEdit2 = New DevExpress.XtraEditors.PictureEdit() Me.Panel2 = New System.Windows.Forms.Panel() + Me.GridControl1 = New DevExpress.XtraGrid.GridControl() + Me.RecentFilesView = New DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView() + Me.GridBand1 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand() + Me.colSecondary = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() + Me.colPrimary = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() Me.AdornerUIManager1 = New DevExpress.Utils.VisualEffects.AdornerUIManager(Me.components) Me.TaskBadge = New DevExpress.Utils.VisualEffects.Badge() Me.ContextMenuSystray.SuspendLayout() @@ -80,6 +85,8 @@ Partial Class frmFlowForm Me.Panel1.SuspendLayout() CType(Me.PictureEdit2.Properties, System.ComponentModel.ISupportInitialize).BeginInit() Me.Panel2.SuspendLayout() + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).BeginInit() + CType(Me.RecentFilesView, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.AdornerUIManager1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SuspendLayout() ' @@ -174,7 +181,7 @@ Partial Class frmFlowForm Me.PictureBoxSearch.SizeMode = DevExpress.XtraEditors.SvgImageSizeMode.Zoom Me.PictureBoxSearch.SvgImage = Global.DigitalData.GUIs.ZooFlow.My.Resources.Resources.FLOW_Sidebar_Search_inaktiv Me.PictureBoxSearch.TabIndex = 13 - Me.PictureBoxSearch.Text = "SvgImageBox1" + Me.PictureBoxSearch.Text = "X" Me.ToolTip1.SetToolTip(Me.PictureBoxSearch, "FlowSearch öffnen") ' 'TimerFolderwatch @@ -404,6 +411,7 @@ Partial Class frmFlowForm ' 'Panel2 ' + Me.Panel2.Controls.Add(Me.GridControl1) Me.Panel2.Controls.Add(Me.PictureBoxPM) Me.Panel2.Controls.Add(Me.Panel3) Me.Panel2.Controls.Add(Me.pnlQuicksearch1) @@ -414,6 +422,58 @@ Partial Class frmFlowForm Me.Panel2.Size = New System.Drawing.Size(202, 410) Me.Panel2.TabIndex = 17 ' + 'GridControl1 + ' + Me.GridControl1.Anchor = System.Windows.Forms.AnchorStyles.Bottom + Me.GridControl1.Location = New System.Drawing.Point(3, 84) + Me.GridControl1.MainView = Me.RecentFilesView + Me.GridControl1.MenuManager = Me.BarManager1 + Me.GridControl1.Name = "GridControl1" + Me.GridControl1.Size = New System.Drawing.Size(196, 182) + Me.GridControl1.TabIndex = 18 + Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.RecentFilesView}) + ' + 'AdvBandedGridView1 + ' + Me.RecentFilesView.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.GridBand1}) + Me.RecentFilesView.Columns.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn() {Me.colPrimary, Me.colSecondary}) + Me.RecentFilesView.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.None + Me.RecentFilesView.GridControl = Me.GridControl1 + Me.RecentFilesView.Name = "AdvBandedGridView1" + Me.RecentFilesView.OptionsBehavior.Editable = False + Me.RecentFilesView.OptionsBehavior.ReadOnly = True + Me.RecentFilesView.OptionsView.ColumnAutoWidth = True + Me.RecentFilesView.OptionsView.ShowBands = False + Me.RecentFilesView.OptionsView.ShowColumnHeaders = False + Me.RecentFilesView.OptionsView.ShowGroupPanel = False + Me.RecentFilesView.OptionsView.ShowHorizontalLines = DevExpress.Utils.DefaultBoolean.[False] + Me.RecentFilesView.OptionsView.ShowIndicator = False + Me.RecentFilesView.OptionsView.ShowVerticalLines = DevExpress.Utils.DefaultBoolean.[False] + ' + 'GridBand1 + ' + Me.GridBand1.Caption = "GridBand1" + Me.GridBand1.Columns.Add(Me.colSecondary) + Me.GridBand1.Columns.Add(Me.colPrimary) + Me.GridBand1.Name = "GridBand1" + Me.GridBand1.VisibleIndex = 0 + Me.GridBand1.Width = 75 + ' + 'colSecondary + ' + Me.colSecondary.Caption = "Secondary" + Me.colSecondary.FieldName = "Secondary" + Me.colSecondary.Name = "colSecondary" + Me.colSecondary.Visible = True + ' + 'colPrimary + ' + Me.colPrimary.Caption = "Primary" + Me.colPrimary.FieldName = "Primary" + Me.colPrimary.Name = "colPrimary" + Me.colPrimary.RowIndex = 1 + Me.colPrimary.Visible = True + ' 'AdornerUIManager1 ' Me.AdornerUIManager1.Elements.Add(Me.TaskBadge) @@ -463,6 +523,8 @@ Partial Class frmFlowForm Me.Panel1.ResumeLayout(False) CType(Me.PictureEdit2.Properties, System.ComponentModel.ISupportInitialize).EndInit() Me.Panel2.ResumeLayout(False) + CType(Me.GridControl1, System.ComponentModel.ISupportInitialize).EndInit() + CType(Me.RecentFilesView, System.ComponentModel.ISupportInitialize).EndInit() CType(Me.AdornerUIManager1, System.ComponentModel.ISupportInitialize).EndInit() Me.ResumeLayout(False) Me.PerformLayout() @@ -510,4 +572,9 @@ Partial Class frmFlowForm Friend WithEvents bbtnitmAusblenden As DevExpress.XtraBars.BarButtonItem Friend WithEvents EinblendenToolStripMenuItem As ToolStripMenuItem Friend WithEvents SucheEntwurfToolStripMenuItem As ToolStripMenuItem + Friend WithEvents GridControl1 As DevExpress.XtraGrid.GridControl + Friend WithEvents RecentFilesView As DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView + Friend WithEvents GridBand1 As DevExpress.XtraGrid.Views.BandedGrid.GridBand + Friend WithEvents colSecondary As DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn + Friend WithEvents colPrimary As DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn End Class diff --git a/GUIs.ZooFlow/frmFlowForm.vb b/GUIs.ZooFlow/frmFlowForm.vb index 72c025b2..8acd2e70 100644 --- a/GUIs.ZooFlow/frmFlowForm.vb +++ b/GUIs.ZooFlow/frmFlowForm.vb @@ -20,6 +20,7 @@ Imports DevExpress.LookAndFeel Imports System.Threading.Tasks Imports System.Threading Imports DigitalData.Controls.MessageBoxEx +Imports System.ComponentModel Public Class frmFlowForm #Region "Sidebar DllImport" @@ -86,9 +87,7 @@ Public Class frmFlowForm End If MyBase.WndProc(m) Catch ex As Exception - End Try - End Sub Protected Overrides ReadOnly Property CreateParams() As System.Windows.Forms.CreateParams Get @@ -196,6 +195,7 @@ Public Class frmFlowForm Public Event ClipboardChanged As EventHandler(Of IDataObject) Private WithEvents HotkeyClass As Hotkey Private WithEvents Watcher As Watcher = Watcher.Singleton + #End Region Private Sub frmFlowForm_Load(sender As Object, e As EventArgs) Handles Me.Load @@ -232,7 +232,6 @@ Public Class frmFlowForm Environment = My.Application.GetEnvironment() ErrorHandler = New BaseErrorHandler(My.LogConfig, Logger, Me) Modules = New ClassModules(My.LogConfig, My.SystemConfig) - FileEx = New Filesystem.File(My.LogConfig) ' === Initialize Theming === If My.Application.Palette = "" Then @@ -250,8 +249,6 @@ Public Class frmFlowForm AddHandler KeyUp, AddressOf frmFlowForm_KeyDown 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.Database.GetDatatableIDB(oSQL) PictureBoxSearch.Visible = False For Each oRow As DataRow In My.Tables.DTIDB_COMMON_SQL.Rows @@ -261,14 +258,12 @@ Public Class frmFlowForm End If Next - 'If Not IsNothing(oDatatable) Then - ' If oDatatable.Rows.Count > 0 Then - ' IDBSearchActive = True - ' DTIDB_SEARCHES = oDatatable - ' PictureBoxSearch1.Visible = True - ' End If + Dim oSql = $"SELECT TOP 10 * FROM VWIDB_DOCRESULT_DE WHERE [Changed who] = 'SchreiberM' ORDER BY [Changed when] DESC" + Dim AccessedFilesTable = Await My.Database.GetDatatableIDBAsync(oSql) - 'End If + GridControl1.DataSource = AccessedFilesTable + colPrimary.FieldName = "DisplayFileName" + colSecondary.FieldName = "Changed when" If My.Application.ModulesActive.Contains(MODULE_CLIPBOARDWATCHER) Then Try @@ -345,8 +340,6 @@ Public Class frmFlowForm End If - - If IsNothing(My.Tables.DTIDB_CATALOG_USER) Then Exit Function End If @@ -1120,7 +1113,6 @@ Public Class frmFlowForm Private Function GetResultWindowString(SearchContent As String) As String If SearchContent <> String.Empty Then If My.Application.User.Language = DigitalData.Modules.ZooFlow.State.UserState.LANG_DE_DE Then - Return $"Suche Nach '{SearchContent}'" Else Return $"Search For '{SearchContent}'" @@ -1246,7 +1238,7 @@ Public Class frmFlowForm Private Sub PictureBoxPM_Click(sender As Object, e As EventArgs) Handles PictureBoxPM.Click Try - Dim oProcessManagerPath = Modules.GetProductPath(DigitalData.Modules.Base.ECM.Product.ProcessManager) + Dim oProcessManagerPath = Modules.GetProductProgramPath(DigitalData.Modules.Base.ECM.Product.ProcessManager) If oProcessManagerPath IsNot Nothing AndAlso IO.File.Exists(oProcessManagerPath) Then Process.Start(oProcessManagerPath) End If @@ -1286,5 +1278,36 @@ Public Class frmFlowForm Private Sub PictureEditQuicksearch1_EditValueChanged(sender As Object, e As EventArgs) Handles PictureEditQuicksearch1.EditValueChanged End Sub + + Private Sub AdvBandedGridView1_DoubleClick(sender As Object, e As EventArgs) Handles RecentFilesView.DoubleClick + If RecentFilesView.FocusedRowHandle >= 0 Then + Dim oFile As DataRowView = RecentFilesView.GetRow(RecentFilesView.FocusedRowHandle) + Dim oRow As DataRow = oFile.Row + Dim oObjectId As Long = oRow.Item("DocId") + + Dim oDataSource As DataTable = GridControl1.DataSource + Dim oResult = oDataSource.AsEnumerable(). + Where(Function(row) row.Item("DocId") = oObjectId). + CopyToDataTable() + + Dim oParams = New DocumentResultList.Params() With { + .WindowGuid = "SingleDocument", + .WindowTitle = "Einzelnes Dokument", + .OperationModeOverride = DigitalData.Modules.ZooFlow.Constants.OperationMode.ZooFlow, + .ProfileGuid = 354521, + .ShowBackNavigation = False, + .ShowFileList = False, + .Results = New List(Of DocumentResultList.DocumentResult) From { + New DocumentResultList.DocumentResult() With { + .Title = "Einzelnes Dokument", + .Datatable = oResult + } + } + } + + Dim oForm As New frmDocumentResultList(My.LogConfig, Environment, oParams) + oForm.Show() + End If + End Sub End Class