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 #10318 from Chocobo1/ptr 

Convert to use private pointer for ui object
adaptive-webui-19844
Mike Tzou 6 years ago committed by GitHub
parent
bb041c0eca e5dca50025
commit
d7ea9a5f55
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
8 changed files with 88 additions and 57 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. 17
      src/app/stacktracedialog.h
  2. 35
      src/gui/aboutdialog.h
  3. 41
      src/gui/deletionconfirmationdialog.h
  4. 37
      src/gui/previewselectdialog.cpp
  5. 8
      src/gui/previewselectdialog.h
  6. 4
      src/gui/previewselectdialog.ui
  7. 1
      src/gui/transferlistwidget.cpp
  8. 2
      src/gui/transferlistwidget.h

17
src/app/stacktracedialog.h
Unescape View File

@ -30,21 +30,27 @@
#ifndef STACKTRACEDIALOG_H #ifndef STACKTRACEDIALOG_H
#define STACKTRACEDIALOG_H #define STACKTRACEDIALOG_H
#include <QString>
#include <QDialog> #include <QDialog>
#include <QString>
#include "base/utils/misc.h" #include "base/utils/misc.h"
#include "ui_stacktracedialog.h" #include "ui_stacktracedialog.h"
class StacktraceDialog : public QDialog, private Ui::StacktraceDialog class StacktraceDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
StacktraceDialog(QWidget *parent = nullptr) StacktraceDialog(QWidget *parent = nullptr)
: QDialog(parent) : QDialog(parent)
, m_ui(new Ui::StacktraceDialog)
{
m_ui->setupUi(this);
}
~StacktraceDialog()
{ {
setupUi(this); delete m_ui;
} }
void setStacktraceString(const QString &sigName, const QString &trace) void setStacktraceString(const QString &sigName, const QString &trace)
@ -79,8 +85,11 @@ public:
, sigName , sigName
, trace); , trace);
errorText->setHtml(htmlStr); m_ui->errorText->setHtml(htmlStr);
} }
private:
Ui::StacktraceDialog *m_ui;
}; };
#endif // STACKTRACEDIALOG_H #endif // STACKTRACEDIALOG_H

35
src/gui/aboutdialog.h
Unescape View File

