diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 864a808a2..51d380aa4 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -415,7 +415,7 @@ MainWindow::MainWindow(QWidget *parent) hide(); if (!pref->minimizeToTrayNotified()) { - showNotificationBaloon(tr("qBittorrent is minimized to tray"), tr("This behavior can be changed in the settings. You won't be reminded again.")); + showNotificationBalloon(tr("qBittorrent is minimized to tray"), tr("This behavior can be changed in the settings. You won't be reminded again.")); pref->setMinimizeToTrayNotified(true); } } @@ -857,26 +857,26 @@ void MainWindow::balloonClicked() void MainWindow::addTorrentFailed(const QString &error) const { - showNotificationBaloon(tr("Error"), tr("Failed to add torrent: %1").arg(error)); + showNotificationBalloon(tr("Error"), tr("Failed to add torrent: %1").arg(error)); } // called when a torrent was added void MainWindow::torrentNew(BitTorrent::Torrent *const torrent) const { if (isTorrentAddedNotificationsEnabled()) - showNotificationBaloon(tr("Torrent added"), tr("'%1' was added.", "e.g: xxx.avi was added.").arg(torrent->name())); + showNotificationBalloon(tr("Torrent added"), tr("'%1' was added.", "e.g: xxx.avi was added.").arg(torrent->name())); } // called when a torrent has finished void MainWindow::finishedTorrent(BitTorrent::Torrent *const torrent) const { - showNotificationBaloon(tr("Download completed"), tr("'%1' has finished downloading.", "e.g: xxx.avi has finished downloading.").arg(torrent->name())); + showNotificationBalloon(tr("Download completed"), tr("'%1' has finished downloading.", "e.g: xxx.avi has finished downloading.").arg(torrent->name())); } // Notification when disk is full void MainWindow::fullDiskError(BitTorrent::Torrent *const torrent, const QString &msg) const { - showNotificationBaloon(tr("I/O Error", "i.e: Input/Output Error") + showNotificationBalloon(tr("I/O Error", "i.e: Input/Output Error") , tr("An I/O error occurred for torrent '%1'.\n Reason: %2" , "e.g: An error occurred for torrent 'xxx.avi'.\n Reason: disk is full.").arg(torrent->name(), msg)); } @@ -993,7 +993,7 @@ void MainWindow::askRecursiveTorrentDownloadConfirmation(BitTorrent::Torrent *co void MainWindow::handleDownloadFromUrlFailure(const QString &url, const QString &reason) const { // Display a message box - showNotificationBaloon(tr("URL download error") + showNotificationBalloon(tr("URL download error") , tr("Couldn't download file at URL '%1', reason: %2.").arg(url, reason)); } @@ -1203,7 +1203,7 @@ void MainWindow::closeEvent(QCloseEvent *e) QTimer::singleShot(0, this, &QWidget::hide); if (!pref->closeToTrayNotified()) { - showNotificationBaloon(tr("qBittorrent is closed to tray"), tr("This behavior can be changed in the settings. You won't be reminded again.")); + showNotificationBalloon(tr("qBittorrent is closed to tray"), tr("This behavior can be changed in the settings. You won't be reminded again.")); pref->setCloseToTrayNotified(true); } return; @@ -1303,7 +1303,7 @@ bool MainWindow::event(QEvent *e) QTimer::singleShot(0, this, &QWidget::hide); if (!pref->minimizeToTrayNotified()) { - showNotificationBaloon(tr("qBittorrent is minimized to tray"), tr("This behavior can be changed in the settings. You won't be reminded again.")); + showNotificationBalloon(tr("qBittorrent is minimized to tray"), tr("This behavior can be changed in the settings. You won't be reminded again.")); pref->setMinimizeToTrayNotified(true); } return true; @@ -1666,7 +1666,7 @@ void MainWindow::reloadTorrentStats(const QVector &torren } } -void MainWindow::showNotificationBaloon(const QString &title, const QString &msg) const +void MainWindow::showNotificationBalloon(const QString &title, const QString &msg) const { if (!isNotificationsEnabled()) return; diff --git a/src/gui/mainwindow.h b/src/gui/mainwindow.h index 12d56ed83..b0a962ccf 100644 --- a/src/gui/mainwindow.h +++ b/src/gui/mainwindow.h @@ -105,7 +105,7 @@ public: void activate(); void cleanup(); - void showNotificationBaloon(const QString &title, const QString &msg) const; + void showNotificationBalloon(const QString &title, const QString &msg) const; private slots: void showFilterContextMenu(const QPoint &); diff --git a/src/gui/optionsdialog.cpp b/src/gui/optionsdialog.cpp index ad5607dcb..ff64a6445 100644 --- a/src/gui/optionsdialog.cpp +++ b/src/gui/optionsdialog.cpp @@ -421,8 +421,8 @@ OptionsDialog::OptionsDialog(QWidget *parent) connect(m_ui->checkLimitTransportOverhead, &QAbstractButton::toggled, this, &ThisType::enableApplyButton); connect(m_ui->checkLimitLocalPeerRate, &QAbstractButton::toggled, this, &ThisType::enableApplyButton); // Bittorrent tab - connect(m_ui->checkMaxConnecs, &QAbstractButton::toggled, this, &ThisType::enableApplyButton); - connect(m_ui->checkMaxConnecsPerTorrent, &QAbstractButton::toggled, this, &ThisType::enableApplyButton); + connect(m_ui->checkMaxConnections, &QAbstractButton::toggled, this, &ThisType::enableApplyButton); + connect(m_ui->checkMaxConnectionsPerTorrent, &QAbstractButton::toggled, this, &ThisType::enableApplyButton); connect(m_ui->checkMaxUploads, &QAbstractButton::toggled, this, &ThisType::enableApplyButton); connect(m_ui->checkMaxUploadsPerTorrent, &QAbstractButton::toggled, this, &ThisType::enableApplyButton); connect(m_ui->spinMaxConnec, qSpinBoxValueChanged, this, &ThisType::enableApplyButton); @@ -446,7 +446,7 @@ OptionsDialog::OptionsDialog(QWidget *parent) connect(m_ui->comboProxyType, qComboBoxCurrentIndexChanged, this, &ThisType::enableApplyButton); connect(m_ui->textProxyIP, &QLineEdit::textChanged, this, &ThisType::enableApplyButton); connect(m_ui->spinProxyPort, qSpinBoxValueChanged, this, &ThisType::enableApplyButton); - connect(m_ui->checkProxyPeerConnecs, &QAbstractButton::toggled, this, &ThisType::enableApplyButton); + connect(m_ui->checkProxyPeerConnections, &QAbstractButton::toggled, this, &ThisType::enableApplyButton); connect(m_ui->isProxyOnlyForTorrents, &QAbstractButton::toggled, this, &ThisType::enableApplyButton); connect(m_ui->checkProxyAuth, &QGroupBox::toggled, this, &ThisType::enableApplyButton); connect(m_ui->textProxyUsername, &QLineEdit::textChanged, this, &ThisType::enableApplyButton); @@ -796,12 +796,12 @@ void OptionsDialog::saveOptions() proxyConfigManager->setProxyOnlyForTorrents(m_ui->isProxyOnlyForTorrents->isChecked()); proxyConfigManager->setProxyConfiguration(proxyConf); - session->setProxyPeerConnectionsEnabled(m_ui->checkProxyPeerConnecs->isChecked()); + session->setProxyPeerConnectionsEnabled(m_ui->checkProxyPeerConnections->isChecked()); // End Connection preferences // Bittorrent preferences - session->setMaxConnections(getMaxConnecs()); - session->setMaxConnectionsPerTorrent(getMaxConnecsPerTorrent()); + session->setMaxConnections(getMaxConnections()); + session->setMaxConnectionsPerTorrent(getMaxConnectionsPerTorrent()); session->setMaxUploads(getMaxUploads()); session->setMaxUploadsPerTorrent(getMaxUploadsPerTorrent()); session->setDHTEnabled(isDHTEnabled()); @@ -1076,28 +1076,28 @@ void OptionsDialog::loadOptions() if (intValue > 0) { // enable - m_ui->checkMaxConnecs->setChecked(true); + m_ui->checkMaxConnections->setChecked(true); m_ui->spinMaxConnec->setEnabled(true); m_ui->spinMaxConnec->setValue(intValue); } else { // disable - m_ui->checkMaxConnecs->setChecked(false); + m_ui->checkMaxConnections->setChecked(false); m_ui->spinMaxConnec->setEnabled(false); } intValue = session->maxConnectionsPerTorrent(); if (intValue > 0) { // enable - m_ui->checkMaxConnecsPerTorrent->setChecked(true); + m_ui->checkMaxConnectionsPerTorrent->setChecked(true); m_ui->spinMaxConnecPerTorrent->setEnabled(true); m_ui->spinMaxConnecPerTorrent->setValue(intValue); } else { // disable - m_ui->checkMaxConnecsPerTorrent->setChecked(false); + m_ui->checkMaxConnectionsPerTorrent->setChecked(false); m_ui->spinMaxConnecPerTorrent->setEnabled(false); } intValue = session->maxUploads(); @@ -1162,7 +1162,7 @@ void OptionsDialog::loadOptions() m_ui->textProxyUsername->setText(proxyConf.username); m_ui->textProxyPassword->setText(proxyConf.password); - m_ui->checkProxyPeerConnecs->setChecked(session->isProxyPeerConnectionsEnabled()); + m_ui->checkProxyPeerConnections->setChecked(session->isProxyPeerConnectionsEnabled()); m_ui->isProxyOnlyForTorrents->setChecked(proxyConfigManager->isProxyOnlyForTorrents()); enableProxy(m_ui->comboProxyType->currentIndex()); @@ -1382,17 +1382,17 @@ int OptionsDialog::getMaxSeedingMinutes() const } // Return max connections number -int OptionsDialog::getMaxConnecs() const +int OptionsDialog::getMaxConnections() const { - if (!m_ui->checkMaxConnecs->isChecked()) + if (!m_ui->checkMaxConnections->isChecked()) return -1; return m_ui->spinMaxConnec->value(); } -int OptionsDialog::getMaxConnecsPerTorrent() const +int OptionsDialog::getMaxConnectionsPerTorrent() const { - if (!m_ui->checkMaxConnecsPerTorrent->isChecked()) + if (!m_ui->checkMaxConnectionsPerTorrent->isChecked()) return -1; return m_ui->spinMaxConnecPerTorrent->value(); @@ -1498,7 +1498,7 @@ void OptionsDialog::enableProxy(const int index) m_ui->textProxyIP->setEnabled(true); m_ui->lblProxyPort->setEnabled(true); m_ui->spinProxyPort->setEnabled(true); - m_ui->checkProxyPeerConnecs->setEnabled(true); + m_ui->checkProxyPeerConnections->setEnabled(true); if (index >= 2) { // SOCKS5 or HTTP m_ui->checkProxyAuth->setEnabled(true); @@ -1518,7 +1518,7 @@ void OptionsDialog::enableProxy(const int index) m_ui->textProxyIP->setEnabled(false); m_ui->lblProxyPort->setEnabled(false); m_ui->spinProxyPort->setEnabled(false); - m_ui->checkProxyPeerConnecs->setEnabled(false); + m_ui->checkProxyPeerConnections->setEnabled(false); m_ui->isProxyOnlyForTorrents->setEnabled(false); m_ui->checkProxyAuth->setEnabled(false); } diff --git a/src/gui/optionsdialog.h b/src/gui/optionsdialog.h index 35a9280ce..d921bd380 100644 --- a/src/gui/optionsdialog.h +++ b/src/gui/optionsdialog.h @@ -144,8 +144,8 @@ private: int getPort() const; bool isUPnPEnabled() const; // Bittorrent options - int getMaxConnecs() const; - int getMaxConnecsPerTorrent() const; + int getMaxConnections() const; + int getMaxConnectionsPerTorrent() const; int getMaxUploads() const; int getMaxUploadsPerTorrent() const; bool isDHTEnabled() const; diff --git a/src/gui/optionsdialog.ui b/src/gui/optionsdialog.ui index a877c59b7..1ead64f3f 100644 --- a/src/gui/optionsdialog.ui +++ b/src/gui/optionsdialog.ui @@ -1525,7 +1525,7 @@ Manual: Various torrent properties (e.g. save path) must be assigned manually - + Maximum number of connections per torrent: @@ -1535,7 +1535,7 @@ Manual: Various torrent properties (e.g. save path) must be assigned manually - + Global maximum number of connections: @@ -1701,7 +1701,7 @@ Manual: Various torrent properties (e.g. save path) must be assigned manually - + false @@ -3502,9 +3502,9 @@ Use ';' to split multiple entries. Can use wildcard '*'. lineEditAutoRun scrollArea_3 randomButton - checkMaxConnecs + checkMaxConnections spinMaxConnec - checkMaxConnecsPerTorrent + checkMaxConnectionsPerTorrent spinMaxConnecPerTorrent checkMaxUploadsPerTorrent spinMaxUploadsPerTorrent @@ -3513,7 +3513,7 @@ Use ';' to split multiple entries. Can use wildcard '*'. comboProxyType textProxyIP spinProxyPort - checkProxyPeerConnecs + checkProxyPeerConnections isProxyOnlyForTorrents checkProxyAuth textProxyUsername @@ -3558,7 +3558,7 @@ Use ';' to split multiple entries. Can use wildcard '*'. - checkMaxConnecs + checkMaxConnections toggled(bool) spinMaxConnec setEnabled(bool) @@ -3574,7 +3574,7 @@ Use ';' to split multiple entries. Can use wildcard '*'. - checkMaxConnecsPerTorrent + checkMaxConnectionsPerTorrent toggled(bool) spinMaxConnecPerTorrent setEnabled(bool) diff --git a/src/gui/search/searchwidget.cpp b/src/gui/search/searchwidget.cpp index fda9e1763..5c0dcc5a1 100644 --- a/src/gui/search/searchwidget.cpp +++ b/src/gui/search/searchwidget.cpp @@ -304,7 +304,7 @@ void SearchWidget::on_searchButton_clicked() { if (!Utils::ForeignApps::pythonInfo().isValid()) { - m_mainWindow->showNotificationBaloon(tr("Search Engine"), tr("Please install Python to use the Search Engine.")); + m_mainWindow->showNotificationBalloon(tr("Search Engine"), tr("Please install Python to use the Search Engine.")); return; } @@ -373,9 +373,9 @@ void SearchWidget::tabStatusChanged(QWidget *tab) if (m_mainWindow->isNotificationsEnabled() && (m_mainWindow->currentTabWidget() != this)) { if (m_activeSearchTab->status() == SearchJobWidget::Status::Error) - m_mainWindow->showNotificationBaloon(tr("Search Engine"), tr("Search has failed")); + m_mainWindow->showNotificationBalloon(tr("Search Engine"), tr("Search has failed")); else - m_mainWindow->showNotificationBaloon(tr("Search Engine"), tr("Search has finished")); + m_mainWindow->showNotificationBalloon(tr("Search Engine"), tr("Search has finished")); } m_activeSearchTab = nullptr; diff --git a/src/webui/www/private/views/preferences.html b/src/webui/www/private/views/preferences.html index 380d3c11b..1b4fd1cf9 100644 --- a/src/webui/www/private/views/preferences.html +++ b/src/webui/www/private/views/preferences.html @@ -400,8 +400,8 @@
- - + +
QBT_TR(From:)QBT_TR[CONTEXT=OptionsDialog] @@ -1457,7 +1457,7 @@ // Speed tab const updateSchedulingEnabled = function() { - const isLimitSchedulingEnabled = $('limit_sheduling_checkbox').getProperty('checked'); + const isLimitSchedulingEnabled = $('limitSchedulingCheckbox').getProperty('checked'); $('schedule_from_hour').setProperty('disabled', !isLimitSchedulingEnabled); $('schedule_from_min').setProperty('disabled', !isLimitSchedulingEnabled); $('schedule_to_hour').setProperty('disabled', !isLimitSchedulingEnabled); @@ -1797,7 +1797,7 @@ $('limit_lan_peers_checkbox').setProperty('checked', pref.limit_lan_peers); // Scheduling - $('limit_sheduling_checkbox').setProperty('checked', pref.scheduler_enabled); + $('limitSchedulingCheckbox').setProperty('checked', pref.scheduler_enabled); $('schedule_from_hour').setProperty('value', time_padding(pref.schedule_from_hour)); $('schedule_from_min').setProperty('value', time_padding(pref.schedule_from_min)); $('schedule_to_hour').setProperty('value', time_padding(pref.schedule_to_hour)); @@ -2142,7 +2142,7 @@ settings.set('limit_lan_peers', $('limit_lan_peers_checkbox').getProperty('checked')); // Scheduler - const scheduling_enabled = $('limit_sheduling_checkbox').getProperty('checked'); + const scheduling_enabled = $('limitSchedulingCheckbox').getProperty('checked'); settings.set('scheduler_enabled', scheduling_enabled); if (scheduling_enabled) { settings.set('schedule_from_hour', $('schedule_from_hour').getProperty('value').toInt());