Git-Mirrors/RetroShare
1
0
Fork 0
mirror of https://github.com/RetroShare/RetroShare.git synced 2024-10-01 02:35:48 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

Optimized RsCollectionDialog (still without thread).

Browse Source 
Enabled extended selection and mark with the key 'space'.

git-svn-id: http://svn.code.sf.net/p/retroshare/code/trunk@5173 b45a01b8-16f6-495d-af2f-9b41ad6348cc
This commit is contained in:
thunder2 2012-05-16 18:58:52 +00:00
parent 5fbb6448d3
commit e2746efb85
3 changed files with 126 additions and 93 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

160
retroshare-gui/src/gui/common/RsCollectionDialog.cpp
View File

@ -27,71 +27,61 @@
#include <QKeyEvent> #include <QKeyEvent>
#include "RsCollectionDialog.h" #include "RsCollectionDialog.h"
#include "RsCollectionFile.h" #include "RsCollectionFile.h"
#include "util/misc.h"
RsCollectionDialog::RsCollectionDialog(const QString& CollectionFileName,const std::vector<RsCollectionFile::DLinfo>& dlinfos) RsCollectionDialog::RsCollectionDialog(const QString& CollectionFileName,const std::vector<RsCollectionFile::DLinfo>& dlinfos)
: _dlinfos(dlinfos),_filename(CollectionFileName) : _dlinfos(dlinfos),_filename(CollectionFileName)
{ {
setupUi(this) ; setupUi(this) ;
setWindowFlags(Qt::Window); // for maximize button
setWindowFlags(windowFlags() & ~Qt::WindowMinimizeButtonHint);
setWindowTitle(QString("%1 - %2").arg(windowTitle()).arg(QFileInfo(_filename).completeBaseName())); setWindowTitle(QString("%1 - %2").arg(windowTitle()).arg(QFileInfo(_filename).completeBaseName()));
// 1 - add all elements to the list. // 1 - add all elements to the list.
int row = 0; _fileEntriesTW->setColumnCount(3) ;
_fileEntriesTW->setColumnCount(4) ;
_fileEntriesTW->setHorizontalHeaderItem(0,new QTableWidgetItem(QString())) ; QTreeWidgetItem *headerItem = _fileEntriesTW->headerItem();
_fileEntriesTW->setHorizontalHeaderItem(1,new QTableWidgetItem(tr("File"))) ; headerItem->setText(0, tr("File"));
_fileEntriesTW->setHorizontalHeaderItem(2,new QTableWidgetItem(tr("Size"))) ; headerItem->setText(1, tr("Size"));
_fileEntriesTW->setHorizontalHeaderItem(3,new QTableWidgetItem(tr("Hash"))) ; headerItem->setText(2, tr("Hash"));
QHeaderView *header = _fileEntriesTW->horizontalHeader(); uint32_t size = dlinfos.size();
header->setResizeMode(0, QHeaderView::Fixed);
header->setHighlightSections(false);
_cboxes.clear() ;
_cboxes.resize(dlinfos.size(),NULL) ;
uint64_t total_size ; uint64_t total_size ;
uint32_t total_files ; uint32_t total_files ;
for(uint32_t i=0;i<dlinfos.size();++i) for(uint32_t i=0;i<size;++i)
{ {
_fileEntriesTW->insertRow(row) ; const RsCollectionFile::DLinfo &dlinfo = dlinfos[i];
QWidget *widget = new QWidget; QTreeWidgetItem *item = new QTreeWidgetItem;
QCheckBox *cb = new QCheckBox(widget); item->setFlags(Qt::ItemIsUserCheckable | item->flags());
cb->setChecked(true) ; item->setCheckState(0, Qt::Checked);
item->setData(0, Qt::UserRole, i);
item->setText(0, dlinfo.path + "/" + dlinfo.name);
item->setText(1, misc::friendlyUnit(dlinfo.size));
item->setText(2, dlinfo.hash);
QHBoxLayout *layout = new QHBoxLayout(widget); _fileEntriesTW->addTopLevelItem(item);
layout->addWidget(cb, 0, Qt::AlignCenter);
layout->setSpacing(0);
layout->setContentsMargins(10, 0, 0, 0); // to be centered
widget->setLayout(layout);
connect(cb,SIGNAL(toggled(bool)),this,SLOT(updateSizes())) ; total_size += dlinfo.size ;
_cboxes[i] = cb ;
_fileEntriesTW->setCellWidget(row,0,widget) ;
_fileEntriesTW->setItem(row,1,new QTableWidgetItem(dlinfos[i].path + "/" + dlinfos[i].name)) ;
_fileEntriesTW->setItem(row,2,new QTableWidgetItem(QString::number(dlinfos[i].size))) ;
_fileEntriesTW->setItem(row,3,new QTableWidgetItem(dlinfos[i].hash)) ;
total_size += dlinfos[i].size ;
total_files++ ; total_files++ ;
++row ;
} }
_filename_TL->setText(_filename) ; _filename_TL->setText(_filename) ;
_fileEntriesTW->resizeColumnsToContents() ; for (int column = 0; column < _fileEntriesTW->columnCount(); ++column) {
_fileEntriesTW->resizeColumnToContents(column);
}
updateSizes() ; updateSizes() ;
// 2 - connect necessary signals/slots // 2 - connect necessary signals/slots
connectUpdate(true);
connect(_selectAll_PB,SIGNAL(clicked()),this,SLOT(selectAll())) ; connect(_selectAll_PB,SIGNAL(clicked()),this,SLOT(selectAll())) ;
connect(_deselectAll_PB,SIGNAL(clicked()),this,SLOT(deselectAll())) ; connect(_deselectAll_PB,SIGNAL(clicked()),this,SLOT(deselectAll())) ;
connect(_cancel_PB,SIGNAL(clicked()),this,SLOT(cancel())) ; connect(_cancel_PB,SIGNAL(clicked()),this,SLOT(cancel())) ;
@ -107,14 +97,24 @@ bool RsCollectionDialog::eventFilter(QObject *obj, QEvent *event)
QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event); QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
if (keyEvent && keyEvent->key() == Qt::Key_Space) { if (keyEvent && keyEvent->key() == Qt::Key_Space) {
// Space pressed // Space pressed
QModelIndex currentIndex = _fileEntriesTW->currentIndex();
QModelIndex index = _fileEntriesTW->model()->index(currentIndex.row(), 0, currentIndex.parent()); // get state of current item
QWidget *widget = dynamic_cast<QWidget*>(_fileEntriesTW->indexWidget(index)); QTreeWidgetItem *item = _fileEntriesTW->currentItem();
if (widget) { if (item) {
QCheckBox *cb = dynamic_cast<QCheckBox*>(widget->children().front()); Qt::CheckState checkState = (item->checkState(0) == Qt::Checked) ? Qt::Unchecked : Qt::Checked;
if (cb) {
cb->toggle(); connectUpdate(false);
// set state of all selected items
QList<QTreeWidgetItem*> selectedItems = _fileEntriesTW->selectedItems();
QList<QTreeWidgetItem*>::iterator it;
for (it = selectedItems.begin(); it != selectedItems.end(); ++it) {
(*it)->setCheckState(0, checkState);
} }
updateSizes();
connectUpdate(true);
} }
return true; // eat event return true; // eat event
@ -125,33 +125,67 @@ bool RsCollectionDialog::eventFilter(QObject *obj, QEvent *event)
return QDialog::eventFilter(obj, event); return QDialog::eventFilter(obj, event);
} }
void RsCollectionDialog::connectUpdate(bool doConnect)
{
if (doConnect) {
connect(_fileEntriesTW, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(itemChanged(QTreeWidgetItem*,int)));
} else {
disconnect(_fileEntriesTW, SIGNAL(itemChanged(QTreeWidgetItem*,int)), this, SLOT(itemChanged(QTreeWidgetItem*,int)));
}
}
void RsCollectionDialog::updateSizes() void RsCollectionDialog::updateSizes()
{ {
uint64_t total_size = 0 ; uint64_t total_size = 0 ;
uint32_t total_files = 0 ; uint32_t total_files = 0 ;
for(size_t i=0;i<_dlinfos.size();++i) QTreeWidgetItemIterator itemIterator(_fileEntriesTW);
if(_cboxes[i]->isChecked()) QTreeWidgetItem *item;
{ while ((item = *itemIterator) != NULL) {
total_size += _dlinfos[i].size ; itemIterator++;
if (item->checkState(0) == Qt::Checked) {
total_size += _dlinfos[item->data(0, Qt::UserRole).toInt()].size ;
++total_files ; ++total_files ;
} }
}
_selectedFiles_TL->setText(QString::number(total_files)) ; _selectedFiles_TL->setText(QString::number(total_files)) ;
_totalSize_TL->setText(QString::number(total_size)) ; _totalSize_TL->setText(misc::friendlyUnit(total_size)) ;
} }
void RsCollectionDialog::selectAll() const void RsCollectionDialog::itemChanged(QTreeWidgetItem */*item*/, int /*column*/)
{
updateSizes();
}
void RsCollectionDialog::selectDeselectAll(bool select)
{
connectUpdate(false);
QTreeWidgetItemIterator itemIterator(_fileEntriesTW);
QTreeWidgetItem *item;
while ((item = *itemIterator) != NULL) {
itemIterator++;
item->setCheckState(0, select ? Qt::Checked : Qt::Unchecked);
}
updateSizes();
connectUpdate(true);
}
void RsCollectionDialog::selectAll()
{ {
std::cerr << "Selecting all !" << std::endl; std::cerr << "Selecting all !" << std::endl;
for(size_t i=0;i<_dlinfos.size();++i)
_cboxes[i]->setChecked(true) ; selectDeselectAll(true);
} }
void RsCollectionDialog::deselectAll() const void RsCollectionDialog::deselectAll()
{ {
std::cerr << "Deselecting all !" << std::endl; std::cerr << "Deselecting all !" << std::endl;
for(size_t i=0;i<_dlinfos.size();++i)
_cboxes[i]->setChecked(false) ; selectDeselectAll(false);
} }
void RsCollectionDialog::cancel() void RsCollectionDialog::cancel()
@ -168,20 +202,26 @@ void RsCollectionDialog::download()
std::cerr << "downloading all these files:" << std::endl; std::cerr << "downloading all these files:" << std::endl;
for(uint32_t i=0;i<_dlinfos.size();++i) QTreeWidgetItemIterator itemIterator(_fileEntriesTW);
if(_cboxes[i]->isChecked()) QTreeWidgetItem *item;
{ while ((item = *itemIterator) != NULL) {
std::cerr << _dlinfos[i].name.toStdString() << " " << _dlinfos[i].hash.toStdString() << " " << _dlinfos[i].size << " " << _dlinfos[i].path.toStdString() << std::endl; itemIterator++;
QString cleanPath = dldir + _dlinfos[i].path ;
const RsCollectionFile::DLinfo &dlinfo = _dlinfos[item->data(0, Qt::UserRole).toInt()];
if (item->checkState(0) == Qt::Checked) {
std::cerr << dlinfo.name.toStdString() << " " << dlinfo.hash.toStdString() << " " << dlinfo.size << " " << dlinfo.path.toStdString() << std::endl;
QString cleanPath = dldir + dlinfo.path ;
std::cerr << "making directory " << cleanPath.toStdString() << std::endl; std::cerr << "making directory " << cleanPath.toStdString() << std::endl;
if(!QDir(QApplication::applicationDirPath()).mkpath(cleanPath)) if(!QDir(QApplication::applicationDirPath()).mkpath(cleanPath))
QMessageBox::warning(NULL,QObject::tr("Unable to make path"),QObject::tr("Unable to make path:")+"<br> "+cleanPath) ; QMessageBox::warning(NULL,QObject::tr("Unable to make path"),QObject::tr("Unable to make path:")+"<br> "+cleanPath) ;
rsFiles->FileRequest(_dlinfos[i].name.toUtf8().constData(), _dlinfos[i].hash.toUtf8().constData(), _dlinfos[i].size, cleanPath.toUtf8().constData(), RS_FILE_HINTS_NETWORK_WIDE, std::list<std::string>()); rsFiles->FileRequest(dlinfo.name.toUtf8().constData(), dlinfo.hash.toUtf8().constData(), dlinfo.size, cleanPath.toUtf8().constData(), RS_FILE_HINTS_NETWORK_WIDE, std::list<std::string>());
} }
else else
std::cerr<<"Skipping file : " << _dlinfos[i].name.toStdString() << std::endl; std::cerr<<"Skipping file : " << dlinfo.name.toStdString() << std::endl;
}
close(); close();
} }

