diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:11:09 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:11:09 +0200 |
| commit | 9cc790869ed3905c78c7eeeb0bb44f800b3f2af4 (patch) | |
| tree | 1c085bbf2302be294866c4fc6e0d225f8abbc346 /ui/batch_config.cpp | |
| parent | 3.14 (diff) | |
| download | FreeFileSync-9cc790869ed3905c78c7eeeb0bb44f800b3f2af4.tar.gz FreeFileSync-9cc790869ed3905c78c7eeeb0bb44f800b3f2af4.tar.bz2 FreeFileSync-9cc790869ed3905c78c7eeeb0bb44f800b3f2af4.zip | |
3.15
Diffstat (limited to 'ui/batch_config.cpp')
| -rw-r--r-- | ui/batch_config.cpp | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/ui/batch_config.cpp b/ui/batch_config.cpp index 5630d000..ca489916 100644 --- a/ui/batch_config.cpp +++ b/ui/batch_config.cpp @@ -6,6 +6,7 @@ // #include "batch_config.h" #include "../shared/xml_base.h" +#include "../shared/dir_picker_i18n.h" #include "folder_pair.h" #include <iterator> #include <wx/wupdlock.h> @@ -140,8 +141,8 @@ public: DirectoryPairBatch(wxWindow* parent, BatchDialog& batchDialog) : BatchFolderPairGenerated(parent), FolderPairCallback<BatchFolderPairGenerated>(static_cast<BatchFolderPairGenerated&>(*this), batchDialog), //pass BatchFolderPairGenerated part... - dirNameLeft( m_panelLeft, m_dirPickerLeft, m_directoryLeft), - dirNameRight(m_panelRight, m_dirPickerRight, m_directoryRight) {} + dirNameLeft (*m_panelLeft, *m_dirPickerLeft, *m_directoryLeft), + dirNameRight(*m_panelRight, *m_dirPickerRight, *m_directoryRight) {} void setValues(const Zstring& leftDir, const Zstring& rightDir, AltSyncCfgPtr syncCfg, const FilterConfig& filter) { @@ -172,12 +173,12 @@ public: FolderPairCallback<BatchDlgGenerated>(batchDialog, batchDialog), //prepare drag & drop - dirNameLeft(batchDialog.m_panelLeft, - batchDialog.m_dirPickerLeft, - batchDialog.m_directoryLeft), - dirNameRight(batchDialog.m_panelRight, - batchDialog.m_dirPickerRight, - batchDialog.m_directoryRight) {} + dirNameLeft(*batchDialog.m_panelLeft, + *batchDialog.m_dirPickerLeft, + *batchDialog.m_directoryLeft), + dirNameRight(*batchDialog.m_panelRight, + *batchDialog.m_dirPickerRight, + *batchDialog.m_directoryRight) {} void setValues(const Zstring& leftDir, const Zstring& rightDir, AltSyncCfgPtr syncCfg, const FilterConfig& filter) { @@ -247,7 +248,7 @@ void BatchDialog::init() //prepare drag & drop for loading of *.ffs_batch files SetDropTarget(new BatchFileDropEvent(*this)); - logfileDir.reset(new DirectoryName(m_panelLogging, m_dirPickerLogfileDir, m_textCtrlLogfileDir)); + logfileDir.reset(new DirectoryName(*m_panelLogging, *m_dirPickerLogfileDir, *m_textCtrlLogfileDir, sbSizerLogfileDir)); //set icons for this dialog m_bpButtonAddPair->SetBitmapLabel(GlobalResources::instance().getImage(wxT("addFolderPair"))); @@ -628,13 +629,13 @@ void BatchDialog::loadBatchCfg(const xmlAccess::XmlBatchConfig& batchCfg) //make working copy localBatchCfg = batchCfg; - logfileDir->setName(wxToZ(batchCfg.logFileDirectory)); - m_spinCtrlLogCountMax->SetValue(static_cast<int>(batchCfg.logFileCountMax)); - m_checkBoxSilent->SetValue(batchCfg.silent); //error handling is dependent from m_checkBoxSilent! /|\ \|/ setSelectionHandleError(batchCfg.handleError); + logfileDir->setName(wxToZ(batchCfg.logFileDirectory)); + m_spinCtrlLogCountMax->SetValue(static_cast<int>(batchCfg.logFileCountMax)); //attention: this one emits a "change value" event!! => updateGui() called implicitly! + //set first folder pair firstFolderPair->setValues(batchCfg.mainCfg.firstPair.leftDirectory, batchCfg.mainCfg.firstPair.rightDirectory, |