Merge pull request #2 from qbittorrent/master

Up-to-date commit
This commit is contained in:
Dmitriy Falko
2013-01-28 06:08:05 -08:00
147 changed files with 9455 additions and 8308 deletions

View File

@@ -354,8 +354,6 @@ void TrackerList::showTrackerListMenu(QPoint) {
if (!getSelectedTrackerItems().isEmpty()) {
delAct = menu.addAction(IconProvider::instance()->getIcon("list-remove"), tr("Remove tracker"));
}
menu.addSeparator();
QAction *reannounceAct = menu.addAction(IconProvider::instance()->getIcon("view-refresh"), tr("Force reannounce"));
QAction *act = menu.exec(QCursor::pos());
if (act == 0) return;
if (act == addAct) {
@@ -370,10 +368,6 @@ void TrackerList::showTrackerListMenu(QPoint) {
deleteSelectedTrackers();
return;
}
if (act == reannounceAct) {
properties->getCurrentTorrent().force_reannounce();
return;
}
}
void TrackerList::loadSettings() {