diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb index 4a716477..22a19878 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb @@ -45,7 +45,8 @@ Partial Class frmDocumentResultList Me.RibbonStatusBar = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() Me.GridControl1 = New DevExpress.XtraGrid.GridControl() - Me.GridView1 = New DevExpress.XtraGrid.Views.Grid.GridView() + Me.GridView1 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridView() + Me.GridBand1 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand() Me.SplitContainerControl2 = New DevExpress.XtraEditors.SplitContainerControl() Me.GridControl2 = New DevExpress.XtraGrid.GridControl() Me.GridView2 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridView() @@ -281,6 +282,7 @@ Partial Class frmDocumentResultList Me.GridView1.Appearance.EvenRow.Options.UseBackColor = True Me.GridView1.Appearance.FocusedRow.BackColor = System.Drawing.Color.FromArgb(CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer), CType(CType(224, Byte), Integer)) Me.GridView1.Appearance.FocusedRow.Options.UseBackColor = True + Me.GridView1.Bands.AddRange(New DevExpress.XtraGrid.Views.BandedGrid.GridBand() {Me.GridBand1}) Me.GridView1.GridControl = Me.GridControl1 Me.GridView1.Name = "GridView1" Me.GridView1.OptionsBehavior.Editable = False @@ -288,6 +290,18 @@ Partial Class frmDocumentResultList Me.GridView1.OptionsView.EnableAppearanceEvenRow = True Me.GridView1.OptionsView.ShowAutoFilterRow = True ' + 'GridBand1 + ' + Me.GridBand1.AppearanceHeader.Font = New System.Drawing.Font("Tahoma", 9.0!, System.Drawing.FontStyle.Bold, System.Drawing.GraphicsUnit.Point, CType(0, Byte)) + Me.GridBand1.AppearanceHeader.Options.UseFont = True + Me.GridBand1.Caption = "GridBand1" + Me.GridBand1.Name = "GridBand1" + Me.GridBand1.OptionsBand.AllowHotTrack = False + Me.GridBand1.OptionsBand.AllowMove = False + Me.GridBand1.OptionsBand.AllowPress = False + Me.GridBand1.OptionsBand.AllowSize = False + Me.GridBand1.VisibleIndex = 0 + ' 'SplitContainerControl2 ' Me.SplitContainerControl2.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2 @@ -467,5 +481,6 @@ Partial Class frmDocumentResultList Friend WithEvents RepositoryItemTextEdit2 As DevExpress.XtraEditors.Repository.RepositoryItemTextEdit Friend WithEvents labelCriticalError As DevExpress.XtraBars.BarStaticItem Friend WithEvents labelWarning As DevExpress.XtraBars.BarStaticItem - Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.Grid.GridView + Friend WithEvents GridView1 As DevExpress.XtraGrid.Views.BandedGrid.BandedGridView + Friend WithEvents GridBand1 As DevExpress.XtraGrid.Views.BandedGrid.GridBand End Class diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb index fa0ab51f..39c3f8fe 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb @@ -311,7 +311,7 @@ Public Class frmDocumentResultList Select Case pIndex Case 0 Dim oResult = pResultList.Item(0) - 'GridBand1.Caption = $"{oResult.Title} ({pCount})" + GridBand1.Caption = $"{oResult.Title} ({pCount})" Case 1 Dim oResult = pResultList.Item(1) @@ -323,7 +323,7 @@ Public Class frmDocumentResultList End Select End Sub - Private Sub CreateDocumentGrid(GridView As GridView, Result As DocumentResult) + Private Sub CreateDocumentGrid(GridView As BandedGridView, Result As DocumentResult) Try If IsNothing(GridView.Columns("ICON")) Then Dim oIconColumn = GridView.Columns.AddVisible("ICON", "ICON") @@ -337,6 +337,8 @@ Public Class frmDocumentResultList .MinWidth = 20 .VisibleIndex = 0 End With + + GridView.Bands.First().Columns.Add(oIconColumn) End If Dim oCreated, oChanged As String @@ -389,8 +391,6 @@ Public Class frmDocumentResultList End Try End Sub - - Private Sub GridView1_CustomDrawCell(sender As Object, e As RowCellCustomDrawEventArgs) Handles GridView1.CustomDrawCell If e.RowHandle < 0 Then Exit Sub @@ -410,29 +410,6 @@ Public Class frmDocumentResultList e.Cache.DrawImage(oIcon, e.Bounds.X + offsetX, e.Bounds.Y + offsetY, 18, 18) End If - - 'Dim view As GridView = TryCast(sender, GridView) - 'If e.Column.FieldName = COLUMN_FILENAME Then - ' Dim oCellInfo As GridCellInfo = TryCast(e.Cell, GridCellInfo) - ' Dim oViewInfo As TextEditViewInfo = TryCast(oCellInfo.ViewInfo, TextEditViewInfo) - ' Dim oFilename As String = e.DisplayText - - ' If oViewInfo IsNot Nothing And oFilename <> String.Empty Then - ' If OperationMode = IResultForm.Mode.NoAppServer Then - ' ' oNewRow.Item(COLUMN_ICON) = _Helpers.GetIconByExtension(oFullpath) - ' ' oNewRow.Item(COLUMN_FILEPATH) = oFullpath - ' ' oNewRow.Item(COLUMN_FILENAME) = oFilename - ' Else - ' oViewInfo.ContextImage = _Helpers.GetIconByExtension(oFilename) - ' oViewInfo.ContextImageAlignment = ContextImageAlignment.Near - ' ' oNewRow.Item(COLUMN_ICON) = _Helpers.GetIconByExtension(oFilename) - ' ' oNewRow.Item(COLUMN_FILEPATH) = String.Empty - ' ' oNewRow.Item(COLUMN_FILENAME) = oFilename - ' End If - ' oViewInfo.CalcViewInfo() - ' End If - 'End If - 'e.DefaultDraw() End Sub Private Function TryGetItem(DataRow As DataRow, ColumnName As String, Optional DefaultValue As String = "") As String @@ -553,7 +530,7 @@ Public Class frmDocumentResultList Private Sub SetActiveGridBand() If _ActiveGrid.Equals(GridControl1) Then - '_ActiveGridBand = GridBand1 + _ActiveGridBand = GridBand1 ElseIf _ActiveGrid.Equals(GridControl2) Then _ActiveGridBand = GridBand2 ElseIf _ActiveGrid.Equals(GridControl3) Then