diff --git a/AUTHORS b/AUTHORS index 3aa3c64c8..82fb397c8 100644 --- a/AUTHORS +++ b/AUTHORS @@ -62,7 +62,7 @@ Images Authors: copyright: Mateusz Tobola license: GPLv2 -* file: src/icons/skin/tabs.gif +* file: src/icons/tabs.gif copyright: Greg Houston license: MIT diff --git a/dist/unix/CMakeLists.txt b/dist/unix/CMakeLists.txt index 26b4bea7d..a7145f8a6 100644 --- a/dist/unix/CMakeLists.txt +++ b/dist/unix/CMakeLists.txt @@ -40,9 +40,9 @@ if (Qt5Widgets_FOUND) COMPONENT data) install(FILES - ${qBittorrent_SOURCE_DIR}/src/icons/skin/qbittorrent-tray.svg - ${qBittorrent_SOURCE_DIR}/src/icons/skin/qbittorrent-tray-dark.svg - ${qBittorrent_SOURCE_DIR}/src/icons/skin/qbittorrent-tray-light.svg + ${qBittorrent_SOURCE_DIR}/src/icons/qbittorrent-tray.svg + ${qBittorrent_SOURCE_DIR}/src/icons/qbittorrent-tray-dark.svg + ${qBittorrent_SOURCE_DIR}/src/icons/qbittorrent-tray-light.svg DESTINATION ${CMAKE_INSTALL_DATAROOTDIR}/icons/hicolor/scalable/status COMPONENT data) endif() diff --git a/src/app/main.cpp b/src/app/main.cpp index 58f26b988..bec7cdb85 100644 --- a/src/app/main.cpp +++ b/src/app/main.cpp @@ -353,7 +353,7 @@ void sigAbnormalHandler(int signum) #if !defined(DISABLE_GUI) void showSplashScreen() { - QPixmap splashImg(":/icons/skin/splash.png"); + QPixmap splashImg(":/icons/splash.png"); QPainter painter(&splashImg); const QString version = QBT_VERSION; painter.setPen(QPen(Qt::white)); diff --git a/src/base/iconprovider.cpp b/src/base/iconprovider.cpp index c5cba692d..f5dad49f7 100644 --- a/src/base/iconprovider.cpp +++ b/src/base/iconprovider.cpp @@ -58,11 +58,11 @@ IconProvider *IconProvider::instance() QString IconProvider::getIconPath(const QString &iconId) const { // there are a few icons not available in svg - const QString pathSvg = ":/icons/qbt-theme/" + iconId + ".svg"; + const QString pathSvg = ":/icons/" + iconId + ".svg"; if (QFileInfo::exists(pathSvg)) return pathSvg; - const QString pathPng = ":/icons/qbt-theme/" + iconId + ".png"; + const QString pathPng = ":/icons/" + iconId + ".png"; return pathPng; } diff --git a/src/gui/aboutdialog.cpp b/src/gui/aboutdialog.cpp index 52f587449..cb878abe3 100644 --- a/src/gui/aboutdialog.cpp +++ b/src/gui/aboutdialog.cpp @@ -45,7 +45,7 @@ AboutDialog::AboutDialog(QWidget *parent) // Title m_ui->labelName->setText(QString::fromLatin1("

qBittorrent " QBT_VERSION " (%1-bit)

