d4708/qBittorrent
1
0
Fork 0
mirror of https://github.com/d47081/qBittorrent.git synced 2025-02-02 09:55:55 +00:00
Code Issues Projects Releases Wiki Activity

Use less operations when building strings

Browse Source
This commit is contained in:
Chocobo1 2019-05-27 16:19:24 +08:00
parent 0fe9cd05c4
commit 49df1cd3c7
No known key found for this signature in database
GPG Key ID: 210D9C873253A68C
3 changed files with 23 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/gui/addnewtorrentdialog.cpp
View File

@ -402,11 +402,9 @@ void AddNewTorrentDialog::updateDiskSpaceLabel()
} }
} }
QString sizeString = torrentSize ? Utils::Misc::friendlyUnit(torrentSize) : QString(tr("Not Available", "This size is unavailable.")); const QString sizeString = tr("%1 (Free space on disk: %2)").arg(
sizeString += " ("; ((torrentSize > 0) ? Utils::Misc::friendlyUnit(torrentSize) : tr("Not available", "This size is unavailable."))
sizeString += tr("Free space on disk: %1").arg(Utils::Misc::friendlyUnit(Utils::Fs::freeDiskSpaceOnPath( , Utils::Misc::friendlyUnit(Utils::Fs::freeDiskSpaceOnPath(m_ui->savePath->selectedPath())));
m_ui->savePath->selectedPath())));
sizeString += ')';
m_ui->labelSizeData->setText(sizeString); m_ui->labelSizeData->setText(sizeString);
} }

27
src/gui/mainwindow.cpp
View File

@ -1529,20 +1529,23 @@ void MainWindow::updateGUI()
#ifndef Q_OS_MAC #ifndef Q_OS_MAC
if (m_systrayIcon) { if (m_systrayIcon) {
#ifdef Q_OS_UNIX #ifdef Q_OS_UNIX
QString html = "<div style='background-color: #678db2; color: #fff;height: 18px; font-weight: bold; margin-bottom: 5px;'>"; const QString html = QString(QLatin1String(
html += "qBittorrent"; "<div style='background-color: #678db2; color: #fff;height: 18px; font-weight: bold; margin-bottom: 5px;'>"
html += "</div>"; "qBittorrent"
html += "<div style='vertical-align: baseline; height: 18px;'>"; "</div>"
html += "<img src=':/icons/skin/download.svg' height='14'/>&nbsp;" + tr("DL speed: %1", "e.g: Download speed: 10 KiB/s").arg(Utils::Misc::friendlyUnit(status.payloadDownloadRate, true)); "<div style='vertical-align: baseline; height: 18px;'>"
html += "</div>"; "<img src=':/icons/skin/download.svg' height='14'/>&nbsp;%1"
html += "<div style='vertical-align: baseline; height: 18px;'>"; "</div>"
html += "<img src=':/icons/skin/seeding.svg' height='14'/>&nbsp;" + tr("UP speed: %1", "e.g: Upload speed: 10 KiB/s").arg(Utils::Misc::friendlyUnit(status.payloadUploadRate, true)); "<div style='vertical-align: baseline; height: 18px;'>"
html += "</div>"; "<img src=':/icons/skin/seeding.svg' height='14'/>&nbsp;%2"
"</div>"))
.arg(tr("DL speed: %1", "e.g: Download speed: 10 KiB/s").arg(Utils::Misc::friendlyUnit(status.payloadDownloadRate, true))
, tr("UP speed: %1", "e.g: Upload speed: 10 KiB/s").arg(Utils::Misc::friendlyUnit(status.payloadUploadRate, true)));
#else #else
// OSes such as Windows do not support html here // OSes such as Windows do not support html here
QString html = tr("DL speed: %1", "e.g: Download speed: 10 KiB/s").arg(Utils::Misc::friendlyUnit(status.payloadDownloadRate, true)); const QString html = QString("%1\n%2").arg(
html += '\n'; tr("DL speed: %1", "e.g: Download speed: 10 KiB/s").arg(Utils::Misc::friendlyUnit(status.payloadDownloadRate, true))
html += tr("UP speed: %1", "e.g: Upload speed: 10 KiB/s").arg(Utils::Misc::friendlyUnit(status.payloadUploadRate, true)); , tr("UP speed: %1", "e.g: Upload speed: 10 KiB/s").arg(Utils::Misc::friendlyUnit(status.payloadUploadRate, true)));
#endif // Q_OS_UNIX #endif // Q_OS_UNIX
m_systrayIcon->setToolTip(html); // tray icon m_systrayIcon->setToolTip(html); // tray icon
} }

10
src/gui/rss/rsswidget.cpp
View File

@ -448,15 +448,15 @@ void RSSWidget::handleCurrentArticleItemChanged(QListWidgetItem *currentItem, QL
auto article = m_articleListWidget->getRSSArticle(currentItem); auto article = m_articleListWidget->getRSSArticle(currentItem);
Q_ASSERT(article); Q_ASSERT(article);
QString html; QString html =
html += "<div style='border: 2px solid red; margin-left: 5px; margin-right: 5px; margin-bottom: 5px;'>"; "<div style='border: 2px solid red; margin-left: 5px; margin-right: 5px; margin-bottom: 5px;'>"
html += "<div style='background-color: #678db2; font-weight: bold; color: #fff;'>" + article->title() + "</div>"; "<div style='background-color: #678db2; font-weight: bold; color: #fff;'>" + article->title() + "</div>";
if (article->date().isValid()) if (article->date().isValid())
html += "<div style='background-color: #efefef;'><b>" + tr("Date: ") + "</b>" + article->date().toLocalTime().toString(Qt::SystemLocaleLongDate) + "</div>"; html += "<div style='background-color: #efefef;'><b>" + tr("Date: ") + "</b>" + article->date().toLocalTime().toString(Qt::SystemLocaleLongDate) + "</div>";
if (!article->author().isEmpty()) if (!article->author().isEmpty())
html += "<div style='background-color: #efefef;'><b>" + tr("Author: ") + "</b>" + article->author() + "</div>"; html += "<div style='background-color: #efefef;'><b>" + tr("Author: ") + "</b>" + article->author() + "</div>";
html += "</div>"; html += "</div>"
html += "<div style='margin-left: 5px; margin-right: 5px;'>"; "<div style='margin-left: 5px; margin-right: 5px;'>";
if (Qt::mightBeRichText(article->description())) { if (Qt::mightBeRichText(article->description())) {
html += article->description(); html += article->description();
} }