Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/owncloud/client.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKlaas Freitag <freitag@owncloud.com>2013-11-25 19:17:29 +0400
committerKlaas Freitag <freitag@owncloud.com>2013-11-25 19:18:07 +0400
commit2e4043b49850b793bb7687580f019c65f9b07e7b (patch)
treed3ca8d65d173e20635a8714566168d9695cae45b /src
parentdc29046d618dece67c90f5a0b7a993689d95d60c (diff)
Show proper error message and icon according to error class.
Diffstat (limited to 'src')
-rw-r--r--src/mirall/protocolwidget.cpp8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/mirall/protocolwidget.cpp b/src/mirall/protocolwidget.cpp
index f88e5d7ba..532882dbc 100644
--- a/src/mirall/protocolwidget.cpp
+++ b/src/mirall/protocolwidget.cpp
@@ -290,7 +290,7 @@ void ProtocolWidget::slotProgressProblem( const QString& folder, const Progress:
columns << timeStr;
columns << problem.current_file;
columns << folder;
- QString errMsg = tr("Problem: %1").arg(problem.error_message);
+ QString errMsg = problem.error_message;
#if 0
if( problem.error_code == 507 ) {
errMsg = tr("No more storage space available on server.");
@@ -302,7 +302,11 @@ void ProtocolWidget::slotProgressProblem( const QString& folder, const Progress:
item->setData(0, ErrorIndicatorRole, QVariant(true) );
// Maybe we should not set the error icon for all problems but distinguish
// by error_code. A quota problem is considered an error, others might not??
- item->setIcon(0, Theme::instance()->syncStateIcon(SyncResult::Error, true));
+ if( problem.kind == Progress::SoftError ) {
+ item->setIcon(0, Theme::instance()->syncStateIcon(SyncResult::Problem, true));
+ } else {
+ item->setIcon(0, Theme::instance()->syncStateIcon(SyncResult::Error, true));
+ }
item->setToolTip(0, longTimeStr);
_ui->_treeWidget->insertTopLevelItem(0, item);
Q_UNUSED(item);