@ -36,21 +36,22 @@
#include "ui_aboutdialog.h" #include "ui_aboutdialog.h"
#include "utils.h" #include "utils.h"
class AboutDialog : public QDialog, private Ui::AboutDialog class AboutDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
AboutDialog(QWidget *parent) AboutDialog(QWidget *parent)
: QDialog(parent) : QDialog(parent)
, m_ui(new Ui::AboutDialog)
{ {
setupUi(this); m_ui->setupUi(this);
setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_DeleteOnClose);
// Title // Title
labelName->setText(QString("<b><h2>qBittorrent " QBT_VERSION " (%1-bit)</h2></b>").arg(QT_POINTER_SIZE * 8)); m_ui->labelName->setText(QString("<b><h2>qBittorrent " QBT_VERSION " (%1-bit)</h2></b>").arg(QT_POINTER_SIZE * 8));
logo->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/skin/qbittorrent-tray.svg", this, 32)); m_ui->logo->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/skin/qbittorrent-tray.svg", this, 32));
// About // About
QString aboutText = QString( QString aboutText = QString(
@ -68,40 +69,48 @@ public:
, tr("Home Page:") , tr("Home Page:")
, tr("Forum:") , tr("Forum:")
, tr("Bug Tracker:")); , tr("Bug Tracker:"));
labelAbout->setText(aboutText); m_ui->labelAbout->setText(aboutText);
labelMascot->setPixmap(Utils::Gui::scaledPixmap(":/icons/skin/mascot.png", this)); m_ui->labelMascot->setPixmap(Utils::Gui::scaledPixmap(":/icons/skin/mascot.png", this));
// Thanks // Thanks
QFile thanksfile(":/thanks.html"); QFile thanksfile(":/thanks.html");
if (thanksfile.open(QIODevice::ReadOnly | QIODevice::Text)) { if (thanksfile.open(QIODevice::ReadOnly | QIODevice::Text)) {
textBrowserThanks->setHtml(QString::fromUtf8(thanksfile.readAll().constData())); m_ui->textBrowserThanks->setHtml(QString::fromUtf8(thanksfile.readAll().constData()));
thanksfile.close(); thanksfile.close();
} }
// Translation // Translation
QFile translatorsfile(":/translators.html"); QFile translatorsfile(":/translators.html");
if (translatorsfile.open(QIODevice::ReadOnly | QIODevice::Text)) { if (translatorsfile.open(QIODevice::ReadOnly | QIODevice::Text)) {
textBrowserTranslation->setHtml(QString::fromUtf8(translatorsfile.readAll().constData())); m_ui->textBrowserTranslation->setHtml(QString::fromUtf8(translatorsfile.readAll().constData()));
translatorsfile.close(); translatorsfile.close();
} }
// License // License
QFile licensefile(":/gpl.html"); QFile licensefile(":/gpl.html");
if (licensefile.open(QIODevice::ReadOnly | QIODevice::Text)) { if (licensefile.open(QIODevice::ReadOnly | QIODevice::Text)) {
textBrowserLicense->setHtml(QString::fromUtf8(licensefile.readAll().constData())); m_ui->textBrowserLicense->setHtml(QString::fromUtf8(licensefile.readAll().constData()));
licensefile.close(); licensefile.close();
} }
// Libraries // Libraries
labelQtVer->setText(QT_VERSION_STR); m_ui->labelQtVer->setText(QT_VERSION_STR);
labelLibtVer->setText(Utils::Misc::libtorrentVersionString()); m_ui->labelLibtVer->setText(Utils::Misc::libtorrentVersionString());
labelBoostVer->setText(Utils::Misc::boostVersionString()); m_ui->labelBoostVer->setText(Utils::Misc::boostVersionString());
labelOpensslVer->setText(Utils::Misc::opensslVersionString()); m_ui->labelOpensslVer->setText(Utils::Misc::opensslVersionString());
Utils::Gui::resize(this); Utils::Gui::resize(this);
show(); show();
} }
~AboutDialog()
{
delete m_ui;
}
private:
Ui::AboutDialog *m_ui;
}; };
#endif // ABOUTDIALOG_H #endif // ABOUTDIALOG_H

41
src/gui/deletionconfirmationdialog.h
Unescape View File

