Zooflow: Implement Single file Search Results, Rework client wrt Address parsing

This commit is contained in:
Jonathan Jenne
2022-04-13 15:39:01 +02:00
parent 7716a04452
commit 160040535d
23 changed files with 346 additions and 234 deletions

View File

@@ -12,6 +12,7 @@ Namespace DocumentResultList
Public OperationModeOverride As OperationMode = OperationMode.None
Public ProfileGuid As Integer
Public ShowBackNavigation As Boolean = True
Public ShowFileList As Boolean = True
End Class
Public Class DocumentResult

View File

@@ -107,7 +107,7 @@ Partial Class frmDocumentResultList
Me.DockPanelMetadata = New DevExpress.XtraBars.Docking.DockPanel()
Me.DockPanel3_Container = New DevExpress.XtraBars.Docking.ControlContainer()
Me.CtrlObjectPropertyDialog = New DigitalData.GUIs.Common.ctrlObjectPropertyDialog()
Me.DockPanelDocViewer = New DevExpress.XtraBars.Docking.DockPanel()
Me.DockPanelPreview = New DevExpress.XtraBars.Docking.DockPanel()
Me.DockPanel1_Container = New DevExpress.XtraBars.Docking.ControlContainer()
Me.SvgImageCollection1 = New DevExpress.Utils.SvgImageCollection(Me.components)
CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
@@ -151,7 +151,7 @@ Partial Class frmDocumentResultList
CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.DockPanelMetadata.SuspendLayout()
Me.DockPanel3_Container.SuspendLayout()
Me.DockPanelDocViewer.SuspendLayout()
Me.DockPanelPreview.SuspendLayout()
Me.DockPanel1_Container.SuspendLayout()
CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).BeginInit()
Me.SuspendLayout()
@@ -701,7 +701,7 @@ Partial Class frmDocumentResultList
'DockManager1
'
Me.DockManager1.Form = Me
Me.DockManager1.RootPanels.AddRange(New DevExpress.XtraBars.Docking.DockPanel() {Me.DockPanelFileList, Me.panelContainerStatus, Me.DockPanelDocViewer})
Me.DockManager1.RootPanels.AddRange(New DevExpress.XtraBars.Docking.DockPanel() {Me.DockPanelFileList, Me.panelContainerStatus, Me.DockPanelPreview})
Me.DockManager1.TopZIndexControls.AddRange(New String() {"DevExpress.XtraBars.BarDockControl", "DevExpress.XtraBars.StandaloneBarDockControl", "System.Windows.Forms.MenuStrip", "System.Windows.Forms.StatusStrip", "System.Windows.Forms.StatusBar", "DevExpress.XtraBars.Ribbon.RibbonStatusBar", "DevExpress.XtraBars.Ribbon.RibbonControl", "DevExpress.XtraBars.Navigation.OfficeNavigationBar", "DevExpress.XtraBars.Navigation.TileNavPane", "DevExpress.XtraBars.TabFormControl", "DevExpress.XtraBars.FluentDesignSystem.FluentDesignFormControl", "DevExpress.XtraBars.ToolbarForm.ToolbarFormControl"})
'
'DockPanelFileList
@@ -712,7 +712,7 @@ Partial Class frmDocumentResultList
resources.ApplyResources(Me.DockPanelFileList, "DockPanelFileList")
Me.DockPanelFileList.Name = "DockPanelFileList"
Me.DockPanelFileList.Options.ShowCloseButton = False
Me.DockPanelFileList.OriginalSize = New System.Drawing.Size(585, 200)
Me.DockPanelFileList.OriginalSize = New System.Drawing.Size(590, 200)
'
'DockPanel2_Container
'
@@ -840,15 +840,15 @@ Partial Class frmDocumentResultList
resources.ApplyResources(Me.CtrlObjectPropertyDialog, "CtrlObjectPropertyDialog")
Me.CtrlObjectPropertyDialog.Name = "CtrlObjectPropertyDialog"
'
'DockPanelDocViewer
'DockPanelPreview
'
Me.DockPanelDocViewer.Controls.Add(Me.DockPanel1_Container)
Me.DockPanelDocViewer.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill
Me.DockPanelDocViewer.ID = New System.Guid("6e5335e5-ba54-49c1-81b3-f174ea4e59ca")
resources.ApplyResources(Me.DockPanelDocViewer, "DockPanelDocViewer")
Me.DockPanelDocViewer.Name = "DockPanelDocViewer"
Me.DockPanelDocViewer.Options.ShowCloseButton = False
Me.DockPanelDocViewer.OriginalSize = New System.Drawing.Size(329, 200)
Me.DockPanelPreview.Controls.Add(Me.DockPanel1_Container)
Me.DockPanelPreview.Dock = DevExpress.XtraBars.Docking.DockingStyle.Fill
Me.DockPanelPreview.ID = New System.Guid("6e5335e5-ba54-49c1-81b3-f174ea4e59ca")
resources.ApplyResources(Me.DockPanelPreview, "DockPanelPreview")
Me.DockPanelPreview.Name = "DockPanelPreview"
Me.DockPanelPreview.Options.ShowCloseButton = False
Me.DockPanelPreview.OriginalSize = New System.Drawing.Size(324, 200)
'
'DockPanel1_Container
'
@@ -865,7 +865,7 @@ Partial Class frmDocumentResultList
Me.AllowFormGlass = DevExpress.Utils.DefaultBoolean.[True]
resources.ApplyResources(Me, "$this")
Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
Me.Controls.Add(Me.DockPanelDocViewer)
Me.Controls.Add(Me.DockPanelPreview)
Me.Controls.Add(Me.panelContainerStatus)
Me.Controls.Add(Me.DockPanelFileList)
Me.Controls.Add(Me.RibbonStatusBar)
@@ -916,7 +916,7 @@ Partial Class frmDocumentResultList
CType(Me.EmptySpaceItem1, System.ComponentModel.ISupportInitialize).EndInit()
Me.DockPanelMetadata.ResumeLayout(False)
Me.DockPanel3_Container.ResumeLayout(False)
Me.DockPanelDocViewer.ResumeLayout(False)
Me.DockPanelPreview.ResumeLayout(False)
Me.DockPanel1_Container.ResumeLayout(False)
CType(Me.SvgImageCollection1, System.ComponentModel.ISupportInitialize).EndInit()
Me.ResumeLayout(False)
@@ -974,7 +974,7 @@ Partial Class frmDocumentResultList
Friend WithEvents RibbonPageGroup5 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
Friend WithEvents RibbonPageGroup6 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
Friend WithEvents DockManager1 As DevExpress.XtraBars.Docking.DockManager
Friend WithEvents DockPanelDocViewer As DevExpress.XtraBars.Docking.DockPanel
Friend WithEvents DockPanelPreview As DevExpress.XtraBars.Docking.DockPanel
Friend WithEvents DockPanel1_Container As DevExpress.XtraBars.Docking.ControlContainer
Friend WithEvents DockPanelMetadata As DevExpress.XtraBars.Docking.DockPanel
Friend WithEvents DockPanel3_Container As DevExpress.XtraBars.Docking.ControlContainer

