The "Session" toolbar renamed to "Sessions and Tabs" even in Explorer interface

See 8a5b5fd1 and 93b97cb0

Source commit: 835d1a5e4b44c6b1d9394ddb8d2168e2541d55b4

source/forms/NonVisual.cpp

@@ -77,7 +77,7 @@ TNonVisualDataModule *NonVisualDataModule;
   EMIT_BAND_COMPONENT(ExplorerAddressBand) \
   EMIT_BAND_COMPONENT(ExplorerToolbarBand) \
   EMIT_BAND_COMPONENT(ExplorerSelectionBand) \
-  EMIT_BAND_COMPONENT(ExplorerSessionBand) \
+  EMIT_BAND_COMPONENT2(ExplorerSessionBand, 2) \
   EMIT_BAND_COMPONENT(ExplorerPreferencesBand) \
   EMIT_BAND_COMPONENT(ExplorerSortBand) \
   EMIT_BAND_COMPONENT(ExplorerUpdatesBand) \

source/forms/NonVisual.dfm

@@ -569,12 +569,12 @@ object NonVisualDataModule: TNonVisualDataModule
       ImageIndex = 23
       ShortCut = 24652
     end
-    object ExplorerSessionBandAction: TAction
+    object ExplorerSessionBandAction2: TAction
       Tag = 7
       Category = 'View'
-      Caption = 'Sessio&n Buttons'
+      Caption = 'Sessio&ns and Tabs Buttons'
       HelpKeyword = 'ui_toolbars'
-      Hint = 'Hide/show session toolbar'
+      Hint = 'Hide/show sessions and tabs toolbar'
     end
     object ExplorerPreferencesBandAction: TAction
       Tag = 7
@@ -2429,7 +2429,7 @@ object NonVisualDataModule: TNonVisualDataModule
       Action = ExplorerSelectionBandAction
     end
     object SessionButtons2: TTBXItem
-      Action = ExplorerSessionBandAction
+      Action = ExplorerSessionBandAction2
     end
     object PreferencesButtons1: TTBXItem
       Action = ExplorerPreferencesBandAction

source/forms/NonVisual.h

@@ -113,7 +113,7 @@ __published:    // IDE-managed Components
   TAction *CloseTabAction;
   TAction *SavedSessionsAction2;
   TAction *WorkspacesAction;
-  TAction *ExplorerSessionBandAction;
+  TAction *ExplorerSessionBandAction2;
   TAction *PreferencesAction;
   TAction *ExplorerPreferencesBandAction;
   TAction *RemoteChangePathAction2;

source/forms/ScpExplorer.cpp

@@ -206,7 +206,7 @@ bool __fastcall TScpExplorerForm::AllowedAction(TAction * Action, TActionAllowed
 TControl * __fastcall TScpExplorerForm::GetComponent(Byte Component)
 {
   switch (Component) {
-    case fcSessionToolbar: return SessionToolbar;
+    case fcSessionToolbar: return SessionToolbar2;
     case fcCustomCommandsBand: return CustomCommandsToolbar;
     case fcColorMenu: return reinterpret_cast<TControl*>(ColorMenuItem);
     case fcTransferDropDown: return reinterpret_cast<TControl*>(TransferDropDown);
@@ -219,7 +219,7 @@ TControl * __fastcall TScpExplorerForm::GetComponent(Byte Component)
     case fcExplorerAddressBand: return AddressToolbar;
     case fcExplorerToolbarBand: return ButtonsToolbar;
     case fcExplorerSelectionBand: return SelectionToolbar;
-    case fcExplorerSessionBand: return SessionToolbar;
+    case fcExplorerSessionBand: return SessionToolbar2;
     case fcExplorerPreferencesBand: return PreferencesToolbar;
     case fcExplorerSortBand: return SortToolbar;
     case fcExplorerUpdatesBand: return UpdatesToolbar;

source/forms/ScpExplorer.dfm

@@ -368,7 +368,7 @@ inherited ScpExplorerForm: TScpExplorerForm
             Action = NonVisualDataModule.ExplorerSelectionBandAction
           end
           object TBXItem10: TTBXItem
-            Action = NonVisualDataModule.ExplorerSessionBandAction
+            Action = NonVisualDataModule.ExplorerSessionBandAction2
           end
           object TBXItem11: TTBXItem
             Action = NonVisualDataModule.ExplorerPreferencesBandAction
@@ -770,10 +770,10 @@ inherited ScpExplorerForm: TScpExplorerForm
         Action = NonVisualDataModule.RestoreSelectionAction
       end
     end
-    object SessionToolbar: TTBXToolbar
+    object SessionToolbar2: TTBXToolbar
       Left = 0
       Top = 104
-      Caption = 'Session'
+      Caption = 'Sessions and Tabs'
       DockPos = -4
       DockRow = 4
       Images = GlyphsModule.ExplorerImages

source/forms/ScpExplorer.h

@@ -186,7 +186,7 @@ __published:
   TTBXItem *TBXItem68;
   TTBXItem *TBXItem69;
   TTBXItem *TBXItem70;
-  TTBXToolbar *SessionToolbar;
+  TTBXToolbar *SessionToolbar2;
   TTBXItem *TBXItem123;
   TTBXSeparatorItem *TBXSeparatorItem34;
   TTBXItem *TBXItem124;