Consistently calling command to open window with specific directory Explore, instead of sometimes Browse

Source commit: 92b4ed8c0495c1e8b8ad9817639438047f5028df

source/forms/Copy.cpp

@@ -130,7 +130,7 @@ __fastcall TCopyDialog::TCopyDialog(
   HotTrackLabel(CopyParamLabel);
   HotTrackLabel(ShortCutHintLabel);
 
-  if (FLAGSET(FOptions, coBrowse))
+  if (FLAGSET(FOptions, coExplore))
   {
     DebugAssert(!FToRemote);
     OkButton->Style = TCustomButton::bsSplitButton;
@@ -297,7 +297,7 @@ int __fastcall TCopyDialog::GetOutputOptions()
   return FOutputOptions |
     FLAGMASK(FSaveSettings, cooSaveSettings) |
     FLAGMASK(NeverShowAgainCheck->Checked, cooDoNotShowAgain) |
-    FLAGMASK(FBrowse, cooBrowse);
+    FLAGMASK(FExplore, cooExplore);
 }
 //---------------------------------------------------------------------------
 THistoryComboBox * __fastcall TCopyDialog::GetDirectoryEdit()
@@ -420,7 +420,7 @@ bool __fastcall TCopyDialog::Execute()
   FPreset = GUIConfiguration->CopyParamCurrent;
   DirectoryEdit->Items = CustomWinConfiguration->History[
     FToRemote ? L"RemoteTarget" : L"LocalTarget"];
-  FBrowse = false;
+  FExplore = false;
   bool Result = (ShowModal() == DefaultResult(this));
   if (Result)
   {
@@ -451,7 +451,7 @@ bool __fastcall TCopyDialog::Execute()
 void __fastcall TCopyDialog::FormCloseQuery(TObject * /*Sender*/,
       bool &CanClose)
 {
-  if ((ModalResult == DefaultResult(this)) && !FBrowse)
+  if ((ModalResult == DefaultResult(this)) && !FExplore)
   {
     ExitActiveControl(this);
 
@@ -602,9 +602,9 @@ void __fastcall TCopyDialog::DownloadItemClick(TObject *)
   OkButton->Click();
 }
 //---------------------------------------------------------------------------
-void __fastcall TCopyDialog::BrowseItemClick(TObject *)
+void __fastcall TCopyDialog::ExploreItemClick(TObject *)
 {
-  FBrowse = true;
+  FExplore = true;
   OkButton->Click();
 }
 //---------------------------------------------------------------------------

source/forms/Copy.dfm

@@ -192,9 +192,9 @@ object CopyDialog: TCopyDialog
       Default = True
       OnClick = DownloadItemClick
     end
-    object BrowseItem: TMenuItem
-      Caption = '&Browse'
-      OnClick = BrowseItemClick
+    object ExploreItem: TMenuItem
+      Caption = '&Explore'
+      OnClick = ExploreItemClick
     end
   end
 end

source/forms/Copy.h

@@ -35,7 +35,7 @@ __published:
   TLabel *ShortCutHintLabel;
   TPopupMenu *OkMenu;
   TMenuItem *DownloadItem;
-  TMenuItem *BrowseItem;
+  TMenuItem *ExploreItem;
   void __fastcall FormShow(TObject *Sender);
   void __fastcall FormCloseQuery(TObject *Sender, bool &CanClose);
   void __fastcall LocalDirectoryBrowseButtonClick(TObject *Sender);
@@ -50,7 +50,7 @@ __published:
   void __fastcall ShortCutHintLabelClick(TObject *Sender);
   void __fastcall LocalDirectoryEditExit(TObject *Sender);
   void __fastcall DownloadItemClick(TObject *Sender);
-  void __fastcall BrowseItemClick(TObject *Sender);
+  void __fastcall ExploreItemClick(TObject *Sender);
   void __fastcall OkButtonDropDownClick(TObject *Sender);
   void __fastcall FormAfterMonitorDpiChanged(TObject *Sender, int OldDPI, int NewDPI);
 private:
@@ -67,7 +67,7 @@ private:
   int FCopyParamAttrs;
   TSessionData * FSessionData;
   bool FSaveSettings;
-  bool FBrowse;
+  bool FExplore;
   UnicodeString __fastcall GetDirectory();
   THistoryComboBox * __fastcall GetDirectoryEdit();
   void __fastcall SetParams(const TGUICopyParamType & value);

source/forms/CustomScpExplorer.cpp

@@ -6506,7 +6506,7 @@ void __fastcall TCustomScpExplorerForm::DoSynchronizeMove(
   }
 }
 //---------------------------------------------------------------------------
-void __fastcall TCustomScpExplorerForm::DoSynchronizeBrowse(TOperationSide Side, TSynchronizeChecklist::TAction Action, const TSynchronizeChecklist::TItem * Item)
+void __fastcall TCustomScpExplorerForm::DoSynchronizeExplore(TOperationSide Side, TSynchronizeChecklist::TAction Action, const TSynchronizeChecklist::TItem * Item)
 {
   UnicodeString LocalPath = ExcludeTrailingBackslash(Item->Local.Directory);
   if (Side == osLocal)
@@ -6531,7 +6531,7 @@ void __fastcall TCustomScpExplorerForm::DoSynchronizeBrowse(TOperationSide Side,
     }
 
     UnicodeString SessionName = SaveHiddenDuplicateSession(SessionData.get());
-    ExecuteNewInstance(SessionName, FORMAT(L"%s=\"%s\"", (TProgramParams::FormatSwitch(BROWSE_SWITCH), Item->GetFileName())));
+    ExecuteNewInstance(SessionName, FORMAT(L"%s=\"%s\"", (TProgramParams::FormatSwitch(EXPLORE_SWITCH), Item->GetFileName())));
   }
 }
 //---------------------------------------------------------------------------
@@ -6653,7 +6653,7 @@ int __fastcall TCustomScpExplorerForm::DoFullSynchronizeDirectories(
           }
           if (!DoSynchronizeChecklistDialog(
                 Checklist, Mode, Params, LocalDirectory, RemoteDirectory, CustomCommandMenu, DoFullSynchronize,
-                OnQueueSynchronize, DoSynchronizeChecklistCalculateSize, DoSynchronizeMove, DoSynchronizeBrowse,
+                OnQueueSynchronize, DoSynchronizeChecklistCalculateSize, DoSynchronizeMove, DoSynchronizeExplore,
                 &SynchronizeParams))
           {
             Result = -1;
@@ -11870,7 +11870,7 @@ void __fastcall TCustomScpExplorerForm::RemoteDirViewResize(TObject *)
   CenterReconnectToolbar();
 }
 //---------------------------------------------------------------------------
-void TCustomScpExplorerForm::DoBrowseFile(TCustomDirView * DirView, const UnicodeString & FileName)
+void TCustomScpExplorerForm::DoExploreFile(TCustomDirView * DirView, const UnicodeString & FileName)
 {
   if (!FileName.IsEmpty())
   {
@@ -11882,9 +11882,9 @@ void TCustomScpExplorerForm::DoBrowseFile(TCustomDirView * DirView, const Unicod
   }
 }
 //---------------------------------------------------------------------------
-void __fastcall TCustomScpExplorerForm::BrowseFile(const UnicodeString & FileName)
+void __fastcall TCustomScpExplorerForm::ExploreFile(const UnicodeString & FileName)
 {
-  DoBrowseFile(RemoteDirView, FileName);
+  DoExploreFile(RemoteDirView, FileName);
 }
 //---------------------------------------------------------------------------
 void __fastcall TCustomScpExplorerForm::UpdateQueueFileList()

source/forms/CustomScpExplorer.h

@@ -718,7 +718,7 @@ protected:
     TSynchronizeChecklist * Checklist, const TSynchronizeChecklist::TItemList & Items, void * Token);
   void __fastcall DoSynchronizeMove(
     TOperationSide Side, TStrings * FileList, const UnicodeString & NewFileName, bool TargetIsDirectory, void * Token);
-  void __fastcall DoSynchronizeBrowse(TOperationSide Side, TSynchronizeChecklist::TAction Action, const TSynchronizeChecklist::TItem * Item);
+  void __fastcall DoSynchronizeExplore(TOperationSide Side, TSynchronizeChecklist::TAction Action, const TSynchronizeChecklist::TItem * Item);
   void __fastcall FullSynchronize(
     TSynchronizeParams & Params, TProcessedSynchronizationChecklistItem OnProcessedItem,
     TUpdatedSynchronizationChecklistItems OnUpdatedSynchronizationChecklistItems);
@@ -769,7 +769,7 @@ protected:
   void LoadFilesProperties(TStrings * FileList);
   void PasteFiles();
   bool DoDirectoryExists(void * Session, const UnicodeString & Directory);
-  void DoBrowseFile(TCustomDirView * DirView, const UnicodeString & FileName);
+  void DoExploreFile(TCustomDirView * DirView, const UnicodeString & FileName);
   bool NeedSecondarySessionForRemoteCopy(TStrings * FileList);
   void ReleaseHiContrastTheme();
   bool CanCalculateChecksum();
@@ -918,7 +918,7 @@ public:
   void __fastcall PrivateKeyUpload();
   bool __fastcall IsComponentPossible(Byte Component);
   void __fastcall ReplaceTerminal(TManagedTerminal * value);
-  virtual void __fastcall BrowseFile(const UnicodeString & FileName);
+  virtual void __fastcall ExploreFile(const UnicodeString & FileName);
   void __fastcall CloseApp();
   virtual bool SupportsLocalBrowser();
   virtual bool IsSideLocalBrowser(TOperationSide Side);

source/forms/ScpCommander.cpp

@@ -2676,11 +2676,11 @@ void __fastcall TScpCommanderForm::FileColorsChanged()
   DoFileColorsChanged(OtherLocalDirView);
 }
 //---------------------------------------------------------------------------
