jj

Common/Common.vbproj

@@ -54,6 +54,9 @@
     <Reference Include="DevExpress.XtraLayout.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraPrinting.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
     <Reference Include="DevExpress.XtraTreeList.v18.1, Version=18.1.5.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+    <Reference Include="GdPicture.NET.14">
+      <HintPath>D:\ProgramFiles\GdPicture.NET 14\Redist\GdPicture.NET\GdPicture.NET.14.dll</HintPath>
+    </Reference>
     <Reference Include="Microsoft.CSharp" />
     <Reference Include="NLog, Version=4.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c, processorArchitecture=MSIL">
       <HintPath>..\packages\NLog.4.6.7\lib\net45\NLog.dll</HintPath>
@@ -137,6 +140,10 @@
     <None Include="packages.config" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\DocumentViewer\DocumentViewer.vbproj">
+      <Project>{0958cddf-4a16-41f6-8837-8335f71d599c}</Project>
+      <Name>DocumentViewer</Name>
+    </ProjectReference>
     <ProjectReference Include="..\Modules.Config\Config.vbproj">
       <Project>{44982f9b-6116-44e2-85d0-f39650b1ef99}</Project>
       <Name>Config</Name>

Common/DocumentResultList/DocumentResultParams.vb

@@ -3,6 +3,7 @@
     ''' WindowGuid is used to save layout data
     ''' </summary>
     Public WindowGuid As String
+    Public ViewerLicense As String
     Public Results As New List(Of DocumentResult)
 End Class
 

Common/DocumentResultList/frmDocumentResultList.Designer.vb

@@ -41,6 +41,8 @@ Partial Class frmDocumentResultList
         Me.GridView3 = New DevExpress.XtraGrid.Views.BandedGrid.BandedGridView()
         Me.GridBand3 = New DevExpress.XtraGrid.Views.BandedGrid.GridBand()
         Me.XtraSaveFileDialog = New DevExpress.XtraEditors.XtraSaveFileDialog(Me.components)
+        Me.SplitContainerControl3 = New DevExpress.XtraEditors.SplitContainerControl()
+        Me.DocumentViewer1 = New DocumentViewer.DocumentViewer()
         CType(Me.RibbonControl, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).BeginInit()
         Me.SplitContainerControl1.SuspendLayout()
@@ -52,6 +54,8 @@ Partial Class frmDocumentResultList
         CType(Me.GridView2, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridControl3, System.ComponentModel.ISupportInitialize).BeginInit()
         CType(Me.GridView3, System.ComponentModel.ISupportInitialize).BeginInit()
+        CType(Me.SplitContainerControl3, System.ComponentModel.ISupportInitialize).BeginInit()
+        Me.SplitContainerControl3.SuspendLayout()
         Me.SuspendLayout()
         '
         'RibbonControl
@@ -118,14 +122,14 @@ Partial Class frmDocumentResultList
         '
         Me.SplitContainerControl1.CollapsePanel = DevExpress.XtraEditors.SplitCollapsePanel.Panel2
         Me.SplitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill
-        Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 143)
+        Me.SplitContainerControl1.Location = New System.Drawing.Point(0, 0)
         Me.SplitContainerControl1.Name = "SplitContainerControl1"
         Me.SplitContainerControl1.Panel1.Controls.Add(Me.GridControl1)
         Me.SplitContainerControl1.Panel1.Text = "Panel1"
         Me.SplitContainerControl1.Panel2.Controls.Add(Me.SplitContainerControl2)
         Me.SplitContainerControl1.Panel2.Text = "Panel2"
-        Me.SplitContainerControl1.Size = New System.Drawing.Size(1189, 497)
-        Me.SplitContainerControl1.SplitterPosition = 531
+        Me.SplitContainerControl1.Size = New System.Drawing.Size(762, 497)
+        Me.SplitContainerControl1.SplitterPosition = 382
         Me.SplitContainerControl1.TabIndex = 2
         Me.SplitContainerControl1.Text = "SplitContainerControl1"
         '
@@ -136,7 +140,7 @@ Partial Class frmDocumentResultList
         Me.GridControl1.MainView = Me.GridView1
         Me.GridControl1.MenuManager = Me.RibbonControl
         Me.GridControl1.Name = "GridControl1"
-        Me.GridControl1.Size = New System.Drawing.Size(531, 497)
+        Me.GridControl1.Size = New System.Drawing.Size(382, 497)
         Me.GridControl1.TabIndex = 0
         Me.GridControl1.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView1})
         '
@@ -172,7 +176,7 @@ Partial Class frmDocumentResultList
         Me.SplitContainerControl2.Panel1.Text = "Panel1"
         Me.SplitContainerControl2.Panel2.Controls.Add(Me.GridControl3)
         Me.SplitContainerControl2.Panel2.Text = "Panel2"
-        Me.SplitContainerControl2.Size = New System.Drawing.Size(653, 497)
+        Me.SplitContainerControl2.Size = New System.Drawing.Size(375, 497)
         Me.SplitContainerControl2.SplitterPosition = 223
         Me.SplitContainerControl2.TabIndex = 0
         Me.SplitContainerControl2.Text = "SplitContainerControl2"
@@ -184,7 +188,7 @@ Partial Class frmDocumentResultList
         Me.GridControl2.MainView = Me.GridView2
         Me.GridControl2.MenuManager = Me.RibbonControl
         Me.GridControl2.Name = "GridControl2"
