d4708
/
qBittorrent
mirror of https://github.com/d47081/qBittorrent.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

Merge pull request #6967 from thalieht/codingStyle 

Coding style for several files
adaptive-webui-19844
Eugene Shalygin 8 years ago committed by GitHub
parent
aaf78f09c2 91f528bc96
commit
228f82bcdc
13 changed files with 753 additions and 726 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 63
      src/gui/autoexpandabledialog.cpp
  2. 24
      src/gui/autoexpandabledialog.h
  3. 79
      src/gui/previewselect.cpp
  4. 35
      src/gui/previewselect.h
  5. 20
      src/gui/properties/peerlistsortmodel.h
  6. 223
      src/gui/properties/trackerlist.cpp
  7. 6
      src/gui/properties/trackerlist.h
  8. 38
      src/gui/shutdownconfirmdlg.cpp
  9. 7
      src/gui/shutdownconfirmdlg.h
  10. 49
      src/gui/torrentcontentfiltermodel.cpp
  11. 32
      src/gui/torrentcontentfiltermodel.h
  12. 18
      src/gui/torrentcontenttreeview.cpp
  13. 11
      src/gui/torrentcontenttreeview.h

63
src/gui/autoexpandabledialog.cpp
Unescape View File

@ -1,6 +1,6 @@
/* /*
* Bittorrent Client using Qt4 and libtorrent. * Bittorrent Client using Qt and libtorrent.
* Copyright (C) 2013 Nick Tiskov * Copyright (C) 2013 Nick Tiskov <daymansmail@gmail.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -24,46 +24,49 @@
* modify file(s), you may extend this exception to your version of the file(s), * modify file(s), you may extend this exception to your version of the file(s),
* but you are not obligated to do so. If you do not wish to do so, delete this * but you are not obligated to do so. If you do not wish to do so, delete this
* exception statement from your version. * exception statement from your version.
*
* Contact : daymansmail@gmail.com
*/ */
#include "autoexpandabledialog.h"
#include <QDesktopWidget> #include <QDesktopWidget>
#include "mainwindow.h" #include "mainwindow.h"
#include "autoexpandabledialog.h"
#include "ui_autoexpandabledialog.h" #include "ui_autoexpandabledialog.h"
AutoExpandableDialog::AutoExpandableDialog(QWidget *parent) : QDialog(parent), ui(new Ui::AutoExpandableDialog) { AutoExpandableDialog::AutoExpandableDialog(QWidget *parent)
ui->setupUi(this); : QDialog(parent)
, m_ui(new Ui::AutoExpandableDialog)
{
m_ui->setupUi(this);
} }
AutoExpandableDialog::~AutoExpandableDialog() { AutoExpandableDialog::~AutoExpandableDialog()
delete ui; {
delete m_ui;
} }
QString AutoExpandableDialog::getText(QWidget *parent, const QString &title, const QString &label, QString AutoExpandableDialog::getText(QWidget *parent, const QString &title, const QString &label,
QLineEdit::EchoMode mode, const QString &text, bool *ok, QLineEdit::EchoMode mode, const QString &text,
Qt::InputMethodHints inputMethodHints) { bool *ok, Qt::InputMethodHints inputMethodHints)
{
AutoExpandableDialog d(parent); AutoExpandableDialog d(parent);
d.setWindowTitle(title); d.setWindowTitle(title);
d.ui->textLabel->setText(label); d.m_ui->textLabel->setText(label);
d.ui->textEdit->setText(text); d.m_ui->textEdit->setText(text);
d.ui->textEdit->setEchoMode(mode); d.m_ui->textEdit->setEchoMode(mode);
d.ui->textEdit->setInputMethodHints(inputMethodHints); d.m_ui->textEdit->setInputMethodHints(inputMethodHints);
bool res = d.exec(); bool res = d.exec();
if (ok) if (ok)
*ok = res; *ok = res;
if (!res) if (!res) return QString();
return QString();
return d.ui->textEdit->text(); return d.m_ui->textEdit->text();
} }
void AutoExpandableDialog::showEvent(QShowEvent *e) { void AutoExpandableDialog::showEvent(QShowEvent *e)
{
// Overriding showEvent is required for consistent UI with fixed size under custom DPI // Overriding showEvent is required for consistent UI with fixed size under custom DPI
// Show dialog // Show dialog
QDialog::showEvent(e); QDialog::showEvent(e);
@ -71,24 +74,24 @@ void AutoExpandableDialog::showEvent(QShowEvent *e) {
// NOTE: For some strange reason QFontMetrics gets more accurate // NOTE: For some strange reason QFontMetrics gets more accurate
// when called from showEvent. Only 6 symbols off instead of 11 symbols off. // when called from showEvent. Only 6 symbols off instead of 11 symbols off.
int textW = ui->textEdit->fontMetrics().width(ui->textEdit->text()) + 4; int textW = m_ui->textEdit->fontMetrics().width(m_ui->textEdit->text()) + 4;
int wd = textW; int wd = textW;
if (!windowTitle().isEmpty()) { if (!windowTitle().isEmpty()) {
int _w = fontMetrics().width(windowTitle()); int w = fontMetrics().width(windowTitle());
if (_w > wd) if (w > wd)
wd = _w; wd = w;
} }
if (!ui->textLabel->text().isEmpty()) { if (!m_ui->textLabel->text().isEmpty()) {
int _w = ui->textLabel->fontMetrics().width(ui->textLabel->text()); int w = m_ui->textLabel->fontMetrics().width(m_ui->textLabel->text());
if (_w > wd) if (w > wd)
wd = _w; wd = w;
} }
// Now resize the dialog to fit the contents // Now resize the dialog to fit the contents
// max width of text from either of: label, title, textedit // max width of text from either of: label, title, textedit
// If the value is less than dialog default size default size is used // If the value is less than dialog default size, default size is used
if (wd > width()) if (wd > width())
resize(width() - ui->verticalLayout->sizeHint().width() + wd, height()); resize(width() - m_ui->verticalLayout->sizeHint().width() + wd, height());
} }

24
src/gui/autoexpandabledialog.h
Unescape View File

@ -1,6 +1,6 @@
/* /*
* Bittorrent Client using Qt4 and libtorrent. * Bittorrent Client using Qt and libtorrent.
* Copyright (C) 2013 Nick Tiskov * Copyright (C) 2013 Nick Tiskov <daymansmail@gmail.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -24,37 +24,37 @@
* modify file(s), you may extend this exception to your version of the file(s), * modify file(s), you may extend this exception to your version of the file(s),
* but you are not obligated to do so. If you do not wish to do so, delete this * but you are not obligated to do so. If you do not wish to do so, delete this
* exception statement from your version. * exception statement from your version.
*
* Contact : daymansmail@gmail.com
*/ */
#ifndef AUTOEXPANDABLEDIALOG_H #ifndef AUTOEXPANDABLEDIALOG_H
#define AUTOEXPANDABLEDIALOG_H #define AUTOEXPANDABLEDIALOG_H
#include <QDialog> #include <QDialog>
#include <QString>
#include <QLineEdit> #include <QLineEdit>
#include <QString>
namespace Ui { namespace Ui
class AutoExpandableDialog; {
class AutoExpandableDialog;
} }
class AutoExpandableDialog : public QDialog { class AutoExpandableDialog: public QDialog
{
Q_OBJECT Q_OBJECT
public: public:
explicit AutoExpandableDialog(QWidget *parent); explicit AutoExpandableDialog(QWidget *parent);
~AutoExpandableDialog(); ~AutoExpandableDialog();
static QString getText(QWidget *parent, const QString& title, const QString& label, static QString getText(QWidget *parent, const QString &title, const QString &label,
QLineEdit::EchoMode mode = QLineEdit::Normal, const QString & text = QString(), QLineEdit::EchoMode mode = QLineEdit::Normal, const QString &text = QString(),
bool * ok = 0, Qt::InputMethodHints inputMethodHints = Qt::ImhNone); bool *ok = 0, Qt::InputMethodHints inputMethodHints = Qt::ImhNone);
protected: protected:
void showEvent(QShowEvent *e); void showEvent(QShowEvent *e);
private: private:
Ui::AutoExpandableDialog *ui; Ui::AutoExpandableDialog *m_ui;
}; };
#endif // AUTOEXPANDABLEDIALOG_H #endif // AUTOEXPANDABLEDIALOG_H

79
src/gui/previewselect.cpp
Unescape View File

@ -1,6 +1,6 @@
/* /*
* Bittorrent Client using Qt4 and libtorrent. * Bittorrent Client using Qt and libtorrent.
* Copyright (C) 2011 Christophe Dumez * Copyright (C) 2011 Christophe Dumez <chris@qbittorrent.org>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -24,21 +24,20 @@
* modify file(s), you may extend this exception to your version of the file(s), * modify file(s), you may extend this exception to your version of the file(s),
* but you are not obligated to do so. If you do not wish to do so, delete this * but you are not obligated to do so. If you do not wish to do so, delete this
* exception statement from your version. * exception statement from your version.
*
* Contact : chris@qbittorrent.org
*/ */
#include <QStandardItemModel> #include "previewselect.h"
#include <QFile>
#include <QHeaderView> #include <QHeaderView>
#include <QMessageBox> #include <QMessageBox>
#include <QFile> #include <QStandardItemModel>
#include <QTableView> #include <QTableView>
#include "base/preferences.h"
#include "base/utils/fs.h"
#include "base/utils/misc.h" #include "base/utils/misc.h"
#include "previewlistdelegate.h" #include "previewlistdelegate.h"
#include "previewselect.h"
#include "base/utils/fs.h"
#include "base/preferences.h"
PreviewSelect::PreviewSelect(QWidget* parent, BitTorrent::TorrentHandle *const torrent) PreviewSelect::PreviewSelect(QWidget* parent, BitTorrent::TorrentHandle *const torrent)
: QDialog(parent) : QDialog(parent)
@ -46,22 +45,24 @@ PreviewSelect::PreviewSelect(QWidget* parent, BitTorrent::TorrentHandle *const t
{ {
setupUi(this); setupUi(this);
setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_DeleteOnClose);
Preferences* const pref = Preferences::instance(); Preferences *const pref = Preferences::instance();
// Preview list // Preview list
previewListModel = new QStandardItemModel(0, NB_COLUMNS); m_previewListModel = new QStandardItemModel(0, NB_COLUMNS);
previewListModel->setHeaderData(NAME, Qt::Horizontal, tr("Name")); m_previewListModel->setHeaderData(NAME, Qt::Horizontal, tr("Name"));
previewListModel->setHeaderData(SIZE, Qt::Horizontal, tr("Size")); m_previewListModel->setHeaderData(SIZE, Qt::Horizontal, tr("Size"));
previewListModel->setHeaderData(PROGRESS, Qt::Horizontal, tr("Progress")); m_previewListModel->setHeaderData(PROGRESS, Qt::Horizontal, tr("Progress"));
// This hack fixes reordering of first column with Qt5. // This hack fixes reordering of first column with Qt5.
// https://github.com/qtproject/qtbase/commit/e0fc088c0c8bc61dbcaf5928b24986cd61a22777 // https://github.com/qtproject/qtbase/commit/e0fc088c0c8bc61dbcaf5928b24986cd61a22777
QTableView unused; QTableView unused;
unused.setVerticalHeader(previewList->header()); unused.setVerticalHeader(previewList->header());
previewList->header()->setParent(previewList); previewList->header()->setParent(previewList);
unused.setVerticalHeader(new QHeaderView(Qt::Horizontal)); unused.setVerticalHeader(new QHeaderView(Qt::Horizontal));
previewList->setModel(previewListModel);
previewList->setModel(m_previewListModel);
previewList->hideColumn(FILE_INDEX); previewList->hideColumn(FILE_INDEX);
listDelegate = new PreviewListDelegate(this); m_listDelegate = new PreviewListDelegate(this);
previewList->setItemDelegate(listDelegate); previewList->setItemDelegate(m_listDelegate);
previewList->header()->resizeSection(0, 200); previewList->header()->resizeSection(0, 200);
previewList->setAlternatingRowColors(pref->useAlternatingRowColors()); previewList->setAlternatingRowColors(pref->useAlternatingRowColors());
// Fill list in // Fill list in
@ -73,57 +74,63 @@ PreviewSelect::PreviewSelect(QWidget* parent, BitTorrent::TorrentHandle *const t
fileName.chop(4); fileName.chop(4);
QString extension = Utils::Fs::fileExtension(fileName).toUpper(); QString extension = Utils::Fs::fileExtension(fileName).toUpper();
if (Utils::Misc::isPreviewable(extension)) { if (Utils::Misc::isPreviewable(extension)) {
int row = previewListModel->rowCount(); int row = m_previewListModel->rowCount();
previewListModel->insertRow(row); m_previewListModel->insertRow(row);
previewListModel->setData(previewListModel->index(row, NAME), QVariant(fileName)); m_previewListModel->setData(m_previewListModel->index(row, NAME), QVariant(fileName));
previewListModel->setData(previewListModel->index(row, SIZE), QVariant(torrent->fileSize(i))); m_previewListModel->setData(m_previewListModel->index(row, SIZE), QVariant(torrent->fileSize(i)));
previewListModel->setData(previewListModel->index(row, PROGRESS), QVariant(fp[i])); m_previewListModel->setData(m_previewListModel->index(row, PROGRESS), QVariant(fp[i]));
previewListModel->setData(previewListModel->index(row, FILE_INDEX), QVariant(i)); m_previewListModel->setData(m_previewListModel->index(row, FILE_INDEX), QVariant(i));
} }
} }
if (!previewListModel->rowCount()) { if (m_previewListModel->rowCount() == 0) {
QMessageBox::critical(this->parentWidget(), tr("Preview impossible"), tr("Sorry, we can't preview this file")); QMessageBox::critical(this->parentWidget(), tr("Preview impossible"), tr("Sorry, we can't preview this file"));
close(); close();
} }
connect(this, SIGNAL(readyToPreviewFile(QString)), parent, SLOT(previewFile(QString))); connect(this, SIGNAL(readyToPreviewFile(QString)), parent, SLOT(previewFile(QString)));
previewListModel->sort(NAME); m_previewListModel->sort(NAME);
previewList->header()->setSortIndicator(0, Qt::AscendingOrder); previewList->header()->setSortIndicator(0, Qt::AscendingOrder);
previewList->selectionModel()->select(previewListModel->index(0, NAME), QItemSelectionModel::Select | QItemSelectionModel::Rows); previewList->selectionModel()->select(m_previewListModel->index(0, NAME), QItemSelectionModel::Select | QItemSelectionModel::Rows);
if (previewListModel->rowCount() == 1) { if (m_previewListModel->rowCount() == 1) {
qDebug("Torrent file only contains one file, no need to display selection dialog before preview"); qDebug("Torrent file only contains one file, no need to display selection dialog before preview");
// Only one file : no choice // Only one file : no choice
on_previewButton_clicked(); on_previewButton_clicked();
}else{ }
else {
qDebug("Displaying media file selection dialog for preview"); qDebug("Displaying media file selection dialog for preview");
show(); show();
} }
} }
PreviewSelect::~PreviewSelect() { PreviewSelect::~PreviewSelect()
delete previewListModel; {
delete listDelegate; delete m_previewListModel;
delete m_listDelegate;
} }
void PreviewSelect::on_previewButton_clicked() { void PreviewSelect::on_previewButton_clicked()
{
QModelIndexList selectedIndexes = previewList->selectionModel()->selectedRows(FILE_INDEX); QModelIndexList selectedIndexes = previewList->selectionModel()->selectedRows(FILE_INDEX);
if (selectedIndexes.size() == 0) return; if (selectedIndexes.size() == 0) return;
// Flush data // Flush data
m_torrent->flushCache(); m_torrent->flushCache();
QStringList absolute_paths(m_torrent->absoluteFilePaths()); QStringList absolutePaths(m_torrent->absoluteFilePaths());
//only one file should be selected // Only one file should be selected
QString path = absolute_paths.at(selectedIndexes.at(0).data().toInt()); QString path = absolutePaths.at(selectedIndexes.at(0).data().toInt());
// File // File
if (QFile::exists(path)) if (QFile::exists(path))
emit readyToPreviewFile(path); emit readyToPreviewFile(path);
else else
QMessageBox::critical(this->parentWidget(), tr("Preview impossible"), tr("Sorry, we can't preview this file")); QMessageBox::critical(this->parentWidget(), tr("Preview impossible"), tr("Sorry, we can't preview this file"));
close(); close();
} }
void PreviewSelect::on_cancelButton_clicked() { void PreviewSelect::on_cancelButton_clicked()
{
close(); close();
} }