-void __fastcall TScpCommanderForm::BrowseFile(const UnicodeString & FileName)
+void __fastcall TScpCommanderForm::ExploreFile(const UnicodeString & FileName)
 {
   DebugAssert(!IsLocalBrowserMode());
-  TCustomScpExplorerForm::BrowseFile(FileName);
-  DoBrowseFile(LocalDirView, FileName);
+  TCustomScpExplorerForm::ExploreFile(FileName);
+  DoExploreFile(LocalDirView, FileName);
   TScpCommanderConfiguration ScpCommander = WinConfiguration->ScpCommander;
   // Select the panel that has the file, with preference on the remote panel
   if ((RemoteDirView->ItemFocused != NULL) && RemoteDirView->ItemFocused->Selected)

source/forms/ScpCommander.h

@@ -700,7 +700,7 @@ public:
   virtual void __fastcall GoToAddress();
   virtual void __fastcall CopyFilesToClipboard(TOperationSide Side, bool OnFocused);
   virtual void __fastcall PasteFromClipBoard();
-  virtual void __fastcall BrowseFile(const UnicodeString & FileName);
+  virtual void __fastcall ExploreFile(const UnicodeString & FileName);
   virtual bool SupportsLocalBrowser();
   virtual bool IsSideLocalBrowser(TOperationSide Side);
   virtual bool IsLocalBrowserMode();

source/forms/SynchronizeChecklist.cpp

@@ -35,12 +35,12 @@ bool __fastcall DoSynchronizeChecklistDialog(TSynchronizeChecklist * Checklist,
   TCustomCommandMenuEvent OnCustomCommandMenu, TFullSynchronizeEvent OnSynchronize,
   TQueueSynchronizeEvent OnQueueSynchronize,
   TSynchronizeChecklistCalculateSize OnSynchronizeChecklistCalculateSize, TSynchronizeMoveEvent OnSynchronizeMove,
-  TSynchronizeBrowseEvent OnSynchronizeBrowse, void * Token)
+  TSynchronizeExploreEvent OnSynchronizeExplore, void * Token)
 {
   std::unique_ptr<TSynchronizeChecklistDialog> Dialog(
     new TSynchronizeChecklistDialog(
       Application, Mode, Params, LocalDirectory, RemoteDirectory, OnCustomCommandMenu, OnSynchronize,
-      OnQueueSynchronize, OnSynchronizeChecklistCalculateSize, OnSynchronizeMove, OnSynchronizeBrowse, Token));
+      OnQueueSynchronize, OnSynchronizeChecklistCalculateSize, OnSynchronizeMove, OnSynchronizeExplore, Token));
   return Dialog->Execute(Checklist);
 }
 //---------------------------------------------------------------------
