diff --git a/src/mirall/csyncthread.cpp b/src/mirall/csyncthread.cpp index 6a79a7500..a471cc6b9 100644 --- a/src/mirall/csyncthread.cpp +++ b/src/mirall/csyncthread.cpp @@ -233,6 +233,20 @@ int CSyncThread::treewalkFile( TREE_WALK_FILE *file, bool remote ) break; } + switch( file->type ) { + case CSYNC_FTW_TYPE_DIR: + item._type = SyncFileItem::Directory; + break; + case CSYNC_FTW_TYPE_FILE: + item._type = SyncFileItem::File; + break; + case CSYNC_FTW_TYPE_SLINK: + item._type = SyncFileItem::SoftLink; + break; + default: + item._type = SyncFileItem::UnknownType; + } + item._dir = dir; _mutex.lock(); _syncedItems.append(item); diff --git a/src/mirall/itemprogressdialog.cpp b/src/mirall/itemprogressdialog.cpp index 75c0b8d85..4b2e73166 100644 --- a/src/mirall/itemprogressdialog.cpp +++ b/src/mirall/itemprogressdialog.cpp @@ -139,20 +139,29 @@ void ItemProgressDialog::setSyncResult( const SyncResult& result ) for (i = items.begin(); i != items.end(); ++i) { const SyncFileItem& item = *i; + QString errMsg; if( item._instruction == CSYNC_INSTRUCTION_IGNORE ) { QStringList columns; QString timeStr = QTime::currentTime().toString("hh:mm"); columns << timeStr; columns << item._file; - QString errMsg = tr("File ignored."); + if( item._type == SyncFileItem::File ) { + errMsg = tr("File ignored."); + } else if( item._type == SyncFileItem::Directory ){ + errMsg = tr("Directory ignored."); + } else if( item._type == SyncFileItem::SoftLink ) { + errMsg = tr("Soft Link ignored."); + } else { + errMsg = tr("Ignored."); + } columns << errMsg; - QTreeWidgetItem *item = new QTreeWidgetItem(folderItem, columns); - item->setData(0, ErrorIndicatorRole, QVariant(true) ); - item->setIcon(0, Theme::instance()->syncStateIcon(SyncResult::Problem, true)); + QTreeWidgetItem *twitem = new QTreeWidgetItem(folderItem, columns); + twitem->setData(0, ErrorIndicatorRole, QVariant(true) ); + twitem->setIcon(0, Theme::instance()->syncStateIcon(SyncResult::Problem, true)); - Q_UNUSED(item); + Q_UNUSED(twitem); } } } diff --git a/src/mirall/syncfileitem.h b/src/mirall/syncfileitem.h index d3ef2b1f3..411882e78 100644 --- a/src/mirall/syncfileitem.h +++ b/src/mirall/syncfileitem.h @@ -11,9 +11,16 @@ namespace Mirall { class SyncFileItem { public: typedef enum { - None = 0, - Up, - Down } Direction; + None = 0, + Up, + Down } Direction; + + typedef enum { + UnknownType, + File, + Directory, + SoftLink + } Type; SyncFileItem() {} @@ -30,6 +37,7 @@ public: QString _renameTarget; csync_instructions_e _instruction; Direction _dir; + Type _type; }; typedef QVector SyncFileItemVector;