35
src/gui/previewselect.h
Unescape View File

@ -1,6 +1,6 @@
/* /*
* Bittorrent Client using Qt4 and libtorrent. * Bittorrent Client using Qt and libtorrent.
* Copyright (C) 2006 Christophe Dumez * Copyright (C) 2011 Christophe Dumez <chris@qbittorrent.org>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -24,8 +24,6 @@
* modify file(s), you may extend this exception to your version of the file(s), * modify file(s), you may extend this exception to your version of the file(s),
* but you are not obligated to do so. If you do not wish to do so, delete this * but you are not obligated to do so. If you do not wish to do so, delete this
* exception statement from your version. * exception statement from your version.
*
* Contact : chris@qbittorrent.org
*/ */
#ifndef PREVIEWSELECT_H #ifndef PREVIEWSELECT_H
@ -33,22 +31,29 @@
#include <QDialog> #include <QDialog>
#include <QList> #include <QList>
#include "ui_preview.h"
#include "base/bittorrent/torrenthandle.h"
class PreviewListDelegate; #include "base/bittorrent/torrenthandle.h"
#include "ui_preview.h"
QT_BEGIN_NAMESPACE
class QStandardItemModel; class QStandardItemModel;
QT_END_NAMESPACE
class PreviewSelect: public QDialog, private Ui::preview { class PreviewListDelegate;
class PreviewSelect: public QDialog, private Ui::preview
{
Q_OBJECT Q_OBJECT
public: public:
enum PreviewColumn { NAME, SIZE, PROGRESS, FILE_INDEX, NB_COLUMNS }; enum PreviewColumn
{
NAME,
SIZE,
PROGRESS,
FILE_INDEX,
NB_COLUMNS
};
public:
PreviewSelect(QWidget* parent, BitTorrent::TorrentHandle *const torrent); PreviewSelect(QWidget* parent, BitTorrent::TorrentHandle *const torrent);
~PreviewSelect(); ~PreviewSelect();
@ -60,9 +65,9 @@ protected slots:
void on_cancelButton_clicked(); void on_cancelButton_clicked();
private: private:
QStandardItemModel *previewListModel; QStandardItemModel *m_previewListModel;
PreviewListDelegate *listDelegate; PreviewListDelegate *m_listDelegate;
BitTorrent::TorrentHandle *const m_torrent; BitTorrent::TorrentHandle *const m_torrent;
}; };
#endif #endif // PREVIEWSELECT_H

