diff --git a/Changelog b/Changelog index 48bda454b..2f4d5d966 100644 --- a/Changelog +++ b/Changelog @@ -20,6 +20,7 @@ - COSMETIC: Merged download / upload lists - COSMETIC: Torrents can be filtered based on their status - COSMETIC: Torrent properties are now displayed in main window + - COSMETIC: Made program preferences scrollable for usability on small screens (e.g. netbooks) * Thu Sep 3 2009 - Christophe Dumez - v1.5.0 - FEATURE: Added Magnet URI support diff --git a/src/options.ui b/src/options.ui index c14307f00..fffc265bc 100644 --- a/src/options.ui +++ b/src/options.ui @@ -7,7 +7,7 @@ 0 0 789 - 586 + 572 @@ -214,300 +214,116 @@ - - - User interface settings + + + true - - - - - - - Language: - - - - - - - - 0 - 0 - - - - QComboBox::AdjustToContents - - - 0 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - 8 - true - - - - <b>Note:</b> Changes will be applied after qBittorrent is restarted. - - - Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop - - - - - - - - - Visual style: - - - - - - - - System default - - - - - Plastique style (KDE like) - - - - - Cleanlooks style (Gnome like) - - - - - Motif style (Unix like) - - - - - CDE style (Common Desktop Environment like) - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Ask for confirmation on exit when download list is not empty - - - true - - - - - - - Display top toolbar - - - true - - - - - - - Disable splash screen - - - - - - - Display current speed in title bar - - - - - - - - - transfer lists refresh interval: - - - - - - - 10 - - - 99999 - - - 1500 - - - - - - - ms - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - - System tray icon - - - - - - Disable system tray icon - - - - - - - Close to tray - - - - - - - Minimize to tray - - - false - - - - - - - Start minimized - - - - - - - Show notification balloons in tray - - - true - - - - - - - - + + + + 0 + 0 + 620 + 488 + + + - - - - 0 - 0 - - + - Action for double click + User interface settings - + - + - + - Download list: + Language: - - - - 0 - 0 - + + + + 0 + 0 + - + + QComboBox::AdjustToContents + + 0 + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + 8 + true + + + + <b>Note:</b> Changes will be applied after qBittorrent is restarted. + + + Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop + + + + + + + + + Visual style: + + + + + - Start/Stop + System default - Open folder + Plastique style (KDE like) - Show properties + Cleanlooks style (Gnome like) + + + + + Motif style (Unix like) + + + + + CDE style (Common Desktop Environment like) @@ -528,31 +344,66 @@ - + + + Ask for confirmation on exit when download list is not empty + + + true + + + + + + + Display top toolbar + + + true + + + + + + + Disable splash screen + + + + + + + Display current speed in title bar + + + + + - + - Seeding list: + transfer lists refresh interval: - - - - Start/Stop - - - - - Open folder - - - - - Show properties - - + + + 10 + + + 99999 + + + 1500 + + + + + + + ms + @@ -570,167 +421,354 @@ + + + + + + System tray icon + + + + + + Disable system tray icon + + + + + + + Close to tray + + + + + + + Minimize to tray + + + false + + + + + + + Start minimized + + + + + + + Show notification balloons in tray + + + true + + + + + + + + + + + + + 0 + 0 + + + + Action for double click + + + + + + + + Download list: + + + + + + + + 0 + 0 + + + + 0 + + + + Start/Stop + + + + + Open folder + + + + + Show properties + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Seeding list: + + + + + + + + Start/Stop + + + + + Open folder + + + + + Show properties + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - Qt::Vertical - - - - 623 - 20 - - - + + - - - - 0 - 0 - + + + true - - File system - - - - - - 6 - - - 0 - - - - - 6 - - - 0 - + + + + 0 + 0 + 620 + 208 + + + + + + + + 0 + 0 + + + + File system + + - - - Download folder: + + + 6 - + + 0 + + + + + 6 + + + 0 + + + + + Download folder: + + + + + + + + + + + + + + true + + + + 22 + 22 + + + + + 25 + 27 + + + + + :/Icons/oxygen/browse.png:/Icons/oxygen/browse.png + + + + + + - - - - - + + + + + Temp folder: + + + + + + + false + + + + + + + false + + + + 25 + 27 + + + + + 22 + 22 + + + + + 25 + 27 + + + + + :/Icons/oxygen/browse.png:/Icons/oxygen/browse.png + + + + - - - true - - - - 22 - 22 - - - - - 25 - 27 - - - - - :/Icons/oxygen/browse.png:/Icons/oxygen/browse.png + + + Pre-allocate all files - - - - - - - - - Temp folder: - - - - - - - false - - - - - - - false - - - - 25 - 27 - - - - - 22 - 22 - - - - - 25 - 27 - - - - - :/Icons/oxygen/browse.png:/Icons/oxygen/browse.png - - - - - - - - - Pre-allocate all files - - - - + + + + @@ -1045,41 +1083,133 @@ - - - + + + true + + + + + 0 + 0 + 620 + 480 + + + - - - Listening port - - - - + + + + + Listening port + + - + + + + + Port used for incoming connections: + + + + + + + 1000 + + + 65535 + + + 6881 + + + + + + + Random + + + + + + + Qt::Horizontal + + + + 20 + 20 + + + + + + + + - Port used for incoming connections: + Enable UPnP port mapping + + + true - + + + Enable NAT-PMP port mapping + + + true + + + + + + + + + + + + Connections limit + + + + + + + + Global maximum number of connections: + + + true + + + + + + + true + + + + 8 + + - 1000 + 2 - 65535 + 2000 - 6881 - - - - - - - Random + 500 @@ -1090,7 +1220,7 @@ - 20 + 40 20 @@ -1099,276 +1229,29 @@ - - - Enable UPnP port mapping - - - true - - - - - - - Enable NAT-PMP port mapping - - - true - - - - - - - - - - - - - - Connections limit - - - - - - - - Global maximum number of connections: - - - true - - - - - - - true - - - - 8 - - - - 2 - - - 2000 - - - 500 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - Maximum number of connections per torrent: - - - true - - - - - - - - 8 - - - - 2 - - - 2000 - - - 100 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - Maximum number of upload slots per torrent: - - - true - - - - - - - - 8 - - - - 500 - - - 4 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - Global bandwidth limiting - - - - - - - - - - - 0 - 45 - - - - Upload: - - - true - - - - - - - - 0 - 37 - - - - Download: - - - - - - - - - + - - + + + Maximum number of connections per torrent: + + true - - - 0 - 27 - - - - - - - 1 - - - 1000000 - - - 50 - - - - KiB/s - - - - - - - - - - - false - - - - 0 - 27 - - - - + + + + 8 + - 1 + 2 - 1000000 + 2000 100 @@ -1376,663 +1259,581 @@ - + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + - KiB/s + Maximum number of upload slots per torrent: + + + true + + + + + 8 + + + + 500 + + + 4 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - + + + + + + Global bandwidth limiting + + + + + + + + + + + 0 + 45 + + + + Upload: + + + true + + + + + + + + 0 + 37 + + + + Download: + + + + + + + + + + + + + true + + + + 0 + 27 + + + + + + + 1 + + + 1000000 + + + 50 + + + + + + + KiB/s + + + + + + + + + + + false + + + + 0 + 27 + + + + + + + 1 + + + 1000000 + + + 100 + + + + + + + KiB/s + + + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + - - - Qt::Vertical - - - - 623 - 121 - - - + - - - Bittorrent features + + + true - - - - - Enable DHT network (decentralized) - - - true - - - - - - - Use the same port for DHT and Bittorrent - - - true - - - - - - - - - Qt::Horizontal - - - QSizePolicy::Fixed - - - - 13 - 20 - - - - - - - - false - - - DHT port: - - - - - - - false - - - 1000 - - - 65525 - - - 6882 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - Enable Local Peer Discovery - - - true - - - - - - - Spoof µtorrent to avoid ban (requires restart) - - - - - - - - - Encryption: - - - - - + + + + 0 + 0 + 620 + 488 + + + + + + + Bittorrent features + + - - Enabled - + + + Enable DHT network (decentralized) + + + true + + - - Forced - + + + Use the same port for DHT and Bittorrent + + + true + + - - Disabled - + + + + + Qt::Horizontal + + + QSizePolicy::Fixed + + + + 13 + 20 + + + + + + + + false + + + DHT port: + + + + + + + false + + + 1000 + + + 65525 + + + 6882 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - + + + + Enable Local Peer Discovery + + + true + + + + + + + Spoof µtorrent to avoid ban (requires restart) + + + + + + + + + Encryption: + + + + + + + + Enabled + + + + + Forced + + + + + Disabled + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + Share ratio settings + + + + + + + + Desired ratio: + + + + + + + false + + + + 8 + + + + Qt::AlignHCenter + + + 1 + + + 1.000000000000000 + + + 10.000000000000000 + + + 0.100000000000000 + + + 1.000000000000000 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Remove finished torrents when their ratio reaches: + + + + + + + false + + + + 8 + + + + Qt::AlignHCenter + + + 1 + + + 1.000000000000000 + + + 10.000000000000000 + + + 0.100000000000000 + + + 1.000000000000000 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + - - - - Share ratio settings - - - - - - - - Desired ratio: - - - - - - - false - - - - 8 - - - - Qt::AlignHCenter - - - 1 - - - 1.000000000000000 - - - 10.000000000000000 - - - 0.100000000000000 - - - 1.000000000000000 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - Remove finished torrents when their ratio reaches: - - - - - - - false - - - - 8 - - - - Qt::AlignHCenter - - - 1 - - - 1.000000000000000 - - - 10.000000000000000 - - - 0.100000000000000 - - - 1.000000000000000 - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - Search engine proxy settings - - - - - - - - Type: - - - - - - - - (None) - - - - - HTTP - - - - - - - - false - - - Proxy: - - - - - - - false - - - - - - 75 - - - QLineEdit::Normal - - - - - - - false - - - Port: - - - - - - - false - - - 65535 - - - 8080 - - - - - - - Qt::Horizontal - - - - 21 - 29 - - - - - - - - - - - - false - - - Authentication - - - - - - - - - - - false - - - Username: - - - - - - - false - - - Password: - - - - - - - - - - - false - - - - - - 1000 - - - QLineEdit::Normal - - - - - - - false - - - - - - 1000 - - - QLineEdit::Password - - - - - - - - - Qt::Horizontal - - - - 40 - 20 - - - - - - - - - - - - - - + + true - - Bittorrent proxy settings - - - - - - - - Type: - - - - - + + + + 0 + 0 + 620 + 488 + + + + + + + Search engine proxy settings + + - - (None) - - - - - HTTP - - - - - SOCKS5 - - - - - - - - false - - - Proxy: - - - - - - - false - - - - - - 75 - - - QLineEdit::Normal - - - - - - - false - - - Port: - - - - - - - false - - - 65535 - - - 8080 - - - - - - - Qt::Horizontal - - - - 21 - 29 - - - - - - - - - - - - false - - - Authentication - - - - - - - + - - - false - + - Username: + Type: - + + + + (None) + + + + + HTTP + + + + + + false - Password: + Proxy: - - - - - + false @@ -2040,7 +1841,7 @@ - 1000 + 75 QLineEdit::Normal @@ -2048,7 +1849,186 @@ - + + + false + + + Port: + + + + + + + false + + + 65535 + + + 8080 + + + + + + + Qt::Horizontal + + + + 21 + 29 + + + + + + + + + + + + false + + + Authentication + + + + + + + + + + + false + + + Username: + + + + + + + false + + + Password: + + + + + + + + + + + false + + + + + + 1000 + + + QLineEdit::Normal + + + + + + + false + + + + + + 1000 + + + QLineEdit::Password + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + + + + true + + + Bittorrent proxy settings + + + + + + + + Type: + + + + + + + + (None) + + + + + HTTP + + + + + SOCKS5 + + + + + + + + false + + + Proxy: + + + + + false @@ -2056,533 +2036,695 @@ - 1000 + 75 - QLineEdit::Password + QLineEdit::Normal + + + + false + + + Port: + + + + + + + false + + + 65535 + + + 8080 + + + + + + + Qt::Horizontal + + + + 21 + 29 + + + + - - - Qt::Horizontal + + + + + false + + + Authentication + + + + + + + + + + + false + + + Username: + + + + + + + false + + + Password: + + + + + + + + + + + false + + + + + + 1000 + + + QLineEdit::Normal + + + + + + + false + + + + + + 1000 + + + QLineEdit::Password + + + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + false - + - 40 - 20 + 0 + 110 - + + Affected connections + + + + + + + 0 + 0 + + + + Use proxy for connections to trackers + + + true + + + + + + + + 0 + 0 + + + + Use proxy for connections to regular peers + + + true + + + + + + + + 0 + 0 + + + + Use proxy for DHT messages + + + true + + + + + + + + 0 + 0 + + + + Use proxy for connections to web seeds + + + true + + + + + - - - - - - - false - - - - 0 - 110 - - - - Affected connections - - - - - - - 0 - 0 - - - - Use proxy for connections to trackers - - - true - - - - - - - - 0 - 0 - - - - Use proxy for connections to regular peers - - - true - - - - - - - - 0 - 0 - - - - Use proxy for DHT messages - - - true - - - - - - - - 0 - 0 - - - - Use proxy for connections to web seeds - - - true - - - - - - - + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + - - - - Qt::Vertical - - - - 20 - 40 - - - - - - + + true - - Filter Settings - - - - - - Activate IP Filtering - - - - :/Icons/filter.png:/Icons/filter.png - - - - - - - - - false - - - Filter file path: - - - - - - - false - - - - - - - false - - - - 22 - 22 - - - - - 25 - 27 - - - - - :/Icons/oxygen/browse.png:/Icons/oxygen/browse.png - - - - - - + + + + 0 + 0 + 620 + 488 + + + + + + + true + + + Filter Settings + + + + + + Activate IP Filtering + + + + :/Icons/filter.png:/Icons/filter.png + + + + + + + + + false + + + Filter file path: + + + + + + + false + + + + + + + false + + + + 22 + 22 + + + + + :/Icons/oxygen/browse.png:/Icons/oxygen/browse.png + + + + + + + + + + + + + 20 + 357 + + + + + + - - - - Qt::Vertical - - - - 623 - 20 - - - - - - - true - - - Enable Web User Interface - - + + true + + + + 0 + 0 + 620 + 488 + + + + + + + true + + + Enable Web User Interface + + + true + + + + + + + true + + + HTTP Server + + + + + + true + + + Port: + + + + + + + true + + + 65535 + + + 80 + + + + + + + Qt::Horizontal + + + + 21 + 29 + + + + + + + + + + + true + + + Authentication + + + + + + + + true + + + Username: + + + + + + + true + + + Password: + + + + + + + + + + + true + + + + + + 1000 + + + QLineEdit::Normal + + + + + + + true + + + + + + 1000 + + + QLineEdit::Password + + + + + + + + + Qt::Horizontal + + + + 198 + 57 + + + + + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + - - - - true - - - HTTP Server - - - - - - true - - - Port: - - - - - - - true - - - 65535 - - - 80 - - - - - - - Qt::Horizontal - - - - 21 - 29 - - - - - - - - - - - true - - - Authentication - - - - - - - - true - - - Username: - - - - - - - true - - - Password: - - - - - - - - - - - true - - - - - - 1000 - - - QLineEdit::Normal - - - - - - - true - - - - - - 1000 - - - QLineEdit::Password - - - - - - - - - Qt::Horizontal - - - - 198 - 57 - - - - - - - - - - - Qt::Vertical - - - - 623 - 41 - - - - - - - RSS + + + true - - - - - Enable RSS support - - - - - - - false - - - RSS settings - - - - - - - - - 48 - 48 - - - - - 48 - 48 - - - - - - - :/Icons/rss32.png - - - true - - - - - + + + + 0 + 0 + 620 + 488 + + + + + + + RSS + + + + + + Enable RSS support + + + + + + + false + + + RSS settings + + - + - - - RSS feeds refresh interval: - - - - - - - 1 - - - 999999 - - - 5 - - - - - - - minutes - - - - - - - Qt::Horizontal - - + + - 40 - 20 + 48 + 48 - - - - - - - - - - Maximum number of articles per feed: - - - - - - - 9999 - - - 100 - - - - - - - Qt::Horizontal - - + - 40 - 20 + 48 + 48 - + + + + + :/Icons/rss32.png + + + true + + + + + + + + + + + RSS feeds refresh interval: + + + + + + + 1 + + + 999999 + + + 5 + + + + + + + minutes + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + + + + + + Maximum number of articles per feed: + + + + + + + 9999 + + + 100 + + + + + + + Qt::Horizontal + + + + 40 + 20 + + + + + + + - - - - - - - + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + - - - - Qt::Vertical - - - - 20 - 317 - - - - @@ -2663,7 +2805,6 @@ checkIPFilter textFilterPath browseFilterButton - checkWebUi spinWebUiPort textWebUiUsername textWebUiPassword