github/qBittorrent
1
0
Fork 0
mirror of https://github.com/qbittorrent/qBittorrent synced 2025-08-13 01:57:07 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 9

Merge msvc compilation fixes from stable branch

Browse source
This commit is contained in:
Christophe Dumez 2010-06-05 13:43:36 +00:00
commit 682377ff66
12 changed files with 487 additions and 394 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/transferlistwidget.cpp
View file

@ -52,6 +52,8 @@
#include <QFileDialog>
#include <vector>
Q_DECLARE_METATYPE(QList<int>)
TransferListWidget::TransferListWidget(QWidget *parent, GUI *main_window, Bittorrent *_BTSession):
QTreeView(parent), BTSession(_BTSession), main_window(main_window) {
QSettings settings("qBittorrent", "qBittorrent");
@ -1242,6 +1244,7 @@ void TransferListWidget::saveColWidthList() {
QStringList width_list;
QStringList new_width_list;
const short nbColumns = listModel->columnCount()-1; // HASH is hidden
if(nbColumns <= 0) return;
const QString &line = settings.value("TransferListColsWidth", QString()).toString();
if(!line.isEmpty()) {
width_list = line.split(' ');
@ -1260,11 +1263,11 @@ void TransferListWidget::saveColWidthList() {
}
}
settings.setValue(QString::fromUtf8("TransferListColsWidth"), new_width_list.join(QString::fromUtf8(" ")));
QVariantList visualIndexes;
QList<int> visualIndexes;
for(int i=0; i<nbColumns; ++i) {
visualIndexes.append(header()->visualIndex(i));
}
settings.setValue(QString::fromUtf8("TransferListVisualIndexes"), visualIndexes);
settings.setValue(QString::fromUtf8("TransferListVisualIndexes"), QVariant::fromValue< QList<int> >(visualIndexes));
qDebug("Download list columns width saved");
}
@ -1272,10 +1275,10 @@ void TransferListWidget::saveColWidthList() {
bool TransferListWidget::loadColWidthList() {
qDebug("Loading columns width for download list");
QSettings settings(QString::fromUtf8("qBittorrent"), QString::fromUtf8("qBittorrent"));
const QString &line = settings.value(QString::fromUtf8("TransferListColsWidth"), QString()).toString();
QString line = settings.value(QString::fromUtf8("TransferListColsWidth"), QString()).toString();
if(line.isEmpty())
return false;
const QStringList &width_list = line.split(QString::fromUtf8(" "));
const QStringList width_list = line.split(" ");
if(width_list.size() != listModel->columnCount()-1) {
qDebug("Corrupted values for transfer list columns sizes");
return false;
@ -1284,7 +1287,7 @@ bool TransferListWidget::loadColWidthList() {
for(unsigned int i=0; i<listSize; ++i) {
header()->resizeSection(i, width_list.at(i).toInt());
}
const QVariantList& visualIndexes = settings.value(QString::fromUtf8("TransferListVisualIndexes"), QVariantList()).toList();
const QList<int> visualIndexes = settings.value(QString::fromUtf8("TransferListVisualIndexes")).value<QList<int> >();
if(visualIndexes.size() != listModel->columnCount()-1) {
qDebug("Corrupted values for transfer list columns indexes");
return false;
@ -1293,7 +1296,7 @@ bool TransferListWidget::loadColWidthList() {
do {
change = false;
for(int i=0;i<visualIndexes.size(); ++i) {
const int new_visual_index = visualIndexes.at(header()->logicalIndex(i)).toInt();
const int new_visual_index = visualIndexes.at(header()->logicalIndex(i));
if(i != new_visual_index) {
qDebug("Moving column from %d to %d", header()->logicalIndex(i), new_visual_index);
header()->moveSection(i, new_visual_index);