Handling in DocumentResultLsit

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]

GUIs.Common/DocumentResultList/frmDocumentResultList.resx

@@ -506,10 +506,10 @@
     <value>1189, 671</value>
   </data>
   <data name="DockPanel2_Container.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 26</value>
+    <value>3, 46</value>
   </data>
   <data name="DockPanel2_Container.Size" type="System.Drawing.Size, System.Drawing">
-    <value>583, 460</value>
+    <value>583, 442</value>
   </data>
   <data name="DockPanel2_Container.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -530,7 +530,7 @@
     <value>0, 158</value>
   </data>
   <data name="DockPanelFileList.Size" type="System.Drawing.Size, System.Drawing">
-    <value>590, 489</value>
+    <value>590, 491</value>
   </data>
   <data name="DockPanelFileList.Text" xml:space="preserve">
     <value>Ergebnisse</value>
@@ -554,7 +554,7 @@
     <value>0, 0</value>
   </data>
   <data name="DocumentViewer1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>318, 459</value>
+    <value>318, 441</value>
   </data>
   <data name="DocumentViewer1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -563,7 +563,7 @@
     <value>DocumentViewer1</value>
   </data>
   <data name="&gt;&gt;DocumentViewer1.Type" xml:space="preserve">
-    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.6.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DigitalData.Controls.DocumentViewer.DocumentViewer, DigitalData.Controls.DocumentViewer, Version=2.7.0.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;DocumentViewer1.Parent" xml:space="preserve">
     <value>DockPanel1_Container</value>
@@ -572,10 +572,10 @@
     <value>0</value>
   </data>
   <data name="DockPanel1_Container.Location" type="System.Drawing.Point, System.Drawing">
-    <value>3, 26</value>
+    <value>3, 46</value>
   </data>
   <data name="DockPanel1_Container.Size" type="System.Drawing.Size, System.Drawing">
-    <value>318, 459</value>
+    <value>318, 441</value>
   </data>
   <data name="DockPanel1_Container.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -596,7 +596,7 @@
     <value>590, 158</value>
   </data>
   <data name="DockPanelPreview.Size" type="System.Drawing.Size, System.Drawing">
-    <value>324, 489</value>
+    <value>324, 491</value>
   </data>
   <data name="DockPanelPreview.Text" xml:space="preserve">
     <value>Vorschau</value>
@@ -620,7 +620,7 @@
     <value>0, 0</value>
   </data>
   <data name="CtrlObjectPropertyDialog.Size" type="System.Drawing.Size, System.Drawing">
-    <value>268, 434</value>
+    <value>268, 413</value>
   </data>
   <data name="CtrlObjectPropertyDialog.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -629,7 +629,7 @@
     <value>CtrlObjectPropertyDialog</value>
   </data>
   <data name="&gt;&gt;CtrlObjectPropertyDialog.Type" xml:space="preserve">
-    <value>DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=2.8.0.0, Culture=neutral, PublicKeyToken=null</value>
+    <value>DigitalData.GUIs.Common.ctrlObjectPropertyDialog, DigitalData.GUIs.Common, Version=2.7.2.0, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;CtrlObjectPropertyDialog.Parent" xml:space="preserve">
     <value>DockPanel3_Container</value>
@@ -641,7 +641,7 @@
     <value>0, 0</value>
   </data>
   <data name="DockPanel3_Container.Size" type="System.Drawing.Size, System.Drawing">
-    <value>268, 434</value>
+    <value>268, 413</value>
   </data>
   <data name="DockPanel3_Container.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -659,10 +659,10 @@
     <value>0</value>
   </data>
   <data name="DockPanelMetadata.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 26</value>
+    <value>4, 46</value>
   </data>
   <data name="DockPanelMetadata.Size" type="System.Drawing.Size, System.Drawing">
-    <value>268, 434</value>
+    <value>268, 413</value>
   </data>
   <data name="DockPanelMetadata.Text" xml:space="preserve">
     <value>Eigenschaften</value>
@@ -680,10 +680,10 @@
     <value>0</value>
   </data>
   <data name="txtCheckedOutWho.Location" type="System.Drawing.Point, System.Drawing">
-    <value>162, 45</value>
+    <value>160, 45</value>
   </data>
   <data name="txtCheckedOutWho.Size" type="System.Drawing.Size, System.Drawing">
-    <value>82, 20</value>
+    <value>84, 20</value>
   </data>
   <data name="txtCheckedOutWho.TabIndex" type="System.Int32, mscorlib">
     <value>4</value>
@@ -704,7 +704,7 @@
     <value />
   </data>
   <data name="dateCheckedOutWhen.Location" type="System.Drawing.Point, System.Drawing">
-    <value>162, 69</value>
+    <value>160, 69</value>
   </data>
   <data name="dateCheckedOutWhen.Properties.Buttons" type="DevExpress.XtraEditors.Controls.ButtonPredefines, DevExpress.Utils.v21.2">
     <value>Combo</value>
