The "Session" toolbar renamed to "Sessions and Tabs" and "Sessions Tabs" to "Tabs"

Part of Bug 1893

Source commit: 53178152febf0dfe3f0c1a87875946e34451d1cd

source/forms/NonVisual.cpp

@@ -90,7 +90,7 @@ TNonVisualDataModule *NonVisualDataModule;
   EMIT_BAND_COMPONENT(ExplorerTransferBand) \
   EMIT_BAND_COMPONENT(ExplorerCustomCommandsBand) \
   EMIT_BAND_COMPONENT(CommanderMenuBand) \
-  EMIT_BAND_COMPONENT(CommanderSessionBand) \
+  EMIT_BAND_COMPONENT2(CommanderSessionBand, 2) \
   EMIT_BAND_COMPONENT(CommanderPreferencesBand) \
   EMIT_BAND_COMPONENT(CommanderSortBand) \
   EMIT_BAND_COMPONENT(CommanderCommandsBand) \
@@ -317,7 +317,7 @@ void __fastcall TNonVisualDataModule::ExplorerActionsUpdate(
   UPDEX1(TipsAction, true, TipsAction->Visible = AnyTips())
 
   // VIEW
-  UPDCOMP(SessionsTabs)
+  UPDCOMP2(SessionsTabs, 2)
   UPDCOMP(StatusBar)
   UPDCOMP(ToolBar2)
   UPDCOMP2(LocalStatusBar, 2)
@@ -659,7 +659,7 @@ void __fastcall TNonVisualDataModule::ExplorerActionsExecute(
     EXE(TipsAction, ShowTips())
 
     // VIEW
-    EXECOMP(SessionsTabs)
+    EXECOMP2(SessionsTabs, 2)
     EXECOMP(StatusBar)
     EXECOMP(ToolBar2)
     EXECOMP2(LocalStatusBar, 2)

source/forms/NonVisual.dfm

@@ -479,11 +479,11 @@ object NonVisualDataModule: TNonVisualDataModule
       Caption = 'Status &Bar'
       Hint = 'Hide/show status bar'
     end
-    object SessionsTabsAction: TAction
+    object SessionsTabsAction2: TAction
       Tag = 15
       Category = 'View'
-      Caption = 'Sessions Tabs'
-      Hint = 'Hide/show sessions tabs'
+      Caption = 'T&abs'
+      Hint = 'Hide/show tabs'
     end
     object ExplorerAddressBandAction: TAction
       Tag = 7
@@ -759,12 +759,12 @@ object NonVisualDataModule: TNonVisualDataModule
       HelpKeyword = 'ui_toolbars'
       Hint = 'Hide/show menu'
     end
-    object CommanderSessionBandAction: TAction
+    object CommanderSessionBandAction2: TAction
       Tag = 11
       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 CommanderPreferencesBandAction: TAction
       Tag = 11
@@ -2395,8 +2395,8 @@ object NonVisualDataModule: TNonVisualDataModule
     end
     object N5: TTBXSeparatorItem
     end
-    object SessionsTabsAction2: TTBXItem
-      Action = SessionsTabsAction
+    object SessionsTabs2: TTBXItem
+      Action = SessionsTabsAction2
     end
     object StatusBar2: TTBXItem
       Action = StatusBarAction
@@ -2453,7 +2453,7 @@ object NonVisualDataModule: TNonVisualDataModule
       Action = CommanderCommandsBandAction
     end
     object SessionButtons5: TTBXItem
-      Action = CommanderSessionBandAction
+      Action = CommanderSessionBandAction2
     end
     object PreferencesButtons4: TTBXItem
       Action = CommanderPreferencesBandAction
@@ -2481,8 +2481,8 @@ object NonVisualDataModule: TNonVisualDataModule
     end
     object N26: TTBXSeparatorItem
     end
-    object SessionsTabsAction1: TTBXItem
-      Action = SessionsTabsAction
+    object SessionsTabs1: TTBXItem
+      Action = SessionsTabsAction2
     end
     object CommandLine2: TTBXItem
       Action = CommandLinePanelAction
@@ -3206,8 +3206,8 @@ object NonVisualDataModule: TNonVisualDataModule
     end
     object TBXSeparatorItem35: TTBXSeparatorItem
     end
-    object SessionsTabsAction4: TTBXItem
-      Action = SessionsTabsAction
+    object SessionsTabs4: TTBXItem
+      Action = SessionsTabsAction2
     end
   end
   object LocalFilePopup: TTBXPopupMenu

source/forms/NonVisual.h

@@ -96,7 +96,7 @@ __published:    // IDE-managed Components
   TAction *RemoteRefreshAction;
   TAction *AboutAction;
   TAction *StatusBarAction;
-  TAction *SessionsTabsAction;
+  TAction *SessionsTabsAction2;
   TAction *ExplorerAddressBandAction;
   TAction *ExplorerMenuBandAction;
   TAction *ExplorerToolbarBandAction;
@@ -127,7 +127,7 @@ __published:    // IDE-managed Components
   TAction *LocalRefreshAction;
   TAction *ToolBar2Action;
   TAction *CommanderMenuBandAction;
-  TAction *CommanderSessionBandAction;
+  TAction *CommanderSessionBandAction2;
   TAction *CommanderPreferencesBandAction;
   TAction *CommanderLocalHistoryBandAction2;
   TAction *CommanderLocalNavigationBandAction2;

source/forms/ScpCommander.cpp

@@ -1133,7 +1133,7 @@ TControl * __fastcall TScpCommanderForm::GetComponent(Byte Component)
     case fcRemoteStatusBar: return RemoteStatusBar;
     case fcCommandLinePanel: return CommandLineToolbar;
     case fcLocalTree: return LocalDriveView;
-    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);
@@ -1143,7 +1143,7 @@ TControl * __fastcall TScpCommanderForm::GetComponent(Byte Component)
     case fcRemotePathComboBox: return reinterpret_cast<TControl*>(RemotePathComboBox);
 
     case fcCommanderMenuBand: return MenuToolbar;
-    case fcCommanderSessionBand: return SessionToolbar;
+    case fcCommanderSessionBand: return SessionToolbar2;
     case fcCommanderPreferencesBand: return PreferencesToolbar;
     case fcCommanderSortBand: return SortToolbar;
     case fcCommanderCommandsBand: return CommandsToolbar;

source/forms/ScpCommander.dfm

@@ -485,7 +485,7 @@ inherited ScpCommanderForm: TScpCommanderForm
             Action = NonVisualDataModule.CommanderCommandsBandAction
           end
           object TBXItem60: TTBXItem
-            Action = NonVisualDataModule.CommanderSessionBandAction
+            Action = NonVisualDataModule.CommanderSessionBandAction2
           end
           object TBXItem62: TTBXItem
             Action = NonVisualDataModule.CommanderPreferencesBandAction
@@ -568,8 +568,8 @@ inherited ScpCommanderForm: TScpCommanderForm
         end
         object TBXSeparatorItem20: TTBXSeparatorItem
         end
-        object SessionsTabsAction3: TTBXItem
-          Action = NonVisualDataModule.SessionsTabsAction
+        object SessionsTabs3: TTBXItem
+          Action = NonVisualDataModule.SessionsTabsAction2
         end
         object TBXItem73: TTBXItem
           Action = NonVisualDataModule.CommandLinePanelAction
@@ -840,10 +840,10 @@ inherited ScpCommanderForm: TScpCommanderForm
         end
       end
     end
-    object SessionToolbar: TTBXToolbar
+    object SessionToolbar2: TTBXToolbar
       Left = 0
       Top = 25
-      Caption = 'Session'
+      Caption = 'Sessions and Tabs'
       DockPos = 0
       DockRow = 1
       Images = GlyphsModule.ExplorerImages

source/forms/ScpCommander.h

@@ -50,7 +50,7 @@ __published:
   TTBXStatusBar *StatusBar;
   TDriveView *LocalDriveView;
   TSplitter *LocalPanelSplitter;
-  TTBXToolbar *SessionToolbar;
+  TTBXToolbar *SessionToolbar2;
   TTBXItem *TBXItem123;
   TTBXSeparatorItem *TBXSeparatorItem34;
   TTBXItem *TBXItem124;

source/forms/ScpExplorer.dfm

@@ -394,8 +394,8 @@ inherited ScpExplorerForm: TScpExplorerForm
             Action = NonVisualDataModule.SelectiveToolbarTextAction
           end
         end
-        object SessionsTabsAction3: TTBXItem
-          Action = NonVisualDataModule.SessionsTabsAction
+        object SessionsTabs3: TTBXItem
+          Action = NonVisualDataModule.SessionsTabsAction2
         end
         object TBXItem13: TTBXItem
           Action = NonVisualDataModule.StatusBarAction

source/windows/UserInterface.cpp

@@ -421,7 +421,7 @@ int __fastcall GetToolbarLayoutPixelsPerInch(TStrings * Storage, TControl * Cont
 UnicodeString __fastcall GetToolbarKey(const UnicodeString & ToolbarName)
 {
   UnicodeString Result = ToolbarName;
-  Result = RemoveSuffix(Result, L"Toolbar");
+  Result = RemoveSuffix(Result, L"Toolbar", true);
   return Result;
 }
 //---------------------------------------------------------------------