Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2025-08-01 02:36:23 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

retains sort order for upload transfers

Browse source 
git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@1653 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
alexandrut 2009-09-15 18:37:03 +00:00
parent ebfd56026a
commit a7c1b9f31c
2 changed files with 30 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -126,11 +126,11 @@ 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(saveSortIndicator(int, Qt::SortOrder))); connect(_header, SIGNAL(sortIndicatorChanged(int, Qt::SortOrder)), this, SLOT(saveSortIndicatorDwl(int, Qt::SortOrder)));
// set default column and sort order // set default column and sort order for download
_sortCol = 0; _sortColDwl = 0;
_sortOrder = Qt::AscendingOrder; _sortOrderDwl = Qt::AscendingOrder;
// Set Upload list model // Set Upload list model
ULListModel = new QStandardItemModel(0,7); ULListModel = new QStandardItemModel(0,7);
@ -172,6 +172,12 @@ TransfersDialog::TransfersDialog(QWidget *parent)
upheader->resizeSection ( USTATUS, 100 ); upheader->resizeSection ( USTATUS, 100 );
upheader->resizeSection ( USERNAME, 75 ); upheader->resizeSection ( USERNAME, 75 );
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;
/* Hide platform specific features */ /* Hide platform specific features */
#ifdef Q_WS_WIN #ifdef Q_WS_WIN
@ -620,7 +626,7 @@ void TransfersDialog::insertTransfers()
delUploadItem(i); delUploadItem(i);
} }
ui.downloadList->sortByColumn(_sortCol, _sortOrder); ui.downloadList->sortByColumn(_sortColDwl, _sortOrderDwl);
/* disable for performance issues, enable after insert all transfers */ /* disable for performance issues, enable after insert all transfers */
ui.downloadList->setSortingEnabled(false); ui.downloadList->setSortingEnabled(false);
@ -810,6 +816,9 @@ void TransfersDialog::insertTransfers()
ui.downloadList->setSortingEnabled(true); ui.downloadList->setSortingEnabled(true);
ui.uploadsList->sortByColumn(_sortColUpl, _sortOrderUpl);
/* disable for performance issues, enable after insert all transfers */
ui.uploadsList->setSortingEnabled(false);
for(it = upHashes.begin(); it != upHashes.end(); it++) for(it = upHashes.begin(); it != upHashes.end(); it++)
{ {
FileInfo info; FileInfo info;
@ -902,6 +911,8 @@ void TransfersDialog::insertTransfers()
ulCount++; ulCount++;
} }
} }
ui.uploadsList->setSortingEnabled(true);
} }
QString TransfersDialog::getPeerName(const std::string& id) const QString TransfersDialog::getPeerName(const std::string& id) const
@ -1272,10 +1283,16 @@ void TransfersDialog::rootisnotdecorated()
ui.downloadList->setRootIsDecorated(false); ui.downloadList->setRootIsDecorated(false);
} }
void TransfersDialog::saveSortIndicator(int logicalIndex, Qt::SortOrder order) void TransfersDialog::saveSortIndicatorDwl(int logicalIndex, Qt::SortOrder order)
{ {
_sortCol = logicalIndex;; _sortColDwl = logicalIndex;;
_sortOrder = order; _sortOrderDwl = order;
}
void TransfersDialog::saveSortIndicatorUpl(int logicalIndex, Qt::SortOrder order)
{
_sortColUpl = logicalIndex;;
_sortOrderUpl = order;
} }
double TransfersDialog::getProgress(int row, QStandardItemModel *model) double TransfersDialog::getProgress(int row, QStandardItemModel *model)

9
retroshare-gui/src/gui/TransfersDialog.h
View file

@ -87,8 +87,9 @@ class TransfersDialog : public MainPage
void priorityHigh(); void priorityHigh();
void priorityAuto(); void priorityAuto();
/** save sort indicator for next transfers display */ /** save sort indicators for next transfers display */
void saveSortIndicator(int logicalIndex, Qt::SortOrder order); void saveSortIndicatorDwl(int logicalIndex, Qt::SortOrder order);
void saveSortIndicatorUpl(int logicalIndex, Qt::SortOrder order);
signals: signals:
void playFiles(QStringList files); void playFiles(QStringList files);
@ -109,8 +110,8 @@ class TransfersDialog : public MainPage
QString status, icon, name; QString status, icon, name;
qlonglong completed, remaining; qlonglong completed, remaining;
int _sortCol; int _sortColDwl, _sortColUpl;
Qt::SortOrder _sortOrder; Qt::SortOrder _sortOrderDwl, _sortOrderUpl;
/** Create the actions on the tray menu or menubar */ /** Create the actions on the tray menu or menubar */