@@ -50,7 +50,7 @@ __fastcall TSynchronizeChecklistDialog::TSynchronizeChecklistDialog(
   TCustomCommandMenuEvent OnCustomCommandMenu, TFullSynchronizeEvent OnSynchronize,
   TQueueSynchronizeEvent OnQueueSynchronize,
   TSynchronizeChecklistCalculateSize OnSynchronizeChecklistCalculateSize, TSynchronizeMoveEvent OnSynchronizeMove,
-  TSynchronizeBrowseEvent OnSynchronizeBrowse, void * Token)
+  TSynchronizeExploreEvent OnSynchronizeExplore, void * Token)
   : TForm(AOwner)
 {
   FFormRestored = false;
@@ -61,7 +61,7 @@ __fastcall TSynchronizeChecklistDialog::TSynchronizeChecklistDialog(
   FOnCustomCommandMenu = OnCustomCommandMenu;
   FOnSynchronizeChecklistCalculateSize = OnSynchronizeChecklistCalculateSize;
   FOnSynchronizeMove = OnSynchronizeMove;
-  FOnSynchronizeBrowse = OnSynchronizeBrowse;
+  FOnSynchronizeExplore = OnSynchronizeExplore;
   DebugAssert(OnSynchronize != NULL);
   FOnSynchronize = OnSynchronize;
   FOnQueueSynchronize = OnQueueSynchronize;
@@ -342,8 +342,8 @@ void __fastcall TSynchronizeChecklistDialog::UpdateControls()
   CalculateSizeAllAction->Enabled = (FDirectories > 0) && !FSynchronizing;
   TSynchronizeChecklist::TAction SelectedItemAction =
     (SelCount == 1) ? GetChecklistItemAction(GetChecklistItem(ListView->Selected)) : TSynchronizeChecklist::saNone;
-  BrowseLocalAction->Enabled = (SelCount == 1) && (SelectedItemAction != TSynchronizeChecklist::saDeleteRemote);
-  BrowseRemoteAction->Enabled = (SelCount == 1) && (SelectedItemAction != TSynchronizeChecklist::saDeleteLocal);
+  ExploreLocalAction->Enabled = (SelCount == 1) && (SelectedItemAction != TSynchronizeChecklist::saDeleteRemote);
+  ExploreRemoteAction->Enabled = (SelCount == 1) && (SelectedItemAction != TSynchronizeChecklist::saDeleteLocal);
 
   int Count = ListView->Items->Count;
   DebugAssert(FTotals[0] == Count);
@@ -1545,21 +1545,21 @@ void __fastcall TSynchronizeChecklistDialog::UncheckDirectoryActionExecute(TObje
   CheckDirectory(false);
 }
 //---------------------------------------------------------------------------
-void __fastcall TSynchronizeChecklistDialog::DoBrowse(TOperationSide Side)
+void __fastcall TSynchronizeChecklistDialog::DoExplore(TOperationSide Side)
 {
   const TSynchronizeChecklist::TItem * ChecklistItem = GetChecklistItem(ListView->Selected);
   TSynchronizeChecklist::TAction Action = GetChecklistItemAction(ChecklistItem);
-  FOnSynchronizeBrowse(Side, Action, ChecklistItem);
+  FOnSynchronizeExplore(Side, Action, ChecklistItem);
 }
 //---------------------------------------------------------------------------
-void __fastcall TSynchronizeChecklistDialog::BrowseLocalActionExecute(TObject *)
+void __fastcall TSynchronizeChecklistDialog::ExploreLocalActionExecute(TObject *)
 {
-  DoBrowse(osLocal);
+  DoExplore(osLocal);
 }
 //---------------------------------------------------------------------------
-void __fastcall TSynchronizeChecklistDialog::BrowseRemoteActionExecute(TObject *)
+void __fastcall TSynchronizeChecklistDialog::ExploreRemoteActionExecute(TObject *)
 {
-  DoBrowse(osRemote);
+  DoExplore(osRemote);
 }
 //---------------------------------------------------------------------------
 void __fastcall TSynchronizeChecklistDialog::KeyDown(Word & Key, TShiftState Shift)

source/forms/SynchronizeChecklist.dfm

@@ -2107,11 +2107,11 @@ object SynchronizeChecklistDialog: TSynchronizeChecklistDialog
       object TMenuItem
       end
     end
-    object BrowseLocalDirectory2: TMenuItem
-      Action = BrowseLocalAction
+    object ExploreLocalDirectory1: TMenuItem
+      Action = ExploreLocalAction
     end
-    object BrowseLocalDirectory1: TMenuItem
-      Action = BrowseRemoteAction
+    object ExploreRemoteDirectory1: TMenuItem
+      Action = ExploreRemoteAction
     end
     object N2: TMenuItem
       Caption = '-'
@@ -2182,13 +2182,13 @@ object SynchronizeChecklistDialog: TSynchronizeChecklistDialog
       Caption = 'Uncheck All Actions in This &Directory'
       OnExecute = UncheckDirectoryActionExecute
     end
-    object BrowseLocalAction: TAction
-      Caption = 'Browse &Local Directory'
-      OnExecute = BrowseLocalActionExecute
+    object ExploreLocalAction: TAction
+      Caption = 'Explore &Local Directory'
+      OnExecute = ExploreLocalActionExecute
     end
-    object BrowseRemoteAction: TAction
-      Caption = 'Browse &Remote Directory'
-      OnExecute = BrowseRemoteActionExecute
+    object ExploreRemoteAction: TAction
+      Caption = 'Explore &Remote Directory'
+      OnExecute = ExploreRemoteActionExecute
     end
     object FindMoveCandidateAction: TAction
       Caption = '&Find Move Candidate'

source/forms/SynchronizeChecklist.h

@@ -65,10 +65,10 @@ __published:
   TMenuItem *N3;
   TMenuItem *CheckAllFilesinThisDirectory1;
   TMenuItem *UncheckAllActionsinThisDirectory1;
-  TAction *BrowseLocalAction;
-  TAction *BrowseRemoteAction;
-  TMenuItem *BrowseLocalDirectory1;
-  TMenuItem *BrowseLocalDirectory2;
+  TAction *ExploreLocalAction;
+  TAction *ExploreRemoteAction;
+  TMenuItem *ExploreLocalDirectory1;
+  TMenuItem *ExploreRemoteDirectory1;
   TAction *FindMoveCandidateAction;
   TMenuItem *Calculate3;
   TMenuItem *CalculateAll1;
@@ -116,8 +116,8 @@ __published:
   void __fastcall MoveActionExecute(TObject *Sender);
   void __fastcall CheckDirectoryActionExecute(TObject *Sender);
   void __fastcall UncheckDirectoryActionExecute(TObject *Sender);
-  void __fastcall BrowseLocalActionExecute(TObject *Sender);
-  void __fastcall BrowseRemoteActionExecute(TObject *Sender);
+  void __fastcall ExploreLocalActionExecute(TObject *Sender);
+  void __fastcall ExploreRemoteActionExecute(TObject *Sender);
   void __fastcall ListViewRecreate(TObject *Sender);
   void __fastcall ToolsMenuButtonClick(TObject *Sender);
   void __fastcall FindMoveCandidateActionExecute(TObject *Sender);
@@ -133,7 +133,7 @@ public:
     TCustomCommandMenuEvent OnCustomCommandMenu, TFullSynchronizeEvent OnSynchronize,
     TQueueSynchronizeEvent OnQueueSynchronize,
     TSynchronizeChecklistCalculateSize OnSynchronizeChecklistCalculateSize, TSynchronizeMoveEvent OnSynchronizeMove,
-    TSynchronizeBrowseEvent OnSynchronizeBrowse, void * Token);
+    TSynchronizeExploreEvent OnSynchronizeExplore, void * Token);
   virtual __fastcall ~TSynchronizeChecklistDialog();
 
   bool __fastcall Execute(TSynchronizeChecklist * Checklist);