@ -33,42 +33,46 @@
#include <QPushButton> #include <QPushButton>
#include "base/preferences.h" #include "base/preferences.h"
#include "base/utils/misc.h"
#include "base/utils/string.h"
#include "guiiconprovider.h" #include "guiiconprovider.h"
#include "ui_deletionconfirmationdialog.h" #include "ui_deletionconfirmationdialog.h"
#include "utils.h" #include "utils.h"
class DeletionConfirmationDialog : public QDialog, private Ui::DeletionConfirmationDialog class DeletionConfirmationDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT
public: public:
DeletionConfirmationDialog(QWidget *parent, const int &size, const QString &name, bool defaultDeleteFiles) DeletionConfirmationDialog(QWidget *parent, const int &size, const QString &name, bool defaultDeleteFiles)
: QDialog(parent) : QDialog(parent)
, m_ui(new Ui::DeletionConfirmationDialog)
{ {
setupUi(this); m_ui->setupUi(this);
if (size == 1) if (size == 1)
label->setText(tr("Are you sure you want to delete '%1' from the transfer list?", "Are you sure you want to delete 'ubuntu-linux-iso' from the transfer list?").arg(name.toHtmlEscaped())); m_ui->label->setText(tr("Are you sure you want to delete '%1' from the transfer list?", "Are you sure you want to delete 'ubuntu-linux-iso' from the transfer list?").arg(name.toHtmlEscaped()));
else else
label->setText(tr("Are you sure you want to delete these %1 torrents from the transfer list?", "Are you sure you want to delete these 5 torrents from the transfer list?").arg(QString::number(size))); m_ui->label->setText(tr("Are you sure you want to delete these %1 torrents from the transfer list?", "Are you sure you want to delete these 5 torrents from the transfer list?").arg(QString::number(size)));
// Icons // Icons
const QSize iconSize = Utils::Gui::largeIconSize(); const QSize iconSize = Utils::Gui::largeIconSize();
labelWarning->setPixmap(GuiIconProvider::instance()->getIcon("dialog-warning").pixmap(iconSize)); m_ui->labelWarning->setPixmap(GuiIconProvider::instance()->getIcon("dialog-warning").pixmap(iconSize));
labelWarning->setFixedWidth(iconSize.width()); m_ui->labelWarning->setFixedWidth(iconSize.width());
rememberBtn->setIcon(GuiIconProvider::instance()->getIcon("object-locked")); m_ui->rememberBtn->setIcon(GuiIconProvider::instance()->getIcon("object-locked"));
rememberBtn->setIconSize(Utils::Gui::mediumIconSize()); m_ui->rememberBtn->setIconSize(Utils::Gui::mediumIconSize());
checkPermDelete->setChecked(defaultDeleteFiles || Preferences::instance()->deleteTorrentFilesAsDefault()); m_ui->checkPermDelete->setChecked(defaultDeleteFiles || Preferences::instance()->deleteTorrentFilesAsDefault());
connect(checkPermDelete, &QCheckBox::clicked, this, &DeletionConfirmationDialog::updateRememberButtonState); connect(m_ui->checkPermDelete, &QCheckBox::clicked, this, &DeletionConfirmationDialog::updateRememberButtonState);
buttonBox->button(QDialogButtonBox::Cancel)->setFocus(); m_ui->buttonBox->button(QDialogButtonBox::Cancel)->setFocus();
Utils::Gui::resize(this); Utils::Gui::resize(this);
} }
~DeletionConfirmationDialog()
{
delete m_ui;
}
bool shouldDeleteLocalFiles() const bool shouldDeleteLocalFiles() const
{ {
return checkPermDelete->isChecked(); return m_ui->checkPermDelete->isChecked();
} }
static bool askForDeletionConfirmation(QWidget *parent, bool &deleteLocalFiles, const int &size, const QString &name) static bool askForDeletionConfirmation(QWidget *parent, bool &deleteLocalFiles, const int &size, const QString &name)
@ -84,14 +88,17 @@ public:
private slots: private slots:
void updateRememberButtonState() void updateRememberButtonState()
{ {
rememberBtn->setEnabled(checkPermDelete->isChecked() != Preferences::instance()->deleteTorrentFilesAsDefault()); m_ui->rememberBtn->setEnabled(m_ui->checkPermDelete->isChecked() != Preferences::instance()->deleteTorrentFilesAsDefault());
} }
void on_rememberBtn_clicked() void on_rememberBtn_clicked()
{ {
Preferences::instance()->setDeleteTorrentFilesAsDefault(checkPermDelete->isChecked()); Preferences::instance()->setDeleteTorrentFilesAsDefault(m_ui->checkPermDelete->isChecked());
rememberBtn->setEnabled(false); m_ui->rememberBtn->setEnabled(false);
} }
private:
Ui::DeletionConfirmationDialog *m_ui;
}; };
#endif // DELETIONCONFIRMATIONDIALOG_H #endif // DELETIONCONFIRMATIONDIALOG_H

37
src/gui/previewselectdialog.cpp
Unescape View File

