Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-02-17 21:34:10 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

Enabled back sorting for Downloads

Browse Source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@3484 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
defnax 2010-09-14 11:37:50 +00:00
parent 671e3e71a6
commit f7635044ae
2 changed files with 35 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
retroshare-gui/src/gui/TransfersDialog.cpp
View File

@ -132,6 +132,12 @@ TransfersDialog::TransfersDialog(QWidget *parent)
_header->resizeSection ( PRIORITY, 100 ); _header->resizeSection ( PRIORITY, 100 );
_header->resizeSection ( REMAINING, 100 ); _header->resizeSection ( REMAINING, 100 );
connect(_header, SIGNAL(sortIndicatorChanged(int, Qt::SortOrder)), this, SLOT(saveSortIndicatorDwl(int, Qt::SortOrder)));
// set default column and sort order for download
_sortColDwl = 0;
_sortOrderDwl = Qt::AscendingOrder;
// Set Upload list model // Set Upload list model
ULListModel = new QStandardItemModel(0,8); ULListModel = new QStandardItemModel(0,8);
ULListModel->setHeaderData(UNAME, Qt::Horizontal, tr("Name", "i.e: file name")); ULListModel->setHeaderData(UNAME, Qt::Horizontal, tr("Name", "i.e: file name"));
@ -154,8 +160,8 @@ TransfersDialog::TransfersDialog(QWidget *parent)
//Selection Setup //Selection Setup
selectionup = ui.uploadsList->selectionModel(); selectionup = ui.uploadsList->selectionModel();
ui.uploadsList->setSelectionMode(QAbstractItemView::ExtendedSelection); ui.uploadsList->setSelectionMode(QAbstractItemView::ExtendedSelection);
/* Set header resize modes and initial section sizes Uploads TreeView*/ /* Set header resize modes and initial section sizes Uploads TreeView*/
QHeaderView * upheader = ui.uploadsList->header () ; QHeaderView * upheader = ui.uploadsList->header () ;
@ -177,6 +183,10 @@ TransfersDialog::TransfersDialog(QWidget *parent)
connect(upheader, SIGNAL(sortIndicatorChanged(int, Qt::SortOrder)), this, SLOT(saveSortIndicatorUpl(int, Qt::SortOrder))); connect(upheader, SIGNAL(sortIndicatorChanged(int, Qt::SortOrder)), this, SLOT(saveSortIndicatorUpl(int, Qt::SortOrder)));
// set default column and sort order for upload
_sortColUpl = 0;
_sortOrderUpl = Qt::AscendingOrder;
FileTransferInfoWidget *ftiw = new FileTransferInfoWidget(); FileTransferInfoWidget *ftiw = new FileTransferInfoWidget();
ui.fileTransferInfoWidget->setWidget(ftiw); ui.fileTransferInfoWidget->setWidget(ftiw);
ui.fileTransferInfoWidget->setWidgetResizable(true); ui.fileTransferInfoWidget->setWidgetResizable(true);
@ -651,6 +661,10 @@ static void QListDelete (const QList <QStandardItem*> &List)
void TransfersDialog::insertTransfers() void TransfersDialog::insertTransfers()
{ {
ui.downloadList->sortByColumn(_sortColDwl, _sortOrderDwl);
/* disable for performance issues, enable after insert all transfers */
ui.downloadList->setSortingEnabled(false);
/* get the download lists */ /* get the download lists */
std::list<std::string> downHashes; std::list<std::string> downHashes;
rsFiles->FileDownloads(downHashes); rsFiles->FileDownloads(downHashes);
@ -786,6 +800,10 @@ void TransfersDialog::insertTransfers()
else else
removeIndex++; removeIndex++;
} }
ui.downloadList->setSortingEnabled(true);
ui.uploadsList->sortByColumn(_sortColUpl, _sortOrderUpl);
// Now show upload hashes // Now show upload hashes
// //
@ -1375,6 +1393,17 @@ void TransfersDialog::clearcompleted()
rsFiles->FileClearCompleted(); rsFiles->FileClearCompleted();
} }
void TransfersDialog::saveSortIndicatorDwl(int logicalIndex, Qt::SortOrder order)
{
_sortColDwl = logicalIndex;;
_sortOrderDwl = order;
}
void TransfersDialog::saveSortIndicatorUpl(int logicalIndex, Qt::SortOrder order)
{
_sortColUpl = logicalIndex;;
_sortOrderUpl = order;
}
void TransfersDialog::showFileDetails() void TransfersDialog::showFileDetails()
{ {
std::string file_hash ; std::string file_hash ;

8
retroshare-gui/src/gui/TransfersDialog.h
View File

@ -98,8 +98,8 @@ private slots:
void chunkStreaming(); void chunkStreaming();
/** save sort indicators for next transfers display */ /** save sort indicators for next transfers display */
// void saveSortIndicatorDwl(int logicalIndex, Qt::SortOrder order); void saveSortIndicatorDwl(int logicalIndex, Qt::SortOrder order);
// void saveSortIndicatorUpl(int logicalIndex, Qt::SortOrder order); void saveSortIndicatorUpl(int logicalIndex, Qt::SortOrder order);
void showDetailsDialog(); void showDetailsDialog();
void updateDetailsDialog(); void updateDetailsDialog();
@ -119,8 +119,8 @@ private:
DLListDelegate *DLDelegate; DLListDelegate *DLDelegate;
ULListDelegate *ULDelegate; ULListDelegate *ULDelegate;
// int _sortColDwl, _sortColUpl; int _sortColDwl, _sortColUpl;
// Qt::SortOrder _sortOrderDwl, _sortOrderUpl; Qt::SortOrder _sortOrderDwl, _sortOrderUpl;
/** Create the actions on the tray menu or menubar */ /** Create the actions on the tray menu or menubar */
void createActions(); void createActions();