@@ -157,7 +157,7 @@ protected:
   TCustomCommandMenuEvent FOnCustomCommandMenu;
   TSynchronizeChecklistCalculateSize FOnSynchronizeChecklistCalculateSize;
   TSynchronizeMoveEvent FOnSynchronizeMove;
-  TSynchronizeBrowseEvent FOnSynchronizeBrowse;
+  TSynchronizeExploreEvent FOnSynchronizeExplore;
   typedef std::map<const TSynchronizeChecklist::TItem *, TSynchronizeChecklist::TAction> TActions;
   TActions FActions;
   TFullSynchronizeEvent FOnSynchronize;
@@ -203,7 +203,7 @@ protected:
   void __fastcall CountItemTotal(const TSynchronizeChecklist::TItem * ChecklistItem, int Factor);
   void __fastcall DeleteItem(const TSynchronizeChecklist::TItem * ChecklistItem);
   void __fastcall CheckDirectory(bool Check);
-  void __fastcall DoBrowse(TOperationSide Side);
+  void __fastcall DoExplore(TOperationSide Side);
   void __fastcall ListViewHintShow(TCMHintShow & HintShow);
   void __fastcall StatusBarHintShow(TCMHintShow & HintShow);
   DYNAMIC void __fastcall KeyDown(Word & Key, TShiftState Shift);

