diff --git a/src/icons/icons.qrc b/src/icons/icons.qrc index 04beda8b1..ff7b81ceb 100644 --- a/src/icons/icons.qrc +++ b/src/icons/icons.qrc @@ -1,14 +1,8 @@ - 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 @@ -19,7 +13,6 @@ dialog-information.svg dialog-warning.svg disconnected.svg - dock-tabs.gif document-edit-verify.svg document-edit.svg document-encrypt.svg @@ -306,23 +299,16 @@ 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 - logo-blank.gif - logo.gif - logo2.gif mail-folder-inbox.svg mail-mark-read.svg mascot.png @@ -353,28 +339,21 @@ 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 diff --git a/src/webui/webapplication.cpp b/src/webui/webapplication.cpp index 021c7a1bd..46846ebd5 100644 --- a/src/webui/webapplication.cpp +++ b/src/webui/webapplication.cpp @@ -64,7 +64,7 @@ constexpr int MAX_ALLOWED_FILESIZE = 10 * 1024 * 1024; -const QString PATH_PREFIX_IMAGES {QStringLiteral("/images/")}; +const QString PATH_PREFIX_ICONS {QStringLiteral("/icons/")}; const QString WWW_FOLDER {QStringLiteral(":/www")}; const QString PUBLIC_FOLDER {QStringLiteral("/public")}; const QString PRIVATE_FOLDER {QStringLiteral("/private")}; @@ -145,8 +145,8 @@ void WebApplication::sendWebUIFile() throw InternalServerErrorHTTPError(); if (!m_isAltUIUsed) { - if (request().path.startsWith(PATH_PREFIX_IMAGES)) { - const QString imageFilename {request().path.mid(PATH_PREFIX_IMAGES.size())}; + if (request().path.startsWith(PATH_PREFIX_ICONS)) { + const QString imageFilename {request().path.mid(PATH_PREFIX_ICONS.size())}; sendFile(QLatin1String(":/icons/") + imageFilename); return; } diff --git a/src/webui/www/private/css/Layout.css b/src/webui/www/private/css/Layout.css index e95c271bb..03372b07c 100644 --- a/src/webui/www/private/css/Layout.css +++ b/src/webui/www/private/css/Layout.css @@ -316,11 +316,11 @@ li.divider { } .panel-collapse { - background: url(../images/collapse.svg) left top no-repeat; + background: url(../icons/collapse.svg) left top no-repeat; } .panel-expand { - background: url(../images/collapse.svg) left top no-repeat; + background: url(../icons/collapse.svg) left top no-repeat; transform: rotate(180deg); } diff --git a/src/webui/www/private/css/dynamicTable.css b/src/webui/www/private/css/dynamicTable.css index c71c9b9cb..b12b9f694 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/go-up.svg); + background-image: url(../icons/go-up.svg); background-position: right; background-repeat: no-repeat; background-size: 15px; } .dynamicTable th.sorted.reverse { - background-image: url(../images/go-down.svg); + background-image: url(../icons/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 860f43fa0..3b4a04543 100644 --- a/src/webui/www/private/css/style.css +++ b/src/webui/www/private/css/style.css @@ -357,7 +357,7 @@ a.propButton img { #torrentsFilterInput { width: 160px; padding-left: 2em; - background-image: url("../images/edit-find.svg"); + background-image: url("../icons/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/edit-find.svg"); + background-image: url("../icons/edit-find.svg"); background-repeat: no-repeat; background-size: 1.5em; background-position: left; diff --git a/src/icons/3-state-checkbox.gif b/src/webui/www/private/images/3-state-checkbox.gif similarity index 100% rename from src/icons/3-state-checkbox.gif rename to src/webui/www/private/images/3-state-checkbox.gif diff --git a/src/icons/L.gif b/src/webui/www/private/images/L.gif similarity index 100% rename from src/icons/L.gif rename to src/webui/www/private/images/L.gif diff --git a/src/icons/arrow-right.gif b/src/webui/www/private/images/arrow-right.gif similarity index 100% rename from src/icons/arrow-right.gif rename to src/webui/www/private/images/arrow-right.gif diff --git a/src/icons/bg-dropdown.gif b/src/webui/www/private/images/bg-dropdown.gif similarity index 100% rename from src/icons/bg-dropdown.gif rename to src/webui/www/private/images/bg-dropdown.gif diff --git a/src/icons/bg-handle-horizontal.gif b/src/webui/www/private/images/bg-handle-horizontal.gif similarity index 100% rename from src/icons/bg-handle-horizontal.gif rename to src/webui/www/private/images/bg-handle-horizontal.gif diff --git a/src/icons/bg-header.gif b/src/webui/www/private/images/bg-header.gif similarity index 100% rename from src/icons/bg-header.gif rename to src/webui/www/private/images/bg-header.gif diff --git a/src/icons/bg-panel-header.gif b/src/webui/www/private/images/bg-panel-header.gif similarity index 100% rename from src/icons/bg-panel-header.gif rename to src/webui/www/private/images/bg-panel-header.gif diff --git a/src/icons/dock-tabs.gif b/src/webui/www/private/images/dock-tabs.gif similarity index 100% rename from src/icons/dock-tabs.gif rename to src/webui/www/private/images/dock-tabs.gif diff --git a/src/icons/handle-icon-horizontal.gif b/src/webui/www/private/images/handle-icon-horizontal.gif similarity index 100% rename from src/icons/handle-icon-horizontal.gif rename to src/webui/www/private/images/handle-icon-horizontal.gif diff --git a/src/icons/handle-icon.gif b/src/webui/www/private/images/handle-icon.gif similarity index 100% rename from src/icons/handle-icon.gif rename to src/webui/www/private/images/handle-icon.gif diff --git a/src/icons/knob.gif b/src/webui/www/private/images/knob.gif similarity index 100% rename from src/icons/knob.gif rename to src/webui/www/private/images/knob.gif diff --git a/src/icons/logo-blank.gif b/src/webui/www/private/images/logo-blank.gif similarity index 100% rename from src/icons/logo-blank.gif rename to src/webui/www/private/images/logo-blank.gif diff --git a/src/icons/logo.gif b/src/webui/www/private/images/logo.gif similarity index 100% rename from src/icons/logo.gif rename to src/webui/www/private/images/logo.gif diff --git a/src/icons/logo2.gif b/src/webui/www/private/images/logo2.gif similarity index 100% rename from src/icons/logo2.gif rename to src/webui/www/private/images/logo2.gif diff --git a/src/icons/slider-area.gif b/src/webui/www/private/images/slider-area.gif similarity index 100% rename from src/icons/slider-area.gif rename to src/webui/www/private/images/slider-area.gif diff --git a/src/icons/spacer.gif b/src/webui/www/private/images/spacer.gif similarity index 100% rename from src/icons/spacer.gif rename to src/webui/www/private/images/spacer.gif diff --git a/src/icons/spinner-placeholder.gif b/src/webui/www/private/images/spinner-placeholder.gif similarity index 100% rename from src/icons/spinner-placeholder.gif rename to src/webui/www/private/images/spinner-placeholder.gif diff --git a/src/icons/spinner.gif b/src/webui/www/private/images/spinner.gif similarity index 100% rename from src/icons/spinner.gif rename to src/webui/www/private/images/spinner.gif diff --git a/src/icons/tabs.gif b/src/webui/www/private/images/tabs.gif similarity index 100% rename from src/icons/tabs.gif rename to src/webui/www/private/images/tabs.gif diff --git a/src/icons/toolbox-divider.gif b/src/webui/www/private/images/toolbox-divider.gif similarity index 100% rename from src/icons/toolbox-divider.gif rename to src/webui/www/private/images/toolbox-divider.gif diff --git a/src/icons/toolbox-divider2.gif b/src/webui/www/private/images/toolbox-divider2.gif similarity index 100% rename from src/icons/toolbox-divider2.gif rename to src/webui/www/private/images/toolbox-divider2.gif diff --git a/src/webui/www/private/index.html b/src/webui/www/private/index.html index 6ef9372cf..80c76c841 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]