You've already forked qBittorrent
							
							
				mirror of
				https://github.com/qbittorrent/qBittorrent
				synced 2025-10-30 23:30:54 +01:00 
			
		
		
		
	Compare commits
	
		
			43 Commits
		
	
	
		
			v4_6_x
			...
			release-2.
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
|   | 0e8f62b675 | ||
|   | c571ae900c | ||
|   | b9f6bbf09b | ||
|   | 916e01f9f8 | ||
|   | 7bd5b0d3b5 | ||
|   | 44574498ad | ||
|   | ec3d45fc99 | ||
|   | 7908de917a | ||
|   | 0e53a6ab8b | ||
|   | ba2f8af012 | ||
|   | a8bc3f6d4d | ||
|   | 0211f42df9 | ||
|   | 0180f46dc9 | ||
|   | 6e4d15e72d | ||
|   | 3e1e992fa8 | ||
|   | 6051aa57cf | ||
|   | 55b0cac61b | ||
|   | 28409b83c3 | ||
|   | eed0b6ca12 | ||
|   | 4b0fae88bc | ||
|   | 6ff3de7686 | ||
|   | f08d792e67 | ||
|   | e2edf62834 | ||
|   | eb4c449620 | ||
|   | c06386126b | ||
|   | 8c854b8a0e | ||
|   | 749c3a429a | ||
|   | a6edea2222 | ||
|   | d66c88d59e | ||
|   | b92c152d30 | ||
|   | 148ec32825 | ||
|   | 8298b62f56 | ||
|   | 53f46875d8 | ||
|   | a67caf1730 | ||
|   | 6a38f69fad | ||
|   | d5bf2b2e1f | ||
|   | f6df1c7fed | ||
|   | fa88bce77d | ||
|   | 571465ff7e | ||
|   | 09a3f78a28 | ||
|   | f98520e6c2 | ||
|   | 0211f3aee3 | ||
|   | 0dcd33fb6d | 
							
								
								
									
										30
									
								
								Changelog
									
									
									
									
									
								
							
							
						
						
									
										30
									
								
								Changelog
									
									
									
									
									
								
							| @@ -1,3 +1,33 @@ | |||||||
