You've already forked qBittorrent
							
							
				mirror of
				https://github.com/qbittorrent/qBittorrent
				synced 2025-10-30 23:30:54 +01:00 
			
		
		
		
	Compare commits
	
		
			62 Commits
		
	
	
		
			release-4.
			...
			release-2.
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | c92a8cee7b | ||
|   | 536f275ca3 | ||
|   | 3238336e6e | ||
|   | bd8c03ecd8 | ||
|   | 32ed944ac8 | ||
|   | 72fbf11f70 | ||
|   | 0dc4b27cb6 | ||
|   | a5aa1a5cab | ||
|   | 2dbf418f5a | ||
|   | 04f6d96575 | ||
|   | 25eb43d3bb | ||
|   | cc785c4eea | ||
|   | a589cb7fdc | ||
|   | 4704b50379 | ||
|   | f43de35c33 | ||
|   | ec61870c9e | ||
|   | 746ffaf420 | ||
|   | c60545977c | ||
|   | 10020ed520 | ||
|   | 0aae5f947d | ||
|   | 11b5965b31 | ||
|   | 35b2377e68 | ||
|   | b0ab072aba | ||
|   | 4552df5ec2 | ||
|   | c19db4fa04 | ||
|   | 74e2339bc8 | ||
|   | 991c308423 | ||
|   | 1867643288 | ||
|   | 50023bd968 | ||
|   | 30c5bf3fd6 | ||
|   | 4e2d9564d1 | ||
|   | 600186a6e9 | ||
|   | ca0e605276 | ||
|   | 201aaae897 | ||
|   | 629dc15bef | ||
|   | 35541e14aa | ||
|   | cdede2d3db | ||
|   | 1f2e34b828 | ||
|   | d5aaf975dd | ||
|   | 4ac59dbaba | ||
|   | 67802b16ab | ||
|   | 41883c99c5 | ||
|   | d663c7bd3a | ||
|   | a6d1090515 | ||
|   | 7844ce287d | ||
|   | c6ce0d35b2 | ||
|   | eec56074fc | ||
|   | 7c180dc57a | ||
|   | 043b9f2981 | ||
|   | 229559ef67 | ||
|   | 5e4b815d0f | ||
|   | c98ab55e11 | ||
|   | 632c2c5e4a | ||
|   | bbd9764f9c | ||
|   | 7437bd4265 | ||
|   | 1299e75934 | ||
|   | 514f82a3c9 | ||
|   | 51a69dc36a | ||
|   | 737fee79ed | ||
|   | e5e4bb1111 | ||
|   | 75111cdd8a | ||
|   | f5f915eb5d | 
							
								
								
									
										2
									
								
								AUTHORS
									
									
									
									
									
								
							
							
						
						
									
										2
									
								
								AUTHORS
									
									
									
									
									
								
							| @@ -2,6 +2,7 @@ Author: | ||||
