Compare commits
	
		
			49 Commits
		
	
	
		
			release-3.
			...
			release-2.
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | eda04b3ef3 | ||
|   | 3ef6e7bf65 | ||
|   | 146cf9a435 | ||
|   | dff6b057b9 | ||
|   | 3b7448dfc7 | ||
|   | 4e4ac771a9 | ||
|   | 06a376d014 | ||
|   | b3d2f9b701 | ||
|   | 055a99239b | ||
|   | e779c9a7db | ||
|   | b0f7f5ae58 | ||
|   | 512ab58832 | ||
|   | 9ad088682c | ||
|   | d2fad8249c | ||
|   | 20fb7c3adf | ||
|   | c4fdfec420 | ||
|   | a3e03e739c | ||
|   | 9846dc0fff | ||
|   | 1b29b148d8 | ||
|   | 6dab35cb8e | ||
|   | 6b2d922005 | ||
|   | 1d92ae6382 | ||
|   | 62f4d6386a | ||
|   | e74ef4c6fd | ||
|   | 282ee0e879 | ||
|   | 697d2ccb71 | ||
|   | 71d163d743 | ||
|   | 83685942de | ||
|   | 6f34c81014 | ||
|   | 5e826dffc8 | ||
|   | b4dc66020c | ||
|   | cb4741ed89 | ||
|   | 4c3976e5df | ||
|   | fd7fb115ff | ||
|   | 197d5b3a05 | ||
|   | 624d6aa6a1 | ||
|   | 28d7dc137b | ||
|   | 351d84e2f7 | ||
|   | 774b8f4fd6 | ||
|   | 2fc6470696 | ||
|   | 1038b00553 | ||
|   | c3b37b4f1f | ||
|   | 41faf341cc | ||
|   | 44e92a7f3d | ||
|   | 599f956269 | ||
|   | 79a9606e86 | ||
|   | 5b576baf67 | ||
|   | aa3ce90478 | ||
|   | 2c433e35b0 | 
							
								
								
									
										3
									
								
								.gitignore
									
									
									
									
										vendored
									
									
								
							
							
						
						| @@ -1,6 +1,6 @@ | ||||
| src/geoip/GeoIP.dat | ||||
| src/qbittorrent | ||||
| qbittorrent.pro.user* | ||||
| qbittorrent.pro.user | ||||
| conf.pri | ||||
| Makefile | ||||
| *.pyc | ||||
| @@ -12,4 +12,3 @@ moc_*.cpp | ||||
| qrc_*.cpp | ||||
| ui_*.h | ||||
| *.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 | ||||
							
								
								
									
										44
									
								
								AUTHORS
									
									
									
									
									
								
							
							
						
						| @@ -1,7 +1,4 @@ | ||||
