mirror of
https://github.com/qbittorrent/qBittorrent
synced 2025-07-11 15:56:17 -07:00
- Display more log messages
This commit is contained in:
parent
ebc9d62f69
commit
3ff075c048
5 changed files with 33 additions and 1 deletions
1
INSTALL
1
INSTALL
|
@ -27,6 +27,7 @@ Dependencies:
|
||||||
- libcurl
|
- libcurl
|
||||||
|
|
||||||
- libupnp (>= 1.2.1) *OPTIONAL*
|
- libupnp (>= 1.2.1) *OPTIONAL*
|
||||||
|
-> For Universal Plug 'n Play Port forwarding support
|
||||||
|
|
||||||
- python >= 2.3 (previous might work - not tested): needed by search engine.
|
- python >= 2.3 (previous might work - not tested): needed by search engine.
|
||||||
|
|
||||||
|
|
17
src/GUI.cpp
17
src/GUI.cpp
|
@ -104,6 +104,9 @@ GUI::GUI(QWidget *parent, QStringList torrentCmdLine) : QMainWindow(parent){
|
||||||
}
|
}
|
||||||
nbTorrents = 0;
|
nbTorrents = 0;
|
||||||
tabs->setTabText(0, tr("Transfers") +" (0)");
|
tabs->setTabText(0, tr("Transfers") +" (0)");
|
||||||
|
#ifndef NO_UPNP
|
||||||
|
connect(&BTSession, SIGNAL(noWanServiceDetected()), this, SLOT(displayNoUPnPWanServiceDetected()));
|
||||||
|
#endif
|
||||||
connect(&BTSession, SIGNAL(addedTorrent(const QString&, torrent_handle&, bool)), this, SLOT(torrentAdded(const QString&, torrent_handle&, bool)));
|
connect(&BTSession, SIGNAL(addedTorrent(const QString&, torrent_handle&, bool)), this, SLOT(torrentAdded(const QString&, torrent_handle&, bool)));
|
||||||
connect(&BTSession, SIGNAL(duplicateTorrent(const QString&)), this, SLOT(torrentDuplicate(const QString&)));
|
connect(&BTSession, SIGNAL(duplicateTorrent(const QString&)), this, SLOT(torrentDuplicate(const QString&)));
|
||||||
connect(&BTSession, SIGNAL(invalidTorrent(const QString&)), this, SLOT(torrentCorrupted(const QString&)));
|
connect(&BTSession, SIGNAL(invalidTorrent(const QString&)), this, SLOT(torrentCorrupted(const QString&)));
|
||||||
|
@ -277,6 +280,12 @@ void GUI::readParamsOnSocket(){
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
#ifndef NO_UPNP
|
||||||
|
void GUI::displayNoUPnPWanServiceDetected(){
|
||||||
|
setInfoBar(tr("UPnP: no WAN service detected..."), "red");
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
// Toggle paused state of selected torrent
|
// Toggle paused state of selected torrent
|
||||||
void GUI::togglePausedState(const QModelIndex& index){
|
void GUI::togglePausedState(const QModelIndex& index){
|
||||||
int row = index.row();
|
int row = index.row();
|
||||||
|
@ -953,7 +962,7 @@ void GUI::configureSession(bool deleteOptions){
|
||||||
BTSession.setListeningPortsRange(options->getPorts());
|
BTSession.setListeningPortsRange(options->getPorts());
|
||||||
new_listenPort = BTSession.getListenPort();
|
new_listenPort = BTSession.getListenPort();
|
||||||
if(new_listenPort != old_listenPort){
|
if(new_listenPort != old_listenPort){
|
||||||
setInfoBar(tr("Listening on port: %1", "e.g: Listening on port: 1666").arg( QString(misc::toString(new_listenPort).c_str())));
|
setInfoBar(tr("qBittorrent is bind to port: %1", "e.g: qBittorrent is bind to port: 1666").arg( QString(misc::toString(new_listenPort).c_str())));
|
||||||
}
|
}
|
||||||
// Apply max connec limit (-1 if disabled)
|
// Apply max connec limit (-1 if disabled)
|
||||||
BTSession.setMaxConnections(options->getMaxConnec());
|
BTSession.setMaxConnections(options->getMaxConnec());
|
||||||
|
@ -978,26 +987,32 @@ void GUI::configureSession(bool deleteOptions){
|
||||||
BTSession.setGlobalRatio(options->getRatio());
|
BTSession.setGlobalRatio(options->getRatio());
|
||||||
// DHT (Trackerless)
|
// DHT (Trackerless)
|
||||||
if(options->isDHTEnabled()){
|
if(options->isDHTEnabled()){
|
||||||
|
setInfoBar(tr("DHT support [ON], port: %1").arg(options->getDHTPort()), "blue");
|
||||||
BTSession.enableDHT();
|
BTSession.enableDHT();
|
||||||
// Set DHT Port
|
// Set DHT Port
|
||||||
BTSession.setDHTPort(options->getDHTPort());
|
BTSession.setDHTPort(options->getDHTPort());
|
||||||
}else{
|
}else{
|
||||||
|
setInfoBar(tr("DHT support [OFF]"), "blue");
|
||||||
BTSession.disableDHT();
|
BTSession.disableDHT();
|
||||||
}
|
}
|
||||||
#ifndef NO_UPNP
|
#ifndef NO_UPNP
|
||||||
// Upnp
|
// Upnp
|
||||||
if(options->isUPnPEnabled()){
|
if(options->isUPnPEnabled()){
|
||||||
|
setInfoBar(tr("UPnP support [ON], port: %1").arg(options->getUPnPPort()), "blue");
|
||||||
BTSession.enableUPnP(options->getUPnPPort());
|
BTSession.enableUPnP(options->getUPnPPort());
|
||||||
BTSession.setUPnPPort(options->getUPnPPort());
|
BTSession.setUPnPPort(options->getUPnPPort());
|
||||||
}else{
|
}else{
|
||||||
|
setInfoBar(tr("UPnP support [OFF]"), "blue");
|
||||||
BTSession.disableUPnP();
|
BTSession.disableUPnP();
|
||||||
}
|
}
|
||||||
#endif
|
#endif
|
||||||
// PeX
|
// PeX
|
||||||
if(!options->isPeXDisabled()){
|
if(!options->isPeXDisabled()){
|
||||||
qDebug("Enabling Peer eXchange (PeX)");
|
qDebug("Enabling Peer eXchange (PeX)");
|
||||||
|
setInfoBar(tr("PeX support [OFF]"), "blue");
|
||||||
BTSession.enablePeerExchange();
|
BTSession.enablePeerExchange();
|
||||||
}else{
|
}else{
|
||||||
|
setInfoBar(tr("PeX support [OFF]"), "blue");
|
||||||
qDebug("Peer eXchange (PeX) disabled");
|
qDebug("Peer eXchange (PeX) disabled");
|
||||||
}
|
}
|
||||||
// Apply filtering settings
|
// Apply filtering settings
|
||||||
|
|
|
@ -140,6 +140,10 @@ class GUI : public QMainWindow, private Ui::MainWindow{
|
||||||
void OptionsSaved(const QString& info, bool deleteOptions);
|
void OptionsSaved(const QString& info, bool deleteOptions);
|
||||||
// HTTP slots
|
// HTTP slots
|
||||||
void askForTorrentUrl();
|
void askForTorrentUrl();
|
||||||
|
#ifndef NO_UPNP
|
||||||
|
void displayNoUPnPWanServiceDetected();
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
||||||
public slots:
|
public slots:
|
||||||
void torrentAdded(const QString& path, torrent_handle& h, bool fastResume);
|
void torrentAdded(const QString& path, torrent_handle& h, bool fastResume);
|
||||||
|
|
|
@ -89,10 +89,16 @@ void bittorrent::enableUPnP(int port){
|
||||||
true,
|
true,
|
||||||
"qBittorrent");
|
"qBittorrent");
|
||||||
m_upnp = new CUPnPControlPoint(port);
|
m_upnp = new CUPnPControlPoint(port);
|
||||||
|
connect(m_upnp, SIGNAL(noWanServiceDetected()), this, SLOT(noWanServiceEventHandler()));
|
||||||
m_upnp->AddPortMappings(m_upnpMappings);
|
m_upnp->AddPortMappings(m_upnpMappings);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
void bittorrent::noWanServiceEventHandler(){
|
||||||
|
// Forward this signal
|
||||||
|
emit noWanServiceDetected();
|
||||||
|
}
|
||||||
|
|
||||||
// Set UPnP port (>= 1000)
|
// Set UPnP port (>= 1000)
|
||||||
void bittorrent::setUPnPPort(int upnp_port){
|
void bittorrent::setUPnPPort(int upnp_port){
|
||||||
if(!UPnPEnabled){
|
if(!UPnPEnabled){
|
||||||
|
|
|
@ -133,6 +133,9 @@ class bittorrent : public QObject{
|
||||||
void resumeUnfinished();
|
void resumeUnfinished();
|
||||||
bool loadTrackerFile(const QString& hash);
|
bool loadTrackerFile(const QString& hash);
|
||||||
void saveTrackerFile(const QString& hash);
|
void saveTrackerFile(const QString& hash);
|
||||||
|
#ifndef NO_UPNP
|
||||||
|
void noWanServiceEventHandler();
|
||||||
|
#endif
|
||||||
|
|
||||||
signals:
|
signals:
|
||||||
void invalidTorrent(const QString& path);
|
void invalidTorrent(const QString& path);
|
||||||
|
@ -147,6 +150,9 @@ class bittorrent : public QObject{
|
||||||
void scanDirFoundTorrents(const QStringList& pathList);
|
void scanDirFoundTorrents(const QStringList& pathList);
|
||||||
void newDownloadedTorrent(const QString& path, const QString& url);
|
void newDownloadedTorrent(const QString& path, const QString& url);
|
||||||
void aboutToDownloadFromUrl(const QString& url);
|
void aboutToDownloadFromUrl(const QString& url);
|
||||||
|
#ifndef NO_UPNP
|
||||||
|
void noWanServiceDetected();
|
||||||
|
#endif
|
||||||
};
|
};
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue