From 951ac79a68b652331654346f06a83715bb3810ad Mon Sep 17 00:00:00 2001 From: Klaas Freitag Date: Thu, 28 Nov 2013 10:57:49 +0100 Subject: Destinguish between rename and move in wording. --- src/mirall/folder.cpp | 12 +++++++++++- src/mirall/protocolwidget.cpp | 1 - 2 files changed, 11 insertions(+), 2 deletions(-) diff --git a/src/mirall/folder.cpp b/src/mirall/folder.cpp index a769bfa28..55920968a 100644 --- a/src/mirall/folder.cpp +++ b/src/mirall/folder.cpp @@ -386,7 +386,17 @@ void Folder::bubbleUpSyncResult() createGuiLog( firstItemNew._file, tr("downloaded"), newItems ); createGuiLog( firstItemDeleted._file, tr("removed"), removedItems ); createGuiLog( firstItemUpdated._file, tr("updated"), updatedItems ); - createGuiLog( firstItemRenamed._file, tr("renamed"), renamedItems ); + + if( !firstItemRenamed.isEmpty() ) { + QString renameVerb = tr("renamed"); + // if the path changes it's rather a move + QDir renTarget = QFileInfo(firstItemRenamed._renameTarget).dir(); + QDir renSource = QFileInfo(firstItemRenamed._file).dir(); + if(renTarget != renSource) { + renameVerb = tr("moved"); + } + createGuiLog( firstItemRenamed._file, tr("%1 to %2").arg(renameVerb).arg(firstItemRenamed._renameTarget), renamedItems ); + } qDebug() << "OO folder slotSyncFinished: result: " << int(_syncResult.status()); } diff --git a/src/mirall/protocolwidget.cpp b/src/mirall/protocolwidget.cpp index b69a8cb58..d5f249d4b 100644 --- a/src/mirall/protocolwidget.cpp +++ b/src/mirall/protocolwidget.cpp @@ -231,7 +231,6 @@ QTreeWidgetItem* ProtocolWidget::createProgressTreewidgetItem( const Progress::I item->setToolTip(0, longTimeStr); return item; - } void ProtocolWidget::slotProgressInfo( const QString& folder, const Progress::Info& progress ) -- cgit v1.2.3