source/resource/TextsWin.h

@@ -299,7 +299,7 @@
 #define CUSTOM_COMMAND_PATTERNS_HINT6 1583
 #define USAGE_PASSPHRASE        1584
 #define AUTO_WORKSPACE_ENABLE   1585
-#define USAGE_BROWSE            1586
+#define USAGE_EXPLORE           1586
 #define PUTTY_SETTINGS_INSTRUCTIONS 1587
 #define PUTTY_SETTINGS_SITE_NAME 1588
 #define USAGE_USERNAME          1589

source/resource/TextsWin1.rc

@@ -304,7 +304,7 @@ BEGIN
         CUSTOM_COMMAND_PATTERNS_HINT6, "!E expands to serialized connection data of current session"
         USAGE_PASSPHRASE, "A passphrase for an encrypted private key or a client certificate"
         AUTO_WORKSPACE_ENABLE, "Press 'No' to enable automatic saving of the workspace."
-        USAGE_BROWSE, "Selects the specified file in file panel(s)."
+        USAGE_EXPLORE, "Selects the specified file in file panel(s)."
         PUTTY_SETTINGS_INSTRUCTIONS, "**Edit terminal settings in PuTTY.**\n\nPuTTY will be started. Edit terminal settings of a temporary site %s. WinSCP will remember these settings after you close PuTTY."
         PUTTY_SETTINGS_SITE_NAME, "Terminal settings for %s"
         USAGE_USERNAME, "An alternative way to provide a username"

