Compare commits
	
		
			51 Commits
		
	
	
		
			release-3.
			...
			search_enc
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 882f3dcf0e | ||
|   | b191a977af | ||
|   | 61858814ee | ||
|   | 365387f092 | ||
|   | df295d96c2 | ||
|   | a069f806d9 | ||
|   | 4638a9e6ee | ||
|   | af790e40f8 | ||
|   | 76fd5d3eb4 | ||
|   | dc8a8fbc06 | ||
|   | 30e0cc20c8 | ||
|   | 63dcb81384 | ||
|   | ce391ad328 | ||
|   | 7b908c7adf | ||
|   | 0d26d734b3 | ||
|   | f836c40fc4 | ||
|   | 21fe7f2ca6 | ||
|   | da85a57f83 | ||
|   | e35664b188 | ||
|   | 2fc350b265 | ||
|   | 83bcd6a2d7 | ||
|   | edcfa4df12 | ||
|   | 12a83e1aec | ||
|   | 7d50a8b28c | ||
|   | 232e112d84 | ||
|   | 5b1ee883b4 | ||
|   | b07fceec65 | ||
|   | 4c9cf6c773 | ||
|   | 164f37e961 | ||
|   | 093fb303f3 | ||
|   | f3d5039e33 | ||
|   | 007c307388 | ||
|   | 4079689f32 | ||
|   | 2b3d6926c8 | ||
|   | 14b3414e9d | ||
|   | 73254962f1 | ||
|   | 74f042516b | ||
|   | 8c0853248c | ||
|   | 80ea0a67b5 | ||
|   | 6d2b51203c | ||
|   | 8ac82156b3 | ||
|   | c1806b099a | ||
|   | 1046c816bf | ||
|   | cfbb5ecde5 | ||
|   | afdec02674 | ||
|   | 927e6bc6cc | ||
|   | e862d3332c | ||
|   | 699144a83d | ||
|   | 1792f44bfa | ||
|   | 64e4095ef1 | ||
|   | 1d1ffcec7c | 
							
								
								
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						| @@ -1,6 +1,6 @@ | |||||||
| src/geoip/GeoIP.dat | src/geoip/GeoIP.dat | ||||||
| src/qbittorrent | src/qbittorrent | ||||||
| qbittorrent.pro.user* | qbittorrent.pro.user | ||||||
| conf.pri | conf.pri | ||||||
| Makefile | Makefile | ||||||
| *.pyc | *.pyc | ||||||
| @@ -12,4 +12,3 @@ moc_*.cpp | |||||||
| qrc_*.cpp | qrc_*.cpp | ||||||
| ui_*.h | ui_*.h | ||||||
| *.moc | *.moc | ||||||
| src/lang/qbittorrent_*.qm |  | ||||||
|   | |||||||
							
								
								
									
										53
									
								
								.travis.yml
									
									
									
									
									
								
							
							
						
						| @@ -1,53 +0,0 @@ | |||||||
| language: |  | ||||||
|   - cpp |  | ||||||
|  |  | ||||||
| env: |  | ||||||
|   # use libtorrent 0.15.10 |  | ||||||
|   - lt_source=from_dist gui=true |  | ||||||
|   - lt_source=from_dist gui=false |  | ||||||
|   # use libtorrent 0.16.X from RC_0_16 svn branch |  | ||||||
|   - lt_source=from_svn gui=true |  | ||||||
|   - lt_source=from_svn gui=false |  | ||||||
|  |  | ||||||
| branches: |  | ||||||
|   except: |  | ||||||
|     - search_encoding_windows |  | ||||||
|     - v2_9_x |  | ||||||
|  |  | ||||||
| notifications: |  | ||||||
|   email: |  | ||||||
|     on_success: change |  | ||||||
|     on_failure: change  |  | ||||||
|  |  | ||||||
| before_install: |  | ||||||
|   - shopt -s expand_aliases |  | ||||||
|   - alias sudo="sudo " |  | ||||||
|   # Using nprocs/2 sometimes may fail (gcc is killed by system), just use two threads |  | ||||||
|   - alias make="colormake -j2 " |  | ||||||
|  |  | ||||||
|   # Also setup a virtual display for after_success target when gui == true |  | ||||||
|   - if ! $gui; then qbtconf="$qbtconf --disable-gui"; else export "DISPLAY=:99.0" && /sbin/start-stop-daemon --start --quiet --pidfile /tmp/custom_xvfb_99.pid --make-pidfile --background --exec /usr/bin/Xvfb -- :99 -ac -screen 0 1280x1024x16 ; fi |  | ||||||
|   - ltconf=" --with-libgeoip=system" |  | ||||||
|  |  | ||||||
|   - echo settings |  | ||||||
|   - echo $lt_source |  | ||||||
|   - echo $ltconf |  | ||||||
|   - echo $gui |  | ||||||
|   - echo $qbtconf |  | ||||||
|  |  | ||||||
|   - sudo apt-get -qq update |  | ||||||
|   # Travis can stall during heavy load if these packages are installed in one step - split the command |  | ||||||
|   - sudo apt-get -qq install debhelper qconf colormake libssl-dev libgeoip-dev |  | ||||||
|   - sudo apt-get -qq install libboost-dev libboost-filesystem-dev libboost-system-dev |  | ||||||
|   - sudo apt-get -qq install libqt4-dev  |  | ||||||
|  |  | ||||||
| install: |  | ||||||
|   - if [[ "$lt_source" == "from_dist" ]]; then sudo apt-get -qq install libtorrent-rasterbar-dev; fi |  | ||||||
|   - if [[ "$lt_source" == "from_svn" ]]; then cd .. && svn co svn://svn.code.sf.net/p/libtorrent/code/branches/RC_0_16 ./libtorrent && (cd libtorrent && ./autotool.sh && ./configure $ltconf && sudo make install) && sudo ldconfig /usr/local/lib && cd $TRAVIS_BUILD_DIR ; fi |  | ||||||
|  |  | ||||||
| script: |  | ||||||
|   - qt-qconf |  | ||||||
|   - ./configure $qbtconf && sudo make install |  | ||||||
|    |  | ||||||
| after_success: |  | ||||||
|   - if $gui ; then qbittorrent --version ; else qbittorrent-nox --version ; fi |  | ||||||
							
								
								
									
										18
									
								
								.tx/config
									
									
									
									
									
								
							
							
						
						| @@ -1,18 +0,0 @@ | |||||||
