diff --git a/app/DD-Record-Organizer/My Project/licenses.licx b/app/DD-Record-Organizer/My Project/licenses.licx index 8e8f744..eb43b69 100644 --- a/app/DD-Record-Organizer/My Project/licenses.licx +++ b/app/DD-Record-Organizer/My Project/licenses.licx @@ -1,9 +1,10 @@ -DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Docking2010.DocumentManager, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.ComboBoxEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.TextEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraBars.Ribbon.RibbonControl, DevExpress.XtraBars.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraGrid.GridControl, DevExpress.XtraGrid.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraMap.MapControl, DevExpress.XtraMap.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a -DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraEditors.Repository.RepositoryItemProgressBar, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraEditors.ButtonEdit, DevExpress.XtraEditors.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a +DevExpress.XtraTreeList.TreeList, DevExpress.XtraTreeList.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a DevExpress.XtraLayout.LayoutControl, DevExpress.XtraLayout.v21.2, Version=21.2.4.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a diff --git a/app/DD-Record-Organizer/frmDocSearchResult.Designer.vb b/app/DD-Record-Organizer/frmDocSearchResult.Designer.vb index 24382b7..9dcd6b3 100644 --- a/app/DD-Record-Organizer/frmDocSearchResult.Designer.vb +++ b/app/DD-Record-Organizer/frmDocSearchResult.Designer.vb @@ -23,7 +23,7 @@ Partial Class frmDocSearchResult _ Private Sub InitializeComponent() Me.components = New System.ComponentModel.Container() - Dim GridLevelNode2 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() + Dim GridLevelNode1 As DevExpress.XtraGrid.GridLevelNode = New DevExpress.XtraGrid.GridLevelNode() Dim resources As System.ComponentModel.ComponentResourceManager = New System.ComponentModel.ComponentResourceManager(GetType(frmDocSearchResult)) Me.GridControlDocSearch = New DevExpress.XtraGrid.GridControl() Me.ContextMenuStripResultFiles = New System.Windows.Forms.ContextMenuStrip(Me.components) @@ -49,6 +49,7 @@ Partial Class frmDocSearchResult Me.RibbonStatusBar1 = New DevExpress.XtraBars.Ribbon.RibbonStatusBar() Me.RibbonPage2 = New DevExpress.XtraBars.Ribbon.RibbonPage() Me.SplitContainerControl1 = New DevExpress.XtraEditors.SplitContainerControl() + Me.DocumentViewer1 = New DigitalData.Controls.DocumentViewer.DocumentViewer() CType(Me.GridControlDocSearch, System.ComponentModel.ISupportInitialize).BeginInit() Me.ContextMenuStripResultFiles.SuspendLayout() CType(Me.GridViewDoc_Search, System.ComponentModel.ISupportInitialize).BeginInit() @@ -57,6 +58,7 @@ Partial Class frmDocSearchResult CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).BeginInit() Me.SplitContainerControl1.Panel1.SuspendLayout() CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).BeginInit() + Me.SplitContainerControl1.Panel2.SuspendLayout() Me.SplitContainerControl1.SuspendLayout() Me.SuspendLayout() ' @@ -64,8 +66,8 @@ Partial Class frmDocSearchResult ' Me.GridControlDocSearch.ContextMenuStrip = Me.ContextMenuStripResultFiles Me.GridControlDocSearch.Dock = System.Windows.Forms.DockStyle.Fill - GridLevelNode2.RelationName = "Level1" - Me.GridControlDocSearch.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode2}) + GridLevelNode1.RelationName = "Level1" + Me.GridControlDocSearch.LevelTree.Nodes.AddRange(New DevExpress.XtraGrid.GridLevelNode() {GridLevelNode1}) Me.GridControlDocSearch.Location = New System.Drawing.Point(0, 0) Me.GridControlDocSearch.MainView = Me.GridViewDoc_Search Me.GridControlDocSearch.Name = "GridControlDocSearch" @@ -257,11 +259,21 @@ Partial Class frmDocSearchResult ' 'SplitContainerControl1.Panel2 ' + Me.SplitContainerControl1.Panel2.Controls.Add(Me.DocumentViewer1) Me.SplitContainerControl1.Panel2.Text = "Panel2" Me.SplitContainerControl1.Size = New System.Drawing.Size(1083, 465) Me.SplitContainerControl1.SplitterPosition = 698 Me.SplitContainerControl1.TabIndex = 11 ' + 'DocumentViewer1 + ' + Me.DocumentViewer1.Dock = System.Windows.Forms.DockStyle.Fill + Me.DocumentViewer1.FileLoaded = False + Me.DocumentViewer1.Location = New System.Drawing.Point(0, 0) + Me.DocumentViewer1.Name = "DocumentViewer1" + Me.DocumentViewer1.Size = New System.Drawing.Size(375, 465) + Me.DocumentViewer1.TabIndex = 0 + ' 'frmDocSearchResult ' Me.Appearance.Options.UseFont = True @@ -284,6 +296,7 @@ Partial Class frmDocSearchResult CType(Me.SplitContainerControl1.Panel1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControl1.Panel1.ResumeLayout(False) CType(Me.SplitContainerControl1.Panel2, System.ComponentModel.ISupportInitialize).EndInit() + Me.SplitContainerControl1.Panel2.ResumeLayout(False) CType(Me.SplitContainerControl1, System.ComponentModel.ISupportInitialize).EndInit() Me.SplitContainerControl1.ResumeLayout(False) Me.ResumeLayout(False) @@ -314,4 +327,5 @@ Partial Class frmDocSearchResult Friend WithEvents bchlitmPreview As DevExpress.XtraBars.BarCheckItem Friend WithEvents BarCheckItem1 As DevExpress.XtraBars.BarCheckItem Friend WithEvents SplitContainerControl1 As DevExpress.XtraEditors.SplitContainerControl + Friend WithEvents DocumentViewer1 As DigitalData.Controls.DocumentViewer.DocumentViewer End Class diff --git a/app/DD-Record-Organizer/frmDocSearchResult.resx b/app/DD-Record-Organizer/frmDocSearchResult.resx index 563a6dd..8c5ee56 100644 --- a/app/DD-Record-Organizer/frmDocSearchResult.resx +++ b/app/DD-Record-Organizer/frmDocSearchResult.resx @@ -124,7 +124,7 @@ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAAAlwSFlzAAAO - wAAADsABataJCQAAAINJREFUOE9jQAbfvn37TwyGKscEIEknJye8mH4GfHj/EQWTbAAuPIRcgAsPRwO+ + vwAADr8BOAVTJAAAAINJREFUOE9jQAbfvn37TwyGKscEIEknJye8mH4GfHj/EQWTbAAuPIRcgAsPRwO+ f/+eABLEhX19ffEbABR4n5KSAlcA0rB582YwDRIHacAbjQ8ePABLgDSdPHny/5w5c8Ds5cuXg8VBYjDN WA2AuQDZZphimAvwGkAoDLBhqFYgYGAAAFMd0furxZnJAAAAAElFTkSuQmCC diff --git a/app/DD-Record-Organizer/frmDocSearchResult.vb b/app/DD-Record-Organizer/frmDocSearchResult.vb index c940675..1dc52ab 100644 --- a/app/DD-Record-Organizer/frmDocSearchResult.vb +++ b/app/DD-Record-Organizer/frmDocSearchResult.vb @@ -3,36 +3,25 @@ 'Imports System.Text Imports DevExpress.XtraGrid.Views.Base Imports DevExpress.XtraPrinting +Imports DigitalData.Modules.Database Public Class frmDocSearchResult - ' - ' Public Shared Function ShellExecuteEx(ByRef lpExecInfo As SHELLEXECUTEINFO) As Boolean - ' End Function - - 'Public Structure SHELLEXECUTEINFO - ' Public cbSize As Integer - ' Public fMask As Integer - ' Public hwnd As IntPtr - ' Public lpVerb As String - ' Public lpFile As String - ' Public lpParameters As String - ' Public lpDirectory As String - ' Dim nShow As Integer - ' Dim hInstApp As IntPtr - ' Dim lpIDList As IntPtr - ' Public lpClass As String - ' Public hkeyClass As IntPtr - ' Public dwHotKey As Integer - ' Public hIcon As IntPtr - ' Public hProcess As IntPtr - 'End Structure - ' Private Const SEE_MASK_INVOKEIDLIST = &HC - ' Private Const SEE_MASK_NOCLOSEPROCESS = &H40 - ' Private Const SEE_MASK_FLAG_NO_UI = &H400 - ' Public Const SW_SHOW As Short = 5 Private DT_RESULT As DataTable Private SelectedDocID As Int64 Private SelectedFULL_FILEPATH As String + + Private Sub frmDocSearchResult_Load(sender As Object, e As EventArgs) Handles Me.Load + LoadDocSearch(False) + Text = CURRENT_DOCSEARCH_CAPTION + + Dim oGDPictureLicenseKey = MYDB_ECM.GetScalarValue(Queries.DD_ECM.ThirdPartyModules.GdPictureLicense) + DocumentViewer1.Init(LOGCONFIG, oGDPictureLicenseKey) + End Sub + + Private Sub frmDocSearchResult_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing + Save_DocGrid_Layout() + End Sub + Public Sub LoadDocSearch(reload As Boolean) Try Cursor = Cursors.WaitCursor @@ -64,13 +53,14 @@ Public Class frmDocSearchResult GetDocID() Refresh_DocID() End If - End Sub Private Sub GridViewDoc_Search_FocusedRowChanged(sender As Object, e As FocusedRowChangedEventArgs) Handles GridViewDoc_Search.FocusedRowChanged If GridViewDoc_Search.RowCount > 0 Then GetDocID() Refresh_DocID() + + DocumentViewer1.LoadFile(SelectedFULL_FILEPATH) End If End Sub Sub Refresh_DocID() @@ -199,10 +189,7 @@ Public Class frmDocSearchResult 'End Sub - Private Sub frmDocSearchResult_Load(sender As Object, e As EventArgs) Handles Me.Load - LoadDocSearch(False) - Me.Text = CURRENT_DOCSEARCH_CAPTION - End Sub + Sub Save_DocGrid_Layout() Try Dim XMLPath = Get_DocGrid_Layout_Filename() @@ -231,9 +218,7 @@ Public Class frmDocSearchResult Return LAYOUT_DOC_GRIDVIEW End Function - Private Sub frmDocSearchResult_FormClosing(sender As Object, e As FormClosingEventArgs) Handles Me.FormClosing - Save_DocGrid_Layout() - End Sub + Private Sub GridControlDocSearch_DoubleClick(sender As Object, e As EventArgs) Handles GridControlDocSearch.DoubleClick GetDocID()