diff --git a/src/base/iconprovider.cpp b/src/base/iconprovider.cpp index 9851536e9..7289261ba 100644 --- a/src/base/iconprovider.cpp +++ b/src/base/iconprovider.cpp @@ -29,6 +29,8 @@ #include "iconprovider.h" +#include + IconProvider::IconProvider(QObject *parent) : QObject(parent) { @@ -57,7 +59,13 @@ IconProvider *IconProvider::instance() QString IconProvider::getIconPath(const QString &iconId) const { - return ":/icons/qbt-theme/" + iconId + ".png"; + // there are a few icons not available in svg + const QString pathSvg = ":/icons/qbt-theme/" + iconId + ".svg"; + if (QFileInfo::exists(pathSvg)) + return pathSvg; + + const QString pathPng = ":/icons/qbt-theme/" + iconId + ".png"; + return pathPng; } IconProvider *IconProvider::m_instance = nullptr; diff --git a/src/gui/guiiconprovider.cpp b/src/gui/guiiconprovider.cpp index 292061c8d..b1f6ef4ec 100644 --- a/src/gui/guiiconprovider.cpp +++ b/src/gui/guiiconprovider.cpp @@ -29,6 +29,7 @@ #include "guiiconprovider.h" +#include #include #include #if (defined(Q_OS_UNIX) && !defined(Q_OS_MAC)) @@ -76,7 +77,15 @@ QIcon GuiIconProvider::getIcon(const QString &iconId, const QString &fallback) c #else Q_UNUSED(fallback) #endif - return QIcon(IconProvider::getIconPath(iconId)); + // cache to avoid rescaling svg icons + static QHash iconCache; + const auto iter = iconCache.find(iconId); + if (iter != iconCache.end()) + return *iter; + + const QIcon icon {IconProvider::getIconPath(iconId)}; + iconCache[iconId] = icon; + return icon; } QIcon GuiIconProvider::getFlagIcon(const QString &countryIsoCode) const diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index 7bb893e2a..7077375d7 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -1568,10 +1568,10 @@ void MainWindow::updateGUI() html += "qBittorrent"; html += ""; html += "
"; - html += " " + tr("DL speed: %1", "e.g: Download speed: 10 KiB/s").arg(Utils::Misc::friendlyUnit(status.payloadDownloadRate, true)); + html += " " + tr("DL speed: %1", "e.g: Download speed: 10 KiB/s").arg(Utils::Misc::friendlyUnit(status.payloadDownloadRate, true)); html += "
"; html += "
"; - html += " " + tr("UP speed: %1", "e.g: Upload speed: 10 KiB/s").arg(Utils::Misc::friendlyUnit(status.payloadUploadRate, true)); + html += " " + tr("UP speed: %1", "e.g: Upload speed: 10 KiB/s").arg(Utils::Misc::friendlyUnit(status.payloadUploadRate, true)); html += "
"; #else // OSes such as Windows do not support html here diff --git a/src/gui/optionsdialog.cpp b/src/gui/optionsdialog.cpp index 44209f49a..0f32793b7 100644 --- a/src/gui/optionsdialog.cpp +++ b/src/gui/optionsdialog.cpp @@ -1751,11 +1751,11 @@ bool OptionsDialog::setSslKey(const QByteArray &key) // try different formats const bool isKeyValid = (!QSslKey(key, QSsl::Rsa).isNull() || !QSslKey(key, QSsl::Ec).isNull()); if (isKeyValid) { - m_ui->lblSslKeyStatus->setPixmap(Utils::Gui::scaledPixmap(":/icons/qbt-theme/security-high.png", this, 24)); + m_ui->lblSslKeyStatus->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/qbt-theme/security-high.svg", this, 24)); m_sslKey = key; } else { - m_ui->lblSslKeyStatus->setPixmap(Utils::Gui::scaledPixmap(":/icons/qbt-theme/security-low.png", this, 24)); + m_ui->lblSslKeyStatus->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/qbt-theme/security-low.svg", this, 24)); m_sslKey.clear(); } return isKeyValid; @@ -1770,11 +1770,11 @@ bool OptionsDialog::setSslCertificate(const QByteArray &cert) #ifndef QT_NO_OPENSSL const bool isCertValid = !QSslCertificate(cert).isNull(); if (isCertValid) { - m_ui->lblSslCertStatus->setPixmap(Utils::Gui::scaledPixmap(":/icons/qbt-theme/security-high.png", this, 24)); + m_ui->lblSslCertStatus->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/qbt-theme/security-high.svg", this, 24)); m_sslCert = cert; } else { - m_ui->lblSslCertStatus->setPixmap(Utils::Gui::scaledPixmap(":/icons/qbt-theme/security-low.png", this, 24)); + m_ui->lblSslCertStatus->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/qbt-theme/security-low.svg", this, 24)); m_sslCert.clear(); } return isCertValid; diff --git a/src/gui/statusbar.cpp b/src/gui/statusbar.cpp index ce61ec2fb..52a1c3b40 100644 --- a/src/gui/statusbar.cpp +++ b/src/gui/statusbar.cpp @@ -63,14 +63,14 @@ StatusBar::StatusBar(QWidget *parent) m_connecStatusLblIcon->setFlat(true); m_connecStatusLblIcon->setFocusPolicy(Qt::NoFocus); m_connecStatusLblIcon->setCursor(Qt::PointingHandCursor); - m_connecStatusLblIcon->setIcon(QIcon(":/icons/skin/firewalled.png")); + m_connecStatusLblIcon->setIcon(QIcon(":/icons/skin/firewalled.svg")); m_connecStatusLblIcon->setToolTip( QString(QLatin1String("%1
%2")).arg(tr("Connection status:") , tr("No direct connections. This may indicate network configuration problems."))); connect(m_connecStatusLblIcon, &QAbstractButton::clicked, this, &StatusBar::connectionButtonClicked); m_dlSpeedLbl = new QPushButton(this); - m_dlSpeedLbl->setIcon(QIcon(":/icons/skin/download.png")); + m_dlSpeedLbl->setIcon(QIcon(":/icons/skin/download.svg")); connect(m_dlSpeedLbl, &QAbstractButton::clicked, this, &StatusBar::capDownloadSpeed); m_dlSpeedLbl->setFlat(true); m_dlSpeedLbl->setFocusPolicy(Qt::NoFocus); @@ -79,7 +79,7 @@ StatusBar::StatusBar(QWidget *parent) m_dlSpeedLbl->setMinimumWidth(200); m_upSpeedLbl = new QPushButton(this); - m_upSpeedLbl->setIcon(QIcon(":/icons/skin/seeding.png")); + m_upSpeedLbl->setIcon(QIcon(":/icons/skin/seeding.svg")); connect(m_upSpeedLbl, &QAbstractButton::clicked, this, &StatusBar::capUploadSpeed); m_upSpeedLbl->setFlat(true); m_upSpeedLbl->setFocusPolicy(Qt::NoFocus); @@ -174,17 +174,17 @@ void StatusBar::updateConnectionStatus() const BitTorrent::SessionStatus &sessionStatus = BitTorrent::Session::instance()->status(); if (!BitTorrent::Session::instance()->isListening()) { - m_connecStatusLblIcon->setIcon(QIcon(QLatin1String(":/icons/skin/disconnected.png"))); + m_connecStatusLblIcon->setIcon(QIcon(QLatin1String(":/icons/skin/disconnected.svg"))); m_connecStatusLblIcon->setToolTip(QLatin1String("") + tr("Connection Status:") + QLatin1String("
") + tr("Offline. This usually means that qBittorrent failed to listen on the selected port for incoming connections.")); } else { if (sessionStatus.hasIncomingConnections) { // Connection OK - m_connecStatusLblIcon->setIcon(QIcon(QLatin1String(":/icons/skin/connected.png"))); + m_connecStatusLblIcon->setIcon(QIcon(QLatin1String(":/icons/skin/connected.svg"))); m_connecStatusLblIcon->setToolTip(QLatin1String("") + tr("Connection Status:") + QLatin1String("
") + tr("Online")); } else { - m_connecStatusLblIcon->setIcon(QIcon(QLatin1String(":/icons/skin/firewalled.png"))); + m_connecStatusLblIcon->setIcon(QIcon(QLatin1String(":/icons/skin/firewalled.svg"))); m_connecStatusLblIcon->setToolTip(QLatin1String("") + tr("Connection status:") + QLatin1String("
") + QLatin1String("") + tr("No direct connections. This may indicate network configuration problems.") + QLatin1String("")); } } diff --git a/src/gui/trackerlogindialog.cpp b/src/gui/trackerlogindialog.cpp index 37f780b99..ca8d7e52e 100644 --- a/src/gui/trackerlogindialog.cpp +++ b/src/gui/trackerlogindialog.cpp @@ -33,6 +33,7 @@ #include #include "base/bittorrent/torrenthandle.h" +#include "guiiconprovider.h" #include "utils.h" TrackerLoginDialog::TrackerLoginDialog(QWidget *parent, BitTorrent::TorrentHandle *const torrent) @@ -44,7 +45,7 @@ TrackerLoginDialog::TrackerLoginDialog(QWidget *parent, BitTorrent::TorrentHandl buttonBox->button(QDialogButtonBox::Ok)->setText(tr("Log in")); - labelLoginLogo->setPixmap(QPixmap(QLatin1String(":/icons/qbt-theme/encrypted.png"))); + labelLoginLogo->setPixmap(Utils::Gui::scaledPixmap(GuiIconProvider::instance()->getIcon("document-encrypt"), this, 32)); labelTrackerURL->setText(torrent->currentTracker()); diff --git a/src/gui/transferlistfilterswidget.cpp b/src/gui/transferlistfilterswidget.cpp index e2d746903..66a90de56 100644 --- a/src/gui/transferlistfilterswidget.cpp +++ b/src/gui/transferlistfilterswidget.cpp @@ -132,31 +132,31 @@ StatusFilterWidget::StatusFilterWidget(QWidget *parent, TransferListWidget *tran // Add status filters QListWidgetItem *all = new QListWidgetItem(this); all->setData(Qt::DisplayRole, QVariant(tr("All (0)", "this is for the status filter"))); - all->setData(Qt::DecorationRole, QIcon(":/icons/skin/filterall.png")); + all->setData(Qt::DecorationRole, QIcon(":/icons/skin/filterall.svg")); QListWidgetItem *downloading = new QListWidgetItem(this); downloading->setData(Qt::DisplayRole, QVariant(tr("Downloading (0)"))); - downloading->setData(Qt::DecorationRole, QIcon(":/icons/skin/downloading.png")); + downloading->setData(Qt::DecorationRole, QIcon(":/icons/skin/downloading.svg")); QListWidgetItem *seeding = new QListWidgetItem(this); seeding->setData(Qt::DisplayRole, QVariant(tr("Seeding (0)"))); - seeding->setData(Qt::DecorationRole, QIcon(":/icons/skin/uploading.png")); + seeding->setData(Qt::DecorationRole, QIcon(":/icons/skin/uploading.svg")); QListWidgetItem *completed = new QListWidgetItem(this); completed->setData(Qt::DisplayRole, QVariant(tr("Completed (0)"))); - completed->setData(Qt::DecorationRole, QIcon(":/icons/skin/completed.png")); + completed->setData(Qt::DecorationRole, QIcon(":/icons/skin/completed.svg")); QListWidgetItem *resumed = new QListWidgetItem(this); resumed->setData(Qt::DisplayRole, QVariant(tr("Resumed (0)"))); - resumed->setData(Qt::DecorationRole, QIcon(":/icons/skin/resumed.png")); + resumed->setData(Qt::DecorationRole, QIcon(":/icons/skin/resumed.svg")); QListWidgetItem *paused = new QListWidgetItem(this); paused->setData(Qt::DisplayRole, QVariant(tr("Paused (0)"))); - paused->setData(Qt::DecorationRole, QIcon(":/icons/skin/paused.png")); + paused->setData(Qt::DecorationRole, QIcon(":/icons/skin/paused.svg")); QListWidgetItem *active = new QListWidgetItem(this); active->setData(Qt::DisplayRole, QVariant(tr("Active (0)"))); - active->setData(Qt::DecorationRole, QIcon(":/icons/skin/filteractive.png")); + active->setData(Qt::DecorationRole, QIcon(":/icons/skin/filteractive.svg")); QListWidgetItem *inactive = new QListWidgetItem(this); inactive->setData(Qt::DisplayRole, QVariant(tr("Inactive (0)"))); - inactive->setData(Qt::DecorationRole, QIcon(":/icons/skin/filterinactive.png")); + inactive->setData(Qt::DecorationRole, QIcon(":/icons/skin/filterinactive.svg")); QListWidgetItem *errored = new QListWidgetItem(this); errored->setData(Qt::DisplayRole, QVariant(tr("Errored (0)"))); - errored->setData(Qt::DecorationRole, QIcon(":/icons/skin/error.png")); + errored->setData(Qt::DecorationRole, QIcon(":/icons/skin/error.svg")); const Preferences *const pref = Preferences::instance(); setCurrentRow(pref->getTransSelFilter(), QItemSelectionModel::SelectCurrent); diff --git a/src/gui/transferlistmodel.cpp b/src/gui/transferlistmodel.cpp index adfd8773d..f7766c814 100644 --- a/src/gui/transferlistmodel.cpp +++ b/src/gui/transferlistmodel.cpp @@ -419,55 +419,55 @@ QColor getColorByState(BitTorrent::TorrentState state) QIcon getPausedIcon() { - static QIcon cached = QIcon(":/icons/skin/paused.png"); + static QIcon cached = QIcon(":/icons/skin/paused.svg"); return cached; } QIcon getQueuedIcon() { - static QIcon cached = QIcon(":/icons/skin/queued.png"); + static QIcon cached = QIcon(":/icons/skin/queued.svg"); return cached; } QIcon getDownloadingIcon() { - static QIcon cached = QIcon(":/icons/skin/downloading.png"); + static QIcon cached = QIcon(":/icons/skin/downloading.svg"); return cached; } QIcon getStalledDownloadingIcon() { - static QIcon cached = QIcon(":/icons/skin/stalledDL.png"); + static QIcon cached = QIcon(":/icons/skin/stalledDL.svg"); return cached; } QIcon getUploadingIcon() { - static QIcon cached = QIcon(":/icons/skin/uploading.png"); + static QIcon cached = QIcon(":/icons/skin/uploading.svg"); return cached; } QIcon getStalledUploadingIcon() { - static QIcon cached = QIcon(":/icons/skin/stalledUP.png"); + static QIcon cached = QIcon(":/icons/skin/stalledUP.svg"); return cached; } QIcon getCompletedIcon() { - static QIcon cached = QIcon(":/icons/skin/completed.png"); + static QIcon cached = QIcon(":/icons/skin/completed.svg"); return cached; } QIcon getCheckingIcon() { - static QIcon cached = QIcon(":/icons/skin/checking.png"); + static QIcon cached = QIcon(":/icons/skin/checking.svg"); return cached; } QIcon getErrorIcon() { - static QIcon cached = QIcon(":/icons/skin/error.png"); + static QIcon cached = QIcon(":/icons/skin/error.svg"); return cached; } diff --git a/src/gui/transferlistwidget.cpp b/src/gui/transferlistwidget.cpp index 94fa159f4..8e4a34c33 100644 --- a/src/gui/transferlistwidget.cpp +++ b/src/gui/transferlistwidget.cpp @@ -874,7 +874,7 @@ void TransferListWidget::displayListMenu(const QPoint&) connect(&actionDelete, &QAction::triggered, this, &TransferListWidget::softDeleteSelectedTorrents); QAction actionPreviewFile(GuiIconProvider::instance()->getIcon("view-preview"), tr("Preview file..."), nullptr); connect(&actionPreviewFile, &QAction::triggered, this, &TransferListWidget::previewSelectedTorrents); - QAction actionSetMaxRatio(QIcon(QLatin1String(":/icons/skin/ratio.png")), tr("Limit share ratio..."), nullptr); + QAction actionSetMaxRatio(QIcon(QLatin1String(":/icons/skin/ratio.svg")), tr("Limit share ratio..."), nullptr); connect(&actionSetMaxRatio, &QAction::triggered, this, &TransferListWidget::setMaxRatioSelectedTorrents); QAction actionSetUploadLimit(GuiIconProvider::instance()->getIcon("kt-set-max-upload-speed"), tr("Limit upload rate..."), nullptr); connect(&actionSetUploadLimit, &QAction::triggered, this, &TransferListWidget::setUpLimitSelectedTorrents); diff --git a/src/gui/utils.cpp b/src/gui/utils.cpp index 08ca7b59b..c57de985f 100644 --- a/src/gui/utils.cpp +++ b/src/gui/utils.cpp @@ -63,6 +63,13 @@ qreal Utils::Gui::screenScalingFactor(const QWidget *widget) #endif // Q_OS_WIN } +QPixmap Utils::Gui::scaledPixmap(const QIcon &icon, const QWidget *widget, const int height) +{ + Q_ASSERT(height > 0); + const int scaledHeight = height * Utils::Gui::screenScalingFactor(widget); + return icon.pixmap(scaledHeight); +} + QPixmap Utils::Gui::scaledPixmap(const QString &path, const QWidget *widget, const int height) { const QPixmap pixmap(path); diff --git a/src/gui/utils.h b/src/gui/utils.h index 05da593be..35502abe3 100644 --- a/src/gui/utils.h +++ b/src/gui/utils.h @@ -33,6 +33,7 @@ #include #include +class QIcon; class QWidget; namespace Utils @@ -48,6 +49,7 @@ namespace Utils return (size * screenScalingFactor(widget)); } + QPixmap scaledPixmap(const QIcon &icon, const QWidget *widget, const int height); QPixmap scaledPixmap(const QString &path, const QWidget *widget, const int height = 0); QPixmap scaledPixmapSvg(const QString &path, const QWidget *widget, const int baseHeight); QSize smallIconSize(const QWidget *widget = nullptr); diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc index 7fd89b931..88b35b2b4 100644 --- a/src/icons/icons.qrc +++ b/src/icons/icons.qrc @@ -251,105 +251,105 @@ flags/zw.svg L.gif loading.png - qbt-theme/application-exit.png - qbt-theme/application-rss+xml.png - qbt-theme/application-x-mswinurl.png - qbt-theme/checked.png - qbt-theme/configure.png - qbt-theme/dialog-cancel.png - qbt-theme/dialog-information.png - qbt-theme/dialog-warning.png - qbt-theme/document-edit-verify.png - qbt-theme/document-edit.png - qbt-theme/document-encrypt.png - qbt-theme/document-import.png - qbt-theme/document-new.png - qbt-theme/document-properties.png - qbt-theme/document-save.png - qbt-theme/download.png - qbt-theme/edit-clear-history.png - qbt-theme/edit-clear.png - qbt-theme/edit-copy.png - qbt-theme/edit-cut.png - qbt-theme/edit-delete.png - qbt-theme/edit-find-user.png - qbt-theme/edit-find.png - qbt-theme/edit-paste.png - qbt-theme/edit-rename.png - qbt-theme/folder-documents.png - qbt-theme/folder-download.png - qbt-theme/folder-new.png - qbt-theme/folder-remote.png - qbt-theme/gear.png - qbt-theme/gear32.png - qbt-theme/go-bottom.png - qbt-theme/go-down.png - qbt-theme/go-top.png - qbt-theme/go-up.png - qbt-theme/help-about.png - qbt-theme/help-contents.png - qbt-theme/inode-directory.png - qbt-theme/insert-link.png + qbt-theme/application-exit.svg + qbt-theme/application-rss+xml.svg + qbt-theme/application-x-mswinurl.svg + qbt-theme/checked.svg + qbt-theme/configure.svg + qbt-theme/dialog-cancel.svg + qbt-theme/dialog-information.svg + qbt-theme/dialog-warning.svg + qbt-theme/document-edit-verify.svg + qbt-theme/document-edit.svg + qbt-theme/document-encrypt.svg + qbt-theme/document-import.svg + qbt-theme/document-new.svg + qbt-theme/document-properties.svg + qbt-theme/document-save.svg + qbt-theme/download.svg + qbt-theme/edit-clear-history.svg + qbt-theme/edit-clear.svg + qbt-theme/edit-copy.svg + qbt-theme/edit-cut.svg + qbt-theme/edit-delete.svg + qbt-theme/edit-find-user.svg + qbt-theme/edit-find.svg + qbt-theme/edit-paste.svg + qbt-theme/edit-rename.svg + qbt-theme/folder-documents.svg + qbt-theme/folder-download.svg + qbt-theme/folder-new.svg + qbt-theme/folder-remote.svg + qbt-theme/gear.svg + qbt-theme/gear32.svg + qbt-theme/go-bottom.svg + qbt-theme/go-down.svg + qbt-theme/go-top.svg + qbt-theme/go-up.svg + qbt-theme/help-about.svg + qbt-theme/help-contents.svg + qbt-theme/inode-directory.svg + qbt-theme/insert-link.svg qbt-theme/kt-magnet.png qbt-theme/kt-set-max-download-speed.png qbt-theme/kt-set-max-upload-speed.png - qbt-theme/list-add.png - qbt-theme/list-remove.png - qbt-theme/mail-folder-inbox.png - qbt-theme/mail-mark-read.png - qbt-theme/media-playback-pause.png - qbt-theme/media-playback-start.png - qbt-theme/media-seek-forward.png - qbt-theme/network-server.png - qbt-theme/network-wired.png - qbt-theme/object-locked.png - qbt-theme/office-chart-line.png - qbt-theme/preferences-desktop.png - qbt-theme/preferences-other.png - qbt-theme/preferences-system-network.png - qbt-theme/preferences-web-browser-cookies.png + qbt-theme/list-add.svg + qbt-theme/list-remove.svg + qbt-theme/mail-folder-inbox.svg + qbt-theme/mail-mark-read.svg + qbt-theme/media-playback-pause.svg + qbt-theme/media-playback-start.svg + qbt-theme/media-seek-forward.svg + qbt-theme/network-server.svg + qbt-theme/network-wired.svg + qbt-theme/object-locked.svg + qbt-theme/office-chart-line.svg + qbt-theme/preferences-desktop.svg + qbt-theme/preferences-other.svg + qbt-theme/preferences-system-network.svg + qbt-theme/preferences-web-browser-cookies.svg qbt-theme/rss-config.png - qbt-theme/security-high.png - qbt-theme/security-low.png - qbt-theme/services.png - qbt-theme/speedometer.png - qbt-theme/system-log-out.png - qbt-theme/tab-close.png - qbt-theme/task-attention.png + qbt-theme/security-high.svg + qbt-theme/security-low.svg + qbt-theme/services.svg + qbt-theme/speedometer.svg + qbt-theme/system-log-out.svg + qbt-theme/tab-close.svg + qbt-theme/task-attention.svg qbt-theme/task-complete.png qbt-theme/task-ongoing.png qbt-theme/task-reject.png - qbt-theme/text-plain.png - qbt-theme/tools-report-bug.png - qbt-theme/unavailable.png - qbt-theme/user-group-delete.png - qbt-theme/user-group-new.png - qbt-theme/view-calendar-journal.png - qbt-theme/view-categories.png - qbt-theme/view-filter.png - qbt-theme/view-preview.png - qbt-theme/view-refresh.png - qbt-theme/view-statistics.png - qbt-theme/wallet-open.png - qbt-theme/webui.png + qbt-theme/text-plain.svg + qbt-theme/tools-report-bug.svg + qbt-theme/unavailable.svg + qbt-theme/user-group-delete.svg + qbt-theme/user-group-new.svg + qbt-theme/view-calendar-journal.svg + qbt-theme/view-categories.svg + qbt-theme/view-filter.svg + qbt-theme/view-preview.svg + qbt-theme/view-refresh.svg + qbt-theme/view-statistics.svg + qbt-theme/wallet-open.svg + qbt-theme/webui.svg skin/arrow-right.gif skin/bg-dropdown.gif skin/bg-handle-horizontal.gif skin/bg-header.gif skin/bg-panel-header.gif - skin/checking.png + skin/checking.svg skin/collapse-expand.gif - skin/completed.png - skin/connected.png - skin/disconnected.png + skin/completed.svg + skin/connected.svg + skin/disconnected.svg skin/dock-tabs.gif - skin/download.png - skin/downloading.png - skin/error.png - skin/filteractive.png - skin/filterall.png - skin/filterinactive.png - skin/firewalled.png + skin/download.svg + skin/downloading.svg + skin/error.svg + skin/filteractive.svg + skin/filterall.svg + skin/filterinactive.svg + skin/firewalled.svg skin/handle-icon-horizontal.gif skin/handle-icon.gif skin/knob.gif @@ -357,26 +357,26 @@ skin/logo.gif skin/logo2.gif skin/mascot.png - skin/paused.png + skin/paused.svg skin/qbittorrent-tray.svg skin/qbittorrent-tray-dark.svg skin/qbittorrent-tray-light.svg skin/qbittorrent32.png - skin/queued.png - skin/ratio.png - skin/resumed.png - skin/seeding.png + skin/queued.svg + skin/ratio.svg + skin/resumed.svg + skin/seeding.svg skin/slider-area.gif skin/spacer.gif skin/spinner-placeholder.gif skin/spinner.gif skin/splash.png - skin/stalledDL.png - skin/stalledUP.png + skin/stalledDL.svg + skin/stalledUP.svg skin/tabs.gif skin/toolbox-divider.gif skin/toolbox-divider2.gif - skin/uploading.png + skin/uploading.svg slow.png slow_off.png sphere.png diff --git a/src/icons/qbt-theme/application-exit.png b/src/icons/qbt-theme/application-exit.png deleted file mode 100644 index f88e00086..000000000 Binary files a/src/icons/qbt-theme/application-exit.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/application-exit.svg b/src/icons/qbt-theme/application-exit.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/application-exit.svg rename to src/icons/qbt-theme/application-exit.svg diff --git a/src/icons/qbt-theme/application-rss+xml.png b/src/icons/qbt-theme/application-rss+xml.png deleted file mode 100644 index 7efeb3220..000000000 Binary files a/src/icons/qbt-theme/application-rss+xml.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/application-rss+xml.svg b/src/icons/qbt-theme/application-rss+xml.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/application-rss+xml.svg rename to src/icons/qbt-theme/application-rss+xml.svg diff --git a/src/icons/qbt-theme/application-x-mswinurl.png b/src/icons/qbt-theme/application-x-mswinurl.png deleted file mode 100644 index 95f49c94d..000000000 Binary files a/src/icons/qbt-theme/application-x-mswinurl.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/application-x-mswinurl.svg b/src/icons/qbt-theme/application-x-mswinurl.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/application-x-mswinurl.svg rename to src/icons/qbt-theme/application-x-mswinurl.svg diff --git a/src/icons/qbt-theme/checked.png b/src/icons/qbt-theme/checked.png deleted file mode 100644 index 79f7c0d00..000000000 Binary files a/src/icons/qbt-theme/checked.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/checked.svg b/src/icons/qbt-theme/checked.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/checked.svg rename to src/icons/qbt-theme/checked.svg diff --git a/src/icons/qbt-theme/configure.png b/src/icons/qbt-theme/configure.png deleted file mode 100644 index a4459360b..000000000 Binary files a/src/icons/qbt-theme/configure.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/configure.svg b/src/icons/qbt-theme/configure.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/configure.svg rename to src/icons/qbt-theme/configure.svg diff --git a/src/icons/qbt-theme/dialog-cancel.png b/src/icons/qbt-theme/dialog-cancel.png deleted file mode 100644 index 8127f7228..000000000 Binary files a/src/icons/qbt-theme/dialog-cancel.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/dialog-cancel.svg b/src/icons/qbt-theme/dialog-cancel.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/dialog-cancel.svg rename to src/icons/qbt-theme/dialog-cancel.svg diff --git a/src/icons/qbt-theme/dialog-information.png b/src/icons/qbt-theme/dialog-information.png deleted file mode 100644 index ab4dfa923..000000000 Binary files a/src/icons/qbt-theme/dialog-information.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/dialog-information.svg b/src/icons/qbt-theme/dialog-information.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/dialog-information.svg rename to src/icons/qbt-theme/dialog-information.svg diff --git a/src/icons/qbt-theme/dialog-warning.png b/src/icons/qbt-theme/dialog-warning.png deleted file mode 100644 index b92e0cfd6..000000000 Binary files a/src/icons/qbt-theme/dialog-warning.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/dialog-warning.svg b/src/icons/qbt-theme/dialog-warning.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/dialog-warning.svg rename to src/icons/qbt-theme/dialog-warning.svg diff --git a/src/icons/qbt-theme/document-edit-verify.png b/src/icons/qbt-theme/document-edit-verify.png deleted file mode 100644 index 515fe6955..000000000 Binary files a/src/icons/qbt-theme/document-edit-verify.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/document-edit-verify.svg b/src/icons/qbt-theme/document-edit-verify.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/document-edit-verify.svg rename to src/icons/qbt-theme/document-edit-verify.svg diff --git a/src/icons/qbt-theme/document-edit.png b/src/icons/qbt-theme/document-edit.png deleted file mode 100644 index b4eb6fcac..000000000 Binary files a/src/icons/qbt-theme/document-edit.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/document-edit.svg b/src/icons/qbt-theme/document-edit.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/document-edit.svg rename to src/icons/qbt-theme/document-edit.svg diff --git a/src/icons/qbt-theme/document-encrypt.png b/src/icons/qbt-theme/document-encrypt.png deleted file mode 100644 index 39ac5c86f..000000000 Binary files a/src/icons/qbt-theme/document-encrypt.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/document-encrypt.svg b/src/icons/qbt-theme/document-encrypt.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/document-encrypt.svg rename to src/icons/qbt-theme/document-encrypt.svg diff --git a/src/icons/qbt-theme/document-import.png b/src/icons/qbt-theme/document-import.png deleted file mode 100644 index a13684832..000000000 Binary files a/src/icons/qbt-theme/document-import.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/document-import.svg b/src/icons/qbt-theme/document-import.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/document-import.svg rename to src/icons/qbt-theme/document-import.svg diff --git a/src/icons/qbt-theme/document-new.png b/src/icons/qbt-theme/document-new.png deleted file mode 100644 index 40bded949..000000000 Binary files a/src/icons/qbt-theme/document-new.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/document-new.svg b/src/icons/qbt-theme/document-new.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/document-new.svg rename to src/icons/qbt-theme/document-new.svg diff --git a/src/icons/qbt-theme/document-properties.png b/src/icons/qbt-theme/document-properties.png deleted file mode 100644 index 38c00a3b1..000000000 Binary files a/src/icons/qbt-theme/document-properties.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/document-properties.svg b/src/icons/qbt-theme/document-properties.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/document-properties.svg rename to src/icons/qbt-theme/document-properties.svg diff --git a/src/icons/qbt-theme/document-save.png b/src/icons/qbt-theme/document-save.png deleted file mode 100644 index b88902a7a..000000000 Binary files a/src/icons/qbt-theme/document-save.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/document-save.svg b/src/icons/qbt-theme/document-save.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/document-save.svg rename to src/icons/qbt-theme/document-save.svg diff --git a/src/icons/qbt-theme/download.png b/src/icons/qbt-theme/download.png deleted file mode 100644 index 000e2d730..000000000 Binary files a/src/icons/qbt-theme/download.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/download.svg b/src/icons/qbt-theme/download.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/download.svg rename to src/icons/qbt-theme/download.svg diff --git a/src/icons/qbt-theme/edit-clear-history.png b/src/icons/qbt-theme/edit-clear-history.png deleted file mode 100644 index aca749b41..000000000 Binary files a/src/icons/qbt-theme/edit-clear-history.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/edit-clear-history.svg b/src/icons/qbt-theme/edit-clear-history.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/edit-clear-history.svg rename to src/icons/qbt-theme/edit-clear-history.svg diff --git a/src/icons/qbt-theme/edit-clear.png b/src/icons/qbt-theme/edit-clear.png deleted file mode 100644 index a04529bcd..000000000 Binary files a/src/icons/qbt-theme/edit-clear.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/edit-clear.svg b/src/icons/qbt-theme/edit-clear.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/edit-clear.svg rename to src/icons/qbt-theme/edit-clear.svg diff --git a/src/icons/qbt-theme/edit-copy.png b/src/icons/qbt-theme/edit-copy.png deleted file mode 100644 index f78e267e3..000000000 Binary files a/src/icons/qbt-theme/edit-copy.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/edit-copy.svg b/src/icons/qbt-theme/edit-copy.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/edit-copy.svg rename to src/icons/qbt-theme/edit-copy.svg diff --git a/src/icons/qbt-theme/edit-cut.png b/src/icons/qbt-theme/edit-cut.png deleted file mode 100644 index 61eaf4c15..000000000 Binary files a/src/icons/qbt-theme/edit-cut.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/edit-cut.svg b/src/icons/qbt-theme/edit-cut.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/edit-cut.svg rename to src/icons/qbt-theme/edit-cut.svg diff --git a/src/icons/qbt-theme/edit-delete.png b/src/icons/qbt-theme/edit-delete.png deleted file mode 100644 index f88e00086..000000000 Binary files a/src/icons/qbt-theme/edit-delete.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/edit-delete.svg b/src/icons/qbt-theme/edit-delete.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/edit-delete.svg rename to src/icons/qbt-theme/edit-delete.svg diff --git a/src/icons/qbt-theme/edit-find-user.png b/src/icons/qbt-theme/edit-find-user.png deleted file mode 100644 index 378a98fcb..000000000 Binary files a/src/icons/qbt-theme/edit-find-user.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/edit-find-user.svg b/src/icons/qbt-theme/edit-find-user.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/edit-find-user.svg rename to src/icons/qbt-theme/edit-find-user.svg diff --git a/src/icons/qbt-theme/edit-find.png b/src/icons/qbt-theme/edit-find.png deleted file mode 100644 index 522f30c9d..000000000 Binary files a/src/icons/qbt-theme/edit-find.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/edit-find.svg b/src/icons/qbt-theme/edit-find.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/edit-find.svg rename to src/icons/qbt-theme/edit-find.svg diff --git a/src/icons/qbt-theme/edit-paste.png b/src/icons/qbt-theme/edit-paste.png deleted file mode 100644 index eb73dbe8a..000000000 Binary files a/src/icons/qbt-theme/edit-paste.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/edit-paste.svg b/src/icons/qbt-theme/edit-paste.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/edit-paste.svg rename to src/icons/qbt-theme/edit-paste.svg diff --git a/src/icons/qbt-theme/edit-rename.png b/src/icons/qbt-theme/edit-rename.png deleted file mode 100644 index c8090e019..000000000 Binary files a/src/icons/qbt-theme/edit-rename.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/edit-rename.svg b/src/icons/qbt-theme/edit-rename.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/edit-rename.svg rename to src/icons/qbt-theme/edit-rename.svg diff --git a/src/icons/qbt-theme/folder-documents.png b/src/icons/qbt-theme/folder-documents.png deleted file mode 100644 index 74efc0645..000000000 Binary files a/src/icons/qbt-theme/folder-documents.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/folder-documents.svg b/src/icons/qbt-theme/folder-documents.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/folder-documents.svg rename to src/icons/qbt-theme/folder-documents.svg diff --git a/src/icons/qbt-theme/folder-download.png b/src/icons/qbt-theme/folder-download.png deleted file mode 100644 index 000e2d730..000000000 Binary files a/src/icons/qbt-theme/folder-download.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/folder-download.svg b/src/icons/qbt-theme/folder-download.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/folder-download.svg rename to src/icons/qbt-theme/folder-download.svg diff --git a/src/icons/qbt-theme/folder-new.png b/src/icons/qbt-theme/folder-new.png deleted file mode 100644 index b187c4d11..000000000 Binary files a/src/icons/qbt-theme/folder-new.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/folder-new.svg b/src/icons/qbt-theme/folder-new.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/folder-new.svg rename to src/icons/qbt-theme/folder-new.svg diff --git a/src/icons/qbt-theme/folder-remote.png b/src/icons/qbt-theme/folder-remote.png deleted file mode 100644 index 75a00291c..000000000 Binary files a/src/icons/qbt-theme/folder-remote.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/folder-remote.svg b/src/icons/qbt-theme/folder-remote.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/folder-remote.svg rename to src/icons/qbt-theme/folder-remote.svg diff --git a/src/icons/qbt-theme/gear.png b/src/icons/qbt-theme/gear.png deleted file mode 100644 index a4459360b..000000000 Binary files a/src/icons/qbt-theme/gear.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/gear.svg b/src/icons/qbt-theme/gear.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/gear.svg rename to src/icons/qbt-theme/gear.svg diff --git a/src/icons/qbt-theme/gear32.png b/src/icons/qbt-theme/gear32.png deleted file mode 100644 index a4459360b..000000000 Binary files a/src/icons/qbt-theme/gear32.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/gear32.svg b/src/icons/qbt-theme/gear32.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/gear32.svg rename to src/icons/qbt-theme/gear32.svg diff --git a/src/icons/qbt-theme/go-bottom.png b/src/icons/qbt-theme/go-bottom.png deleted file mode 100644 index bc345e449..000000000 Binary files a/src/icons/qbt-theme/go-bottom.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/go-bottom.svg b/src/icons/qbt-theme/go-bottom.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/go-bottom.svg rename to src/icons/qbt-theme/go-bottom.svg diff --git a/src/icons/qbt-theme/go-down.png b/src/icons/qbt-theme/go-down.png deleted file mode 100644 index cdce86687..000000000 Binary files a/src/icons/qbt-theme/go-down.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/go-down.svg b/src/icons/qbt-theme/go-down.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/go-down.svg rename to src/icons/qbt-theme/go-down.svg diff --git a/src/icons/qbt-theme/go-top.png b/src/icons/qbt-theme/go-top.png deleted file mode 100644 index a6cbbbba0..000000000 Binary files a/src/icons/qbt-theme/go-top.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/go-top.svg b/src/icons/qbt-theme/go-top.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/go-top.svg rename to src/icons/qbt-theme/go-top.svg diff --git a/src/icons/qbt-theme/go-up.png b/src/icons/qbt-theme/go-up.png deleted file mode 100644 index 37827553e..000000000 Binary files a/src/icons/qbt-theme/go-up.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/go-up.svg b/src/icons/qbt-theme/go-up.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/go-up.svg rename to src/icons/qbt-theme/go-up.svg diff --git a/src/icons/qbt-theme/help-about.png b/src/icons/qbt-theme/help-about.png deleted file mode 100644 index ab4dfa923..000000000 Binary files a/src/icons/qbt-theme/help-about.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/help-about.svg b/src/icons/qbt-theme/help-about.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/help-about.svg rename to src/icons/qbt-theme/help-about.svg diff --git a/src/icons/qbt-theme/help-contents.png b/src/icons/qbt-theme/help-contents.png deleted file mode 100644 index 5e4daff56..000000000 Binary files a/src/icons/qbt-theme/help-contents.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/help-contents.svg b/src/icons/qbt-theme/help-contents.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/help-contents.svg rename to src/icons/qbt-theme/help-contents.svg diff --git a/src/icons/qbt-theme/inode-directory.png b/src/icons/qbt-theme/inode-directory.png deleted file mode 100644 index 74efc0645..000000000 Binary files a/src/icons/qbt-theme/inode-directory.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/inode-directory.svg b/src/icons/qbt-theme/inode-directory.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/inode-directory.svg rename to src/icons/qbt-theme/inode-directory.svg diff --git a/src/icons/qbt-theme/insert-link.png b/src/icons/qbt-theme/insert-link.png deleted file mode 100644 index 5edea8a44..000000000 Binary files a/src/icons/qbt-theme/insert-link.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/insert-link.svg b/src/icons/qbt-theme/insert-link.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/insert-link.svg rename to src/icons/qbt-theme/insert-link.svg diff --git a/src/icons/qbt-theme/list-add.png b/src/icons/qbt-theme/list-add.png deleted file mode 100644 index 40bded949..000000000 Binary files a/src/icons/qbt-theme/list-add.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/list-add.svg b/src/icons/qbt-theme/list-add.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/list-add.svg rename to src/icons/qbt-theme/list-add.svg diff --git a/src/icons/qbt-theme/list-remove.png b/src/icons/qbt-theme/list-remove.png deleted file mode 100644 index 2d2714e2e..000000000 Binary files a/src/icons/qbt-theme/list-remove.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/list-remove.svg b/src/icons/qbt-theme/list-remove.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/list-remove.svg rename to src/icons/qbt-theme/list-remove.svg diff --git a/src/icons/qbt-theme/mail-folder-inbox.png b/src/icons/qbt-theme/mail-folder-inbox.png deleted file mode 100644 index 7f3b6db51..000000000 Binary files a/src/icons/qbt-theme/mail-folder-inbox.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/mail-folder-inbox.svg b/src/icons/qbt-theme/mail-folder-inbox.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/mail-folder-inbox.svg rename to src/icons/qbt-theme/mail-folder-inbox.svg diff --git a/src/icons/qbt-theme/mail-mark-read.png b/src/icons/qbt-theme/mail-mark-read.png deleted file mode 100644 index e96d81f40..000000000 Binary files a/src/icons/qbt-theme/mail-mark-read.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/mail-mark-read.svg b/src/icons/qbt-theme/mail-mark-read.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/mail-mark-read.svg rename to src/icons/qbt-theme/mail-mark-read.svg diff --git a/src/icons/qbt-theme/media-playback-pause.png b/src/icons/qbt-theme/media-playback-pause.png deleted file mode 100644 index 4f1e6e85b..000000000 Binary files a/src/icons/qbt-theme/media-playback-pause.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/media-playback-pause.svg b/src/icons/qbt-theme/media-playback-pause.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/media-playback-pause.svg rename to src/icons/qbt-theme/media-playback-pause.svg diff --git a/src/icons/qbt-theme/media-playback-start.png b/src/icons/qbt-theme/media-playback-start.png deleted file mode 100644 index bac2ea958..000000000 Binary files a/src/icons/qbt-theme/media-playback-start.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/media-playback-start.svg b/src/icons/qbt-theme/media-playback-start.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/media-playback-start.svg rename to src/icons/qbt-theme/media-playback-start.svg diff --git a/src/icons/qbt-theme/media-seek-forward.png b/src/icons/qbt-theme/media-seek-forward.png deleted file mode 100644 index 03b1f76f1..000000000 Binary files a/src/icons/qbt-theme/media-seek-forward.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/media-seek-forward.svg b/src/icons/qbt-theme/media-seek-forward.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/media-seek-forward.svg rename to src/icons/qbt-theme/media-seek-forward.svg diff --git a/src/icons/qbt-theme/network-server.png b/src/icons/qbt-theme/network-server.png deleted file mode 100644 index a8f38a12a..000000000 Binary files a/src/icons/qbt-theme/network-server.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/network-server.svg b/src/icons/qbt-theme/network-server.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/network-server.svg rename to src/icons/qbt-theme/network-server.svg diff --git a/src/icons/qbt-theme/network-wired.png b/src/icons/qbt-theme/network-wired.png deleted file mode 100644 index 0fb316203..000000000 Binary files a/src/icons/qbt-theme/network-wired.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/network-wired.svg b/src/icons/qbt-theme/network-wired.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/network-wired.svg rename to src/icons/qbt-theme/network-wired.svg diff --git a/src/icons/qbt-theme/object-locked.png b/src/icons/qbt-theme/object-locked.png deleted file mode 100644 index 39ac5c86f..000000000 Binary files a/src/icons/qbt-theme/object-locked.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/object-locked.svg b/src/icons/qbt-theme/object-locked.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/object-locked.svg rename to src/icons/qbt-theme/object-locked.svg diff --git a/src/icons/qbt-theme/office-chart-line.png b/src/icons/qbt-theme/office-chart-line.png deleted file mode 100644 index afa1720be..000000000 Binary files a/src/icons/qbt-theme/office-chart-line.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/office-chart-line.svg b/src/icons/qbt-theme/office-chart-line.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/office-chart-line.svg rename to src/icons/qbt-theme/office-chart-line.svg diff --git a/src/icons/qbt-theme/preferences-desktop.png b/src/icons/qbt-theme/preferences-desktop.png deleted file mode 100644 index 3991170db..000000000 Binary files a/src/icons/qbt-theme/preferences-desktop.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/preferences-desktop.svg b/src/icons/qbt-theme/preferences-desktop.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/preferences-desktop.svg rename to src/icons/qbt-theme/preferences-desktop.svg diff --git a/src/icons/qbt-theme/preferences-other.png b/src/icons/qbt-theme/preferences-other.png deleted file mode 100644 index 70067b644..000000000 Binary files a/src/icons/qbt-theme/preferences-other.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/preferences-other.svg b/src/icons/qbt-theme/preferences-other.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/preferences-other.svg rename to src/icons/qbt-theme/preferences-other.svg diff --git a/src/icons/qbt-theme/preferences-system-network.png b/src/icons/qbt-theme/preferences-system-network.png deleted file mode 100644 index ad94a6b14..000000000 Binary files a/src/icons/qbt-theme/preferences-system-network.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/preferences-system-network.svg b/src/icons/qbt-theme/preferences-system-network.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/preferences-system-network.svg rename to src/icons/qbt-theme/preferences-system-network.svg diff --git a/src/icons/qbt-theme/preferences-web-browser-cookies.png b/src/icons/qbt-theme/preferences-web-browser-cookies.png deleted file mode 100644 index 956587b97..000000000 Binary files a/src/icons/qbt-theme/preferences-web-browser-cookies.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/preferences-web-browser-cookies.svg b/src/icons/qbt-theme/preferences-web-browser-cookies.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/preferences-web-browser-cookies.svg rename to src/icons/qbt-theme/preferences-web-browser-cookies.svg diff --git a/src/icons/qbt-theme/security-high.png b/src/icons/qbt-theme/security-high.png deleted file mode 100644 index 74fc5c706..000000000 Binary files a/src/icons/qbt-theme/security-high.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/security-high.svg b/src/icons/qbt-theme/security-high.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/security-high.svg rename to src/icons/qbt-theme/security-high.svg diff --git a/src/icons/qbt-theme/security-low.png b/src/icons/qbt-theme/security-low.png deleted file mode 100644 index 01b3ca9e0..000000000 Binary files a/src/icons/qbt-theme/security-low.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/security-low.svg b/src/icons/qbt-theme/security-low.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/security-low.svg rename to src/icons/qbt-theme/security-low.svg diff --git a/src/icons/qbt-theme/services.png b/src/icons/qbt-theme/services.png deleted file mode 100644 index dc3fdae8f..000000000 Binary files a/src/icons/qbt-theme/services.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/services.svg b/src/icons/qbt-theme/services.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/services.svg rename to src/icons/qbt-theme/services.svg diff --git a/src/icons/qbt-theme/speedometer.png b/src/icons/qbt-theme/speedometer.png deleted file mode 100644 index 02a8f9086..000000000 Binary files a/src/icons/qbt-theme/speedometer.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/speedometer.svg b/src/icons/qbt-theme/speedometer.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/speedometer.svg rename to src/icons/qbt-theme/speedometer.svg diff --git a/src/icons/qbt-theme/system-log-out.png b/src/icons/qbt-theme/system-log-out.png deleted file mode 100644 index da4844309..000000000 Binary files a/src/icons/qbt-theme/system-log-out.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/system-log-out.svg b/src/icons/qbt-theme/system-log-out.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/system-log-out.svg rename to src/icons/qbt-theme/system-log-out.svg diff --git a/src/icons/qbt-theme/tab-close.png b/src/icons/qbt-theme/tab-close.png deleted file mode 100644 index 627f4ac91..000000000 Binary files a/src/icons/qbt-theme/tab-close.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/tab-close.svg b/src/icons/qbt-theme/tab-close.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/tab-close.svg rename to src/icons/qbt-theme/tab-close.svg diff --git a/src/icons/qbt-theme/task-attention.png b/src/icons/qbt-theme/task-attention.png deleted file mode 100644 index b92e0cfd6..000000000 Binary files a/src/icons/qbt-theme/task-attention.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/task-attention.svg b/src/icons/qbt-theme/task-attention.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/task-attention.svg rename to src/icons/qbt-theme/task-attention.svg diff --git a/src/icons/qbt-theme/text-plain.png b/src/icons/qbt-theme/text-plain.png deleted file mode 100644 index 7aa62fd70..000000000 Binary files a/src/icons/qbt-theme/text-plain.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/text-plain.svg b/src/icons/qbt-theme/text-plain.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/text-plain.svg rename to src/icons/qbt-theme/text-plain.svg diff --git a/src/icons/qbt-theme/tools-report-bug.png b/src/icons/qbt-theme/tools-report-bug.png deleted file mode 100644 index 9ddfb0b4d..000000000 Binary files a/src/icons/qbt-theme/tools-report-bug.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/tools-report-bug.svg b/src/icons/qbt-theme/tools-report-bug.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/tools-report-bug.svg rename to src/icons/qbt-theme/tools-report-bug.svg diff --git a/src/icons/qbt-theme/unavailable.png b/src/icons/qbt-theme/unavailable.png deleted file mode 100644 index 0eeeef8ea..000000000 Binary files a/src/icons/qbt-theme/unavailable.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/unavailable.svg b/src/icons/qbt-theme/unavailable.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/unavailable.svg rename to src/icons/qbt-theme/unavailable.svg diff --git a/src/icons/qbt-theme/user-group-delete.png b/src/icons/qbt-theme/user-group-delete.png deleted file mode 100644 index c22fb6c62..000000000 Binary files a/src/icons/qbt-theme/user-group-delete.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/user-group-delete.svg b/src/icons/qbt-theme/user-group-delete.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/user-group-delete.svg rename to src/icons/qbt-theme/user-group-delete.svg diff --git a/src/icons/qbt-theme/user-group-new.png b/src/icons/qbt-theme/user-group-new.png deleted file mode 100644 index 42c6726aa..000000000 Binary files a/src/icons/qbt-theme/user-group-new.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/user-group-new.svg b/src/icons/qbt-theme/user-group-new.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/user-group-new.svg rename to src/icons/qbt-theme/user-group-new.svg diff --git a/src/icons/qbt-theme/view-calendar-journal.png b/src/icons/qbt-theme/view-calendar-journal.png deleted file mode 100644 index 33bdfb0b4..000000000 Binary files a/src/icons/qbt-theme/view-calendar-journal.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/view-calendar-journal.svg b/src/icons/qbt-theme/view-calendar-journal.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/view-calendar-journal.svg rename to src/icons/qbt-theme/view-calendar-journal.svg diff --git a/src/icons/qbt-theme/view-categories.png b/src/icons/qbt-theme/view-categories.png deleted file mode 100644 index f139b65fa..000000000 Binary files a/src/icons/qbt-theme/view-categories.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/view-categories.svg b/src/icons/qbt-theme/view-categories.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/view-categories.svg rename to src/icons/qbt-theme/view-categories.svg diff --git a/src/icons/qbt-theme/view-filter.png b/src/icons/qbt-theme/view-filter.png deleted file mode 100644 index d49ec895b..000000000 Binary files a/src/icons/qbt-theme/view-filter.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/view-filter.svg b/src/icons/qbt-theme/view-filter.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/view-filter.svg rename to src/icons/qbt-theme/view-filter.svg diff --git a/src/icons/qbt-theme/view-preview.png b/src/icons/qbt-theme/view-preview.png deleted file mode 100644 index 316b3cffc..000000000 Binary files a/src/icons/qbt-theme/view-preview.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/view-preview.svg b/src/icons/qbt-theme/view-preview.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/view-preview.svg rename to src/icons/qbt-theme/view-preview.svg diff --git a/src/icons/qbt-theme/view-refresh.png b/src/icons/qbt-theme/view-refresh.png deleted file mode 100644 index d0597294f..000000000 Binary files a/src/icons/qbt-theme/view-refresh.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/view-refresh.svg b/src/icons/qbt-theme/view-refresh.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/view-refresh.svg rename to src/icons/qbt-theme/view-refresh.svg diff --git a/src/icons/qbt-theme/view-statistics.png b/src/icons/qbt-theme/view-statistics.png deleted file mode 100644 index 07c6e10ac..000000000 Binary files a/src/icons/qbt-theme/view-statistics.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/view-statistics.svg b/src/icons/qbt-theme/view-statistics.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/view-statistics.svg rename to src/icons/qbt-theme/view-statistics.svg diff --git a/src/icons/qbt-theme/wallet-open.png b/src/icons/qbt-theme/wallet-open.png deleted file mode 100644 index fd0b48f04..000000000 Binary files a/src/icons/qbt-theme/wallet-open.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/wallet-open.svg b/src/icons/qbt-theme/wallet-open.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/wallet-open.svg rename to src/icons/qbt-theme/wallet-open.svg diff --git a/src/icons/qbt-theme/webui.png b/src/icons/qbt-theme/webui.png deleted file mode 100644 index 03604e1ea..000000000 Binary files a/src/icons/qbt-theme/webui.png and /dev/null differ diff --git a/src/icons/qbt-theme/build-icons/icons/webui.svg b/src/icons/qbt-theme/webui.svg similarity index 100% rename from src/icons/qbt-theme/build-icons/icons/webui.svg rename to src/icons/qbt-theme/webui.svg diff --git a/src/icons/skin/checking.png b/src/icons/skin/checking.png deleted file mode 100644 index 0e6561239..000000000 Binary files a/src/icons/skin/checking.png and /dev/null differ diff --git a/src/icons/skin/build-icons/icons/checking.svg b/src/icons/skin/checking.svg similarity index 100% rename from src/icons/skin/build-icons/icons/checking.svg rename to src/icons/skin/checking.svg diff --git a/src/icons/skin/completed.png b/src/icons/skin/completed.png deleted file mode 100644 index 857fa927a..000000000 Binary files a/src/icons/skin/completed.png and /dev/null differ diff --git a/src/icons/skin/build-icons/icons/completed.svg b/src/icons/skin/completed.svg similarity index 100% rename from src/icons/skin/build-icons/icons/completed.svg rename to src/icons/skin/completed.svg diff --git a/src/icons/skin/connected.png b/src/icons/skin/connected.png deleted file mode 100644 index 043eb1842..000000000 Binary files a/src/icons/skin/connected.png and /dev/null differ diff --git a/src/icons/skin/build-icons/icons/connected.svg b/src/icons/skin/connected.svg similarity index 100% rename from src/icons/skin/build-icons/icons/connected.svg rename to src/icons/skin/connected.svg diff --git a/src/icons/skin/disconnected.png b/src/icons/skin/disconnected.png deleted file mode 100644 index 9432d6ba1..000000000 Binary files a/src/icons/skin/disconnected.png and /dev/null differ diff --git a/src/icons/skin/build-icons/icons/disconnected.svg b/src/icons/skin/disconnected.svg similarity index 100% rename from src/icons/skin/build-icons/icons/disconnected.svg rename to src/icons/skin/disconnected.svg diff --git a/src/icons/skin/download.png b/src/icons/skin/download.png deleted file mode 100644 index b61efd541..000000000 Binary files a/src/icons/skin/download.png and /dev/null differ diff --git a/src/icons/skin/build-icons/icons/download.svg b/src/icons/skin/download.svg similarity index 100% rename from src/icons/skin/build-icons/icons/download.svg rename to src/icons/skin/download.svg diff --git a/src/icons/skin/downloading.png b/src/icons/skin/downloading.png deleted file mode 100644 index 59a7c801d..000000000 Binary files a/src/icons/skin/downloading.png and /dev/null differ diff --git a/src/icons/skin/build-icons/icons/downloading.svg b/src/icons/skin/downloading.svg similarity index 100% rename from src/icons/skin/build-icons/icons/downloading.svg rename to src/icons/skin/downloading.svg diff --git a/src/icons/skin/error.png b/src/icons/skin/error.png deleted file mode 100644 index f03c5a1aa..000000000 Binary files a/src/icons/skin/error.png and /dev/null differ diff --git a/src/icons/skin/build-icons/icons/error.svg b/src/icons/skin/error.svg similarity index 100% rename from src/icons/skin/build-icons/icons/error.svg rename to src/icons/skin/error.svg diff --git a/src/icons/skin/filteractive.png b/src/icons/skin/filteractive.png deleted file mode 100644 index 4e27da0f5..000000000 Binary files a/src/icons/skin/filteractive.png and /dev/null differ diff --git a/src/icons/skin/build-icons/icons/filteractive.svg b/src/icons/skin/filteractive.svg similarity index 100% rename from src/icons/skin/build-icons/icons/filteractive.svg rename to src/icons/skin/filteractive.svg diff --git a/src/icons/skin/filterall.png b/src/icons/skin/filterall.png deleted file mode 100644 index bf00a26c9..000000000 Binary files a/src/icons/skin/filterall.png and /dev/null differ diff --git a/src/icons/skin/build-icons/icons/filterall.svg b/src/icons/skin/filterall.svg similarity index 100% rename from src/icons/skin/build-icons/icons/filterall.svg rename to src/icons/skin/filterall.svg diff --git a/src/icons/skin/filterinactive.png b/src/icons/skin/filterinactive.png deleted file mode 100644 index ae1ce840e..000000000 Binary files a/src/icons/skin/filterinactive.png and /dev/null differ diff --git a/src/icons/skin/build-icons/icons/filterinactive.svg b/src/icons/skin/filterinactive.svg similarity index 100% rename from src/icons/skin/build-icons/icons/filterinactive.svg rename to src/icons/skin/filterinactive.svg diff --git a/src/icons/skin/firewalled.png b/src/icons/skin/firewalled.png deleted file mode 100644 index 9a1ef3425..000000000 Binary files a/src/icons/skin/firewalled.png and /dev/null differ diff --git a/src/icons/skin/build-icons/icons/firewalled.svg b/src/icons/skin/firewalled.svg similarity index 100% rename from src/icons/skin/build-icons/icons/firewalled.svg rename to src/icons/skin/firewalled.svg diff --git a/src/icons/skin/paused.png b/src/icons/skin/paused.png deleted file mode 100644 index 2842c47c3..000000000 Binary files a/src/icons/skin/paused.png and /dev/null differ diff --git a/src/icons/skin/build-icons/icons/paused.svg b/src/icons/skin/paused.svg similarity index 100% rename from src/icons/skin/build-icons/icons/paused.svg rename to src/icons/skin/paused.svg diff --git a/src/icons/skin/queued.png b/src/icons/skin/queued.png deleted file mode 100644 index 35f57a0a9..000000000 Binary files a/src/icons/skin/queued.png and /dev/null differ diff --git a/src/icons/skin/build-icons/icons/queued.svg b/src/icons/skin/queued.svg similarity index 100% rename from src/icons/skin/build-icons/icons/queued.svg rename to src/icons/skin/queued.svg diff --git a/src/icons/skin/ratio.png b/src/icons/skin/ratio.png deleted file mode 100644 index 9665d69de..000000000 Binary files a/src/icons/skin/ratio.png and /dev/null differ diff --git a/src/icons/skin/build-icons/icons/ratio.svg b/src/icons/skin/ratio.svg similarity index 100% rename from src/icons/skin/build-icons/icons/ratio.svg rename to src/icons/skin/ratio.svg diff --git a/src/icons/skin/resumed.png b/src/icons/skin/resumed.png deleted file mode 100644 index 33ec5a5a3..000000000 Binary files a/src/icons/skin/resumed.png and /dev/null differ diff --git a/src/icons/skin/build-icons/icons/resumed.svg b/src/icons/skin/resumed.svg similarity index 100% rename from src/icons/skin/build-icons/icons/resumed.svg rename to src/icons/skin/resumed.svg diff --git a/src/icons/skin/seeding.png b/src/icons/skin/seeding.png deleted file mode 100644 index eb5198836..000000000 Binary files a/src/icons/skin/seeding.png and /dev/null differ diff --git a/src/icons/skin/build-icons/icons/seeding.svg b/src/icons/skin/seeding.svg similarity index 100% rename from src/icons/skin/build-icons/icons/seeding.svg rename to src/icons/skin/seeding.svg diff --git a/src/icons/skin/stalledDL.png b/src/icons/skin/stalledDL.png deleted file mode 100644 index b0419468a..000000000 Binary files a/src/icons/skin/stalledDL.png and /dev/null differ diff --git a/src/icons/skin/build-icons/icons/stalledDL.svg b/src/icons/skin/stalledDL.svg similarity index 100% rename from src/icons/skin/build-icons/icons/stalledDL.svg rename to src/icons/skin/stalledDL.svg diff --git a/src/icons/skin/stalledUP.png b/src/icons/skin/stalledUP.png deleted file mode 100644 index 582dafac4..000000000 Binary files a/src/icons/skin/stalledUP.png and /dev/null differ diff --git a/src/icons/skin/build-icons/icons/stalledUP.svg b/src/icons/skin/stalledUP.svg similarity index 100% rename from src/icons/skin/build-icons/icons/stalledUP.svg rename to src/icons/skin/stalledUP.svg diff --git a/src/icons/skin/uploading.png b/src/icons/skin/uploading.png deleted file mode 100644 index 91215d570..000000000 Binary files a/src/icons/skin/uploading.png and /dev/null differ diff --git a/src/icons/skin/build-icons/icons/uploading.svg b/src/icons/skin/uploading.svg similarity index 100% rename from src/icons/skin/build-icons/icons/uploading.svg rename to src/icons/skin/uploading.svg diff --git a/src/webui/webapplication.cpp b/src/webui/webapplication.cpp index d6b339420..828be87e5 100644 --- a/src/webui/webapplication.cpp +++ b/src/webui/webapplication.cpp @@ -67,7 +67,6 @@ constexpr int MAX_ALLOWED_FILESIZE = 10 * 1024 * 1024; const QString PATH_PREFIX_IMAGES {QStringLiteral("/images/")}; -const QString PATH_PREFIX_THEME {QStringLiteral("/theme/")}; const QString WWW_FOLDER {QStringLiteral(":/www")}; const QString PUBLIC_FOLDER {QStringLiteral("/public")}; const QString PRIVATE_FOLDER {QStringLiteral("/private")}; @@ -191,12 +190,6 @@ void WebApplication::sendWebUIFile() sendFile(QLatin1String(":/icons/") + imageFilename); return; } - - if (request().path.startsWith(PATH_PREFIX_THEME)) { - const QString iconId {request().path.mid(PATH_PREFIX_THEME.size())}; - sendFile(IconProvider::instance()->getIconPath(iconId)); - return; - } } const QString path { diff --git a/src/webui/www/private/filters.html b/src/webui/www/private/filters.html index 3f8b35941..890431a4b 100644 --- a/src/webui/www/private/filters.html +++ b/src/webui/www/private/filters.html @@ -1,14 +1,14 @@ QBT_TR(Status)QBT_TR[CONTEXT=TransferListFiltersWidget]
QBT_TR(Categories)QBT_TR[CONTEXT=TransferListFiltersWidget] diff --git a/src/webui/www/private/index.html b/src/webui/www/private/index.html index 3497b5882..8947633ab 100644 --- a/src/webui/www/private/index.html +++ b/src/webui/www/private/index.html @@ -39,115 +39,115 @@
  • QBT_TR(&File)QBT_TR[CONTEXT=MainWindow]
  • QBT_TR(&Edit)QBT_TR[CONTEXT=MainWindow]
  • QBT_TR(&View)QBT_TR[CONTEXT=MainWindow]
  • QBT_TR(&Tools)QBT_TR[CONTEXT=MainWindow]
  • QBT_TR(&Help)QBT_TR[CONTEXT=MainWindow]
    •    - QBT_TR(Add Torrent &Link...)QBT_TR[CONTEXT=MainWindow] - QBT_TR(&Add Torrent File...)QBT_TR[CONTEXT=MainWindow] - QBT_TR(Delete)QBT_TR[CONTEXT=TransferListWidget] - QBT_TR(Resume)QBT_TR[CONTEXT=TransferListWidget] - QBT_TR(Pause)QBT_TR[CONTEXT=TransferListWidget] + QBT_TR(Add Torrent &Link...)QBT_TR[CONTEXT=MainWindow] + QBT_TR(&Add Torrent File...)QBT_TR[CONTEXT=MainWindow] + QBT_TR(Delete)QBT_TR[CONTEXT=TransferListWidget] + QBT_TR(Resume)QBT_TR[CONTEXT=TransferListWidget] + QBT_TR(Pause)QBT_TR[CONTEXT=TransferListWidget] - QBT_TR(Top Priority)QBT_TR[CONTEXT=MainWindow] - QBT_TR(Increase Priority)QBT_TR[CONTEXT=MainWindow] - QBT_TR(Decrease Priority)QBT_TR[CONTEXT=MainWindow] - QBT_TR(Minimum Priority)QBT_TR[CONTEXT=MainWindow] + QBT_TR(Top Priority)QBT_TR[CONTEXT=MainWindow] + QBT_TR(Increase Priority)QBT_TR[CONTEXT=MainWindow] + QBT_TR(Decrease Priority)QBT_TR[CONTEXT=MainWindow] + QBT_TR(Minimum Priority)QBT_TR[CONTEXT=MainWindow] - QBT_TR(Options)QBT_TR[CONTEXT=OptionsDialog] + QBT_TR(Options)QBT_TR[CONTEXT=OptionsDialog]
    @@ -156,13 +156,13 @@ - Connection Status + Connection Status QBT_TR(Alternative speed limits)QBT_TR[CONTEXT=MainWindow] - + - +
    diff --git a/src/webui/www/private/preferences_content.html b/src/webui/www/private/preferences_content.html index ec2ca4c7d..d7dc168aa 100644 --- a/src/webui/www/private/preferences_content.html +++ b/src/webui/www/private/preferences_content.html @@ -35,7 +35,7 @@ - Add + Add
    diff --git a/src/webui/www/private/properties_content.html b/src/webui/www/private/properties_content.html index a4b4269cf..6c7cbc481 100644 --- a/src/webui/www/private/properties_content.html +++ b/src/webui/www/private/properties_content.html @@ -84,7 +84,7 @@ - + diff --git a/src/webui/www/private/scripts/client.js b/src/webui/www/private/scripts/client.js index 51f463abe..5561c29ef 100644 --- a/src/webui/www/private/scripts/client.js +++ b/src/webui/www/private/scripts/client.js @@ -239,7 +239,7 @@ window.addEvent('load', function() { var create_link = function(hash, text, count) { var html = '' - + '' + + '' + escapeHtml(text) + ' (' + count + ')' + ''; var el = new Element('li', { id: hash, @@ -421,11 +421,11 @@ window.addEvent('load', function() { } if (serverState.connection_status == "connected") - $('connectionStatus').src = 'images/skin/connected.png'; + $('connectionStatus').src = 'images/skin/connected.svg'; else if (serverState.connection_status == "firewalled") - $('connectionStatus').src = 'images/skin/firewalled.png'; + $('connectionStatus').src = 'images/skin/firewalled.svg'; else - $('connectionStatus').src = 'images/skin/disconnected.png'; + $('connectionStatus').src = 'images/skin/disconnected.svg'; if (queueing_enabled != serverState.queueing) { queueing_enabled = serverState.queueing; diff --git a/src/webui/www/private/scripts/contextmenu.js b/src/webui/www/private/scripts/contextmenu.js index 5973a8e69..fa28687bb 100644 --- a/src/webui/www/private/scripts/contextmenu.js +++ b/src/webui/www/private/scripts/contextmenu.js @@ -356,10 +356,10 @@ var TorrentsTableContextMenu = new Class({ var categoryList = $('contextCategoryList'); categoryList.empty(); categoryList.appendChild(new Element('li', { - html: 'QBT_TR(New...)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(New...)QBT_TR[CONTEXT=TransferListWidget]' + html: 'QBT_TR(New...)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(New...)QBT_TR[CONTEXT=TransferListWidget]' })); categoryList.appendChild(new Element('li', { - html: 'QBT_TR(Reset)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Reset)QBT_TR[CONTEXT=TransferListWidget]' + html: 'QBT_TR(Reset)QBT_TR[CONTEXT=TransferListWidget] QBT_TR(Reset)QBT_TR[CONTEXT=TransferListWidget]' })); var sortedCategories = []; @@ -372,7 +372,7 @@ var TorrentsTableContextMenu = new Class({ Object.each(sortedCategories, function(categoryName) { var categoryHash = genHash(categoryName); var el = new Element('li', { - html: ' ' + escapeHtml(categoryName) + '' + html: ' ' + escapeHtml(categoryName) + '' }); if (first) { el.addClass('separator'); diff --git a/src/webui/www/private/scripts/dynamicTable.js b/src/webui/www/private/scripts/dynamicTable.js index 0a9392aad..baf0a2560 100644 --- a/src/webui/www/private/scripts/dynamicTable.js +++ b/src/webui/www/private/scripts/dynamicTable.js @@ -292,7 +292,7 @@ var DynamicTable = new Class({ }); var createLi = function(columnName, text) { - var html = '' + escapeHtml(text) + ''; + var html = '' + escapeHtml(text) + ''; return new Element('li', { html: html }); @@ -834,7 +834,7 @@ var TorrentsTable = new Class({ break; // do nothing } - var img_path = 'images/skin/' + state + '.png'; + var img_path = 'images/skin/' + state + '.svg'; if (td.getChildren('img').length) { var img = td.getChildren('img')[0];
    QBT_TR(URL)QBT_TR[CONTEXT=TrackerListWidget] Add TrackersQBT_TR(URL)QBT_TR[CONTEXT=TrackerListWidget] Add Trackers QBT_TR(Status)QBT_TR[CONTEXT=TrackerListWidget] QBT_TR(Peers)QBT_TR[CONTEXT=TrackerListWidget] QBT_TR(Message)QBT_TR[CONTEXT=TrackerListWidget]