We are using a single set of Login dialog options only

Source commit: a8b1b1973c1e7cc277c1ff848aabff2a285360ce

source/forms/Login.cpp

@@ -34,15 +34,14 @@ const int WorkspaceImageIndex = 4;
 const int NewSiteImageIndex = 6;
 const int SiteColorMaskImageIndex = 8;
 //---------------------------------------------------------------------------
-bool __fastcall DoLoginDialog(TStoredSessionList *SessionList,
-  TList * DataList, int Options)
+bool __fastcall DoLoginDialog(TStoredSessionList *SessionList, TList * DataList)
 {
   DebugAssert(DataList != NULL);
   TLoginDialog * LoginDialog = SafeFormCreate<TLoginDialog>();
   bool Result;
   try
   {
-    LoginDialog->Init(SessionList, Options);
+    LoginDialog->Init(SessionList);
     Result = LoginDialog->Execute(DataList);
   }
   __finally
@@ -59,7 +58,6 @@ __fastcall TLoginDialog::TLoginDialog(TComponent* AOwner)
 {
   FNewSiteData = new TSessionData(L"");
   FInitialized = false;
-  FOptions = loStartup;
   FHintNode = NULL;
   FScrollOnDragOver = new TTreeViewScrollOnDragOver(SessionTree, true);
   FDataList = NULL;
@@ -96,18 +94,13 @@ void __fastcall TLoginDialog::InvalidateSessionData()
   FSessionData = NULL;
 }
 //---------------------------------------------------------------------
-void __fastcall TLoginDialog::Init(TStoredSessionList *SessionList,
-  int Options)
+void __fastcall TLoginDialog::Init(TStoredSessionList *SessionList)
 {
   FStoredSessions = SessionList;
   LoadSessions();
-  FOptions = Options;
   UnicodeString Dummy;
   RunPageantAction->Visible = FindTool(PageantTool, Dummy);
   RunPuttygenAction->Visible = FindTool(PuttygenTool, Dummy);
-  AdvancedButton->Style =
-    FLAGSET(FOptions, loExternalTools) ?
-      TCustomButton::bsSplitButton : TCustomButton::bsPushButton;
   UpdateControls();
 }
 //---------------------------------------------------------------------
@@ -1148,12 +1141,6 @@ void __fastcall TLoginDialog::ActionListUpdate(TBasicAction * BasicAction,
   {
     NewSessionFolderAction->Enabled = !FEditing;
   }
-  else if ((Action == ImportAction) ||
-           (Action == AboutAction) || (Action == CleanUpAction) ||
-           (Action == CheckForUpdatesAction) || (Action == PreferencesAction))
-  {
-    Action->Visible = FLAGSET(FOptions, loExternalTools);
-  }
   else if (Action == PasteUrlAction)
   {
     UnicodeString ClipboardUrl;
@@ -2733,7 +2720,7 @@ void __fastcall TLoginDialog::SessionAdvancedActionExecute(TObject * /*Sender*/)
     ParseHostName();
 
     SaveSession(FSessionData);
-    DoSiteAdvancedDialog(FSessionData, FOptions);
+    DoSiteAdvancedDialog(FSessionData);
     // Needed only for Note.
     // The only other property visible on Login dialog that Advanced site dialog
     // can change is protocol (between fsSFTP and fsSFTPonly),

source/forms/Login.h

@@ -288,7 +288,6 @@ private:
   bool FNewSiteKeepName;
   TSessionData * FSessionData;
   TStoredSessionList * FStoredSessions;
-  int FOptions;
   bool FInitialized;
   TWndMethod FOldSessionTreeProc;
   TTreeNode * FHintNode;
@@ -407,7 +406,7 @@ protected:
 public:
   virtual __fastcall TLoginDialog(TComponent* AOwner);
   __fastcall ~TLoginDialog();
-  void __fastcall Init(TStoredSessionList *SessionList, int Options);
+  void __fastcall Init(TStoredSessionList *SessionList);
   bool __fastcall Execute(TList * DataList);
 };
 //----------------------------------------------------------------------------

source/forms/SiteAdvanced.cpp

@@ -27,9 +27,9 @@
 // Sheet tag:
 // 01 top, 02 indented
 //---------------------------------------------------------------------------
-bool __fastcall DoSiteAdvancedDialog(TSessionData * SessionData, int Options)
+bool __fastcall DoSiteAdvancedDialog(TSessionData * SessionData)
 {
-  TSiteAdvancedDialog * SiteAdvancedDialog = new TSiteAdvancedDialog(Application, Options);
+  TSiteAdvancedDialog * SiteAdvancedDialog = new TSiteAdvancedDialog(Application);
   bool Result;
   try
   {
@@ -44,12 +44,10 @@ bool __fastcall DoSiteAdvancedDialog(TSessionData * SessionData, int Options)
 //---------------------------------------------------------------------
 static const UnicodeString DefaultRecycleBinPath = L"/tmp";
 //---------------------------------------------------------------------
-__fastcall TSiteAdvancedDialog::TSiteAdvancedDialog(
-    TComponent * AOwner, int Options) :
+__fastcall TSiteAdvancedDialog::TSiteAdvancedDialog(TComponent * AOwner) :
   TForm(AOwner)
 {
   NoUpdate = 0;
-  FOptions = Options;
 
   // we need to make sure that window procedure is set asap
   // (so that CM_SHOWINGCHANGED handling is applied)
@@ -104,17 +102,6 @@ void __fastcall TSiteAdvancedDialog::InitControls()
 
   UpdateNavigationTree();
 
-  if (FLAGCLEAR(FOptions, loLocalDirectory))
-  {
-    LocalDirectoryLabel->Visible = false;
-    LocalDirectoryEdit->Visible = false;
-    LocalDirectoryDescLabel->Visible = false;
-    DirectoriesGroup->Height = RemoteDirectoryEdit->Top + RemoteDirectoryEdit->Height + ScaleByTextHeight(this, 12);
-    DirectoryOptionsGroup->Top = DirectoriesGroup->Top + DirectoriesGroup->Height + ScaleByTextHeight(this, 8);
-  }
-
-  ColorButton->Visible = (FOptions & loColor);
-
   SetSessionColor((TColor)0);
 }
 //---------------------------------------------------------------------

source/forms/SiteAdvanced.h

@@ -291,7 +291,7 @@ __published:
 
 
 public:
-  virtual __fastcall TSiteAdvancedDialog(TComponent * AOwner, int Options);
+  virtual __fastcall TSiteAdvancedDialog(TComponent * AOwner);
   bool __fastcall Execute(TSessionData * SessionData);
 
 protected:

source/windows/WinInterface.h

@@ -201,21 +201,10 @@ bool __fastcall DoImportSessionsDialog(TList * Imported);
 enum TLicense { lcNoLicense = -1, lcWinScp, lcExpat };
 void __fastcall DoLicenseDialog(TLicense License);
 
-// forms\Login.cpp
-// these flags are used in navigation tree of login dialog, change with care
-const loLocalDirectory = 0x01;
-const loExternalTools  = 0x04;
-
-const loColor          = 0x80;
-
-const loNone           = 0x00;
-const loAddSession     = (loLocalDirectory | loColor);
-const loStartup        = (loLocalDirectory | loExternalTools | loColor);
-bool __fastcall DoLoginDialog(TStoredSessionList * SessionList,
-  TList * DataList, int Options);
+bool __fastcall DoLoginDialog(TStoredSessionList * SessionList, TList * DataList);
 
   // forms\SiteAdvanced.cpp
-bool __fastcall DoSiteAdvancedDialog(TSessionData * SessionData, int Options);
+bool __fastcall DoSiteAdvancedDialog(TSessionData * SessionData);
 
 // forms\OpenDirectory.cpp
 enum TOpenDirectoryMode { odBrowse, odAddBookmark };

source/windows/WinMain.cpp

@@ -85,7 +85,7 @@ void __fastcall GetLoginData(UnicodeString SessionName, TOptions * Options,
     // - the specified session does not contain enough information to login [= not even hostname]
 
     DebugAssert(DataList->Count <= 1);
-    if (!DoLoginDialog(StoredSessions, DataList, loStartup))
+    if (!DoLoginDialog(StoredSessions, DataList))
     {
       Abort();
     }