diff options
author | Klaas Freitag <freitag@owncloud.com> | 2013-11-25 19:12:25 +0400 |
---|---|---|
committer | Klaas Freitag <freitag@owncloud.com> | 2013-11-25 19:18:07 +0400 |
commit | 1a3f246c46ea88935a92cf4af82ffb1c555c2998 (patch) | |
tree | 53315ca6581f72ded20e2bae3a9a2692d25ea147 /src | |
parent | ad6c42b031977f2ff1d16b5fd80919aca43f182c (diff) |
Add new Error Types to progress: Soft, Normal, Fatal.
Diffstat (limited to 'src')
-rw-r--r-- | src/mirall/accountsettings.cpp | 4 | ||||
-rw-r--r-- | src/mirall/progressdispatcher.cpp | 9 | ||||
-rw-r--r-- | src/mirall/progressdispatcher.h | 4 |
3 files changed, 15 insertions, 2 deletions
diff --git a/src/mirall/accountsettings.cpp b/src/mirall/accountsettings.cpp index f96f079e4..f75b885e1 100644 --- a/src/mirall/accountsettings.cpp +++ b/src/mirall/accountsettings.cpp @@ -672,7 +672,9 @@ void AccountSettings::slotSetProgress(const QString& folder, const Progress::Inf case Progress::Download: case Progress::Upload: case Progress::Inactive: - case Progress::Error: + case Progress::SoftError: + case Progress::NormalError: + case Progress::FatalError: break; } diff --git a/src/mirall/progressdispatcher.cpp b/src/mirall/progressdispatcher.cpp index dfae38644..f5a23f6b8 100644 --- a/src/mirall/progressdispatcher.cpp +++ b/src/mirall/progressdispatcher.cpp @@ -124,6 +124,15 @@ QString Progress::asActionString( Kind kind ) return re; } +bool Progress::isErrorKind( Kind kind ) +{ + bool re = false; + if( kind == SoftError || kind == NormalError || kind == FatalError ) { + re = true; + } + return re; +} + ProgressDispatcher* ProgressDispatcher::instance() { if (!_instance) { _instance = new ProgressDispatcher(); diff --git a/src/mirall/progressdispatcher.h b/src/mirall/progressdispatcher.h index 5848556bc..dbeab03f2 100644 --- a/src/mirall/progressdispatcher.h +++ b/src/mirall/progressdispatcher.h @@ -44,7 +44,9 @@ namespace Progress EndDelete, StartRename, EndRename, - Error + SoftError, + NormalError, + FatalError }; struct Info { |