| * Christophe Dumez <chris@qbittorrent.org> | ||||
|  | ||||
| Contributors: | ||||
| * Vladimir Golovnev <glassez@yandex.ru> | ||||
| * Stefanos Antaris <santaris@csd.auth.gr> | ||||
| * Mohammad Dib <mdib@qbittorrent.org> | ||||
| * Mirco Chinelli <infinity89@fastwebmail.it> | ||||
| @@ -68,6 +69,7 @@ Translations authors: | ||||
| * files: src/lang/*.ts | ||||
|   copyright: | ||||
|   - Arabic: SDERAWI (abz8868@msn.com) and sn51234 (nesseyan@gmail.com) | ||||
|   - Armenian: Hrant Ohanyan (hrantohanyan@mail.am) | ||||
|   - Brazilian: Nick Marinho (nickmarinho@gmail.com) | ||||
|   - Bulgarian: Tsvetan & Boyko Bankoff (emerge_life@users.sourceforge.net) | ||||
|   - Catalan: Francisco Luque Contreras (frannoe@ya.com) | ||||
|   | ||||
							
								
								
									
										37
									
								
								Changelog
									
									
									
									
									
								
							
							
						
						
									
										37
									
								
								Changelog
									
									
									
									
									
								
							| @@ -1,3 +1,40 @@ | ||||
| * Sun Jan 23 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.4 | ||||
|    - BUGFIX: Added unicode support to email notification | ||||
|    - BUGFIX: Improved compatibility with various SMTP servers | ||||
|    - BUGFIX: Fix Labeling in RSS downloader | ||||
|    - BUGFIX: Avoid main window flashing on startup (closes #703984) | ||||
|    - BUGFIX: Improved hostname resolution code | ||||
|    - BUGFIX: Dropped dependency on libboost-thread | ||||
|    - BUGFIX: Display legal notice on screen center | ||||
|    - BUGFIX: Fix renaming of single-file torrents (by Vladimir Golovnev) | ||||
|    - I18N: More dialog buttons are now translated (by Vladimir Golovnev) | ||||
|    - I18N: Fix translation of size units (by Vladimir Golovnev) | ||||
|  | ||||
| * Sat Jan 15 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.3 | ||||
|    - BUGFIX: Fix possible crashes in full allocation mode | ||||
|    - BUGFIX: Fix icon size issues (Linux, icon theme) | ||||
|    - BUGFIX: Fixed file priority context menu | ||||
|    - BUGFIX: Remove dbus dependency in nox mode | ||||
|    - BUGFIX: Fix compilation on FreeBSD | ||||
|    - I18N: Improve Web UI translation | ||||
|    - I18N: Updated Polish translation | ||||
|  | ||||
| * Wed Jan 12 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.2 | ||||
|     - BUGFIX: Do not report PeX as being disabled when DHT is | ||||
|     - BUGFIX: Fix possible crash on adding magnet links | ||||
|     - BUGFIX: Fix torrent import (was not working) | ||||
|     - I18N: Updated Greek, Croatian, Russian, Unkrainian and Bulgarian translations | ||||
|     - I18N: Added Armenian translation (New) | ||||
|     - I18N: Remove country flags from program preferences (language selection) | ||||
|     - I18N: Translate locale names (language selection) | ||||
|  | ||||
| * Mon Jan 10 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.1 | ||||
|     - BUGFIX: Really disable torrent addition dialog by default | ||||
|     - BUGFIX: Fix some missing icons in the Web UI | ||||
|     - BUGFIX: Fix magnet torrent name update problem | ||||
|     - COSMETIC: Use 24px size for toolbar icons and reduce spacing | ||||
|     - COSMETIC: Move transfer list filter on the right side of the toolbar | ||||
|  | ||||
| * Sun Jan 9 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.6.0 | ||||
|     - FEATURE: Use system icons (Linux, Qt >= 4.6) | ||||
|     - FEATURE: Improved ETA calculation | ||||
|   | ||||
							
								
								
									
										4
									
								
								INSTALL
									
									
									
									
									
								
							
							
						
						
									
										4
									
								
								INSTALL
									
									
									
									
									
								
							| @@ -18,9 +18,9 @@ qBittorrent - A BitTorrent client in C++ / Qt4 | ||||
|         -> http://www.libtorrent.net | ||||
|         Be careful: another library (the one used by rTorrent) uses a similar name. | ||||
|  | ||||
|     - libboost 1.34.x (libboost-filesystem, libboost-thread, libboost-date-time) + libasio | ||||
|     - libboost 1.34.x (libboost-filesystem, libboost-date-time) + libasio | ||||
|       or | ||||
|     - libboost >= 1.35.x (libboost-system, libboost-filesystem, libboost-thread, libboost-date-time) | ||||
|     - libboost >= 1.35.x (libboost-system, libboost-filesystem, libboost-date-time) | ||||
|  | ||||
|     - python >= 2.3 (needed by search engine) | ||||
|         * Run time only dependency | ||||
|   | ||||
							
								
								
									
										14
									
								
								configure
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										14
									
								
								configure
									
									
									
									
										vendored
									
									
								
							| @@ -346,6 +346,12 @@ public: | ||||
|                 if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) { | ||||
|                   conf->addExtra("CONFIG += debug"); | ||||
|                 } | ||||
|                 #ifdef Q_OS_FREEBSD | ||||
|                   conf->addLib("-lexecinfo"); | ||||
|                   conf->addExtra("MANPREFIX = \$\$PREFIX"); | ||||
|                 #else | ||||
|                   conf->addExtra("MANPREFIX = \$\$PREFIX/share");  | ||||
|                 #endif | ||||
| 		return(QT_VERSION >= 0x040500); | ||||
| 	} | ||||
| }; | ||||
| @@ -445,9 +451,6 @@ public: | ||||
| 			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) { | ||||
| 				return false; | ||||
|       			} | ||||
| 			if(!conf->checkHeader(s, "boost/thread.hpp")) { | ||||
| 				return false; | ||||
|       			} | ||||
| 		}else{ | ||||
| 			QStringList sl; | ||||
| 			sl << "/usr/include"; | ||||
| @@ -468,9 +471,6 @@ public: | ||||
| 			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) { | ||||
| 				return false; | ||||
|       			} | ||||
| 			if(!conf->checkHeader(s, "boost/thread.hpp")) { | ||||
| 				return false; | ||||
|       			} | ||||
| 		} | ||||
| 		conf->addIncludePath(s); | ||||
| 		// Find library | ||||
| @@ -481,7 +481,7 @@ public: | ||||
| #endif | ||||
|     if(conf->getenv("QC_DISABLE_GUI").isEmpty()) { | ||||
|       // Not required by nox | ||||
|       required_libs << "filesystem" << "thread"; | ||||
|       required_libs << "filesystem" ; | ||||
|     } | ||||
|     QStringList libDirs; | ||||
|     libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/"; | ||||
|   | ||||
| @@ -1,5 +1,3 @@ | ||||
| INCLUDEPATH += $$PWD | ||||
|  | ||||
| exists(conf.pri) { | ||||
|     # to the conf.pri goes all system dependent stuff | ||||
|     include(conf.pri) | ||||
|   | ||||
| @@ -48,9 +48,6 @@ public: | ||||
| 			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) { | ||||
| 				return false; | ||||
|       			} | ||||
| 			if(!conf->checkHeader(s, "boost/thread.hpp")) { | ||||
| 				return false; | ||||
|       			} | ||||
| 		}else{ | ||||
| 			QStringList sl; | ||||
| 			sl << "/usr/include"; | ||||
| @@ -71,9 +68,6 @@ public: | ||||
| 			if(!conf->checkHeader(s, "boost/filesystem/path.hpp")) { | ||||
| 				return false; | ||||
|       			} | ||||
| 			if(!conf->checkHeader(s, "boost/thread.hpp")) { | ||||
| 				return false; | ||||
|       			} | ||||
| 		} | ||||
| 		conf->addIncludePath(s); | ||||
| 		// Find library | ||||
| @@ -84,7 +78,7 @@ public: | ||||
| #endif | ||||
|     if(conf->getenv("QC_DISABLE_GUI").isEmpty()) { | ||||
|       // Not required by nox | ||||
|       required_libs << "filesystem" << "thread"; | ||||
|       required_libs << "filesystem" ; | ||||
|     } | ||||
|     QStringList libDirs; | ||||
|     libDirs << "/usr/lib/" << "/usr/lib64/" << "/usr/local/lib/" << "/usr/local/lib64/"; | ||||
|   | ||||
| @@ -21,6 +21,12 @@ public: | ||||
|                 if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) { | ||||
|                   conf->addExtra("CONFIG += debug"); | ||||
|                 } | ||||
|                 #ifdef Q_OS_FREEBSD | ||||
|                   conf->addLib("-lexecinfo"); | ||||
|                   conf->addExtra("MANPREFIX = $$PREFIX"); | ||||
|                 #else | ||||
|                   conf->addExtra("MANPREFIX = $$PREFIX/share");  | ||||
|                 #endif | ||||
| 		return(QT_VERSION >= 0x040500); | ||||
| 	} | ||||
| }; | ||||
|   | ||||
| @@ -1,6 +1,6 @@ | ||||
| [Desktop Entry] | ||||
| Categories=Qt;Network;P2P; | ||||
| Comment=V2.6.0 | ||||
| Comment=V2.6.4 | ||||
| Exec=qbittorrent %f | ||||
| GenericName=Bittorrent client | ||||
| GenericName[ar]=العميل Bittorrent | ||||
|   | ||||
| @@ -47,7 +47,7 @@ | ||||
| 	<key>CFBundlePackageType</key> | ||||
| 	<string>APPL</string> | ||||
| 	<key>CFBundleGetInfoString</key> | ||||
| 	<string>2.6.0</string> | ||||
| 	<string>2.6.4</string> | ||||
| 	<key>CFBundleSignature</key> | ||||
| 	<string>????</string> | ||||
| 	<key>CFBundleExecutable</key> | ||||
|   | ||||
| @@ -60,6 +60,7 @@ class about : public QDialog, private Ui::AboutDlg{ | ||||
|       // Translation | ||||
|       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) and sn51234 (nesseyan@gmail.com)</li>\ | ||||
|           <li><u>Armenian:</u> Hrant Ohanyan (hrantohanyan@mail.am)</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>Catalan:</u> Francisco Luque Contreras (frannoe@ya.com)</li>\ | ||||
|   | ||||
| @@ -12,7 +12,7 @@ | ||||
| #include <QSet> | ||||
| #include <iostream> | ||||
| #include <errno.h> | ||||
| #ifdef Q_WS_MAC | ||||
| #if defined(Q_WS_MAC) || defined(Q_OS_FREEBSD) | ||||
| #include <sys/param.h> | ||||
| #include <sys/mount.h> | ||||
| #include <string.h> | ||||
|   | ||||
| @@ -58,8 +58,11 @@ void IconProvider::drop() | ||||
| QIcon IconProvider::getIcon(const QString &iconId) | ||||
| { | ||||
| #if defined(Q_WS_X11) && (QT_VERSION >= QT_VERSION_CHECK(4,6,0)) | ||||
|   if(m_useSystemTheme) | ||||
|     return QIcon::fromTheme(iconId, QIcon(":/Icons/oxygen/"+iconId+".png")); | ||||
|   if(m_useSystemTheme) { | ||||
|     QIcon icon = QIcon::fromTheme(iconId, QIcon(":/Icons/oxygen/"+iconId+".png")); | ||||
|     icon = generateDifferentSizes(icon); | ||||
|     return icon; | ||||
|   } | ||||
| #endif | ||||
|   return QIcon(":/Icons/oxygen/"+iconId+".png"); | ||||
| } | ||||
| @@ -69,6 +72,28 @@ void IconProvider::useSystemIconTheme(bool enable) | ||||
| { | ||||
|   m_useSystemTheme = enable; | ||||
| } | ||||
|  | ||||
| QIcon IconProvider::generateDifferentSizes(const QIcon &icon) | ||||
| { | ||||
|   QIcon new_icon; | ||||
|   QList<QSize> required_sizes; | ||||
|   required_sizes << QSize(16, 16) << QSize(24, 24); | ||||
|   QList<QIcon::Mode> modes; | ||||
|   modes << QIcon::Normal << QIcon::Active << QIcon::Selected << QIcon::Disabled; | ||||
|   foreach(const QSize& size, required_sizes) { | ||||
|     foreach(QIcon::Mode mode, modes) { | ||||
|       QPixmap pixoff = icon.pixmap(size, mode, QIcon::Off); | ||||
|       if(pixoff.height() > size.height()) | ||||
|         pixoff = pixoff.scaled(size, Qt::KeepAspectRatio,  Qt::SmoothTransformation); | ||||
|       new_icon.addPixmap(pixoff, mode, QIcon::Off); | ||||
|       QPixmap pixon = icon.pixmap(size, mode, QIcon::On); | ||||
|       if(pixon.height() > size.height()) | ||||
|         pixon = pixoff.scaled(size, Qt::KeepAspectRatio,  Qt::SmoothTransformation); | ||||
|       new_icon.addPixmap(pixon, mode, QIcon::On); | ||||
|     } | ||||
|   } | ||||
|   return new_icon; | ||||
| } | ||||
| #endif | ||||
|  | ||||
| QString IconProvider::getIconPath(const QString &iconId) | ||||
|   | ||||
| @@ -52,6 +52,9 @@ public: | ||||
| public: | ||||
|   void useSystemIconTheme(bool enable); | ||||
|  | ||||
| private: | ||||
|   QIcon generateDifferentSizes(const QIcon& icon); | ||||
|  | ||||
| private: | ||||
|   bool m_useSystemTheme; | ||||
| #endif | ||||
|   | ||||
| @@ -31,5 +31,6 @@ | ||||
|   <file>lang/qbittorrent_en.qm</file> | ||||
|   <file>lang/qbittorrent_hr.qm</file> | ||||
|   <file>lang/qbittorrent_ro.qm</file> | ||||
|   <file>lang/qbittorrent_hy.qm</file> | ||||
| </qresource> | ||||
| </RCC> | ||||
										
											Binary file not shown.
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											Binary file not shown.
										
									
								
							
										
											
												File diff suppressed because it is too large
												Load Diff
											
										
									
								
							
										
											Binary file not shown.
										
									
								
							Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user