1
0
mirror of https://github.com/winscp/winscp.git synced 2026-10-24 02:28:55 +03:00

Unused code

Source commit: 28714f02f78a3997881e0607c56c66dbf4b0c645
This commit is contained in:
Martin Prikryl
2018-09-10 07:08:17 +00:00
parent 190d375f1a
commit 7ada31b79f
6 changed files with 15 additions and 25 deletions

View File

@@ -335,10 +335,6 @@ void __fastcall TCopyDialog::UpdateControls()
bool RemoteTransfer = FLAGSET(FOutputOptions, cooRemoteTransfer);
EnableControl(QueueCheck2,
((FOptions & (coDisableQueue | coTemp)) == 0) && !RemoteTransfer);
TransferSettingsButton->Style =
FLAGCLEAR(FOptions, coDoNotUsePresets) ?
TCustomButton::bsSplitButton : TCustomButton::bsPushButton;
}
//---------------------------------------------------------------------------
void __fastcall TCopyDialog::FormShow(TObject * /*Sender*/)
@@ -468,7 +464,7 @@ void __fastcall TCopyDialog::ControlChange(TObject * /*Sender*/)
//---------------------------------------------------------------------------
void __fastcall TCopyDialog::TransferSettingsButtonClick(TObject * /*Sender*/)
{
if (FLAGCLEAR(FOptions, coDoNotUsePresets) && !SupportsSplitButton())
if (!SupportsSplitButton())
{
CopyParamListPopup(CalculatePopupRect(TransferSettingsButton), 0);
}
@@ -535,11 +531,8 @@ void __fastcall TCopyDialog::CopyParamGroupClick(TObject * /*Sender*/)
void __fastcall TCopyDialog::CopyParamGroupContextPopup(TObject * /*Sender*/,
TPoint & MousePos, bool & Handled)
{
if (FLAGCLEAR(FOptions, coDoNotUsePresets))
{
CopyParamListPopup(CalculatePopupRect(CopyParamGroup, MousePos), cplCustomizeDefault);
Handled = true;
}
CopyParamListPopup(CalculatePopupRect(CopyParamGroup, MousePos), cplCustomizeDefault);
Handled = true;
}
//---------------------------------------------------------------------------
void __fastcall TCopyDialog::CopyParamListPopup(TRect R, int AdditionalOptions)
@@ -548,7 +541,7 @@ void __fastcall TCopyDialog::CopyParamListPopup(TRect R, int AdditionalOptions)
::CopyParamListPopup(R, FPresetsMenu,
FCopyParams, FPreset, CopyParamClick,
cplCustomize | AdditionalOptions |
AdditionalOptions |
FLAGMASK(
FLAGCLEAR(FOptions, coDisableSaveSettings) && !RemoteTransfer,
cplSaveSettings) |

View File

@@ -121,6 +121,7 @@ object CopyDialog: TCopyDialog
Width = 161
Height = 25
Caption = 'Transfer settin&gs...'
Style = bsSplitButton
TabOrder = 5
OnClick = TransferSettingsButtonClick
OnDropDownClick = TransferSettingsButtonDropDownClick

View File

@@ -315,7 +315,7 @@ void __fastcall TFullSynchronizeDialog::CopyParamListPopup(TRect R, int Addition
// display checkbox next to user-selected preset
::CopyParamListPopup(
R, FPresetsMenu, FCopyParams, FPreset, CopyParamClick,
cplCustomize | AdditionalOptions,
AdditionalOptions,
ActualCopyParamAttrs());
}
//---------------------------------------------------------------------------

View File

@@ -271,7 +271,7 @@ void __fastcall TSynchronizeDialog::CopyParamListPopup(TRect R, int AdditionalOp
// display checkbox next to user-selected preset
::CopyParamListPopup(
R, FPresetsMenu, FCopyParams, FPreset, CopyParamClick,
cplCustomize | AdditionalOptions, ActualCopyParamAttrs());
AdditionalOptions, ActualCopyParamAttrs());
}
//---------------------------------------------------------------------------
void __fastcall TSynchronizeDialog::TransferSettingsButtonClick(

View File

@@ -807,16 +807,13 @@ void __fastcall CopyParamListPopup(TRect Rect, TPopupMenu * Menu,
TMenuItem * CustomizeItem = NULL;
TMenuItem * Item;
if (FLAGSET(Options, cplCustomize))
{
Item = new TMenuItem(Menu);
Item->Caption = LoadStr(COPY_PARAM_CUSTOM);
Item->Tag = cpiCustom;
Item->Default = FLAGSET(Options, cplCustomizeDefault);
Item->OnClick = OnClick;
Menu->Items->Add(Item);
CustomizeItem = Item;
}
Item = new TMenuItem(Menu);
Item->Caption = LoadStr(COPY_PARAM_CUSTOM);
Item->Tag = cpiCustom;
Item->Default = FLAGSET(Options, cplCustomizeDefault);
Item->OnClick = OnClick;
Menu->Items->Add(Item);
CustomizeItem = Item;
if (FLAGSET(Options, cplSaveSettings))
{

View File

@@ -199,7 +199,7 @@ const coDisableQueue = 0x002;
const coDisableDirectory = 0x008; // not used anymore
const coDoNotShowAgain = 0x020;
const coDisableSaveSettings = 0x040; // not used anymore
const coDoNotUsePresets = 0x080;
const coDoNotUsePresets = 0x080; // not used anymore
const coAllowRemoteTransfer = 0x100;
const coNoQueue = 0x200;
const coShortCutHint = 0x800;
@@ -446,7 +446,6 @@ void __fastcall DoGenerateTransferCodeDialog(
void __fastcall CopyParamListButton(TButton * Button);
const int cplNone = 0x00;
const int cplCustomize = 0x01;
const int cplCustomizeDefault = 0x02;
const int cplSaveSettings = 0x04;
const int cplGenerateCode = 0x08;