Compare commits
	
		
			62 Commits
		
	
	
		
			release-3.
			...
			release-3.
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 753e9181fe | ||
|   | 9546a73182 | ||
|   | c0ee99c553 | ||
|   | 50976b8dc2 | ||
|   | 6a312461a1 | ||
|   | 3fe09bde12 | ||
|   | f851b18b80 | ||
|   | ced29ced1b | ||
|   | 5023b1ab74 | ||
|   | c2ef78de8d | ||
|   | 6fbe452b55 | ||
|   | 51c4a0d8d0 | ||
|   | 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 http://libtorrent.googlecode.com/svn/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 | ||||||
|   | |||||||
							
								
								
									
										171
									
								
								Changelog
									
									
									
									
									
								
							
							
						
						| @@ -1,153 +1,30 @@ | |||||||
| * Sat Mar 01 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.9 | * Tue Sep 18 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.4 | ||||||
|     - BUGFIX: Fix nox build. Closes #1368 (bob23450) |     - BUGFIX: Fix issue with downloads starting from scratch on startup if temporary | ||||||
|     - BUGFIX: Fix build with libtorrent 0.15.x (sledgehammer999) |       directory setting is enabled. | ||||||
|     - BUGFIX: Fix missing percentage signs. Closes #1392. (sledgehammer999) |  | ||||||
|     - BUGFIX: Fix queue sorting order. (alfrix) |  | ||||||
|     - BUGFIX: Fix build using qt < 4.7 Closes #1385. (Evgeny Lensky) |  | ||||||
|     - BUGFIX: Fix autoupdater. Send our user-agent to sourceforge.net (sledgehammer999) |  | ||||||
|     - FEATURE: Add button for links in toolbar (alfrix) |  | ||||||
|  |  | ||||||
| * Sun Feb 02 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.8 | * Sun Sep 16 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.3 | ||||||
|     - BUGFIX: Really fix build of v3.1.6 |     - BUGFIX: Fix issue with temporary directory not being taken into consideration (closes #94) | ||||||
|  |     - BUGFIX: Address encoding issues when using search engine on Windows (closes #29) | ||||||
|  |     - BUGFIX: Bypass cache when uploading a torrent file in Web UI (closes #68) | ||||||
|  |     - BUGFIX: "Completed On" column is not updated until restart (closes #84) | ||||||
|  |     - BUGFIX: Fix possible build error on some systems | ||||||
|  |     - I18N: Add hebrew translation | ||||||
|  |  | ||||||
| * Sun Feb 02 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.7 | * Sat Sep 1 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.2 | ||||||
|     - BUGFIX: Fix build of v3.1.6 |     - FEATURE: Add "clear" functionality to search field (closes #59) | ||||||
|  |     - BUGFIX: Attempt to use qBittorrent icon from theme if available (closes #49) | ||||||
|  |     - BUGFIX: Fix crash when a fastresume file is empty (closes #52) | ||||||
|  |     - BUGFIX: Fix encoding problem for detected XDG Download folder (closes #53) | ||||||
|  |     - BUGFIX: Improve performance when showing torrent content panel (Improves #24) | ||||||
|  |     - BUGFIX: Fix label-based filtering of torrents whose label contains special characters | ||||||
|  |     - BUGFIX: Fix possible crash due to labels (closes #64) | ||||||
|  |  | ||||||
| * Sun Feb 02 2014 - sledgehammer999 <sledgehammer999@qbittorrent.org> - v3.1.6 | * Tue Aug 21 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.1 | ||||||
|     - BUGFIX: Fix 'preview file' regression. Closes #1285. (sledgehammer999) |     - BUGFIX: Fix possible crash when adding a tracker to a magnet torrent without metadata (Closes #1034254) | ||||||
|     - BUGFIX: Fix peers and seeds sorting in transfer list. (Angel Alonso) |     - BUGFIX: Remember queue position for torrents without metadata (closes #17) | ||||||
|     - BUGFIX: Fix btdigg search engine. (BTDigg research team) |     - BUGFIX: Fix crash when using unauthorized characters in label names (closes #19) | ||||||
|     - BUGFIX: Save statistics every 15min and only if there was new traffic. Fixes #1288 and partially #1272. (sledgehammer999) |     - BUGFIX: Fix search plugins updating (closes #25) | ||||||
|     - BUGFIX: Fix share ratio text in the 'general' tab. (sledgehammer999) |     - BUGFIX: Make uTP connections rate limited by default | ||||||
|     - 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. |  | ||||||
|  |  | ||||||
| * 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. |  | ||||||
|  |  | ||||||
| * 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) |  | ||||||
|  |  | ||||||
| * 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 | * Thu Aug 09 2012 - Christophe Dumez <chris@qbittorrent.org> - v3.0.0 | ||||||
|     - FEATURE: Brand new torrent addition dialog |     - FEATURE: Brand new torrent addition dialog | ||||||
|   | |||||||
							
								
								
									
										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 | ||||||
|   | |||||||
| @@ -19,8 +19,6 @@ LIBS += -lboost_system-mt | |||||||
| #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 = mac/qBitTorrentDocument.icns | ||||||
|   | |||||||
| @@ -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 | 
							
								
								
									
										294
									
								
								src/about.ui
									
									
									
									
									
								
							
							
						
						| @@ -48,28 +48,10 @@ class about : public QDialog, private Ui::AboutDlg{ | |||||||
|     about(QWidget *parent): QDialog(parent) { |     about(QWidget *parent): QDialog(parent) { | ||||||
|       setupUi(this); |       setupUi(this); | ||||||
|       setAttribute(Qt::WA_DeleteOnClose); |       setAttribute(Qt::WA_DeleteOnClose); | ||||||
|       // About |  | ||||||
|       QString aboutText = |  | ||||||
|           QString::fromUtf8("<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.0//EN\" \"http://www.w3.org/TR/REC-html40/strict.dtd\"><html><head><meta name=\"qrichtext\" content=\"1\" /><style type=\"text/css\">p, li { white-space: pre-wrap; }</style></head><body style=\" font-size:11pt; font-weight:400; font-style:normal;\"><p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">") + |  | ||||||
|           tr("An advanced BitTorrent client programmed in C++, based on Qt4 toolkit and libtorrent-rasterbar.") + |  | ||||||
|           QString::fromUtf8(" <br /><br />") + |  | ||||||
|           trUtf8("Copyright ©2006-2013 The qBittorrent project") + |  | ||||||
|           QString::fromUtf8("<br /><br />") + |  | ||||||
|           tr("Home Page: ") + |  | ||||||
|           QString::fromUtf8("<a href=\"http://www.qbittorrent.org\"><span style=\" text-decoration: underline; color:#0000ff;\">http://www.qbittorrent.org</span></a></p><p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">") + |  | ||||||
|           tr("Bug Tracker: ") + |  | ||||||
|           QString::fromUtf8("<a href=\"http://bugs.qbittorrent.org\"><span style=\" text-decoration: underline; color:#0000ff;\">http://bugs.qbittorrent.org</span></a><br />") + |  | ||||||
|           tr("Forum: ") + |  | ||||||
|           QString::fromUtf8( |  | ||||||
|               "<a href=\"http://forum.qbittorrent.org\"><span style=\" text-decoration: underline; color:#0000ff;\">http://forum.qbittorrent.org</span></a></p><p style=\" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;\">") + |  | ||||||
|           tr("IRC: #qbittorrent on Freenode") + |  | ||||||
|           QString::fromUtf8( |  | ||||||
|               "</p></body></html>"); |  | ||||||
|       lb_about->setText(aboutText); |  | ||||||
|       // Set icons |       // Set icons | ||||||
|       logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/qbittorrent22.png"))); |       logo->setPixmap(QPixmap(QString::fromUtf8(":/Icons/skin/qbittorrent22.png"))); | ||||||
|       //Title |       //Title | ||||||
|       lb_name->setText(QString::fromUtf8("<b><h1>qBittorrent")+QString::fromUtf8(" "VERSION"</h1></b>")); |       lb_name->setText(QString::fromUtf8("<b><h1>")+tr("qBittorrent")+QString::fromUtf8(" "VERSION"</h1></b>")); | ||||||
|       // Thanks |       // Thanks | ||||||
|       QString thanks_txt; |       QString thanks_txt; | ||||||
|       thanks_txt += QString::fromUtf8("<p>I would first like to thank sourceforge.net for hosting qBittorrent project and for their support.</p>"); |       thanks_txt += QString::fromUtf8("<p>I would first like to thank sourceforge.net for hosting qBittorrent project and for their support.</p>"); | ||||||
| @@ -80,25 +62,24 @@ class about : public QDialog, private Ui::AboutDlg{ | |||||||
|       te_thanks->setHtml(thanks_txt); |       te_thanks->setHtml(thanks_txt); | ||||||
|       // Translation |       // Translation | ||||||
|       QString trans_txt = "<p>"+tr("I would like to thank the following people who volunteered to translate qBittorrent:")+"</p>"; |       QString trans_txt = "<p>"+tr("I would like to thank the following people who volunteered to translate qBittorrent:")+"</p>"; | ||||||
|       trans_txt += QString::fromUtf8("<ul><li><u>Arabic:</u> SDERAWI (abz8868@msn.com), sn51234 (nesseyan@gmail.com) and  Ibrahim Saed ibraheem_alex(Transifex)</li>\ |       trans_txt += QString::fromUtf8("<ul><li><u>Arabic:</u> SDERAWI (abz8868@msn.com) and sn51234 (nesseyan@gmail.com)</li>\ | ||||||
|           <li><u>Armenian:</u> Hrant Ohanyan (hrantohanyan@mail.am)</li>\ |           <li><u>Armenian:</u> Hrant Ohanyan (hrantohanyan@mail.am)</li>\ | ||||||
|           <li><u>Basque:</u> Xabier Aramendi (azpidatziak@gmail.com)</li>\ |           <li><u>Basque:</u> Xabier Aramendi (azpidatziak@gmail.com)</li>\ | ||||||
|           <li><u>Belarusian:</u> Mihas Varantsou (meequz@gmail.com)</li>\ |           <li><u>Belarusian:</u> Mihas Varantsou (meequz@gmail.com)</li>\ | ||||||
|  |           <li><u>Brazilian:</u> Nick Marinho (nickmarinho@gmail.com)</li>\ | ||||||
|           <li><u>Bulgarian:</u> Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net)</li>\ |           <li><u>Bulgarian:</u> Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net)</li>\ | ||||||
|           <li><u>Catalan:</u> Francisco Luque Contreras (frannoe@ya.com)</li>\ |           <li><u>Catalan:</u> Francisco Luque Contreras (frannoe@ya.com)</li>\ | ||||||
|           <li><u>Chinese (Simplified):</u> Guo Yue (yue.guo0418@gmail.com)</li>\ |           <li><u>Chinese (Simplified):</u> Guo Yue (yue.guo0418@gmail.com)</li>\ | ||||||
|           <li><u>Chinese (Traditional):</u> Yi-Shun Wang (dnextstep@gmail.com) and 冥王歐西里斯 s8321414(Transifex)</li>\ |           <li><u>Chinese (Traditional):</u> Yi-Shun Wang (dnextstep@gmail.com)</li>\ | ||||||
|           <li><u>Croatian:</u> Oliver Mucafir (oliver.untwist@gmail.com)</li>\ |           <li><u>Croatian:</u> Oliver Mucafir (oliver.untwist@gmail.com)</li>\ | ||||||
|           <li><u>Czech:</u> Jirka Vilim (web@tets.cz) and Petr Cernobila abr(Transifex)</li>\ |           <li><u>Czech:</u> Jirka Vilim (web@tets.cz)</li>\ | ||||||
|           <li><u>Danish:</u> Mathias Nielsen (comoneo@gmail.com)</li>\ |           <li><u>Danish:</u> Mathias Nielsen (comoneo@gmail.com)</li>\ | ||||||
|           <li><u>Dutch:</u> Pieter Heyvaert (pieter_heyvaert@hotmail.com)</li>\ |           <li><u>Dutch:</u> Pieter Heyvaert (pieter_heyvaert@hotmail.com)</li>\ | ||||||
|           <li><u>English(Australia):</u> Robert Readman readmanr(Transifex)</li>\ |           <li><u>Finnish:</u> Niklas Laxström (nikerabbit@users.sourceforge.net) and Pekka Niemi (pekka.niemi@iki.fi)</li>\ | ||||||
|           <li><u>English(United Kingdom):</u> Robert Readman readmanr(Transifex)</li>\ |           <li><u>Galician:</u> Marcos Lans (marcoslansgarza@gmail.com)</li>\ | ||||||
|           <li><u>Finnish:</u> Niklas Laxström (nikerabbit@users.sourceforge.net), Pekka Niemi (pekka.niemi@iki.fi) and Jiri Grönroos artnay(Transifex)</li>\ |  | ||||||
|           <li><u>Galician:</u> Marcos Lans (marcoslansgarza@gmail.com) and antiparvos(Transifex)</li>\ |  | ||||||
|           <li><u>Georgian:</u> Beqa Arabuli (arabulibeqa@yahoo.com)</li>\ |           <li><u>Georgian:</u> Beqa Arabuli (arabulibeqa@yahoo.com)</li>\ | ||||||
|           <li><u>German:</u> Niels Hoffmann (zentralmaschine@users.sourceforge.net)</li>\ |           <li><u>German:</u> Niels Hoffmann (zentralmaschine@users.sourceforge.net)</li>\ | ||||||
|           <li><u>Greek:</u> Tsvetan Bankov (emerge_life@users.sourceforge.net), Stephanos Antaris (santaris@csd.auth.gr), sledgehammer999(hammered999@gmail.com) and Γιάννης Ανθυμίδης Evropi(Transifex)</li>\ |           <li><u>Greek:</u> Tsvetan Bankov (emerge_life@users.sourceforge.net)</li>\ | ||||||
|           <li><u>Hebrew:</u> David Deutsch (d.deffo@gmail.com)</li>\ |           <li><u>Hebrew:</u> David Deutsch (d.deffo@gmail.com)</li>\ | ||||||
|           <li><u>Hungarian:</u> Majoros Péter (majoros.peterj@gmail.com)</li>\ |           <li><u>Hungarian:</u> Majoros Péter (majoros.peterj@gmail.com)</li>\ | ||||||
|           <li><u>Italian:</u> bovirus (bovirus@live.it) and Matteo Sechi (bu17714@gmail.com)</li>\ |           <li><u>Italian:</u> bovirus (bovirus@live.it) and Matteo Sechi (bu17714@gmail.com)</li>\ | ||||||
| @@ -107,17 +88,15 @@ class about : public QDialog, private Ui::AboutDlg{ | |||||||
|           <li><u>Lithuanian:</u> Naglis Jonaitis (njonaitis@gmail.com)</li>\ |           <li><u>Lithuanian:</u> Naglis Jonaitis (njonaitis@gmail.com)</li>\ | ||||||
|           <li><u>Norwegian:</u> Tomaso</li>\ |           <li><u>Norwegian:</u> Tomaso</li>\ | ||||||
|           <li><u>Polish:</u> Mariusz Fik (fisiu@opensuse.org)</li>\ |           <li><u>Polish:</u> Mariusz Fik (fisiu@opensuse.org)</li>\ | ||||||
|           <li><u>Portuguese:</u> Sérgio Marques smarquespt(Transifex)</li>\ |           <li><u>Portuguese:</u> Nick Marinho (nickmarinho@gmail.com)</li>\ | ||||||
|           <li><u>Portuguese(Brazil):</u> Nick Marinho (nickmarinho@gmail.com)</li>\ |           <li><u>Romanian:</u> Obada Denis (obadadenis@users.sourceforge.net)</li>\ | ||||||
|           <li><u>Romanian:</u> Obada Denis (obadadenis@users.sourceforge.net), Adrian Gabor Adriannho(Transifex) and Mihai Coman z0id(Transifex)</li>\ |           <li><u>Russian:</u> Nick Khazov (m2k3d0n@users.sourceforge.net) and Alexey Morsov (samurai@ricom.ru)</li>\ | ||||||
|           <li><u>Russian:</u> 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)</li>\ |  | ||||||
|           <li><u>Serbian:</u> Anaximandar Milet (anaximandar@operamail.com)</li>\ |           <li><u>Serbian:</u> Anaximandar Milet (anaximandar@operamail.com)</li>\ | ||||||
|           <li><u>Slovak:</u>  helix84</li>\ |           <li><u>Slovak:</u>  helix84</li>\ | ||||||
|           <li><u>Spanish:</u> Alfredo Monclús (alfrix), Francisco Luque Contreras (frannoe@ya.com) and José Antonio Moray moray33(Transifex)</li>\ |           <li><u>Spanish:</u> Francisco Luque Contreras (frannoe@ya.com)</li>\ | ||||||
|           <li><u>Swedish:</u> Daniel Nylander (po@danielnylander.se) and Emil Hammarberg Ooglogput(Transifex)</li>\ |           <li><u>Swedish:</u> Daniel Nylander (po@danielnylander.se)</li>\ | ||||||
|           <li><u>Turkish:</u> Hasan YILMAZ (iletisim@hedefturkce.com) and Erdem Bingöl (erdem84@gmail.com)</li>\ |           <li><u>Turkish:</u> Hasan YILMAZ (iletisim@hedefturkce.com) and Erdem Bingöl (erdem84@gmail.com)</li>\ | ||||||
|           <li><u>Ukrainian:</u> Oleh Prypin (blaxpirit@gmail.com)</li>\ |           <li><u>Ukrainian:</u> Oleh Prypin (blaxpirit@gmail.com)</li></ul>"); | ||||||
|           <li><u>Vietnamese:</u> Anh Phan ppanhh(Transifex)</li></ul>"); |  | ||||||
|       trans_txt += "<p>"+tr("Please contact me if you would like to translate qBittorrent into your own language.")+"</p>"; |       trans_txt += "<p>"+tr("Please contact me if you would like to translate qBittorrent into your own language.")+"</p>"; | ||||||
|       te_translation->setHtml(trans_txt); |       te_translation->setHtml(trans_txt); | ||||||
|       // License |       // License | ||||||
|   | |||||||
| @@ -31,11 +31,9 @@ | |||||||
| #ifndef ADDNEWTORRENTDIALOG_H | #ifndef ADDNEWTORRENTDIALOG_H | ||||||
| #define ADDNEWTORRENTDIALOG_H | #define ADDNEWTORRENTDIALOG_H | ||||||
|  |  | ||||||
| #include <QShortcut> |  | ||||||
| #include <QDialog> | #include <QDialog> | ||||||
| #include <QUrl> | #include <QUrl> | ||||||
| #include <libtorrent/torrent_info.hpp> | #include <libtorrent/torrent_info.hpp> | ||||||
| #include "qtorrenthandle.h" |  | ||||||
|  |  | ||||||
| QT_BEGIN_NAMESPACE | QT_BEGIN_NAMESPACE | ||||||
| namespace Ui { | namespace Ui { | ||||||
| @@ -56,22 +54,15 @@ public: | |||||||
|   static void showTorrent(const QString& torrent_path, const QString& from_url = QString()); |   static void showTorrent(const QString& torrent_path, const QString& from_url = QString()); | ||||||
|   static void showMagnet(const QString& torrent_link); |   static void showMagnet(const QString& torrent_link); | ||||||
|  |  | ||||||
| protected: |  | ||||||
|   void showEvent(QShowEvent *event); |  | ||||||
|  |  | ||||||
| private slots: | private slots: | ||||||
|   void showAdvancedSettings(bool show); |   void showAdvancedSettings(bool show); | ||||||
|   void displayContentTreeMenu(const QPoint&); |   void displayContentTreeMenu(const QPoint&); | ||||||
|  |   void on_buttonBox_accepted(); | ||||||
|   void updateDiskSpaceLabel(); |   void updateDiskSpaceLabel(); | ||||||
|   void onSavePathChanged(int); |   void onSavePathChanged(int); | ||||||
|   void relayout(); |   void relayout(); | ||||||
|   void renameSelectedFile(); |   void renameSelectedFile(); | ||||||
|   void setdialogPosition(); |   void setdialogPosition(); | ||||||
|   void updateMetadata(const QTorrentHandle& h); |  | ||||||
|  |  | ||||||
| protected slots: |  | ||||||
|   virtual void accept(); |  | ||||||
|   virtual void reject(); |  | ||||||
|  |  | ||||||
| private: | private: | ||||||
|   explicit AddNewTorrentDialog(QWidget *parent = 0); |   explicit AddNewTorrentDialog(QWidget *parent = 0); | ||||||
| @@ -83,23 +74,18 @@ private: | |||||||
|   void updateFileNameInSavePaths(const QString& new_filename); |   void updateFileNameInSavePaths(const QString& new_filename); | ||||||
|   void loadState(); |   void loadState(); | ||||||
|   void saveState(); |   void saveState(); | ||||||
|   void setMetadataProgressIndicator(bool visibleIndicator, const QString &labelText = QString()); |  | ||||||
|   void setupTreeview(); |  | ||||||
|  |  | ||||||
| private: | private: | ||||||
|   Ui::AddNewTorrentDialog *ui; |   Ui::AddNewTorrentDialog *ui; | ||||||
|   TorrentContentFilterModel *m_contentModel; |   TorrentContentFilterModel *m_contentModel; | ||||||
|   PropListDelegate *m_contentDelegate; |   PropListDelegate *m_contentDelegate; | ||||||
|   bool m_isMagnet; |   bool m_isMagnet; | ||||||
|   bool m_hasMetadata; |  | ||||||
|   QString m_filePath; |   QString m_filePath; | ||||||
|   QString m_url; |   QString m_url; | ||||||
|   QString m_hash; |   QString m_hash; | ||||||
|   boost::intrusive_ptr<libtorrent::torrent_info> m_torrentInfo; |   boost::intrusive_ptr<libtorrent::torrent_info> m_torrentInfo; | ||||||
|   QStringList m_filesPath; |   QStringList m_filesPath; | ||||||
|   bool m_hasRenamedFile; |   bool m_hasRenamedFile; | ||||||
|   QShortcut *editHotkey; |  | ||||||
|   QByteArray m_headerState; |  | ||||||
| }; | }; | ||||||
|  |  | ||||||
| #endif // ADDNEWTORRENTDIALOG_H | #endif // ADDNEWTORRENTDIALOG_H | ||||||
|   | |||||||
| @@ -22,6 +22,9 @@ | |||||||
|     <height>16777215</height> |     <height>16777215</height> | ||||||
|    </size> |    </size> | ||||||
|   </property> |   </property> | ||||||
|  |   <property name="windowTitle"> | ||||||
|  |    <string>Dialog</string> | ||||||
|  |   </property> | ||||||
|   <layout class="QVBoxLayout" name="verticalLayout_3"> |   <layout class="QVBoxLayout" name="verticalLayout_3"> | ||||||
|    <item> |    <item> | ||||||
|     <widget class="QGroupBox" name="groupBox"> |     <widget class="QGroupBox" name="groupBox"> | ||||||
| @@ -176,6 +179,9 @@ | |||||||
|         <property name="sortingEnabled"> |         <property name="sortingEnabled"> | ||||||
|          <bool>true</bool> |          <bool>true</bool> | ||||||
|         </property> |         </property> | ||||||
|  |         <attribute name="headerStretchLastSection"> | ||||||
|  |          <bool>false</bool> | ||||||
|  |         </attribute> | ||||||
|        </widget> |        </widget> | ||||||
|       </item> |       </item> | ||||||
|      </layout> |      </layout> | ||||||
| @@ -183,38 +189,6 @@ | |||||||
|    </item> |    </item> | ||||||
|    <item> |    <item> | ||||||
|     <layout class="QHBoxLayout" name="buttonsHLayout"> |     <layout class="QHBoxLayout" name="buttonsHLayout"> | ||||||
|      <item> |  | ||||||
|       <widget class="QProgressBar" name="progMetaLoading"> |  | ||||||
|        <property name="sizePolicy"> |  | ||||||
|         <sizepolicy hsizetype="Minimum" vsizetype="Minimum"> |  | ||||||
|          <horstretch>0</horstretch> |  | ||||||
|          <verstretch>0</verstretch> |  | ||||||
|         </sizepolicy> |  | ||||||
|        </property> |  | ||||||
|        <property name="maximum"> |  | ||||||
|         <number>0</number> |  | ||||||
|        </property> |  | ||||||
|        <property name="value"> |  | ||||||
|         <number>-1</number> |  | ||||||
|        </property> |  | ||||||
|        <property name="textVisible"> |  | ||||||
|         <bool>false</bool> |  | ||||||
|        </property> |  | ||||||
|        <property name="format"> |  | ||||||
|         <string notr="true">%p%</string> |  | ||||||
|        </property> |  | ||||||
|       </widget> |  | ||||||
|      </item> |  | ||||||
|      <item> |  | ||||||
|       <widget class="QLabel" name="lblMetaLoading"> |  | ||||||
|        <property name="enabled"> |  | ||||||
|         <bool>true</bool> |  | ||||||
|        </property> |  | ||||||
|        <property name="text"> |  | ||||||
|         <string notr="true"/> |  | ||||||
|        </property> |  | ||||||
|       </widget> |  | ||||||
|      </item> |  | ||||||
|      <item> |      <item> | ||||||
|       <spacer name="horizontalSpacer"> |       <spacer name="horizontalSpacer"> | ||||||
|        <property name="orientation"> |        <property name="orientation"> | ||||||
|   | |||||||