1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
|
Version: 11.22
Date: 2022-06-26
Message: The source release appears not to actually include the logic that performs operations in parallel, so this patch doesn't actually do anything.
--- a/FreeFileSync/Source/ui/folder_selector.cpp
+++ b/FreeFileSync/Source/ui/folder_selector.cpp
@@ -263,7 +263,7 @@ void FolderSelector::onSelectFolder(wxCo
void FolderSelector::onSelectAltFolder(wxCommandEvent& event)
{
Zstring folderPathPhrase = getPath();
- size_t parallelOps = getDeviceParallelOps_ ? getDeviceParallelOps_(folderPathPhrase) : 1;
+ size_t parallelOps = getDeviceParallelOps_ ? getDeviceParallelOps_(folderPathPhrase) : 5;
if (showCloudSetupDialog(parent_, folderPathPhrase, sftpKeyFileLastSelected_, parallelOps, static_cast<bool>(setDeviceParallelOps_)) != ConfirmationButton::accept)
return;
--- a/FreeFileSync/Source/ui/small_dlgs.cpp
+++ b/FreeFileSync/Source/ui/small_dlgs.cpp
@@ -371,11 +371,14 @@ CloudSetupDlg::CloudSetupDlg(wxWindow* p
m_spinCtrlConnectionCount->SetValue(parallelOps);
- m_spinCtrlConnectionCount->Disable();
- m_staticTextConnectionCountDescr->Hide();
+ if (!canChangeParallelOp)
+ {
+ m_spinCtrlConnectionCount->Disable();
+ m_staticTextConnectionCountDescr->Hide();
- m_spinCtrlChannelCountSftp->Disable();
- m_buttonChannelCountSftp ->Disable();
+ m_spinCtrlChannelCountSftp->Disable();
+ m_buttonChannelCountSftp ->Disable();
+ }
//---------------------------------------------------------
//set up default view for dialog size calculation
@@ -821,7 +824,7 @@ CopyToDialog::CopyToDialog(wxWindow* par
targetFolder = std::make_unique<FolderSelector>(this, *this, *m_buttonSelectTargetFolder, *m_bpButtonSelectAltTargetFolder, *m_targetFolderPath,
targetFolderLastSelected, sftpKeyFileLastSelected, nullptr /*staticText*/, nullptr /*wxWindow*/, nullptr /*droppedPathsFilter*/,
- [](const Zstring& folderPathPhrase) { return 1; } /*getDeviceParallelOps*/, nullptr /*setDeviceParallelOps*/);
+ [](const Zstring& folderPathPhrase) { return 5; } /*getDeviceParallelOps*/, nullptr /*setDeviceParallelOps*/);
m_targetFolderPath->setHistory(std::make_shared<HistoryList>(folderHistory, folderHistoryMax));
--- a/FreeFileSync/Source/ui/sync_cfg.cpp
+++ b/FreeFileSync/Source/ui/sync_cfg.cpp
@@ -352,7 +352,7 @@ emailHistoryOut_(emailHistory),
commandHistoryOut_(commandHistory),
globalPairCfg_(globalPairCfg),
localPairCfg_(localPairCfg),
- enableExtraFeatures_(false),
+ enableExtraFeatures_(true),
showMultipleCfgs_(showMultipleCfgs),
globalLogFolderPhrase_(globalLogFolderPhrase)
{
|
