diff options
| author | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:01:29 +0200 |
|---|---|---|
| committer | Daniel Wilhelm <daniel@wili.li> | 2014-04-18 17:01:29 +0200 |
| commit | 9a2a524f1e311853d08050be2dcdddc09ac7759a (patch) | |
| tree | d8e4a24169fce88c2d89931d58514889a0bcb0ea /ui/guiStatusHandler.cpp | |
| parent | 2.3 (diff) | |
| download | FreeFileSync-9a2a524f1e311853d08050be2dcdddc09ac7759a.tar.gz FreeFileSync-9a2a524f1e311853d08050be2dcdddc09ac7759a.tar.bz2 FreeFileSync-9a2a524f1e311853d08050be2dcdddc09ac7759a.zip | |
3.0
Diffstat (limited to 'ui/guiStatusHandler.cpp')
| -rw-r--r-- | ui/guiStatusHandler.cpp | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/ui/guiStatusHandler.cpp b/ui/guiStatusHandler.cpp index 4e69b66e..c4c98a85 100644 --- a/ui/guiStatusHandler.cpp +++ b/ui/guiStatusHandler.cpp @@ -7,9 +7,9 @@ CompareStatusHandler::CompareStatusHandler(MainDialog* dlg) : - mainDialog(dlg), - ignoreErrors(false), - currentProcess(StatusHandler::PROCESS_NONE) + mainDialog(dlg), + ignoreErrors(false), + currentProcess(StatusHandler::PROCESS_NONE) { wxWindowUpdateLocker dummy(mainDialog); //avoid display distortion @@ -189,7 +189,7 @@ void CompareStatusHandler::abortThisProcess() SyncStatusHandler::SyncStatusHandler(wxWindow* dlg, bool ignoreAllErrors) : - ignoreErrors(ignoreAllErrors) + ignoreErrors(ignoreAllErrors) { syncStatusFrame = new SyncStatus(this, dlg); syncStatusFrame->Show(); @@ -224,20 +224,17 @@ SyncStatusHandler::~SyncStatusHandler() if (abortIsRequested()) { result += wxString(_("Synchronization aborted!")) + wxT(" ") + _("You may try to synchronize remaining items again (WITHOUT having to re-compare)!"); - syncStatusFrame->setStatusText_NoUpdate(result.c_str()); - syncStatusFrame->processHasFinished(SyncStatus::ABORTED); //enable okay and close events + syncStatusFrame->processHasFinished(SyncStatus::ABORTED, result); //enable okay and close events } else if (errorLog.errorsTotal() > 0) { result += wxString(_("Synchronization completed with errors!")) + wxT(" ") + _("You may try to synchronize remaining items again (WITHOUT having to re-compare)!"); - syncStatusFrame->setStatusText_NoUpdate(result.c_str()); - syncStatusFrame->processHasFinished(SyncStatus::FINISHED_WITH_ERROR); + syncStatusFrame->processHasFinished(SyncStatus::FINISHED_WITH_ERROR, result); } else { result += _("Synchronization completed successfully!"); - syncStatusFrame->setStatusText_NoUpdate(result.c_str()); - syncStatusFrame->processHasFinished(SyncStatus::FINISHED_WITH_SUCCESS); + syncStatusFrame->processHasFinished(SyncStatus::FINISHED_WITH_SUCCESS, result); } } |