Bug fix: Separation of Tab and Session menus was unintentionally not reverted for Explorer interface (see d1ecc3c1)

Source commit: 4785ba11e51913790b96cba49d8137084dc7da42

source/forms/NonVisual.cpp

@@ -410,7 +410,6 @@ void __fastcall TNonVisualDataModule::ExplorerActionsUpdate(
   UPD(BestFitColumnAction, (ListColumn != NULL))
 
   // SESSION
-  UPD(NewSessionAction, true)
   UPDACT(NewTabAction, Action->ImageIndex = ScpExplorer->GetNewTabActionImageIndex())
   UPD(NewRemoteTabAction, true)
   UPD(NewLocalTabAction, true)
@@ -752,7 +751,6 @@ void __fastcall TNonVisualDataModule::ExplorerActionsExecute(
     #undef COLVIEWPROPS
 
     // SESSION
-    EXE(NewSessionAction, ScpExplorer->NewSession())
     EXE(NewTabAction, ScpExplorer->NewTab())
     EXE(NewRemoteTabAction, ScpExplorer->NewTab(osRemote))
     EXE(NewLocalTabAction, ScpExplorer->NewTab(osLocal))
@@ -880,6 +878,7 @@ void __fastcall TNonVisualDataModule::ExplorerShortcuts()
   // commands
   NewFileAction->ShortCut = ShortCut(L'E', CTRLSHIFT);
   RemoteFindFilesAction2->ShortCut = ShortCut(VK_F3, NONE);
+  NewTabAction->ShortCut = ShortCut(L'N', CTRL);
 
   CloseApplicationAction2->ShortCut = ShortCut(VK_F4, ALT);
 

source/forms/NonVisual.dfm

@@ -610,17 +610,6 @@ object NonVisualDataModule: TNonVisualDataModule
       HelpKeyword = 'ui_toolbars'
       Hint = 'Hide/show custom commands toolbar'
     end
-    object NewSessionAction: TAction
-      Tag = 15
-      Category = 'Session'
-      Caption = '&New Session...'
-      HelpKeyword = 'task_connections#opening_additional_connection'
-      Hint = 
-        'New session|Opens new session (hold down Shift to open session i' +
-        'n new window)'
-      ImageIndex = 25
-      ShortCut = 16462
-    end
     object SiteManagerAction: TAction
       Tag = 15
       Category = 'Session'

source/forms/NonVisual.h

@@ -109,7 +109,6 @@ __published:    // IDE-managed Components
   TAction *ExplorerSelectionBandAction;
   TAction *ClearSelectionAction;
   TTimer *SessionIdleTimer;
-  TAction *NewSessionAction;
   TAction *SiteManagerAction;
   TAction *CloseTabAction;
   TAction *SavedSessionsAction2;

source/forms/ScpExplorer.dfm

@@ -290,6 +290,9 @@ inherited ScpExplorerForm: TScpExplorerForm
         Caption = '&Tab'
         HelpKeyword = 'ui_explorer_menu#tab'
         Hint = 'Tab commands'
+        object TBXItem113: TTBXItem
+          Action = NonVisualDataModule.NewTabAction
+        end
         object TBXItem166: TTBXItem
           Action = NonVisualDataModule.CloseTabAction
         end
@@ -307,23 +310,6 @@ inherited ScpExplorerForm: TScpExplorerForm
         end
         object TBXSeparatorItem49: TTBXSeparatorItem
         end
-        object TBXSubmenuItem9: TTBXSubmenuItem
-          Action = NonVisualDataModule.OpenedTabsAction
-        end
-        object TBXSubmenuItem10: TTBXSubmenuItem
-          Action = NonVisualDataModule.WorkspacesAction
-        end
-        object TBXItem168: TTBXItem
-          Action = NonVisualDataModule.SaveWorkspaceAction
-        end
-      end
-      object TBXSubmenuItem19: TTBXSubmenuItem
-        Caption = '&Session'
-        HelpKeyword = 'ui_explorer_menu#session'
-        Hint = 'Session commands'
-        object TBXItem113: TTBXItem
-          Action = NonVisualDataModule.NewSessionAction
-        end
         object TBXItem162: TTBXItem
           Action = NonVisualDataModule.DisconnectSessionAction
         end
@@ -333,7 +319,7 @@ inherited ScpExplorerForm: TScpExplorerForm
         object TBXItem114: TTBXItem
           Action = NonVisualDataModule.SaveCurrentSessionAction2
         end
-        object TBXSeparatorItem37: TTBXSeparatorItem
+        object TBXSeparatorItem50: TTBXSeparatorItem
         end
         object TBXItem56: TTBXItem
           Action = NonVisualDataModule.FileSystemInfoAction
@@ -347,6 +333,17 @@ inherited ScpExplorerForm: TScpExplorerForm
         object TBXItem14: TTBXItem
           Action = NonVisualDataModule.PrivateKeyUploadAction
         end
+        object TBXSeparatorItem37: TTBXSeparatorItem
+        end
+        object TBXSubmenuItem9: TTBXSubmenuItem
+          Action = NonVisualDataModule.OpenedTabsAction
+        end
+        object TBXSubmenuItem10: TTBXSubmenuItem
+          Action = NonVisualDataModule.WorkspacesAction
+        end
+        object TBXItem168: TTBXItem
+          Action = NonVisualDataModule.SaveWorkspaceAction
+        end
         object TBXSeparatorItem53: TTBXSeparatorItem
         end
         object TBXSubmenuItem20: TTBXSubmenuItem
@@ -785,7 +782,7 @@ inherited ScpExplorerForm: TScpExplorerForm
       ShowHint = True
       TabOrder = 4
       object TBXItem123: TTBXItem
-        Action = NonVisualDataModule.NewSessionAction
+        Action = NonVisualDataModule.NewTabAction
         DisplayMode = nbdmImageAndText
       end
       object TBXItem125: TTBXItem

source/forms/ScpExplorer.h

@@ -83,7 +83,6 @@ __published:
   TTBXItem *TBXItem55;
   TTBXSeparatorItem *TBXSeparatorItem14;
   TTBXItem *TBXItem57;
-  TTBXSubmenuItem *TBXSubmenuItem19;
   TTBXItem *TBXItem113;
   TTBXSubmenuItem *TBXSubmenuItem20;
   TTBXItem *TBXItem114;
@@ -331,6 +330,7 @@ __published:
   TTBXItem *TBXItem22;
   TTBXSeparatorItem *TBXSeparatorItem29;
   TTBXItem *TBXItem90;
+  TTBXSeparatorItem *TBXSeparatorItem50;
   void __fastcall RemoteDirViewUpdateStatusBar(TObject *Sender,
           const TStatusFileInfo &FileInfo);
   void __fastcall UnixPathComboBoxBeginEdit(TTBEditItem *Sender,