| Current maintainer: | ||||
| * Sledgehammer999 <sledgehammer999@qbittorrent.org> | ||||
|  | ||||
| Original author: | ||||
| Author: | ||||
| * Christophe Dumez <chris@qbittorrent.org> | ||||
|  | ||||
| Contributors: | ||||
| @@ -14,7 +11,6 @@ Contributors: | ||||
| * Grigis Gaëtan <cipher16@gmail.com> | ||||
| * Christian Kandeler <zambesi@users.sourceforge.net> | ||||
| * Silvan Scherrer <silvan.scherrer@aroa.ch> | ||||
| * Nick Tiskov <daymansmail@gmail.com> | ||||
|  | ||||
| Code from other projects: | ||||
| * files src/qtsingleapp/* src/lineedit/* | ||||
| @@ -29,10 +25,6 @@ Code from other projects: | ||||
|   copyright: Dan Haim <negativeiq@users.sourceforge.net> | ||||
|   license: BSD | ||||
|  | ||||
| * file src/stacktrace_win.h | ||||
|   copyright: Quassel Project | ||||
|   license: GPLv2/3 | ||||
|  | ||||
| Images Authors: | ||||
| * files: src/Icons/*.png | ||||
|   copyright: Gnome Icon Theme | ||||
| @@ -79,46 +71,40 @@ Images Authors: | ||||
|  | ||||
| Translations authors: | ||||
| * files: src/lang/*.ts | ||||
| * file: src/Icons/qBittorrent.desktop | ||||
|   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) | ||||
|   - Basque: Xabier Aramendi (azpidatziak@gmail.com) | ||||
|   - Belarusian: Mihas Varantsou (meequz@gmail.com) | ||||
|   - Brazilian: Nick Marinho (nickmarinho@gmail.com) | ||||
|   - Bulgarian: Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net) | ||||
|   - Catalan: Francisco Luque Contreras (frannoe@ya.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) | ||||
|   - Czech: Jirka Vilim (web@tets.cz) and Petr Cernobila abr(Transifex) | ||||
|   - Czech: Jirka Vilim (web@tets.cz) | ||||
|   - Danish: Mathias Nielsen (comoneo@gmail.com) | ||||
|   - Dutch: Pieter Heyvaert (pieter_heyvaert@hotmail.com) | ||||
|   - English: Christophe Dumez (chris@qbittorrent.org) | ||||
|   - English(Australia): Robert Readman readmanr(Transifex) | ||||
|   - 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) | ||||
|   - Finnish: Niklas Laxström (nikerabbit@users.sourceforge.net) | ||||
|   - 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) | ||||
|   - 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) | ||||
|   - Hebrew: David Deutsch (d.deffo@gmail.com) | ||||
|   - Greek: Tsvetan Bankov (emerge_life@users.sourceforge.net) and Stephanos Antaris (santaris@csd.auth.gr) | ||||
|   - 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) | ||||
|   - Korean: Jin Woo Sin (jin828sin@users.sourceforge.net) | ||||
|   - Lithuanian: Naglis Jonaitis (njonaitis@gmail.com) | ||||
|   - Norwegian: Tomaso | ||||
|   - Polish: Mariusz Fik (fisiu@opensuse.org) | ||||
|   - Portuguese: Sérgio Marques smarquespt(Transifex) | ||||
|   - Portuguese(Brazil): Nick Marinho (nickmarinho@gmail.com) | ||||
|   - Romanian: Obada Denis (obadadenis@users.sourceforge.net), Adrian Gabor Adriannho(Transifex) and Mihai Coman z0id(Transifex) | ||||
|   - 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) | ||||
|   - Portuguese: Nick Marinho (nickmarinho@gmail.com) | ||||
|   - Romanian: Obada Denis (obadadenis@users.sourceforge.net) | ||||
|   - Russian: Nick Khazov (m2k3d0n at users.sourceforge.net) | ||||
|   - Serbian: Anaximandar Milet (anaximandar at operamail.com) | ||||
|   - Slovak:  helix84 | ||||
|   - Spanish: Francisco Luque Contreras (frannoe@ya.com), Alfredo Monclus alfrix(Transifex) and José Antonio Moray moray33(Transifex) | ||||
|   - Swedish: Daniel Nylander (po@danielnylander.se) and Emil Hammarberg Ooglogput(Transifex) | ||||
|   - Spanish: Francisco Luque Contreras (frannoe@ya.com) | ||||
|   - Swedish: Daniel Nylander (po@danielnylander.se) | ||||
|   - Turkish: Hasan Yilmaz (iletisim@hedefturkce.com) | ||||
|   - Ukrainian: Oleh Prypin (blaxpirit@gmail.com) and zubr139(Transifex) | ||||
|   - Vietnamese: Anh Phan ppanhh(Transifex) | ||||
|   - Ukrainian: Andrey Shpachenko (masterfix@users.sourceforge.net) and Oleh Prypin (blaxpirit@gmail.com) | ||||
|   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 | ||||
| modification follow. | ||||
|  | ||||
|  | ||||
| 		    GNU GENERAL PUBLIC LICENSE | ||||
|    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 | ||||
|     does not normally print such an announcement, your work based on | ||||
|     the Program is not required to print an announcement.) | ||||
|  | ||||
|  | ||||
| These requirements apply to the modified work as a whole.  If | ||||
| identifiable sections of that work are not derived from the Program, | ||||
| 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 | ||||
| distribution of the source code, even though third parties are not | ||||
| compelled to copy the source along with the object code. | ||||
|  | ||||
|  | ||||
|   4. You may not copy, modify, sublicense, or distribute the Program | ||||
| except as expressly provided under this License.  Any attempt | ||||
| 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 | ||||
| be a consequence of the rest of this License. | ||||
|  | ||||
|  | ||||
|   8. If the distribution and/or use of the Program is restricted in | ||||
| certain countries either by patents or by copyrighted interfaces, the | ||||
| 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. | ||||
|  | ||||
| 		     END OF TERMS AND CONDITIONS | ||||
|  | ||||
|  | ||||
| 	    How to Apply These Terms to Your New Programs | ||||
|  | ||||
|   If you develop a new program, and you want it to be of the greatest | ||||
|   | ||||
							
								
								
									
										177
									
								
								Changelog
									
									
									
									
									
								
							
							
						
						| @@ -1,152 +1,39 @@ | ||||
| * Sun Feb 02 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.7 | ||||
|     - BUGFIX: Fix build of v3.1.6 | ||||
| * Sat Feb 18 2012 - Christophe Dumez <chris@qbittorrent.org> - v2.9.5 | ||||
|     - BUGFIX: Fix crash when disabling then reenabling RSS | ||||
|     - BUGFIX: Fix duplicate torrent detection when adding a magnet link | ||||
|     - BUGFIX: Fix import of new trackers when adding a torrent with same hash (Closes #747000) | ||||
|     - BUGFIX: Fix possible redownload of torrents marked as read (Closes #927495) | ||||
|     - BUGFIX: Properly remove RSS feed settings/history upon feed removal | ||||
|  | ||||
| * Sun Feb 02 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.6 | ||||
|     - BUGFIX: Fix 'preview file' regression. Closes #1285. (sledgehammer999) | ||||
|     - BUGFIX: Fix peers and seeds sorting in transfer list. (Angel Alonso) | ||||
|     - BUGFIX: Fix btdigg search engine. (BTDigg research team) | ||||
|     - BUGFIX: Save statistics every 15min and only if there was new traffic. Fixes #1288 and partially #1272. (sledgehammer999) | ||||
|     - BUGFIX: Fix share ratio text in the 'general' tab. (sledgehammer999) | ||||
|     - BUGFIX: Output a more generic message when blocking IPs and don't use italics in the log. (sledgehammer999) | ||||
|     - BUGFIX: Allow 2 decimals when setting the share ratio. Closes #1303. (sledgehammer999) | ||||
|     - BUGFIX: Fix extratorrents search plugin. (sledgehammer999) | ||||
|     - BUGFIX: Use shorter names for amount columns in main UI (Gelmir) | ||||
|     - BUGFIX: Fix overstretched options dialog. Closes #1293. (sledgehammer999) | ||||
|     - BUGFIX: Don't show a popup menu when no torrent is selected. (sledgehammer999) | ||||
|     - BUGFIX: Launch external programs async and don't block. Closes #1252. (sledgehammer999) | ||||
|     - BUGFIX: Don't re-announce to trackers when torrent is paused. Closes #1310. (sledgehammer999) | ||||
|     - BUGFIX: Bring dialog boxes in the front when qbt doesn't have focus. (sledgehammer999) | ||||
|     - BUGFIX: Correctly resize 'name' column of the content tab. Closes #1360. (sledgehammer999) | ||||
|     - BUGFIX: Correctly restore 'name' column width when loading magnet links in the 'Add new torrent dialog'. Closes #1334. (sledgehammer999) | ||||
|     - WEBUI: Fix sorting by size in WebUI when non-default locale used. (Vladimir Golovnev) | ||||
|     - UI: Reposition statistics menu item. (sledgehammer999) | ||||
|     - UI: Convert more accurately decimal numbers to text. (sledgehammer999) | ||||
|     - WINDOWS/OSX: Improvements on the behavior of the program updater(closes #1282) (sledgehammer999) | ||||
|     - LINUX: Explicitle tell that we don't support freedesktop's startup notify standard. Fixes GNOME issues. Closes #1217. (sledgehammer999) | ||||
|     - LINUX: Add our WM_CLASS in the .desktop file so window managers know how to group our windows. (sledgehammer999) | ||||
|     - OTHER: Sync translations from Transifex. | ||||
| * Sat Feb 18 2012 - Christophe Dumez <chris@qbittorrent.org> - v2.9.4 | ||||
|     - BUGFIX: qBittorrent does not handle redirection to relative URLs correctly (Closes #919905) | ||||
|     - BUGFIX: Cmd+M minimizes main window on Mac OS X (Closes #928216) | ||||
|     - BUGFIX: Cmd+Del removes torrents on Mac OS X (Closes #928852) | ||||
|     - BUGFIX: Fix potential bug when moving single file torrents to tmp folder (closes #932861) | ||||
|     - BUGFIX: Fix torrent import dialog layout (Closes #930932) | ||||
|     - BUGFIX: Prevent log window buffer from filling up (Closes #929673) | ||||
|     - I18N: Add Belarusian translation | ||||
|  | ||||
| * Thu 16 Jan 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.5 | ||||
|     - BUGFIX: Fix compilation with Qt 4.7. Closes #1215. (sledgehammer999) | ||||
|     - BUGFIX: Third attempt at fixing saving settings on OS shutdown. (sledgehammer999) | ||||
|     - BUGFIX: Preview now correctly uses the selected file. Closes #1222 #1182. (sledgehammer999) | ||||
|     - BUGFIX: Allow to resize the columns in Add New Torrent dialog. Closes #1207 #676 (sledgehammer999) | ||||
|     - BUGFIX: Ensure that at least one column in the tranferlist is always visible. Closes #1165. (sledgehammer999) | ||||
|     - BUGFIX: Ensure that the options window will always be placed onscreen. Closes #1226. (sledgehammer999) | ||||
|     - BUGFIX: Delete temporary files after they aren't needed. Closes #1188. (sledgehammer999) | ||||
|     - BUGFIX: Correctly detect libtorrent version. (sledgehammer999) | ||||
|     - BUGFIX: Various code cppcheck fixes (Konstantin Goncharik) | ||||
|     - BUGFIX: Remove isohunt search engine and update thepiratebay url (sledgehammer999) | ||||
|     - BUGFIX: Fix rss settings corruption when checking regexp and going to other rule. (Gelmir) | ||||
|     - BUGFIX: Don't count paused torrents for the autoshutdown. Closes #1280. (sledgehammer999) | ||||
|     - LINUX: Fix notifications with xfce4-notifyd. | ||||
|     - OSX: Added basic retina support. Closes #1251. (Sébastien Lavoie) | ||||
|     - OTHER: Sync translations from Transifex. | ||||
| * Thu Dec 29 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.9.3 | ||||
|     - BUGFIX: Fix btdigg plugin (Python3 support + torrent name in magnet links) | ||||
|     - BUGFIX: Fix banning of IPv6 peers (Closes #885021) | ||||
|     - BUGFIX: Fix torrent addition dialog layout problem (Closes #84650522) | ||||
|     - BUGFIX: Do not report any progress for disabled files (Closes #56731485) | ||||
|     - BUGFIX: Make torrent sorting case insensitive (Closes #857154) | ||||
|     - BUGFIX: Improve Web UI usability of small devices | ||||
|     - BUGFIX: Program updater: More reliable version detection / comparison | ||||
|     - I18N: Add Georgian translation | ||||
|  | ||||
| * Sun 29 Dec 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.4 | ||||
|     - FEATURE: Statistics dialog (Gelmir) | ||||
|     - FEATURE: Tooltips explaining each peer's connection flags (sledgehammer999) | ||||
|     - FEATURE: Win/Mac Check for program updates every 15min and allow the user to manually check for updates through the help menu. (sledgehammer999) | ||||
|     - BUGFIX: Better dialog message for torrent delete confirmation (sledgehammer999) | ||||
|     - BUGFIX: Fix resizing grip location. Closes #1146. (sledgehammer999) | ||||
|     - BUGFIX: Lock toolbar in place. Closes #1144. (sledgehammer999) | ||||
|     - BUGFIX: Second attempt at fixing saving settings on shutdown. (sledgehammer999) | ||||
|     - BUGFIX: Sort labels in 'Add new torrent' dialog. Closes #1150 #411. (sledgehammer999) | ||||
|     - LINUX: Fix build under Ubuntu 13.10 (sledgehammer999) | ||||
|     - LINUX: Make sleep and shutdown functions work on systemd's logind (Faheem Pervez) | ||||
| * Sat Oct 29 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.9.2 | ||||
|     - BUGFIX: Fix mimimum dimensions for torrent addition dialog | ||||
|     - BUGFIX: Remove dependency on boost-datetime | ||||
|     - BUGFIX: Remove dependency on boost-filesystem (libtorrent v0.16.x) | ||||
|  | ||||
| * Mon Nov 20 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.3 | ||||
|     - FEATURE: Add a key shortcut to "Add link to torrent..." (Angel Alonso) | ||||
|     - BUGFIX: Make all columns and headers use the same text alignment in the transferlist. (sledgehammer999) | ||||
|     - BUGFIX: Fix build system for Unix/Linux. (sledgehammer999) | ||||
|     - BUGFIX: Case insensitive sort in Peers list. Closes #1066. (sledgehammer999) | ||||
|     - BUGFIX: Small optimization of WebUI responses when there isn't a data payload. (sledgehammer999) | ||||
|     - BUGFIX: Hide empty folders after filtering. Closes #74. (sledgehammer999) | ||||
|     - BUGFIX: Expand folders when filtering files. Closes #1076. (sledgehammer999) | ||||
|     - BUGFIX: Updated search plugin's URL (Zach Thibeau) | ||||
|     - BUGFIX: Strip some png to fix incorrect sRGB profiles. (Angel Alonso) | ||||
|     - BUGFIX: Fixed font issues on OSX Mavericks (Zach Thibeau) | ||||
|     - BUGFIX: Improve text in the About dialog (Artem S. Tashkinov) | ||||
|     - BUGFIX: Always show a peer IP address as a tool tip (Artem S. Tashkinov) | ||||
|     - BUGFIX: Fix inhibit system functionality. Closes #766. (sledgehammer999) | ||||
|     - BUGFIX: WebUI: Don't gzip too small payloads. (sledgehammer999) | ||||
|     - BUGFIX: Correctly detect if the browser supports gzip compression. (sledgehammer999) | ||||
|     - BUGFIX: Fix WebUI link to 'Anonymous mode' explanation. Closes #1093. (sledgehammer999) | ||||
|     - BUGFIX: Correctly update tracker tier number in the trackers tab. Closes #1075. (sledgehammer999) | ||||
|     - BUGFIX: Speed improvements.(sledgehammer999) | ||||
|     - OTHER: Updated translations. | ||||
|      | ||||
| * Tue Nov 05 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.2 | ||||
|     - BUGFIX: Fix WebUI gzip compression. Closes #1037. (sledgehammer999) | ||||
|     - BUGFIX: Fix compilation with qt < 4.8.0. Closes #1043. (sledgehammer999) | ||||
|     - OTHER: Updated translations. | ||||
|  | ||||
| * Mon Oct 28 2013 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.1 | ||||
|     - FEATURE: Show external IP in the log. Closes #968. (sledgehammer999) | ||||
|     - FEATURE: Enable gzip compression in the webui. It should be faster now. (sledgehammer999) | ||||
|     - FEATURE: Torrents show more states(queued for checking, downloading metadata, allocating, checking resume). (sledgehammer999) | ||||
|     - FEATURE: Reenable "force reannounce" to all trackers. (sledgehammer999) | ||||
|     - FEATURE: Allow to clear the UI lock password. Closes #973. (sledgehammer999) | ||||
|     - FEATURE: New translations: English(Australia) and English(United Kingdom) | ||||
|     - BUGFIX: Expose all available translation in the WebUI. Closes #976. (sledgehammer999) | ||||
|     - BUGFIX: Copy IP copied wrong data. Closes #970 (sledgehammer999) | ||||
|     - BUGFIX: "Preview file..." didn't work on single file torrents. (sledgehammer999) | ||||
|     - BUGFIX: Fix and improve the scheduler (Gelmir and sledgehammer999) | ||||
|     - BUGFIX: RSS fixes. Closes #960, #998 (Gelmir) | ||||
|     - BUGFIX: Fix 'append label to save path' with magnet links. (sledgehammer999) | ||||
|     - BUGFIX: Can download up to 10MB .torrent file when a link is provided. Closes #879 (sledgehammer999) | ||||
|     - OTHER: Updated translations. | ||||
|     - LINUX: Fix missing conf.pri error (leigh123linux) | ||||
|     - WINDOWS: Don't remove file associations if they aren't our own. (sledgehammer999) | ||||
|  | ||||
| * Sat Oct 12 2013 - Christophe Dumez <chris@qbittorrent.org> and sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.0 | ||||
|     - FEATURE: Add command line option to daemonize qbittorrent-nox (ngaro) | ||||
|     - FEATURE: Add "Shutdown qBittorrent" button to Web UI (ngaro) | ||||
|     - FEATURE: Add setting to copy .torrent files for finished downloads (Driim) | ||||
|     - FEATURE: Add option to start qBittorrent on Windows startup (sledgehammer999) | ||||
|     - FEATURE: Add context menu to Web seed list (Gelmir) | ||||
|     - FEATURE: Add support for tracker tiers / groups to creator (Gelmir) | ||||
|     - FEATURE: Allow clearing execution and ban logs (Gelmir) | ||||
|     - FEATURE: Add option to use random port on each startup (ireallylikeher) | ||||
|     - FEATURE: Expose the cache expiry to the user (Gelmir) | ||||
|     - FEATURE: Support Atom feeds (Gelmir) | ||||
|     - FEATURE: Add "save path" column (John Peterson) | ||||
|     - FEATURE: Add μTorrent-compatible "Flags" column in the peer tab(sledgehammer999) | ||||
|     - FEATURE: Load magnet metadata in the background while the "Add New Torrent" Dialog is showing (Gelmir) | ||||
|     - FEATURE: Allow to enter only an info-hash for download(sledgehammer999) | ||||
|     - FEATURE: Bring the "Add New Torrent" Dialog to the front(glassez) | ||||
|     - BUGFIX: Add confirmation dialog for "Force recheck" action (closes #131) | ||||
|     - BUGFIX: Greatly improve RSS manager performance (closes #34) | ||||
|     - BUGFIX: Ensure that all columns in the tranferlist have a size > 0. | ||||
|     - BUGFIX: Don't mark RSS item as read when it failed to download (Gelmir) | ||||
|     - BUGFIX: Fix ETA calculation when some files are downloaded and marked afterwards as 'do not download'(sledgehammer999) | ||||
|     - BUGFIX: Make the UI show that PEX/DHT/LSD are actually disabled on private torrents(sledgehammer999) | ||||
|     - BUGFIX: Scheduler should be much more robust and correct now(sledgehammer999) | ||||
|     - BUGFIX: Now qBt won't forget torrent settings after an unclean shutdown(sledgehammer999) | ||||
|     - BUGFIX: Text boxes in edit dialogs will fit to text width(Gelmir) | ||||
|     - BUGFIX: Enable edit/rename via F2 or double click in various places(Gelmir) | ||||
|     - BUGFIX: Allow to edit trackers and copy their urls(Gelmir and Driim) | ||||
|     - BUGFIX: Add Uploaded column to main view(Gelmir) | ||||
|     - BUGFIX: Calculate ETA for seeding torrents(Gelmir)     | ||||
|     - BUGFIX: Add option to ignore global share ratio limits for created torrents(Gelmir) | ||||
|     - OTHER: Many RSS bugfixes and improvements all over the place(Gelmir) | ||||
|     - OTHER: Generate translations at configure time to reduce tarball size | ||||
|     - OTHER: Make peer tab sortable by ip too (Gelmir) | ||||
|     - OTHER: Translations moved to Transifex(https://www.transifex.com/projects/p/qbittorrent/) | ||||
|     - OTHER: New Translation - Vietnamese (Anh Phan) | ||||
|     - PERFORMANCE: Impove drawing speed of tranferlist when there are many torrents(>100) | ||||
|     - PERFORMANCE: Impove drawing speed of peers list when there are many peers | ||||
|  | ||||
| * Thu Aug 09 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.0 | ||||
|     - FEATURE: Brand new torrent addition dialog | ||||
|     - FEATURE: Add the ability to choose the save path when using magnet links (mutoso) | ||||
|     - FEATURE: Add support for adding multiple local torrents at once (Web UI) | ||||
|     - COSMETIC: Improve style of left panel | ||||
|     - BUGFIX: Lower panels no longer gets disabled | ||||
|     - BUGFIX: Major code refactoring and various optimizations. | ||||
|     - BUGFIX: No longer strip root folder from torrent files | ||||
|     - OTHER: Drop support for libtorrent v0.14.x | ||||
|     - OTHER: Drop support for Qt 4.5 | ||||
| * Sun Oct 23 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.9.1 | ||||
|     - BUGFIX: Add support for speed limits scheduling (Web UI) | ||||
|     - BUGFIX: Fix ratio calculation for purely seeded torrents | ||||
|     - I18N: Update Russian translation | ||||
|     - COSMETIC: Torrent addition dialog layout fixes | ||||
|  | ||||
| * Sat Oct 08 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.9.0 | ||||
|     - FEATURE: Add file association settings to program preferences (Windows) | ||||
|   | ||||
							
								
								
									
										6
									
								
								INSTALL
									
									
									
									
									
								
							
							
						
						| @@ -10,11 +10,11 @@ qBittorrent - A BitTorrent client in C++ / Qt4 | ||||
|   will install and execute qBittorrent hopefully without any problems. | ||||
|  | ||||
|   Dependencies: | ||||
|     - Qt >= 4.6.0 (libqtgui, libqtcore, libqtnetwork, libqtxml, libqtdbus/optional) | ||||
|     - Qt >= 4.5.0 (libqtgui, libqtcore, libqtnetwork, libqtxml, libqtdbus/optional) | ||||
|  | ||||
|     - pkg-config executable | ||||
|  | ||||
|     - libtorrent-rasterbar by Arvid Norberg (>= 0.15.0) | ||||
|     - libtorrent-rasterbar by Arvid Norberg (>= 0.14.4 REQUIRED, compatible with v0.15.x/v0.16.x) | ||||
|         -> http://www.libtorrent.net | ||||
|         Be careful: another library (the one used by rTorrent) uses a similar name. | ||||
|  | ||||
| @@ -44,7 +44,7 @@ qBittorrent - A BitTorrent client in C++ / Qt4 | ||||
|  | ||||
|     - pkg-config executable | ||||
|  | ||||
|     - libtorrent-rasterbar by Arvid Norberg (>= v0.15.0) | ||||
|     - libtorrent-rasterbar by Arvid Norberg (>= 0.14.4 REQUIRED, >= v0.15.0 ADVISED) | ||||
|         -> http://www.libtorrent.net | ||||
|         Be careful: another library (the one used by rTorrent) uses a similar name. | ||||
|  | ||||
|   | ||||
							
								
								
									
										16
									
								
								README.os2
									
									
									
									
									
								
							
							
						
						| @@ -27,6 +27,7 @@ First you need to create the conf.pri file in the same dir as this readme.os2 is | ||||
| the conf.pri file has the following content: | ||||
|  | ||||
| ##### conf.pri content beginn ##### | ||||
| PREFIX = . | ||||
| BINDIR = ./bin | ||||
| INCDIR = ./include | ||||
| LIBDIR = ./lib | ||||
| @@ -42,10 +43,7 @@ LIBS += -Lx:/trees/libtorrent/trunk/src/.libs \ | ||||
|  | ||||
| Of course all the above path references have to be adjusted to your build env. | ||||
|  | ||||
| Now you can either do a normal build or a shadow build. A shadow build has the | ||||
| advantage that no created files are in the same dir as the sources are. | ||||
|  | ||||
| For a normal build do the following: | ||||
| It should now be easy to build qBittorrent: | ||||
|  | ||||
| Simply type: | ||||
| $ qmake | ||||
| @@ -53,16 +51,6 @@ $ qmake | ||||
| Followed by: | ||||
| $ make | ||||
|  | ||||
| For a shadow build do the following: | ||||
| given your sources are in x:\trees\qbittorrent\trunk create a  | ||||
| x:\trees\qbittorrent\build directory | ||||
|  | ||||
| Now switch to the created directory and type: | ||||
| $ qmake ..\trunk | ||||
|  | ||||
| Followed by: | ||||
| $ make | ||||
|  | ||||
| If all works fine you should get a working qbittorrent executable. | ||||
|  | ||||
| If you have any question regarding the eCS (OS/2) port of qBittorrent you can meet me (_diver) on IRC: | ||||
|   | ||||
							
								
								
									
										15
									
								
								configure
									
									
									
									
										vendored
									
									
								
							
							
						
						| @@ -325,7 +325,7 @@ cat >$1/modules.cpp <<EOT | ||||
| #line 1 "qt4.qcm" | ||||
| /* | ||||
| -----BEGIN QCMOD----- | ||||
| name: Qt >= 4.6 | ||||
| name: Qt >= 4.5 | ||||
| arg: enable-debug, Enable debug mode | ||||
| arg: disable-gui, Disable qBittorrent Graphical user interface for headless running | ||||
| -----END QCMOD----- | ||||
| @@ -334,8 +334,8 @@ class qc_qt4 : public ConfObj | ||||
| { | ||||
| public: | ||||
| 	qc_qt4(Conf *c) : ConfObj(c) {} | ||||
| 	QString name() const { return "Qt >= 4.6"; } | ||||
| 	QString shortname() const { return "Qt 4.6"; } | ||||
| 	QString name() const { return "Qt >= 4.5"; } | ||||
| 	QString shortname() const { return "Qt 4.5"; } | ||||
| 	bool exec() | ||||
| 	{ | ||||
|                 // NOX mode | ||||
| @@ -356,7 +356,7 @@ public: | ||||
|                 #else | ||||
|                   conf->addExtra("MANPREFIX = \$\$PREFIX/share");  | ||||
|                 #endif | ||||
| 		return(QT_VERSION >= 0x040600); | ||||
| 		return(QT_VERSION >= 0x040500); | ||||
| 	} | ||||
| }; | ||||
| #line 1 "qt-dbus.qcm" | ||||
| @@ -419,11 +419,11 @@ class qc_libtorrent_rasterbar : public ConfObj | ||||
| { | ||||
| public: | ||||
| 	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {} | ||||
| 	QString name() const { return "libtorrent-rasterbar >= 0.15.0"; } | ||||
| 	QString name() const { return "libtorrent-rasterbar >= 0.14.4"; } | ||||
| 	QString shortname() const { return "libtorrent-rasterbar"; } | ||||
| 	bool exec(){ | ||||
| 		QStringList incs; | ||||
| 		QString req_ver = "0.15.0"; | ||||
| 		QString req_ver = "0.14.4"; | ||||
| 		QString version, libs, other; | ||||
| 		VersionMode mode = VersionMin; | ||||
| 		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other)) | ||||
| @@ -507,11 +507,10 @@ public: | ||||
| #if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16 | ||||
|     required_libs << "filesystem" ; | ||||
| #endif | ||||
|     //required_libs << "thread"; | ||||
|     QStringList libDirs; | ||||
|     if (!s.isEmpty()) | ||||
|       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) { | ||||
|       bool found = false; | ||||
|   | ||||
| @@ -8,7 +8,7 @@ qBittorrent\-nox \- a command line Bittorrent client written in C++ / Qt4 | ||||
|  | ||||
| .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 | ||||
|  | ||||
|   | ||||
							
								
								
									
										129
									
								
								install.os2
									
									
									
									
									
								
							
							
						
						| @@ -11,7 +11,7 @@ QBittorrent installation | ||||
|  | ||||
| 3. INSTALLATION | ||||
|  | ||||
| 4. BUGREPORTS | ||||
| 4. CONTACT | ||||
|  | ||||
| 5. CREDITS | ||||
|  | ||||
| @@ -29,70 +29,17 @@ Welcome to QBittorrent port for OS/2 and eComStation. | ||||
| 2. REQUIREMENTS | ||||
| =============== | ||||
|  | ||||
| The following requirements can be installed either by rpm or by zip files. | ||||
| * klibc 0.6.3 or later | ||||
|  | ||||
| RPM Installation: | ||||
|     ftp://ftp.netlabs.org/pub/gcc/libc-0_6_3-csd3.wpi | ||||
|  | ||||
| klibc | ||||
| ----- | ||||
| * openssl 1.0 | ||||
|   | ||||
|   1. yum install libc | ||||
|     ftp://ftp.netlabs.org/pub/unixos2/ssl10.zip | ||||
|  | ||||
| openssl 1.0 | ||||
| ----------- | ||||
| * Qt4 dll | ||||
|  | ||||
|   1. yum install openssl | ||||
|  | ||||
| pthread | ||||
| ------- | ||||
|  | ||||
|   1. yum install pthread | ||||
|  | ||||
| GCC4Core | ||||
| -------- | ||||
|  | ||||
|   1. yum install libgcc | ||||
|   2. yum install gcc-stack-protector | ||||
|   3. yum install gcc-stdc++-shared-library | ||||
|   4. yum install gcc-supc++-shared-library | ||||
|  | ||||
| Qt4 dll | ||||
| ------- | ||||
|  | ||||
|   1. yum install libqt4 | ||||
|  | ||||
|  | ||||
| ZIP Installation: | ||||
|  | ||||
| klibc | ||||
| ----- | ||||
|  | ||||
|   1. Download klibc 0.6.5 or better (see http://svn.netlabs.org/libc for more information) | ||||
|   2. Install the files to your libpath eg x:\ecs\dll | ||||
|  | ||||
| openssl 1.0 | ||||
| ----------- | ||||
|  | ||||
|   1. Download the zip file from http://rpm.netlabs.org/release/00/zip | ||||
|   2. Install the files to your libpath eg. x:\ecs\dll | ||||
|  | ||||
| pthread | ||||
| ------- | ||||
|  | ||||
|   1. Download pthread 2012-03-13 or better from http://rpm.netlabs.org/release/00/zip | ||||
|   2. Install the files to your libpath eg. x:\ecs\dll | ||||
|  | ||||
| GCC4Core | ||||
| -------- | ||||
|  | ||||
|   1. Download GCC4Core 1.2.1 or better from http://ftp.netlabs.org/pub/gcc | ||||
|   2. Install the files to your libpath eg. x:\ecs\dll | ||||
|  | ||||
| Qt4 dll | ||||
| ------- | ||||
|  | ||||
|   1. Download Qt4 4.7.3 or better (see http://svn.netlabs.org/qt4 for more information) | ||||
|   2. Install the files according to the readme | ||||
|     see http://svn.netlabs.org/qt4 for more information whats needed and where to get the latest | ||||
|  | ||||
|  | ||||
| 3. INSTALLATION | ||||
| @@ -100,6 +47,30 @@ Qt4 dll | ||||
|            | ||||
| To install QBittorrent, do the following: | ||||
|  | ||||
| klibc | ||||
| ----- | ||||
|  | ||||
|   1. Download klibc 0.6.3 csd3 or later. | ||||
|   2. Install the package by double-clicking on the WPI file. | ||||
|  | ||||
|  | ||||
| openssl 1.0 | ||||
| ----------- | ||||
|  | ||||
|   1. Download the zip file | ||||
|   2. Install the files to your libpath eg. x:\ecs\dll | ||||
|  | ||||
| Qt4 dll | ||||
| ------- | ||||
|  | ||||
|   1. Download the package | ||||
|   2. Install the package by double-clicking on the wpi file. | ||||
|  | ||||
|  | ||||
|  | ||||
| QBittorrent | ||||
| ----------- | ||||
|  | ||||
|   1. Create a directory for QBittorrent. | ||||
|   2. Extract the QBittorrent package to the new directory. | ||||
|   3. Create a WPS object for QBittorrent.exe. | ||||
| @@ -107,13 +78,18 @@ To install QBittorrent, do the following: | ||||
|   5. Happy torrenting | ||||
|    | ||||
|  | ||||
| 4. BUGREPORTS | ||||
| ============= | ||||
|  | ||||
| Please create bugreports at http://svn.netlabs.org/qtapps | ||||
| 4. CONTACT | ||||
| ========== | ||||
|  | ||||
| Please send bugreports to: | ||||
|  | ||||
|   ecs@aroa.ch | ||||
|  | ||||
| Only bug reports with a reproducable bug are accepted. :-) | ||||
|  | ||||
|  | ||||
|  | ||||
| 5. CREDITS | ||||
| ========== | ||||
|  | ||||
| @@ -146,33 +122,6 @@ development, you can do so in one of the following ways: | ||||
| 7. HISTORY | ||||
| ========== | ||||
|  | ||||
| 2012-09-19 | ||||
|  | ||||
|   * updated to 3.0.4 code level of QBittorrent | ||||
|   * updated libtorrent to 0.16.3 level | ||||
|  | ||||
| 2012-09-06 | ||||
|  | ||||
|   * updated to 3.0.2 code level of QBittorrent | ||||
|  | ||||
| 2012-05-14 | ||||
|  | ||||
|   * updated to 2.9.8 code level of QBittorrent | ||||
|  | ||||
| 2012-03-15 | ||||
|  | ||||
|   * updated to 2.9.5 code level of QBittorrent | ||||
|  | ||||
| 2011-09-26 | ||||
|  | ||||
|   * updated to 2.8.5 code level of QBittorrent | ||||
|   * updated to Qt 4.7.3 | ||||
|  | ||||
| 2011-06-20 | ||||
|  | ||||
|   * updated to 2.7.3 code level of QBittorrent | ||||
|   * updated libtorrent to 0.15.6 level | ||||
|  | ||||
| 2010-12-23 | ||||
|  | ||||
|   * updated to 2.5.2 code level of QBittorrent | ||||
|   | ||||
							
								
								
									
										47
									
								
								macxconf.pri
									
									
									
									
									
								
							
							
						
						| @@ -5,7 +5,6 @@ DATADIR = /usr/local/share | ||||
| # Use pkg-config to get all necessary libtorrent DEFINES | ||||
| CONFIG += link_pkgconfig | ||||
| PKGCONFIG += libtorrent-rasterbar | ||||
| DEFINES += BOOST_ASIO_DYN_LINK | ||||
|  | ||||
| # Special include/libs paths (macports) | ||||
| INCLUDEPATH += /usr/include/openssl /usr/include /opt/local/include/boost /opt/local/include | ||||
| @@ -16,52 +15,16 @@ LIBS += -lssl -lcrypto | ||||
| # Boost system lib | ||||
| LIBS += -lboost_system-mt | ||||
| # Boost filesystem lib (Not needed for libtorrent >= 0.16.0) | ||||
| #LIBS += -lboost_filesystem-mt | ||||
| LIBS += -lboost_filesystem-mt | ||||
| # Carbon | ||||
| LIBS += -framework Carbon -framework IOKit | ||||
| # Zlib | ||||
| LIBS += -lz | ||||
|  | ||||
| document_icon.path = Contents/Resources | ||||
| document_icon.files = mac/qBitTorrentDocument.icns | ||||
| document_icon.files = Icons/qBitTorrentDocument.icns | ||||
|  | ||||
| QMAKE_BUNDLE_DATA += document_icon | ||||
|  | ||||
| qt_conf.path = Contents/Resources | ||||
| qt_conf.files = mac/qt.conf | ||||
| QMAKE_BUNDLE_DATA += qt_conf | ||||
|  | ||||
| qt_translations.path = Contents/MacOS/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 | ||||
| ICON = Icons/qbittorrent_mac.icns | ||||
| QMAKE_INFO_PLIST = Info.plist | ||||
|  | ||||
| DEFINES += WITH_GEOIP_EMBEDDED | ||||
| message("On Mac OS X, GeoIP database must be embedded.") | ||||
|   | ||||
| @@ -7,13 +7,12 @@ LIBS += -ltorrent-rasterbar \ | ||||
|         -lboost_thread \ | ||||
|         -lboost_system \ | ||||
|         -lboost_filesystem \ | ||||
|         -lssl -lcrypto -lidn -lpthread -lz | ||||
|         -lssl -lcrypto -lidn -lpthread | ||||
|  | ||||
| RC_FILE = qbittorrent_os2.rc | ||||
|  | ||||
| # LIBTORRENT DEFINES | ||||
| DEFINES += WITH_SHIPPED_GEOIP_H | ||||
| DEFINES += BOOST_ASIO_DYN_LINK | ||||
|  | ||||
| DEFINES += WITH_GEOIP_EMBEDDED | ||||
| message("On eCS(OS/2), GeoIP database must be embedded.") | ||||
|   | ||||
| @@ -3,7 +3,6 @@ TEMPLATE = subdirs | ||||
| SUBDIRS += src | ||||
|  | ||||
| include(version.pri) | ||||
| include(qm_gen.pri) | ||||
|  | ||||
| # Dist | ||||
| dist.commands += rm -fR ../$${PROJECT_NAME}-$${PROJECT_VERSION}/ && | ||||
| @@ -12,8 +11,6 @@ dist.commands += rm -fR ../$${PROJECT_NAME}-$${PROJECT_VERSION}/.git && | ||||
| dist.commands += rm -f ../$${PROJECT_NAME}-$${PROJECT_VERSION}/.gitignore && | ||||
| dist.commands += cd .. && | ||||
| dist.commands += tar czf $${PROJECT_NAME}-$${PROJECT_VERSION}.tar.gz $${PROJECT_NAME}-$${PROJECT_VERSION} && | ||||
| dist.commands += tar cf $${PROJECT_NAME}-$${PROJECT_VERSION}.tar $${PROJECT_NAME}-$${PROJECT_VERSION} && | ||||
| dist.commands += xz -f $${PROJECT_NAME}-$${PROJECT_VERSION}.tar && | ||||
| dist.commands += rm -fR $${PROJECT_NAME}-$${PROJECT_VERSION} | ||||
|  | ||||
| QMAKE_EXTRA_TARGETS += dist | ||||
|   | ||||
| @@ -71,11 +71,10 @@ public: | ||||
| #if LIBTORRENT_VERSION_MAJOR == 0 && LIBTORRENT_VERSION_MINOR < 16 | ||||
|     required_libs << "filesystem" ; | ||||
| #endif | ||||
|     //required_libs << "thread"; | ||||
|     QStringList libDirs; | ||||
|     if (!s.isEmpty()) | ||||
|       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) { | ||||
|       bool found = false; | ||||
|   | ||||
| @@ -8,11 +8,11 @@ class qc_libtorrent_rasterbar : public ConfObj | ||||
| { | ||||
| public: | ||||
| 	qc_libtorrent_rasterbar(Conf *c) : ConfObj(c) {} | ||||
| 	QString name() const { return "libtorrent-rasterbar >= 0.15.0"; } | ||||
| 	QString name() const { return "libtorrent-rasterbar >= 0.14.4"; } | ||||
| 	QString shortname() const { return "libtorrent-rasterbar"; } | ||||
| 	bool exec(){ | ||||
| 		QStringList incs; | ||||
| 		QString req_ver = "0.15.0"; | ||||
| 		QString req_ver = "0.14.4"; | ||||
| 		QString version, libs, other; | ||||
| 		VersionMode mode = VersionMin; | ||||
| 		if(!conf->findPkgConfig("libtorrent-rasterbar", mode, req_ver, &version, &incs, &libs, &other)) | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| /* | ||||
| -----BEGIN QCMOD----- | ||||
| name: Qt >= 4.6 | ||||
| name: Qt >= 4.5 | ||||
| arg: enable-debug, Enable debug mode | ||||
| arg: disable-gui, Disable qBittorrent Graphical user interface for headless running | ||||
| -----END QCMOD----- | ||||
| @@ -9,8 +9,8 @@ class qc_qt4 : public ConfObj | ||||
| { | ||||
| public: | ||||
| 	qc_qt4(Conf *c) : ConfObj(c) {} | ||||
| 	QString name() const { return "Qt >= 4.6"; } | ||||
| 	QString shortname() const { return "Qt 4.6"; } | ||||
| 	QString name() const { return "Qt >= 4.5"; } | ||||
| 	QString shortname() const { return "Qt 4.5"; } | ||||
| 	bool exec() | ||||
| 	{ | ||||
|                 // NOX mode | ||||
| @@ -31,6 +31,6 @@ public: | ||||
|                 #else | ||||
|                   conf->addExtra("MANPREFIX = $$PREFIX/share");  | ||||
|                 #endif | ||||
| 		return(QT_VERSION >= 0x040600); | ||||
| 		return(QT_VERSION >= 0x040500); | ||||
| 	} | ||||
| }; | ||||
|   | ||||
							
								
								
									
										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; | ||||
| Exec=qbittorrent %U | ||||
| 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[fr]=Télécharger et partager des fichiers avec BitTorrent | ||||
| Comment[pl]=Dzielenie się plikami przez BitTorrent | ||||
| Icon=qbittorrent | ||||
| MimeType=application/x-bittorrent;x-scheme-handler/magnet; | ||||
| Name=qBittorrent | ||||
| Name[ko]=큐비토런트 | ||||
| Terminal=false | ||||
| 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 |