From 45485400e15a666d7e04b9930f849afeac7741ea Mon Sep 17 00:00:00 2001 From: Developer01 Date: Tue, 5 May 2026 08:04:48 +0200 Subject: [PATCH] Handling in DocumentResultLsit --- .../frmDocumentResultList.Designer.vb | 28 ++++---- .../frmDocumentResultList.resx | 64 +++++++++---------- .../frmDocumentResultList.vb | 28 +++++--- 3 files changed, 66 insertions(+), 54 deletions(-) diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb index eae99e33..e110d0b7 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.Designer.vb @@ -68,6 +68,7 @@ Partial Class frmDocumentResultList Me.btnSaveWorkspaceAs = New DevExpress.XtraBars.BarButtonItem() Me.btnSaveAsMySearch = New DevExpress.XtraBars.BarButtonItem() Me.lblCurrentWorkspace = New DevExpress.XtraBars.BarStaticItem() + Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem() Me.RibbonPageStart = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.RibbonPageGroup_Navigation = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() Me.RibbonPageGroupExport = New DevExpress.XtraBars.Ribbon.RibbonPageGroup() @@ -116,7 +117,6 @@ Partial Class frmDocumentResultList Me.EmptySpaceItem1 = New DevExpress.XtraLayout.EmptySpaceItem() Me.DockPanelPreview = New DevExpress.XtraBars.Docking.DockPanel() Me.DockPanel1_Container = New DevExpress.XtraBars.Docking.ControlContainer() - Me.BarButtonItem6 = New DevExpress.XtraBars.BarButtonItem() CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit() CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl1.Panel1.SuspendLayout() @@ -531,6 +531,13 @@ Partial Class frmDocumentResultList Me.lblCurrentWorkspace.PaintStyle = DevExpress.XtraBars.BarItemPaintStyle.CaptionGlyph Me.lblCurrentWorkspace.Tag = "Arbeitsbereich: {0}" ' + 'BarButtonItem6 + ' + resources.ApplyResources(Me.BarButtonItem6, "BarButtonItem6") + Me.BarButtonItem6.Id = 61 + Me.BarButtonItem6.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem6.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) + Me.BarButtonItem6.Name = "BarButtonItem6" + ' 'RibbonPageStart ' Me.RibbonPageStart.Groups.AddRange(New DevExpress.XtraBars.Ribbon.RibbonPageGroup() {Me.RibbonPageGroup_Navigation, Me.RibbonPageGroupExport, Me.RibbonPageRefresh, Me.RibbonPageGroupDocument, Me.RibbonPageGroupFilesystem, Me.RibbonPageGroupCheckInOut, Me.RibbonPageGroupWorkflow, Me.RibbonPageGroupAttribute, Me.RibbonPageGroupWorkspace, Me.RibbonPageGroupSavedSearch}) @@ -799,7 +806,7 @@ Partial Class frmDocumentResultList resources.ApplyResources(Me.DockPanelMetadata, "DockPanelMetadata") Me.DockPanelMetadata.Name = "DockPanelMetadata" Me.DockPanelMetadata.Options.ShowCloseButton = False - Me.DockPanelMetadata.OriginalSize = New System.Drawing.Size(268, 413) + Me.DockPanelMetadata.OriginalSize = New System.Drawing.Size(268, 434) ' 'DockPanel3_Container ' @@ -821,7 +828,7 @@ Partial Class frmDocumentResultList resources.ApplyResources(Me.DockPanelStatus, "DockPanelStatus") Me.DockPanelStatus.Name = "DockPanelStatus" Me.DockPanelStatus.Options.ShowCloseButton = False - Me.DockPanelStatus.OriginalSize = New System.Drawing.Size(268, 413) + Me.DockPanelStatus.OriginalSize = New System.Drawing.Size(268, 434) ' 'ControlContainer1 ' @@ -862,7 +869,7 @@ Partial Class frmDocumentResultList Me.Root.GroupBordersVisible = False Me.Root.Items.AddRange(New DevExpress.XtraLayout.BaseLayoutItem() {Me.LayoutControlGroup1, Me.EmptySpaceItem1}) Me.Root.Name = "Root" - Me.Root.Size = New System.Drawing.Size(268, 434) + Me.Root.Size = New System.Drawing.Size(268, 413) Me.Root.TextVisible = False ' 'LayoutControlGroup1 @@ -880,7 +887,7 @@ Partial Class frmDocumentResultList Me.LayoutControlItem1.Name = "LayoutControlItem1" Me.LayoutControlItem1.Size = New System.Drawing.Size(224, 24) resources.ApplyResources(Me.LayoutControlItem1, "LayoutControlItem1") - Me.LayoutControlItem1.TextSize = New System.Drawing.Size(126, 13) + Me.LayoutControlItem1.TextSize = New System.Drawing.Size(124, 13) ' 'LayoutControlItem2 ' @@ -889,14 +896,14 @@ Partial Class frmDocumentResultList Me.LayoutControlItem2.Name = "LayoutControlItem2" Me.LayoutControlItem2.Size = New System.Drawing.Size(224, 24) resources.ApplyResources(Me.LayoutControlItem2, "LayoutControlItem2") - Me.LayoutControlItem2.TextSize = New System.Drawing.Size(126, 13) + Me.LayoutControlItem2.TextSize = New System.Drawing.Size(124, 13) ' 'EmptySpaceItem1 ' Me.EmptySpaceItem1.AllowHotTrack = False Me.EmptySpaceItem1.Location = New System.Drawing.Point(0, 93) Me.EmptySpaceItem1.Name = "EmptySpaceItem1" - Me.EmptySpaceItem1.Size = New System.Drawing.Size(248, 321) + Me.EmptySpaceItem1.Size = New System.Drawing.Size(248, 300) Me.EmptySpaceItem1.TextSize = New System.Drawing.Size(0, 0) ' 'DockPanelPreview @@ -915,13 +922,6 @@ Partial Class frmDocumentResultList resources.ApplyResources(Me.DockPanel1_Container, "DockPanel1_Container") Me.DockPanel1_Container.Name = "DockPanel1_Container" ' - 'BarButtonItem6 - ' - resources.ApplyResources(Me.BarButtonItem6, "BarButtonItem6") - Me.BarButtonItem6.Id = 61 - Me.BarButtonItem6.ImageOptions.SvgImage = CType(resources.GetObject("BarButtonItem6.ImageOptions.SvgImage"), DevExpress.Utils.Svg.SvgImage) - Me.BarButtonItem6.Name = "BarButtonItem6" - ' 'frmDocumentResultList ' Me.AllowFormGlass = DevExpress.Utils.DefaultBoolean.[True] diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.resx b/GUIs.Common/DocumentResultList/frmDocumentResultList.resx index 8ee89881..ebc5597c 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.resx +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.resx @@ -506,10 +506,10 @@ 1189, 671 - 3, 26 + 3, 46 - 583, 460 + 583, 442 0 @@ -530,7 +530,7 @@ 0, 158 - 590, 489 + 590, 491 Ergebnisse @@ -554,7 +554,7 @@ 0, 0 - 318, 459 + 318, 441 0 @@ -563,7 +563,7 @@ DocumentViewer1 - DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.6.0.0, Culture=neutral, PublicKeyToken=null + DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.7.0.0, Culture=neutral, PublicKeyToken=null DockPanel1_Container @@ -572,10 +572,10 @@ 0 - 3, 26 + 3, 46 - 318, 459 + 318, 441 0 @@ -596,7 +596,7 @@ 590, 158 - 324, 489 + 324, 491 Vorschau @@ -620,7 +620,7 @@ 0, 0 - 268, 434 + 268, 413 0 @@ -629,7 +629,7 @@ CtrlObjectPropertyDialog - DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=2.8.0.0, Culture=neutral, PublicKeyToken=null + DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=2.7.2.0, Culture=neutral, PublicKeyToken=null DockPanel3_Container @@ -641,7 +641,7 @@ 0, 0 - 268, 434 + 268, 413 0 @@ -659,10 +659,10 @@ 0 - 4, 26 + 4, 46 - 268, 434 + 268, 413 Eigenschaften @@ -680,10 +680,10 @@ 0 - 162, 45 + 160, 45 - 82, 20 + 84, 20 4 @@ -704,7 +704,7 @@ - 162, 69 + 160, 69 Combo @@ -713,7 +713,7 @@ Combo - 82, 20 + 84, 20 5 @@ -746,7 +746,7 @@ In Bearbeitung - 268, 434 + 268, 413 0 @@ -770,7 +770,7 @@ 0, 0 - 268, 434 + 268, 413 0 @@ -788,10 +788,10 @@ 0 - 4, 26 + 4, 46 - 268, 434 + 268, 413 Status @@ -812,7 +812,7 @@ 914, 158 - 275, 489 + 275, 491 panelContainer1 @@ -833,10 +833,10 @@ Arbeitsbereich: {0} - 0, 647 + 0, 649 - 1189, 24 + 1189, 22 RibbonStatusBar @@ -1191,6 +1191,12 @@ DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + + BarButtonItem6 + + + DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a + RibbonPageStart @@ -1371,12 +1377,6 @@ DevExpress.XtraLayout.EmptySpaceItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - - BarButtonItem6 - - - DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a - frmDocumentResultList @@ -1482,7 +1482,7 @@ 4 - 573, 460 + 573, 442 0 @@ -1653,7 +1653,7 @@ 1 - 583, 460 + 583, 442 2 diff --git a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb index cb45dd24..7f832d95 100644 --- a/GUIs.Common/DocumentResultList/frmDocumentResultList.vb +++ b/GUIs.Common/DocumentResultList/frmDocumentResultList.vb @@ -269,7 +269,8 @@ Public Class frmDocumentResultList ' This loads the default workspace, for now Workspace.LoadWorkspace(Config.Config.SelectedWorkspace) - + ' Selektion zuverlässig setzen + SelectFirstRowInGrid1() ' This needs to done be after loading the grid ' so we can set the row handle and start loading the (only) file @@ -304,7 +305,13 @@ Public Class frmDocumentResultList End Try End Sub - + Private Sub SelectFirstRowInGrid1() + If GridView1.RowCount > 0 Then + GridView1.FocusedRowHandle = 0 + Else + GridView1.FocusedRowHandle = GridControl.InvalidRowHandle + End If + End Sub Private Sub Workspace_WorkspaceLoaded(sender As Object, e As String) lblCurrentWorkspace.Caption = String.Format(lblCurrentWorkspace.Tag, e) End Sub @@ -374,10 +381,10 @@ Public Class frmDocumentResultList ' } 'Else If Not IsNothing(oDocument.Contents) Then - _Logger.Debug("Loading document into viewer with MemoryStream handler. ObjectId: [{0}], Filename: [{1}], FullPath: [{2}]", oObjectId, oFileName, oFullPath) - DocumentViewer1.LoadFile(oFileName, New MemoryStream(oDocument.Contents)) + _Logger.Debug("Loading document into viewer with MemoryStream handler (LoadFile_FromStream). ObjectId: [{0}], Filename: [{1}], FullPath: [{2}]", oObjectId, oFileName, oFullPath) + DocumentViewer1.LoadFile_FromStream(oFileName, New MemoryStream(oDocument.Contents)) Else - _Logger.Debug("Loading document into viewer from filepath ObjectId: [{0}], Filename: [{1}], FullPath: [{2}]", oObjectId, oFileName, oFullPath) + _Logger.Debug("Loading document into viewer from filepath (LoadFile_FromPath). ObjectId: [{0}], Filename: [{1}], FullPath: [{2}]", oObjectId, oFileName, oFullPath) DocumentViewer1.LoadFile_FromPath(oFullPath) End If 'End If @@ -589,9 +596,14 @@ Public Class frmDocumentResultList UpdateTotalResults() LoadGridDataAndLayout() - ' After the new results are loaded, set the old row handle - ' to trigger the row change events and load object properties - GridView1.FocusedRowHandle = oCurrentRowHandle + ' Restore old selection only if still valid; otherwise select first row + If GridView1.IsValidRowHandle(oCurrentRowHandle) Then + GridView1.FocusedRowHandle = oCurrentRowHandle + ElseIf GridView1.RowCount > 0 Then + GridView1.FocusedRowHandle = 0 + Else + GridView1.FocusedRowHandle = GridControl.InvalidRowHandle + End If Return True Catch ex As Exception