diff --git a/Changelog b/Changelog index c65aa8b01..21b49b0d9 100644 --- a/Changelog +++ b/Changelog @@ -1,8 +1,9 @@ -* Unknown - Christophe Dumez - v0.10.0 or v1.0.0? +* Unknown - Christophe Dumez - v0.10.0 - FEATURE: Added UPnP port forwarding support - FEATURE: Display more infos about the torrent in its properties - FEATURE: Allow the user to edit torrents' trackers - COSMETIC: Redesigned torrent properties a little + - COSMETIC: Redesigned options a little * Unknown - Christophe Dumez - v0.9.0 - FEATURE: Based on libtorrent v0.12 diff --git a/TODO b/TODO index f48cff3c4..4c2b57341 100644 --- a/TODO +++ b/TODO @@ -40,4 +40,6 @@ - Allow user to change application style? (WinXP, MacOS, CleanLooks...) : app.setStyle(new QCleanlooksStyle()); - Update v0.9.0 changelog after its release - Display Url seeds in torrent properties and allow to edit them -- Improve Ipfilter.dat parser (move to a thread ?) \ No newline at end of file +- Improve Ipfilter.dat parser (move to a thread ?) +- Use tooltips to explain options +- Exit confirmation only if there are active downloads \ No newline at end of file diff --git a/src/Icons/connection.png b/src/Icons/connection.png new file mode 100644 index 000000000..66c4e7f5d Binary files /dev/null and b/src/Icons/connection.png differ diff --git a/src/icons.qrc b/src/icons.qrc index d6228f1f9..87ae1b087 100644 --- a/src/icons.qrc +++ b/src/icons.qrc @@ -21,6 +21,7 @@ Icons/home.png Icons/uparrow.png Icons/downarrow.png + Icons/connection.png Icons/flags/portugal.png Icons/flags/france.png Icons/flags/ukraine.png diff --git a/src/options.ui b/src/options.ui index eba1628a0..cef7ba3bb 100644 --- a/src/options.ui +++ b/src/options.ui @@ -5,8 +5,8 @@ 0 0 - 506 - 508 + 545 + 530 @@ -54,7 +54,7 @@ - + QTabWidget::North @@ -64,9 +64,18 @@ 0 - + + + 22 + 22 + + + + Qt::ElideLeft + + - Main + Connection @@ -76,15 +85,9 @@ 6 - - - - 0 - 191 - - + - Connection Settings + Main @@ -124,9 +127,6 @@ Upload Limit: - - enableScan_checkBox - @@ -502,17 +502,268 @@ + + + + + + + Peer eXchange (PeX) + + + + 9 + + + 6 + - + - Disable DHT (Trackerless) + Disable Peer eXchange (PeX) + + + + + + + + + + 0 + + + 6 + + + + + DHT (trackerless) + + + + 9 + + + 6 + + + + + Disable DHT (Trackerless) + + + + + + + DHT configuration + + + + 9 + + + 6 + + + + + 0 + + + 6 + + + + + DHT port: + + + + + + + + 6 + 0 + + + + 65525 + + + 1000 + + + 6881 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + + UPnP port forwarding + + + + 9 + + + 6 + + + + + Disable UPnP port forwarding + + + + + + + UPnP configuration + + + + 9 + + + 6 + + + + + 0 + + + 6 + + + + + UPnP port: + + + + + + + + 6 + 0 + + + + 65525 + + + 1000 + + + 50000 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + Behaviour + + + + 9 + + + 6 + + + + + Torrent addition + + + + 9 + + + 6 + + + + + Display a torrent addition dialog everytime I add a torrent + + + true - + + + false + - DHT configuration + Default save path @@ -530,53 +781,83 @@ 6 - + - DHT port: + Save Path: - - - - - - - 6 - 0 - - - - 65525 - - - 1000 - - - 6881 + + proxy_username - - - Qt::Horizontal + + + 0 - - - 40 - 20 - + + 6 - + + + + + + + + + + + ... + + + + + + + + + + + Main window + + + + 9 + + + 6 + - + - Disable Peer eXchange (PeX) + Ask for confirmation on exit + + + true + + + + + + + Go to systray when minimizing window + + + true + + + + + + + Go to systray when closing main window @@ -584,62 +865,44 @@ - - - Enable directory scan (auto add torrent files inside) + + + Systray messages + + + 9 + + + 6 + + + + + Always display systray messages + + + true + + + + + + + Display systray messages only when window is hidden + + + + + + + Never display systray messages + + + + - - - - 0 - - - 6 - - - - - false - - - Scanned Dir: - - - proxy_username - - - - - - - 0 - - - 6 - - - - - false - - - - - - - false - - - ... - - - - - - - @@ -647,8 +910,8 @@ - 20 - 40 + 466 + 31 @@ -1156,22 +1419,9 @@ 6 - - - Display a torrent addition dialog everytime I add a torrent - - - true - - - - - - - false - + - Default save path + Directory scan @@ -1180,6 +1430,13 @@ 6 + + + + Enable directory scan (auto add torrent files inside) + + + @@ -1189,9 +1446,12 @@ 6 - + + + false + - Save Path: + Scanned Dir: proxy_username @@ -1207,14 +1467,17 @@ 6 - - - + + + false - + + + false + ... @@ -1227,48 +1490,6 @@ - - - - Behaviour - - - - 9 - - - 6 - - - - - Ask for confirmation on exit - - - true - - - - - - - Go to systray when minimizing window - - - true - - - - - - - Go to systray when closing main window - - - - - - @@ -1312,43 +1533,17 @@ - - - Systray Messages + + + Qt::Vertical - - - 9 - - - 6 - - - - - Always display systray messages - - - true - - - - - - - Display systray messages only when window is hidden - - - - - - - Never display systray messages - - - - - + + + 466 + 41 + + + diff --git a/src/options_imp.cpp b/src/options_imp.cpp index da50d091b..0b82036b7 100644 --- a/src/options_imp.cpp +++ b/src/options_imp.cpp @@ -34,11 +34,12 @@ options_imp::options_imp(QWidget *parent):QDialog(parent){ QString savePath; setupUi(this); // Setting icons - tabWidget->setTabIcon(0, QIcon(QString::fromUtf8(":/Icons/systemtray.png"))); - tabWidget->setTabIcon(1, QIcon(QString::fromUtf8(":/Icons/locale.png"))); - tabWidget->setTabIcon(2, QIcon(QString::fromUtf8(":/Icons/filter.png"))); - tabWidget->setTabIcon(3, QIcon(QString::fromUtf8(":/Icons/proxy.png"))); - tabWidget->setTabIcon(4, QIcon(QString::fromUtf8(":/Icons/style.png"))); + tabOptions->setTabIcon(0, QIcon(QString::fromUtf8(":/Icons/connection.png"))); + tabOptions->setTabIcon(1, QIcon(QString::fromUtf8(":/Icons/style.png"))); + tabOptions->setTabIcon(2, QIcon(QString::fromUtf8(":/Icons/locale.png"))); + tabOptions->setTabIcon(3, QIcon(QString::fromUtf8(":/Icons/filter.png"))); + tabOptions->setTabIcon(4, QIcon(QString::fromUtf8(":/Icons/proxy.png"))); + tabOptions->setTabIcon(5, QIcon(QString::fromUtf8(":/Icons/wizard.png"))); lbl_icon_i18n->setPixmap(QPixmap(QString::fromUtf8(":/Icons/locale.png"))); addFilterRange->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/add.png"))); delFilterRange->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/remove.png")));