-        Me.GridControl2.Size = New System.Drawing.Size(653, 223)
+        Me.GridControl2.Size = New System.Drawing.Size(375, 223)
         Me.GridControl2.TabIndex = 0
         Me.GridControl2.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView2})
         '
@@ -215,7 +219,7 @@ Partial Class frmDocumentResultList
         Me.GridControl3.MainView = Me.GridView3
         Me.GridControl3.MenuManager = Me.RibbonControl
         Me.GridControl3.Name = "GridControl3"
-        Me.GridControl3.Size = New System.Drawing.Size(653, 269)
+        Me.GridControl3.Size = New System.Drawing.Size(375, 269)
         Me.GridControl3.TabIndex = 0
         Me.GridControl3.ViewCollection.AddRange(New DevExpress.XtraGrid.Views.Base.BaseView() {Me.GridView3})
         '
@@ -243,12 +247,34 @@ Partial Class frmDocumentResultList
         '
         Me.XtraSaveFileDialog.FileName = "XtraSaveFileDialog1"
         '
+        'SplitContainerControl3
+        '
+        Me.SplitContainerControl3.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.SplitContainerControl3.Location = New System.Drawing.Point(0, 143)
+        Me.SplitContainerControl3.Name = "SplitContainerControl3"
+        Me.SplitContainerControl3.Panel1.Controls.Add(Me.SplitContainerControl1)
+        Me.SplitContainerControl3.Panel1.Text = "Panel1"
+        Me.SplitContainerControl3.Panel2.Controls.Add(Me.DocumentViewer1)
+        Me.SplitContainerControl3.Panel2.Text = "Panel2"
+        Me.SplitContainerControl3.Size = New System.Drawing.Size(1189, 497)
+        Me.SplitContainerControl3.SplitterPosition = 762
+        Me.SplitContainerControl3.TabIndex = 5
+        Me.SplitContainerControl3.Text = "SplitContainerControl3"
+        '
+        'DocumentViewer1
+        '
+        Me.DocumentViewer1.Dock = System.Windows.Forms.DockStyle.Fill
+        Me.DocumentViewer1.Location = New System.Drawing.Point(0, 0)
+        Me.DocumentViewer1.Name = "DocumentViewer1"
+        Me.DocumentViewer1.Size = New System.Drawing.Size(422, 497)
+        Me.DocumentViewer1.TabIndex = 0
+        '
         'frmDocumentResultList
         '
         Me.AutoScaleDimensions = New System.Drawing.SizeF(6.0!, 13.0!)
         Me.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font
         Me.ClientSize = New System.Drawing.Size(1189, 671)
-        Me.Controls.Add(Me.SplitContainerControl1)
+        Me.Controls.Add(Me.SplitContainerControl3)
         Me.Controls.Add(Me.RibbonStatusBar)
         Me.Controls.Add(Me.RibbonControl)
         Me.Icon = CType(resources.GetObject("$this.Icon"), System.Drawing.Icon)
@@ -267,6 +293,8 @@ Partial Class frmDocumentResultList
         CType(Me.GridView2, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.GridControl3, System.ComponentModel.ISupportInitialize).EndInit()
         CType(Me.GridView3, System.ComponentModel.ISupportInitialize).EndInit()
+        CType(Me.SplitContainerControl3, System.ComponentModel.ISupportInitialize).EndInit()
+        Me.SplitContainerControl3.ResumeLayout(False)
         Me.ResumeLayout(False)
         Me.PerformLayout()
 
@@ -292,4 +320,6 @@ Partial Class frmDocumentResultList
     Friend WithEvents BarButtonItemExportGrid1 As DevExpress.XtraBars.BarButtonItem
     Friend WithEvents RibbonPageGroup2 As DevExpress.XtraBars.Ribbon.RibbonPageGroup
     Friend WithEvents XtraSaveFileDialog As DevExpress.XtraEditors.XtraSaveFileDialog
+    Friend WithEvents SplitContainerControl3 As DevExpress.XtraEditors.SplitContainerControl
+    Friend WithEvents DocumentViewer1 As DocumentViewer.DocumentViewer
 End Class

Common/DocumentResultList/frmDocumentResultList.vb

@@ -16,6 +16,7 @@ Public Class frmDocumentResultList
     Private _Logger As Logger
     Private _Config As ConfigManager(Of DocumentResultConfig)
     Private _Environment As Environment
+    Private _Params As DocumentResultParams
     Private _ResultLists As List(Of DocumentResult)
 
     Private _IsLoading As Boolean = True
@@ -31,6 +32,7 @@ Public Class frmDocumentResultList
         _Logger = LogConfig.GetLogger()
         _Config = New ConfigManager(Of DocumentResultConfig)(LogConfig, oConfigPath)
         _Environment = Environment
+        _Params = Params
         _ResultLists = Params.Results
     End Sub
 
@@ -42,6 +44,8 @@ Public Class frmDocumentResultList
             SplitContainerControl2.SplitterPosition = _Config.Config.SplitContainer2Distance
             SwitchDetailContainerHorizontal.Checked = _Config.Config.SplitContainer2Horizontal
 
+            DocumentViewer1.Init(_Params.ViewerLicense)
+
             Dim oTotalResults = 0
 
             For Each oList In _ResultLists