").arg(QT_POINTER_SIZE * 8)); - m_ui->logo->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/skin/qbittorrent-tray.svg", this, 32)); + m_ui->logo->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/qbittorrent-tray.svg", this, 32)); // About const QString aboutText = QString( @@ -65,7 +65,7 @@ AboutDialog::AboutDialog(QWidget *parent) , tr("Bug Tracker:")); m_ui->labelAbout->setText(aboutText); - m_ui->labelMascot->setPixmap(Utils::Gui::scaledPixmap(":/icons/skin/mascot.png", this)); + m_ui->labelMascot->setPixmap(Utils::Gui::scaledPixmap(":/icons/mascot.png", this)); // Thanks QFile thanksfile(":/thanks.html"); diff --git a/src/gui/mainwindow.cpp b/src/gui/mainwindow.cpp index ac6daf6cd..3eaf2bb1f 100644 --- a/src/gui/mainwindow.cpp +++ b/src/gui/mainwindow.cpp @@ -152,10 +152,10 @@ MainWindow::MainWindow(QWidget *parent) #ifndef Q_OS_MACOS #ifdef Q_OS_UNIX const QIcon appLogo = Preferences::instance()->useSystemIconTheme() - ? QIcon::fromTheme("qbittorrent", QIcon(":/icons/skin/qbittorrent-tray.svg")) - : QIcon(":/icons/skin/qbittorrent-tray.svg"); + ? QIcon::fromTheme("qbittorrent", QIcon(":/icons/qbittorrent-tray.svg")) + : QIcon(":/icons/qbittorrent-tray.svg"); #else - const QIcon appLogo(":/icons/skin/qbittorrent-tray.svg"); + const QIcon appLogo(":/icons/qbittorrent-tray.svg"); #endif // Q_OS_UNIX setWindowIcon(appLogo); #endif // Q_OS_MACOS @@ -1539,10 +1539,10 @@ void MainWindow::reloadSessionStats() "qBittorrent" "" "
" - " %1" + " %1" "
" "
" - " %2" + " %2" "
") .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))); @@ -1984,18 +1984,18 @@ QIcon MainWindow::getSystrayIcon() const #else switch (style) { case TrayIcon::NORMAL: - return QIcon(QLatin1String(":/icons/skin/qbittorrent-tray.svg")); + return QIcon(QLatin1String(":/icons/qbittorrent-tray.svg")); case TrayIcon::MONO_DARK: - return QIcon(QLatin1String(":/icons/skin/qbittorrent-tray-dark.svg")); + return QIcon(QLatin1String(":/icons/qbittorrent-tray-dark.svg")); case TrayIcon::MONO_LIGHT: - return QIcon(QLatin1String(":/icons/skin/qbittorrent-tray-light.svg")); + return QIcon(QLatin1String(":/icons/qbittorrent-tray-light.svg")); default: break; } #endif // As a failsafe in case the enum is invalid - return QIcon(QLatin1String(":/icons/skin/qbittorrent-tray.svg")); + return QIcon(QLatin1String(":/icons/qbittorrent-tray.svg")); } #endif // Q_OS_MACOS diff --git a/src/gui/optionsdialog.cpp b/src/gui/optionsdialog.cpp index 5427d984d..3554a383b 100644 --- a/src/gui/optionsdialog.cpp +++ b/src/gui/optionsdialog.cpp @@ -1691,7 +1691,7 @@ QString OptionsDialog::webUiPassword() const void OptionsDialog::webUIHttpsCertChanged(const QString &path, const ShowError showError) { m_ui->textWebUIHttpsCert->setSelectedPath(path); - m_ui->lblSslCertStatus->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/qbt-theme/security-low.svg", this, 24)); + m_ui->lblSslCertStatus->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/security-low.svg", this, 24)); if (path.isEmpty()) return; @@ -1709,13 +1709,13 @@ void OptionsDialog::webUIHttpsCertChanged(const QString &path, const ShowError s return; } - m_ui->lblSslCertStatus->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/qbt-theme/security-high.svg", this, 24)); + m_ui->lblSslCertStatus->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/security-high.svg", this, 24)); } void OptionsDialog::webUIHttpsKeyChanged(const QString &path, const ShowError showError) { m_ui->textWebUIHttpsKey->setSelectedPath(path); - m_ui->lblSslKeyStatus->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/qbt-theme/security-low.svg", this, 24)); + m_ui->lblSslKeyStatus->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/security-low.svg", this, 24)); if (path.isEmpty()) return; @@ -1733,7 +1733,7 @@ void OptionsDialog::webUIHttpsKeyChanged(const QString &path, const ShowError sh return; } - m_ui->lblSslKeyStatus->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/qbt-theme/security-high.svg", this, 24)); + m_ui->lblSslKeyStatus->setPixmap(Utils::Gui::scaledPixmapSvg(":/icons/security-high.svg", this, 24)); } void OptionsDialog::showConnectionTab() diff --git a/src/gui/statusbar.cpp b/src/gui/statusbar.cpp index 3f5ec8800..0ebd64d6a 100644 --- a/src/gui/statusbar.cpp +++ b/src/gui/statusbar.cpp @@ -62,14 +62,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.svg")); + m_connecStatusLblIcon->setIcon(QIcon(":/icons/firewalled.svg")); m_connecStatusLblIcon->setToolTip( QString::fromLatin1("%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.svg")); + m_dlSpeedLbl->setIcon(QIcon(":/icons/downloading_small.svg")); connect(m_dlSpeedLbl, &QAbstractButton::clicked, this, &StatusBar::capDownloadSpeed); m_dlSpeedLbl->setFlat(true); m_dlSpeedLbl->setFocusPolicy(Qt::NoFocus); @@ -78,7 +78,7 @@ StatusBar::StatusBar(QWidget *parent) m_dlSpeedLbl->setMinimumWidth(200); m_upSpeedLbl = new QPushButton(this); - m_upSpeedLbl->setIcon(QIcon(":/icons/skin/seeding.svg")); + m_upSpeedLbl->setIcon(QIcon(":/icons/seeding.svg")); connect(m_upSpeedLbl, &QAbstractButton::clicked, this, &StatusBar::capUploadSpeed); m_upSpeedLbl->setFlat(true); m_upSpeedLbl->setFocusPolicy(Qt::NoFocus); @@ -173,17 +173,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.svg"))); + m_connecStatusLblIcon->setIcon(QIcon(QLatin1String(":/icons/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.svg"))); + m_connecStatusLblIcon->setIcon(QIcon(QLatin1String(":/icons/connected.svg"))); m_connecStatusLblIcon->setToolTip(QLatin1String("") + tr("Connection Status:") + QLatin1String("
") + tr("Online")); } else { - m_connecStatusLblIcon->setIcon(QIcon(QLatin1String(":/icons/skin/firewalled.svg"))); + m_connecStatusLblIcon->setIcon(QIcon(QLatin1String(":/icons/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/transferlistfilterswidget.cpp b/src/gui/transferlistfilterswidget.cpp index 8f0094591..115fb50d5 100644 --- a/src/gui/transferlistfilterswidget.cpp +++ b/src/gui/transferlistfilterswidget.cpp @@ -165,40 +165,40 @@ StatusFilterWidget::StatusFilterWidget(QWidget *parent, TransferListWidget *tran // Add status filters auto *all = new QListWidgetItem(this); all->setData(Qt::DisplayRole, tr("All (0)", "this is for the status filter")); - all->setData(Qt::DecorationRole, QIcon(":/icons/skin/filterall.svg")); + all->setData(Qt::DecorationRole, QIcon(":/icons/filterall.svg")); auto *downloading = new QListWidgetItem(this); downloading->setData(Qt::DisplayRole, tr("Downloading (0)")); - downloading->setData(Qt::DecorationRole, QIcon(":/icons/skin/downloading.svg")); + downloading->setData(Qt::DecorationRole, QIcon(":/icons/downloading.svg")); auto *seeding = new QListWidgetItem(this); seeding->setData(Qt::DisplayRole, tr("Seeding (0)")); - seeding->setData(Qt::DecorationRole, QIcon(":/icons/skin/uploading.svg")); + seeding->setData(Qt::DecorationRole, QIcon(":/icons/uploading.svg")); auto *completed = new QListWidgetItem(this); completed->setData(Qt::DisplayRole, tr("Completed (0)")); - completed->setData(Qt::DecorationRole, QIcon(":/icons/skin/completed.svg")); + completed->setData(Qt::DecorationRole, QIcon(":/icons/completed.svg")); auto *resumed = new QListWidgetItem(this); resumed->setData(Qt::DisplayRole, tr("Resumed (0)")); - resumed->setData(Qt::DecorationRole, QIcon(":/icons/skin/resumed.svg")); + resumed->setData(Qt::DecorationRole, QIcon(":/icons/resumed.svg")); auto *paused = new QListWidgetItem(this); paused->setData(Qt::DisplayRole, tr("Paused (0)")); - paused->setData(Qt::DecorationRole, QIcon(":/icons/skin/paused.svg")); + paused->setData(Qt::DecorationRole, QIcon(":/icons/paused.svg")); auto *active = new QListWidgetItem(this); active->setData(Qt::DisplayRole, tr("Active (0)")); - active->setData(Qt::DecorationRole, QIcon(":/icons/skin/filteractive.svg")); + active->setData(Qt::DecorationRole, QIcon(":/icons/filteractive.svg")); auto *inactive = new QListWidgetItem(this); inactive->setData(Qt::DisplayRole, tr("Inactive (0)")); - inactive->setData(Qt::DecorationRole, QIcon(":/icons/skin/filterinactive.svg")); + inactive->setData(Qt::DecorationRole, QIcon(":/icons/filterinactive.svg")); auto *stalled = new QListWidgetItem(this); stalled->setData(Qt::DisplayRole, tr("Stalled (0)")); - stalled->setData(Qt::DecorationRole, QIcon(":/icons/skin/filterstalled.svg")); + stalled->setData(Qt::DecorationRole, QIcon(":/icons/filterstalled.svg")); auto *stalledUploading = new QListWidgetItem(this); stalledUploading->setData(Qt::DisplayRole, tr("Stalled Uploading (0)")); - stalledUploading->setData(Qt::DecorationRole, QIcon(":/icons/skin/stalledUP.svg")); + stalledUploading->setData(Qt::DecorationRole, QIcon(":/icons/stalledUP.svg")); auto *stalledDownloading = new QListWidgetItem(this); stalledDownloading->setData(Qt::DisplayRole, tr("Stalled Downloading (0)")); - stalledDownloading->setData(Qt::DecorationRole, QIcon(":/icons/skin/stalledDL.svg")); + stalledDownloading->setData(Qt::DecorationRole, QIcon(":/icons/stalledDL.svg")); auto *errored = new QListWidgetItem(this); errored->setData(Qt::DisplayRole, tr("Errored (0)")); - errored->setData(Qt::DecorationRole, QIcon(":/icons/skin/error.svg")); + errored->setData(Qt::DecorationRole, QIcon(":/icons/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 5695a667b..e1dad59d1 100644 --- a/src/gui/transferlistmodel.cpp +++ b/src/gui/transferlistmodel.cpp @@ -727,55 +727,55 @@ QColor getDefaultColorByState(const BitTorrent::TorrentState state) QIcon getPausedIcon() { - static QIcon cached = QIcon(":/icons/skin/paused.svg"); + static QIcon cached = QIcon(":/icons/paused.svg"); return cached; } QIcon getQueuedIcon() { - static QIcon cached = QIcon(":/icons/skin/queued.svg"); + static QIcon cached = QIcon(":/icons/queued.svg"); return cached; } QIcon getDownloadingIcon() { - static QIcon cached = QIcon(":/icons/skin/downloading.svg"); + static QIcon cached = QIcon(":/icons/downloading.svg"); return cached; } QIcon getStalledDownloadingIcon() { - static QIcon cached = QIcon(":/icons/skin/stalledDL.svg"); + static QIcon cached = QIcon(":/icons/stalledDL.svg"); return cached; } QIcon getUploadingIcon() { - static QIcon cached = QIcon(":/icons/skin/uploading.svg"); + static QIcon cached = QIcon(":/icons/uploading.svg"); return cached; } QIcon getStalledUploadingIcon() { - static QIcon cached = QIcon(":/icons/skin/stalledUP.svg"); + static QIcon cached = QIcon(":/icons/stalledUP.svg"); return cached; } QIcon getCompletedIcon() { - static QIcon cached = QIcon(":/icons/skin/completed.svg"); + static QIcon cached = QIcon(":/icons/completed.svg"); return cached; } QIcon getCheckingIcon() { - static QIcon cached = QIcon(":/icons/skin/checking.svg"); + static QIcon cached = QIcon(":/icons/checking.svg"); return cached; } QIcon getErrorIcon() { - static QIcon cached = QIcon(":/icons/skin/error.svg"); + static QIcon cached = QIcon(":/icons/error.svg"); return cached; } diff --git a/src/gui/transferlistwidget.cpp b/src/gui/transferlistwidget.cpp index 952b68bed..889b95690 100644 --- a/src/gui/transferlistwidget.cpp +++ b/src/gui/transferlistwidget.cpp @@ -865,7 +865,7 @@ void TransferListWidget::displayListMenu(const QPoint &) connect(actionDelete, &QAction::triggered, this, &TransferListWidget::softDeleteSelectedTorrents); auto *actionPreviewFile = new QAction(UIThemeManager::instance()->getIcon("view-preview"), tr("Preview file..."), listMenu); connect(actionPreviewFile, &QAction::triggered, this, &TransferListWidget::previewSelectedTorrents); - auto *actionSetMaxRatio = new QAction(QIcon(QLatin1String(":/icons/skin/ratio.svg")), tr("Limit share ratio..."), listMenu); + auto *actionSetMaxRatio = new QAction(QIcon(QLatin1String(":/icons/ratio.svg")), tr("Limit share ratio..."), listMenu); connect(actionSetMaxRatio, &QAction::triggered, this, &TransferListWidget::setMaxRatioSelectedTorrents); auto *actionSetUploadLimit = new QAction(UIThemeManager::instance()->getIcon("kt-set-max-upload-speed"), tr("Limit upload rate..."), listMenu); connect(actionSetUploadLimit, &QAction::triggered, this, &TransferListWidget::setUpLimitSelectedTorrents); diff --git a/src/icons/qbt-theme/README.md b/src/icons/README.md similarity index 100% rename from src/icons/qbt-theme/README.md rename to src/icons/README.md diff --git a/src/icons/qbt-theme/application-exit.svg b/src/icons/application-exit.svg similarity index 100% rename from src/icons/qbt-theme/application-exit.svg rename to src/icons/application-exit.svg diff --git a/src/icons/qbt-theme/application-rss+xml.svg b/src/icons/application-rss+xml.svg similarity index 100% rename from src/icons/qbt-theme/application-rss+xml.svg rename to src/icons/application-rss+xml.svg diff --git a/src/icons/qbt-theme/application-x-mswinurl.svg b/src/icons/application-x-mswinurl.svg similarity index 100% rename from src/icons/qbt-theme/application-x-mswinurl.svg rename to src/icons/application-x-mswinurl.svg diff --git a/src/icons/skin/arrow-right.gif b/src/icons/arrow-right.gif similarity index 100% rename from src/icons/skin/arrow-right.gif rename to src/icons/arrow-right.gif diff --git a/src/icons/skin/bg-dropdown.gif b/src/icons/bg-dropdown.gif similarity index 100% rename from src/icons/skin/bg-dropdown.gif rename to src/icons/bg-dropdown.gif diff --git a/src/icons/skin/bg-handle-horizontal.gif b/src/icons/bg-handle-horizontal.gif similarity index 100% rename from src/icons/skin/bg-handle-horizontal.gif rename to src/icons/bg-handle-horizontal.gif diff --git a/src/icons/skin/bg-header.gif b/src/icons/bg-header.gif similarity index 100% rename from src/icons/skin/bg-header.gif rename to src/icons/bg-header.gif diff --git a/src/icons/skin/bg-panel-header.gif b/src/icons/bg-panel-header.gif similarity index 100% rename from src/icons/skin/bg-panel-header.gif rename to src/icons/bg-panel-header.gif diff --git a/src/icons/qbt-theme/build-icons/Gruntfile.js b/src/icons/build-icons/Gruntfile.js similarity index 100% rename from src/icons/qbt-theme/build-icons/Gruntfile.js rename to src/icons/build-icons/Gruntfile.js diff --git a/src/icons/qbt-theme/build-icons/package.json b/src/icons/build-icons/package.json similarity index 100% rename from src/icons/qbt-theme/build-icons/package.json rename to src/icons/build-icons/package.json diff --git a/src/icons/qbt-theme/build-icons/readme.md b/src/icons/build-icons/readme.md similarity index 100% rename from src/icons/qbt-theme/build-icons/readme.md rename to src/icons/build-icons/readme.md diff --git a/src/icons/qbt-theme/checked.svg b/src/icons/checked.svg similarity index 100% rename from src/icons/qbt-theme/checked.svg rename to src/icons/checked.svg diff --git a/src/icons/skin/checking.svg b/src/icons/checking.svg similarity index 100% rename from src/icons/skin/checking.svg rename to src/icons/checking.svg diff --git a/src/icons/skin/collapse.svg b/src/icons/collapse.svg similarity index 100% rename from src/icons/skin/collapse.svg rename to src/icons/collapse.svg diff --git a/src/icons/skin/completed.svg b/src/icons/completed.svg similarity index 100% rename from src/icons/skin/completed.svg rename to src/icons/completed.svg diff --git a/src/icons/qbt-theme/configure.svg b/src/icons/configure.svg similarity index 100% rename from src/icons/qbt-theme/configure.svg rename to src/icons/configure.svg diff --git a/src/icons/skin/connected.svg b/src/icons/connected.svg similarity index 100% rename from src/icons/skin/connected.svg rename to src/icons/connected.svg diff --git a/src/icons/qbt-theme/dialog-cancel.svg b/src/icons/dialog-cancel.svg similarity index 100% rename from src/icons/qbt-theme/dialog-cancel.svg rename to src/icons/dialog-cancel.svg diff --git a/src/icons/qbt-theme/dialog-information.svg b/src/icons/dialog-information.svg similarity index 100% rename from src/icons/qbt-theme/dialog-information.svg rename to src/icons/dialog-information.svg diff --git a/src/icons/qbt-theme/dialog-warning.svg b/src/icons/dialog-warning.svg similarity index 100% rename from src/icons/qbt-theme/dialog-warning.svg rename to src/icons/dialog-warning.svg diff --git a/src/icons/skin/disconnected.svg b/src/icons/disconnected.svg similarity index 100% rename from src/icons/skin/disconnected.svg rename to src/icons/disconnected.svg diff --git a/src/icons/skin/dock-tabs.gif b/src/icons/dock-tabs.gif similarity index 100% rename from src/icons/skin/dock-tabs.gif rename to src/icons/dock-tabs.gif diff --git a/src/icons/qbt-theme/document-edit-verify.svg b/src/icons/document-edit-verify.svg similarity index 100% rename from src/icons/qbt-theme/document-edit-verify.svg rename to src/icons/document-edit-verify.svg diff --git a/src/icons/qbt-theme/document-edit.svg b/src/icons/document-edit.svg similarity index 100% rename from src/icons/qbt-theme/document-edit.svg rename to src/icons/document-edit.svg diff --git a/src/icons/qbt-theme/document-encrypt.svg b/src/icons/document-encrypt.svg similarity index 100% rename from src/icons/qbt-theme/document-encrypt.svg rename to src/icons/document-encrypt.svg diff --git a/src/icons/qbt-theme/document-import.svg b/src/icons/document-import.svg similarity index 100% rename from src/icons/qbt-theme/document-import.svg rename to src/icons/document-import.svg diff --git a/src/icons/qbt-theme/document-new.svg b/src/icons/document-new.svg similarity index 100% rename from src/icons/qbt-theme/document-new.svg rename to src/icons/document-new.svg diff --git a/src/icons/qbt-theme/document-properties.svg b/src/icons/document-properties.svg similarity index 100% rename from src/icons/qbt-theme/document-properties.svg rename to src/icons/document-properties.svg diff --git a/src/icons/qbt-theme/document-save.svg b/src/icons/document-save.svg similarity index 100% rename from src/icons/qbt-theme/document-save.svg rename to src/icons/document-save.svg diff --git a/src/icons/qbt-theme/download.svg b/src/icons/download.svg similarity index 100% rename from src/icons/qbt-theme/download.svg rename to src/icons/download.svg diff --git a/src/icons/skin/downloading.svg b/src/icons/downloading.svg similarity index 100% rename from src/icons/skin/downloading.svg rename to src/icons/downloading.svg diff --git a/src/icons/skin/download.svg b/src/icons/downloading_small.svg similarity index 100% rename from src/icons/skin/download.svg rename to src/icons/downloading_small.svg diff --git a/src/icons/qbt-theme/edit-clear-history.svg b/src/icons/edit-clear-history.svg similarity index 100% rename from src/icons/qbt-theme/edit-clear-history.svg rename to src/icons/edit-clear-history.svg diff --git a/src/icons/qbt-theme/edit-clear.svg b/src/icons/edit-clear.svg similarity index 100% rename from src/icons/qbt-theme/edit-clear.svg rename to src/icons/edit-clear.svg diff --git a/src/icons/qbt-theme/edit-copy.svg b/src/icons/edit-copy.svg similarity index 100% rename from src/icons/qbt-theme/edit-copy.svg rename to src/icons/edit-copy.svg diff --git a/src/icons/qbt-theme/edit-cut.svg b/src/icons/edit-cut.svg similarity index 100% rename from src/icons/qbt-theme/edit-cut.svg rename to src/icons/edit-cut.svg diff --git a/src/icons/qbt-theme/edit-delete.svg b/src/icons/edit-delete.svg similarity index 100% rename from src/icons/qbt-theme/edit-delete.svg rename to src/icons/edit-delete.svg diff --git a/src/icons/qbt-theme/edit-find-user.svg b/src/icons/edit-find-user.svg similarity index 100% rename from src/icons/qbt-theme/edit-find-user.svg rename to src/icons/edit-find-user.svg diff --git a/src/icons/qbt-theme/edit-find.svg b/src/icons/edit-find.svg similarity index 100% rename from src/icons/qbt-theme/edit-find.svg rename to src/icons/edit-find.svg diff --git a/src/icons/qbt-theme/edit-paste.svg b/src/icons/edit-paste.svg similarity index 100% rename from src/icons/qbt-theme/edit-paste.svg rename to src/icons/edit-paste.svg diff --git a/src/icons/qbt-theme/edit-rename.svg b/src/icons/edit-rename.svg similarity index 100% rename from src/icons/qbt-theme/edit-rename.svg rename to src/icons/edit-rename.svg diff --git a/src/icons/skin/error.svg b/src/icons/error.svg similarity index 100% rename from src/icons/skin/error.svg rename to src/icons/error.svg diff --git a/src/icons/skin/expand.svg b/src/icons/expand.svg similarity index 100% rename from src/icons/skin/expand.svg rename to src/icons/expand.svg diff --git a/src/icons/skin/filteractive.svg b/src/icons/filteractive.svg similarity index 100% rename from src/icons/skin/filteractive.svg rename to src/icons/filteractive.svg diff --git a/src/icons/skin/filterall.svg b/src/icons/filterall.svg similarity index 100% rename from src/icons/skin/filterall.svg rename to src/icons/filterall.svg diff --git a/src/icons/skin/filterinactive.svg b/src/icons/filterinactive.svg similarity index 100% rename from src/icons/skin/filterinactive.svg rename to src/icons/filterinactive.svg diff --git a/src/icons/skin/filterstalled.svg b/src/icons/filterstalled.svg similarity index 100% rename from src/icons/skin/filterstalled.svg rename to src/icons/filterstalled.svg diff --git a/src/icons/skin/firewalled.svg b/src/icons/firewalled.svg similarity index 100% rename from src/icons/skin/firewalled.svg rename to src/icons/firewalled.svg diff --git a/src/icons/qbt-theme/folder-documents.svg b/src/icons/folder-documents.svg similarity index 100% rename from src/icons/qbt-theme/folder-documents.svg rename to src/icons/folder-documents.svg diff --git a/src/icons/qbt-theme/folder-download.svg b/src/icons/folder-download.svg similarity index 100% rename from src/icons/qbt-theme/folder-download.svg rename to src/icons/folder-download.svg diff --git a/src/icons/qbt-theme/folder-new.svg b/src/icons/folder-new.svg similarity index 100% rename from src/icons/qbt-theme/folder-new.svg rename to src/icons/folder-new.svg diff --git a/src/icons/qbt-theme/folder-remote.svg b/src/icons/folder-remote.svg similarity index 100% rename from src/icons/qbt-theme/folder-remote.svg rename to src/icons/folder-remote.svg diff --git a/src/icons/qbt-theme/gear.svg b/src/icons/gear.svg similarity index 100% rename from src/icons/qbt-theme/gear.svg rename to src/icons/gear.svg diff --git a/src/icons/qbt-theme/gear32.svg b/src/icons/gear32.svg similarity index 100% rename from src/icons/qbt-theme/gear32.svg rename to src/icons/gear32.svg diff --git a/src/icons/qbt-theme/go-bottom.svg b/src/icons/go-bottom.svg similarity index 100% rename from src/icons/qbt-theme/go-bottom.svg rename to src/icons/go-bottom.svg diff --git a/src/icons/qbt-theme/go-down.svg b/src/icons/go-down.svg similarity index 100% rename from src/icons/qbt-theme/go-down.svg rename to src/icons/go-down.svg diff --git a/src/icons/qbt-theme/go-top.svg b/src/icons/go-top.svg similarity index 100% rename from src/icons/qbt-theme/go-top.svg rename to src/icons/go-top.svg diff --git a/src/icons/qbt-theme/go-up.svg b/src/icons/go-up.svg similarity index 100% rename from src/icons/qbt-theme/go-up.svg rename to src/icons/go-up.svg diff --git a/src/icons/skin/handle-icon-horizontal.gif b/src/icons/handle-icon-horizontal.gif similarity index 100% rename from src/icons/skin/handle-icon-horizontal.gif rename to src/icons/handle-icon-horizontal.gif diff --git a/src/icons/skin/handle-icon.gif b/src/icons/handle-icon.gif similarity index 100% rename from src/icons/skin/handle-icon.gif rename to src/icons/handle-icon.gif diff --git a/src/icons/qbt-theme/help-about.svg b/src/icons/help-about.svg similarity index 100% rename from src/icons/qbt-theme/help-about.svg rename to src/icons/help-about.svg diff --git a/src/icons/qbt-theme/help-contents.svg b/src/icons/help-contents.svg similarity index 100% rename from src/icons/qbt-theme/help-contents.svg rename to src/icons/help-contents.svg diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc index 341d1f5d8..04beda8b1 100644 --- a/src/icons/icons.qrc +++ b/src/icons/icons.qrc @@ -1,6 +1,52 @@ 3-state-checkbox.gif + application-exit.svg + application-rss+xml.svg + application-x-mswinurl.svg + arrow-right.gif + bg-dropdown.gif + bg-handle-horizontal.gif + bg-header.gif + bg-panel-header.gif + checked.svg + checking.svg + collapse.svg + completed.svg + configure.svg + connected.svg + dialog-cancel.svg + dialog-information.svg + dialog-warning.svg + disconnected.svg + dock-tabs.gif + document-edit-verify.svg + document-edit.svg + document-encrypt.svg + document-import.svg + document-new.svg + document-properties.svg + document-save.svg + download.svg + downloading.svg + downloading_small.svg + edit-clear-history.svg + edit-clear.svg + edit-copy.svg + edit-cut.svg + edit-delete.svg + edit-find-user.svg + edit-find.svg + edit-paste.svg + edit-rename.svg + error.svg + expand.svg + fileicon.svg + filteractive.svg + filterall.svg + filterinactive.svg + filterstalled.svg + firewalled.svg flags/ad.svg flags/ae.svg flags/af.svg @@ -141,6 +187,7 @@ flags/mc.svg flags/md.svg flags/me.svg + flags/mf.svg flags/mg.svg flags/mh.svg flags/mk.svg @@ -249,138 +296,97 @@ flags/za.svg flags/zm.svg flags/zw.svg + folder-documents.svg + folder-download.svg + folder-new.svg + folder-remote.svg + gear.svg + gear32.svg + go-bottom.svg + go-down.svg + go-top.svg + go-up.svg + handle-icon-horizontal.gif + handle-icon.gif + help-about.svg + help-contents.svg + inode-directory.svg + insert-link.svg + knob.gif + kt-magnet.svg + kt-set-max-download-speed.svg + kt-set-max-upload-speed.svg L.gif + list-add.svg + list-remove.svg loading.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.svg - qbt-theme/kt-set-max-download-speed.svg - qbt-theme/kt-set-max-upload-speed.svg - 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.svg - 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.svg - qbt-theme/task-ongoing.svg - qbt-theme/task-reject.svg - 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.svg - skin/collapse.svg - skin/completed.svg - skin/connected.svg - skin/disconnected.svg - skin/dock-tabs.gif - skin/download.svg - skin/downloading.svg - skin/error.svg - skin/filteractive.svg - skin/filterall.svg - skin/filterinactive.svg - skin/filterstalled.svg - skin/firewalled.svg - skin/handle-icon-horizontal.gif - skin/handle-icon.gif - skin/knob.gif - skin/logo-blank.gif - skin/logo.gif - skin/logo2.gif - skin/mascot.png - skin/paused.svg - skin/qbittorrent-tray.svg - skin/qbittorrent-tray-dark.svg - skin/qbittorrent-tray-light.svg - skin/qbittorrent32.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.svg - skin/stalledUP.svg - skin/tabs.gif - skin/toolbox-divider.gif - skin/toolbox-divider2.gif - skin/uploading.svg + logo-blank.gif + logo.gif + logo2.gif + mail-folder-inbox.svg + mail-mark-read.svg + mascot.png + media-playback-pause.svg + media-playback-start.svg + media-seek-forward.svg + network-server.svg + network-wired.svg + object-locked.svg + office-chart-line.svg + paused.svg + preferences-desktop.svg + preferences-other.svg + preferences-system-network.svg + preferences-web-browser-cookies.svg + qbittorrent-tray-dark.svg + qbittorrent-tray-light.svg + qbittorrent-tray-with-font.svg + qbittorrent-tray.svg + qbittorrent.ico + qbittorrent32.png + qbittorrent_file.ico + queued.svg + ratio.svg + resumed.svg + rss-config.svg + security-high.svg + security-low.svg + seeding.svg + services.svg + slider-area.gif slow.svg slow_off.svg + spacer.gif + speedometer.svg sphere.png sphere2.png + spinner-placeholder.gif + spinner.gif + splash.png + stalledDL.svg + stalledUP.svg + system-log-out.svg + tab-close.svg + tabs.gif + task-attention.svg + task-complete.svg + task-ongoing.svg + task-reject.svg + text-plain.svg + toolbox-divider.gif + toolbox-divider2.gif + tools-report-bug.svg + unavailable.svg + uploading.svg + user-group-delete.svg + user-group-new.svg + view-calendar-journal.svg + view-categories.svg + view-filter.svg + view-preview.svg + view-refresh.svg + view-statistics.svg + wallet-open.svg + webui.svg diff --git a/src/icons/qbt-theme/inode-directory.svg b/src/icons/inode-directory.svg similarity index 100% rename from src/icons/qbt-theme/inode-directory.svg rename to src/icons/inode-directory.svg diff --git a/src/icons/qbt-theme/insert-link.svg b/src/icons/insert-link.svg similarity index 100% rename from src/icons/qbt-theme/insert-link.svg rename to src/icons/insert-link.svg diff --git a/src/icons/skin/knob.gif b/src/icons/knob.gif similarity index 100% rename from src/icons/skin/knob.gif rename to src/icons/knob.gif diff --git a/src/icons/qbt-theme/kt-magnet.svg b/src/icons/kt-magnet.svg similarity index 100% rename from src/icons/qbt-theme/kt-magnet.svg rename to src/icons/kt-magnet.svg diff --git a/src/icons/qbt-theme/kt-set-max-download-speed.svg b/src/icons/kt-set-max-download-speed.svg similarity index 100% rename from src/icons/qbt-theme/kt-set-max-download-speed.svg rename to src/icons/kt-set-max-download-speed.svg diff --git a/src/icons/qbt-theme/kt-set-max-upload-speed.svg b/src/icons/kt-set-max-upload-speed.svg similarity index 100% rename from src/icons/qbt-theme/kt-set-max-upload-speed.svg rename to src/icons/kt-set-max-upload-speed.svg diff --git a/src/icons/qbt-theme/list-add.svg b/src/icons/list-add.svg similarity index 100% rename from src/icons/qbt-theme/list-add.svg rename to src/icons/list-add.svg diff --git a/src/icons/qbt-theme/list-remove.svg b/src/icons/list-remove.svg similarity index 100% rename from src/icons/qbt-theme/list-remove.svg rename to src/icons/list-remove.svg diff --git a/src/icons/skin/logo-blank.gif b/src/icons/logo-blank.gif similarity index 100% rename from src/icons/skin/logo-blank.gif rename to src/icons/logo-blank.gif diff --git a/src/icons/skin/logo.gif b/src/icons/logo.gif similarity index 100% rename from src/icons/skin/logo.gif rename to src/icons/logo.gif diff --git a/src/icons/skin/logo2.gif b/src/icons/logo2.gif similarity index 100% rename from src/icons/skin/logo2.gif rename to src/icons/logo2.gif diff --git a/src/icons/qbt-theme/mail-folder-inbox.svg b/src/icons/mail-folder-inbox.svg similarity index 100% rename from src/icons/qbt-theme/mail-folder-inbox.svg rename to src/icons/mail-folder-inbox.svg diff --git a/src/icons/qbt-theme/mail-mark-read.svg b/src/icons/mail-mark-read.svg similarity index 100% rename from src/icons/qbt-theme/mail-mark-read.svg rename to src/icons/mail-mark-read.svg diff --git a/src/icons/skin/mascot.png b/src/icons/mascot.png similarity index 100% rename from src/icons/skin/mascot.png rename to src/icons/mascot.png diff --git a/src/icons/qbt-theme/media-playback-pause.svg b/src/icons/media-playback-pause.svg similarity index 100% rename from src/icons/qbt-theme/media-playback-pause.svg rename to src/icons/media-playback-pause.svg diff --git a/src/icons/qbt-theme/media-playback-start.svg b/src/icons/media-playback-start.svg similarity index 100% rename from src/icons/qbt-theme/media-playback-start.svg rename to src/icons/media-playback-start.svg diff --git a/src/icons/qbt-theme/media-seek-forward.svg b/src/icons/media-seek-forward.svg similarity index 100% rename from src/icons/qbt-theme/media-seek-forward.svg rename to src/icons/media-seek-forward.svg diff --git a/src/icons/qbt-theme/network-server.svg b/src/icons/network-server.svg similarity index 100% rename from src/icons/qbt-theme/network-server.svg rename to src/icons/network-server.svg diff --git a/src/icons/qbt-theme/network-wired.svg b/src/icons/network-wired.svg similarity index 100% rename from src/icons/qbt-theme/network-wired.svg rename to src/icons/network-wired.svg diff --git a/src/icons/qbt-theme/object-locked.svg b/src/icons/object-locked.svg similarity index 100% rename from src/icons/qbt-theme/object-locked.svg rename to src/icons/object-locked.svg diff --git a/src/icons/qbt-theme/office-chart-line.svg b/src/icons/office-chart-line.svg similarity index 100% rename from src/icons/qbt-theme/office-chart-line.svg rename to src/icons/office-chart-line.svg diff --git a/src/icons/skin/paused.svg b/src/icons/paused.svg similarity index 100% rename from src/icons/skin/paused.svg rename to src/icons/paused.svg diff --git a/src/icons/qbt-theme/preferences-desktop.svg b/src/icons/preferences-desktop.svg similarity index 100% rename from src/icons/qbt-theme/preferences-desktop.svg rename to src/icons/preferences-desktop.svg diff --git a/src/icons/qbt-theme/preferences-other.svg b/src/icons/preferences-other.svg similarity index 100% rename from src/icons/qbt-theme/preferences-other.svg rename to src/icons/preferences-other.svg diff --git a/src/icons/qbt-theme/preferences-system-network.svg b/src/icons/preferences-system-network.svg similarity index 100% rename from src/icons/qbt-theme/preferences-system-network.svg rename to src/icons/preferences-system-network.svg diff --git a/src/icons/qbt-theme/preferences-web-browser-cookies.svg b/src/icons/preferences-web-browser-cookies.svg similarity index 100% rename from src/icons/qbt-theme/preferences-web-browser-cookies.svg rename to src/icons/preferences-web-browser-cookies.svg diff --git a/src/icons/skin/qbittorrent-tray-dark.svg b/src/icons/qbittorrent-tray-dark.svg similarity index 100% rename from src/icons/skin/qbittorrent-tray-dark.svg rename to src/icons/qbittorrent-tray-dark.svg diff --git a/src/icons/skin/qbittorrent-tray-light.svg b/src/icons/qbittorrent-tray-light.svg similarity index 100% rename from src/icons/skin/qbittorrent-tray-light.svg rename to src/icons/qbittorrent-tray-light.svg diff --git a/src/icons/skin/qbittorrent-tray-with-font.svg b/src/icons/qbittorrent-tray-with-font.svg similarity index 100% rename from src/icons/skin/qbittorrent-tray-with-font.svg rename to src/icons/qbittorrent-tray-with-font.svg diff --git a/src/icons/skin/qbittorrent-tray.svg b/src/icons/qbittorrent-tray.svg similarity index 100% rename from src/icons/skin/qbittorrent-tray.svg rename to src/icons/qbittorrent-tray.svg diff --git a/src/icons/skin/qbittorrent32.png b/src/icons/qbittorrent32.png similarity index 100% rename from src/icons/skin/qbittorrent32.png rename to src/icons/qbittorrent32.png diff --git a/src/icons/skin/queued.svg b/src/icons/queued.svg similarity index 100% rename from src/icons/skin/queued.svg rename to src/icons/queued.svg diff --git a/src/icons/skin/ratio.svg b/src/icons/ratio.svg similarity index 100% rename from src/icons/skin/ratio.svg rename to src/icons/ratio.svg diff --git a/src/icons/skin/resumed.svg b/src/icons/resumed.svg similarity index 100% rename from src/icons/skin/resumed.svg rename to src/icons/resumed.svg diff --git a/src/icons/qbt-theme/rss-config.svg b/src/icons/rss-config.svg similarity index 100% rename from src/icons/qbt-theme/rss-config.svg rename to src/icons/rss-config.svg diff --git a/src/icons/qbt-theme/security-high.svg b/src/icons/security-high.svg similarity index 100% rename from src/icons/qbt-theme/security-high.svg rename to src/icons/security-high.svg diff --git a/src/icons/qbt-theme/security-low.svg b/src/icons/security-low.svg similarity index 100% rename from src/icons/qbt-theme/security-low.svg rename to src/icons/security-low.svg diff --git a/src/icons/skin/seeding.svg b/src/icons/seeding.svg similarity index 100% rename from src/icons/skin/seeding.svg rename to src/icons/seeding.svg diff --git a/src/icons/qbt-theme/services.svg b/src/icons/services.svg similarity index 100% rename from src/icons/qbt-theme/services.svg rename to src/icons/services.svg diff --git a/src/icons/skin/build-icons/Gruntfile.js b/src/icons/skin/build-icons/Gruntfile.js deleted file mode 100644 index 2a88a4639..000000000 --- a/src/icons/skin/build-icons/Gruntfile.js +++ /dev/null @@ -1,22 +0,0 @@ -module.exports = function(grunt) { - - grunt.initConfig({ - svg2png: { - all: { - options:{ - size: 256 - }, - files: [ - { - src: ['icons/*.svg'] - } - ] - } - } - }); - - grunt.loadNpmTasks('grunt-svg2png'); - - grunt.registerTask('default', ['svg2png']); - -} \ No newline at end of file diff --git a/src/icons/skin/build-icons/package.json b/src/icons/skin/build-icons/package.json deleted file mode 100644 index c4e5b5ca3..000000000 --- a/src/icons/skin/build-icons/package.json +++ /dev/null @@ -1,13 +0,0 @@ -{ - "name": "build-icons", - "version": "1.0.0", - "description": "Convert svg icons to png", - "main": "index.js", - "dependencies": {}, - "devDependencies": { - "grunt": "^0.4.5", - "grunt-svg2png": "git+https://git@github.com/bertyhell/grunt-svg2png.git" - }, - "author": "Bert Verhelst", - "license": "ISC" -} diff --git a/src/icons/skin/build-icons/readme.md b/src/icons/skin/build-icons/readme.md deleted file mode 100644 index 97c3fd44f..000000000 --- a/src/icons/skin/build-icons/readme.md +++ /dev/null @@ -1,14 +0,0 @@ -Convert SVG icons to PNG ------------------------- - -install npm - -Execute: -``` -npm install -``` - -Convert icons by running: -``` -grunt -``` \ No newline at end of file diff --git a/src/icons/skin/slider-area.gif b/src/icons/slider-area.gif similarity index 100% rename from src/icons/skin/slider-area.gif rename to src/icons/slider-area.gif diff --git a/src/icons/skin/spacer.gif b/src/icons/spacer.gif similarity index 100% rename from src/icons/skin/spacer.gif rename to src/icons/spacer.gif diff --git a/src/icons/qbt-theme/speedometer.svg b/src/icons/speedometer.svg similarity index 100% rename from src/icons/qbt-theme/speedometer.svg rename to src/icons/speedometer.svg diff --git a/src/icons/skin/spinner-placeholder.gif b/src/icons/spinner-placeholder.gif similarity index 100% rename from src/icons/skin/spinner-placeholder.gif rename to src/icons/spinner-placeholder.gif diff --git a/src/icons/skin/spinner.gif b/src/icons/spinner.gif similarity index 100% rename from src/icons/skin/spinner.gif rename to src/icons/spinner.gif diff --git a/src/icons/skin/splash.png b/src/icons/splash.png similarity index 100% rename from src/icons/skin/splash.png rename to src/icons/splash.png diff --git a/src/icons/skin/stalledDL.svg b/src/icons/stalledDL.svg similarity index 100% rename from src/icons/skin/stalledDL.svg rename to src/icons/stalledDL.svg diff --git a/src/icons/skin/stalledUP.svg b/src/icons/stalledUP.svg similarity index 100% rename from src/icons/skin/stalledUP.svg rename to src/icons/stalledUP.svg diff --git a/src/icons/qbt-theme/system-log-out.svg b/src/icons/system-log-out.svg similarity index 100% rename from src/icons/qbt-theme/system-log-out.svg rename to src/icons/system-log-out.svg diff --git a/src/icons/qbt-theme/tab-close.svg b/src/icons/tab-close.svg similarity index 100% rename from src/icons/qbt-theme/tab-close.svg rename to src/icons/tab-close.svg diff --git a/src/icons/skin/tabs.gif b/src/icons/tabs.gif similarity index 100% rename from src/icons/skin/tabs.gif rename to src/icons/tabs.gif diff --git a/src/icons/qbt-theme/task-attention.svg b/src/icons/task-attention.svg similarity index 100% rename from src/icons/qbt-theme/task-attention.svg rename to src/icons/task-attention.svg diff --git a/src/icons/qbt-theme/task-complete.svg b/src/icons/task-complete.svg similarity index 100% rename from src/icons/qbt-theme/task-complete.svg rename to src/icons/task-complete.svg diff --git a/src/icons/qbt-theme/task-ongoing.svg b/src/icons/task-ongoing.svg similarity index 100% rename from src/icons/qbt-theme/task-ongoing.svg rename to src/icons/task-ongoing.svg diff --git a/src/icons/qbt-theme/task-reject.svg b/src/icons/task-reject.svg similarity index 100% rename from src/icons/qbt-theme/task-reject.svg rename to src/icons/task-reject.svg diff --git a/src/icons/qbt-theme/text-plain.svg b/src/icons/text-plain.svg similarity index 100% rename from src/icons/qbt-theme/text-plain.svg rename to src/icons/text-plain.svg diff --git a/src/icons/skin/toolbox-divider.gif b/src/icons/toolbox-divider.gif similarity index 100% rename from src/icons/skin/toolbox-divider.gif rename to src/icons/toolbox-divider.gif diff --git a/src/icons/skin/toolbox-divider2.gif b/src/icons/toolbox-divider2.gif similarity index 100% rename from src/icons/skin/toolbox-divider2.gif rename to src/icons/toolbox-divider2.gif diff --git a/src/icons/qbt-theme/tools-report-bug.svg b/src/icons/tools-report-bug.svg similarity index 100% rename from src/icons/qbt-theme/tools-report-bug.svg rename to src/icons/tools-report-bug.svg diff --git a/src/icons/qbt-theme/unavailable.svg b/src/icons/unavailable.svg similarity index 100% rename from src/icons/qbt-theme/unavailable.svg rename to src/icons/unavailable.svg diff --git a/src/icons/skin/uploading.svg b/src/icons/uploading.svg similarity index 100% rename from src/icons/skin/uploading.svg rename to src/icons/uploading.svg diff --git a/src/icons/qbt-theme/user-group-delete.svg b/src/icons/user-group-delete.svg similarity index 100% rename from src/icons/qbt-theme/user-group-delete.svg rename to src/icons/user-group-delete.svg diff --git a/src/icons/qbt-theme/user-group-new.svg b/src/icons/user-group-new.svg similarity index 100% rename from src/icons/qbt-theme/user-group-new.svg rename to src/icons/user-group-new.svg diff --git a/src/icons/qbt-theme/view-calendar-journal.svg b/src/icons/view-calendar-journal.svg similarity index 100% rename from src/icons/qbt-theme/view-calendar-journal.svg rename to src/icons/view-calendar-journal.svg diff --git a/src/icons/qbt-theme/view-categories.svg b/src/icons/view-categories.svg similarity index 100% rename from src/icons/qbt-theme/view-categories.svg rename to src/icons/view-categories.svg diff --git a/src/icons/qbt-theme/view-filter.svg b/src/icons/view-filter.svg similarity index 100% rename from src/icons/qbt-theme/view-filter.svg rename to src/icons/view-filter.svg diff --git a/src/icons/qbt-theme/view-preview.svg b/src/icons/view-preview.svg similarity index 100% rename from src/icons/qbt-theme/view-preview.svg rename to src/icons/view-preview.svg diff --git a/src/icons/qbt-theme/view-refresh.svg b/src/icons/view-refresh.svg similarity index 100% rename from src/icons/qbt-theme/view-refresh.svg rename to src/icons/view-refresh.svg diff --git a/src/icons/qbt-theme/view-statistics.svg b/src/icons/view-statistics.svg similarity index 100% rename from src/icons/qbt-theme/view-statistics.svg rename to src/icons/view-statistics.svg diff --git a/src/icons/qbt-theme/wallet-open.svg b/src/icons/wallet-open.svg similarity index 100% rename from src/icons/qbt-theme/wallet-open.svg rename to src/icons/wallet-open.svg diff --git a/src/icons/qbt-theme/webui.svg b/src/icons/webui.svg similarity index 100% rename from src/icons/qbt-theme/webui.svg rename to src/icons/webui.svg diff --git a/src/webui/www/private/css/Layout.css b/src/webui/www/private/css/Layout.css index aab95d73b..e95c271bb 100644 --- a/src/webui/www/private/css/Layout.css +++ b/src/webui/www/private/css/Layout.css @@ -43,13 +43,13 @@ body { position: relative; height: 45px; overflow: hidden; - background: #718BA6 url(../images/skin/bg-header.gif) repeat-x; + background: #718BA6 url(../images/bg-header.gif) repeat-x; } #desktopTitlebar { padding: 7px 8px 6px 8px; height: 32px; - background: url(../images/skin/logo.gif) no-repeat; + background: url(../images/logo.gif) no-repeat; background-position: left 0; } @@ -141,14 +141,14 @@ body { } #desktopNavbar ul li a.arrow-right, #desktopNavbar ul li a:hover.arrow-right { - background-image: url(../images/skin/arrow-right.gif); + background-image: url(../images/arrow-right.gif); background-repeat: no-repeat; background-position: right 7px; } #desktopNavbar li ul { border: 1px solid #3f3f3f; - background: #fff url(../images/skin/bg-dropdown.gif) repeat-y; + background: #fff url(../images/bg-dropdown.gif) repeat-y; position: absolute; left: -999em; z-index: 8000; @@ -290,7 +290,7 @@ li.divider { .panel-header { position: relative; - background: #f1f1f1 url(../images/skin/bg-panel-header.gif) repeat-x; + background: #f1f1f1 url(../images/bg-panel-header.gif) repeat-x; height: 30px; overflow: hidden; border-bottom: 1px solid #d3d3d3; @@ -301,7 +301,7 @@ li.divider { } .panel-headerContent.tabs { - background: url(../images/skin/tabs.gif) repeat-x; + background: url(../images/tabs.gif) repeat-x; background-position: left -68px; } @@ -316,11 +316,11 @@ li.divider { } .panel-collapse { - background: url(../images/skin/collapse.svg) left top no-repeat; + background: url(../images/collapse.svg) left top no-repeat; } .panel-expand { - background: url(../images/skin/collapse.svg) left top no-repeat; + background: url(../images/collapse.svg) left top no-repeat; transform: rotate(180deg); } @@ -336,7 +336,7 @@ li.divider { line-height: 1px; font-size: 1px; overflow: hidden; - background: #eee url(../images/skin/bg-handle-horizontal.gif) repeat-x; + background: #eee url(../images/bg-handle-horizontal.gif) repeat-x; } .horizontalHandle.detached .handleIcon { @@ -349,7 +349,7 @@ li.divider { line-height: 1px; font-size: 1px; overflow: hidden; - background: url(../images/skin/handle-icon-horizontal.gif) center center no-repeat; + background: url(../images/handle-icon-horizontal.gif) center center no-repeat; } .columnHandle { @@ -357,7 +357,7 @@ li.divider { float: left; width: 4px; overflow: hidden; - background: #c3c3c3 url(../images/skin/handle-icon.gif) center center no-repeat; + background: #c3c3c3 url(../images/handle-icon.gif) center center no-repeat; border: 1px solid #909090; border-top: 0; border-bottom: 0; @@ -378,7 +378,7 @@ li.divider { } div.toolbox.divider { /* Have to specify div here for IE6's sake */ - background: url(../images/skin/toolbox-divider.gif) repeat-y; + background: url(../images/toolbox-divider.gif) repeat-y; padding-left: 8px; } @@ -413,13 +413,13 @@ div.toolbox.divider { /* Have to specify div here for IE6's sake */ #spinnerWrapper { width: 16px; height: 16px; - background: url(../images/skin/spinner-placeholder.gif) no-repeat; + background: url(../images/spinner-placeholder.gif) no-repeat; margin: 4px 5px 0 5px; } #spinner { display: none; - background: url(../images/skin/spinner.gif) no-repeat; + background: url(../images/spinner.gif) no-repeat; width: 16px; height: 16px; } diff --git a/src/webui/www/private/css/Tabs.css b/src/webui/www/private/css/Tabs.css index fb438eb64..c6c115d35 100644 --- a/src/webui/www/private/css/Tabs.css +++ b/src/webui/www/private/css/Tabs.css @@ -19,7 +19,7 @@ Required by: .toolbarTabs { padding: 0 5px 2px 2px; - background: url(../images/skin/tabs.gif) repeat-x; + background: url(../images/tabs.gif) repeat-x; background-position: left -70px; overflow: visible; } @@ -38,12 +38,12 @@ Required by: float: left; margin: 0 0 5px 0; cursor: pointer; - background: url(../images/skin/tabs.gif) repeat-x; + background: url(../images/tabs.gif) repeat-x; background-position: left -35px; } .tab-menu li.selected { - background: url(../images/skin/tabs.gif) repeat-x; + background: url(../images/tabs.gif) repeat-x; background-position: left 0; } @@ -54,13 +54,13 @@ Required by: text-align: center; font-weight: normal; color: #181818; - background: url(../images/skin/tabs.gif) repeat-x; + background: url(../images/tabs.gif) repeat-x; background-position: right -35px; } .tab-menu li.selected a { color: #181818; font-weight: bold; - background: url(../images/skin/tabs.gif) repeat-x; + background: url(../images/tabs.gif) repeat-x; background-position: right 0; } diff --git a/src/webui/www/private/css/Window.css b/src/webui/www/private/css/Window.css index 30a64ca39..3f6291d70 100644 --- a/src/webui/www/private/css/Window.css +++ b/src/webui/www/private/css/Window.css @@ -46,7 +46,7 @@ Required by: .mochaTitlebar { width: 100%; overflow: hidden; - background: url(../images/skin/spacer.gif?from=fafafa&to=e5e5e5); + background: url(../images/spacer.gif?from=fafafa&to=e5e5e5); } .mochaTitlebar h3 { @@ -187,7 +187,7 @@ div.mochaToolbarWrapper.bottom { left: 6px; width: 16px; height: 16px; - background: url(../images/skin/spinner.gif) no-repeat; + background: url(../images/spinner.gif) no-repeat; } .mochaIframe { @@ -335,7 +335,7 @@ div.mochaToolbarWrapper.bottom { /* Example Window Themes */ #about_contentWrapper { - background: #e5e5e5 url(../images/skin/logo2.gif) 3px 3px no-repeat; + background: #e5e5e5 url(../images/logo2.gif) 3px 3px no-repeat; } #builder_contentWrapper { diff --git a/src/webui/www/private/css/dynamicTable.css b/src/webui/www/private/css/dynamicTable.css index ac5f65fd6..c71c9b9cb 100644 --- a/src/webui/www/private/css/dynamicTable.css +++ b/src/webui/www/private/css/dynamicTable.css @@ -78,14 +78,14 @@ tr.dynamicTableHeader { } .dynamicTable th.sorted { - background-image: url(../images/qbt-theme/go-up.svg); + background-image: url(../images/go-up.svg); background-position: right; background-repeat: no-repeat; background-size: 15px; } .dynamicTable th.sorted.reverse { - background-image: url(../images/qbt-theme/go-down.svg); + background-image: url(../images/go-down.svg); } .dynamicTable td img.flags { diff --git a/src/webui/www/private/css/style.css b/src/webui/www/private/css/style.css index b426aca8b..860f43fa0 100644 --- a/src/webui/www/private/css/style.css +++ b/src/webui/www/private/css/style.css @@ -237,7 +237,7 @@ a.propButton img { } .contextMenu li a.arrow-right, .contextMenu li a:hover.arrow-right { - background-image: url(../images/skin/arrow-right.gif); + background-image: url(../images/arrow-right.gif); background-repeat: no-repeat; background-position: right center; } @@ -290,7 +290,7 @@ a.propButton img { width: 420px; font-size: 1px; line-height: 1px; - background: #f2f2f2 url(../images/skin/slider-area.gif) repeat-x; + background: #f2f2f2 url(../images/slider-area.gif) repeat-x; border: 1px solid #a3a3a3; border-bottom: 1px solid #ccc; border-left: 1px solid #ccc; @@ -307,7 +307,7 @@ a.propButton img { width: 19px; font-size: 1px; line-height: 1px; - background: url(../images/skin/knob.gif) no-repeat; + background: url(../images/knob.gif) no-repeat; cursor: pointer; overflow: hidden; z-index: 2; @@ -331,7 +331,7 @@ a.propButton img { } #mochaToolbar .divider { - background-image: url(../images/skin/toolbox-divider.gif); + background-image: url(../images/toolbox-divider.gif); background-repeat: no-repeat; background-position: left center; padding-left: 14px; @@ -357,7 +357,7 @@ a.propButton img { #torrentsFilterInput { width: 160px; padding-left: 2em; - background-image: url("../images/qbt-theme/edit-find.svg"); + background-image: url("../images/edit-find.svg"); background-repeat: no-repeat; background-size: 1.5em; background-position: left; @@ -371,7 +371,7 @@ a.propButton img { #torrentFilesFilterInput { width: 160px; padding-left: 2em; - background-image: url("../images/qbt-theme/edit-find.svg"); + background-image: url("../images/edit-find.svg"); background-repeat: no-repeat; background-size: 1.5em; background-position: left; @@ -569,7 +569,7 @@ td.generalLabel { td.statusBarSeparator { width: 22px; - background-image: url('../images/skin/toolbox-divider.gif'); + background-image: url('../images/toolbox-divider.gif'); background-repeat: no-repeat; background-position: center 1px; background-size: 2px 18px; diff --git a/src/webui/www/private/index.html b/src/webui/www/private/index.html index 7142480e0..6ef9372cf 100644 --- a/src/webui/www/private/index.html +++ b/src/webui/www/private/index.html @@ -5,8 +5,8 @@ qBittorrent Web UI - - + + @@ -46,68 +46,68 @@
  • 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 of Queue)QBT_TR[CONTEXT=MainWindow] - QBT_TR(Move Up Queue)QBT_TR[CONTEXT=MainWindow] - QBT_TR(Move Down Queue)QBT_TR[CONTEXT=MainWindow] - QBT_TR(Bottom of Queue)QBT_TR[CONTEXT=MainWindow] + QBT_TR(Top of Queue)QBT_TR[CONTEXT=MainWindow] + QBT_TR(Move Up Queue)QBT_TR[CONTEXT=MainWindow] + QBT_TR(Move Down Queue)QBT_TR[CONTEXT=MainWindow] + QBT_TR(Bottom of Queue)QBT_TR[CONTEXT=MainWindow] - QBT_TR(Options)QBT_TR[CONTEXT=OptionsDialog] + QBT_TR(Options)QBT_TR[CONTEXT=OptionsDialog]