#include "base/unicodestrings.h"
-class about : public QDialog, private Ui::AboutDlg{
- Q_OBJECT
+class about: public QDialog, private Ui::AboutDlg
+{
+ Q_OBJECT
- public:
- ~about() {
- qDebug("Deleting about dlg");
- }
+public:
+ about(QWidget *parent) : QDialog(parent)
+ {
+ setupUi(this);
+ setAttribute(Qt::WA_DeleteOnClose);
+
+ // Title
+ lb_name->setText("qBittorrent " VERSION "
");
+
+ // About
+ QString aboutText = QString(
+ ""
+ "%1\n\n"
+ "%2\n\n"
+ "
"
+ "")
+ .arg(tr("An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar."))
+ .arg(tr("Copyright %1 2006-2016 The qBittorrent project").arg(QString::fromUtf8(C_COPYRIGHT)))
+ .arg(tr("Home Page:"))
+ .arg(tr("Forum:"))
+ .arg(tr("Bug Tracker:"));
+ lb_about->setText(aboutText);
+
+ // Thanks
+ QFile thanksfile(":/thanks.html");
+ if (thanksfile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+ te_thanks->setHtml(QString::fromUtf8(thanksfile.readAll().constData()));
+ thanksfile.close();
+ }
+
+ // Translation
+ QFile translatorsfile(":/translators.html");
+ if (translatorsfile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+ te_translation->setHtml(QString::fromUtf8(translatorsfile.readAll().constData()));
+ translatorsfile.close();
+ }
+
+ // License
+ QFile licensefile(":/gpl.html");
+ if (licensefile.open(QIODevice::ReadOnly | QIODevice::Text)) {
+ te_license->setHtml(QString::fromUtf8(licensefile.readAll().constData()));
+ licensefile.close();
+ }
+
+ // Libraries
+ label_11->setText(QT_VERSION_STR);
+ label_12->setText(LIBTORRENT_VERSION);
+ label_13->setText(QString::number(BOOST_VERSION / 100000) + "." + QString::number((BOOST_VERSION / 100) % 1000) + "." + QString::number(BOOST_VERSION % 100));
- about(QWidget *parent): QDialog(parent) {
- setupUi(this);
- setAttribute(Qt::WA_DeleteOnClose);
- // About
- QString aboutText =
- QString::fromUtf8("") +
- tr("An advanced BitTorrent client programmed in C++, based on Qt toolkit and libtorrent-rasterbar.") +
- QString::fromUtf8("
") +
- trUtf8("Copyright %1 2006-2016 The qBittorrent project").arg(QString::fromUtf8(C_COPYRIGHT)) +
- QString::fromUtf8("
") +
- tr("Home Page: ") +
- QString::fromUtf8("http://www.qbittorrent.org
") +
- tr("Bug Tracker: ") +
- QString::fromUtf8("http://bugs.qbittorrent.org
") +
- tr("Forum: ") +
- QString::fromUtf8(
- "http://forum.qbittorrent.org
") +
- tr("IRC: #qbittorrent on Freenode") +
- QString::fromUtf8(
- "
");
- lb_about->setText(aboutText);
- // Set icons
- logo->setPixmap(QPixmap(QString::fromUtf8(":/icons/skin/qbittorrent22.png")));
- //Title
- lb_name->setText(QString::fromUtf8("qBittorrent")+QString::fromUtf8(" " VERSION"
"));
- // Thanks
- QFile thanksfile(":/thanks.html");
- if (thanksfile.open(QIODevice::ReadOnly | QIODevice::Text)) {
- te_thanks->setHtml(QString::fromUtf8(thanksfile.readAll().constData()));
- thanksfile.close();
- }
- // Translation
- QFile translatorsfile(":/translators.html");
- if (translatorsfile.open(QIODevice::ReadOnly | QIODevice::Text)) {
- te_translation->setHtml(QString::fromUtf8(translatorsfile.readAll().constData()));
- translatorsfile.close();
- }
- // License
- QFile licensefile(":/gpl.html");
- if (licensefile.open(QIODevice::ReadOnly | QIODevice::Text)) {
- te_license->setHtml(QString::fromUtf8(licensefile.readAll().constData()));
- licensefile.close();
- }
- // Libraries
- label_11->setText(QT_VERSION_STR);
- label_12->setText(LIBTORRENT_VERSION);
- label_13->setText(QString::number(BOOST_VERSION / 100000) + "." + QString::number((BOOST_VERSION / 100) % 1000) + "." + QString::number(BOOST_VERSION % 100));
- show();
+ show();
}
};
diff --git a/src/gui/addnewtorrentdialog.cpp b/src/gui/addnewtorrentdialog.cpp
index 66098cd50..cb95fab2c 100644
--- a/src/gui/addnewtorrentdialog.cpp
+++ b/src/gui/addnewtorrentdialog.cpp
@@ -266,28 +266,28 @@ void AddNewTorrentDialog::showEvent(QShowEvent *event)
void AddNewTorrentDialog::showAdvancedSettings(bool show)
{
+ const int minimumW = minimumWidth();
+ setMinimumWidth(width()); // to remain the same width
if (show) {
ui->adv_button->setText(QString::fromUtf8(C_UP));
ui->settings_group->setVisible(true);
- ui->info_group->setVisible(true);
+ ui->infoGroup->setVisible(true);
if (m_hasMetadata && (m_torrentInfo.filesCount() > 1)) {
ui->content_tree->setVisible(true);
- setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Preferred);
}
else {
ui->content_tree->setVisible(false);
- setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
}
static_cast(layout())->insertWidget(layout()->indexOf(ui->never_show_cb) + 1, ui->adv_button);
}
else {
ui->adv_button->setText(QString::fromUtf8(C_DOWN));
ui->settings_group->setVisible(false);
- ui->info_group->setVisible(false);
+ ui->infoGroup->setVisible(false);
ui->buttonsHLayout->insertWidget(0, layout()->takeAt(layout()->indexOf(ui->never_show_cb) + 1)->widget());
- setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Fixed);
}
- relayout();
+ adjustSize();
+ setMinimumWidth(minimumW);
}
void AddNewTorrentDialog::saveSavePathHistory() const
@@ -348,7 +348,7 @@ void AddNewTorrentDialog::updateDiskSpaceLabel()
QString size_string = torrent_size ? Utils::Misc::friendlyUnit(torrent_size) : QString(tr("Not Available", "This size is unavailable."));
size_string += " (";
- size_string += tr("Free disk space: %1").arg(Utils::Misc::friendlyUnit(Utils::Fs::freeDiskSpaceOnPath(
+ size_string += tr("Free space on disk: %1").arg(Utils::Misc::friendlyUnit(Utils::Fs::freeDiskSpaceOnPath(
ui->save_path_combo->itemData(
ui->save_path_combo->currentIndex()).toString())));
size_string += ")";
@@ -360,7 +360,6 @@ void AddNewTorrentDialog::onSavePathChanged(int index)
// Toggle default save path setting checkbox visibility
ui->default_save_path_cb->setChecked(false);
ui->default_save_path_cb->setVisible(QDir(ui->save_path_combo->itemData(ui->save_path_combo->currentIndex()).toString()) != QDir(Preferences::instance()->getSavePath()));
- relayout();
// Remember index
m_oldIndex = index;
@@ -417,15 +416,6 @@ void AddNewTorrentDialog::browseButton_clicked()
connect(ui->save_path_combo, SIGNAL(currentIndexChanged(int)), SLOT(onSavePathChanged(int)));
}
-void AddNewTorrentDialog::relayout()
-{
- qApp->processEvents();
- int min_width = minimumWidth();
- setMinimumWidth(width());
- adjustSize();
- setMinimumWidth(min_width);
-}
-
void AddNewTorrentDialog::renameSelectedFile()
{
const QModelIndexList selectedIndexes = ui->content_tree->selectionModel()->selectedRows(0);
@@ -689,7 +679,7 @@ void AddNewTorrentDialog::setupTreeview()
// Set torrent information
ui->comment_lbl->setText(Utils::Misc::parseHtmlLinks(m_torrentInfo.comment()));
- ui->date_lbl->setText(!m_torrentInfo.creationDate().isNull() ? m_torrentInfo.creationDate().toString(Qt::DefaultLocaleLongDate) : tr("Not available"));
+ ui->date_lbl->setText(!m_torrentInfo.creationDate().isNull() ? m_torrentInfo.creationDate().toString(Qt::DefaultLocaleShortDate) : tr("Not available"));
// Prepare content tree
if (m_torrentInfo.filesCount() > 1) {
diff --git a/src/gui/addnewtorrentdialog.h b/src/gui/addnewtorrentdialog.h
index 8b1cd2576..5de761b87 100644
--- a/src/gui/addnewtorrentdialog.h
+++ b/src/gui/addnewtorrentdialog.h
@@ -68,7 +68,6 @@ private slots:
void displayContentTreeMenu(const QPoint&);
void updateDiskSpaceLabel();
void onSavePathChanged(int);
- void relayout();
void renameSelectedFile();
void setdialogPosition();
void updateMetadata(const BitTorrent::TorrentInfo &info);
diff --git a/src/gui/addnewtorrentdialog.ui b/src/gui/addnewtorrentdialog.ui
index f7c46efcb..ce727e72a 100644
--- a/src/gui/addnewtorrentdialog.ui
+++ b/src/gui/addnewtorrentdialog.ui
@@ -10,23 +10,11 @@
590