From 3212c3e077cc4b54f1c2a2e39777072b8174689e Mon Sep 17 00:00:00 2001
From: Jonathan Jenne <j.jenne@digitaldata.works>
Date: Fri, 19 Jan 2024 13:16:54 +0100
Subject: [PATCH] Save DocView Collapsed state in config

---
 app/DD-Record-Organizer/Classes/ClassConfig.vb  |  1 +
 .../frmNodeNavigation.Designer.vb               |  3 ++-
 app/DD-Record-Organizer/frmNodeNavigation.vb    | 17 ++++++++++++-----
 3 files changed, 15 insertions(+), 6 deletions(-)

diff --git a/app/DD-Record-Organizer/Classes/ClassConfig.vb b/app/DD-Record-Organizer/Classes/ClassConfig.vb
index c172bba..3b359ca 100644
--- a/app/DD-Record-Organizer/Classes/ClassConfig.vb
+++ b/app/DD-Record-Organizer/Classes/ClassConfig.vb
@@ -13,4 +13,5 @@ Public Class ClassConfig
     Public Property DocumentViewerSplitterWidth As Integer = 0
     Public Property TreeListSplitterWidth As Integer = 0
     Public Property DocumentSearchSplitterWidth As Integer = 0
+    Public Property DocumentViewerShown As Boolean = True
 End Class
diff --git a/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb b/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb
index 1abf6b4..7f6455c 100644
--- a/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb
+++ b/app/DD-Record-Organizer/frmNodeNavigation.Designer.vb
@@ -357,6 +357,7 @@ Partial Class frmNodeNavigation
         Me.TreeListDevexpress.OptionsFilter.ExpandNodesOnFiltering = True
         Me.TreeListDevexpress.OptionsFind.AlwaysVisible = True
         Me.TreeListDevexpress.OptionsFind.FindDelay = 300
+        Me.TreeListDevexpress.OptionsFind.FindFilterColumns = "NODE_CAPTION;ID1"
         Me.TreeListDevexpress.OptionsFind.ShowCloseButton = False
         Me.TreeListDevexpress.OptionsFind.ShowFindButton = False
         Me.TreeListDevexpress.OptionsLayout.AddNewColumns = False
@@ -478,7 +479,7 @@ Partial Class frmNodeNavigation
         '
         Me.cmsResultFileDetail.Items.AddRange(New System.Windows.Forms.ToolStripItem() {Me.tsmiFileProperties, Me.ToolStripSeparator5, Me.tsmiFileOpen, Me.tsmiFileFolderOpen, Me.ToolStripSeparator1, Me.tsmiFileInWork, Me.ToolStripSeparator3, Me.tsmiFileLink_Add, Me.tsmiFileLink_ShowAll, Me.tsmiFileLinkRemove, Me.ToolStripSeparator2, Me.tsmiFileRename, Me.tsmiFileVersion, Me.DokumentartÄndernToolStripMenuItem, Me.tsmiFileRightsShow, Me.ToolStripSeparator4, Me.tsmiFileDelete})
         Me.cmsResultFileDetail.Name = "ContextMenuStripResultFiles"
-        Me.cmsResultFileDetail.Size = New System.Drawing.Size(240, 320)
+        Me.cmsResultFileDetail.Size = New System.Drawing.Size(240, 298)
         '
         'tsmiFileProperties
         '
diff --git a/app/DD-Record-Organizer/frmNodeNavigation.vb b/app/DD-Record-Organizer/frmNodeNavigation.vb
index aca489f..43253db 100644
--- a/app/DD-Record-Organizer/frmNodeNavigation.vb
+++ b/app/DD-Record-Organizer/frmNodeNavigation.vb
@@ -103,9 +103,10 @@ Public Class frmNodeNavigation
             CONFIG.Config.TreeListSplitterWidth = SplitContainerTreeList.SplitterPosition
             CONFIG.Config.DocumentViewerSplitterWidth = SplitContainerDocView.SplitterPosition
             CONFIG.Config.DocumentSearchSplitterWidth = SplitContainerDocumentSearch.SplitterPosition
+            CONFIG.Config.DocumentViewerShown = Not SplitContainerDocView.Collapsed
 
         Catch ex As Exception
-LOGGER.Error(ex)
+            LOGGER.Error(ex)
             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace)
         End Try
     End Sub
@@ -123,8 +124,12 @@ LOGGER.Error(ex)
             If CONFIG.Config.DocumentSearchSplitterWidth > 0 Then
                 SplitContainerDocumentSearch.SplitterPosition = CONFIG.Config.DocumentSearchSplitterWidth
             End If
+
+            SplitContainerDocView.Collapsed = Not CONFIG.Config.DocumentViewerShown
+            checkShowPreview.Checked = CONFIG.Config.DocumentViewerShown
+
         Catch ex As Exception
-LOGGER.Error(ex)
+            LOGGER.Error(ex)
             ClassHelper.MSGBOX_Handler("ERROR", "Unexpected Error", ex.Message, ex.StackTrace)
         End Try
     End Sub
@@ -1156,10 +1161,8 @@ LOGGER.Error(ex)
             Try
                 CURRENT_DOCVIEW.CloseView(CURRENT_DOCVIEW_PATH, 0)
             Catch ex As Exception
-LOGGER.Error(ex)
-
+                LOGGER.Error(ex)
             End Try
-
         End If
     End Sub
 
@@ -2942,6 +2945,10 @@ LOGGER.Error(ex)
     End Sub
 
     Private Sub checkShowPreview_CheckedChanged(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles checkShowPreview.CheckedChanged
+        If FORM_LOADED = False Then
+            Exit Sub
+        End If
+
         SplitContainerDocView.Collapsed = Not checkShowPreview.Checked
     End Sub