source/windows/ConsoleRunner.cpp

@@ -2304,7 +2304,7 @@ void __fastcall Usage(TConsole * Console)
     PrintUsageSyntax(Console, FORMAT(L"[mysession] /%s=<name>", (LowerCase(SESSIONNAME_SWICH))));
     PrintUsageSyntax(Console, L"[mysession] /newinstance");
     PrintUsageSyntax(Console, L"[mysession] /edit <path>");
-    PrintUsageSyntax(Console, FORMAT(L"[mysession] /%s[=<file>]", (LowerCase(BROWSE_SWITCH))));
+    PrintUsageSyntax(Console, FORMAT(L"[mysession] /%s[=<file>]", (LowerCase(EXPLORE_SWITCH))));
     PrintUsageSyntax(Console, FORMAT(L"[mysession] /%s [local_dir] [remote_dir] [/%s]", (LowerCase(SYNCHRONIZE_SWITCH), LowerCase(DEFAULTS_SWITCH))));
     PrintUsageSyntax(Console, FORMAT(L"[mysession] /%s [local_dir] [remote_dir] [/%s]", (LowerCase(KEEP_UP_TO_DATE_SWITCH), LowerCase(DEFAULTS_SWITCH))));
     PrintUsageSyntax(Console, FORMAT(L"[mysession] /%s [path]", (LowerCase(REFRESH_SWITCH))));