| [main] |  | ||||||
| host = https://www.transifex.com |  | ||||||
|  |  | ||||||
| [qbittorrent.qbittorrent_v3_1_x] |  | ||||||
| file_filter = src/lang/qbittorrent_<lang>.ts |  | ||||||
| source_file = src/lang/qbittorrent_en.ts |  | ||||||
| source_lang = en |  | ||||||
| type = QT |  | ||||||
| minimum_perc = 23 |  | ||||||
| mode = developer |  | ||||||
|  |  | ||||||
|  |  | ||||||
| [qbittorrent.qbittorrentdesktop_master] |  | ||||||
| source_file = src/Icons/qBittorrent.desktop |  | ||||||
| source_lang = en |  | ||||||
| type = DESKTOP |  | ||||||
| minimum_perc = 23 |  | ||||||
| mode = developer |  | ||||||
							
								
								
									
										42
									
								
								AUTHORS
									
									
									
									
									
								
							
							
						
						| @@ -1,7 +1,4 @@ | |||||||
| Current maintainer: | Author: | ||||||
| * Sledgehammer999 <sledgehammer999@qbittorrent.org> |  | ||||||
|  |  | ||||||
| Original author: |  | ||||||
| * Christophe Dumez <chris@qbittorrent.org> | * Christophe Dumez <chris@qbittorrent.org> | ||||||
|  |  | ||||||
| Contributors: | Contributors: | ||||||
| @@ -14,7 +11,6 @@ Contributors: | |||||||
| * Grigis Gaëtan <cipher16@gmail.com> | * Grigis Gaëtan <cipher16@gmail.com> | ||||||
| * Christian Kandeler <zambesi@users.sourceforge.net> | * Christian Kandeler <zambesi@users.sourceforge.net> | ||||||
| * Silvan Scherrer <silvan.scherrer@aroa.ch> | * Silvan Scherrer <silvan.scherrer@aroa.ch> | ||||||
| * Nick Tiskov <daymansmail@gmail.com> |  | ||||||
|  |  | ||||||
| Code from other projects: | Code from other projects: | ||||||
| * files src/qtsingleapp/* src/lineedit/* | * files src/qtsingleapp/* src/lineedit/* | ||||||
| @@ -29,10 +25,6 @@ Code from other projects: | |||||||
|   copyright: Dan Haim <negativeiq@users.sourceforge.net> |   copyright: Dan Haim <negativeiq@users.sourceforge.net> | ||||||
|   license: BSD |   license: BSD | ||||||
|  |  | ||||||
| * file src/stacktrace_win.h |  | ||||||
|   copyright: Quassel Project |  | ||||||
|   license: GPLv2/3 |  | ||||||
|  |  | ||||||
| Images Authors: | Images Authors: | ||||||
| * files: src/Icons/*.png | * files: src/Icons/*.png | ||||||
|   copyright: Gnome Icon Theme |   copyright: Gnome Icon Theme | ||||||
| @@ -79,46 +71,42 @@ Images Authors: | |||||||
|  |  | ||||||
| Translations authors: | Translations authors: | ||||||
| * files: src/lang/*.ts | * files: src/lang/*.ts | ||||||
| * file: src/Icons/qBittorrent.desktop |  | ||||||
|   copyright: |   copyright: | ||||||
|   - Arabic: SDERAWI (abz8868@msn.com), sn51234 (nesseyan@gmail.com) and  Ibrahim Saed ibraheem_alex(Transifex) |   - Arabic: SDERAWI (abz8868@msn.com) and sn51234 (nesseyan@gmail.com) | ||||||
|   - Armenian: Hrant Ohanyan (hrantohanyan@mail.am) |   - Armenian: Hrant Ohanyan (hrantohanyan@mail.am) | ||||||
|   - Basque: Xabier Aramendi (azpidatziak@gmail.com) |   - Basque: Xabier Aramendi (azpidatziak@gmail.com) | ||||||
|   - Belarusian: Mihas Varantsou (meequz@gmail.com) |   - Belarusian: Mihas Varantsou (meequz@gmail.com) | ||||||
|  |   - Brazilian: Nick Marinho (nickmarinho@gmail.com) | ||||||
|   - Bulgarian: Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net) |   - Bulgarian: Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net) | ||||||
|   - Catalan: Francisco Luque Contreras (frannoe@ya.com) |   - Catalan: Francisco Luque Contreras (frannoe@ya.com) | ||||||
|   - Chinese (Simplified): Guo Yue (yue.guo0418@gmail.com) |   - Chinese (Simplified): Guo Yue (yue.guo0418@gmail.com) | ||||||
|   - Chinese (Traditional): Yi-Shun Wang (dnextstep@gmail.com) and 冥王歐西里斯 s8321414(Transifex) |   - Chinese (Traditional): Yi-Shun Wang (dnextstep@gmail.com) | ||||||
|   - Croatian: Oliver Mucafir (oliver.untwist@gmail.com) |   - Croatian: Oliver Mucafir (oliver.untwist@gmail.com) | ||||||
|   - Czech: Jirka Vilim (web@tets.cz) and Petr Cernobila abr(Transifex) |   - Czech: Jirka Vilim (web@tets.cz) | ||||||
|   - Danish: Mathias Nielsen (comoneo@gmail.com) |   - Danish: Mathias Nielsen (comoneo@gmail.com) | ||||||
|   - Dutch: Pieter Heyvaert (pieter_heyvaert@hotmail.com) |   - Dutch: Pieter Heyvaert (pieter_heyvaert@hotmail.com) | ||||||
|   - English: Christophe Dumez (chris@qbittorrent.org) |   - English: Christophe Dumez (chris@qbittorrent.org) | ||||||
|   - English(Australia): Robert Readman readmanr(Transifex) |   - Finnish: Niklas Laxström (nikerabbit@users.sourceforge.net) | ||||||
|   - English(United Kingdom): Robert Readman readmanr(Transifex) |  | ||||||
|   - Finnish: Niklas Laxström (nikerabbit@users.sourceforge.net), Pekka Niemi (pekka.niemi@iki.fi) and Jiri Grönroos artnay(Transifex) |  | ||||||
|   - French: Christophe Dumez (chris@qbittorrent.org) |   - French: Christophe Dumez (chris@qbittorrent.org) | ||||||
|   - Galician: Marcos Lans (marcoslansgarza@gmail.com) and antiparvos(Transifex) |   - Galician: Marcos Lans (marcoslansgarza@gmail.com) | ||||||
|   - Georgian: Beqa Arabuli (arabulibeqa@yahoo.com) |   - Georgian: Beqa Arabuli (arabulibeqa@yahoo.com) | ||||||
|   - German: Niels Hoffmann (zentralmaschine@users.sourceforge.net) |   - German: Niels Hoffmann (zentralmaschine@users.sourceforge.net) | ||||||
|   - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net), Stephanos Antaris (santaris@csd.auth.gr), sledgehammer999(hammered999@gmail.com) and Γιάννης Ανθυμίδης Evropi(Transifex) |   - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net) and Stephanos Antaris (santaris@csd.auth.gr) | ||||||
|   - Hebrew: David Deutsch (d.deffo@gmail.com) |   - Hebrew: David Deutsch (d.deffo@gmail.com) | ||||||
|   - Hungarian: Majoros Péter (majoros.j.p@t-online.hu) |   - Hungarian: Majoros Péter (majoros.j.p@t-online.hu) | ||||||
|   - Italian: bovirus (bovirus@live.it) and Matteo Sechi (bu17714@gmail.com) |   - Italian: Matteo Sechi (bu17714@gmail.com) | ||||||
|   - Japanese: Masato Hashimoto (cabezon.hashimoto@gmail.com) |   - Japanese: Masato Hashimoto (cabezon.hashimoto@gmail.com) | ||||||
|   - Korean: Jin Woo Sin (jin828sin@users.sourceforge.net) |   - Korean: Jin Woo Sin (jin828sin@users.sourceforge.net) | ||||||
|   - Lithuanian: Naglis Jonaitis (njonaitis@gmail.com) |   - Lithuanian: Naglis Jonaitis (njonaitis@gmail.com) | ||||||
|   - Norwegian: Tomaso |   - Norwegian: Tomaso | ||||||
|   - Polish: Mariusz Fik (fisiu@opensuse.org) |   - Polish: Mariusz Fik (fisiu@opensuse.org) | ||||||
|   - Portuguese: Sérgio Marques smarquespt(Transifex) |   - Portuguese: Nick Marinho (nickmarinho@gmail.com) | ||||||
|   - Portuguese(Brazil): Nick Marinho (nickmarinho@gmail.com) |   - Romanian: Obada Denis (obadadenis@users.sourceforge.net) | ||||||
|   - Romanian: Obada Denis (obadadenis@users.sourceforge.net), Adrian Gabor Adriannho(Transifex) and Mihai Coman z0id(Transifex) |   - Russian: Nick Khazov (m2k3d0n at users.sourceforge.net) | ||||||
|   - Russian: Nick Khazov (m2k3d0n at users.sourceforge.net), Alexey Morsov (samurai@ricom.ru), Nick Tiskov Dayman(daymansmail (at) gmail (dot) com), Dmitry DmitryKX(Transifex) and kraleksandr kraleksandr(Transifex) |  | ||||||
|   - Serbian: Anaximandar Milet (anaximandar at operamail.com) |   - Serbian: Anaximandar Milet (anaximandar at operamail.com) | ||||||
|   - Slovak:  helix84 |   - Slovak:  helix84 | ||||||
|   - Spanish: Francisco Luque Contreras (frannoe@ya.com), Alfredo Monclus alfrix(Transifex) and José Antonio Moray moray33(Transifex) |   - Spanish: Francisco Luque Contreras (frannoe@ya.com) | ||||||
|   - Swedish: Daniel Nylander (po@danielnylander.se) and Emil Hammarberg Ooglogput(Transifex) |   - Swedish: Daniel Nylander (po@danielnylander.se) | ||||||
|   - Turkish: Hasan Yilmaz (iletisim@hedefturkce.com) |   - Turkish: Hasan Yilmaz (iletisim@hedefturkce.com) | ||||||
|   - Ukrainian: Oleh Prypin (blaxpirit@gmail.com) and zubr139(Transifex) |   - Ukrainian: Oleh Prypin (blaxpirit@gmail.com) | ||||||
|   - Vietnamese: Anh Phan ppanhh(Transifex) |  | ||||||
|   license: GPLv2 |   license: GPLv2 | ||||||
|   | |||||||
							
								
								
									
										10
									
								
								COPYING
									
									
									
									
									
								
							
							
						
						| @@ -69,7 +69,7 @@ patent must be licensed for everyone's free use or not licensed at all. | |||||||
|  |  | ||||||
|   The precise terms and conditions for copying, distribution and |   The precise terms and conditions for copying, distribution and | ||||||
| modification follow. | modification follow. | ||||||
|  |  | ||||||
| 		    GNU GENERAL PUBLIC LICENSE | 		    GNU GENERAL PUBLIC LICENSE | ||||||
|    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION |    TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION | ||||||
|  |  | ||||||
| @@ -124,7 +124,7 @@ above, provided that you also meet all of these conditions: | |||||||
|     License.  (Exception: if the Program itself is interactive but |     License.  (Exception: if the Program itself is interactive but | ||||||
|     does not normally print such an announcement, your work based on |     does not normally print such an announcement, your work based on | ||||||
|     the Program is not required to print an announcement.) |     the Program is not required to print an announcement.) | ||||||
|  |  | ||||||
| These requirements apply to the modified work as a whole.  If | These requirements apply to the modified work as a whole.  If | ||||||
| identifiable sections of that work are not derived from the Program, | identifiable sections of that work are not derived from the Program, | ||||||
| and can be reasonably considered independent and separate works in | and can be reasonably considered independent and separate works in | ||||||
| @@ -182,7 +182,7 @@ access to copy from a designated place, then offering equivalent | |||||||
| access to copy the source code from the same place counts as | access to copy the source code from the same place counts as | ||||||
| distribution of the source code, even though third parties are not | distribution of the source code, even though third parties are not | ||||||
| compelled to copy the source along with the object code. | compelled to copy the source along with the object code. | ||||||
|  |  | ||||||
|   4. You may not copy, modify, sublicense, or distribute the Program |   4. You may not copy, modify, sublicense, or distribute the Program | ||||||
| except as expressly provided under this License.  Any attempt | except as expressly provided under this License.  Any attempt | ||||||
| otherwise to copy, modify, sublicense or distribute the Program is | otherwise to copy, modify, sublicense or distribute the Program is | ||||||
| @@ -239,7 +239,7 @@ impose that choice. | |||||||
|  |  | ||||||
| This section is intended to make thoroughly clear what is believed to | This section is intended to make thoroughly clear what is believed to | ||||||
| be a consequence of the rest of this License. | be a consequence of the rest of this License. | ||||||
|  |  | ||||||
|   8. If the distribution and/or use of the Program is restricted in |   8. If the distribution and/or use of the Program is restricted in | ||||||
| certain countries either by patents or by copyrighted interfaces, the | certain countries either by patents or by copyrighted interfaces, the | ||||||
| original copyright holder who places the Program under this License | original copyright holder who places the Program under this License | ||||||
| @@ -292,7 +292,7 @@ PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE | |||||||
| POSSIBILITY OF SUCH DAMAGES. | POSSIBILITY OF SUCH DAMAGES. | ||||||
|  |  | ||||||
| 		     END OF TERMS AND CONDITIONS | 		     END OF TERMS AND CONDITIONS | ||||||
|  |  | ||||||
| 	    How to Apply These Terms to Your New Programs | 	    How to Apply These Terms to Your New Programs | ||||||
|  |  | ||||||
|   If you develop a new program, and you want it to be of the greatest |   If you develop a new program, and you want it to be of the greatest | ||||||
|   | |||||||
| @@ -1,11 +1,10 @@ | |||||||
| qBittorrent - A BitTorrent client in Qt | qBittorrent - A BitTorrent client in Qt4 | ||||||
| ------------------------------------------ | ------------------------------------------ | ||||||
|  |  | ||||||
| [](https://travis-ci.org/qbittorrent/qBittorrent) | Description: | ||||||
| ******************************** | ******************************** | ||||||
| ###Description: | qBittorrent is a bittorrent client programmed in C++ / Qt4 that uses | ||||||
| qBittorrent is a bittorrent client programmed in C++ / Qt that uses | libtorrent (sometimes called rblibtorrent) by Arvid Norberg. | ||||||
| libtorrent (sometimes called libtorrent-rasterbar) by Arvid Norberg. |  | ||||||
|  |  | ||||||
| It aims to be a good alternative to all other bittorrent clients | It aims to be a good alternative to all other bittorrent clients | ||||||
| out there. qBittorrent is fast, stable and provides unicode | out there. qBittorrent is fast, stable and provides unicode | ||||||
| @@ -14,14 +13,13 @@ support as well as many features. | |||||||
| This product includes GeoLite data created by MaxMind, available from | This product includes GeoLite data created by MaxMind, available from | ||||||
| http://maxmind.com/ | http://maxmind.com/ | ||||||
|  |  | ||||||
| ### Installation: | Installation: | ||||||
|  | ******************************** | ||||||
| For installation, follow the instructions from INSTALL file, but simple: | For installation, follow the instructions from INSTALL file, but simple: | ||||||
|  |  | ||||||
| ``` |  | ||||||
| ./configure | ./configure | ||||||
| make && make install | make && make install | ||||||
| qbittorrent | qbittorrent | ||||||
| ``` |  | ||||||
|  |  | ||||||
| will install and execute qBittorrent hopefully without any problem. | will install and execute qBittorrent hopefully without any problem. | ||||||
|  |  | ||||||
| @@ -34,9 +32,9 @@ http://wiki.qbittorrent.org | |||||||
| Please report any bug (or feature request) to: | Please report any bug (or feature request) to: | ||||||
| http://bugs.qbittorrent.org | http://bugs.qbittorrent.org | ||||||
|  |  | ||||||
| You can also meet me (sledgehammer_999) on IRC: | You can also meet me (chris-qBT) on IRC: | ||||||
| `#qbittorrent on irc.freenode.net` | #qbittorrent on irc.freenode.net | ||||||
|  |  | ||||||
| ------------------------------------------ | ------------------------------------------ | ||||||
| sledgehammer999 <sledgehammer999@qbittorrent.org> | Christophe Dumez <chris@qbittorrent.org> | ||||||
|  |  | ||||||
							
								
								
									
										4
									
								
								configure
									
									
									
									
										vendored
									
									
								
							
							
						
						| @@ -507,11 +507,11 @@ public: | |||||||
| #if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16 | #if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16 | ||||||
|     required_libs << "filesystem" ; |     required_libs << "filesystem" ; | ||||||
| #endif | #endif | ||||||
|     //required_libs << "thread"; |     required_libs << "thread"; | ||||||
|     QStringList libDirs; |     QStringList libDirs; | ||||||
|     if (!s.isEmpty()) |     if (!s.isEmpty()) | ||||||
|       libDirs << s; |       libDirs << s; | ||||||
|     libDirs << "/usr/lib/" << "/usr/lib/i386-linux-gnu/" << "/usr/lib64/" << "/usr/lib/x86_64-linux-gnu/" << "/usr/local/lib/" << "/usr/lib/local/i386-linux-gnu/" << "/usr/local/lib64/" << "/usr/local/lib/x86_64-linux-gnu/"; |     libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/"; | ||||||
|  |  | ||||||
|     foreach(const QString& lib, required_libs) { |     foreach(const QString& lib, required_libs) { | ||||||
|       bool found = false; |       bool found = false; | ||||||
|   | |||||||
| @@ -8,7 +8,7 @@ qBittorrent\-nox \- a command line Bittorrent client written in C++ / Qt4 | |||||||
|  |  | ||||||
| .SH "SYNOPSIS" | .SH "SYNOPSIS" | ||||||
|  |  | ||||||
| \fBqbittorrent\-nox\fR [\-\-d|\-\-daemon] [\-\-webui-port=x] [TORRENT_FILE | URL]... | \fBqbittorrent\-nox\fR [\-\-webui-port=x] [TORRENT_FILE | URL]... | ||||||
|  |  | ||||||
| \fBqbittorrent\-nox\fR \-\-help | \fBqbittorrent\-nox\fR \-\-help | ||||||
|  |  | ||||||
|   | |||||||
| @@ -146,11 +146,6 @@ development, you can do so in one of the following ways: | |||||||
| 7. HISTORY | 7. HISTORY | ||||||
| ========== | ========== | ||||||
|  |  | ||||||
| 2012-09-19 |  | ||||||
|  |  | ||||||
|   * updated to 3.0.4 code level of QBittorrent |  | ||||||
|   * updated libtorrent to 0.16.3 level |  | ||||||
|  |  | ||||||
| 2012-09-06 | 2012-09-06 | ||||||
|  |  | ||||||
|   * updated to 3.0.2 code level of QBittorrent |   * updated to 3.0.2 code level of QBittorrent | ||||||
|   | |||||||
							
								
								
									
										55
									
								
								macxconf.pri
									
									
									
									
									
								
							
							
						
						| @@ -7,60 +7,25 @@ CONFIG += link_pkgconfig | |||||||
| PKGCONFIG += libtorrent-rasterbar | PKGCONFIG += libtorrent-rasterbar | ||||||
| DEFINES += BOOST_ASIO_DYN_LINK | DEFINES += BOOST_ASIO_DYN_LINK | ||||||
|  |  | ||||||
| # Special include/libs paths (homebrew and macports) | # Special include/libs paths (macports) | ||||||
| INCLUDEPATH += /usr/local/include /opt/local/include /usr/include | INCLUDEPATH += /usr/include/openssl /usr/include /opt/local/include/boost /opt/local/include | ||||||
| LIBS += -L/usr/local/lib -L/opt/local/lib -L/usr/lib | LIBS += -L/opt/local/lib | ||||||
|  |  | ||||||
|  | # OpenSSL lib | ||||||
|  | LIBS += -lssl -lcrypto | ||||||
| # Boost system lib | # Boost system lib | ||||||
| LIBS += -lboost_system-mt | LIBS += -lboost_system-mt | ||||||
| # Boost filesystem lib (Not needed for libtorrent >= 0.16.0) | # Boost filesystem lib (Not needed for libtorrent >= 0.16.0) | ||||||
| #LIBS += -lboost_filesystem-mt | LIBS += -lboost_filesystem-mt | ||||||
| # Carbon | # Carbon | ||||||
| LIBS += -framework Carbon -framework IOKit | LIBS += -framework Carbon -framework IOKit | ||||||
| # Zlib |  | ||||||
| LIBS += -lz |  | ||||||
|  |  | ||||||
| document_icon.path = Contents/Resources | document_icon.path = Contents/Resources | ||||||
| document_icon.files = mac/qBitTorrentDocument.icns | document_icon.files = Icons/qBitTorrentDocument.icns | ||||||
|  |  | ||||||
| QMAKE_BUNDLE_DATA += document_icon | QMAKE_BUNDLE_DATA += document_icon | ||||||
|  | ICON = Icons/qbittorrent_mac.icns | ||||||
| qt_conf.path = Contents/Resources | QMAKE_INFO_PLIST = Info.plist | ||||||
| qt_conf.files = mac/qt.conf |  | ||||||
| QMAKE_BUNDLE_DATA += qt_conf |  | ||||||
| QMAKE_MACOSX_DEPLOYMENT_TARGET = 10.7 |  | ||||||
|  |  | ||||||
| qt_translations.path = Contents/translations |  | ||||||
| qt_translations.files = qt-translations/qt_ar.qm \ |  | ||||||
|                         qt-translations/qt_bg.qm \ |  | ||||||
|                         qt-translations/qt_ca.qm \ |  | ||||||
|                         qt-translations/qt_cs.qm \ |  | ||||||
|                         qt-translations/qt_da.qm \ |  | ||||||
|                         qt-translations/qt_de.qm \ |  | ||||||
|                         qt-translations/qt_es.qm \ |  | ||||||
|                         qt-translations/qt_fi.qm \ |  | ||||||
|                         qt-translations/qt_fr.qm \ |  | ||||||
|                         qt-translations/qt_gl.qm \ |  | ||||||
|                         qt-translations/qt_he.qm \ |  | ||||||
|                         qt-translations/qt_hu.qm \ |  | ||||||
|                         qt-translations/qt_it.qm \ |  | ||||||
|                         qt-translations/qt_ja.qm \ |  | ||||||
|                         qt-translations/qt_ko.qm \ |  | ||||||
|                         qt-translations/qt_lt.qm \ |  | ||||||
|                         qt-translations/qt_nl.qm \ |  | ||||||
|                         qt-translations/qt_pl.qm \ |  | ||||||
|                         qt-translations/qt_pt.qm \ |  | ||||||
|                         qt-translations/qt_pt_BR.qm \ |  | ||||||
|                         qt-translations/qt_ru.qm \ |  | ||||||
|                         qt-translations/qt_sk.qm \ |  | ||||||
|                         qt-translations/qt_sv.qm \ |  | ||||||
|                         qt-translations/qt_tr.qm \ |  | ||||||
|                         qt-translations/qt_uk.qm \ |  | ||||||
|                         qt-translations/qt_zh_CN.qm \ |  | ||||||
|                         qt-translations/qt_zh_TW.qm |  | ||||||
| QMAKE_BUNDLE_DATA += qt_translations |  | ||||||
|  |  | ||||||
| ICON = mac/qbittorrent_mac.icns |  | ||||||
| QMAKE_INFO_PLIST = mac/Info.plist |  | ||||||
|  |  | ||||||
| DEFINES += WITH_GEOIP_EMBEDDED | DEFINES += WITH_GEOIP_EMBEDDED | ||||||
| message("On Mac OS X, GeoIP database must be embedded.") | message("On Mac OS X, GeoIP database must be embedded.") | ||||||
|   | |||||||
| @@ -7,13 +7,12 @@ LIBS += -ltorrent-rasterbar \ | |||||||
|         -lboost_thread \ |         -lboost_thread \ | ||||||
|         -lboost_system \ |         -lboost_system \ | ||||||
|         -lboost_filesystem \ |         -lboost_filesystem \ | ||||||
|         -lssl -lcrypto -lidn -lpthread -lz |         -lssl -lcrypto -lidn -lpthread | ||||||
|  |  | ||||||
| RC_FILE = qbittorrent_os2.rc | RC_FILE = qbittorrent_os2.rc | ||||||
|  |  | ||||||
| # LIBTORRENT DEFINES | # LIBTORRENT DEFINES | ||||||
| DEFINES += WITH_SHIPPED_GEOIP_H | DEFINES += WITH_SHIPPED_GEOIP_H | ||||||
| DEFINES += BOOST_ASIO_DYN_LINK |  | ||||||
|  |  | ||||||
| DEFINES += WITH_GEOIP_EMBEDDED | DEFINES += WITH_GEOIP_EMBEDDED | ||||||
| message("On eCS(OS/2), GeoIP database must be embedded.") | message("On eCS(OS/2), GeoIP database must be embedded.") | ||||||
|   | |||||||
| @@ -3,7 +3,6 @@ TEMPLATE = subdirs | |||||||
| SUBDIRS += src | SUBDIRS += src | ||||||
|  |  | ||||||
| include(version.pri) | include(version.pri) | ||||||
| include(qm_gen.pri) |  | ||||||
|  |  | ||||||
| # Dist | # Dist | ||||||
| dist.commands += rm -fR ../$${PROJECT_NAME}-$${PROJECT_VERSION}/ && | dist.commands += rm -fR ../$${PROJECT_NAME}-$${PROJECT_VERSION}/ && | ||||||
|   | |||||||
| @@ -71,11 +71,11 @@ public: | |||||||
| #if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16 | #if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16 | ||||||
|     required_libs << "filesystem" ; |     required_libs << "filesystem" ; | ||||||
| #endif | #endif | ||||||
|     //required_libs << "thread"; |     required_libs << "thread"; | ||||||
|     QStringList libDirs; |     QStringList libDirs; | ||||||
|     if (!s.isEmpty()) |     if (!s.isEmpty()) | ||||||
|       libDirs << s; |       libDirs << s; | ||||||
|     libDirs << "/usr/lib/" << "/usr/lib/i386-linux-gnu/" << "/usr/lib64/" << "/usr/lib/x86_64-linux-gnu/" << "/usr/local/lib/" << "/usr/lib/local/i386-linux-gnu/" << "/usr/local/lib64/" << "/usr/local/lib/x86_64-linux-gnu/"; |     libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/"; | ||||||
|  |  | ||||||
|     foreach(const QString& lib, required_libs) { |     foreach(const QString& lib, required_libs) { | ||||||
|       bool found = false; |       bool found = false; | ||||||
|   | |||||||
							
								
								
									
										19
									
								
								qm_gen.pri
									
									
									
									
									
								
							
							
						
						| @@ -1,19 +0,0 @@ | |||||||
| TS_IN = $$fromfile(src/src.pro,TRANSLATIONS) |  | ||||||
| TS_IN_NOEXT = $$replace(TS_IN,".ts","") |  | ||||||
|               |  | ||||||
| isEmpty(QMAKE_LRELEASE) { |  | ||||||
|     win32|os2:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe |  | ||||||
|     else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease |  | ||||||
|     unix { |  | ||||||
|         !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease-qt4 } |  | ||||||
|     } else { |  | ||||||
|         !exists($$QMAKE_LRELEASE) { QMAKE_LRELEASE = lrelease } |  | ||||||
|     } |  | ||||||
| } |  | ||||||
|  |  | ||||||
| message("Building translations") |  | ||||||
| for(L,TS_IN_NOEXT) { |  | ||||||
|     message("Processing $${L}") |  | ||||||
|     system("$$QMAKE_LRELEASE -silent src/$${L}.ts -qm src/$${L}.qm") |  | ||||||
|     !exists("src/$${L}.qm"):error("Building translations failed, cannot continue") |  | ||||||
| } |  | ||||||
| Before Width: | Height: | Size: 4.5 KiB After Width: | Height: | Size: 7.0 KiB | 
| Before Width: | Height: | Size: 1.3 KiB | 
| @@ -2,120 +2,40 @@ | |||||||
| Categories=Network;FileTransfer;P2P;Qt; | Categories=Network;FileTransfer;P2P;Qt; | ||||||
| Exec=qbittorrent %U | Exec=qbittorrent %U | ||||||
| GenericName=BitTorrent client | GenericName=BitTorrent client | ||||||
|  | GenericName[ar]=العميل BitTorrent | ||||||
|  | GenericName[bg]=Торент клиент | ||||||
|  | GenericName[cs]=BitTorrent klient | ||||||
|  | GenericName[de]=BitTorren Client | ||||||
|  | GenericName[el]=BitTorrent πελάτης | ||||||
|  | GenericName[es]=Cliente BitTorrent | ||||||
|  | GenericName[fi]=BitTorrent-ohjelma | ||||||
|  | GenericName[fr]=Client BitTorrent | ||||||
|  | GenericName[hr]=BitTorrent klijent | ||||||
|  | GenericName[hu]=BitTorrent kliens | ||||||
|  | GenericName[it]=Client BitTorrent | ||||||
|  | GenericName[ja]=BitTorrent クライアント | ||||||
|  | GenericName[ko]=비토렌트 클라이언트 | ||||||
|  | GenericName[lt]=BitTorrent klientas | ||||||
|  | GenericName[nl]=BitTorrent-cliënt | ||||||
|  | GenericName[pl]=Klient BitTorrent | ||||||
|  | GenericName[pt]=Cliente BitTorrent | ||||||
|  | GenericName[pt_BR]=Cliente BitTorrent | ||||||
|  | GenericName[ro]=Client BitTorrent | ||||||
|  | GenericName[ru]=клиент BitTorrent | ||||||
|  | GenericName[sk]=Klient siete BitTorrent | ||||||
|  | GenericName[sr]=BitTorrent-клијент | ||||||
|  | GenericName[sv]=BitTorrent-klient | ||||||
|  | GenericName[tr]=BitTorrent istemcisi | ||||||
|  | GenericName[uk]=BitTorrent-клієнт | ||||||
|  | GenericName[zh]=BitTorrent之用户 | ||||||
|  | GenericName[zh_TW]=BitTorrent客戶端 | ||||||
| Comment=Download and share files over BitTorrent | Comment=Download and share files over BitTorrent | ||||||
|  | Comment[fr]=Télécharger et partager des fichiers avec BitTorrent | ||||||
|  | Comment[pl]=Dzielenie się plikami przez BitTorrent | ||||||
| Icon=qbittorrent | Icon=qbittorrent | ||||||
| MimeType=application/x-bittorrent;x-scheme-handler/magnet; | MimeType=application/x-bittorrent;x-scheme-handler/magnet; | ||||||
| Name=qBittorrent | Name=qBittorrent | ||||||
|  | Name[ko]=큐비토런트 | ||||||
| Terminal=false | Terminal=false | ||||||
| Type=Application | Type=Application | ||||||
| StartupNotify=false |  | ||||||
| StartupWMClass=qbittorrent |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
| # Translations |  | ||||||
|  |  | ||||||
|  |  | ||||||
| # Translations |  | ||||||
| GenericName[ar]=العميل BitTorrent |  | ||||||
| Comment[be]=Сцягванне і раздача файлаў праз пратакол BitTorrent |  | ||||||
| GenericName[be]=BitTorrent-кліент |  | ||||||
| Name[be]=qBittorrent |  | ||||||
| Icon[be]=qbittorrent |  | ||||||
| GenericName[bg]=Торент клиент |  | ||||||
| Comment[cs]=Stahování a sdílení souborů přes síť BitTorrent |  | ||||||
| GenericName[cs]=BitTorrent klient |  | ||||||
| Name[cs]=qBittorrent |  | ||||||
| Icon[cs]=qbittorrent |  | ||||||
| GenericName[de]=BitTorren Client |  | ||||||
| Comment[el]=Λήψη και διαμοιρασμός αρχείων μέσω BitTorrent |  | ||||||
| GenericName[el]=BitTorrent πελάτης |  | ||||||
| Name[el]=qBittorrent |  | ||||||
| Icon[el]=qbittorrent |  | ||||||
| Comment[en_GB]=Download and share files over BitTorrent |  | ||||||
| GenericName[en_GB]=BitTorrent client |  | ||||||
| Name[en_GB]=qBittorrent |  | ||||||
| Icon[en_GB]=qbittorrent |  | ||||||
| Comment[es]=Descarga y comparte archivos por BitTorrent |  | ||||||
| GenericName[es]=Cliente BitTorrent |  | ||||||
| Name[es]=qBittorrent |  | ||||||
| Icon[es]=qbittorrent |  | ||||||
| Comment[eu]=Jeitsi eta elkarbanatu agiriak BitTorrent-en |  | ||||||
| GenericName[eu]=BitTorrent bezeroa |  | ||||||
| Name[eu]=qBittorrent |  | ||||||
| Icon[eu]=qbittorrent |  | ||||||
| Comment[fi]=Lataa ja jaa tiedostoja BitTorrentia käyttäen |  | ||||||
| GenericName[fi]=BitTorrent-ohjelma |  | ||||||
| Name[fi]=qBittorrent |  | ||||||
| Icon[fi]=qbittorrent |  | ||||||
| Comment[fr]=Télécharger et partager des fichiers avec BitTorrent |  | ||||||
| GenericName[fr]=Client BitTorrent |  | ||||||
| Comment[gl]=Descargue e comparta ficheiros co protocolo BitTorrent |  | ||||||
| GenericName[gl]=Cliente BitTorrent |  | ||||||
| Name[gl]=qBittorrent |  | ||||||
| Icon[gl]=qbittorrent |  | ||||||
| GenericName[hr]=BitTorrent klijent |  | ||||||
| GenericName[hu]=BitTorrent kliens |  | ||||||
| Comment[it]=Client BitTorrent per il download di file via internet |  | ||||||
| GenericName[it]=Client BitTorrent |  | ||||||
| Name[it]=qBittorrent |  | ||||||
| Icon[it]=qbittorrent |  | ||||||
| Comment[ja]=BitTorrent でファイルをダウンロードおよび共有します |  | ||||||
| GenericName[ja]=BitTorrent クライアント |  | ||||||
| Name[ja]=qBittorrent |  | ||||||
| Icon[ja]=qbittorrent |  | ||||||
| GenericName[ko]=비토렌트 클라이언트 |  | ||||||
| Name[ko]=큐비토런트 |  | ||||||
| GenericName[zh]=BitTorrent之用户 |  | ||||||
| Comment[lt]=Atsisiųskite bei dalinkitės failais BitTorrent tinkle |  | ||||||
| GenericName[lt]=BitTorrent klientas |  | ||||||
| Name[lt]=qBittorrent |  | ||||||
| Icon[lt]=qbittorrent |  | ||||||
| Comment[nb]=Last ned og del filer over BitTorrent |  | ||||||
| GenericName[nb]=BitTorrent-klient |  | ||||||
| Name[nb]=qBittorrent |  | ||||||
| Icon[nb]=qbittorrent |  | ||||||
| GenericName[nl]=BitTorrent-cliënt |  | ||||||
| Comment[pl]=Dzielenie się plikami przez BitTorrent |  | ||||||
| GenericName[pl]=Klient BitTorrent |  | ||||||
| Name[pl]=qBittorrent |  | ||||||
| Icon[pl]=qbittorrent |  | ||||||
| Comment[pt]=Transferir e partilhar ficheiros por BitTorrent |  | ||||||
| GenericName[pt]=Aplicação BitTorrent |  | ||||||
| Name[pt]=qBittorrent |  | ||||||
| Icon[pt]=qbittorrent |  | ||||||
| Comment[pt_BR]=Baixe e compartilhe arquivos através do qBittorrent |  | ||||||
| GenericName[pt_BR]=Cliente BitTorrent |  | ||||||
| Name[pt_BR]=qBittorrent |  | ||||||
| Icon[pt_BR]=qbittorrent |  | ||||||
| Comment[ro]=Descărcați  și partajați fișiere prin BitTorrent |  | ||||||
| GenericName[ro]=Client BitTorrent |  | ||||||
| Name[ro]=qBittorrent |  | ||||||
| Icon[ro]=qbittorrent |  | ||||||
| Comment[ru]=Скачивайте и делитесь файлами с помощью BitTorrent |  | ||||||
| GenericName[ru]=клиент BitTorrent |  | ||||||
| Name[ru]=qBittorrent |  | ||||||
| Icon[ru]=qbittorrent |  | ||||||
| GenericName[sk]=Klient siete BitTorrent |  | ||||||
| GenericName[sr]=BitTorrent-клијент |  | ||||||
| Comment[sv]=Hämta och dela filer över BitTorrent |  | ||||||
| GenericName[sv]=BitTorrent-klient |  | ||||||
| Name[sv]=qBittorrent |  | ||||||
| Icon[sv]=qbittorrent |  | ||||||
| GenericName[tr]=BitTorrent istemcisi |  | ||||||
| Comment[uk]=Завантажувати і обмінюватися файлами через BitTorrent |  | ||||||
| GenericName[uk]=BitTorrent-клієнт |  | ||||||
| Name[uk]=qBittorrent |  | ||||||
| Icon[uk]=qbittorrent |  | ||||||
| Comment[vi]=Tải về và chia sẻ các tập tin thông qua BitTorrent |  | ||||||
| GenericName[vi]=Máy trạm dạng BitTorrent |  | ||||||
| Name[vi]=qBittorrent |  | ||||||
| Icon[vi]=qbittorrent |  | ||||||
| Comment[zh_TW]=經由 BitTorrent 下載並分享檔案 |  | ||||||
| GenericName[zh_TW]=BitTorrent 客戶端 |  | ||||||
| Name[zh_TW]=qBittorrent |  | ||||||
| Icon[zh_TW]=qbittorrent |  | ||||||
| Comment[en_AU]=Download and share files over BitTorrent |  | ||||||
| GenericName[en_AU]=BitTorrent client |  | ||||||
| Name[en_AU]=qBittorrent |  | ||||||
| Icon[en_AU]=qbittorrent |  | ||||||
|   | |||||||
| Before Width: | Height: | Size: 593 B After Width: | Height: | Size: 3.3 KiB | 
| Before Width: | Height: | Size: 590 B After Width: | Height: | Size: 3.2 KiB | 
| Before Width: | Height: | Size: 426 B After Width: | Height: | Size: 3.0 KiB | 
| Before Width: | Height: | Size: 522 B After Width: | Height: | Size: 3.1 KiB | 
| Before Width: | Height: | Size: 443 B After Width: | Height: | Size: 3.1 KiB | 
| Before Width: | Height: | Size: 495 B After Width: | Height: | Size: 3.1 KiB | 
| Before Width: | Height: | Size: 359 B After Width: | Height: | Size: 2.9 KiB | 
| Before Width: | Height: | Size: 538 B After Width: | Height: | Size: 3.1 KiB | 
| Before Width: | Height: | Size: 591 B After Width: | Height: | Size: 3.2 KiB | 
| Before Width: | Height: | Size: 583 B After Width: | Height: | Size: 3.1 KiB | 
| @@ -45,21 +45,17 @@ | |||||||
| 	<key>CFBundlePackageType</key> | 	<key>CFBundlePackageType</key> | ||||||
| 	<string>APPL</string> | 	<string>APPL</string> | ||||||
| 	<key>CFBundleShortVersionString</key> | 	<key>CFBundleShortVersionString</key> | ||||||
| 	<string>3.1.12</string> | 	<string>3.0.2</string> | ||||||
| 	<key>CFBundleSignature</key> | 	<key>CFBundleSignature</key> | ||||||
| 	<string>qBit</string> | 	<string>qBit</string> | ||||||
| 	<key>CFBundleExecutable</key> | 	<key>CFBundleExecutable</key> | ||||||
| 	<string>qbittorrent</string> | 	<string>qbittorrent</string> | ||||||
| 	<key>CFBundleIdentifier</key> | 	<key>CFBundleIdentifier</key> | ||||||
| 	<string>org.qbittorrent</string> | 	<string>org.qbittorrent</string> | ||||||
| 	<key>NSPrincipalClass</key> |  | ||||||
| 	<string>NSApplication</string> |  | ||||||
| 	<key>NSHighResolutionCapable</key> |  | ||||||
| 	<string>True</string> |  | ||||||
| 	<key>NSAppleScriptEnabled</key> | 	<key>NSAppleScriptEnabled</key> | ||||||
| 	<string>YES</string> | 	<string>YES</string> | ||||||
| 	<key>NSHumanReadableCopyright</key> | 	<key>NSHumanReadableCopyright</key> | ||||||
| 	<string>Copyright © 2006-2015 The qBittorrent project</string> | 	<string>Copyright © 2006-2012 Christophe Dumez</string> | ||||||
| 	<key>UTExportedTypeDeclarations</key> | 	<key>UTExportedTypeDeclarations</key> | ||||||
| 	<array> | 	<array> | ||||||
| 		<dict> | 		<dict> | ||||||