32
retroshare-gui/src/gui/common/RsCollectionDialog.h
View File

@ -30,22 +30,24 @@ class RsCollectionDialog: public QDialog, public Ui::RsCollectionDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
RsCollectionDialog(const QString& filename,const std::vector<RsCollectionFile::DLinfo>& dlinfos) ; RsCollectionDialog(const QString& filename,const std::vector<RsCollectionFile::DLinfo>& dlinfos) ;
public slots: private slots:
void download() ; void download() ;
void selectAll() const ; void selectAll() ;
void deselectAll() const ; void deselectAll() ;
void cancel() ; void cancel() ;
void updateSizes() ; void updateSizes() ;
void itemChanged(QTreeWidgetItem *item, int column);
protected: protected:
bool eventFilter(QObject *obj, QEvent *ev); bool eventFilter(QObject *obj, QEvent *ev);
private: private:
const std::vector<RsCollectionFile::DLinfo>& _dlinfos ; void selectDeselectAll(bool select);
std::vector<QCheckBox*> _cboxes ; void connectUpdate(bool doConnect);
QString _filename ;
const std::vector<RsCollectionFile::DLinfo>& _dlinfos ;
QString _filename ;
}; };

25
retroshare-gui/src/gui/common/RsCollectionDialog.ui
View File

@ -98,28 +98,19 @@
</layout> </layout>
</item> </item>
<item> <item>
<widget class="QTableWidget" name="_fileEntriesTW"> <widget class="QTreeWidget" name="_fileEntriesTW">
<property name="editTriggers"> <property name="editTriggers">
<set>QAbstractItemView::NoEditTriggers</set> <set>QAbstractItemView::NoEditTriggers</set>
</property> </property>
<property name="selectionBehavior"> <property name="selectionMode">
<enum>QAbstractItemView::SelectRows</enum> <enum>QAbstractItemView::ExtendedSelection</enum>
</property> </property>
<property name="gridStyle"> <property name="rootIsDecorated">
<enum>Qt::DotLine</enum>
</property>
<property name="sortingEnabled">
<bool>true</bool>
</property>
<attribute name="horizontalHeaderStretchLastSection">
<bool>true</bool>
</attribute>
<attribute name="verticalHeaderVisible">
<bool>false</bool> <bool>false</bool>
</attribute> </property>
<attribute name="verticalHeaderDefaultSectionSize"> <property name="allColumnsShowFocus">
<number>22</number> <bool>true</bool>
</attribute> </property>
</widget> </widget>
</item> </item>
<item> <item>