diff --git a/TODO b/TODO
index bb77ba6fa..9a48b3c9c 100644
--- a/TODO
+++ b/TODO
@@ -46,5 +46,4 @@
- Allow to scan multiple directories
- Fix all (or almost all) opened bugs in bug tracker
- Fix sorting with Qt 4.3 - Reported to Trolltech, waiting for fix
-- update sorting when a new torrent is added
-- fix file filtering in a torrent
\ No newline at end of file
+- update sorting when a new torrent is added
\ No newline at end of file
diff --git a/src/GUI.cpp b/src/GUI.cpp
index ae87ca1b1..59a82abd6 100644
--- a/src/GUI.cpp
+++ b/src/GUI.cpp
@@ -112,7 +112,7 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent){
actionDelete_Permanently->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/delete_perm.png")));
actionTorrent_Properties->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/properties.png")));
actionCreate_torrent->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/new.png")));
- info_icon->setPixmap(QPixmap(QString::fromUtf8(":/Icons/log.png")));
+ tabBottom->setTabIcon(0, QIcon(QString::fromUtf8(":/Icons/log.png")));
tabs->setTabIcon(0, QIcon(QString::fromUtf8(":/Icons/skin/downloading.png")));
// Set default ratio
lbl_ratio_icon->setPixmap(QPixmap(QString::fromUtf8(":/Icons/stare.png")));
diff --git a/src/MainWindow.ui b/src/MainWindow.ui
index caddbaaab..5f2832ffb 100644
--- a/src/MainWindow.ui
+++ b/src/MainWindow.ui
@@ -6,7 +6,7 @@
0
0
849
- 576
+ 566
@@ -17,12 +17,21 @@
-
- 9
-
6
+
+ 9
+
+
+ 9
+
+
+ 9
+
+
+ 9
+
-
@@ -36,28 +45,40 @@
Downloads
-
- 9
-
-
- 6
-
-
-
- 0
-
6
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
-
-
- 0
-
6
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
-
@@ -231,6 +252,12 @@
-
+
+
+ 0
+ 238
+
+
Qt::CustomContextMenu
@@ -251,101 +278,70 @@
-
-
-
+
+
+ QTabWidget::West
+
+
0
-
- 6
-
-
-
-
-
- 0
-
-
- 6
-
-
-
-
-
-
- 20
- 20
-
-
-
-
-
-
- Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft
-
-
-
- -
-
-
-
- 0
- 20
-
-
-
-
- Sans Serif
- 9
- 75
- false
- true
- true
- false
-
-
-
- Log:
-
-
- Qt::AlignBottom|Qt::AlignLeading|Qt::AlignLeft
-
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- 661
- 20
-
-
-
-
-
-
- -
-
-
-
- 7
- 0
- 0
- 0
-
-
-
-
- 16777215
- 123
-
-
-
- Qt::CustomContextMenu
+
+
+ Log
+
+
+
+
+ 0
+ -10
+ 809
+ 153
+
+
+
+ 6
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
+ 0
+
+
-
+
+
+
+ 0
+ 0
+
+
+
+
+ 16777215
+ 123
+
+
+
+ Qt::CustomContextMenu
+
+
+
+
-
-
+
+
+
+ IP filter
+
+
+
@@ -426,7 +422,10 @@
- 4
+ TopToolBarArea
+
+
+ false
diff --git a/src/bittorrent.cpp b/src/bittorrent.cpp
index 2ab79a6c7..b3b04cfed 100644
--- a/src/bittorrent.cpp
+++ b/src/bittorrent.cpp
@@ -427,14 +427,16 @@ void bittorrent::loadFilteredFiles(torrent_handle &h){
std::cerr << "* Error: Corrupted priorities file\n";
return;
}
+ std::vector v;
for(unsigned int i=0; i 7){
priority = 1;
}
qDebug("Setting piece piority to %d", priority);
- h.piece_priority(i, priority);
+ v.push_back(priority);
}
+ h.prioritize_files(v);
}
// Save fastresume data for all torrents