Activity: Set a message for conflicts. #2792

Also show size when conflicting files are downloaded.

diff --git a/src/gui/protocolwidget.cpp b/src/gui/protocolwidget.cpp
index baab6191f19a64c3010b156909f6e1e9255c9743..c4b942b0904e4dc513ee347ad6582f47ea0c9653 100644 (file)
--- a/src/gui/protocolwidget.cpp
+++ b/src/gui/protocolwidget.cpp
@@ -201,33 +201,28 @@ QTreeWidgetItem* ProtocolWidget::createCompletedTreewidgetItem(const QString& fo
     QDateTime timestamp = QDateTime::currentDateTime();
     const QString timeStr = timeString(timestamp);
     const QString longTimeStr = timeString(timestamp, QLocale::LongFormat);
-    QIcon icon;
-    QString message;
 
     columns << timeStr;
     columns << fixupFilename(item._file);
     columns << folder;
-    if (Progress::isWarningKind(item._status)) {
-        message= item._errorString;
-        columns << message;
-        if (item._status == SyncFileItem::NormalError || item._status == SyncFileItem::FatalError) {
-            icon = Theme::instance()->syncStateIcon(SyncResult::Error);
-        } else {
-            icon = Theme::instance()->syncStateIcon(SyncResult::Problem);
-        }
 
-    } else {
-        // if the error string is set, it's prefered because it is a usefull user message.
-        // at least should be...
-        if(item._errorString.isEmpty()) {
-            message = Progress::asResultString(item);
-        } else {
-            message = item._errorString;
-        }
-        columns << message;
-        if (Progress::isSizeDependent(item._instruction)) {
-            columns <<  Utility::octetsToString( item._size );
-        }
+    // If the error string is set, it's prefered because it is a useful user message.
+    QString message = item._errorString;
+    if (message.isEmpty()) {
+        message = Progress::asResultString(item);
+    }
+    columns << message;
+
+    QIcon icon;
+    if (item._status == SyncFileItem::NormalError
+            || item._status == SyncFileItem::FatalError) {
+        icon = Theme::instance()->syncStateIcon(SyncResult::Error);
+    } else if (Progress::isWarningKind(item._status)) {
+        icon = Theme::instance()->syncStateIcon(SyncResult::Problem);
+    }
+
+    if (Progress::isSizeDependent(item._instruction)) {
+        columns << Utility::octetsToString( item._size );
     }
 
     QTreeWidgetItem *twitem = new QTreeWidgetItem(columns);

diff --git a/src/libsync/progressdispatcher.cpp b/src/libsync/progressdispatcher.cpp
index b2950d9e620049a0eeb014588703dc3159dbca4a..dc6b9d962fc582eae721eb9341420a49f992a94a 100644 (file)
--- a/src/libsync/progressdispatcher.cpp
+++ b/src/libsync/progressdispatcher.cpp
@@ -25,7 +25,6 @@ ProgressDispatcher* ProgressDispatcher::_instance = 0;
 QString Progress::asResultString( const SyncFileItem& item)
 {
     switch(item._instruction) {
-    case CSYNC_INSTRUCTION_CONFLICT:
     case CSYNC_INSTRUCTION_SYNC:
     case CSYNC_INSTRUCTION_NEW:
         if (item._direction != SyncFileItem::Up) {
@@ -33,6 +32,8 @@ QString Progress::asResultString( const SyncFileItem& item)
         } else {
             return QCoreApplication::translate( "progress", "Uploaded");
         }
+    case CSYNC_INSTRUCTION_CONFLICT:
+        return QCoreApplication::translate( "progress", "Downloaded, renamed conflicting file");
     case CSYNC_INSTRUCTION_REMOVE:
         return QCoreApplication::translate( "progress", "Deleted");
     case CSYNC_INSTRUCTION_EVAL_RENAME: