"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/gui/protocolwidget.cpp" between
ownCloud-2.9.0.5150.tar.xz and ownCloud-2.9.1.5500.tar.xz

About: ownCloud Client (formerly "mirall") is a tool to synchronize files from ownCloud Server with your desktop client. It uses OCSync as its syncing backend.

protocolwidget.cpp  (ownCloud-2.9.0.5150.tar.xz):protocolwidget.cpp  (ownCloud-2.9.1.5500.tar.xz)
skipping to change at line 51 skipping to change at line 51
: QWidget(parent) : QWidget(parent)
, _ui(new Ui::ProtocolWidget) , _ui(new Ui::ProtocolWidget)
{ {
_ui->setupUi(this); _ui->setupUi(this);
connect(ProgressDispatcher::instance(), &ProgressDispatcher::itemCompleted, connect(ProgressDispatcher::instance(), &ProgressDispatcher::itemCompleted,
this, &ProtocolWidget::slotItemCompleted); this, &ProtocolWidget::slotItemCompleted);
connect(_ui->_tableView, &QTreeWidget::customContextMenuRequested, this, &Pr otocolWidget::slotItemContextMenu); connect(_ui->_tableView, &QTreeWidget::customContextMenuRequested, this, &Pr otocolWidget::slotItemContextMenu);
_model = new ProtocolItemModel(this); _model = new ProtocolItemModel(2000, false, this);
_sortModel = new QSortFilterProxyModel(this); _sortModel = new QSortFilterProxyModel(this);
_sortModel->setSourceModel(_model); _sortModel->setSourceModel(_model);
_sortModel->setSortRole(Models::UnderlyingDataRole); _sortModel->setSortRole(Models::UnderlyingDataRole);
_ui->_tableView->setModel(_sortModel); _ui->_tableView->setModel(_sortModel);
auto header = new ExpandingHeaderView(QStringLiteral("ActivityListHeaderV2") , _ui->_tableView); auto header = new ExpandingHeaderView(QStringLiteral("ActivityListHeaderV2") , _ui->_tableView);
_ui->_tableView->setHorizontalHeader(header); _ui->_tableView->setHorizontalHeader(header);
header->setSectionResizeMode(QHeaderView::Interactive); header->setSectionResizeMode(QHeaderView::Interactive);
header->setExpandingColumn(static_cast<int>(ProtocolItemModel::ProtocolItemR ole::File)); header->setExpandingColumn(static_cast<int>(ProtocolItemModel::ProtocolItemR ole::File));
header->setSortIndicator(static_cast<int>(ProtocolItemModel::ProtocolItemRol e::Time), Qt::DescendingOrder); header->setSortIndicator(static_cast<int>(ProtocolItemModel::ProtocolItemRol e::Time), Qt::DescendingOrder);
header->hideSection(static_cast<int>(ProtocolItemModel::ProtocolItemRole::St atus));
header->setContextMenuPolicy(Qt::CustomContextMenu); header->setContextMenuPolicy(Qt::CustomContextMenu);
connect(header, &QHeaderView::customContextMenuRequested, header, [header, t his] { connect(header, &QHeaderView::customContextMenuRequested, header, [header, t his] {
showHeaderContextMenu(header, _sortModel); showHeaderContextMenu(header, _sortModel);
}); });
connect(FolderMan::instance(), &FolderMan::folderRemoved, this, [this](Folde r *f) { connect(FolderMan::instance(), &FolderMan::folderRemoved, this, [this](Folde r *f) {
_model->remove_if([f](const ProtocolItem &item) { _model->remove_if([f](const ProtocolItem &item) {
return item.folder() == f; return item.folder() == f;
}); });
}); });
skipping to change at line 126 skipping to change at line 127
} }
}); });
} }
{ {
switch (data.status()) { switch (data.status()) {
case SyncFileItem::DetailError: case SyncFileItem::DetailError:
Q_FALLTHROUGH(); Q_FALLTHROUGH();
case SyncFileItem::SoftError: case SyncFileItem::SoftError:
Q_FALLTHROUGH(); Q_FALLTHROUGH();
case SyncFileItem::BlacklistedError: case SyncFileItem::BlacklistedError:
menu->addAction(tr("Retry sync"), parent, [&data] { menu->addAction(tr("Retry sync"), parent, [data, folder = QP
data.folder()->journalDb()->wipeErrorBlacklistEntry(data ointer<Folder>(data.folder())] {
.path()); if (folder) {
FolderMan::instance()->scheduleFolderNext(data.folder()) folder->journalDb()->wipeErrorBlacklistEntry(data.pa
; th());
FolderMan::instance()->scheduleFolderNext(folder);
}
}); });
default: default:
break; break;
} }
} }
} }
} }
menu->popup(QCursor::pos()); menu->popup(QCursor::pos());
} }
 End of changes. 3 change blocks. 
6 lines changed or deleted 9 lines changed or added

Home  |  About  |  Features  |  All  |  Newest  |  Dox  |  Diffs  |  RSS Feeds  |  Screenshots  |  Comments  |  Imprint  |  Privacy  |  HTTP(S)