[Pkg-owncloud-commits] [owncloud-client] 22/89: Display rename-target in sync protocol action column.

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 41d54459802be35f52e11879732f3758cc330946
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Fri Dec 6 15:07:25 2013 +0100

    Display rename-target in sync protocol action column.
---
 src/mirall/csyncthread.cpp        | 1 +
 src/mirall/owncloudgui.cpp        | 2 +-
 src/mirall/progressdispatcher.cpp | 8 ++++----
 src/mirall/progressdispatcher.h   | 4 +++-
 src/mirall/protocolwidget.cpp     | 2 +-
 5 files changed, 10 insertions(+), 7 deletions(-)

diff --git a/src/mirall/csyncthread.cpp b/src/mirall/csyncthread.cpp
index 3f8fb6b..7e7a2a6 100644
--- a/src/mirall/csyncthread.cpp
+++ b/src/mirall/csyncthread.cpp
@@ -662,6 +662,7 @@ void CSyncThread::slotProgress(Progress::Kind kind, const SyncFileItem& item, qu
     Progress::Info pInfo(_progressInfo);
     pInfo.kind                  = kind;
     pInfo.current_file          = item._file;
+    pInfo.rename_target         = item._renameTarget;
     pInfo.file_size             = total;
     pInfo.current_file_bytes    = curr;
     pInfo.current_file_no       = _currentFileNo;
diff --git a/src/mirall/owncloudgui.cpp b/src/mirall/owncloudgui.cpp
index ad10da2..47e07f1 100644
--- a/src/mirall/owncloudgui.cpp
+++ b/src/mirall/owncloudgui.cpp
@@ -404,7 +404,7 @@ void ownCloudGui::slotRebuildRecentMenus()
 
         while(i.hasNext()) {
             Progress::Info info = i.next();
-            QString kindStr = Progress::asResultString(info.kind);
+            QString kindStr = Progress::asResultString(info);
             QString timeStr = info.timestamp.toString("hh:mm");
 
             QString actionText = tr("%1 (%2, %3)").arg(info.current_file).arg(kindStr).arg(timeStr);
diff --git a/src/mirall/progressdispatcher.cpp b/src/mirall/progressdispatcher.cpp
index f7aea43..4b5a6d9 100644
--- a/src/mirall/progressdispatcher.cpp
+++ b/src/mirall/progressdispatcher.cpp
@@ -21,11 +21,11 @@
 namespace Mirall {
 
 ProgressDispatcher* ProgressDispatcher::_instance = 0;
-QString Progress::asResultString( Kind kind )
+QString Progress::asResultString( const Progress::Info& progress)
 {
     QString re;
 
-    switch(kind) {
+    switch(progress.kind) {
     case Download:
     case EndDownload:
         re = QCoreApplication::translate( "progress", "Download");
@@ -59,10 +59,10 @@ QString Progress::asResultString( Kind kind )
         re = QCoreApplication::translate( "progress", "deleted");
         break;
     case StartRename:
-        re = QCoreApplication::translate( "progress", "Move");
+        re = QCoreApplication::translate( "progress", "Moved to %1").arg(progress.rename_target);
         break;
     case EndRename:
-        re = QCoreApplication::translate( "progress", "Move");
+        re = QCoreApplication::translate( "progress", "Moved to %1").arg(progress.rename_target);
         break;
     default:
         Q_ASSERT(false);
diff --git a/src/mirall/progressdispatcher.h b/src/mirall/progressdispatcher.h
index 12a2dc1..2b6a597 100644
--- a/src/mirall/progressdispatcher.h
+++ b/src/mirall/progressdispatcher.h
@@ -53,6 +53,8 @@ namespace Progress
         Kind    kind;
         QString folder;
         QString current_file;
+        QString rename_target;
+
         qint64  file_size;
         qint64  current_file_bytes;
 
@@ -80,7 +82,7 @@ namespace Progress
     };
 
     QString asActionString( Kind );
-    QString asResultString( Kind );
+    QString asResultString(  const Progress::Info& progress );
 
     bool isErrorKind( Kind );
 }
diff --git a/src/mirall/protocolwidget.cpp b/src/mirall/protocolwidget.cpp
index 673dcee..b132b16 100644
--- a/src/mirall/protocolwidget.cpp
+++ b/src/mirall/protocolwidget.cpp
@@ -256,7 +256,7 @@ QTreeWidgetItem* ProtocolWidget::createProgressTreewidgetItem( const Progress::I
     columns << timeStr;
     columns << progress.current_file;
     columns << progress.folder;
-    columns << Progress::asResultString(progress.kind);
+    columns << Progress::asResultString(progress);
     columns << Utility::octetsToString( progress.file_size );
 
     QTreeWidgetItem *item = new QTreeWidgetItem(columns);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git