diff --git a/src/gui/properties/trackerlist.cpp b/src/gui/properties/trackerlist.cpp index f1c6f1905..716be9c52 100644 --- a/src/gui/properties/trackerlist.cpp +++ b/src/gui/properties/trackerlist.cpp @@ -347,7 +347,7 @@ void TrackerList::askForTrackers() { if (!torrent) return; QList trackers; - foreach (const QString &tracker, TrackersAdditionDlg::askForTrackers(torrent)) + foreach (const QString &tracker, TrackersAdditionDlg::askForTrackers(this, torrent)) trackers << tracker; torrent->addTrackers(trackers); } diff --git a/src/gui/properties/trackersadditiondlg.cpp b/src/gui/properties/trackersadditiondlg.cpp index a36c4b23c..cf98eea63 100644 --- a/src/gui/properties/trackersadditiondlg.cpp +++ b/src/gui/properties/trackersadditiondlg.cpp @@ -43,7 +43,7 @@ #include "guiiconprovider.h" #include "ui_trackersadditiondlg.h" -TrackersAdditionDlg::TrackersAdditionDlg(BitTorrent::TorrentHandle *const torrent, QWidget *parent) +TrackersAdditionDlg::TrackersAdditionDlg(QWidget *parent, BitTorrent::TorrentHandle *const torrent) : QDialog(parent) , m_ui(new Ui::TrackersAdditionDlg()) , m_torrent(torrent) @@ -132,10 +132,10 @@ void TrackersAdditionDlg::getTrackerError(const QString &, const QString &error) QMessageBox::warning(this, tr("Download error"), tr("The trackers list could not be downloaded, reason: %1").arg(error), QMessageBox::Ok); } -QStringList TrackersAdditionDlg::askForTrackers(BitTorrent::TorrentHandle *const torrent) +QStringList TrackersAdditionDlg::askForTrackers(QWidget *parent, BitTorrent::TorrentHandle *const torrent) { QStringList trackers; - TrackersAdditionDlg dlg(torrent); + TrackersAdditionDlg dlg(parent, torrent); if (dlg.exec() == QDialog::Accepted) return dlg.newTrackers(); diff --git a/src/gui/properties/trackersadditiondlg.h b/src/gui/properties/trackersadditiondlg.h index b04a6f391..fc355acea 100644 --- a/src/gui/properties/trackersadditiondlg.h +++ b/src/gui/properties/trackersadditiondlg.h @@ -51,11 +51,11 @@ class TrackersAdditionDlg : public QDialog Q_OBJECT public: - TrackersAdditionDlg(BitTorrent::TorrentHandle *const torrent, QWidget *parent = 0); + TrackersAdditionDlg(QWidget *parent, BitTorrent::TorrentHandle *const torrent); ~TrackersAdditionDlg(); QStringList newTrackers() const; - static QStringList askForTrackers(BitTorrent::TorrentHandle *const torrent); + static QStringList askForTrackers(QWidget *parent, BitTorrent::TorrentHandle *const torrent); public slots: void on_uTorrentListButton_clicked(); diff --git a/src/gui/properties/trackersadditiondlg.ui b/src/gui/properties/trackersadditiondlg.ui index c4c3c0a73..bee0e607a 100644 --- a/src/gui/properties/trackersadditiondlg.ui +++ b/src/gui/properties/trackersadditiondlg.ui @@ -26,13 +26,6 @@ QTextEdit::NoWrap - - <!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-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> -<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans'; font-size:10pt;"></p></body></html> - false @@ -51,23 +44,7 @@ p, li { white-space: pre-wrap; } - - - - 31 - 31 - - - - - 31 - 31 - - - - - - +