20
src/gui/properties/peerlistsortmodel.h
Unescape View File

@ -1,6 +1,6 @@
/* /*
* Bittorrent Client using Qt4 and libtorrent. * Bittorrent Client using Qt and libtorrent.
* Copyright (C) 2013 Nick Tiskov * Copyright (C) 2013 Nick Tiskov <daymansmail@gmail.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -24,25 +24,29 @@
* modify file(s), you may extend this exception to your version of the file(s), * modify file(s), you may extend this exception to your version of the file(s),
* but you are not obligated to do so. If you do not wish to do so, delete this * but you are not obligated to do so. If you do not wish to do so, delete this
* exception statement from your version. * exception statement from your version.
*
* Contact : daymansmail@gmail.com
*/ */
#ifndef PEERLISTSORTMODEL_H #ifndef PEERLISTSORTMODEL_H
#define PEERLISTSORTMODEL_H #define PEERLISTSORTMODEL_H
#include <QStringList>
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
#include <QStringList>
#include "peerlistdelegate.h" #include "peerlistdelegate.h"
class PeerListSortModel : public QSortFilterProxyModel { class PeerListSortModel: public QSortFilterProxyModel
{
Q_OBJECT Q_OBJECT
public: public:
PeerListSortModel(QObject *parent = 0) : QSortFilterProxyModel(parent) {} PeerListSortModel(QObject *parent = 0)
: QSortFilterProxyModel(parent)
{
}
protected: protected:
bool lessThan(const QModelIndex &left, const QModelIndex &right) const { bool lessThan(const QModelIndex &left, const QModelIndex &right) const
{
switch (sortColumn()) { switch (sortColumn()) {
case PeerListDelegate::IP: case PeerListDelegate::IP:
case PeerListDelegate::CLIENT: { case PeerListDelegate::CLIENT: {

223
src/gui/properties/trackerlist.cpp
Unescape View File

@ -1,6 +1,6 @@
/* /*
* Bittorrent Client using Qt4 and libtorrent. * Bittorrent Client using Qt and libtorrent.
* Copyright (C) 2006 Christophe Dumez * Copyright (C) 2006 Christophe Dumez <chris@qbittorrent.org>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -24,8 +24,6 @@
* modify file(s), you may extend this exception to your version of the file(s), * modify file(s), you may extend this exception to your version of the file(s),
* but you are not obligated to do so. If you do not wish to do so, delete this * but you are not obligated to do so. If you do not wish to do so, delete this
* exception statement from your version. * exception statement from your version.
*
* Contact : chris@qbittorrent.org
*/ */
#include "trackerlist.h" #include "trackerlist.h"
@ -132,53 +130,57 @@ TrackerList::~TrackerList()
saveSettings(); saveSettings();
} }
QList<QTreeWidgetItem*> TrackerList::getSelectedTrackerItems() const { QList<QTreeWidgetItem*> TrackerList::getSelectedTrackerItems() const
const QList<QTreeWidgetItem*> selected_items = selectedItems(); {
QList<QTreeWidgetItem*> selected_trackers; const QList<QTreeWidgetItem *> selectedTrackerItems = selectedItems();
foreach (QTreeWidgetItem *item, selected_items) { QList<QTreeWidgetItem *> selectedTrackers;
if (indexOfTopLevelItem(item) >= NB_STICKY_ITEM) { // Ignore STICKY ITEMS foreach (QTreeWidgetItem *item, selectedTrackerItems) {
selected_trackers << item; if (indexOfTopLevelItem(item) >= NB_STICKY_ITEM) // Ignore STICKY ITEMS
} selectedTrackers << item;
} }
return selected_trackers;
return selectedTrackers;
} }
void TrackerList::setRowColor(int row, QColor color) { void TrackerList::setRowColor(int row, QColor color)
{
unsigned int nbColumns = columnCount(); unsigned int nbColumns = columnCount();
QTreeWidgetItem *item = topLevelItem(row); QTreeWidgetItem *item = topLevelItem(row);
for (unsigned int i=0; i<nbColumns; ++i) { for (unsigned int i = 0; i < nbColumns; ++i)
item->setData(i, Qt::ForegroundRole, color); item->setData(i, Qt::ForegroundRole, color);
}
} }
void TrackerList::moveSelectionUp() { void TrackerList::moveSelectionUp()
{
BitTorrent::TorrentHandle *const torrent = m_properties->getCurrentTorrent(); BitTorrent::TorrentHandle *const torrent = m_properties->getCurrentTorrent();
if (!torrent) { if (!torrent) {
clear(); clear();
return; return;
} }
QList<QTreeWidgetItem *> selected_items = getSelectedTrackerItems(); QList<QTreeWidgetItem *> selectedTrackerItems = getSelectedTrackerItems();
if (selected_items.isEmpty()) return; if (selectedTrackerItems.isEmpty()) return;
bool change = false; bool change = false;
foreach (QTreeWidgetItem *item, selected_items) { foreach (QTreeWidgetItem *item, selectedTrackerItems) {
int index = indexOfTopLevelItem(item); int index = indexOfTopLevelItem(item);
if (index > NB_STICKY_ITEM) { if (index > NB_STICKY_ITEM) {
insertTopLevelItem(index-1, takeTopLevelItem(index)); insertTopLevelItem(index - 1, takeTopLevelItem(index));
change = true; change = true;
} }
} }
if (!change) return; if (!change) return;
// Restore selection // Restore selection
QItemSelectionModel *selection = selectionModel(); QItemSelectionModel *selection = selectionModel();
foreach (QTreeWidgetItem *item, selected_items) { foreach (QTreeWidgetItem *item, selectedTrackerItems)
selection->select(indexFromItem(item), QItemSelectionModel::Rows|QItemSelectionModel::Select); selection->select(indexFromItem(item), (QItemSelectionModel::Rows | QItemSelectionModel::Select));
}
setSelectionModel(selection); setSelectionModel(selection);
// Update torrent trackers // Update torrent trackers
QList<BitTorrent::TrackerEntry> trackers; QList<BitTorrent::TrackerEntry> trackers;
for (int i = NB_STICKY_ITEM; i < topLevelItemCount(); ++i) { for (int i = NB_STICKY_ITEM; i < topLevelItemCount(); ++i) {
QString tracker_url = topLevelItem(i)->data(COL_URL, Qt::DisplayRole).toString(); QString trackerURL = topLevelItem(i)->data(COL_URL, Qt::DisplayRole).toString();
BitTorrent::TrackerEntry e(tracker_url); BitTorrent::TrackerEntry e(trackerURL);
e.setTier(i - NB_STICKY_ITEM); e.setTier(i - NB_STICKY_ITEM);
trackers.append(e); trackers.append(e);
} }
@ -189,34 +191,37 @@ void TrackerList::moveSelectionUp() {
torrent->forceReannounce(); torrent->forceReannounce();
} }
void TrackerList::moveSelectionDown() { void TrackerList::moveSelectionDown()
{
BitTorrent::TorrentHandle *const torrent = m_properties->getCurrentTorrent(); BitTorrent::TorrentHandle *const torrent = m_properties->getCurrentTorrent();
if (!torrent) { if (!torrent) {
clear(); clear();
return; return;
} }
QList<QTreeWidgetItem *> selected_items = getSelectedTrackerItems(); QList<QTreeWidgetItem *> selectedTrackerItems = getSelectedTrackerItems();
if (selected_items.isEmpty()) return; if (selectedTrackerItems.isEmpty()) return;
bool change = false; bool change = false;
for (int i=selectedItems().size()-1; i>= 0; --i) { for (int i = selectedItems().size() - 1; i >= 0; --i) {
int index = indexOfTopLevelItem(selected_items.at(i)); int index = indexOfTopLevelItem(selectedTrackerItems.at(i));
if (index < topLevelItemCount()-1) { if (index < (topLevelItemCount() - 1)) {
insertTopLevelItem(index+1, takeTopLevelItem(index)); insertTopLevelItem(index + 1, takeTopLevelItem(index));
change = true; change = true;
} }
} }
if (!change) return; if (!change) return;
// Restore selection // Restore selection
QItemSelectionModel *selection = selectionModel(); QItemSelectionModel *selection = selectionModel();
foreach (QTreeWidgetItem *item, selected_items) { foreach (QTreeWidgetItem *item, selectedTrackerItems)
selection->select(indexFromItem(item), QItemSelectionModel::Rows|QItemSelectionModel::Select); selection->select(indexFromItem(item), (QItemSelectionModel::Rows | QItemSelectionModel::Select));
}
setSelectionModel(selection); setSelectionModel(selection);
// Update torrent trackers // Update torrent trackers
QList<BitTorrent::TrackerEntry> trackers; QList<BitTorrent::TrackerEntry> trackers;
for (int i = NB_STICKY_ITEM; i < topLevelItemCount(); ++i) { for (int i = NB_STICKY_ITEM; i < topLevelItemCount(); ++i) {
QString tracker_url = topLevelItem(i)->data(COL_URL, Qt::DisplayRole).toString(); QString trackerURL = topLevelItem(i)->data(COL_URL, Qt::DisplayRole).toString();
BitTorrent::TrackerEntry e(tracker_url); BitTorrent::TrackerEntry e(trackerURL);
e.setTier(i - NB_STICKY_ITEM); e.setTier(i - NB_STICKY_ITEM);
trackers.append(e); trackers.append(e);
} }
@ -245,7 +250,8 @@ void TrackerList::clear()
m_LSDItem->setText(COL_MSG, ""); m_LSDItem->setText(COL_MSG, "");
} }
void TrackerList::loadStickyItems(BitTorrent::TorrentHandle *const torrent) { void TrackerList::loadStickyItems(BitTorrent::TorrentHandle *const torrent)
{
QString working = tr("Working"); QString working = tr("Working");
QString disabled = tr("Disabled"); QString disabled = tr("Disabled");
@ -308,29 +314,32 @@ void TrackerList::loadStickyItems(BitTorrent::TorrentHandle *const torrent) {
m_LSDItem->setText(COL_PEERS, QString::number(peersLSD)); m_LSDItem->setText(COL_PEERS, QString::number(peersLSD));
} }
void TrackerList::loadTrackers() { void TrackerList::loadTrackers()
{
// Load trackers from torrent handle // Load trackers from torrent handle
BitTorrent::TorrentHandle *const torrent = m_properties->getCurrentTorrent(); BitTorrent::TorrentHandle *const torrent = m_properties->getCurrentTorrent();
if (!torrent) return; if (!torrent) return;
loadStickyItems(torrent); loadStickyItems(torrent);
// Load actual trackers information // Load actual trackers information
QHash<QString, BitTorrent::TrackerInfo> trackers_data = torrent->trackerInfos(); QHash<QString, BitTorrent::TrackerInfo> trackerData = torrent->trackerInfos();
QStringList old_trackers_urls = m_trackerItems.keys(); QStringList oldTrackerURLs = m_trackerItems.keys();
foreach (const BitTorrent::TrackerEntry &entry, torrent->trackers()) { foreach (const BitTorrent::TrackerEntry &entry, torrent->trackers()) {
QString trackerUrl = entry.url(); QString trackerURL = entry.url();
QTreeWidgetItem *item = m_trackerItems.value(trackerUrl, 0); QTreeWidgetItem *item = m_trackerItems.value(trackerURL, 0);
if (!item) { if (!item) {
item = new QTreeWidgetItem(); item = new QTreeWidgetItem();
item->setText(COL_URL, trackerUrl); item->setText(COL_URL, trackerURL);
addTopLevelItem(item); addTopLevelItem(item);
m_trackerItems[trackerUrl] = item; m_trackerItems[trackerURL] = item;
} else { }
old_trackers_urls.removeOne(trackerUrl); else {
oldTrackerURLs.removeOne(trackerURL);
} }
item->setText(COL_TIER, QString::number(entry.tier())); item->setText(COL_TIER, QString::number(entry.tier()));
BitTorrent::TrackerInfo data = trackers_data.value(trackerUrl); BitTorrent::TrackerInfo data = trackerData.value(trackerURL);
QString error_message = data.lastMessage.trimmed(); QString errorMessage = data.lastMessage.trimmed();
switch (entry.status()) { switch (entry.status()) {
case BitTorrent::TrackerEntry::Working: case BitTorrent::TrackerEntry::Working:
item->setText(COL_STATUS, tr("Working")); item->setText(COL_STATUS, tr("Working"));
@ -342,15 +351,15 @@ void TrackerList::loadTrackers() {
break; break;
case BitTorrent::TrackerEntry::NotWorking: case BitTorrent::TrackerEntry::NotWorking:
item->setText(COL_STATUS, tr("Not working")); item->setText(COL_STATUS, tr("Not working"));
item->setText(COL_MSG, error_message); item->setText(COL_MSG, errorMessage);
break; break;
case BitTorrent::TrackerEntry::NotContacted: case BitTorrent::TrackerEntry::NotContacted:
item->setText(COL_STATUS, tr("Not contacted yet")); item->setText(COL_STATUS, tr("Not contacted yet"));
item->setText(COL_MSG, ""); item->setText(COL_MSG, "");
break; break;
} }
item->setText(COL_RECEIVED, QString::number(data.numPeers));
item->setText(COL_RECEIVED, QString::number(data.numPeers));
#if LIBTORRENT_VERSION_NUM >= 10000 #if LIBTORRENT_VERSION_NUM >= 10000
item->setText(COL_SEEDS, QString::number(entry.nativeEntry().scrape_complete > 0 ? entry.nativeEntry().scrape_complete : 0)); item->setText(COL_SEEDS, QString::number(entry.nativeEntry().scrape_complete > 0 ? entry.nativeEntry().scrape_complete : 0));
item->setText(COL_PEERS, QString::number(entry.nativeEntry().scrape_incomplete > 0 ? entry.nativeEntry().scrape_incomplete : 0)); item->setText(COL_PEERS, QString::number(entry.nativeEntry().scrape_incomplete > 0 ? entry.nativeEntry().scrape_incomplete : 0));
@ -368,124 +377,127 @@ void TrackerList::loadTrackers() {
item->setTextAlignment(COL_DOWNLOADED, (Qt::AlignRight | Qt::AlignVCenter)); item->setTextAlignment(COL_DOWNLOADED, (Qt::AlignRight | Qt::AlignVCenter));
} }
// Remove old trackers // Remove old trackers
foreach (const QString &tracker, old_trackers_urls) { foreach (const QString &tracker, oldTrackerURLs)
delete m_trackerItems.take(tracker); delete m_trackerItems.take(tracker);
}
} }
// Ask the user for new trackers and add them to the torrent // Ask the user for new trackers and add them to the torrent
void TrackerList::askForTrackers() { void TrackerList::askForTrackers()
{
BitTorrent::TorrentHandle *const torrent = m_properties->getCurrentTorrent(); BitTorrent::TorrentHandle *const torrent = m_properties->getCurrentTorrent();
if (!torrent) return; if (!torrent) return;
QList<BitTorrent::TrackerEntry> trackers; QList<BitTorrent::TrackerEntry> trackers;
foreach (const QString &tracker, TrackersAdditionDlg::askForTrackers(this, torrent)) foreach (const QString &tracker, TrackersAdditionDlg::askForTrackers(this, torrent))
trackers << tracker; trackers << tracker;
torrent->addTrackers(trackers); torrent->addTrackers(trackers);
} }
void TrackerList::copyTrackerUrl() { void TrackerList::copyTrackerUrl()
QList<QTreeWidgetItem *> selected_items = getSelectedTrackerItems(); {
if (selected_items.isEmpty()) return; QList<QTreeWidgetItem *> selectedTrackerItems = getSelectedTrackerItems();
QStringList urls_to_copy; if (selectedTrackerItems.isEmpty()) return;
foreach (QTreeWidgetItem *item, selected_items) {
QString tracker_url = item->data(COL_URL, Qt::DisplayRole).toString(); QStringList URLsToCopy;
qDebug() << QString("Copy: ") + tracker_url; foreach (QTreeWidgetItem *item, selectedTrackerItems) {
urls_to_copy << tracker_url; QString trackerURL = item->data(COL_URL, Qt::DisplayRole).toString();
qDebug() << QString("Copy: ") + trackerURL;
URLsToCopy << trackerURL;
} }
QApplication::clipboard()->setText(urls_to_copy.join("\n")); QApplication::clipboard()->setText(URLsToCopy.join("\n"));
} }
void TrackerList::deleteSelectedTrackers() { void TrackerList::deleteSelectedTrackers()
{
BitTorrent::TorrentHandle *const torrent = m_properties->getCurrentTorrent(); BitTorrent::TorrentHandle *const torrent = m_properties->getCurrentTorrent();
if (!torrent) { if (!torrent) {
clear(); clear();
return; return;
} }
QList<QTreeWidgetItem *> selected_items = getSelectedTrackerItems(); QList<QTreeWidgetItem *> selectedTrackerItems = getSelectedTrackerItems();
if (selected_items.isEmpty()) return; if (selectedTrackerItems.isEmpty()) return;
QStringList urls_to_remove; QStringList URLsToRemove;
foreach (QTreeWidgetItem *item, selected_items) { foreach (QTreeWidgetItem *item, selectedTrackerItems) {
QString tracker_url = item->data(COL_URL, Qt::DisplayRole).toString(); QString trackerURL = item->data(COL_URL, Qt::DisplayRole).toString();
urls_to_remove << tracker_url; URLsToRemove << trackerURL;
m_trackerItems.remove(tracker_url); m_trackerItems.remove(trackerURL);
delete item; delete item;
} }
// Iterate of trackers and remove selected ones // Iterate over the trackers and remove the selected ones
QList<BitTorrent::TrackerEntry> remaining_trackers; QList<BitTorrent::TrackerEntry> remainingTrackers;
QList<BitTorrent::TrackerEntry> trackers = torrent->trackers(); QList<BitTorrent::TrackerEntry> trackers = torrent->trackers();
foreach (const BitTorrent::TrackerEntry &entry, trackers) { foreach (const BitTorrent::TrackerEntry &entry, trackers) {
if (!urls_to_remove.contains(entry.url())) { if (!URLsToRemove.contains(entry.url()))
remaining_trackers.push_back(entry); remainingTrackers.push_back(entry);
}
} }
torrent->replaceTrackers(remaining_trackers); torrent->replaceTrackers(remainingTrackers);
if (!torrent->isPaused()) if (!torrent->isPaused())
torrent->forceReannounce(); torrent->forceReannounce();
} }
void TrackerList::editSelectedTracker() { void TrackerList::editSelectedTracker()
{
BitTorrent::TorrentHandle *const torrent = m_properties->getCurrentTorrent(); BitTorrent::TorrentHandle *const torrent = m_properties->getCurrentTorrent();
if (!torrent) return; if (!torrent) return;
QString hash = torrent->hash(); QString hash = torrent->hash();
QList<QTreeWidgetItem *> selected_items = getSelectedTrackerItems(); QList<QTreeWidgetItem *> selectedTrackerItems = getSelectedTrackerItems();
if (selected_items.isEmpty()) if (selectedTrackerItems.isEmpty()) return;
return;
// During multi-select only process item selected last // During multi-select only process item selected last
QUrl tracker_url = selected_items.last()->text(COL_URL); QUrl trackerURL = selectedTrackerItems.last()->text(COL_URL);
bool ok; bool ok;
QUrl new_tracker_url = AutoExpandableDialog::getText(this, tr("Tracker editing"), tr("Tracker URL:"), QUrl newTrackerURL = AutoExpandableDialog::getText(this, tr("Tracker editing"), tr("Tracker URL:"),
QLineEdit::Normal, tracker_url.toString(), &ok).trimmed(); QLineEdit::Normal, trackerURL.toString(), &ok).trimmed();
if (!ok) if (!ok) return;
return;
if (!new_tracker_url.isValid()) { if (!newTrackerURL.isValid()) {
QMessageBox::warning(this, tr("Tracker editing failed"), tr("The tracker URL entered is invalid.")); QMessageBox::warning(this, tr("Tracker editing failed"), tr("The tracker URL entered is invalid."));
return; return;
} }
if (new_tracker_url == tracker_url) if (newTrackerURL == trackerURL) return;
return;
QList<BitTorrent::TrackerEntry> trackers = torrent->trackers(); QList<BitTorrent::TrackerEntry> trackers = torrent->trackers();
bool match = false; bool match = false;
for (int i = 0; i < trackers.size(); ++i) { for (int i = 0; i < trackers.size(); ++i) {
BitTorrent::TrackerEntry &entry = trackers[i]; BitTorrent::TrackerEntry &entry = trackers[i];
if (new_tracker_url == QUrl(entry.url())) { if (newTrackerURL == QUrl(entry.url())) {
QMessageBox::warning(this, tr("Tracker editing failed"), tr("The tracker URL already exists.")); QMessageBox::warning(this, tr("Tracker editing failed"), tr("The tracker URL already exists."));
return; return;
} }
if (tracker_url == QUrl(entry.url()) && !match) { if (trackerURL == QUrl(entry.url()) && !match) {
BitTorrent::TrackerEntry new_entry(new_tracker_url.toString()); BitTorrent::TrackerEntry newEntry(newTrackerURL.toString());
new_entry.setTier(entry.tier()); newEntry.setTier(entry.tier());
match = true; match = true;
entry = new_entry; entry = newEntry;
} }
} }
torrent->replaceTrackers(trackers); torrent->replaceTrackers(trackers);
if (!torrent->isPaused()) { if (!torrent->isPaused())
torrent->forceReannounce(); torrent->forceReannounce();
}
} }
void TrackerList::reannounceSelected() { void TrackerList::reannounceSelected()
QList<QTreeWidgetItem *> selected_items = selectedItems(); {
if (selected_items.isEmpty()) return; QList<QTreeWidgetItem *> selItems = selectedItems();
if (selItems.isEmpty()) return;
BitTorrent::TorrentHandle *const torrent = m_properties->getCurrentTorrent(); BitTorrent::TorrentHandle *const torrent = m_properties->getCurrentTorrent();
if (!torrent) return; if (!torrent) return;
QList<BitTorrent::TrackerEntry> trackers = torrent->trackers(); QList<BitTorrent::TrackerEntry> trackers = torrent->trackers();
foreach (QTreeWidgetItem* item, selected_items) { foreach (QTreeWidgetItem* item, selItems) {
// DHT case // DHT case
if (item == m_DHTItem) { if (item == m_DHTItem) {
torrent->forceDHTAnnounce(); torrent->forceDHTAnnounce();
@ -504,9 +516,11 @@ void TrackerList::reannounceSelected() {
loadTrackers(); loadTrackers();
} }
void TrackerList::showTrackerListMenu(QPoint) { void TrackerList::showTrackerListMenu(QPoint)
{
BitTorrent::TorrentHandle *const torrent = m_properties->getCurrentTorrent(); BitTorrent::TorrentHandle *const torrent = m_properties->getCurrentTorrent();
if (!torrent) return; if (!torrent) return;
//QList<QTreeWidgetItem*> selected_items = getSelectedTrackerItems(); //QList<QTreeWidgetItem*> selected_items = getSelectedTrackerItems();
QMenu menu; QMenu menu;
// Add actions // Add actions
@ -520,14 +534,15 @@ void TrackerList::showTrackerListMenu(QPoint) {
editAct = menu.addAction(GuiIconProvider::instance()->getIcon("edit-rename"),tr("Edit selected tracker URL")); editAct = menu.addAction(GuiIconProvider::instance()->getIcon("edit-rename"),tr("Edit selected tracker URL"));
} }
QAction *reannounceSelAct = nullptr; QAction *reannounceSelAct = nullptr;
QAction *reannounceAct = nullptr; QAction *reannounceAllAct = nullptr;
if (!torrent->isPaused()) { if (!torrent->isPaused()) {
reannounceSelAct = menu.addAction(GuiIconProvider::instance()->getIcon("view-refresh"), tr("Force reannounce to selected trackers")); reannounceSelAct = menu.addAction(GuiIconProvider::instance()->getIcon("view-refresh"), tr("Force reannounce to selected trackers"));
menu.addSeparator(); menu.addSeparator();
reannounceAct = menu.addAction(GuiIconProvider::instance()->getIcon("view-refresh"), tr("Force reannounce to all trackers")); reannounceAllAct = menu.addAction(GuiIconProvider::instance()->getIcon("view-refresh"), tr("Force reannounce to all trackers"));
} }
QAction *act = menu.exec(QCursor::pos()); QAction *act = menu.exec(QCursor::pos());
if (act == nullptr) return; if (act == nullptr) return;
if (act == addAct) { if (act == addAct) {
askForTrackers(); askForTrackers();
return; return;
@ -544,7 +559,7 @@ void TrackerList::showTrackerListMenu(QPoint) {
reannounceSelected(); reannounceSelected();
return; return;
} }
if (act == reannounceAct) { if (act == reannounceAllAct) {
BitTorrent::TorrentHandle *h = m_properties->getCurrentTorrent(); BitTorrent::TorrentHandle *h = m_properties->getCurrentTorrent();
h->forceReannounce(); h->forceReannounce();
h->forceDHTAnnounce(); h->forceDHTAnnounce();

6
src/gui/properties/trackerlist.h
Unescape View File

@ -1,6 +1,6 @@
/* /*
* Bittorrent Client using Qt4 and libtorrent. * Bittorrent Client using Qt and libtorrent.
* Copyright (C) 2006 Christophe Dumez * Copyright (C) 2006 Christophe Dumez <chris@qbittorrent.org>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -24,8 +24,6 @@
* modify file(s), you may extend this exception to your version of the file(s), * modify file(s), you may extend this exception to your version of the file(s),
* but you are not obligated to do so. If you do not wish to do so, delete this * but you are not obligated to do so. If you do not wish to do so, delete this
* exception statement from your version. * exception statement from your version.
*
* Contact : chris@qbittorrent.org
*/ */
#ifndef TRACKERLIST_H #ifndef TRACKERLIST_H

38
src/gui/shutdownconfirmdlg.cpp
Unescape View File

@ -1,7 +1,7 @@
/* /*
* Bittorrent Client using Qt and libtorrent. * Bittorrent Client using Qt and libtorrent.
* Copyright (C) 2011 Christophe Dumez * Copyright (C) 2014 sledgehammer999 <hammered999@gmail.com>
* Copyright (C) 2014 sledgehammer999 * Copyright (C) 2011 Christophe Dumez <chris@qbittorrent.org>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -25,42 +25,38 @@
* modify file(s), you may extend this exception to your version of the file(s), * modify file(s), you may extend this exception to your version of the file(s),
* but you are not obligated to do so. If you do not wish to do so, delete this * but you are not obligated to do so. If you do not wish to do so, delete this
* exception statement from your version. * exception statement from your version.
*
* Contact : chris@qbittorrent.org
* Contact : hammered999@gmail.com
*/ */
#include "shutdownconfirmdlg.h" #include "shutdownconfirmdlg.h"
#include "ui_shutdownconfirmdlg.h"
#include <QStyle>
#include <QIcon>
#include <QDialogButtonBox> #include <QDialogButtonBox>
#include <QIcon>
#include <QPushButton> #include <QPushButton>
#include <QStyle>
#include "base/preferences.h" #include "base/preferences.h"
#include "base/utils/misc.h" #include "base/utils/misc.h"
#include "ui_shutdownconfirmdlg.h"
ShutdownConfirmDlg::ShutdownConfirmDlg(QWidget *parent, const ShutdownDialogAction &action) ShutdownConfirmDlg::ShutdownConfirmDlg(QWidget *parent, const ShutdownDialogAction &action)
: QDialog(parent) : QDialog(parent)
, ui(new Ui::confirmShutdownDlg) , m_ui(new Ui::confirmShutdownDlg)
, m_timeout(15) , m_timeout(15)
, m_action(action) , m_action(action)
{ {
ui->setupUi(this); m_ui->setupUi(this);
initText(); initText();
QIcon warningIcon(style()->standardIcon(QStyle::SP_MessageBoxWarning)); QIcon warningIcon(style()->standardIcon(QStyle::SP_MessageBoxWarning));
ui->warningLabel->setPixmap(warningIcon.pixmap(32)); m_ui->warningLabel->setPixmap(warningIcon.pixmap(32));
if (m_action == ShutdownDialogAction::Exit) if (m_action == ShutdownDialogAction::Exit)
ui->neverShowAgainCheckbox->setVisible(true); m_ui->neverShowAgainCheckbox->setVisible(true);
else else
ui->neverShowAgainCheckbox->setVisible(false); m_ui->neverShowAgainCheckbox->setVisible(false);
// Cancel Button // Cancel Button
QPushButton *cancelButton = ui->buttonBox->button(QDialogButtonBox::Cancel); QPushButton *cancelButton = m_ui->buttonBox->button(QDialogButtonBox::Cancel);
cancelButton->setFocus(); cancelButton->setFocus();
cancelButton->setDefault(true); cancelButton->setDefault(true);
@ -74,7 +70,7 @@ ShutdownConfirmDlg::ShutdownConfirmDlg(QWidget *parent, const ShutdownDialogActi
ShutdownConfirmDlg::~ShutdownConfirmDlg() ShutdownConfirmDlg::~ShutdownConfirmDlg()
{ {
delete ui; delete m_ui;
} }
void ShutdownConfirmDlg::showEvent(QShowEvent *event) void ShutdownConfirmDlg::showEvent(QShowEvent *event)
@ -101,36 +97,32 @@ void ShutdownConfirmDlg::updateSeconds()
void ShutdownConfirmDlg::accept() void ShutdownConfirmDlg::accept()
{ {
Preferences::instance()->setDontConfirmAutoExit(ui->neverShowAgainCheckbox->isChecked()); Preferences::instance()->setDontConfirmAutoExit(m_ui->neverShowAgainCheckbox->isChecked());
QDialog::accept(); QDialog::accept();
} }
void ShutdownConfirmDlg::initText() void ShutdownConfirmDlg::initText()
{ {
QPushButton *okButton = ui->buttonBox->button(QDialogButtonBox::Ok); QPushButton *okButton = m_ui->buttonBox->button(QDialogButtonBox::Ok);
switch (m_action) { switch (m_action) {
case ShutdownDialogAction::Exit: case ShutdownDialogAction::Exit:
m_msg = tr("qBittorrent will now exit."); m_msg = tr("qBittorrent will now exit.");
okButton->setText(tr("E&xit Now")); okButton->setText(tr("E&xit Now"));
setWindowTitle(tr("Exit confirmation")); setWindowTitle(tr("Exit confirmation"));
break; break;
case ShutdownDialogAction::Shutdown: case ShutdownDialogAction::Shutdown:
m_msg = tr("The computer is going to shutdown."); m_msg = tr("The computer is going to shutdown.");
okButton->setText(tr("&Shutdown Now")); okButton->setText(tr("&Shutdown Now"));
setWindowTitle(tr("Shutdown confirmation")); setWindowTitle(tr("Shutdown confirmation"));
break; break;
case ShutdownDialogAction::Suspend: case ShutdownDialogAction::Suspend:
m_msg = tr("The computer is going to enter suspend mode."); m_msg = tr("The computer is going to enter suspend mode.");
okButton->setText(tr("&Suspend Now")); okButton->setText(tr("&Suspend Now"));
setWindowTitle(tr("Suspend confirmation")); setWindowTitle(tr("Suspend confirmation"));
break; break;
case ShutdownDialogAction::Hibernate: case ShutdownDialogAction::Hibernate:
m_msg = tr("The computer is going to enter hibernation mode."); m_msg = tr("The computer is going to enter hibernation mode.");
okButton->setText(tr("&Hibernate Now")); okButton->setText(tr("&Hibernate Now"));
setWindowTitle(tr("Hibernate confirmation")); setWindowTitle(tr("Hibernate confirmation"));
break; break;
@ -143,5 +135,5 @@ void ShutdownConfirmDlg::initText()
void ShutdownConfirmDlg::updateText() void ShutdownConfirmDlg::updateText()
{ {
QString t = tr("You can cancel the action within %1 seconds.").arg(QString::number(m_timeout)) + "\n"; QString t = tr("You can cancel the action within %1 seconds.").arg(QString::number(m_timeout)) + "\n";
ui->shutdownText->setText(m_msg + t); m_ui->shutdownText->setText(m_msg + t);
} }

7
src/gui/shutdownconfirmdlg.h
Unescape View File

@ -1,6 +1,6 @@
/* /*
* Bittorrent Client using Qt and libtorrent. * Bittorrent Client using Qt and libtorrent.
* Copyright (C) 2011 Christophe Dumez * Copyright (C) 2011 Christophe Dumez <chris@qbittorrent.org>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -24,8 +24,6 @@
* modify file(s), you may extend this exception to your version of the file(s), * modify file(s), you may extend this exception to your version of the file(s),
* but you are not obligated to do so. If you do not wish to do so, delete this * but you are not obligated to do so. If you do not wish to do so, delete this
* exception statement from your version. * exception statement from your version.
*
* Contact : chris@qbittorrent.org
*/ */
#ifndef SHUTDOWNCONFIRMDLG_H #ifndef SHUTDOWNCONFIRMDLG_H
@ -33,6 +31,7 @@
#include <QDialog> #include <QDialog>
#include <QTimer> #include <QTimer>
#include "base/types.h" #include "base/types.h"
namespace Ui namespace Ui
@ -63,7 +62,7 @@ private:
void updateText(); void updateText();
// Vars // Vars
Ui::confirmShutdownDlg *ui; Ui::confirmShutdownDlg *m_ui;
QTimer m_timer; QTimer m_timer;
int m_timeout; int m_timeout;
ShutdownDialogAction m_action; ShutdownDialogAction m_action;

49
src/gui/torrentcontentfiltermodel.cpp
Unescape View File

@ -1,6 +1,6 @@
/* /*
* Bittorrent Client using Qt4 and libtorrent. * Bittorrent Client using Qt and libtorrent.
* Copyright (C) 2006-2012 Christophe Dumez * Copyright (C) 2006-2012 Christophe Dumez <chris@qbittorrent.org>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -24,16 +24,16 @@
* modify file(s), you may extend this exception to your version of the file(s), * modify file(s), you may extend this exception to your version of the file(s),
* but you are not obligated to do so. If you do not wish to do so, delete this * but you are not obligated to do so. If you do not wish to do so, delete this
* exception statement from your version. * exception statement from your version.
*
* Contact : chris@qbittorrent.org
*/ */
#include "base/utils/string.h"
#include "torrentcontentfiltermodel.h" #include "torrentcontentfiltermodel.h"
#include "base/utils/string.h"
#include "torrentcontentmodel.h" #include "torrentcontentmodel.h"
TorrentContentFilterModel::TorrentContentFilterModel(QObject *parent): TorrentContentFilterModel::TorrentContentFilterModel(QObject *parent)
QSortFilterProxyModel(parent), m_model(new TorrentContentModel(this)) : QSortFilterProxyModel(parent)
, m_model(new TorrentContentModel(this))
{ {
connect(m_model, SIGNAL(filteredFilesChanged()), this, SIGNAL(filteredFilesChanged())); connect(m_model, SIGNAL(filteredFilesChanged()), this, SIGNAL(filteredFilesChanged()));
setSourceModel(m_model); setSourceModel(m_model);
@ -49,39 +49,43 @@ TorrentContentFilterModel::~TorrentContentFilterModel()
delete m_model; delete m_model;
} }
TorrentContentModel* TorrentContentFilterModel::model() const TorrentContentModel *TorrentContentFilterModel::model() const
{ {
return m_model; return m_model;
} }
TorrentContentModelItem::ItemType TorrentContentFilterModel::itemType(const QModelIndex& index) const TorrentContentModelItem::ItemType TorrentContentFilterModel::itemType(const QModelIndex &index) const
{ {
return m_model->itemType(mapToSource(index)); return m_model->itemType(mapToSource(index));
} }
int TorrentContentFilterModel::getFileIndex(const QModelIndex& index) const int TorrentContentFilterModel::getFileIndex(const QModelIndex &index) const
{ {
return m_model->getFileIndex(mapToSource(index)); return m_model->getFileIndex(mapToSource(index));
} }
QModelIndex TorrentContentFilterModel::parent(const QModelIndex& child) const QModelIndex TorrentContentFilterModel::parent(const QModelIndex &child) const
{ {
if (!child.isValid()) return QModelIndex(); if (!child.isValid()) return QModelIndex();
QModelIndex sourceParent = m_model->parent(mapToSource(child)); QModelIndex sourceParent = m_model->parent(mapToSource(child));
if (!sourceParent.isValid()) return QModelIndex(); if (!sourceParent.isValid()) return QModelIndex();
return mapFromSource(sourceParent); return mapFromSource(sourceParent);
} }
bool TorrentContentFilterModel::filterAcceptsRow(int source_row, const QModelIndex& source_parent) const bool TorrentContentFilterModel::filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const
{ {
if (m_model->itemType(m_model->index(source_row, 0, source_parent)) == TorrentContentModelItem::FolderType) { if (m_model->itemType(m_model->index(sourceRow, 0, sourceParent)) == TorrentContentModelItem::FolderType) {
// accept folders if they have at least one filtered item // accept folders if they have at least one filtered item
return hasFiltered(m_model->index(source_row, 0, source_parent)); return hasFiltered(m_model->index(sourceRow, 0, sourceParent));
} }
return QSortFilterProxyModel::filterAcceptsRow(source_row, source_parent);
return QSortFilterProxyModel::filterAcceptsRow(sourceRow, sourceParent);
} }
bool TorrentContentFilterModel::lessThan(const QModelIndex &left, const QModelIndex &right) const { bool TorrentContentFilterModel::lessThan(const QModelIndex &left, const QModelIndex &right) const
{
switch (sortColumn()) { switch (sortColumn()) {
case TorrentContentModelItem::COL_NAME: { case TorrentContentModelItem::COL_NAME: {
QString vL = left.data().toString(); QString vL = left.data().toString();
@ -91,7 +95,7 @@ bool TorrentContentFilterModel::lessThan(const QModelIndex &left, const QModelIn
if (leftType == rightType) if (leftType == rightType)
return Utils::String::naturalCompareCaseInsensitive(vL, vR); return Utils::String::naturalCompareCaseInsensitive(vL, vR);
else if (leftType == TorrentContentModelItem::FolderType && sortOrder() == Qt::AscendingOrder) else if ((leftType == TorrentContentModelItem::FolderType) && (sortOrder() == Qt::AscendingOrder))
return true; return true;
else else
return false; return false;
@ -103,21 +107,22 @@ bool TorrentContentFilterModel::lessThan(const QModelIndex &left, const QModelIn
void TorrentContentFilterModel::selectAll() void TorrentContentFilterModel::selectAll()
{ {
for (int i=0; i<rowCount(); ++i) { for (int i = 0; i < rowCount(); ++i)
setData(index(i, 0), Qt::Checked, Qt::CheckStateRole); setData(index(i, 0), Qt::Checked, Qt::CheckStateRole);
}
emit dataChanged(index(0,0), index(rowCount(), columnCount())); emit dataChanged(index(0,0), index(rowCount(), columnCount()));
} }
void TorrentContentFilterModel::selectNone() void TorrentContentFilterModel::selectNone()
{ {
for (int i=0; i<rowCount(); ++i) { for (int i = 0; i < rowCount(); ++i)
setData(index(i, 0), Qt::Unchecked, Qt::CheckStateRole); setData(index(i, 0), Qt::Unchecked, Qt::CheckStateRole);
}
emit dataChanged(index(0,0), index(rowCount(), columnCount())); emit dataChanged(index(0,0), index(rowCount(), columnCount()));
} }
bool TorrentContentFilterModel::hasFiltered(const QModelIndex& folder) const { bool TorrentContentFilterModel::hasFiltered(const QModelIndex &folder) const
{
// this should be called only with folders // this should be called only with folders
// check if the folder name itself matches the filter string // check if the folder name itself matches the filter string
QString name = folder.data().toString(); QString name = folder.data().toString();

32
src/gui/torrentcontentfiltermodel.h
Unescape View File

@ -1,6 +1,6 @@
/* /*
* Bittorrent Client using Qt4 and libtorrent. * Bittorrent Client using Qt and libtorrent.
* Copyright (C) 2006-2012 Christophe Dumez * Copyright (C) 2006-2012 Christophe Dumez <chris@qbittorrent.org>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -24,44 +24,44 @@
* modify file(s), you may extend this exception to your version of the file(s), * modify file(s), you may extend this exception to your version of the file(s),
* but you are not obligated to do so. If you do not wish to do so, delete this * but you are not obligated to do so. If you do not wish to do so, delete this
* exception statement from your version. * exception statement from your version.
*
* Contact : chris@qbittorrent.org
*/ */
#ifndef TORRENTCONTENTFILTERMODEL_H #ifndef TORRENTCONTENTFILTERMODEL_H
#define TORRENTCONTENTFILTERMODEL_H #define TORRENTCONTENTFILTERMODEL_H
#include <QSortFilterProxyModel> #include <QSortFilterProxyModel>
#include "torrentcontentmodelitem.h" #include "torrentcontentmodelitem.h"
class TorrentContentModel; class TorrentContentModel;
class TorrentContentFilterModel: public QSortFilterProxyModel { class TorrentContentFilterModel: public QSortFilterProxyModel
{
Q_OBJECT Q_OBJECT
public: public:
TorrentContentFilterModel(QObject *parent = 0); TorrentContentFilterModel(QObject *parent = 0);
virtual ~TorrentContentFilterModel(); virtual ~TorrentContentFilterModel();
TorrentContentModel* model() const; TorrentContentModel *model() const;
TorrentContentModelItem::ItemType itemType(const QModelIndex& index) const; TorrentContentModelItem::ItemType itemType(const QModelIndex &index) const;
int getFileIndex(const QModelIndex& index) const; int getFileIndex(const QModelIndex &index) const;
virtual QModelIndex parent(const QModelIndex& child) const; virtual QModelIndex parent(const QModelIndex &child) const;
public slots:
void selectAll();
void selectNone();
signals: signals:
void filteredFilesChanged(); void filteredFilesChanged();
protected: protected:
virtual bool filterAcceptsRow(int source_row, const QModelIndex& source_parent) const; virtual bool filterAcceptsRow(int sourceRow, const QModelIndex &sourceParent) const;
virtual bool lessThan(const QModelIndex &left, const QModelIndex &right) const; virtual bool lessThan(const QModelIndex &left, const QModelIndex &right) const;
public slots:
void selectAll();
void selectNone();
private: private:
TorrentContentModel* m_model; TorrentContentModel *m_model;
bool hasFiltered(const QModelIndex& folder) const; bool hasFiltered(const QModelIndex &folder) const;
}; };
#endif // TORRENTCONTENTFILTERMODEL_H #endif // TORRENTCONTENTFILTERMODEL_H

18
src/gui/torrentcontenttreeview.cpp
Unescape View File

@ -1,6 +1,6 @@
/* /*
* Bittorrent Client using Qt4 and libtorrent. * Bittorrent Client using Qt and libtorrent.
* Copyright (C) 2014 Ivan Sorokin * Copyright (C) 2014 Ivan Sorokin <vanyacpp@gmail.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -24,20 +24,18 @@
* modify file(s), you may extend this exception to your version of the file(s), * modify file(s), you may extend this exception to your version of the file(s),
* but you are not obligated to do so. If you do not wish to do so, delete this * but you are not obligated to do so. If you do not wish to do so, delete this
* exception statement from your version. * exception statement from your version.
*
* Contact : vanyacpp@gmail.com
*/ */
#include "torrentcontenttreeview.h" #include "torrentcontenttreeview.h"
#include <QHeaderView>
#include <QKeyEvent> #include <QKeyEvent>
#include <QModelIndexList> #include <QModelIndexList>
#include <QTableView> #include <QTableView>
#include <QHeaderView>
#include "torrentcontentmodelitem.h" #include "torrentcontentmodelitem.h"
TorrentContentTreeView::TorrentContentTreeView(QWidget* parent) TorrentContentTreeView::TorrentContentTreeView(QWidget *parent)
: QTreeView(parent) : QTreeView(parent)
{ {
// This hack fixes reordering of first column with Qt5. // This hack fixes reordering of first column with Qt5.
@ -48,8 +46,9 @@ TorrentContentTreeView::TorrentContentTreeView(QWidget* parent)
unused.setVerticalHeader(new QHeaderView(Qt::Horizontal)); unused.setVerticalHeader(new QHeaderView(Qt::Horizontal));
} }
void TorrentContentTreeView::keyPressEvent(QKeyEvent *event) { void TorrentContentTreeView::keyPressEvent(QKeyEvent *event)
if (event->key() != Qt::Key_Space && event->key() != Qt::Key_Select) { {
if ((event->key() != Qt::Key_Space) && (event->key() != Qt::Key_Select)) {
QTreeView::keyPressEvent(event); QTreeView::keyPressEvent(event);
return; return;
} }
@ -76,7 +75,8 @@ void TorrentContentTreeView::keyPressEvent(QKeyEvent *event) {
} }
} }
QModelIndex TorrentContentTreeView::currentNameCell() { QModelIndex TorrentContentTreeView::currentNameCell()
{
QModelIndex current = currentIndex(); QModelIndex current = currentIndex();
if (!current.isValid()) { if (!current.isValid()) {
Q_ASSERT(false); Q_ASSERT(false);

11
src/gui/torrentcontenttreeview.h
Unescape View File

@ -1,6 +1,6 @@
/* /*
* Bittorrent Client using Qt4 and libtorrent. * Bittorrent Client using Qt and libtorrent.
* Copyright (C) 2014 Ivan Sorokin * Copyright (C) 2014 Ivan Sorokin <vanyacpp@gmail.com>
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -24,8 +24,6 @@
* modify file(s), you may extend this exception to your version of the file(s), * modify file(s), you may extend this exception to your version of the file(s),
* but you are not obligated to do so. If you do not wish to do so, delete this * but you are not obligated to do so. If you do not wish to do so, delete this
* exception statement from your version. * exception statement from your version.
*
* Contact : vanyacpp@gmail.com
*/ */
#ifndef TORRENTCONTENTTREEVIEW_H #ifndef TORRENTCONTENTTREEVIEW_H
@ -33,7 +31,8 @@
#include <QTreeView> #include <QTreeView>
class TorrentContentTreeView : public QTreeView { class TorrentContentTreeView: public QTreeView
{
Q_OBJECT Q_OBJECT
public: public:
@ -44,4 +43,4 @@ private:
QModelIndex currentNameCell(); QModelIndex currentNameCell();
}; };
#endif #endif // TORRENTCONTENTTREEVIEW_H

Write Preview
Loading…
Cancel
Save