summaryrefslogtreecommitdiff
path: root/ui/batch_status_handler.h
diff options
context:
space:
mode:
Diffstat (limited to 'ui/batch_status_handler.h')
-rw-r--r--ui/batch_status_handler.h12
1 files changed, 4 insertions, 8 deletions
diff --git a/ui/batch_status_handler.h b/ui/batch_status_handler.h
index 0657e881..cc23019e 100644
--- a/ui/batch_status_handler.h
+++ b/ui/batch_status_handler.h
@@ -14,13 +14,12 @@
#include "switch_to_gui.h"
class LogFile;
-class SyncStatus;
//Exception class used to abort the "compare" and "sync" process
class BatchAbortProcess {};
-class BatchStatusHandler : public StatusHandler
+class BatchStatusHandler : public zen::StatusHandler
{
public:
BatchStatusHandler(bool showProgress, //defines: -start minimized and -quit immediately when finished
@@ -34,10 +33,8 @@ public:
std::vector<std::wstring>& execFinishedHistory);
~BatchStatusHandler();
- virtual void initNewProcess (int objectsTotal, zen::Int64 dataTotal, Process processID);
+ virtual void initNewPhase (int objectsTotal, zen::Int64 dataTotal, Phase phaseID);
virtual void updateProcessedData(int objectsDelta, zen::Int64 dataDelta);
- virtual void updateTotalData (int objectsDelta, zen::Int64 dataDelta);
- virtual void reportStatus(const std::wstring& text);
virtual void reportInfo(const std::wstring& text);
virtual void forceUiRefresh();
@@ -46,18 +43,17 @@ public:
virtual void reportFatalError(const std::wstring& errorMessage);
private:
- virtual void abortThisProcess();
+ virtual void abortThisProcess(); //throw BatchAbortProcess
const zen::SwitchToGui& switchBatchToGui_; //functionality to change from batch mode to GUI mode
bool showFinalResults;
bool switchToGuiRequested;
xmlAccess::OnError handleError_;
zen::ErrorLog errorLog; //list of non-resolved errors and warnings
- Process currentProcess;
int& returnValue;
SyncStatus syncStatusFrame; //the window managed by SyncStatus has longer lifetime than this handler!
- std::shared_ptr<LogFile> logFile; //optional!
+ std::unique_ptr<LogFile> logFile; //optional!
};
bgstack15