Common/SQLEditor: Fix bugs, switch to dictionary

GUIs.Common/frmDocumentResultList.vb

@@ -854,19 +854,7 @@ Public Class frmDocumentResultList
         End Try
     End Sub
 
-    Private Sub BarButtonResetLayout_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonResetGridLayout.ItemClick
-        If Not IsNothing(_ActiveGrid) Then
-            Try
-                Dim oFile = LayoutManager.GetGrid_LayoutName(_ActiveGrid.MainView)
-                If IO.File.Exists(oFile) Then
-                    IO.File.Delete(oFile)
-                End If
-                LoadGridDataAndLayout()
-            Catch ex As Exception
-                Logger.Error(ex)
-            End Try
-        End If
-    End Sub
+
 
     Private Function TestFileExists(pTitle As String) As Boolean
         If _CurrentDocument Is Nothing Then
@@ -1025,6 +1013,29 @@ Public Class frmDocumentResultList
     End Sub
 #End Region
 #Region "Layout"
+
+    Private Sub BarButtonResetLayout_ItemClick(sender As Object, e As DevExpress.XtraBars.ItemClickEventArgs) Handles BarButtonResetGridLayout.ItemClick
+        If Not IsNothing(_ActiveGrid) Then
+            Try
+                Dim oFile = LayoutManager.GetGrid_LayoutName(_ActiveGrid.MainView)
+                If IO.File.Exists(oFile) Then
+                    IO.File.Delete(oFile)
+                End If
+                LoadGridDataAndLayout()
+            Catch ex As Exception
+                Logger.Error(ex)
+            End Try
+        End If
+    End Sub
+
+    Private Sub BarButtonItem6_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonResetWindowLayout.ItemClick
+        Try
+            LayoutManager.DockManager_ResetLayout(DockManager1)
+        Catch ex As Exception
+            Logger.Error(ex)
+        End Try
+    End Sub
+
     Private Sub SplitContainerControl1_SplitterPositionChanged(sender As Object, e As EventArgs) Handles SplitContainerControl1.SplitterPositionChanged
         If IsLoading = False Then
             Config1.Config.SplitContainer1Distance = SplitContainerControl1.SplitterPosition
@@ -1057,16 +1068,7 @@ Public Class frmDocumentResultList
         RaiseEvent NeedsRefresh(Me, Params.ProfileGuid)
     End Sub
 
-    Private Sub BarButtonItem6_ItemClick(sender As Object, e As ItemClickEventArgs) Handles BarButtonResetWindowLayout.ItemClick
-        Try
-            Dim oFile = LayoutManager.GetDockmanager_LayoutName()
-            If File.Exists(oFile) Then
-                File.Delete(oFile)
-            End If
-        Catch ex As Exception
-            Logger.Error(ex)
-        End Try
-    End Sub
+
 
 
     Private Sub chkGridShowGrouping_CheckedChanged(sender As Object, e As ItemClickEventArgs) Handles chkGridShowGrouping.CheckedChanged