mirrors/nextcloud-desktop
1
0
Fork 0
mirror of https://github.com/nextcloud/desktop.git synced 2024-11-23 21:46:03 +03:00
Code Issues Projects Releases Packages Wiki Activity

Show a more informative problem message in progress.

Browse source
This commit is contained in:
Klaas Freitag 2013-08-07 12:15:28 +02:00
parent 6226a6ee8f
commit 364d4340fd
3 changed files with 39 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
src/mirall/csyncthread.cpp
View file

@ -233,6 +233,20 @@ int CSyncThread::treewalkFile( TREE_WALK_FILE *file, bool remote )
break; 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; item._dir = dir;
_mutex.lock(); _mutex.lock();
_syncedItems.append(item); _syncedItems.append(item);

19
src/mirall/itemprogressdialog.cpp
View file

@ -139,20 +139,29 @@ void ItemProgressDialog::setSyncResult( const SyncResult& result )
for (i = items.begin(); i != items.end(); ++i) { for (i = items.begin(); i != items.end(); ++i) {
const SyncFileItem& item = *i; const SyncFileItem& item = *i;
QString errMsg;
if( item._instruction == CSYNC_INSTRUCTION_IGNORE ) { if( item._instruction == CSYNC_INSTRUCTION_IGNORE ) {
QStringList columns; QStringList columns;
QString timeStr = QTime::currentTime().toString("hh:mm"); QString timeStr = QTime::currentTime().toString("hh:mm");
columns << timeStr; columns << timeStr;
columns << item._file; 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; columns << errMsg;
QTreeWidgetItem *item = new QTreeWidgetItem(folderItem, columns); QTreeWidgetItem *twitem = new QTreeWidgetItem(folderItem, columns);
item->setData(0, ErrorIndicatorRole, QVariant(true) ); twitem->setData(0, ErrorIndicatorRole, QVariant(true) );
item->setIcon(0, Theme::instance()->syncStateIcon(SyncResult::Problem, true)); twitem->setIcon(0, Theme::instance()->syncStateIcon(SyncResult::Problem, true));
Q_UNUSED(item); Q_UNUSED(twitem);
} }
} }
} }

14
src/mirall/syncfileitem.h
View file

@ -11,9 +11,16 @@ namespace Mirall {
class SyncFileItem { class SyncFileItem {
public: public:
typedef enum { typedef enum {
None = 0, None = 0,
Up, Up,
Down } Direction; Down } Direction;
typedef enum {
UnknownType,
File,
Directory,
SoftLink
} Type;
SyncFileItem() {} SyncFileItem() {}
@ -30,6 +37,7 @@ public:
QString _renameTarget; QString _renameTarget;
csync_instructions_e _instruction; csync_instructions_e _instruction;
Direction _dir; Direction _dir;
Type _type;
}; };
typedef QVector<SyncFileItem> SyncFileItemVector; typedef QVector<SyncFileItem> SyncFileItemVector;