summaryrefslogtreecommitdiff
path: root/ui/small_dlgs.cpp
diff options
context:
space:
mode:
authorDaniel Wilhelm <daniel@wili.li>2014-04-18 17:13:35 +0200
committerDaniel Wilhelm <daniel@wili.li>2014-04-18 17:13:35 +0200
commit801e8b43b13f1cb67d9e9ba4aae5acb274ccdfbc (patch)
tree473f4a9ea5016f146fb2ff6085807bc91a84c84e /ui/small_dlgs.cpp
parent3.20 (diff)
downloadFreeFileSync-801e8b43b13f1cb67d9e9ba4aae5acb274ccdfbc.tar.gz
FreeFileSync-801e8b43b13f1cb67d9e9ba4aae5acb274ccdfbc.tar.bz2
FreeFileSync-801e8b43b13f1cb67d9e9ba4aae5acb274ccdfbc.zip
3.21
Diffstat (limited to 'ui/small_dlgs.cpp')
-rw-r--r--ui/small_dlgs.cpp13
1 files changed, 8 insertions, 5 deletions
diff --git a/ui/small_dlgs.cpp b/ui/small_dlgs.cpp
index ee82bbcc..137b4028 100644
--- a/ui/small_dlgs.cpp
+++ b/ui/small_dlgs.cpp
@@ -892,7 +892,8 @@ GlobalSettingsDlg::GlobalSettingsDlg(wxWindow* parent, xmlAccess::XmlGlobalSetti
m_bpButtonAddRow->SetBitmapLabel(GlobalResources::instance().getImage(wxT("addFolderPair")));
m_bpButtonRemoveRow->SetBitmapLabel(GlobalResources::instance().getImage(wxT("removeFolderPair")));
- m_checkBoxCopyLocked->SetValue(globalSettings.copyLockedFiles);
+ m_checkBoxCopyLocked ->SetValue(globalSettings.copyLockedFiles);
+ m_checkBoxTransCopy ->SetValue(globalSettings.transactionalFileCopy);
m_checkBoxCopyPermissions->SetValue(globalSettings.copyFilePermissions);
#ifndef FFS_WIN
@@ -919,8 +920,9 @@ GlobalSettingsDlg::GlobalSettingsDlg(wxWindow* parent, xmlAccess::XmlGlobalSetti
void GlobalSettingsDlg::OnOkay(wxCommandEvent& event)
{
//write global settings only when okay-button is pressed!
- settings.copyLockedFiles = m_checkBoxCopyLocked->GetValue();
- settings.copyFilePermissions = m_checkBoxCopyPermissions->GetValue();
+ settings.copyLockedFiles = m_checkBoxCopyLocked->GetValue();
+ settings.transactionalFileCopy = m_checkBoxTransCopy->GetValue();
+ settings.copyFilePermissions = m_checkBoxCopyPermissions->GetValue();
settings.gui.externelApplications = getExtApp();
EndModal(ReturnSmallDlg::BUTTON_OKAY);
@@ -939,8 +941,9 @@ void GlobalSettingsDlg::OnDefault(wxCommandEvent& event)
{
xmlAccess::XmlGlobalSettings defaultCfg;
- m_checkBoxCopyLocked-> SetValue(defaultCfg.copyLockedFiles);
- m_checkBoxCopyPermissions->SetValue(defaultCfg.copyFilePermissions);
+ m_checkBoxCopyLocked ->SetValue(defaultCfg.copyLockedFiles);
+ m_checkBoxTransCopy ->SetValue(defaultCfg.transactionalFileCopy);
+ m_checkBoxCopyPermissions->SetValue(defaultCfg.copyFilePermissions);
set(defaultCfg.gui.externelApplications);
}
bgstack15