@ -40,22 +40,24 @@
#include "base/utils/fs.h" #include "base/utils/fs.h"
#include "base/utils/misc.h" #include "base/utils/misc.h"
#include "previewlistdelegate.h" #include "previewlistdelegate.h"
#include "ui_previewselectdialog.h"
#include "utils.h" #include "utils.h"
#define SETTINGS_KEY(name) "PreviewSelectDialog/" name #define SETTINGS_KEY(name) "PreviewSelectDialog/" name
PreviewSelectDialog::PreviewSelectDialog(QWidget *parent, BitTorrent::TorrentHandle *const torrent) PreviewSelectDialog::PreviewSelectDialog(QWidget *parent, BitTorrent::TorrentHandle *const torrent)
: QDialog(parent) : QDialog(parent)
, m_ui(new Ui::PreviewSelectDialog)
, m_torrent(torrent) , m_torrent(torrent)
, m_storeDialogSize(SETTINGS_KEY("Dimension")) , m_storeDialogSize(SETTINGS_KEY("Dimension"))
, m_storeTreeHeaderState(SETTINGS_KEY("HeaderState")) , m_storeTreeHeaderState(SETTINGS_KEY("HeaderState"))
{ {
setupUi(this); m_ui->setupUi(this);
setAttribute(Qt::WA_DeleteOnClose); setAttribute(Qt::WA_DeleteOnClose);
buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Preview")); m_ui->buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Preview"));
connect(buttonBox, &QDialogButtonBox::accepted, this, &PreviewSelectDialog::previewButtonClicked); connect(m_ui->buttonBox, &QDialogButtonBox::accepted, this, &PreviewSelectDialog::previewButtonClicked);
connect(buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject); connect(m_ui->buttonBox, &QDialogButtonBox::rejected, this, &QDialog::reject);
Preferences *const pref = Preferences::instance(); Preferences *const pref = Preferences::instance();
// Preview list // Preview list
@ -67,15 +69,15 @@ PreviewSelectDialog::PreviewSelectDialog(QWidget *parent, BitTorrent::TorrentHan
// 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(m_ui->previewList->header());
previewList->header()->setParent(previewList); m_ui->previewList->header()->setParent(m_ui->previewList);
unused.setVerticalHeader(new QHeaderView(Qt::Horizontal)); unused.setVerticalHeader(new QHeaderView(Qt::Horizontal));
previewList->setModel(m_previewListModel); m_ui->previewList->setModel(m_previewListModel);
previewList->hideColumn(FILE_INDEX); m_ui->previewList->hideColumn(FILE_INDEX);
m_listDelegate = new PreviewListDelegate(this); m_listDelegate = new PreviewListDelegate(this);
previewList->setItemDelegate(m_listDelegate); m_ui->previewList->setItemDelegate(m_listDelegate);
previewList->setAlternatingRowColors(pref->useAlternatingRowColors()); m_ui->previewList->setAlternatingRowColors(pref->useAlternatingRowColors());
// Fill list in // Fill list in
QVector<qreal> fp = torrent->filesProgress(); QVector<qreal> fp = torrent->filesProgress();
int nbFiles = torrent->filesCount(); int nbFiles = torrent->filesCount();
@ -96,8 +98,8 @@ PreviewSelectDialog::PreviewSelectDialog(QWidget *parent, BitTorrent::TorrentHan
connect(this, SIGNAL(readyToPreviewFile(QString)), parent, SLOT(previewFile(QString))); connect(this, SIGNAL(readyToPreviewFile(QString)), parent, SLOT(previewFile(QString)));
m_previewListModel->sort(NAME); m_previewListModel->sort(NAME);
previewList->header()->setSortIndicator(0, Qt::AscendingOrder); m_ui->previewList->header()->setSortIndicator(0, Qt::AscendingOrder);
previewList->selectionModel()->select(m_previewListModel->index(0, NAME), QItemSelectionModel::Select | QItemSelectionModel::Rows); m_ui->previewList->selectionModel()->select(m_previewListModel->index(0, NAME), QItemSelectionModel::Select | QItemSelectionModel::Rows);
// Restore dialog state // Restore dialog state
loadWindowState(); loadWindowState();
@ -119,11 +121,12 @@ PreviewSelectDialog::~PreviewSelectDialog()
delete m_previewListModel; delete m_previewListModel;
delete m_listDelegate; delete m_listDelegate;
delete m_ui;
} }
void PreviewSelectDialog::previewButtonClicked() void PreviewSelectDialog::previewButtonClicked()
{ {
QModelIndexList selectedIndexes = previewList->selectionModel()->selectedRows(FILE_INDEX); QModelIndexList selectedIndexes = m_ui->previewList->selectionModel()->selectedRows(FILE_INDEX);
if (selectedIndexes.isEmpty()) return; if (selectedIndexes.isEmpty()) return;
// Flush data // Flush data
@ -146,7 +149,7 @@ void PreviewSelectDialog::saveWindowState()
// Persist dialog size // Persist dialog size
m_storeDialogSize = size(); m_storeDialogSize = size();
// Persist TreeView Header state // Persist TreeView Header state
m_storeTreeHeaderState = previewList->header()->saveState(); m_storeTreeHeaderState = m_ui->previewList->header()->saveState();
} }
void PreviewSelectDialog::loadWindowState() void PreviewSelectDialog::loadWindowState()
@ -156,7 +159,7 @@ void PreviewSelectDialog::loadWindowState()
// Restore TreeView Header state // Restore TreeView Header state
if (!m_storeTreeHeaderState.value().isEmpty()) { if (!m_storeTreeHeaderState.value().isEmpty()) {
m_headerStateInitialized = previewList->header()->restoreState(m_storeTreeHeaderState); m_headerStateInitialized = m_ui->previewList->header()->restoreState(m_storeTreeHeaderState);
} }
} }
@ -167,8 +170,8 @@ void PreviewSelectDialog::showEvent(QShowEvent *event)
// Default size, have to be called after show(), because width is needed // Default size, have to be called after show(), because width is needed
// Set Name column width to 60% of TreeView // Set Name column width to 60% of TreeView
if (!m_headerStateInitialized) { if (!m_headerStateInitialized) {
int nameSize = (previewList->size().width() * 0.6); int nameSize = (m_ui->previewList->size().width() * 0.6);
previewList->header()->resizeSection(0, nameSize); m_ui->previewList->header()->resizeSection(0, nameSize);
m_headerStateInitialized = true; m_headerStateInitialized = true;
} }
} }

