diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:21:41 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:21:41 +0200 |
| commit | d6301fca6b78db52d0d98f8e0799aba175ad2e59 (patch) | |
| tree | 0380aac034e0d70ee058db07900d80ff20cfc81e /ui/batch_config.cpp | |
| parent | 5.7 (diff) | |
| download | FreeFileSync-d6301fca6b78db52d0d98f8e0799aba175ad2e59.tar.gz FreeFileSync-d6301fca6b78db52d0d98f8e0799aba175ad2e59.tar.bz2 FreeFileSync-d6301fca6b78db52d0d98f8e0799aba175ad2e59.zip | |
5.8
Diffstat (limited to 'ui/batch_config.cpp')
| -rw-r--r-- | ui/batch_config.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/ui/batch_config.cpp b/ui/batch_config.cpp index c6d50bd2..f07dbc07 100644 --- a/ui/batch_config.cpp +++ b/ui/batch_config.cpp @@ -1,7 +1,7 @@ // ************************************************************************** // * This file is part of the FreeFileSync project. It is distributed under * // * GNU General Public License: http://www.gnu.org/licenses/gpl.html * -// * Copyright (C) ZenJu (zenju AT gmx DOT de) - All Rights Reserved * +// * Copyright (C) Zenju (zenju AT gmx DOT de) - All Rights Reserved * // ************************************************************************** #include "batch_config.h" @@ -252,7 +252,7 @@ BatchDialog::BatchDialog(wxWindow* parent, logfileDir.reset(new DirectoryName<FolderHistoryBox>(*m_panelBatchSettings, *m_buttonSelectLogfileDir, *m_comboBoxLogfileDir)); //set icons for this dialog - m_bpButtonAddPair->SetBitmapLabel(GlobalResources::getImage(L"addFolderPair")); + m_bpButtonAddPair->SetBitmapLabel(GlobalResources::getImage(L"item_add")); m_bitmap27->SetBitmap(GlobalResources::getImage(L"batch")); m_buttonSave->SetFocus(); @@ -551,7 +551,7 @@ void BatchDialog::loadBatchFile(const std::vector<wxString>& filenames) try { //open a *.ffs_gui or *.ffs_batch file! - convertConfig(toZ(filenames), batchCfg); //throw FfsXmlError + mergeConfigs(toZ(filenames), batchCfg); //throw FfsXmlError //readConfig(filename, batchCfg); } |