@@ -713,7 +713,7 @@
     <value>Combo</value>
   </data>
   <data name="dateCheckedOutWhen.Size" type="System.Drawing.Size, System.Drawing">
-    <value>82, 20</value>
+    <value>84, 20</value>
   </data>
   <data name="dateCheckedOutWhen.TabIndex" type="System.Int32, mscorlib">
     <value>5</value>
@@ -746,7 +746,7 @@
     <value>In Bearbeitung</value>
   </data>
   <data name="LayoutControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>268, 434</value>
+    <value>268, 413</value>
   </data>
   <data name="LayoutControl1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -770,7 +770,7 @@
     <value>0, 0</value>
   </data>
   <data name="ControlContainer1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>268, 434</value>
+    <value>268, 413</value>
   </data>
   <data name="ControlContainer1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -788,10 +788,10 @@
     <value>0</value>
   </data>
   <data name="DockPanelStatus.Location" type="System.Drawing.Point, System.Drawing">
-    <value>4, 26</value>
+    <value>4, 46</value>
   </data>
   <data name="DockPanelStatus.Size" type="System.Drawing.Size, System.Drawing">
-    <value>268, 434</value>
+    <value>268, 413</value>
   </data>
   <data name="DockPanelStatus.Text" xml:space="preserve">
     <value>Status</value>
@@ -812,7 +812,7 @@
     <value>914, 158</value>
   </data>
   <data name="panelContainerStatus.Size" type="System.Drawing.Size, System.Drawing">
-    <value>275, 489</value>
+    <value>275, 491</value>
   </data>
   <data name="panelContainerStatus.Text" xml:space="preserve">
     <value>panelContainer1</value>
@@ -833,10 +833,10 @@
     <value>Arbeitsbereich: {0}</value>
   </data>
   <data name="RibbonStatusBar.Location" type="System.Drawing.Point, System.Drawing">
-    <value>0, 647</value>
+    <value>0, 649</value>
   </data>
   <data name="RibbonStatusBar.Size" type="System.Drawing.Size, System.Drawing">
-    <value>1189, 24</value>
+    <value>1189, 22</value>
   </data>
   <data name="&gt;&gt;RibbonStatusBar.Name" xml:space="preserve">
     <value>RibbonStatusBar</value>
@@ -1191,6 +1191,12 @@
   <data name="&gt;&gt;lblCurrentWorkspace.Type" xml:space="preserve">
     <value>DevExpress.XtraBars.BarStaticItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
+  <data name="&gt;&gt;BarButtonItem6.Name" xml:space="preserve">
+    <value>BarButtonItem6</value>
+  </data>
+  <data name="&gt;&gt;BarButtonItem6.Type" xml:space="preserve">
+    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
+  </data>
   <data name="&gt;&gt;RibbonPageStart.Name" xml:space="preserve">
     <value>RibbonPageStart</value>
   </data>
@@ -1371,12 +1377,6 @@
   <data name="&gt;&gt;EmptySpaceItem1.Type" xml:space="preserve">
     <value>DevExpress.XtraLayout.EmptySpaceItem, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
   </data>
-  <data name="&gt;&gt;BarButtonItem6.Name" xml:space="preserve">
-    <value>BarButtonItem6</value>
-  </data>
-  <data name="&gt;&gt;BarButtonItem6.Type" xml:space="preserve">
-    <value>DevExpress.XtraBars.BarButtonItem, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
-  </data>
   <data name="&gt;&gt;$this.Name" xml:space="preserve">
     <value>frmDocumentResultList</value>
   </data>
@@ -1482,7 +1482,7 @@
     <value>4</value>
   </data>
   <data name="GridControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>573, 460</value>
+    <value>573, 442</value>
   </data>
   <data name="GridControl1.TabIndex" type="System.Int32, mscorlib">
     <value>0</value>
@@ -1653,7 +1653,7 @@
     <value>1</value>
   </data>
   <data name="SplitContainerControl1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>583, 460</value>
+    <value>583, 442</value>
   </data>
   <data name="SplitContainerControl1.TabIndex" type="System.Int32, mscorlib">
     <value>2</value>

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)
+                    _Logger.Debug("Loading document into viewer with MemoryStream handler (LoadFile_FromStream). ObjectId: [{0}], Filename: [{1}], FullPath: [{2}]", oObjectId, oFileName, oFullPath)
-                    DocumentViewer1.LoadFile(oFileName, New MemoryStream(oDocument.Contents))
+                    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
+                ' Restore old selection only if still valid; otherwise select first row
-                ' to trigger the row change events and load object properties
+                If GridView1.IsValidRowHandle(oCurrentRowHandle) Then
-                GridView1.FocusedRowHandle = oCurrentRowHandle
+                    GridView1.FocusedRowHandle = oCurrentRowHandle
+                ElseIf GridView1.RowCount > 0 Then
+                    GridView1.FocusedRowHandle = 0
+                Else
+                    GridView1.FocusedRowHandle = GridControl.InvalidRowHandle
+                End If
 
                 Return True
             Catch ex As Exception