8
src/gui/previewselectdialog.h
Unescape View File

@ -32,7 +32,6 @@
#include <QDialog> #include <QDialog>
#include "base/settingvalue.h" #include "base/settingvalue.h"
#include "ui_previewselectdialog.h"
class QStandardItemModel; class QStandardItemModel;
@ -40,9 +39,13 @@ namespace BitTorrent
{ {
class TorrentHandle; class TorrentHandle;
} }
namespace Ui
{
class PreviewSelectDialog;
}
class PreviewListDelegate; class PreviewListDelegate;
class PreviewSelectDialog : public QDialog, private Ui::preview class PreviewSelectDialog : public QDialog
{ {
Q_OBJECT Q_OBJECT
@ -73,6 +76,7 @@ private:
void loadWindowState(); void loadWindowState();
void saveWindowState(); void saveWindowState();
Ui::PreviewSelectDialog *m_ui;
QStandardItemModel *m_previewListModel; QStandardItemModel *m_previewListModel;
PreviewListDelegate *m_listDelegate; PreviewListDelegate *m_listDelegate;
BitTorrent::TorrentHandle *const m_torrent; BitTorrent::TorrentHandle *const m_torrent;

4
src/gui/previewselectdialog.ui
Unescape View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<ui version="4.0"> <ui version="4.0">
<class>preview</class> <class>PreviewSelectDialog</class>
<widget class="QDialog" name="preview"> <widget class="QDialog" name="PreviewSelectDialog">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>0</x> <x>0</x>

1
src/gui/transferlistwidget.cpp
Unescape View File

@ -31,6 +31,7 @@
#include <QClipboard> #include <QClipboard>
#include <QDebug> #include <QDebug>
#include <QFileDialog> #include <QFileDialog>
#include <QHeaderView>
#include <QMenu> #include <QMenu>
#include <QMessageBox> #include <QMessageBox>
#include <QRegExp> #include <QRegExp>

2
src/gui/transferlistwidget.h
Unescape View File

@ -38,8 +38,6 @@ namespace BitTorrent
} }
class QShortcut; class QShortcut;
class QSortFilterProxyModel;
class QStandardItemModel;
class MainWindow; class MainWindow;
class TransferListDelegate; class TransferListDelegate;

Write Preview
Loading…
Cancel
Save