@@ -2364,7 +2364,7 @@ void __fastcall Usage(TConsole * Console)
     RegisterSwitch(SwitchesUsage, TProgramParams::FormatSwitch(SESSIONNAME_SWICH) + L"=", USAGE_SESSIONNAME);
     RegisterSwitch(SwitchesUsage, L"/newinstance", USAGE_NEWINSTANCE);
     RegisterSwitch(SwitchesUsage, L"/edit", USAGE_EDIT);
-    RegisterSwitch(SwitchesUsage, TProgramParams::FormatSwitch(BROWSE_SWITCH), USAGE_BROWSE);
+    RegisterSwitch(SwitchesUsage, TProgramParams::FormatSwitch(EXPLORE_SWITCH), USAGE_EXPLORE);
     RegisterSwitch(SwitchesUsage, TProgramParams::FormatSwitch(SYNCHRONIZE_SWITCH), USAGE_SYNCHRONIZE);
     RegisterSwitch(SwitchesUsage, TProgramParams::FormatSwitch(KEEP_UP_TO_DATE_SWITCH), USAGE_KEEPUPTODATE);
     RegisterSwitch(SwitchesUsage, TProgramParams::FormatSwitch(REFRESH_SWITCH), USAGE_REFRESH);

source/windows/WinInterface.h

@@ -50,7 +50,8 @@ const int mpAllowContinueOnError = 0x02;
 #define DUMPCALLSTACK_SWITCH L"DumpCallstack"
 #define INFO_SWITCH L"Info"
 #define COMREGISTRATION_SWITCH L"ComRegistration"
-#define BROWSE_SWITCH L"Browse"
+#define EXPLORE_SWITCH L"Explore"
+#define EXPLORE_OLD_SWITCH L"Browse"
 #define NOINTERACTIVEINPUT_SWITCH L"NoInteractiveInput"
 #define STDOUT_SWITCH L"StdOut"
 #define STDIN_SWITCH L"StdIn"
@@ -221,11 +222,11 @@ const coDoNotShowAgain      = 0x020;
 const coAllowRemoteTransfer = 0x100;
 const coShortCutHint        = 0x800;
 const coAllFiles            = 0x1000;
-const coBrowse              = 0x2000;
+const coExplore             = 0x2000;
 const cooDoNotShowAgain     = 0x01;
 const cooRemoteTransfer     = 0x02;
 const cooSaveSettings       = 0x04;
