diff --git a/src/gui/aboutdialog.h b/src/gui/aboutdialog.h
index 0e99366e7..1d41fde68 100644
--- a/src/gui/aboutdialog.h
+++ b/src/gui/aboutdialog.h
@@ -49,9 +49,9 @@ public:
// Title
#if defined(__x86_64__) || defined(_M_X64)
- lb_name->setText("qBittorrent " QBT_VERSION " (64-bit)
");
+ labelName->setText("qBittorrent " QBT_VERSION " (64-bit)
");
#else
- lb_name->setText("qBittorrent " QBT_VERSION " (32-bit)
");
+ labelName->setText("qBittorrent " QBT_VERSION " (32-bit)
");
#endif
logo->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/skin/qbittorrent-tray.svg", this, 32));
@@ -72,35 +72,35 @@ public:
, tr("Home Page:")
, tr("Forum:")
, tr("Bug Tracker:"));
- lb_about->setText(aboutText);
+ labelAbout->setText(aboutText);
labelMascot->setPixmap(Utils::Gui::scaledPixmap(":/icons/skin/mascot.png", this));
// Thanks
QFile thanksfile(":/thanks.html");
if (thanksfile.open(QIODevice::ReadOnly | QIODevice::Text)) {
- te_thanks->setHtml(QString::fromUtf8(thanksfile.readAll().constData()));
+ textBrowserThanks->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()));
+ textBrowserTranslation->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()));
+ textBrowserLicense->setHtml(QString::fromUtf8(licensefile.readAll().constData()));
licensefile.close();
}
// Libraries
- label_11->setText(QT_VERSION_STR);
- label_12->setText(Utils::Misc::libtorrentVersionString());
- label_13->setText(Utils::Misc::boostVersionString());
+ labelQtVer->setText(QT_VERSION_STR);
+ labelLibtVer->setText(Utils::Misc::libtorrentVersionString());
+ labelBoostVer->setText(Utils::Misc::boostVersionString());
Utils::Gui::resize(this);
show();
diff --git a/src/gui/aboutdialog.ui b/src/gui/aboutdialog.ui
index 3bf942053..00356c755 100644
--- a/src/gui/aboutdialog.ui
+++ b/src/gui/aboutdialog.ui
@@ -21,7 +21,7 @@
-
-
+
qBittorrent
@@ -56,7 +56,7 @@
-
-
+
0
@@ -254,7 +254,7 @@
0
-
-
+
true
@@ -280,7 +280,7 @@
0
-
-
+
QTextEdit::NoWrap
@@ -306,7 +306,7 @@
0
-
-
+
true
@@ -336,7 +336,7 @@
-
-
-
+
Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse
@@ -395,14 +395,14 @@
-
-
+
Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse
-
-
+
Qt::LinksAccessibleByMouse|Qt::TextSelectableByMouse
diff --git a/src/gui/addnewtorrentdialog.cpp b/src/gui/addnewtorrentdialog.cpp
index 0a9e900a4..1828cf5b7 100644
--- a/src/gui/addnewtorrentdialog.cpp
+++ b/src/gui/addnewtorrentdialog.cpp
@@ -148,7 +148,7 @@ AddNewTorrentDialog::AddNewTorrentDialog(const BitTorrent::AddTorrentParams &inP
m_ui->contentTreeView->header()->setSortIndicator(0, Qt::AscendingOrder);
loadState();
// Signal / slots
- connect(m_ui->adv_button, &QToolButton::clicked, this, &AddNewTorrentDialog::showAdvancedSettings);
+ connect(m_ui->toolButtonAdvanced, &QToolButton::clicked, this, &AddNewTorrentDialog::showAdvancedSettings);
connect(m_ui->doNotDeleteTorrentCheckBox, &QCheckBox::clicked, this, &AddNewTorrentDialog::doNotDeleteTorrentClicked);
QShortcut *editHotkey = new QShortcut(Qt::Key_F2, m_ui->contentTreeView, nullptr, nullptr, Qt::WidgetShortcut);
connect(editHotkey, &QShortcut::activated, this, &AddNewTorrentDialog::renameSelectedFile);
@@ -213,7 +213,7 @@ void AddNewTorrentDialog::loadState()
const int height = newSize.height();
resize(width, height);
- m_ui->adv_button->setChecked(settings()->loadValue(KEY_EXPANDED).toBool());
+ m_ui->toolButtonAdvanced->setChecked(settings()->loadValue(KEY_EXPANDED).toBool());
}
void AddNewTorrentDialog::saveState()
@@ -221,7 +221,7 @@ void AddNewTorrentDialog::saveState()
if (m_contentModel)
settings()->storeValue(KEY_TREEHEADERSTATE, m_ui->contentTreeView->header()->saveState());
settings()->storeValue(KEY_WIDTH, width());
- settings()->storeValue(KEY_EXPANDED, m_ui->adv_button->isChecked());
+ settings()->storeValue(KEY_EXPANDED, m_ui->toolButtonAdvanced->isChecked());
}
void AddNewTorrentDialog::show(QString source, const BitTorrent::AddTorrentParams &inParams, QWidget *parent)
@@ -375,17 +375,17 @@ void AddNewTorrentDialog::showAdvancedSettings(bool show)
const int minimumW = minimumWidth();
setMinimumWidth(width()); // to remain the same width
if (show) {
- m_ui->adv_button->setText(QString::fromUtf8(C_UP));
- m_ui->settings_group->setVisible(true);
+ m_ui->toolButtonAdvanced->setText(QString::fromUtf8(C_UP));
+ m_ui->groupBoxSettings->setVisible(true);
m_ui->infoGroup->setVisible(true);
m_ui->contentTreeView->setVisible(m_hasMetadata);
- static_cast(layout())->insertWidget(layout()->indexOf(m_ui->never_show_cb) + 1, m_ui->adv_button);
+ static_cast(layout())->insertWidget(layout()->indexOf(m_ui->checkBoxNeverShow) + 1, m_ui->toolButtonAdvanced);
}
else {
- m_ui->adv_button->setText(QString::fromUtf8(C_DOWN));
- m_ui->settings_group->setVisible(false);
+ m_ui->toolButtonAdvanced->setText(QString::fromUtf8(C_DOWN));
+ m_ui->groupBoxSettings->setVisible(false);
m_ui->infoGroup->setVisible(false);
- m_ui->buttonsHLayout->insertWidget(0, layout()->takeAt(layout()->indexOf(m_ui->never_show_cb) + 1)->widget());
+ m_ui->buttonsHLayout->insertWidget(0, layout()->takeAt(layout()->indexOf(m_ui->checkBoxNeverShow) + 1)->widget());
}
adjustSize();
setMinimumWidth(minimumW);
@@ -444,7 +444,7 @@ void AddNewTorrentDialog::updateDiskSpaceLabel()
sizeString += tr("Free space on disk: %1").arg(Utils::Misc::friendlyUnit(Utils::Fs::freeDiskSpaceOnPath(
m_ui->savePath->selectedPath())));
sizeString += ")";
- m_ui->size_lbl->setText(sizeString);
+ m_ui->labelSize->setText(sizeString);
}
void AddNewTorrentDialog::onSavePathChanged(const QString &newPath)
@@ -608,7 +608,7 @@ void AddNewTorrentDialog::displayContentTreeMenu(const QPoint &)
}
QMenu subMenu;
subMenu.setTitle(tr("Priority"));
- subMenu.addAction(m_ui->actionNot_downloaded);
+ subMenu.addAction(m_ui->actionNotDownloaded);
subMenu.addAction(m_ui->actionNormal);
subMenu.addAction(m_ui->actionHigh);
subMenu.addAction(m_ui->actionMaximum);
@@ -625,7 +625,7 @@ void AddNewTorrentDialog::displayContentTreeMenu(const QPoint &)
prio = prio::HIGH;
else if (act == m_ui->actionMaximum)
prio = prio::MAXIMUM;
- else if (act == m_ui->actionNot_downloaded)
+ else if (act == m_ui->actionNotDownloaded)
prio = prio::IGNORED;
qDebug("Setting files priority");
@@ -669,7 +669,7 @@ void AddNewTorrentDialog::accept()
m_torrentParams.useAutoTMM = TriStateBool::True;
}
- setEnabled(!m_ui->never_show_cb->isChecked());
+ setEnabled(!m_ui->checkBoxNeverShow->isChecked());
// Add torrent
if (!m_hasMetadata)
@@ -725,7 +725,7 @@ void AddNewTorrentDialog::setupTreeview()
{
if (!m_hasMetadata) {
setCommentText(tr("Not Available", "This comment is unavailable"));
- m_ui->date_lbl->setText(tr("Not Available", "This date is unavailable"));
+ m_ui->labelDate->setText(tr("Not Available", "This date is unavailable"));
}
else {
// Set dialog title
@@ -733,7 +733,7 @@ void AddNewTorrentDialog::setupTreeview()
// Set torrent information
setCommentText(Utils::Misc::parseHtmlLinks(m_torrentInfo.comment()));
- m_ui->date_lbl->setText(!m_torrentInfo.creationDate().isNull() ? m_torrentInfo.creationDate().toString(Qt::DefaultLocaleShortDate) : tr("Not available"));
+ m_ui->labelDate->setText(!m_torrentInfo.creationDate().isNull() ? m_torrentInfo.creationDate().toString(Qt::DefaultLocaleShortDate) : tr("Not available"));
// Prepare content tree
m_contentModel = new TorrentContentFilterModel(this);
@@ -795,7 +795,7 @@ void AddNewTorrentDialog::TMMChanged(int index)
m_ui->groupBoxSavePath->setEnabled(true);
m_ui->savePath->blockSignals(false);
m_ui->savePath->setCurrentIndex(m_oldIndex < m_ui->savePath->count() ? m_oldIndex : m_ui->savePath->count() - 1);
- m_ui->adv_button->setEnabled(true);
+ m_ui->toolButtonAdvanced->setEnabled(true);
}
else {
m_ui->groupBoxSavePath->setEnabled(false);
@@ -803,8 +803,8 @@ void AddNewTorrentDialog::TMMChanged(int index)
m_ui->savePath->clear();
QString savePath = BitTorrent::Session::instance()->categorySavePath(m_ui->categoryComboBox->currentText());
m_ui->savePath->addItem(savePath);
- m_ui->adv_button->setChecked(true);
- m_ui->adv_button->setEnabled(false);
+ m_ui->toolButtonAdvanced->setChecked(true);
+ m_ui->toolButtonAdvanced->setEnabled(false);
showAdvancedSettings(true);
}
}
diff --git a/src/gui/addnewtorrentdialog.ui b/src/gui/addnewtorrentdialog.ui
index 34230f300..fb7c7fd14 100644
--- a/src/gui/addnewtorrentdialog.ui
+++ b/src/gui/addnewtorrentdialog.ui
@@ -82,14 +82,14 @@
-
-
+
Never show again
-
-
+
▼
@@ -99,7 +99,7 @@
-
-
+
Torrent settings
@@ -224,7 +224,7 @@
-
-
+
@@ -245,7 +245,7 @@
-
-
+
@@ -372,7 +372,7 @@
Maximum
-
+
Do not download
@@ -393,9 +393,9 @@
savePath
- checkBoxRememberLastSavePath
- never_show_cb
- adv_button
+ checkBoxRememberLastSavePath
+ checkBoxNeverShow
+ toolButtonAdvanced
startTorrentCheckBox
skipCheckingCheckBox
categoryComboBox
diff --git a/src/gui/advancedsettings.cpp b/src/gui/advancedsettings.cpp
index e1e023942..6a59b4508 100644
--- a/src/gui/advancedsettings.cpp
+++ b/src/gui/advancedsettings.cpp
@@ -125,9 +125,9 @@ AdvancedSettings::AdvancedSettings(QWidget *parent)
setSelectionMode(QAbstractItemView::NoSelection);
setEditTriggers(QAbstractItemView::NoEditTriggers);
// Signals
- connect(&spin_cache, static_cast(&QSpinBox::valueChanged)
+ connect(&spinBoxCache, static_cast(&QSpinBox::valueChanged)
, this, &AdvancedSettings::updateCacheSpinSuffix);
- connect(&combo_iface, static_cast(&QComboBox::currentIndexChanged)
+ connect(&comboBoxInterface, static_cast(&QComboBox::currentIndexChanged)
, this, &AdvancedSettings::updateInterfaceAddressCombo);
// Load settings
loadAdvancedSettings();
@@ -141,116 +141,116 @@ void AdvancedSettings::saveAdvancedSettings()
BitTorrent::Session *const session = BitTorrent::Session::instance();
// Disk write cache
- session->setDiskCacheSize(spin_cache.value());
- session->setDiskCacheTTL(spin_cache_ttl.value());
+ session->setDiskCacheSize(spinBoxCache.value());
+ session->setDiskCacheTTL(spinBoxCacheTTL.value());
// Enable OS cache
- session->setUseOSCache(cb_os_cache.isChecked());
+ session->setUseOSCache(checkBoxOsCache.isChecked());
// Guided read cache
- session->setGuidedReadCacheEnabled(cbGuidedReadCache.isChecked());
+ session->setGuidedReadCacheEnabled(checkBoxGuidedReadCache.isChecked());
// Coalesce reads & writes
- session->setCoalesceReadWriteEnabled(cbCoalesceRW.isChecked());
+ session->setCoalesceReadWriteEnabled(checkBoxCoalesceRW.isChecked());
// Suggest mode
- session->setSuggestMode(cbSuggestMode.isChecked());
+ session->setSuggestMode(checkBoxSuggestMode.isChecked());
// Send buffer watermark
- session->setSendBufferWatermark(spinSendBufferWatermark.value());
- session->setSendBufferLowWatermark(spinSendBufferLowWatermark.value());
- session->setSendBufferWatermarkFactor(spinSendBufferWatermarkFactor.value());
+ session->setSendBufferWatermark(spinBoxSendBufferWatermark.value());
+ session->setSendBufferLowWatermark(spinBoxSendBufferLowWatermark.value());
+ session->setSendBufferWatermarkFactor(spinBoxSendBufferWatermarkFactor.value());
// Save resume data interval
- session->setSaveResumeDataInterval(spin_save_resume_data_interval.value());
+ session->setSaveResumeDataInterval(spinBoxSaveResumeDataInterval.value());
// Outgoing ports
- session->setOutgoingPortsMin(outgoing_ports_min.value());
- session->setOutgoingPortsMax(outgoing_ports_max.value());
+ session->setOutgoingPortsMin(spinBoxOutgoingPortsMin.value());
+ session->setOutgoingPortsMax(spinBoxOutgoingPortsMax.value());
// uTP-TCP mixed mode
- session->setUtpMixedMode(static_cast(comboUtpMixedMode.currentIndex()));
+ session->setUtpMixedMode(static_cast(comboBoxUtpMixedMode.currentIndex()));
// multiple connections per IP
- session->setMultiConnectionsPerIpEnabled(cbMultiConnectionsPerIp.isChecked());
+ session->setMultiConnectionsPerIpEnabled(checkBoxMultiConnectionsPerIp.isChecked());
// Recheck torrents on completion
- pref->recheckTorrentsOnCompletion(cb_recheck_completed.isChecked());
+ pref->recheckTorrentsOnCompletion(checkBoxRecheckCompleted.isChecked());
// Transfer list refresh interval
- session->setRefreshInterval(spin_list_refresh.value());
+ session->setRefreshInterval(spinBoxListRefresh.value());
// Peer resolution
- pref->resolvePeerCountries(cb_resolve_countries.isChecked());
- pref->resolvePeerHostNames(cb_resolve_hosts.isChecked());
+ pref->resolvePeerCountries(checkBoxResolveCountries.isChecked());
+ pref->resolvePeerHostNames(checkBoxResolveHosts.isChecked());
// Max Half-Open connections
- session->setMaxHalfOpenConnections(spin_maxhalfopen.value());
+ session->setMaxHalfOpenConnections(spinBoxMaxHalfOpen.value());
// Super seeding
- session->setSuperSeedingEnabled(cb_super_seeding.isChecked());
+ session->setSuperSeedingEnabled(checkBoxSuperSeeding.isChecked());
// Network interface
- if (combo_iface.currentIndex() == 0) {
+ if (comboBoxInterface.currentIndex() == 0) {
// All interfaces (default)
session->setNetworkInterface(QString());
session->setNetworkInterfaceName(QString());
}
else {
- session->setNetworkInterface(combo_iface.itemData(combo_iface.currentIndex()).toString());
- session->setNetworkInterfaceName(combo_iface.currentText());
+ session->setNetworkInterface(comboBoxInterface.itemData(comboBoxInterface.currentIndex()).toString());
+ session->setNetworkInterfaceName(comboBoxInterface.currentText());
}
// Interface address
- if (combo_iface_address.currentIndex() == 0) {
+ if (comboBoxInterfaceAddress.currentIndex() == 0) {
// All addresses (default)
session->setNetworkInterfaceAddress(QString::null);
}
else {
- QHostAddress ifaceAddr(combo_iface_address.currentText().trimmed());
+ QHostAddress ifaceAddr(comboBoxInterfaceAddress.currentText().trimmed());
ifaceAddr.isNull() ? session->setNetworkInterfaceAddress(QString::null) : session->setNetworkInterfaceAddress(ifaceAddr.toString());
}
- session->setIPv6Enabled(cb_listen_ipv6.isChecked());
+ session->setIPv6Enabled(checkBoxListenIPv6.isChecked());
// Announce IP
- QHostAddress addr(txtAnnounceIP.text().trimmed());
+ QHostAddress addr(lineEditAnnounceIP.text().trimmed());
session->setAnnounceIP(addr.isNull() ? "" : addr.toString());
// Program notification
MainWindow *const mainWindow = static_cast(QCoreApplication::instance())->mainWindow();
- mainWindow->setNotificationsEnabled(cb_program_notifications.isChecked());
- mainWindow->setTorrentAddedNotificationsEnabled(cb_torrent_added_notifications.isChecked());
+ mainWindow->setNotificationsEnabled(checkBoxProgramNotifications.isChecked());
+ mainWindow->setTorrentAddedNotificationsEnabled(checkBoxTorrentAddedNotifications.isChecked());
// Misc GUI properties
- mainWindow->setDownloadTrackerFavicon(cb_tracker_favicon.isChecked());
- AddNewTorrentDialog::setSavePathHistoryLength(spinSavePathHistoryLength.value());
+ mainWindow->setDownloadTrackerFavicon(checkBoxTrackerFavicon.isChecked());
+ AddNewTorrentDialog::setSavePathHistoryLength(spinBoxSavePathHistoryLength.value());
// Tracker
- session->setTrackerEnabled(cb_tracker_status.isChecked());
- pref->setTrackerPort(spin_tracker_port.value());
+ session->setTrackerEnabled(checkBoxTrackerStatus.isChecked());
+ pref->setTrackerPort(spinBoxTrackerPort.value());
// Choking algorithm
- session->setChokingAlgorithm(static_cast(comboChokingAlgorithm.currentIndex()));
+ session->setChokingAlgorithm(static_cast(comboBoxChokingAlgorithm.currentIndex()));
// Seed choking algorithm
- session->setSeedChokingAlgorithm(static_cast(comboSeedChokingAlgorithm.currentIndex()));
+ session->setSeedChokingAlgorithm(static_cast(comboBoxSeedChokingAlgorithm.currentIndex()));
#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
- pref->setUpdateCheckEnabled(cb_update_check.isChecked());
+ pref->setUpdateCheckEnabled(checkBoxUpdateCheck.isChecked());
#endif
// Icon theme
#if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC))
- pref->useSystemIconTheme(cb_use_icon_theme.isChecked());
+ pref->useSystemIconTheme(checkBoxUseIconTheme.isChecked());
#endif
- pref->setConfirmTorrentRecheck(cb_confirm_torrent_recheck.isChecked());
+ pref->setConfirmTorrentRecheck(checkBoxConfirmTorrentRecheck.isChecked());
- pref->setConfirmRemoveAllTags(cb_confirm_remove_all_tags.isChecked());
+ pref->setConfirmRemoveAllTags(checkBoxConfirmRemoveAllTags.isChecked());
- session->setAnnounceToAllTrackers(cb_announce_all_trackers.isChecked());
- session->setAnnounceToAllTiers(cb_announce_all_tiers.isChecked());
+ session->setAnnounceToAllTrackers(checkBoxAnnounceAllTrackers.isChecked());
+ session->setAnnounceToAllTiers(checkBoxAnnounceAllTiers.isChecked());
}
void AdvancedSettings::updateCacheSpinSuffix(int value)
{
if (value == 0)
- spin_cache.setSuffix(tr(" (disabled)"));
+ spinBoxCache.setSuffix(tr(" (disabled)"));
else if (value < 0)
- spin_cache.setSuffix(tr(" (auto)"));
+ spinBoxCache.setSuffix(tr(" (auto)"));
else
- spin_cache.setSuffix(tr(" MiB"));
+ spinBoxCache.setSuffix(tr(" MiB"));
}
void AdvancedSettings::updateInterfaceAddressCombo()
{
// Try to get the currently selected interface name
- const QString ifaceName = combo_iface.itemData(combo_iface.currentIndex()).toString(); // Empty string for the first element
+ const QString ifaceName = comboBoxInterface.itemData(comboBoxInterface.currentIndex()).toString(); // Empty string for the first element
const QString currentAddress = BitTorrent::Session::instance()->networkInterfaceAddress();
// Clear all items and reinsert them, default to all
- combo_iface_address.clear();
- combo_iface_address.addItem(tr("All addresses"));
- combo_iface_address.setCurrentIndex(0);
+ comboBoxInterfaceAddress.clear();
+ comboBoxInterfaceAddress.addItem(tr("All addresses"));
+ comboBoxInterfaceAddress.setCurrentIndex(0);
auto populateCombo = [this, ¤tAddress](const QString &ip, const QAbstractSocket::NetworkLayerProtocol &protocol)
{
@@ -258,10 +258,10 @@ void AdvancedSettings::updateInterfaceAddressCombo()
// Only take ipv4 for now?
if ((protocol != QAbstractSocket::IPv4Protocol) && (protocol != QAbstractSocket::IPv6Protocol))
return;
- combo_iface_address.addItem(ip);
+ comboBoxInterfaceAddress.addItem(ip);
//Try to select the last added one
if (ip == currentAddress)
- combo_iface_address.setCurrentIndex(combo_iface_address.count() - 1);
+ comboBoxInterfaceAddress.setCurrentIndex(comboBoxInterfaceAddress.count() - 1);
};
if (ifaceName.isEmpty()) {
@@ -297,102 +297,102 @@ void AdvancedSettings::loadAdvancedSettings()
labelLibtorrentLink.setText(QString("%2").arg("https://www.libtorrent.org/reference.html", tr("Open documentation")));
labelLibtorrentLink.setOpenExternalLinks(true);
// Disk write cache
- spin_cache.setMinimum(-1);
+ spinBoxCache.setMinimum(-1);
// When build as 32bit binary, set the maximum at less than 2GB to prevent crashes.
// These macros may not be available on compilers other than MSVC and GCC
#if defined(__x86_64__) || defined(_M_X64)
- spin_cache.setMaximum(4096);
+ spinBoxCache.setMaximum(4096);
#else
// allocate 1536MiB and leave 512MiB to the rest of program data in RAM
- spin_cache.setMaximum(1536);
+ spinBoxCache.setMaximum(1536);
#endif
- spin_cache.setValue(session->diskCacheSize());
- updateCacheSpinSuffix(spin_cache.value());
- addRow(DISK_CACHE, tr("Disk cache"), &spin_cache);
+ spinBoxCache.setValue(session->diskCacheSize());
+ updateCacheSpinSuffix(spinBoxCache.value());
+ addRow(DISK_CACHE, tr("Disk cache"), &spinBoxCache);
// Disk cache expiry
- spin_cache_ttl.setMinimum(15);
- spin_cache_ttl.setMaximum(600);
- spin_cache_ttl.setValue(session->diskCacheTTL());
- spin_cache_ttl.setSuffix(tr(" s", " seconds"));
- addRow(DISK_CACHE_TTL, tr("Disk cache expiry interval"), &spin_cache_ttl);
+ spinBoxCacheTTL.setMinimum(15);
+ spinBoxCacheTTL.setMaximum(600);
+ spinBoxCacheTTL.setValue(session->diskCacheTTL());
+ spinBoxCacheTTL.setSuffix(tr(" s", " seconds"));
+ addRow(DISK_CACHE_TTL, tr("Disk cache expiry interval"), &spinBoxCacheTTL);
// Enable OS cache
- cb_os_cache.setChecked(session->useOSCache());
- addRow(OS_CACHE, tr("Enable OS cache"), &cb_os_cache);
+ checkBoxOsCache.setChecked(session->useOSCache());
+ addRow(OS_CACHE, tr("Enable OS cache"), &checkBoxOsCache);
// Guided read cache
- cbGuidedReadCache.setChecked(session->isGuidedReadCacheEnabled());
- addRow(GUIDED_READ_CACHE, tr("Guided read cache"), &cbGuidedReadCache);
+ checkBoxGuidedReadCache.setChecked(session->isGuidedReadCacheEnabled());
+ addRow(GUIDED_READ_CACHE, tr("Guided read cache"), &checkBoxGuidedReadCache);
// Coalesce reads & writes
- cbCoalesceRW.setChecked(session->isCoalesceReadWriteEnabled());
+ checkBoxCoalesceRW.setChecked(session->isCoalesceReadWriteEnabled());
#if LIBTORRENT_VERSION_NUM >= 10107
- addRow(COALESCE_RW, tr("Coalesce reads & writes"), &cbCoalesceRW);
+ addRow(COALESCE_RW, tr("Coalesce reads & writes"), &checkBoxCoalesceRW);
#endif
// Suggest mode
- cbSuggestMode.setChecked(session->isSuggestModeEnabled());
- addRow(SUGGEST_MODE, tr("Send upload piece suggestions"), &cbSuggestMode);
+ checkBoxSuggestMode.setChecked(session->isSuggestModeEnabled());
+ addRow(SUGGEST_MODE, tr("Send upload piece suggestions"), &checkBoxSuggestMode);
// Send buffer watermark
- spinSendBufferWatermark.setMinimum(1);
- spinSendBufferWatermark.setMaximum(INT_MAX);
- spinSendBufferWatermark.setSuffix(tr(" KiB"));
- spinSendBufferWatermark.setValue(session->sendBufferWatermark());
- addRow(SEND_BUF_WATERMARK, tr("Send buffer watermark"), &spinSendBufferWatermark);
- spinSendBufferLowWatermark.setMinimum(1);
- spinSendBufferLowWatermark.setMaximum(INT_MAX);
- spinSendBufferLowWatermark.setSuffix(tr(" KiB"));
- spinSendBufferLowWatermark.setValue(session->sendBufferLowWatermark());
- addRow(SEND_BUF_LOW_WATERMARK, tr("Send buffer low watermark"), &spinSendBufferLowWatermark);
- spinSendBufferWatermarkFactor.setMinimum(1);
- spinSendBufferWatermarkFactor.setMaximum(INT_MAX);
- spinSendBufferWatermarkFactor.setSuffix(" %");
- spinSendBufferWatermarkFactor.setValue(session->sendBufferWatermarkFactor());
- addRow(SEND_BUF_WATERMARK_FACTOR, tr("Send buffer watermark factor"), &spinSendBufferWatermarkFactor);
+ spinBoxSendBufferWatermark.setMinimum(1);
+ spinBoxSendBufferWatermark.setMaximum(INT_MAX);
+ spinBoxSendBufferWatermark.setSuffix(tr(" KiB"));
+ spinBoxSendBufferWatermark.setValue(session->sendBufferWatermark());
+ addRow(SEND_BUF_WATERMARK, tr("Send buffer watermark"), &spinBoxSendBufferWatermark);
+ spinBoxSendBufferLowWatermark.setMinimum(1);
+ spinBoxSendBufferLowWatermark.setMaximum(INT_MAX);
+ spinBoxSendBufferLowWatermark.setSuffix(tr(" KiB"));
+ spinBoxSendBufferLowWatermark.setValue(session->sendBufferLowWatermark());
+ addRow(SEND_BUF_LOW_WATERMARK, tr("Send buffer low watermark"), &spinBoxSendBufferLowWatermark);
+ spinBoxSendBufferWatermarkFactor.setMinimum(1);
+ spinBoxSendBufferWatermarkFactor.setMaximum(INT_MAX);
+ spinBoxSendBufferWatermarkFactor.setSuffix(" %");
+ spinBoxSendBufferWatermarkFactor.setValue(session->sendBufferWatermarkFactor());
+ addRow(SEND_BUF_WATERMARK_FACTOR, tr("Send buffer watermark factor"), &spinBoxSendBufferWatermarkFactor);
// Save resume data interval
- spin_save_resume_data_interval.setMinimum(1);
- spin_save_resume_data_interval.setMaximum(1440);
- spin_save_resume_data_interval.setValue(session->saveResumeDataInterval());
- spin_save_resume_data_interval.setSuffix(tr(" m", " minutes"));
- addRow(SAVE_RESUME_DATA_INTERVAL, tr("Save resume data interval", "How often the fastresume file is saved."), &spin_save_resume_data_interval);
+ spinBoxSaveResumeDataInterval.setMinimum(1);
+ spinBoxSaveResumeDataInterval.setMaximum(1440);
+ spinBoxSaveResumeDataInterval.setValue(session->saveResumeDataInterval());
+ spinBoxSaveResumeDataInterval.setSuffix(tr(" m", " minutes"));
+ addRow(SAVE_RESUME_DATA_INTERVAL, tr("Save resume data interval", "How often the fastresume file is saved."), &spinBoxSaveResumeDataInterval);
// Outgoing port Min
- outgoing_ports_min.setMinimum(0);
- outgoing_ports_min.setMaximum(65535);
- outgoing_ports_min.setValue(session->outgoingPortsMin());
- addRow(OUTGOING_PORT_MIN, tr("Outgoing ports (Min) [0: Disabled]"), &outgoing_ports_min);
+ spinBoxOutgoingPortsMin.setMinimum(0);
+ spinBoxOutgoingPortsMin.setMaximum(65535);
+ spinBoxOutgoingPortsMin.setValue(session->outgoingPortsMin());
+ addRow(OUTGOING_PORT_MIN, tr("Outgoing ports (Min) [0: Disabled]"), &spinBoxOutgoingPortsMin);
// Outgoing port Min
- outgoing_ports_max.setMinimum(0);
- outgoing_ports_max.setMaximum(65535);
- outgoing_ports_max.setValue(session->outgoingPortsMax());
- addRow(OUTGOING_PORT_MAX, tr("Outgoing ports (Max) [0: Disabled]"), &outgoing_ports_max);
+ spinBoxOutgoingPortsMax.setMinimum(0);
+ spinBoxOutgoingPortsMax.setMaximum(65535);
+ spinBoxOutgoingPortsMax.setValue(session->outgoingPortsMax());
+ addRow(OUTGOING_PORT_MAX, tr("Outgoing ports (Max) [0: Disabled]"), &spinBoxOutgoingPortsMax);
// uTP-TCP mixed mode
- comboUtpMixedMode.addItems({tr("Prefer TCP"), tr("Peer proportional (throttles TCP)")});
- comboUtpMixedMode.setCurrentIndex(static_cast(session->utpMixedMode()));
- addRow(UTP_MIX_MODE, tr("%1-TCP mixed mode algorithm", "uTP-TCP mixed mode algorithm").arg(C_UTP), &comboUtpMixedMode);
+ comboBoxUtpMixedMode.addItems({tr("Prefer TCP"), tr("Peer proportional (throttles TCP)")});
+ comboBoxUtpMixedMode.setCurrentIndex(static_cast(session->utpMixedMode()));
+ addRow(UTP_MIX_MODE, tr("%1-TCP mixed mode algorithm", "uTP-TCP mixed mode algorithm").arg(C_UTP), &comboBoxUtpMixedMode);
// multiple connections per IP
- cbMultiConnectionsPerIp.setChecked(session->multiConnectionsPerIpEnabled());
- addRow(MULTI_CONNECTIONS_PER_IP, tr("Allow multiple connections from the same IP address"), &cbMultiConnectionsPerIp);
+ checkBoxMultiConnectionsPerIp.setChecked(session->multiConnectionsPerIpEnabled());
+ addRow(MULTI_CONNECTIONS_PER_IP, tr("Allow multiple connections from the same IP address"), &checkBoxMultiConnectionsPerIp);
// Recheck completed torrents
- cb_recheck_completed.setChecked(pref->recheckTorrentsOnCompletion());
- addRow(RECHECK_COMPLETED, tr("Recheck torrents on completion"), &cb_recheck_completed);
+ checkBoxRecheckCompleted.setChecked(pref->recheckTorrentsOnCompletion());
+ addRow(RECHECK_COMPLETED, tr("Recheck torrents on completion"), &checkBoxRecheckCompleted);
// Transfer list refresh interval
- spin_list_refresh.setMinimum(30);
- spin_list_refresh.setMaximum(99999);
- spin_list_refresh.setValue(session->refreshInterval());
- spin_list_refresh.setSuffix(tr(" ms", " milliseconds"));
- addRow(LIST_REFRESH, tr("Transfer list refresh interval"), &spin_list_refresh);
+ spinBoxListRefresh.setMinimum(30);
+ spinBoxListRefresh.setMaximum(99999);
+ spinBoxListRefresh.setValue(session->refreshInterval());
+ spinBoxListRefresh.setSuffix(tr(" ms", " milliseconds"));
+ addRow(LIST_REFRESH, tr("Transfer list refresh interval"), &spinBoxListRefresh);
// Resolve Peer countries
- cb_resolve_countries.setChecked(pref->resolvePeerCountries());
- addRow(RESOLVE_COUNTRIES, tr("Resolve peer countries (GeoIP)"), &cb_resolve_countries);
+ checkBoxResolveCountries.setChecked(pref->resolvePeerCountries());
+ addRow(RESOLVE_COUNTRIES, tr("Resolve peer countries (GeoIP)"), &checkBoxResolveCountries);
// Resolve peer hosts
- cb_resolve_hosts.setChecked(pref->resolvePeerHostNames());
- addRow(RESOLVE_HOSTS, tr("Resolve peer host names"), &cb_resolve_hosts);
+ checkBoxResolveHosts.setChecked(pref->resolvePeerHostNames());
+ addRow(RESOLVE_HOSTS, tr("Resolve peer host names"), &checkBoxResolveHosts);
// Max Half Open connections
- spin_maxhalfopen.setMinimum(0);
- spin_maxhalfopen.setMaximum(99999);
- spin_maxhalfopen.setValue(session->maxHalfOpenConnections());
- addRow(MAX_HALF_OPEN, tr("Maximum number of half-open connections [0: Unlimited]"), &spin_maxhalfopen);
+ spinBoxMaxHalfOpen.setMinimum(0);
+ spinBoxMaxHalfOpen.setMaximum(99999);
+ spinBoxMaxHalfOpen.setValue(session->maxHalfOpenConnections());
+ addRow(MAX_HALF_OPEN, tr("Maximum number of half-open connections [0: Unlimited]"), &spinBoxMaxHalfOpen);
// Super seeding
- cb_super_seeding.setChecked(session->isSuperSeedingEnabled());
- addRow(SUPER_SEEDING, tr("Strict super seeding"), &cb_super_seeding);
+ checkBoxSuperSeeding.setChecked(session->isSuperSeedingEnabled());
+ addRow(SUPER_SEEDING, tr("Strict super seeding"), &checkBoxSuperSeeding);
// Network interface
- combo_iface.addItem(tr("Any interface", "i.e. Any network interface"));
+ comboBoxInterface.addItem(tr("Any interface", "i.e. Any network interface"));
const QString current_iface = session->networkInterface();
bool interface_exists = current_iface.isEmpty();
int i = 1;
@@ -403,83 +403,83 @@ void AdvancedSettings::loadAdvancedSettings()
// https://github.com/qbittorrent/qBittorrent/pull/5135
if (iface.addressEntries().isEmpty()) continue;
- combo_iface.addItem(iface.humanReadableName(), iface.name());
+ comboBoxInterface.addItem(iface.humanReadableName(), iface.name());
if (!current_iface.isEmpty() && (iface.name() == current_iface)) {
- combo_iface.setCurrentIndex(i);
+ comboBoxInterface.setCurrentIndex(i);
interface_exists = true;
}
++i;
}
// Saved interface does not exist, show it anyway
if (!interface_exists) {
- combo_iface.addItem(session->networkInterfaceName(), current_iface);
- combo_iface.setCurrentIndex(i);
+ comboBoxInterface.addItem(session->networkInterfaceName(), current_iface);
+ comboBoxInterface.setCurrentIndex(i);
}
- addRow(NETWORK_IFACE, tr("Network Interface (requires restart)"), &combo_iface);
+ addRow(NETWORK_IFACE, tr("Network Interface (requires restart)"), &comboBoxInterface);
// Network interface address
updateInterfaceAddressCombo();
- addRow(NETWORK_IFACE_ADDRESS, tr("Optional IP Address to bind to (requires restart)"), &combo_iface_address);
+ addRow(NETWORK_IFACE_ADDRESS, tr("Optional IP Address to bind to (requires restart)"), &comboBoxInterfaceAddress);
// Listen on IPv6 address
- cb_listen_ipv6.setChecked(session->isIPv6Enabled());
- addRow(NETWORK_LISTEN_IPV6, tr("Listen on IPv6 address (requires restart)"), &cb_listen_ipv6);
+ checkBoxListenIPv6.setChecked(session->isIPv6Enabled());
+ addRow(NETWORK_LISTEN_IPV6, tr("Listen on IPv6 address (requires restart)"), &checkBoxListenIPv6);
// Announce IP
- txtAnnounceIP.setText(session->announceIP());
- addRow(ANNOUNCE_IP, tr("IP Address to report to trackers (requires restart)"), &txtAnnounceIP);
+ lineEditAnnounceIP.setText(session->announceIP());
+ addRow(ANNOUNCE_IP, tr("IP Address to report to trackers (requires restart)"), &lineEditAnnounceIP);
// Program notifications
const MainWindow * const mainWindow = static_cast(QCoreApplication::instance())->mainWindow();
- cb_program_notifications.setChecked(mainWindow->isNotificationsEnabled());
- addRow(PROGRAM_NOTIFICATIONS, tr("Display notifications"), &cb_program_notifications);
+ checkBoxProgramNotifications.setChecked(mainWindow->isNotificationsEnabled());
+ addRow(PROGRAM_NOTIFICATIONS, tr("Display notifications"), &checkBoxProgramNotifications);
// Torrent added notifications
- cb_torrent_added_notifications.setChecked(mainWindow->isTorrentAddedNotificationsEnabled());
- addRow(TORRENT_ADDED_NOTIFICATIONS, tr("Display notifications for added torrents"), &cb_torrent_added_notifications);
+ checkBoxTorrentAddedNotifications.setChecked(mainWindow->isTorrentAddedNotificationsEnabled());
+ addRow(TORRENT_ADDED_NOTIFICATIONS, tr("Display notifications for added torrents"), &checkBoxTorrentAddedNotifications);
// Download tracker's favicon
- cb_tracker_favicon.setChecked(mainWindow->isDownloadTrackerFavicon());
- addRow(DOWNLOAD_TRACKER_FAVICON, tr("Download tracker's favicon"), &cb_tracker_favicon);
+ checkBoxTrackerFavicon.setChecked(mainWindow->isDownloadTrackerFavicon());
+ addRow(DOWNLOAD_TRACKER_FAVICON, tr("Download tracker's favicon"), &checkBoxTrackerFavicon);
// Save path history length
- spinSavePathHistoryLength.setRange(AddNewTorrentDialog::minPathHistoryLength, AddNewTorrentDialog::maxPathHistoryLength);
- spinSavePathHistoryLength.setValue(AddNewTorrentDialog::savePathHistoryLength());
- addRow(SAVE_PATH_HISTORY_LENGTH, tr("Save path history length"), &spinSavePathHistoryLength);
+ spinBoxSavePathHistoryLength.setRange(AddNewTorrentDialog::minPathHistoryLength, AddNewTorrentDialog::maxPathHistoryLength);
+ spinBoxSavePathHistoryLength.setValue(AddNewTorrentDialog::savePathHistoryLength());
+ addRow(SAVE_PATH_HISTORY_LENGTH, tr("Save path history length"), &spinBoxSavePathHistoryLength);
// Tracker State
- cb_tracker_status.setChecked(session->isTrackerEnabled());
- addRow(TRACKER_STATUS, tr("Enable embedded tracker"), &cb_tracker_status);
+ checkBoxTrackerStatus.setChecked(session->isTrackerEnabled());
+ addRow(TRACKER_STATUS, tr("Enable embedded tracker"), &checkBoxTrackerStatus);
// Tracker port
- spin_tracker_port.setMinimum(1);
- spin_tracker_port.setMaximum(65535);
- spin_tracker_port.setValue(pref->getTrackerPort());
- addRow(TRACKER_PORT, tr("Embedded tracker port"), &spin_tracker_port);
+ spinBoxTrackerPort.setMinimum(1);
+ spinBoxTrackerPort.setMaximum(65535);
+ spinBoxTrackerPort.setValue(pref->getTrackerPort());
+ addRow(TRACKER_PORT, tr("Embedded tracker port"), &spinBoxTrackerPort);
// Choking algorithm
- comboChokingAlgorithm.addItems({tr("Fixed slots"), tr("Upload rate based")});
- comboChokingAlgorithm.setCurrentIndex(static_cast(session->chokingAlgorithm()));
- addRow(CHOKING_ALGORITHM, tr("Upload slots behavior"), &comboChokingAlgorithm);
+ comboBoxChokingAlgorithm.addItems({tr("Fixed slots"), tr("Upload rate based")});
+ comboBoxChokingAlgorithm.setCurrentIndex(static_cast(session->chokingAlgorithm()));
+ addRow(CHOKING_ALGORITHM, tr("Upload slots behavior"), &comboBoxChokingAlgorithm);
// Seed choking algorithm
- comboSeedChokingAlgorithm.addItems({tr("Round-robin"), tr("Fastest upload"), tr("Anti-leech")});
- comboSeedChokingAlgorithm.setCurrentIndex(static_cast(session->seedChokingAlgorithm()));
- addRow(SEED_CHOKING_ALGORITHM, tr("Upload choking algorithm"), &comboSeedChokingAlgorithm);
+ comboBoxSeedChokingAlgorithm.addItems({tr("Round-robin"), tr("Fastest upload"), tr("Anti-leech")});
+ comboBoxSeedChokingAlgorithm.setCurrentIndex(static_cast(session->seedChokingAlgorithm()));
+ addRow(SEED_CHOKING_ALGORITHM, tr("Upload choking algorithm"), &comboBoxSeedChokingAlgorithm);
#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
- cb_update_check.setChecked(pref->isUpdateCheckEnabled());
- addRow(UPDATE_CHECK, tr("Check for software updates"), &cb_update_check);
+ checkBoxUpdateCheck.setChecked(pref->isUpdateCheckEnabled());
+ addRow(UPDATE_CHECK, tr("Check for software updates"), &checkBoxUpdateCheck);
#endif
#if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC))
- cb_use_icon_theme.setChecked(pref->useSystemIconTheme());
- addRow(USE_ICON_THEME, tr("Use system icon theme"), &cb_use_icon_theme);
+ checkBoxUseIconTheme.setChecked(pref->useSystemIconTheme());
+ addRow(USE_ICON_THEME, tr("Use system icon theme"), &checkBoxUseIconTheme);
#endif
// Torrent recheck confirmation
- cb_confirm_torrent_recheck.setChecked(pref->confirmTorrentRecheck());
- addRow(CONFIRM_RECHECK_TORRENT, tr("Confirm torrent recheck"), &cb_confirm_torrent_recheck);
+ checkBoxConfirmTorrentRecheck.setChecked(pref->confirmTorrentRecheck());
+ addRow(CONFIRM_RECHECK_TORRENT, tr("Confirm torrent recheck"), &checkBoxConfirmTorrentRecheck);
// Remove all tags confirmation
- cb_confirm_remove_all_tags.setChecked(pref->confirmRemoveAllTags());
- addRow(CONFIRM_REMOVE_ALL_TAGS, tr("Confirm removal of all tags"), &cb_confirm_remove_all_tags);
+ checkBoxConfirmRemoveAllTags.setChecked(pref->confirmRemoveAllTags());
+ addRow(CONFIRM_REMOVE_ALL_TAGS, tr("Confirm removal of all tags"), &checkBoxConfirmRemoveAllTags);
// Announce to all trackers in a tier
- cb_announce_all_trackers.setChecked(session->announceToAllTrackers());
- addRow(ANNOUNCE_ALL_TRACKERS, tr("Always announce to all trackers in a tier"), &cb_announce_all_trackers);
+ checkBoxAnnounceAllTrackers.setChecked(session->announceToAllTrackers());
+ addRow(ANNOUNCE_ALL_TRACKERS, tr("Always announce to all trackers in a tier"), &checkBoxAnnounceAllTrackers);
// Announce to all tiers
- cb_announce_all_tiers.setChecked(session->announceToAllTiers());
- addRow(ANNOUNCE_ALL_TIERS, tr("Always announce to all tiers"), &cb_announce_all_tiers);
+ checkBoxAnnounceAllTiers.setChecked(session->announceToAllTiers());
+ addRow(ANNOUNCE_ALL_TIERS, tr("Always announce to all tiers"), &checkBoxAnnounceAllTiers);
}
template
diff --git a/src/gui/advancedsettings.h b/src/gui/advancedsettings.h
index b159d28e9..c5d65cd1e 100644
--- a/src/gui/advancedsettings.h
+++ b/src/gui/advancedsettings.h
@@ -58,22 +58,23 @@ private:
template void addRow(int row, const QString &rowText, T* widget);
QLabel labelQbtLink, labelLibtorrentLink;
- QSpinBox spin_cache, spin_save_resume_data_interval, outgoing_ports_min, outgoing_ports_max, spin_list_refresh, spin_maxhalfopen, spin_tracker_port, spin_cache_ttl,
- spinSendBufferWatermark, spinSendBufferLowWatermark, spinSendBufferWatermarkFactor, spinSavePathHistoryLength;
- QCheckBox cb_os_cache, cb_recheck_completed, cb_resolve_countries, cb_resolve_hosts, cb_super_seeding,
- cb_program_notifications, cb_torrent_added_notifications, cb_tracker_favicon, cb_tracker_status,
- cb_confirm_torrent_recheck, cb_confirm_remove_all_tags, cb_listen_ipv6, cb_announce_all_trackers, cb_announce_all_tiers,
- cbGuidedReadCache, cbMultiConnectionsPerIp, cbSuggestMode, cbCoalesceRW;
- QComboBox combo_iface, combo_iface_address, comboUtpMixedMode, comboChokingAlgorithm, comboSeedChokingAlgorithm;
- QLineEdit txtAnnounceIP;
+ QSpinBox spinBoxCache, spinBoxSaveResumeDataInterval, spinBoxOutgoingPortsMin, spinBoxOutgoingPortsMax, spinBoxListRefresh, spinBoxMaxHalfOpen,
+ spinBoxTrackerPort, spinBoxCacheTTL, spinBoxSendBufferWatermark, spinBoxSendBufferLowWatermark,
+ spinBoxSendBufferWatermarkFactor, spinBoxSavePathHistoryLength;
+ QCheckBox checkBoxOsCache, checkBoxRecheckCompleted, checkBoxResolveCountries, checkBoxResolveHosts, checkBoxSuperSeeding,
+ checkBoxProgramNotifications, checkBoxTorrentAddedNotifications, checkBoxTrackerFavicon, checkBoxTrackerStatus,
+ checkBoxConfirmTorrentRecheck, checkBoxConfirmRemoveAllTags, checkBoxListenIPv6, checkBoxAnnounceAllTrackers, checkBoxAnnounceAllTiers,
+ checkBoxGuidedReadCache, checkBoxMultiConnectionsPerIp, checkBoxSuggestMode, checkBoxCoalesceRW;
+ QComboBox comboBoxInterface, comboBoxInterfaceAddress, comboBoxUtpMixedMode, comboBoxChokingAlgorithm, comboBoxSeedChokingAlgorithm;
+ QLineEdit lineEditAnnounceIP;
// OS dependent settings
#if defined(Q_OS_WIN) || defined(Q_OS_MAC)
- QCheckBox cb_update_check;
+ QCheckBox checkBoxUpdateCheck;
#endif
#if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC))
- QCheckBox cb_use_icon_theme;
+ QCheckBox checkBoxUseIconTheme;
#endif
};
diff --git a/src/gui/deletionconfirmationdialog.h b/src/gui/deletionconfirmationdialog.h
index 65533a4b5..c4822c229 100644
--- a/src/gui/deletionconfirmationdialog.h
+++ b/src/gui/deletionconfirmationdialog.h
@@ -54,8 +54,8 @@ public:
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
const QSize iconSize = Utils::Gui::largeIconSize();
- lbl_warn->setPixmap(GuiIconProvider::instance()->getIcon("dialog-warning").pixmap(iconSize));
- lbl_warn->setFixedWidth(iconSize.width());
+ labelWarning->setPixmap(GuiIconProvider::instance()->getIcon("dialog-warning").pixmap(iconSize));
+ labelWarning->setFixedWidth(iconSize.width());
rememberBtn->setIcon(GuiIconProvider::instance()->getIcon("object-locked"));
rememberBtn->setIconSize(Utils::Gui::mediumIconSize());
diff --git a/src/gui/deletionconfirmationdialog.ui b/src/gui/deletionconfirmationdialog.ui
index 2629e6491..cc891aa09 100644
--- a/src/gui/deletionconfirmationdialog.ui
+++ b/src/gui/deletionconfirmationdialog.ui
@@ -23,7 +23,7 @@
-
-
-
+
0
diff --git a/src/gui/optionsdialog.cpp b/src/gui/optionsdialog.cpp
index 6f91cbe38..8d3929690 100644
--- a/src/gui/optionsdialog.cpp
+++ b/src/gui/optionsdialog.cpp
@@ -165,7 +165,7 @@ OptionsDialog::OptionsDialog(QWidget *parent)
// Load week days (scheduler)
for (uint i = 1; i <= 7; ++i)
- m_ui->schedule_days->addItem(QDate::longDayName(i, QDate::StandaloneFormat));
+ m_ui->comboBoxScheduleDays->addItem(QDate::longDayName(i, QDate::StandaloneFormat));
// Load options
loadOptions();
@@ -176,7 +176,7 @@ OptionsDialog::OptionsDialog(QWidget *parent)
if (!QSystemTrayIcon::isSystemTrayAvailable()) {
m_ui->checkShowSystray->setChecked(false);
m_ui->checkShowSystray->setEnabled(false);
- m_ui->label_trayIconStyle->setVisible(false);
+ m_ui->labelTrayIconStyle->setVisible(false);
m_ui->comboTrayIcon->setVisible(false);
}
#endif
@@ -275,14 +275,14 @@ OptionsDialog::OptionsDialog(QWidget *parent)
connect(m_ui->removeScanFolderButton, &QAbstractButton::clicked, this, &ThisType::enableApplyButton);
connect(m_ui->groupMailNotification, &QGroupBox::toggled, this, &ThisType::enableApplyButton);
connect(m_ui->senderEmailTxt, &QLineEdit::textChanged, this, &ThisType::enableApplyButton);
- connect(m_ui->dest_email_txt, &QLineEdit::textChanged, this, &ThisType::enableApplyButton);
- connect(m_ui->smtp_server_txt, &QLineEdit::textChanged, this, &ThisType::enableApplyButton);
+ connect(m_ui->lineEditDestEmail, &QLineEdit::textChanged, this, &ThisType::enableApplyButton);
+ connect(m_ui->lineEditSmtpServer, &QLineEdit::textChanged, this, &ThisType::enableApplyButton);
connect(m_ui->checkSmtpSSL, &QAbstractButton::toggled, this, &ThisType::enableApplyButton);
connect(m_ui->groupMailNotifAuth, &QGroupBox::toggled, this, &ThisType::enableApplyButton);
connect(m_ui->mailNotifUsername, &QLineEdit::textChanged, this, &ThisType::enableApplyButton);
connect(m_ui->mailNotifPassword, &QLineEdit::textChanged, this, &ThisType::enableApplyButton);
connect(m_ui->autoRunBox, &QGroupBox::toggled, this, &ThisType::enableApplyButton);
- connect(m_ui->autoRun_txt, &QLineEdit::textChanged, this, &ThisType::enableApplyButton);
+ connect(m_ui->lineEditAutoRun, &QLineEdit::textChanged, this, &ThisType::enableApplyButton);
const QString autoRunStr = QString("%1\n %2\n %3\n %4\n %5\n %6\n %7\n %8\n %9\n %10\n %11\n%12")
.arg(tr("Supported parameters (case sensitive):")
@@ -297,7 +297,7 @@ OptionsDialog::OptionsDialog(QWidget *parent)
.arg(tr("%T: Current tracker")
, tr("%I: Info hash")
, tr("Tip: Encapsulate parameter with quotation marks to avoid text being cut off at whitespace (e.g., \"%N\")"));
- m_ui->autoRun_param->setText(autoRunStr);
+ m_ui->labelAutoRunParam->setText(autoRunStr);
// Connection tab
connect(m_ui->comboProtocol, qComboBoxCurrentIndexChanged, this, &ThisType::enableApplyButton);
@@ -312,10 +312,10 @@ OptionsDialog::OptionsDialog(QWidget *parent)
connect(m_ui->spinDownloadLimit, qSpinBoxValueChanged, this, &ThisType::enableApplyButton);
connect(m_ui->spinUploadLimitAlt, qSpinBoxValueChanged, this, &ThisType::enableApplyButton);
connect(m_ui->spinDownloadLimitAlt, qSpinBoxValueChanged, this, &ThisType::enableApplyButton);
- connect(m_ui->check_schedule, &QGroupBox::toggled, this, &ThisType::enableApplyButton);
- connect(m_ui->schedule_from, &QDateTimeEdit::timeChanged, this, &ThisType::enableApplyButton);
- connect(m_ui->schedule_to, &QDateTimeEdit::timeChanged, this, &ThisType::enableApplyButton);
- connect(m_ui->schedule_days, qComboBoxCurrentIndexChanged, this, &ThisType::enableApplyButton);
+ connect(m_ui->groupBoxSchedule, &QGroupBox::toggled, this, &ThisType::enableApplyButton);
+ connect(m_ui->timeEditScheduleFrom, &QDateTimeEdit::timeChanged, this, &ThisType::enableApplyButton);
+ connect(m_ui->timeEditScheduleTo, &QDateTimeEdit::timeChanged, this, &ThisType::enableApplyButton);
+ connect(m_ui->comboBoxScheduleDays, qComboBoxCurrentIndexChanged, this, &ThisType::enableApplyButton);
connect(m_ui->checkLimituTPConnections, &QAbstractButton::toggled, this, &ThisType::enableApplyButton);
connect(m_ui->checkLimitTransportOverhead, &QAbstractButton::toggled, this, &ThisType::enableApplyButton);
connect(m_ui->checkLimitLocalPeerRate, &QAbstractButton::toggled, this, &ThisType::enableApplyButton);
@@ -617,14 +617,14 @@ void OptionsDialog::saveOptions()
session->setFinishedTorrentExportDirectory(getFinishedTorrentExportDir());
pref->setMailNotificationEnabled(m_ui->groupMailNotification->isChecked());
pref->setMailNotificationSender(m_ui->senderEmailTxt->text());
- pref->setMailNotificationEmail(m_ui->dest_email_txt->text());
- pref->setMailNotificationSMTP(m_ui->smtp_server_txt->text());
+ pref->setMailNotificationEmail(m_ui->lineEditDestEmail->text());
+ pref->setMailNotificationSMTP(m_ui->lineEditSmtpServer->text());
pref->setMailNotificationSMTPSSL(m_ui->checkSmtpSSL->isChecked());
pref->setMailNotificationSMTPAuth(m_ui->groupMailNotifAuth->isChecked());
pref->setMailNotificationSMTPUsername(m_ui->mailNotifUsername->text());
pref->setMailNotificationSMTPPassword(m_ui->mailNotifPassword->text());
pref->setAutoRunEnabled(m_ui->autoRunBox->isChecked());
- pref->setAutoRunProgram(m_ui->autoRun_txt->text().trimmed());
+ pref->setAutoRunProgram(m_ui->lineEditAutoRun->text().trimmed());
pref->setActionOnDblClOnTorrentDl(getActionOnDblClOnTorrentDl());
pref->setActionOnDblClOnTorrentFn(getActionOnDblClOnTorrentFn());
TorrentFileGuard::setAutoDeleteMode(!m_ui->deleteTorrentBox->isChecked() ? TorrentFileGuard::Never
@@ -646,10 +646,10 @@ void OptionsDialog::saveOptions()
const QPair alt_down_up_limit = getAltGlobalBandwidthLimits();
session->setAltGlobalDownloadSpeedLimit(alt_down_up_limit.first);
session->setAltGlobalUploadSpeedLimit(alt_down_up_limit.second);
- pref->setSchedulerStartTime(m_ui->schedule_from->time());
- pref->setSchedulerEndTime(m_ui->schedule_to->time());
- pref->setSchedulerDays(static_cast(m_ui->schedule_days->currentIndex()));
- session->setBandwidthSchedulerEnabled(m_ui->check_schedule->isChecked());
+ pref->setSchedulerStartTime(m_ui->timeEditScheduleFrom->time());
+ pref->setSchedulerEndTime(m_ui->timeEditScheduleTo->time());
+ pref->setSchedulerDays(static_cast(m_ui->comboBoxScheduleDays->currentIndex()));
+ session->setBandwidthSchedulerEnabled(m_ui->groupBoxSchedule->isChecked());
auto proxyConfigManager = Net::ProxyConfigurationManager::instance();
Net::ProxyConfiguration proxyConf;
@@ -881,15 +881,15 @@ void OptionsDialog::loadOptions()
m_ui->groupMailNotification->setChecked(pref->isMailNotificationEnabled());
m_ui->senderEmailTxt->setText(pref->getMailNotificationSender());
- m_ui->dest_email_txt->setText(pref->getMailNotificationEmail());
- m_ui->smtp_server_txt->setText(pref->getMailNotificationSMTP());
+ m_ui->lineEditDestEmail->setText(pref->getMailNotificationEmail());
+ m_ui->lineEditSmtpServer->setText(pref->getMailNotificationSMTP());
m_ui->checkSmtpSSL->setChecked(pref->getMailNotificationSMTPSSL());
m_ui->groupMailNotifAuth->setChecked(pref->getMailNotificationSMTPAuth());
m_ui->mailNotifUsername->setText(pref->getMailNotificationSMTPUsername());
m_ui->mailNotifPassword->setText(pref->getMailNotificationSMTPPassword());
m_ui->autoRunBox->setChecked(pref->isAutoRunEnabled());
- m_ui->autoRun_txt->setText(pref->getAutoRunProgram());
+ m_ui->lineEditAutoRun->setText(pref->getAutoRunProgram());
intValue = pref->getActionOnDblClOnTorrentDl();
if (intValue >= m_ui->actionTorrentDlOnDblClBox->count())
intValue = 0;
@@ -1056,10 +1056,10 @@ void OptionsDialog::loadOptions()
m_ui->checkLimitTransportOverhead->setChecked(session->includeOverheadInLimits());
m_ui->checkLimitLocalPeerRate->setChecked(!session->ignoreLimitsOnLAN());
- m_ui->check_schedule->setChecked(session->isBandwidthSchedulerEnabled());
- m_ui->schedule_from->setTime(pref->getSchedulerStartTime());
- m_ui->schedule_to->setTime(pref->getSchedulerEndTime());
- m_ui->schedule_days->setCurrentIndex(static_cast(pref->getSchedulerDays()));
+ m_ui->groupBoxSchedule->setChecked(session->isBandwidthSchedulerEnabled());
+ m_ui->timeEditScheduleFrom->setTime(pref->getSchedulerStartTime());
+ m_ui->timeEditScheduleTo->setTime(pref->getSchedulerEndTime());
+ m_ui->comboBoxScheduleDays->setCurrentIndex(static_cast(pref->getSchedulerDays()));
// End Speed preferences
// Bittorrent preferences
@@ -1786,7 +1786,7 @@ bool OptionsDialog::setSslCertificate(const QByteArray &cert)
bool OptionsDialog::schedTimesOk()
{
- if (m_ui->schedule_from->time() == m_ui->schedule_to->time()) {
+ if (m_ui->timeEditScheduleFrom->time() == m_ui->timeEditScheduleTo->time()) {
QMessageBox::warning(this, tr("Time Error"), tr("The start time and the end time can't be the same."));
return false;
}
diff --git a/src/gui/optionsdialog.ui b/src/gui/optionsdialog.ui
index 9911c3158..c35d49072 100644
--- a/src/gui/optionsdialog.ui
+++ b/src/gui/optionsdialog.ui
@@ -416,7 +416,7 @@
-
-
-
+
Tray icon style:
@@ -1127,7 +1127,7 @@
-
-
-
+
-
@@ -1144,7 +1144,7 @@
-
-
+
-
@@ -1220,10 +1220,10 @@
-
-
+
-
-
+
true
@@ -1884,7 +1884,7 @@
-
-
+
Schedule &the use of alternative rate limits
@@ -1903,7 +1903,7 @@
-
-
+
true
@@ -1927,7 +1927,7 @@
-
-
+
true
@@ -1954,7 +1954,7 @@
-
-
+
0
@@ -3384,14 +3384,14 @@ Use ';' to split multiple entries. Can use wildcard '*'.
checkExportDirFin
textExportDirFin
groupMailNotification
- dest_email_txt
- smtp_server_txt
+ lineEditDestEmail
+ lineEditSmtpServer
groupMailNotifAuth
mailNotifUsername
mailNotifPassword
checkSmtpSSL
autoRunBox
- autoRun_txt
+ lineEditAutoRun
scrollArea_3
randomButton
checkRandomPort
@@ -3421,10 +3421,10 @@ Use ';' to split multiple entries. Can use wildcard '*'.
checkUploadLimit
spinDownloadLimit
checkDownloadLimit
- check_schedule
- schedule_to
- schedule_from
- schedule_days
+ groupBoxSchedule
+ timeEditScheduleTo
+ timeEditScheduleFrom
+ comboBoxScheduleDays
checkUploadLimitAlt
checkDownloadLimitAlt
spinUploadLimitAlt
diff --git a/src/gui/properties/peersadditiondialog.cpp b/src/gui/properties/peersadditiondialog.cpp
index 4c83f2cc7..68d3f8905 100644
--- a/src/gui/properties/peersadditiondialog.cpp
+++ b/src/gui/properties/peersadditiondialog.cpp
@@ -55,13 +55,13 @@ QList PeersAdditionDialog::askForPeers(QWidget *parent)
void PeersAdditionDialog::validateInput()
{
- if (m_ui->peers_txt->toPlainText().trimmed().isEmpty()) {
+ if (m_ui->textEditPeers->toPlainText().trimmed().isEmpty()) {
QMessageBox::warning(this, tr("No peer entered"),
tr("Please type at least one peer."),
QMessageBox::Ok);
return;
}
- foreach (const QString &peer, m_ui->peers_txt->toPlainText().trimmed().split('\n')) {
+ foreach (const QString &peer, m_ui->textEditPeers->toPlainText().trimmed().split('\n')) {
BitTorrent::PeerAddress addr = parsePeer(peer);
if (!addr.ip.isNull()) {
m_peersList.append(addr);
diff --git a/src/gui/properties/peersadditiondialog.ui b/src/gui/properties/peersadditiondialog.ui
index 751ef1c4b..a7aab53c7 100644
--- a/src/gui/properties/peersadditiondialog.ui
+++ b/src/gui/properties/peersadditiondialog.ui
@@ -22,7 +22,7 @@
-
-
+
QTextEdit::NoWrap
diff --git a/src/gui/properties/propertieswidget.cpp b/src/gui/properties/propertieswidget.cpp
index ee200fee9..628128bf9 100644
--- a/src/gui/properties/propertieswidget.cpp
+++ b/src/gui/properties/propertieswidget.cpp
@@ -139,10 +139,10 @@ PropertiesWidget::PropertiesWidget(QWidget *parent, MainWindow *mainWindow, Tran
m_ui->trackerDownButton->setIconSize(Utils::Gui::smallIconSize());
connect(m_ui->trackerUpButton, &QPushButton::clicked, m_trackerList, &TrackerListWidget::moveSelectionUp);
connect(m_ui->trackerDownButton, &QPushButton::clicked, m_trackerList, &TrackerListWidget::moveSelectionDown);
- m_ui->horizontalLayout_trackers->insertWidget(0, m_trackerList);
+ m_ui->hBoxLayoutTrackers->insertWidget(0, m_trackerList);
// Peers list
m_peerList = new PeerListWidget(this);
- m_ui->peerpage_layout->addWidget(m_peerList);
+ m_ui->vBoxLayoutPeerPage->addWidget(m_peerList);
// Speed widget
m_speedWidget = new SpeedWidget(this);
m_ui->speedLayout->addWidget(m_speedWidget);
@@ -604,7 +604,7 @@ void PropertiesWidget::displayFilesListMenu(const QPoint &)
QMenu subMenu;
if (!m_torrent->isSeed()) {
subMenu.setTitle(tr("Priority"));
- subMenu.addAction(m_ui->actionNot_downloaded);
+ subMenu.addAction(m_ui->actionNotDownloaded);
subMenu.addAction(m_ui->actionNormal);
subMenu.addAction(m_ui->actionHigh);
subMenu.addAction(m_ui->actionMaximum);
@@ -632,7 +632,7 @@ void PropertiesWidget::displayFilesListMenu(const QPoint &)
prio = prio::HIGH;
else if (act == m_ui->actionMaximum)
prio = prio::MAXIMUM;
- else if (act == m_ui->actionNot_downloaded)
+ else if (act == m_ui->actionNotDownloaded)
prio = prio::IGNORED;
qDebug("Setting files priority");
diff --git a/src/gui/properties/propertieswidget.ui b/src/gui/properties/propertieswidget.ui
index 26c2ebe69..4f8d46e4f 100644
--- a/src/gui/properties/propertieswidget.ui
+++ b/src/gui/properties/propertieswidget.ui
@@ -905,7 +905,7 @@
-
+
0
@@ -957,7 +957,7 @@
-
+
0
@@ -1083,7 +1083,7 @@
-
+
Do not download
diff --git a/src/gui/properties/trackersadditiondialog.cpp b/src/gui/properties/trackersadditiondialog.cpp
index ee9d11219..41aff1346 100644
--- a/src/gui/properties/trackersadditiondialog.cpp
+++ b/src/gui/properties/trackersadditiondialog.cpp
@@ -60,7 +60,7 @@ TrackersAdditionDialog::~TrackersAdditionDialog()
QStringList TrackersAdditionDialog::newTrackers() const
{
QStringList cleanTrackers;
- foreach (QString url, m_ui->trackers_list->toPlainText().split('\n')) {
+ foreach (QString url, m_ui->textEditTrackersList->toPlainText().split('\n')) {
url = url.trimmed();
if (!url.isEmpty())
cleanTrackers << url;
@@ -71,7 +71,7 @@ QStringList TrackersAdditionDialog::newTrackers() const
void TrackersAdditionDialog::on_uTorrentListButton_clicked()
{
m_ui->uTorrentListButton->setEnabled(false);
- Net::DownloadHandler *handler = Net::DownloadManager::instance()->download({m_ui->list_url->text()});
+ Net::DownloadHandler *handler = Net::DownloadManager::instance()->download({m_ui->lineEditListURL->text()});
connect(handler, static_cast(&Net::DownloadHandler::downloadFinished)
, this, &TrackersAdditionDialog::parseUTorrentList);
connect(handler, &Net::DownloadHandler::downloadFailed, this, &TrackersAdditionDialog::getTrackerError);
@@ -84,7 +84,7 @@ void TrackersAdditionDialog::parseUTorrentList(const QString &, const QByteArray
// Load from torrent handle
QList existingTrackers = m_torrent->trackers();
// Load from current user list
- QStringList tmp = m_ui->trackers_list->toPlainText().split('\n');
+ QStringList tmp = m_ui->textEditTrackersList->toPlainText().split('\n');
foreach (const QString &userURL, tmp) {
BitTorrent::TrackerEntry userTracker(userURL);
if (!existingTrackers.contains(userTracker))
@@ -92,8 +92,8 @@ void TrackersAdditionDialog::parseUTorrentList(const QString &, const QByteArray
}
// Add new trackers to the list
- if (!m_ui->trackers_list->toPlainText().isEmpty() && !m_ui->trackers_list->toPlainText().endsWith('\n'))
- m_ui->trackers_list->insertPlainText("\n");
+ if (!m_ui->textEditTrackersList->toPlainText().isEmpty() && !m_ui->textEditTrackersList->toPlainText().endsWith('\n'))
+ m_ui->textEditTrackersList->insertPlainText("\n");
int nb = 0;
QBuffer buffer;
buffer.setData(data);
@@ -104,7 +104,7 @@ void TrackersAdditionDialog::parseUTorrentList(const QString &, const QByteArray
BitTorrent::TrackerEntry newTracker(line);
if (!existingTrackers.contains(newTracker)) {
- m_ui->trackers_list->insertPlainText(line + '\n');
+ m_ui->textEditTrackersList->insertPlainText(line + '\n');
++nb;
}
}
diff --git a/src/gui/properties/trackersadditiondialog.ui b/src/gui/properties/trackersadditiondialog.ui
index 07e62caf9..33528cb8c 100644
--- a/src/gui/properties/trackersadditiondialog.ui
+++ b/src/gui/properties/trackersadditiondialog.ui
@@ -22,7 +22,7 @@
-
-
+
QTextEdit::NoWrap
@@ -41,7 +41,7 @@
-
-
-
+
-
diff --git a/src/gui/rss/automatedrssdownloader.cpp b/src/gui/rss/automatedrssdownloader.cpp
index 6575b5b97..e3a2d3485 100644
--- a/src/gui/rss/automatedrssdownloader.cpp
+++ b/src/gui/rss/automatedrssdownloader.cpp
@@ -253,7 +253,7 @@ void AutomatedRssDownloader::updateRuleDefinitionBox()
m_ui->lineEFilter->setText(m_currentRule.episodeFilter());
else
m_ui->lineEFilter->clear();
- m_ui->saveDiffDir_check->setChecked(!m_currentRule.savePath().isEmpty());
+ m_ui->checkBoxSaveDiffDir->setChecked(!m_currentRule.savePath().isEmpty());
m_ui->lineSavePath->setText(Utils::Fs::toNativePath(m_currentRule.savePath()));
m_ui->checkRegex->blockSignals(true);
m_ui->checkRegex->setChecked(m_currentRule.useRegex());
@@ -300,7 +300,7 @@ void AutomatedRssDownloader::clearRuleDefinitionBox()
m_ui->lineContains->clear();
m_ui->lineNotContains->clear();
m_ui->lineEFilter->clear();
- m_ui->saveDiffDir_check->setChecked(false);
+ m_ui->checkBoxSaveDiffDir->setChecked(false);
m_ui->lineSavePath->clear();
m_ui->comboCategory->clearEditText();
m_ui->comboCategory->setCurrentIndex(-1);
@@ -334,7 +334,7 @@ void AutomatedRssDownloader::updateEditedRule()
m_currentRule.setMustContain(m_ui->lineContains->text());
m_currentRule.setMustNotContain(m_ui->lineNotContains->text());
m_currentRule.setEpisodeFilter(m_ui->lineEFilter->text());
- m_currentRule.setSavePath(m_ui->saveDiffDir_check->isChecked() ? m_ui->lineSavePath->text() : "");
+ m_currentRule.setSavePath(m_ui->checkBoxSaveDiffDir->isChecked() ? m_ui->lineSavePath->text() : "");
m_currentRule.setCategory(m_ui->comboCategory->currentText());
TriStateBool addPaused; // Undefined by default
if (m_ui->comboAddPaused->currentIndex() == 1)
@@ -692,13 +692,13 @@ void AutomatedRssDownloader::updateMustLineValidity()
if (valid) {
m_ui->lineContains->setStyleSheet("");
- m_ui->lbl_must_stat->setPixmap(QPixmap());
- m_ui->lbl_must_stat->setToolTip("");
+ m_ui->labelMustStat->setPixmap(QPixmap());
+ m_ui->labelMustStat->setToolTip("");
}
else {
m_ui->lineContains->setStyleSheet("QLineEdit { color: #ff0000; }");
- m_ui->lbl_must_stat->setPixmap(GuiIconProvider::instance()->getIcon("task-attention").pixmap(16, 16));
- m_ui->lbl_must_stat->setToolTip(error);
+ m_ui->labelMustStat->setPixmap(GuiIconProvider::instance()->getIcon("task-attention").pixmap(16, 16));
+ m_ui->labelMustStat->setToolTip(error);
}
}
@@ -730,13 +730,13 @@ void AutomatedRssDownloader::updateMustNotLineValidity()
if (valid) {
m_ui->lineNotContains->setStyleSheet("");
- m_ui->lbl_mustnot_stat->setPixmap(QPixmap());
- m_ui->lbl_mustnot_stat->setToolTip("");
+ m_ui->labelMustNotStat->setPixmap(QPixmap());
+ m_ui->labelMustNotStat->setToolTip("");
}
else {
m_ui->lineNotContains->setStyleSheet("QLineEdit { color: #ff0000; }");
- m_ui->lbl_mustnot_stat->setPixmap(GuiIconProvider::instance()->getIcon("task-attention").pixmap(16, 16));
- m_ui->lbl_mustnot_stat->setToolTip(error);
+ m_ui->labelMustNotStat->setPixmap(GuiIconProvider::instance()->getIcon("task-attention").pixmap(16, 16));
+ m_ui->labelMustNotStat->setToolTip(error);
}
}
@@ -747,11 +747,11 @@ void AutomatedRssDownloader::updateEpisodeFilterValidity()
if (valid) {
m_ui->lineEFilter->setStyleSheet("");
- m_ui->lbl_epfilter_stat->setPixmap(QPixmap());
+ m_ui->labelEpFilterStat->setPixmap(QPixmap());
}
else {
m_ui->lineEFilter->setStyleSheet("QLineEdit { color: #ff0000; }");
- m_ui->lbl_epfilter_stat->setPixmap(GuiIconProvider::instance()->getIcon("task-attention").pixmap(16, 16));
+ m_ui->labelEpFilterStat->setPixmap(GuiIconProvider::instance()->getIcon("task-attention").pixmap(16, 16));
}
}
diff --git a/src/gui/rss/automatedrssdownloader.ui b/src/gui/rss/automatedrssdownloader.ui
index dd48649dd..f1357eab4 100644
--- a/src/gui/rss/automatedrssdownloader.ui
+++ b/src/gui/rss/automatedrssdownloader.ui
@@ -140,7 +140,7 @@
-
-
+
18
@@ -153,7 +153,7 @@
-
-
+
18
@@ -163,7 +163,7 @@
-
-
+
18
@@ -223,7 +223,7 @@ Supports the formats: S01E01, 1x1, 2017.01.01 and 01.01.2017 (Date formats also
-
-
+
Save to a Different Directory
@@ -438,7 +438,7 @@ Supports the formats: S01E01, 1x1, 2017.01.01 and 01.01.2017 (Date formats also
lineNotContains
lineEFilter
comboCategory
- saveDiffDir_check
+ checkBoxSaveDiffDir
lineSavePath
browseSP
spinIgnorePeriod
@@ -483,7 +483,7 @@ Supports the formats: S01E01, 1x1, 2017.01.01 and 01.01.2017 (Date formats also
- saveDiffDir_check
+ checkBoxSaveDiffDir
toggled(bool)
label_6
setEnabled(bool)
@@ -499,7 +499,7 @@ Supports the formats: S01E01, 1x1, 2017.01.01 and 01.01.2017 (Date formats also
- saveDiffDir_check
+ checkBoxSaveDiffDir
toggled(bool)
lineSavePath
setEnabled(bool)
@@ -515,7 +515,7 @@ Supports the formats: S01E01, 1x1, 2017.01.01 and 01.01.2017 (Date formats also
- saveDiffDir_check
+ checkBoxSaveDiffDir
toggled(bool)
browseSP
setEnabled(bool)
diff --git a/src/gui/search/searchwidget.cpp b/src/gui/search/searchwidget.cpp
index ccff90752..6e4c40296 100644
--- a/src/gui/search/searchwidget.cpp
+++ b/src/gui/search/searchwidget.cpp
@@ -116,7 +116,7 @@ SearchWidget::SearchWidget(MainWindow *mainWindow)
"Search phrase example, illustrates quotes usage, double quoted"
"pair of space delimited words, the whole pair is highlighted")
<< "