|  | * Thu Jan 6 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.5.4 | ||||||
|  |     - BUGFIX: Added --enable-debug parameter to the configure script | ||||||
|  |     - BUGFIX: Prioritize first and last pieces when sequential download is enabled | ||||||
|  |     - BUGFIX: Some encoding fixes (Windows) | ||||||
|  |     - BUGFIX: Display default password on stdout when using nox | ||||||
|  |     - BUGFIX: Fix issues when search engines results contain a '|' | ||||||
|  |     - BUGFIX: Avoid possible crash on exit when the IP filter is enabled (closes #695945) | ||||||
|  |  | ||||||
|  | * Sat Jan 1 2011 - Christophe Dumez <chris@qbittorrent.org> - v2.5.3 | ||||||
|  |     - BUGFIX: Fix priority up/down for multiple torrents at the same time (closes #692184) | ||||||
|  |     - BUGFIX: Make sure the number of torrents is properly set on startup (closes #694135) | ||||||
|  |     - BUGFIX: Fix scan directories saving (closes #694768) | ||||||
|  |     - BUGFIX: Remove empty folders on torrent soft deletion (closes #695174) | ||||||
|  |     - BUGFIX: Make sure the main window has focus on startup | ||||||
|  |     - BUGFIX: Fix ampersand display in search tabs (closes #695715) | ||||||
|  |  | ||||||
|  | * Sun Dec 19 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.5.2 | ||||||
|  |     - BUGFIX: Fix alternative speed icon staying pressed when disabled | ||||||
|  |     - BUGFIX: Fix slot warning on startup | ||||||
|  |     - BUGFIX: Fix alignment issues in program preferences | ||||||
|  |     - BUGFIX: Make sure we don't move completed torrent to the temp directory | ||||||
|  |     for checking (closes #602938) | ||||||
|  |     - BUGFIX: Fix some 'File Not found' warning in the Web UI | ||||||
|  |     - BUGFIX: Fix dangerous usage of vector iterator | ||||||
|  |     - BUGFIX: No longer expand the first folder in the torrent content list | ||||||
|  |     - BUGFIX: Fixes possible crash in the RSS Downloader dialog (closes #691426) | ||||||
|  |  | ||||||
|  | * Sun Dec 5 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.5.1 | ||||||
|  |     - BUGFIX: Fix possible crash when right-clicking on a torrent | ||||||
|  |  | ||||||
| * Sun Dec 5 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.5.0 | * Sun Dec 5 2010 - Christophe Dumez <chris@qbittorrent.org> - v2.5.0 | ||||||
|     - FEATURE: qBittorrent can now act as a tracker |     - FEATURE: qBittorrent can now act as a tracker | ||||||
|     - FEATURE: New and improved RSS feed automated downloader |     - FEATURE: New and improved RSS feed automated downloader | ||||||
|   | |||||||
							
								
								
									
										37
									
								
								configure
									
									
									
									
										vendored
									
									
								
							
							
						
						
									
										37
									
								
								configure
									
									
									
									
										vendored
									
									
								
							| @@ -18,9 +18,11 @@ Main options: | |||||||
|   --help              This help text. |   --help              This help text. | ||||||
|  |  | ||||||
| Dependency options: | Dependency options: | ||||||
|  |   --enable-debug                                  Enable debug mode | ||||||
|   --disable-gui                                   Disable qBittorrent |   --disable-gui                                   Disable qBittorrent | ||||||
|                                                  Graphical user interface for |                                                  Graphical user interface for | ||||||
|                                                  headless running |                                                  headless running | ||||||
|  |   --enable-debug                                  Enable debug mode | ||||||
|   --with-libboost-inc=[path]                      Path to libboost include |   --with-libboost-inc=[path]                      Path to libboost include | ||||||
|                                                  files |                                                  files | ||||||
|   --with-libboost-lib=[path]                      Path to libboost library |   --with-libboost-lib=[path]                      Path to libboost library | ||||||
| @@ -32,7 +34,6 @@ Dependency options: | |||||||
|                                                  executable (please follow |                                                  executable (please follow | ||||||
|                                                  instructions in |                                                  instructions in | ||||||
|                                                  src/geoip/README) |                                                  src/geoip/README) | ||||||
|   --disable-qtsingleapplication                  Disable use of libboost |  | ||||||
|   --with-qtsingleapplication=[system|shipped]     Use the shipped |   --with-qtsingleapplication=[system|shipped]     Use the shipped | ||||||
|                                                  qtsingleapplication library |                                                  qtsingleapplication library | ||||||
|                                                  or the system one |                                                  or the system one | ||||||
| @@ -152,11 +153,21 @@ while [ $# -gt 0 ]; do | |||||||
| 			shift | 			shift | ||||||
| 			;; | 			;; | ||||||
|  |  | ||||||
|  | 		--enable-debug) | ||||||
|  | 			QC_ENABLE_DEBUG="Y" | ||||||
|  | 			shift | ||||||
|  | 			;; | ||||||
|  |  | ||||||
| 		--disable-gui) | 		--disable-gui) | ||||||
| 			QC_DISABLE_GUI="Y" | 			QC_DISABLE_GUI="Y" | ||||||
| 			shift | 			shift | ||||||
| 			;; | 			;; | ||||||
|  |  | ||||||
|  | 		--enable-debug) | ||||||
|  | 			QC_ENABLE_DEBUG="Y" | ||||||
|  | 			shift | ||||||
|  | 			;; | ||||||
|  |  | ||||||
| 		--with-libboost-inc=*) | 		--with-libboost-inc=*) | ||||||
| 			QC_WITH_LIBBOOST_INC=$optarg | 			QC_WITH_LIBBOOST_INC=$optarg | ||||||
| 			shift | 			shift | ||||||
| @@ -182,11 +193,6 @@ while [ $# -gt 0 ]; do | |||||||
| 			shift | 			shift | ||||||
| 			;; | 			;; | ||||||
|  |  | ||||||
| 		--disable-qtsingleapplication) |  | ||||||
| 			QC_DISABLE_qtsingleapplication="Y" |  | ||||||
| 			shift |  | ||||||
| 			;; |  | ||||||
|  |  | ||||||
| 		--with-qtsingleapplication=*) | 		--with-qtsingleapplication=*) | ||||||
| 			QC_WITH_QTSINGLEAPPLICATION=$optarg | 			QC_WITH_QTSINGLEAPPLICATION=$optarg | ||||||
| 			shift | 			shift | ||||||
| @@ -213,13 +219,14 @@ echo PREFIX=$PREFIX | |||||||
| echo BINDIR=$BINDIR | echo BINDIR=$BINDIR | ||||||
| echo DATADIR=$DATADIR | echo DATADIR=$DATADIR | ||||||
| echo EX_QTDIR=$EX_QTDIR | echo EX_QTDIR=$EX_QTDIR | ||||||
|  | echo QC_ENABLE_DEBUG=$QC_ENABLE_DEBUG | ||||||
| echo QC_DISABLE_GUI=$QC_DISABLE_GUI | echo QC_DISABLE_GUI=$QC_DISABLE_GUI | ||||||
|  | echo QC_ENABLE_DEBUG=$QC_ENABLE_DEBUG | ||||||
| echo QC_WITH_LIBBOOST_INC=$QC_WITH_LIBBOOST_INC | echo QC_WITH_LIBBOOST_INC=$QC_WITH_LIBBOOST_INC | ||||||
| echo QC_WITH_LIBBOOST_LIB=$QC_WITH_LIBBOOST_LIB | echo QC_WITH_LIBBOOST_LIB=$QC_WITH_LIBBOOST_LIB | ||||||
| echo QC_DISABLE_libnotify=$QC_DISABLE_libnotify | echo QC_DISABLE_libnotify=$QC_DISABLE_libnotify | ||||||
| echo QC_DISABLE_geoip_database=$QC_DISABLE_geoip_database | echo QC_DISABLE_geoip_database=$QC_DISABLE_geoip_database | ||||||
| echo QC_WITH_GEOIP_DATABASE_EMBEDDED=$QC_WITH_GEOIP_DATABASE_EMBEDDED | echo QC_WITH_GEOIP_DATABASE_EMBEDDED=$QC_WITH_GEOIP_DATABASE_EMBEDDED | ||||||
| echo QC_DISABLE_qtsingleapplication=$QC_DISABLE_qtsingleapplication |  | ||||||
| echo QC_WITH_QTSINGLEAPPLICATION=$QC_WITH_QTSINGLEAPPLICATION | echo QC_WITH_QTSINGLEAPPLICATION=$QC_WITH_QTSINGLEAPPLICATION | ||||||
| echo | echo | ||||||
| fi | fi | ||||||
| @@ -326,7 +333,9 @@ cat >$1/modules.cpp <<EOT | |||||||
| /* | /* | ||||||
| -----BEGIN QCMOD----- | -----BEGIN QCMOD----- | ||||||
| name: Qt >= 4.5 | name: Qt >= 4.5 | ||||||
|  | arg: enable-debug, Enable debug mode | ||||||
| arg: disable-gui, Disable qBittorrent Graphical user interface for headless running | arg: disable-gui, Disable qBittorrent Graphical user interface for headless running | ||||||
|  | arg: enable-debug, Enable debug mode | ||||||
| -----END QCMOD----- | -----END QCMOD----- | ||||||
| */ | */ | ||||||
| class qc_qt4 : public ConfObj | class qc_qt4 : public ConfObj | ||||||
| @@ -337,9 +346,14 @@ public: | |||||||
| 	QString shortname() const { return "Qt 4.5"; } | 	QString shortname() const { return "Qt 4.5"; } | ||||||
| 	bool exec() | 	bool exec() | ||||||
| 	{ | 	{ | ||||||
|  |                 // NOX mode | ||||||
| 		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) { | 		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) { | ||||||
| 			conf->addExtra("CONFIG += nox"); | 			conf->addExtra("CONFIG += nox"); | ||||||
| 		}	 | 		} | ||||||
|  |                 // Debug mode | ||||||
|  |                 if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) { | ||||||
|  |                   conf->addExtra("CONFIG += debug"); | ||||||
|  |                 } | ||||||
| 		return(QT_VERSION >= 0x040500); | 		return(QT_VERSION >= 0x040500); | ||||||
| 	} | 	} | ||||||
| }; | }; | ||||||
| @@ -609,7 +623,7 @@ public: | |||||||
| #line 1 "qtsingleapplication.qcm" | #line 1 "qtsingleapplication.qcm" | ||||||
| /* | /* | ||||||
| -----BEGIN QCMOD----- | -----BEGIN QCMOD----- | ||||||
| name: libboost | name: qtsingleapplication | ||||||
| arg: with-qtsingleapplication=[system|shipped], Use the shipped qtsingleapplication library or the system one | arg: with-qtsingleapplication=[system|shipped], Use the shipped qtsingleapplication library or the system one | ||||||
| -----END QCMOD----- | -----END QCMOD----- | ||||||
| */ | */ | ||||||
| @@ -655,7 +669,7 @@ cat >$1/modules_new.cpp <<EOT | |||||||
|     o->required = false; |     o->required = false; | ||||||
|     o->disabled = false; |     o->disabled = false; | ||||||
|     o = new qc_qtsingleapplication(conf); |     o = new qc_qtsingleapplication(conf); | ||||||
|     o->required = false; |     o->required = true; | ||||||
|     o->disabled = false; |     o->disabled = false; | ||||||
|  |  | ||||||
| EOT | EOT | ||||||
| @@ -1602,13 +1616,14 @@ export PREFIX | |||||||
| export BINDIR | export BINDIR | ||||||
| export DATADIR | export DATADIR | ||||||
| export EX_QTDIR | export EX_QTDIR | ||||||
|  | export QC_ENABLE_DEBUG | ||||||
| export QC_DISABLE_GUI | export QC_DISABLE_GUI | ||||||
|  | export QC_ENABLE_DEBUG | ||||||
| export QC_WITH_LIBBOOST_INC | export QC_WITH_LIBBOOST_INC | ||||||
| export QC_WITH_LIBBOOST_LIB | export QC_WITH_LIBBOOST_LIB | ||||||
| export QC_DISABLE_libnotify | export QC_DISABLE_libnotify | ||||||
| export QC_DISABLE_geoip_database | export QC_DISABLE_geoip_database | ||||||
| export QC_WITH_GEOIP_DATABASE_EMBEDDED | export QC_WITH_GEOIP_DATABASE_EMBEDDED | ||||||
| export QC_DISABLE_qtsingleapplication |  | ||||||
| export QC_WITH_QTSINGLEAPPLICATION | export QC_WITH_QTSINGLEAPPLICATION | ||||||
| export QC_VERBOSE | export QC_VERBOSE | ||||||
| rm -rf .qconftemp | rm -rf .qconftemp | ||||||
|   | |||||||
							
								
								
									
										136
									
								
								install.os2
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										136
									
								
								install.os2
									
									
									
									
									
										Normal file
									
								
							| @@ -0,0 +1,136 @@ | |||||||