View File

@@ -493,7 +493,7 @@
<value>0, 0</value>
</data>
<data name="DocumentViewer1.Size" type="System.Drawing.Size, System.Drawing">
<value>323, 459</value>
<value>318, 459</value>
</data>
<assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="DocumentViewer1.TabIndex" type="System.Int32, mscorlib">
@@ -515,7 +515,7 @@
<value>3, 26</value>
</data>
<data name="DockPanel1_Container.Size" type="System.Drawing.Size, System.Drawing">
<value>323, 459</value>
<value>318, 459</value>
</data>
<data name="DockPanel1_Container.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -527,30 +527,30 @@
<value>DevExpress.XtraBars.Docking.ControlContainer, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;DockPanel1_Container.Parent" xml:space="preserve">
<value>DockPanelDocViewer</value>
<value>DockPanelPreview</value>
</data>
<data name="&gt;&gt;DockPanel1_Container.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="DockPanelDocViewer.Location" type="System.Drawing.Point, System.Drawing">
<value>585, 158</value>
<data name="DockPanelPreview.Location" type="System.Drawing.Point, System.Drawing">
<value>590, 158</value>
</data>
<data name="DockPanelDocViewer.Size" type="System.Drawing.Size, System.Drawing">
<value>329, 489</value>
<data name="DockPanelPreview.Size" type="System.Drawing.Size, System.Drawing">
<value>324, 489</value>
</data>
<data name="DockPanelDocViewer.Text" xml:space="preserve">
<data name="DockPanelPreview.Text" xml:space="preserve">
<value>Vorschau</value>
</data>
<data name="&gt;&gt;DockPanelDocViewer.Name" xml:space="preserve">
<value>DockPanelDocViewer</value>
<data name="&gt;&gt;DockPanelPreview.Name" xml:space="preserve">
<value>DockPanelPreview</value>
</data>
<data name="&gt;&gt;DockPanelDocViewer.Type" xml:space="preserve">
<data name="&gt;&gt;DockPanelPreview.Type" xml:space="preserve">
<value>DevExpress.XtraBars.Docking.DockPanel, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a</value>
</data>
<data name="&gt;&gt;DockPanelDocViewer.Parent" xml:space="preserve">
<data name="&gt;&gt;DockPanelPreview.Parent" xml:space="preserve">
<value>$this</value>
</data>
<data name="&gt;&gt;DockPanelDocViewer.ZOrder" xml:space="preserve">
<data name="&gt;&gt;DockPanelPreview.ZOrder" xml:space="preserve">
<value>0</value>
</data>
<data name="txtCheckedOutWho.Location" type="System.Drawing.Point, System.Drawing">
@@ -774,7 +774,7 @@
<value>3, 26</value>
</data>
<data name="DockPanel2_Container.Size" type="System.Drawing.Size, System.Drawing">
<value>578, 460</value>
<value>583, 460</value>
</data>
<data name="DockPanel2_Container.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -795,7 +795,7 @@
<value>0, 158</value>
</data>
<data name="DockPanelFileList.Size" type="System.Drawing.Size, System.Drawing">
<value>585, 489</value>
<value>590, 489</value>
</data>
<data name="DockPanelFileList.Text" xml:space="preserve">
<value>Ergebnisse</value>
@@ -1397,7 +1397,7 @@
<value>4</value>
</data>
<data name="GridControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>568, 460</value>
<value>573, 460</value>
</data>
<data name="GridControl1.TabIndex" type="System.Int32, mscorlib">
<value>0</value>
@@ -1568,7 +1568,7 @@
<value>1</value>
</data>
<data name="SplitContainerControl1.Size" type="System.Drawing.Size, System.Drawing">
<value>578, 460</value>
<value>583, 460</value>
</data>
<data name="SplitContainerControl1.TabIndex" type="System.Int32, mscorlib">
<value>2</value>

