Merge branch 'master' of http://dd-vmp07-com04:3000/JenneJ/RecordOrganizer

app/DD-Record-Organizer/frmNodeNavigation.vb

@@ -15,6 +15,7 @@ Imports System.Runtime.InteropServices
 Imports DD_LIB_Standards
 Imports DigitalData.Modules.Base
 Imports DigitalData.Modules.Logging
+Imports DigitalData.Modules.Database
 
 Public Class frmNodeNavigation
 #Region "Laufzeitvariablen & Konstanten"
@@ -93,6 +94,7 @@ Public Class frmNodeNavigation
 
         DocList = New ClassWindreamDocGrid(GridViewDoc_Search)
         WindowsEx = New WindowsEx(LOGCONFIG)
+
     End Sub
     Private Function Get_Splitter_Layout_Filename()
         Dim Filename As String = String.Format("{0}-{1}-SplitterLayout.xml", CONSTRUCTOR_DETAIL_ID, CONSTRUCTOR_DETAIL_ID.ToString)
@@ -149,6 +151,11 @@ Public Class frmNodeNavigation
 
         DT_VWPMO_CONSTRUCTOR_FORMS = MYDB_ECM.GetDatatable(Sql)
         CURRENT_DT_TBPMO_ENTITY_RIGHT_CONTROLS = MYDB_ECM.GetDatatable(String.Format("SELECT T.* FROM TBPMO_ENTITY_RIGHT_CONTROLS T INNER JOIN VWPMO_CONSTRUCTOR_FORMS T1 ON T.ENTITY_ID = T1.FORM_ID where T1.CONSTRUCT_ID = {0}", CONSTRUCTORID))
+
+        Dim oGDPictureLicenseKey = MYDB_ECM.GetScalarValue(Queries.DD_ECM.ThirdPartyModules.GdPictureLicense)
+        DocumentViewer.Init(LOGCONFIG, oGDPictureLicenseKey)
+
+
         ' Hintergrund Bild initialisieren
         'If (System.IO.File.Exists(Application.StartupPath + "\Resources\windream-portrait_col_RGB_Wordpress.png")) Then
         '    WM_LOGO = New Bitmap(Application.StartupPath + "\Resources\windream-portrait_col_RGB_Wordpress.png")
@@ -951,8 +958,20 @@ Public Class frmNodeNavigation
         End If
         sw.Done()
     End Sub
+
+    Private LastFindFilterText As String = ""
+
     Private Sub TreeListDevexpress_ColumnFilterChanged_1(sender As Object, e As EventArgs) Handles TreeListDevexpress.ColumnFilterChanged
         'oFilterActive = True
+        Dim oFilterText As String = TreeListDevexpress.FindFilterText
+        Dim oNode = TreeListDevexpress.FocusedNode
+
+        If LastFindFilterText <> "" And oFilterText = "" Then
+            TreeListDevexpress.FocusedNode = FocusedNode
+            TreeListDevexpress.MakeNodeVisible(FocusedNode)
+        End If
+
+        LastFindFilterText = oFilterText
     End Sub
     Private Sub LoadRecord(pRecord As Integer)
         Try
@@ -1759,6 +1778,8 @@ Public Class frmNodeNavigation
         If ClassWindreamDocGrid.SELECTED_DOC_ID <> 0 Then
             Dim omsg = "Doc-ID: " & ClassWindreamDocGrid.SELECTED_DOC_ID.ToString
             Update_DocID_Label(True, omsg, EditState.Update)
+
+
         Else
             Update_DocID_Label(True, "DocRow not selected", EditState.None)
         End If
@@ -2851,4 +2872,20 @@ Public Class frmNodeNavigation
     Private Sub bbtnitmRecSave_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles bbtnitmRecSave.ItemClick
         Save_Record()
     End Sub
+
+    Private Sub checkShowPreview_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles checkShowPreview.CheckedChanged
+        SplitContainerDocView.Collapsed = Not checkShowPreview.Checked
+    End Sub
+
+    Private Sub GridViewDoc_Search_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles GridViewDoc_Search.SelectionChanged
+        Dim oSelectedDocs = ClassWindreamDocGrid.GetSelectedDocuments(GridViewDoc_Search)
+
+        If oSelectedDocs.Count = 1 Then
+            Dim oDocument As ClassWindreamDocGrid.WindreamDoc = oSelectedDocs.First()
+            Dim oPath = ClassHelper.FORMAT_WM_PATH(oDocument.DocPath)
+            DocumentViewer.LoadFile(oPath)
+        Else
+            DocumentViewer.CloseDocument()
+        End If
+    End Sub
 End Class