Browse Source

Improvement to last commit

adaptive-webui-19844
Christophe Dumez 14 years ago
parent
commit
a9ce197d04
  1. 1
      src/properties/trackerlist.cpp
  2. 9
      src/properties/trackersadditiondlg.h

1
src/properties/trackerlist.cpp

@ -295,6 +295,7 @@ void TrackerList::askForTrackers(){
QStringList trackers = TrackersAdditionDlg::askForTrackers(h); QStringList trackers = TrackersAdditionDlg::askForTrackers(h);
if(!trackers.empty()) { if(!trackers.empty()) {
foreach(const QString& tracker, trackers) { foreach(const QString& tracker, trackers) {
if(tracker.trimmed().isEmpty()) continue;
announce_entry url(tracker.toStdString()); announce_entry url(tracker.toStdString());
url.tier = 0; url.tier = 0;
h.add_tracker(url); h.add_tracker(url);

9
src/properties/trackersadditiondlg.h

@ -66,6 +66,7 @@ public:
public slots: public slots:
void on_uTorrentListButton_clicked() { void on_uTorrentListButton_clicked() {
uTorrentListButton->setEnabled(false);
DownloadThread *d = new DownloadThread(this); DownloadThread *d = new DownloadThread(this);
connect(d, SIGNAL(downloadFinished(QString,QString)), SLOT(parseUTorrentList(QString,QString))); connect(d, SIGNAL(downloadFinished(QString,QString)), SLOT(parseUTorrentList(QString,QString)));
connect(d, SIGNAL(downloadFailure(QString,QString)), SLOT(getTrackerError(QString,QString))); connect(d, SIGNAL(downloadFailure(QString,QString)), SLOT(getTrackerError(QString,QString)));
@ -79,6 +80,8 @@ public slots:
if (!list_file.open(QFile::ReadOnly)) { if (!list_file.open(QFile::ReadOnly)) {
QMessageBox::warning(this, tr("I/O Error"), tr("Error while trying to open the downloaded file."), QMessageBox::Ok); QMessageBox::warning(this, tr("I/O Error"), tr("Error while trying to open the downloaded file."), QMessageBox::Ok);
setCursor(Qt::ArrowCursor); setCursor(Qt::ArrowCursor);
uTorrentListButton->setEnabled(true);
sender()->deleteLater();
return; return;
} }
QList<QUrl> existingTrackers; QList<QUrl> existingTrackers;
@ -114,16 +117,20 @@ public slots:
list_file.remove(); list_file.remove();
//To restore the cursor ... //To restore the cursor ...
setCursor(Qt::ArrowCursor); setCursor(Qt::ArrowCursor);
uTorrentListButton->setEnabled(true);
// Display information message if necessary // Display information message if necessary
if(nb == 0) { if(nb == 0) {
QMessageBox::information(this, tr("No change"), tr("No additional trackers were found."), QMessageBox::Ok); QMessageBox::information(this, tr("No change"), tr("No additional trackers were found."), QMessageBox::Ok);
} }
sender()->deleteLater();
} }
void getTrackerError(QString, QString error) { void getTrackerError(const QString&, const QString &error) {
//To restore the cursor ... //To restore the cursor ...
setCursor(Qt::ArrowCursor); setCursor(Qt::ArrowCursor);
uTorrentListButton->setEnabled(true);
QMessageBox::warning(this, tr("Download error"), tr("The trackers list could not be downloaded, reason: %1").arg(error), QMessageBox::Ok); QMessageBox::warning(this, tr("Download error"), tr("The trackers list could not be downloaded, reason: %1").arg(error), QMessageBox::Ok);
sender()->deleteLater();
} }
public: public:

Loading…
Cancel
Save