From 3572e7ffa475f2615a98aa6b66d44edf39a1a45e Mon Sep 17 00:00:00 2001
From: Christian Kamm <mail@ckamm.de>
Date: Wed, 9 Dec 2015 15:49:30 +0100
Subject: [PATCH] Activity: Improve formatting of copied data #3498

---
 src/gui/activitywidget.cpp | 20 ++++++++++++++++----
 src/gui/protocolwidget.cpp | 30 +++++++++++++++++++++++++-----
 2 files changed, 41 insertions(+), 9 deletions(-)

diff --git a/src/gui/activitywidget.cpp b/src/gui/activitywidget.cpp
index 9add476c0..022cba440 100644
--- a/src/gui/activitywidget.cpp
+++ b/src/gui/activitywidget.cpp
@@ -347,19 +347,31 @@ void ActivityWidget::storeActivityList( QTextStream& ts )
     ActivityList activities = _model->activityList();
 
     foreach( Activity activity, activities ) {
-        ts << left
+        ts << right
               // account name
            << qSetFieldWidth(30)
            << activity._accName
+              // separator
+           << qSetFieldWidth(0) << ","
+
               // date and time
            << qSetFieldWidth(34)
            << activity._dateTime.toString()
-              // subject
-           << qSetFieldWidth(10)
-           << activity._subject
+              // separator
+           << qSetFieldWidth(0) << ","
+
               // file
            << qSetFieldWidth(30)
            << activity._file
+              // separator
+           << qSetFieldWidth(0) << ","
+
+              // subject
+           << qSetFieldWidth(100)
+           << activity._subject
+              // separator
+           << qSetFieldWidth(0) << ","
+
               // message (mostly empty)
            << qSetFieldWidth(55)
            << activity._message
diff --git a/src/gui/protocolwidget.cpp b/src/gui/protocolwidget.cpp
index 064de3c78..4aa3161f0 100644
--- a/src/gui/protocolwidget.cpp
+++ b/src/gui/protocolwidget.cpp
@@ -292,19 +292,31 @@ void ProtocolWidget::storeSyncActivity(QTextStream& ts)
 
     for (int i = 0; i < topLevelItems; i++) {
         QTreeWidgetItem *child = _ui->_treeWidget->topLevelItem(i);
-        ts << left
+        ts << right
               // time stamp
-           << qSetFieldWidth(10)
+           << qSetFieldWidth(20)
            << child->data(0,Qt::DisplayRole).toString()
+              // separator
+           << qSetFieldWidth(0) << ","
+
               // file name
            << qSetFieldWidth(64)
            << child->data(1,Qt::DisplayRole).toString()
+              // separator
+           << qSetFieldWidth(0) << ","
+
               // folder
            << qSetFieldWidth(30)
            << child->data(2, Qt::DisplayRole).toString()
+              // separator
+           << qSetFieldWidth(0) << ","
+
               // action
            << qSetFieldWidth(15)
            << child->data(3, Qt::DisplayRole).toString()
+              // separator
+           << qSetFieldWidth(0) << ","
+
               // size
            << qSetFieldWidth(10)
            << child->data(4, Qt::DisplayRole).toString()
@@ -319,20 +331,28 @@ void ProtocolWidget::storeSyncIssues(QTextStream& ts)
 
     for (int i = 0; i < topLevelItems; i++) {
         QTreeWidgetItem *child = _issueItemView->topLevelItem(i);
-        ts << left
+        ts << right
               // time stamp
-           << qSetFieldWidth(10)
+           << qSetFieldWidth(20)
            << child->data(0,Qt::DisplayRole).toString()
+              // separator
+           << qSetFieldWidth(0) << ","
+
               // file name
            << qSetFieldWidth(64)
            << child->data(1,Qt::DisplayRole).toString()
+              // separator
+           << qSetFieldWidth(0) << ","
+
               // folder
            << qSetFieldWidth(30)
            << child->data(2, Qt::DisplayRole).toString()
+              // separator
+           << qSetFieldWidth(0) << ","
+
               // action
            << qSetFieldWidth(15)
            << child->data(3, Qt::DisplayRole).toString()
-
            << qSetFieldWidth(0)
            << endl;
     }
-- 
2.30.2