|  | QBittorrent installation | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | 0. CONTENTS OF THIS FILE | ||||||
|  | ======================== | ||||||
|  |  | ||||||
|  | 1. INTRODUCTION | ||||||
|  |  | ||||||
|  | 2. REQUIREMENTS | ||||||
|  |  | ||||||
|  | 3. INSTALLATION | ||||||
|  |  | ||||||
|  | 4. CONTACT | ||||||
|  |  | ||||||
|  | 5. CREDITS | ||||||
|  |  | ||||||
|  | 6. SUPPORT AND DONATIONS | ||||||
|  |  | ||||||
|  | 7. HISTORY | ||||||
|  |  | ||||||
|  |  | ||||||
|  | 1. INTRODUCTION | ||||||
|  | =============== | ||||||
|  |  | ||||||
|  | Welcome to QBittorrent port for OS/2 and eComStation. | ||||||
|  |  | ||||||
|  |  | ||||||
|  | 2. REQUIREMENTS | ||||||
|  | =============== | ||||||
|  |  | ||||||
|  | * klibc 0.6.3 or later | ||||||
|  |  | ||||||
|  |     ftp://ftp.netlabs.org/pub/gcc/libc-0_6_3-csd3.wpi | ||||||
|  |  | ||||||
|  | * openssl 1.0 | ||||||
|  |   | ||||||
|  |     ftp://ftp.netlabs.org/pub/unixos2/ssl10.zip | ||||||
|  |  | ||||||
|  | * Qt4 dll | ||||||
|  |  | ||||||
|  |     see http://svn.netlabs.org/qt4 for more information whats needed and where to get the latest | ||||||
|  |  | ||||||
|  |  | ||||||
|  | 3. INSTALLATION | ||||||
|  | =============== | ||||||
|  |            | ||||||
|  | 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. | ||||||
|  |   4. Start QBittorrent | ||||||
|  |   5. Happy torrenting | ||||||
|  |    | ||||||
|  |  | ||||||
|  |  | ||||||
|  | 4. CONTACT | ||||||
|  | ========== | ||||||
|  |  | ||||||
|  | Please send bugreports to: | ||||||
|  |  | ||||||
|  |   ecs@aroa.ch | ||||||
|  |  | ||||||
|  | Only bug reports with a reproducable bug are accepted. :-) | ||||||
|  |  | ||||||
|  |  | ||||||
|  |  | ||||||
|  | 5. CREDITS | ||||||
|  | ========== | ||||||
|  |  | ||||||
|  | The port was done by: | ||||||
|  |  | ||||||
|  | Silvan Scherrer aka _diver | ||||||
|  |  | ||||||
|  | Thanks go to: | ||||||
|  |  | ||||||
|  |   * Dmitry A. Kuminov | ||||||
|  |  | ||||||
|  | They either helped me when I had some nasty questions or did some testing for | ||||||
|  | me. | ||||||
|  |  | ||||||
|  |  | ||||||
|  | 6. SUPPORT AND DONATIONS | ||||||
|  | ======================== | ||||||
|  |  | ||||||
|  | QBittorrent port is based on volunteer work. If you would like to support further | ||||||
|  | development, you can do so in one of the following ways: | ||||||
|  |  | ||||||
|  |  | ||||||
|  |   * Donate to the Qt4 project: see qt.netlabs.org for more information | ||||||
|  |  | ||||||
|  |   * Contribute to the project: Besides actual development, this also includes | ||||||
|  |     maintaining the documentation and the project web site as well as help | ||||||
|  |     for users. | ||||||
|  |  | ||||||
|  |  | ||||||
|  | 7. HISTORY | ||||||
|  | ========== | ||||||
|  |  | ||||||
|  | 2010-12-23 | ||||||
|  |  | ||||||
|  |   * updated to 2.5.2 code level of QBittorrent | ||||||
|  |  | ||||||
|  | 2010-11-22 | ||||||
|  |  | ||||||
|  |   * updated to 2.4.11 code level of QBittorrent | ||||||
|  |  | ||||||
|  | 2010-xx-xx | ||||||
|  |  | ||||||
|  |   * initial port | ||||||
|  |  | ||||||
| @@ -1,3 +1,10 @@ | |||||||
|  | INCLUDEPATH += $$PWD | ||||||
|  |  | ||||||
|  | exists(conf.pri) { | ||||||
|  |     # to the conf.pri goes all system dependent stuff | ||||||
|  |     include(conf.pri) | ||||||
|  | } | ||||||
|  |  | ||||||
| LIBS += -ltorrent-rasterbar \ | LIBS += -ltorrent-rasterbar \ | ||||||
|         -lboost_thread \ |         -lboost_thread \ | ||||||
|         -lboost_system \ |         -lboost_system \ | ||||||
|   | |||||||
| @@ -20,5 +20,6 @@ | |||||||
|   <dep type='geoip-database'> |   <dep type='geoip-database'> | ||||||
|   </dep> |   </dep> | ||||||
|   <dep type='qtsingleapplication'> |   <dep type='qtsingleapplication'> | ||||||
|  |     <required/> | ||||||
|   </dep> |   </dep> | ||||||
| </qconf> | </qconf> | ||||||
|   | |||||||
| @@ -1,7 +1,9 @@ | |||||||
| /* | /* | ||||||
| -----BEGIN QCMOD----- | -----BEGIN QCMOD----- | ||||||
| name: Qt >= 4.5 | name: Qt >= 4.5 | ||||||
|  | arg: enable-debug, Enable debug mode | ||||||
| arg: disable-gui, Disable qBittorrent Graphical user interface for headless running | arg: disable-gui, Disable qBittorrent Graphical user interface for headless running | ||||||
|  | arg: enable-debug, Enable debug mode | ||||||
| -----END QCMOD----- | -----END QCMOD----- | ||||||
| */ | */ | ||||||
| class qc_qt4 : public ConfObj | class qc_qt4 : public ConfObj | ||||||
| @@ -12,9 +14,14 @@ public: | |||||||
| 	QString shortname() const { return "Qt 4.5"; } | 	QString shortname() const { return "Qt 4.5"; } | ||||||
| 	bool exec() | 	bool exec() | ||||||
| 	{ | 	{ | ||||||
|  |                 // NOX mode | ||||||
| 		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) { | 		if(!conf->getenv("QC_DISABLE_GUI").isEmpty()) { | ||||||
| 			conf->addExtra("CONFIG += nox"); | 			conf->addExtra("CONFIG += nox"); | ||||||
| 		}	 | 		} | ||||||
|  |                 // Debug mode | ||||||
|  |                 if(!conf->getenv("QC_ENABLE_DEBUG").isEmpty()) { | ||||||
|  |                   conf->addExtra("CONFIG += debug"); | ||||||
|  |                 } | ||||||
| 		return(QT_VERSION >= 0x040500); | 		return(QT_VERSION >= 0x040500); | ||||||
| 	} | 	} | ||||||
| }; | }; | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| /* | /* | ||||||
| -----BEGIN QCMOD----- | -----BEGIN QCMOD----- | ||||||
| name: libboost | name: qtsingleapplication | ||||||
| arg: with-qtsingleapplication=[system|shipped], Use the shipped qtsingleapplication library or the system one | arg: with-qtsingleapplication=[system|shipped], Use the shipped qtsingleapplication library or the system one | ||||||
| -----END QCMOD----- | -----END QCMOD----- | ||||||
| */ | */ | ||||||
|   | |||||||
| @@ -1,6 +1,6 @@ | |||||||
| [Desktop Entry] | [Desktop Entry] | ||||||
| Categories=Qt;Network;P2P; | Categories=Qt;Network;P2P; | ||||||
| Comment=V2.5.0 | Comment=V2.5.4 | ||||||
| Exec=qbittorrent %f | Exec=qbittorrent %f | ||||||
| GenericName=Bittorrent client | GenericName=Bittorrent client | ||||||
| GenericName[ar]=العميل Bittorrent | GenericName[ar]=العميل Bittorrent | ||||||
|   | |||||||
| @@ -47,7 +47,7 @@ | |||||||
| 	<key>CFBundlePackageType</key> | 	<key>CFBundlePackageType</key> | ||||||
| 	<string>APPL</string> | 	<string>APPL</string> | ||||||
| 	<key>CFBundleGetInfoString</key> | 	<key>CFBundleGetInfoString</key> | ||||||
| 	<string>2.5.0</string> | 	<string>2.5.4</string> | ||||||
| 	<key>CFBundleSignature</key> | 	<key>CFBundleSignature</key> | ||||||
| 	<string>????</string> | 	<string>????</string> | ||||||
| 	<key>CFBundleExecutable</key> | 	<key>CFBundleExecutable</key> | ||||||
|   | |||||||
| @@ -88,6 +88,7 @@ protected: | |||||||
|         } |         } | ||||||
|       } |       } | ||||||
|     } |     } | ||||||
|  |     if(abort) return; | ||||||
|     s->set_ip_filter(filter); |     s->set_ip_filter(filter); | ||||||
|     qDebug("IP Filter thread: finished parsing, filter applied"); |     qDebug("IP Filter thread: finished parsing, filter applied"); | ||||||
|   } |   } | ||||||
|   | |||||||
| @@ -54,7 +54,8 @@ public: | |||||||
|     std::cout << std::endl << "******** " << qPrintable(tr("Information")) << " ********" << std::endl; |     std::cout << std::endl << "******** " << qPrintable(tr("Information")) << " ********" << std::endl; | ||||||
|     std::cout << qPrintable(tr("To control qBittorrent, access the Web UI at http://localhost:%1").arg(QString::number(pref.getWebUiPort()))) << std::endl; |     std::cout << qPrintable(tr("To control qBittorrent, access the Web UI at http://localhost:%1").arg(QString::number(pref.getWebUiPort()))) << std::endl; | ||||||
|     std::cout << qPrintable(tr("The Web UI administrator user name is: %1").arg(pref.getWebUiUsername())) << std::endl; |     std::cout << qPrintable(tr("The Web UI administrator user name is: %1").arg(pref.getWebUiUsername())) << std::endl; | ||||||
|     if(pref.getWebUiPassword() == "f6fdffe48c908deb0f4c3bd36c032e72") { |     qDebug() << "Password:" << pref.getWebUiPassword(); | ||||||
|  |     if(pref.getWebUiPassword() == "32fe0bd2bb001911bb8bcfe23fc92b63") { | ||||||
|       std::cout << qPrintable(tr("The Web UI administrator password is still the default one: %1").arg("adminadmin")) << std::endl; |       std::cout << qPrintable(tr("The Web UI administrator password is still the default one: %1").arg("adminadmin")) << std::endl; | ||||||
|       std::cout << qPrintable(tr("This is a security risk, please consider changing your password from program preferences.")) << std::endl; |       std::cout << qPrintable(tr("This is a security risk, please consider changing your password from program preferences.")) << std::endl; | ||||||
|     } |     } | ||||||
|   | |||||||
| @@ -3986,12 +3986,12 @@ Please install it manually.</source> | |||||||
|         <translation>اضغط هنا لتشغيل حد السرعة البديل</translation> |         <translation>اضغط هنا لتشغيل حد السرعة البديل</translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="226"/> |         <location filename="../statusbar.h" line="227"/> | ||||||
|         <source>Global Download Speed Limit</source> |         <source>Global Download Speed Limit</source> | ||||||
|         <translation>حد سرعة التحميل العامة</translation> |         <translation>حد سرعة التحميل العامة</translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="246"/> |         <location filename="../statusbar.h" line="247"/> | ||||||
|         <source>Global Upload Speed Limit</source> |         <source>Global Upload Speed Limit</source> | ||||||
|         <translation>حد سرعة الرفع العامة</translation> |         <translation>حد سرعة الرفع العامة</translation> | ||||||
|     </message> |     </message> | ||||||
|   | |||||||
| @@ -3927,12 +3927,12 @@ Please install it manually.</source> | |||||||
|         <translation>Щракни за включване на други ограничения за скорост</translation> |         <translation>Щракни за включване на други ограничения за скорост</translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="226"/> |         <location filename="../statusbar.h" line="227"/> | ||||||
|         <source>Global Download Speed Limit</source> |         <source>Global Download Speed Limit</source> | ||||||
|         <translation>Общ лимит Скорост на сваляне</translation> |         <translation>Общ лимит Скорост на сваляне</translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="246"/> |         <location filename="../statusbar.h" line="247"/> | ||||||
|         <source>Global Upload Speed Limit</source> |         <source>Global Upload Speed Limit</source> | ||||||
|         <translation>Общ лимит Скорост на качване</translation> |         <translation>Общ лимит Скорост на качване</translation> | ||||||
|     </message> |     </message> | ||||||
|   | |||||||
| @@ -3758,12 +3758,12 @@ Si us plau, instal-li'l de forma manual.</translation> | |||||||
|         <translation>Click per activar els límits de velocitat alternativa</translation> |         <translation>Click per activar els límits de velocitat alternativa</translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="226"/> |         <location filename="../statusbar.h" line="227"/> | ||||||
|         <source>Global Download Speed Limit</source> |         <source>Global Download Speed Limit</source> | ||||||
|         <translation>Velocitat límit global de descàrrega</translation> |         <translation>Velocitat límit global de descàrrega</translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="246"/> |         <location filename="../statusbar.h" line="247"/> | ||||||
|         <source>Global Upload Speed Limit</source> |         <source>Global Upload Speed Limit</source> | ||||||
|         <translation>Velocitat límit global de pujada</translation> |         <translation>Velocitat límit global de pujada</translation> | ||||||
|     </message> |     </message> | ||||||
|   | |||||||
| @@ -3990,12 +3990,12 @@ Nainstalujte jej prosím ručně.</translation> | |||||||
|         <translation>Kliknutí zapne alternativní limity rychlosti</translation> |         <translation>Kliknutí zapne alternativní limity rychlosti</translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="226"/> |         <location filename="../statusbar.h" line="227"/> | ||||||
|         <source>Global Download Speed Limit</source> |         <source>Global Download Speed Limit</source> | ||||||
|         <translation>Celkový limit rychlosti stahování</translation> |         <translation>Celkový limit rychlosti stahování</translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="246"/> |         <location filename="../statusbar.h" line="247"/> | ||||||
|         <source>Global Upload Speed Limit</source> |         <source>Global Upload Speed Limit</source> | ||||||
|         <translation>Celkový limit rychlosti nahrávání</translation> |         <translation>Celkový limit rychlosti nahrávání</translation> | ||||||
|     </message> |     </message> | ||||||
|   | |||||||
| @@ -3500,12 +3500,12 @@ Please install it manually.</source> | |||||||
|         <translation type="unfinished"></translation> |         <translation type="unfinished"></translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="226"/> |         <location filename="../statusbar.h" line="227"/> | ||||||
|         <source>Global Download Speed Limit</source> |         <source>Global Download Speed Limit</source> | ||||||
|         <translation>Global begrænsning af downloadhastighed</translation> |         <translation>Global begrænsning af downloadhastighed</translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="246"/> |         <location filename="../statusbar.h" line="247"/> | ||||||
|         <source>Global Upload Speed Limit</source> |         <source>Global Upload Speed Limit</source> | ||||||
|         <translation>Global begrænsning af upload hastighed</translation> |         <translation>Global begrænsning af upload hastighed</translation> | ||||||
|     </message> |     </message> | ||||||
|   | |||||||
| @@ -3883,12 +3883,12 @@ Please install it manually.</source> | |||||||
|         <translation>Klicken um alternative Geschwindigkeitsbegrenzungen zu aktivieren</translation> |         <translation>Klicken um alternative Geschwindigkeitsbegrenzungen zu aktivieren</translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="226"/> |         <location filename="../statusbar.h" line="227"/> | ||||||
|         <source>Global Download Speed Limit</source> |         <source>Global Download Speed Limit</source> | ||||||
|         <translation>Begrenzung der globalen DL-Rate</translation> |         <translation>Begrenzung der globalen DL-Rate</translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="246"/> |         <location filename="../statusbar.h" line="247"/> | ||||||
|         <source>Global Upload Speed Limit</source> |         <source>Global Upload Speed Limit</source> | ||||||
|         <translation>Begrenzung der globalen UL-Rate</translation> |         <translation>Begrenzung der globalen UL-Rate</translation> | ||||||
|     </message> |     </message> | ||||||
|   | |||||||
| @@ -3938,12 +3938,12 @@ Please install it manually.</source> | |||||||
|         <translation>Κλικ για ενεργοποίηση εναλλακτικών ορίων ταχύτητας</translation> |         <translation>Κλικ για ενεργοποίηση εναλλακτικών ορίων ταχύτητας</translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="226"/> |         <location filename="../statusbar.h" line="227"/> | ||||||
|         <source>Global Download Speed Limit</source> |         <source>Global Download Speed Limit</source> | ||||||
|         <translation>Συνολικό Όριο Ταχύτητας Λήψης</translation> |         <translation>Συνολικό Όριο Ταχύτητας Λήψης</translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="246"/> |         <location filename="../statusbar.h" line="247"/> | ||||||
|         <source>Global Upload Speed Limit</source> |         <source>Global Upload Speed Limit</source> | ||||||
|         <translation>Συνολικό Όριο Ταχύτητας Αποστολής</translation> |         <translation>Συνολικό Όριο Ταχύτητας Αποστολής</translation> | ||||||
|     </message> |     </message> | ||||||
|   | |||||||
| @@ -3024,12 +3024,12 @@ Please install it manually.</source> | |||||||
|         <translation type="unfinished"></translation> |         <translation type="unfinished"></translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="226"/> |         <location filename="../statusbar.h" line="227"/> | ||||||
|         <source>Global Download Speed Limit</source> |         <source>Global Download Speed Limit</source> | ||||||
|         <translation type="unfinished"></translation> |         <translation type="unfinished"></translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="246"/> |         <location filename="../statusbar.h" line="247"/> | ||||||
|         <source>Global Upload Speed Limit</source> |         <source>Global Upload Speed Limit</source> | ||||||
|         <translation type="unfinished"></translation> |         <translation type="unfinished"></translation> | ||||||
|     </message> |     </message> | ||||||
|   | |||||||
| @@ -3762,12 +3762,12 @@ Por favor, instálelo de forma manual.</translation> | |||||||
|         <translation>Click para activar los límites de velocidad alternativa</translation> |         <translation>Click para activar los límites de velocidad alternativa</translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="226"/> |         <location filename="../statusbar.h" line="227"/> | ||||||
|         <source>Global Download Speed Limit</source> |         <source>Global Download Speed Limit</source> | ||||||
|         <translation>Velocidad límite global de descarga</translation> |         <translation>Velocidad límite global de descarga</translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="246"/> |         <location filename="../statusbar.h" line="247"/> | ||||||
|         <source>Global Upload Speed Limit</source> |         <source>Global Upload Speed Limit</source> | ||||||
|         <translation>Velocidad límite global de subida</translation> |         <translation>Velocidad límite global de subida</translation> | ||||||
|     </message> |     </message> | ||||||
|   | |||||||
| @@ -3896,12 +3896,12 @@ Asenna se itse.</translation> | |||||||
|         <translation>Napsauta ottaaksesi vaihtoehtoinen nopeusrajoitus käyttöön</translation> |         <translation>Napsauta ottaaksesi vaihtoehtoinen nopeusrajoitus käyttöön</translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="226"/> |         <location filename="../statusbar.h" line="227"/> | ||||||
|         <source>Global Download Speed Limit</source> |         <source>Global Download Speed Limit</source> | ||||||
|         <translation>Yleinen latausnopeusrajoitus</translation> |         <translation>Yleinen latausnopeusrajoitus</translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="246"/> |         <location filename="../statusbar.h" line="247"/> | ||||||
|         <source>Global Upload Speed Limit</source> |         <source>Global Upload Speed Limit</source> | ||||||
|         <translation>Yleinen lähetysnopeusrajoitus</translation> |         <translation>Yleinen lähetysnopeusrajoitus</translation> | ||||||
|     </message> |     </message> | ||||||
|   | |||||||
| @@ -3977,12 +3977,12 @@ Veuillez l'installer manuellement.</translation> | |||||||
|         <translation>Cliquer pour activer les limites de vitesse alternatives</translation> |         <translation>Cliquer pour activer les limites de vitesse alternatives</translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="226"/> |         <location filename="../statusbar.h" line="227"/> | ||||||
|         <source>Global Download Speed Limit</source> |         <source>Global Download Speed Limit</source> | ||||||
|         <translation>Limite globale de la vitesse de réception</translation> |         <translation>Limite globale de la vitesse de réception</translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="246"/> |         <location filename="../statusbar.h" line="247"/> | ||||||
|         <source>Global Upload Speed Limit</source> |         <source>Global Upload Speed Limit</source> | ||||||
|         <translation>Limite globale de la vitesse d'envoi</translation> |         <translation>Limite globale de la vitesse d'envoi</translation> | ||||||
|     </message> |     </message> | ||||||
|   | |||||||
| @@ -3933,12 +3933,12 @@ Kérlek telepítsd manuálisan.</translation> | |||||||
|         <translation>Alternatív sebesség korlátok engedélyezéséhez kattints ide</translation> |         <translation>Alternatív sebesség korlátok engedélyezéséhez kattints ide</translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="226"/> |         <location filename="../statusbar.h" line="227"/> | ||||||
|         <source>Global Download Speed Limit</source> |         <source>Global Download Speed Limit</source> | ||||||
|         <translation>Teljes letöltési sebesség korlát</translation> |         <translation>Teljes letöltési sebesség korlát</translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="246"/> |         <location filename="../statusbar.h" line="247"/> | ||||||
|         <source>Global Upload Speed Limit</source> |         <source>Global Upload Speed Limit</source> | ||||||
|         <translation>Teljes feltöltési sebesség korlát</translation> |         <translation>Teljes feltöltési sebesség korlát</translation> | ||||||
|     </message> |     </message> | ||||||
|   | |||||||
| @@ -4019,12 +4019,12 @@ Per favore installalo manualmente.</translation> | |||||||
|         <translation>Clicca per abilitare i limiti alternativi di velocità</translation> |         <translation>Clicca per abilitare i limiti alternativi di velocità</translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="226"/> |         <location filename="../statusbar.h" line="227"/> | ||||||
|         <source>Global Download Speed Limit</source> |         <source>Global Download Speed Limit</source> | ||||||
|         <translation>Limite globale download</translation> |         <translation>Limite globale download</translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="246"/> |         <location filename="../statusbar.h" line="247"/> | ||||||
|         <source>Global Upload Speed Limit</source> |         <source>Global Upload Speed Limit</source> | ||||||
|         <translation>Limite globale upload</translation> |         <translation>Limite globale upload</translation> | ||||||
|     </message> |     </message> | ||||||
|   | |||||||
| @@ -3259,12 +3259,12 @@ Please install it manually.</source> | |||||||
|         <translation type="unfinished"></translation> |         <translation type="unfinished"></translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="226"/> |         <location filename="../statusbar.h" line="227"/> | ||||||
|         <source>Global Download Speed Limit</source> |         <source>Global Download Speed Limit</source> | ||||||
|         <translation type="unfinished"></translation> |         <translation type="unfinished"></translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="246"/> |         <location filename="../statusbar.h" line="247"/> | ||||||
|         <source>Global Upload Speed Limit</source> |         <source>Global Upload Speed Limit</source> | ||||||
|         <translation type="unfinished"></translation> |         <translation type="unfinished"></translation> | ||||||
|     </message> |     </message> | ||||||
|   | |||||||
| @@ -3564,12 +3564,12 @@ Please install it manually.</source> | |||||||
|         <translation>설정한 속도 제한을 사용하기</translation> |         <translation>설정한 속도 제한을 사용하기</translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="226"/> |         <location filename="../statusbar.h" line="227"/> | ||||||
|         <source>Global Download Speed Limit</source> |         <source>Global Download Speed Limit</source> | ||||||
|         <translation>전체 다운 속도 제한</translation> |         <translation>전체 다운 속도 제한</translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="246"/> |         <location filename="../statusbar.h" line="247"/> | ||||||
|         <source>Global Upload Speed Limit</source> |         <source>Global Upload Speed Limit</source> | ||||||
|         <translation>전체 업로드 속도 제한</translation> |         <translation>전체 업로드 속도 제한</translation> | ||||||
|     </message> |     </message> | ||||||
|   | |||||||
| @@ -3141,12 +3141,12 @@ Please install it manually.</source> | |||||||
|         <translation type="unfinished"></translation> |         <translation type="unfinished"></translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="226"/> |         <location filename="../statusbar.h" line="227"/> | ||||||
|         <source>Global Download Speed Limit</source> |         <source>Global Download Speed Limit</source> | ||||||
|         <translation type="unfinished"></translation> |         <translation type="unfinished"></translation> | ||||||
|     </message> |     </message> | ||||||
|     <message> |     <message> | ||||||
|         <location filename="../statusbar.h" line="246"/> |         <location filename="../statusbar.h" line="247"/> | ||||||
|         <source>Global Upload Speed Limit</source> |         <source>Global Upload Speed Limit</source> | ||||||
|         <translation type="unfinished"></translation> |         <translation type="unfinished"></translation> | ||||||
|     </message> |     </message> | ||||||
|   | |||||||
										
											Binary file not shown.
										
									
								
							
										
											
												File diff suppressed because one or more lines are too long
											
										
									
								
							| @@ -263,9 +263,9 @@ int main(int argc, char *argv[]){ | |||||||
|     painter.setFont(QFont("Arial", 22, QFont::Black)); |     painter.setFont(QFont("Arial", 22, QFont::Black)); | ||||||
|     painter.drawText(224 - painter.fontMetrics().width(version), 270, version); |     painter.drawText(224 - painter.fontMetrics().width(version), 270, version); | ||||||
|     splash = new QSplashScreen(splash_img, Qt::WindowStaysOnTopHint); |     splash = new QSplashScreen(splash_img, Qt::WindowStaysOnTopHint); | ||||||
|  |     QTimer::singleShot(1500, splash, SLOT(deleteLater())); | ||||||
|     splash->show(); |     splash->show(); | ||||||
|     app.processEvents(); |     app.processEvents(); | ||||||
|     QTimer::singleShot(2000, splash, SLOT(deleteLater())); |  | ||||||
|   } |   } | ||||||
| #endif | #endif | ||||||
|   // Set environment variable |   // Set environment variable | ||||||
| @@ -296,6 +296,8 @@ int main(int argc, char *argv[]){ | |||||||
|   torrentCmdLine.removeFirst(); |   torrentCmdLine.removeFirst(); | ||||||
| #ifndef DISABLE_GUI | #ifndef DISABLE_GUI | ||||||
|   MainWindow window(0, torrentCmdLine); |   MainWindow window(0, torrentCmdLine); | ||||||
|  |   if(!no_splash) | ||||||
|  |     window.raise(); | ||||||
|   QObject::connect(&app, SIGNAL(messageReceived(const QString&)), |   QObject::connect(&app, SIGNAL(messageReceived(const QString&)), | ||||||
|                    &window, SLOT(processParams(const QString&))); |                    &window, SLOT(processParams(const QString&))); | ||||||
|   app.setActivationWindow(&window); |   app.setActivationWindow(&window); | ||||||
|   | |||||||
| @@ -98,7 +98,7 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo | |||||||
|   setWindowTitle(tr("qBittorrent %1", "e.g: qBittorrent v0.x").arg(QString::fromUtf8(VERSION))); |   setWindowTitle(tr("qBittorrent %1", "e.g: qBittorrent v0.x").arg(QString::fromUtf8(VERSION))); | ||||||
|   displaySpeedInTitle = pref.speedInTitleBar(); |   displaySpeedInTitle = pref.speedInTitleBar(); | ||||||
|   // Clean exit on log out |   // Clean exit on log out | ||||||
|   connect(static_cast<SessionApplication*>(qApp), SIGNAL(sessionIsShuttingDown()), this, SLOT(deleteQBtSession::instance()())); |   connect(static_cast<SessionApplication*>(qApp), SIGNAL(sessionIsShuttingDown()), this, SLOT(deleteBTSession())); | ||||||
|   // Setting icons |   // Setting icons | ||||||
|   this->setWindowIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png"))); |   this->setWindowIcon(QIcon(QString::fromUtf8(":/Icons/skin/qbittorrent32.png"))); | ||||||
|   actionOpen->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/open.png"))); |   actionOpen->setIcon(QIcon(QString::fromUtf8(":/Icons/skin/open.png"))); | ||||||
| @@ -163,8 +163,6 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo | |||||||
|   vSplitter->setCollapsible(0, true); |   vSplitter->setCollapsible(0, true); | ||||||
|   vSplitter->setCollapsible(1, false); |   vSplitter->setCollapsible(1, false); | ||||||
|   tabs->addTab(vSplitter, QIcon(QString::fromUtf8(":/Icons/oxygen/folder-remote.png")), tr("Transfers")); |   tabs->addTab(vSplitter, QIcon(QString::fromUtf8(":/Icons/oxygen/folder-remote.png")), tr("Transfers")); | ||||||
|   connect(transferList->getSourceModel(), SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(updateNbTorrents())); |  | ||||||
|   connect(transferList->getSourceModel(), SIGNAL(rowsRemoved(QModelIndex, int, int)), this, SLOT(updateNbTorrents())); |  | ||||||
|  |  | ||||||
|   vboxLayout->addWidget(tabs); |   vboxLayout->addWidget(tabs); | ||||||
|  |  | ||||||
| @@ -227,6 +225,8 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo | |||||||
|   } else { |   } else { | ||||||
|     if(pref.startMinimized()) |     if(pref.startMinimized()) | ||||||
|       showMinimized(); |       showMinimized(); | ||||||
|  |     else | ||||||
|  |       setFocus(); | ||||||
|   } |   } | ||||||
|  |  | ||||||
|   // Start watching the executable for updates |   // Start watching the executable for updates | ||||||
| @@ -242,6 +242,11 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo | |||||||
|   // Populate the transfer list |   // Populate the transfer list | ||||||
|   transferList->getSourceModel()->populate(); |   transferList->getSourceModel()->populate(); | ||||||
|  |  | ||||||
|  |   // Update the number of torrents (tab) | ||||||
|  |   updateNbTorrents(); | ||||||
|  |   connect(transferList->getSourceModel(), SIGNAL(rowsInserted(QModelIndex, int, int)), this, SLOT(updateNbTorrents())); | ||||||
|  |   connect(transferList->getSourceModel(), SIGNAL(rowsRemoved(QModelIndex, int, int)), this, SLOT(updateNbTorrents())); | ||||||
|  |  | ||||||
|   qDebug("GUI Built"); |   qDebug("GUI Built"); | ||||||
| #ifdef Q_WS_WIN | #ifdef Q_WS_WIN | ||||||
|   if(!pref.neverCheckFileAssoc() && !Preferences::isFileAssocOk()) { |   if(!pref.neverCheckFileAssoc() && !Preferences::isFileAssocOk()) { | ||||||
| @@ -263,6 +268,7 @@ MainWindow::MainWindow(QWidget *parent, QStringList torrentCmdLine) : QMainWindo | |||||||
|   connect(updater, SIGNAL(updateCheckFinished(bool, QString)), SLOT(handleUpdateCheckFinished(bool, QString))); |   connect(updater, SIGNAL(updateCheckFinished(bool, QString)), SLOT(handleUpdateCheckFinished(bool, QString))); | ||||||
|   updater->checkForUpdates(); |   updater->checkForUpdates(); | ||||||
| #endif | #endif | ||||||
|  |  | ||||||
| } | } | ||||||
|  |  | ||||||
| void MainWindow::deleteBTSession() { | void MainWindow::deleteBTSession() { | ||||||
| @@ -515,7 +521,14 @@ void MainWindow::displayRSSTab() const { | |||||||
| void MainWindow::askRecursiveTorrentDownloadConfirmation(const QTorrentHandle &h) { | void MainWindow::askRecursiveTorrentDownloadConfirmation(const QTorrentHandle &h) { | ||||||
|   Preferences pref; |   Preferences pref; | ||||||
|   if(pref.recursiveDownloadDisabled()) return; |   if(pref.recursiveDownloadDisabled()) return; | ||||||
|   QMessageBox confirmBox(QMessageBox::Question, tr("Recursive download confirmation"), tr("The torrent %1 contains torrent files, do you want to proceed with their download?").arg(h.name())); |   // Get Torrent name | ||||||
|  |   QString torrent_name; | ||||||
|  |   try { | ||||||
|  |     torrent_name = h.name(); | ||||||
|  |   } catch(invalid_handle&){ | ||||||
|  |     return; | ||||||
|  |   } | ||||||
|  |   QMessageBox confirmBox(QMessageBox::Question, tr("Recursive download confirmation"), tr("The torrent %1 contains torrent files, do you want to proceed with their download?").arg(torrent_name)); | ||||||
|   QPushButton *yes = confirmBox.addButton(tr("Yes"), QMessageBox::YesRole); |   QPushButton *yes = confirmBox.addButton(tr("Yes"), QMessageBox::YesRole); | ||||||
|   /*QPushButton *no = */confirmBox.addButton(tr("No"), QMessageBox::NoRole); |   /*QPushButton *no = */confirmBox.addButton(tr("No"), QMessageBox::NoRole); | ||||||
|   QPushButton *never = confirmBox.addButton(tr("Never"), QMessageBox::NoRole); |   QPushButton *never = confirmBox.addButton(tr("Never"), QMessageBox::NoRole); | ||||||
|   | |||||||
							
								
								
									
										19
									
								
								src/misc.cpp
									
									
									
									
									
								
							
							
						
						
									
										19
									
								
								src/misc.cpp
									
									
									
									
									
								
							| @@ -557,19 +557,6 @@ bool misc::isPreviewable(QString extension){ | |||||||
|   return false; |   return false; | ||||||
| } | } | ||||||
|  |  | ||||||
| bool misc::removeEmptyTree(QString path) { |  | ||||||
|   QDir dir(path); |  | ||||||
|   foreach(const QString &child, dir.entryList(QDir::AllDirs)) { |  | ||||||
|     if(child == "." || child == "..") continue; |  | ||||||
|     return removeEmptyTree(dir.absoluteFilePath(child)); |  | ||||||
|   } |  | ||||||
|   const QString dir_name = dir.dirName(); |  | ||||||
|   if(dir.cdUp()) { |  | ||||||
|     return dir.rmdir(dir_name); |  | ||||||
|   } |  | ||||||
|   return false; |  | ||||||
| } |  | ||||||
|  |  | ||||||
| QString misc::bcLinkToMagnet(QString bc_link) { | QString misc::bcLinkToMagnet(QString bc_link) { | ||||||
|   QByteArray raw_bc = bc_link.toUtf8(); |   QByteArray raw_bc = bc_link.toUtf8(); | ||||||
|   raw_bc = raw_bc.mid(8); // skip bc://bt/ |   raw_bc = raw_bc.mid(8); // skip bc://bt/ | ||||||
| @@ -759,3 +746,9 @@ bool misc::isValidTorrentFile(const QString &torrent_path) { | |||||||
|   } |   } | ||||||
|   return true; |   return true; | ||||||
| } | } | ||||||
|  |  | ||||||
|  | QString misc::branchPath(QString file_path) | ||||||
|  | { | ||||||
|  |   file_path.replace("\\", "/"); | ||||||
|  |   return file_path.left(file_path.lastIndexOf('/')); | ||||||
|  | } | ||||||
|   | |||||||
Some files were not shown because too many files have changed in this diff Show More
		Reference in New Issue
	
	Block a user