MS Funktionsprüfungen, benennung Parameter, neue GDPictureVersion

app/DD-Record-Organizer/frmNodeNavigation.vb

@@ -75,6 +75,7 @@ Public Class frmNodeNavigation
     Private Property ChildNodeGuid As Integer = 0
 
     Private Property ClassNodeCommands As ClassNodeCommands
+    Private Property ViewerInit As Boolean = False
 
     Private Debug As Boolean = False
 
@@ -130,8 +131,12 @@ Public Class frmNodeNavigation
             If CONFIG.Config.DocumentSearchSplitterWidth > 0 Then
                 SplitContainerDocumentSearch.SplitterPosition = CONFIG.Config.DocumentSearchSplitterWidth
             End If
+            If ViewerInit Then
+                SplitContainerDocView.Collapsed = Not CONFIG.Config.DocumentViewerShown
+            Else
+                SplitContainerDocView.Collapsed = True
+            End If
 
-            SplitContainerDocView.Collapsed = Not CONFIG.Config.DocumentViewerShown
             checkShowPreview.Checked = CONFIG.Config.DocumentViewerShown
 
         Catch ex As Exception
@@ -152,8 +157,18 @@ Public Class frmNodeNavigation
 
         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))
         Try
-
-            DocumentViewer.Init(LOGCONFIG, MYGDPICTURE_LICENSE_KEY)
+            If DocumentViewer.Init(LOGCONFIG, MYGDPICTURE_LICENSE_KEY, New DigitalData.Controls.DocumentViewer.DocumentViewer.ToolbarSettings() With {
+            .ShowPrintButton = True,
+            .ShowRotateButton = True,
+            .ShowFlipButton = True,
+            .ShowSettingButton = True
+        }) = False Then
+                MsgBox("Viewer konnte nicht initialisiert werden. Bitte informieren Sie den Systembetreuer und prüfen Ihr Log.", MsgBoxStyle.Information)
+                SplitContainerDocView.Collapsed = True
+                DocumentViewer.Visible = False
+            Else
+                ViewerInit = True
+            End If
         Catch ex As Exception
             LOGGER.Warn($"Error while init DocumentViewer: {ex.Message}")
         End Try
@@ -903,15 +918,19 @@ Public Class frmNodeNavigation
 
             Dim oDocumentsFound = Await RUN_WDSEARCH_GRID(True)
 
-            If oDocumentsFound = 0 Then
-                Close_Document_Viewer()
-                RibbonPageGroupDocResult.Enabled = False
-                SplitContainerDocView.Collapsed = True
-            Else
-                RibbonPageGroupDocResult.Enabled = True
-                SplitContainerDocView.Collapsed = False
+            If ViewerInit Then
+                If oDocumentsFound = 0 Then
+                    Close_Document_Viewer()
+                    RibbonPageGroupDocResult.Enabled = False
+                    SplitContainerDocView.Collapsed = True
+                Else
+                    RibbonPageGroupDocResult.Enabled = True
+                    SplitContainerDocView.Collapsed = False
+                End If
             End If
 
+
+
             Update_Document_Label(oDocumentsFound)
 
             sw.Done()
@@ -2489,6 +2508,9 @@ Public Class frmNodeNavigation
         Dim allow_Open As Boolean = False
 
         Dim oDocuments = Current_DocList.SelectedDocuments
+        If oDocuments.Count = 0 Then
+            Exit Sub
+        End If
         Dim Result = ClassDOC_SEARCH.Get_File_Rights(oDocuments.First.DocId)
 
 
@@ -2642,15 +2664,18 @@ Public Class frmNodeNavigation
             Dim oDocuments = Current_DocList.SelectedDocuments
             If oDocuments.Count = 1 Then
                 ClassFileResult.DocID = oDocuments.First.DocId
+                ClassFileResult.DocumentPath = oDocuments.First.DocPath
                 ClassFileResult.OldDisplayName = oDocuments.First.DisplayName
-                If oDocuments.First.DisplayName <> "" Then
+                If oDocuments.First.DisplayName <> "" And ClassFileResult.DocID > 0 Then
                     Dim oRowHandle As Integer = GridViewDoc_Search.FocusedRowHandle
-                    Dim frm As New frmFileRename(ClassFileResult.DocID, oDocuments.First.DisplayName, "Displayname")
+                    Dim frm As New frmFileRename(ClassFileResult.DocID, oDocuments.First.DisplayName, "Displayname", ClassFileResult.DocumentPath)
                     frm.ShowDialog()
                     Await RUN_WDSEARCH_GRID(True)
                     If Not IsNothing(oRowHandle) Then
                         GridViewDoc_Search.FocusedRowHandle = oRowHandle
                     End If
+                Else
+                    MsgBox("Bitte eine Datei auswählen!", MsgBoxStyle.Information)
                 End If
             End If
 
@@ -2684,11 +2709,11 @@ Public Class frmNodeNavigation
 
 
 
-            If RENAME_DOC_PATH <> "" Then
+            If RENAME_DOC_PATH <> "" And ClassFileResult.DocID > 0 Then
                 Dim FileToRename As String
                 FileToRename = Path.GetFileNameWithoutExtension(RENAME_DOC_PATH)
                 Dim oRowHandle As Integer = GridViewDoc_Search.FocusedRowHandle
-                Dim frm As New frmFileRename(ClassFileResult.DocID, FileToRename, "Filename")
+                Dim frm As New frmFileRename(ClassFileResult.DocID, FileToRename, "Filename", RENAME_DOC_PATH)
                 frm.ShowDialog()
                 Await RUN_WDSEARCH_GRID(True)
                 If Not IsNothing(oRowHandle) Then
@@ -3088,8 +3113,12 @@ Public Class frmNodeNavigation
         If FORM_LOADED = False Then
             Exit Sub
         End If
+        If ViewerInit Then
+            SplitContainerDocView.Collapsed = Not checkShowPreview.Checked
+        Else
+            SplitContainerDocView.Collapsed = True
+        End If
 
-        SplitContainerDocView.Collapsed = Not checkShowPreview.Checked
     End Sub
 
     Private Sub GridViewDoc_Search_SelectionChanged(sender As Object, e As SelectionChangedEventArgs) Handles GridViewDoc_Search.SelectionChanged
@@ -3097,19 +3126,21 @@ Public Class frmNodeNavigation
     End Sub
     Private Sub Show_SelectedDoc()
         Dim oSelectedDocs = ClassDocGrid.GetSelectedDocuments(GridViewDoc_Search)
+        If ViewerInit Then
+            If oSelectedDocs.Count = 1 Then
+                Refresh_DocID()
+                Close_Document_Viewer()
 
-        If oSelectedDocs.Count = 1 Then
-            Refresh_DocID()
-            Close_Document_Viewer()
+                System.Threading.Thread.Sleep(400)
+                Dim oDocument As ClassDocGrid.clsWMDoc = oSelectedDocs.First()
+                Dim oPath = ClassHelper.FORMAT_WM_PATH(oDocument.DocPath)
 
-            System.Threading.Thread.Sleep(400)
-            Dim oDocument As ClassDocGrid.clsWMDoc = oSelectedDocs.First()
-            Dim oPath = ClassHelper.FORMAT_WM_PATH(oDocument.DocPath)
-
-            DocumentViewer.LoadFile(oPath)
-        Else
-            Close_Document_Viewer()
+                DocumentViewer.LoadFile(oPath)
+            Else
+                Close_Document_Viewer()
+            End If
         End If
+
     End Sub
     Private Sub Close_Document_Viewer()
         Try