Bug fix: Rename tab dialog still says "Rename session"

Source commit: 1f696ebeefc41d5abfb5c1f3a71b8b10d8a96814

source/forms/CustomScpExplorer.cpp

@@ -5168,7 +5168,7 @@ UnicodeString __fastcall TCustomScpExplorerForm::CreateHiddenDuplicateSession()
   return SaveHiddenDuplicateSession(SessionData.get());
 }
 //---------------------------------------------------------------------------
-void __fastcall TCustomScpExplorerForm::DuplicateSession()
+void __fastcall TCustomScpExplorerForm::DuplicateTab()
 {
   if (OpenInNewWindow())
   {
@@ -5191,10 +5191,10 @@ void __fastcall TCustomScpExplorerForm::DuplicateSession()
   }
 }
 //---------------------------------------------------------------------------
-void __fastcall TCustomScpExplorerForm::RenameSession()
+void __fastcall TCustomScpExplorerForm::RenameTab()
 {
   UnicodeString Name = ManagedSession->SessionData->SessionName;
-  if (InputDialog(LoadStr(RENAME_SESSION_TITLE), LoadStr(RENAME_SESSION_PROMPT), Name, HELP_SESSION_RENAME) &&
+  if (InputDialog(LoadStr(RENAME_TAB_TITLE), LoadStr(RENAME_TAB_PROMPT), Name, HELP_TAB_RENAME) &&
       // When submitting the default name, do not fix it
       (Name != ManagedSession->SessionData->SessionName))
   {
@@ -5227,7 +5227,7 @@ bool __fastcall TCustomScpExplorerForm::CanCloseQueue()
   return CanCloseQueue(FQueue);
 }
 //---------------------------------------------------------------------------
-void __fastcall TCustomScpExplorerForm::CloseSession()
+void __fastcall TCustomScpExplorerForm::CloseTab()
 {
   if (CanCloseQueue())
   {
@@ -11070,7 +11070,7 @@ void __fastcall TCustomScpExplorerForm::CloseSessionTab(int Index)
 {
   if (Index == SessionsPageControl->TabIndex)
   {
-    CloseSession();
+    CloseTab();
   }
   else
   {

source/forms/CustomScpExplorer.h

@@ -792,9 +792,9 @@ public:
 
   void __fastcall NewSession(const UnicodeString & SessionUrl = L"");
   virtual void NewTab(TOperationSide Side = osCurrent);
-  void __fastcall DuplicateSession();
-  void __fastcall RenameSession();
-  void __fastcall CloseSession();
+  void __fastcall DuplicateTab();
+  void __fastcall RenameTab();
+  void __fastcall CloseTab();
   void __fastcall DisconnectSession();
   void __fastcall ReconnectSession();
   void __fastcall OpenDirectory(TOperationSide Side);

source/forms/NonVisual.cpp

@@ -758,9 +758,9 @@ void __fastcall TNonVisualDataModule::ExplorerActionsExecute(
     EXE(NewLocalTabAction, ScpExplorer->NewTab(osLocal))
     EXE(DefaultToNewRemoteTabAction, WinConfiguration->DefaultToNewRemoteTab = !WinConfiguration->DefaultToNewRemoteTab)
     EXE(SiteManagerAction, ScpExplorer->NewSession())
-    EXE(DuplicateTabAction, ScpExplorer->DuplicateSession())
-    EXE(RenameTabAction, ScpExplorer->RenameSession())
-    EXE(CloseTabAction, ScpExplorer->CloseSession())
+    EXE(DuplicateTabAction, ScpExplorer->DuplicateTab())
+    EXE(RenameTabAction, ScpExplorer->RenameTab())
+    EXE(CloseTabAction, ScpExplorer->CloseTab())
     EXE(DisconnectSessionAction, ScpExplorer->DisconnectSession())
     EXE(ReconnectSessionAction, ScpExplorer->ReconnectSession())
     EXE(SavedSessionsAction2, CreateSessionListMenu(SavedSessionsAction2))

source/resource/HelpWin.h

@@ -61,7 +61,7 @@
 #define HELP_FILTER                  "ui_filter"
 #define HELP_LOGIN_AUTHORIZED_KEYS   "guide_public_key"
 #define HELP_READONLY_INI_FILE       "config#ini_readonly"
-#define HELP_SESSION_RENAME          "ui_tabs#renaming"
+#define HELP_TAB_RENAME              "ui_tabs#renaming"
 #define HELP_DD_TARGET_UNKNOWN       "ui_pref_dragdrop#fake_file"
 #define HELP_FILE_COLORS             "ui_file_color"
 #define HELP_AUTOMATIC_UPDATE        "updates#automatic_upgrade"

source/resource/TextsWin.h

@@ -613,8 +613,8 @@
 #define EDITOR_READONLY         6011
 #define PROGRESS_TIME_LEFT_CALCULATING 6012
 #define COPY_PARAM_SAVE_PRESET  6013
-#define RENAME_SESSION_TITLE    6014
-#define RENAME_SESSION_PROMPT   6015
+#define RENAME_TAB_TITLE        6014
+#define RENAME_TAB_PROMPT       6015
 #define SYNCHRONIZE_COMPLETE    6016
 #define SYNCHRONIZE_SUMMARY     6017
 #define PREFERENCES_DRAGEXT_BROKEN 6018

source/resource/TextsWin1.rc

@@ -618,8 +618,8 @@ BEGIN
         EDITOR_READONLY, "Read-only"
         PROGRESS_TIME_LEFT_CALCULATING, "Calculating"
         COPY_PARAM_SAVE_PRESET, "Save as &Preset..."
-        RENAME_SESSION_TITLE, "Rename session"
-        RENAME_SESSION_PROMPT, "&New session name:"
+        RENAME_TAB_TITLE, "Rename tab"
+        RENAME_TAB_PROMPT, "&New tab name:"
         SYNCHRONIZE_COMPLETE, "Synchronization was completed."
         SYNCHRONIZE_SUMMARY, "Files uploaded: %s (%s)|Files downloaded: %s (%s)|Local files deleted: %s|Remote files deleted: %s|Comparison time: %s|Synchronization time: %s"
         PREFERENCES_DRAGEXT_BROKEN, "Shell extension cannot work on this system."