-const cooBrowse             = 0x08;
+const cooExplore            = 0x08;
 bool __fastcall DoCopyDialog(
   bool ToRemote, bool Move, TStrings * FileList, UnicodeString & TargetDirectory,
   TGUICopyParamType * Params, int Options, int CopyParamAttrs,
@@ -398,7 +399,7 @@ typedef void __fastcall (__closure *TSynchronizeChecklistCalculateSize)
   (TSynchronizeChecklist * Checklist, const TSynchronizeChecklist::TItemList & Items, void * Token);
 typedef void __fastcall (__closure *TSynchronizeMoveEvent)(
   TOperationSide Side, TStrings * FileList, const UnicodeString & NewFileName, bool TargetIsDirectory, void * Token);
-typedef void __fastcall (__closure *TSynchronizeBrowseEvent)(
+typedef void __fastcall (__closure *TSynchronizeExploreEvent)(
   TOperationSide Side, TSynchronizeChecklist::TAction Action, const TSynchronizeChecklist::TItem * Item);
 bool __fastcall DoSynchronizeChecklistDialog(TSynchronizeChecklist * Checklist,
   TSynchronizeMode Mode, int Params,
@@ -406,7 +407,7 @@ bool __fastcall DoSynchronizeChecklistDialog(TSynchronizeChecklist * Checklist,
   TCustomCommandMenuEvent OnCustomCommandMenu, TFullSynchronizeEvent OnSynchronize,
   TQueueSynchronizeEvent OnQueueSynchronize,
   TSynchronizeChecklistCalculateSize OnSynchronizeChecklistCalculateSize, TSynchronizeMoveEvent OnSynchronizeMove,
-  TSynchronizeBrowseEvent OnSynchronizeBrowse, void * Token);
+  TSynchronizeExploreEvent OnSynchronizeExplore, void * Token);
 
 // forms\Editor.cpp
 typedef void __fastcall (__closure *TFileClosedEvent)

source/windows/WinMain.cpp

@@ -132,7 +132,7 @@ void __fastcall Upload(TTerminal * Terminal, TStrings * FileList, int UseDefault
   }
 }
 //---------------------------------------------------------------------------
-void __fastcall Download(TTerminal * Terminal, const UnicodeString FileName, int UseDefaults, bool & Browse, UnicodeString & BrowseFile)
+void __fastcall Download(TTerminal * Terminal, const UnicodeString FileName, int UseDefaults, bool & Explore, UnicodeString & ExploreFile)
 {
   TRemoteFile * File = NULL;
 
@@ -170,14 +170,14 @@ void __fastcall Download(TTerminal * Terminal, const UnicodeString FileName, int
     std::unique_ptr<TStrings> FileListFriendly(new TStringList());
     FileListFriendly->AddObject(FriendyFileName, File);
 
-    int Options = coDisableQueue | coBrowse;
+    int Options = coDisableQueue | coExplore;
     int CopyParamAttrs = Terminal->UsableCopyParamAttrs(0).Download;
     int OutputOptions = 0;
     if ((UseDefaults == 0) ||
         DoCopyDialog(false, false, FileListFriendly.get(), TargetDirectory, &CopyParam,
           Options, CopyParamAttrs, NULL, &OutputOptions, UseDefaults))
     {
-      if (FLAGCLEAR(OutputOptions, cooBrowse))
+      if (FLAGCLEAR(OutputOptions, cooExplore))
       {
         // Setting parameter overrides only now, otherwise the dialog would present the parametes as non-default
 
@@ -199,8 +199,8 @@ void __fastcall Download(TTerminal * Terminal, const UnicodeString FileName, int
       else
       {
         UnicodeString Directory = UnixExtractFilePath(FileName);
-        BrowseFile = UnixExtractFileName(FileName);
-        Browse = true;
+        ExploreFile = UnixExtractFileName(FileName);
+        Explore = true;
         Terminal->AutoReadDirectory = true;
         Terminal->ChangeDirectory(Directory);
       }
@@ -1270,20 +1270,20 @@ int __fastcall Execute()
               DebugAssert(TerminalManager->ActiveSession == NULL);
 
               bool CanStart;
-              bool Browse = false;
-              UnicodeString BrowseFile;
+              bool Explore = false;
+              UnicodeString ExploreFile;
               if (DataList->Count > 0)
               {
                 TManagedTerminal * Session = TerminalManager->NewSessions(DataList.get());
-                if (Params->FindSwitch(BROWSE_SWITCH, BrowseFile) &&
-                    (!BrowseFile.IsEmpty() || !DownloadFile.IsEmpty()))
+                if ((Params->FindSwitch(EXPLORE_SWITCH, ExploreFile) || Params->FindSwitch(EXPLORE_OLD_SWITCH, ExploreFile)) &&
+                    (!ExploreFile.IsEmpty() || !DownloadFile.IsEmpty()))
                 {
-                  if (BrowseFile.IsEmpty())
+                  if (ExploreFile.IsEmpty())
                   {
-                    BrowseFile = DownloadFile;
+                    ExploreFile = DownloadFile;
                   }
                   DownloadFile = UnicodeString();
-                  Browse = true;
+                  Explore = true;
                 }
                 if (!DownloadFile.IsEmpty())
                 {
@@ -1351,7 +1351,7 @@ int __fastcall Execute()
                   else if (!DownloadFile.IsEmpty())
                   {
                     Download(
-                      TerminalManager->ActiveSession, DownloadFile, UseDefaults, Browse, BrowseFile);
+                      TerminalManager->ActiveSession, DownloadFile, UseDefaults, Explore, ExploreFile);
                   }
                   else
                   {
@@ -1363,9 +1363,9 @@ int __fastcall Execute()
 
                   ScpExplorer->StandaloneOperation = false;
 
-                  if (Browse)
+                  if (Explore)
                   {
-                    ScpExplorer->BrowseFile(BrowseFile);
+                    ScpExplorer->ExploreFile(ExploreFile);
                   }
 
                   AddStartupSequence(L"R");