View File

@@ -117,7 +117,7 @@ Public Class frmDocumentResultList
Private Function GetOperationMode() As OperationMode
Dim oOperationMode As OperationMode
If Environment.Service.IsActive AndAlso Environment.Service.Address <> String.Empty Then
If Environment.Service.Client.IsOnline AndAlso Environment.Service.Address <> String.Empty Then
oOperationMode = OperationMode.WithAppServer
Else
oOperationMode = OperationMode.NoAppServer
@@ -205,6 +205,8 @@ Public Class frmDocumentResultList
panelContainerStatus.Visibility = Docking.DockVisibility.Hidden
End If
' Hide the complete Navigation Ribbon Group if desired
RibbonPageGroup_Navigation.Visible = Params.ShowBackNavigation
@@ -217,6 +219,15 @@ Public Class frmDocumentResultList
chkGridShowGrouping.Checked = LayoutManager.GetGroupPanelVisible()
chkGridShowTitle.Checked = LayoutManager.GetBandTitleVisible()
' This needs to done be after loading the grid
' so we can set the row handle and start loading the (only) file
If Params.ShowFileList = False Then
DockPanelFileList.HideImmediately()
GridView1.FocusedRowHandle = 0
Else
DockPanelFileList.Show()
End If
Catch ex As Exception
ErrorHandler.ShowErrorMessage(ex, "Form Load", "Error while loading results")
@@ -449,9 +460,9 @@ Public Class frmDocumentResultList
#End Region
Private Function InitAppServer() As Boolean
Dim oSplit As List(Of String) = Environment.Service.Address.Split(":").ToList()
Dim oAddress As String = oSplit.Item(0)
Dim oPort As Integer = oSplit.Item(1)
Dim oServerAddress = Client.ParseServiceAddress(Environment.Service.Client.ServerAddress)
Dim oAddress As String = oServerAddress.Item1
Dim oPort As Integer = oServerAddress.Item2
Client = New Client(LogConfig, oAddress, oPort)
ControlManager = New AttributeControls(LogConfig, Environment, Client)
@@ -1113,4 +1124,8 @@ Public Class frmDocumentResultList
GridBuilder.WithFontSizeDelta(Config.Config.GridFontSizeDelta)
End Sub
Private Sub RibbonControl_Click(sender As Object, e As EventArgs) Handles RibbonControl.Click
End Sub
End Class