diff options
author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 16:57:03 +0200 |
---|---|---|
committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 16:57:03 +0200 |
commit | 420fb6c9b3427f65cfe24411944ee46b58cfcfb4 (patch) | |
tree | 58269ba5ee7a22d2df004f03b100cc234b8c3f14 /ui/SyncDialog.cpp | |
parent | 1.16 (diff) | |
download | FreeFileSync-420fb6c9b3427f65cfe24411944ee46b58cfcfb4.tar.gz FreeFileSync-420fb6c9b3427f65cfe24411944ee46b58cfcfb4.tar.bz2 FreeFileSync-420fb6c9b3427f65cfe24411944ee46b58cfcfb4.zip |
1.17
Diffstat (limited to 'ui/SyncDialog.cpp')
-rw-r--r-- | ui/SyncDialog.cpp | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/ui/SyncDialog.cpp b/ui/SyncDialog.cpp index 99c7dfde..fe36d751 100644 --- a/ui/SyncDialog.cpp +++ b/ui/SyncDialog.cpp @@ -207,15 +207,11 @@ void SyncDialog::calculatePreview() objectsToDelete, dataToProcess); - wxString toCreate = globalFunctions::numberToWxString(objectsToCreate); - wxString toUpdate = globalFunctions::numberToWxString(objectsToOverwrite); - wxString toDelete = globalFunctions::numberToWxString(objectsToDelete); + wxString toCreate = globalFunctions::includeNumberSeparator(globalFunctions::numberToWxString(objectsToCreate)); + wxString toUpdate = globalFunctions::includeNumberSeparator(globalFunctions::numberToWxString(objectsToOverwrite)); + wxString toDelete = globalFunctions::includeNumberSeparator(globalFunctions::numberToWxString(objectsToDelete)); wxString data = FreeFileSync::formatFilesizeToShortString(dataToProcess); - globalFunctions::includeNumberSeparator(toCreate); - globalFunctions::includeNumberSeparator(toUpdate); - globalFunctions::includeNumberSeparator(toDelete); - m_textCtrlCreate->SetValue(toCreate); m_textCtrlUpdate->SetValue(toUpdate); m_textCtrlDelete->SetValue(toDelete); @@ -629,7 +625,7 @@ void BatchDialog::OnSaveBatchJob(wxCommandEvent& event) if (filePicker->ShowModal() == wxID_OK) { fileName = filePicker->GetPath(); - if (wxFileExists(fileName)) + if (FreeFileSync::fileExists(fileName.c_str())) { wxMessageDialog* messageDlg = new wxMessageDialog(this, wxString(_("File already exists. Overwrite?")) + wxT(" \"") + fileName + wxT("\""), _("Warning") , wxOK | wxCANCEL); |