diff --git a/src/Icons/skin/bg-dropdown.gif b/src/Icons/skin/bg-dropdown.gif new file mode 100644 index 000000000..b598f9dd0 Binary files /dev/null and b/src/Icons/skin/bg-dropdown.gif differ diff --git a/src/Icons/skin/bg-header.gif b/src/Icons/skin/bg-header.gif new file mode 100644 index 000000000..6f44fb91f Binary files /dev/null and b/src/Icons/skin/bg-header.gif differ diff --git a/src/Icons/skin/bg-panel-header.gif b/src/Icons/skin/bg-panel-header.gif new file mode 100644 index 000000000..ea746f0d2 Binary files /dev/null and b/src/Icons/skin/bg-panel-header.gif differ diff --git a/src/Icons/skin/collapse-expand.gif b/src/Icons/skin/collapse-expand.gif new file mode 100644 index 000000000..5833c0c67 Binary files /dev/null and b/src/Icons/skin/collapse-expand.gif differ diff --git a/src/Icons/skin/dock-tabs.gif b/src/Icons/skin/dock-tabs.gif new file mode 100644 index 000000000..c835fa9c6 Binary files /dev/null and b/src/Icons/skin/dock-tabs.gif differ diff --git a/src/Icons/skin/logo-blank.gif b/src/Icons/skin/logo-blank.gif new file mode 100644 index 000000000..f5f8d7c1d Binary files /dev/null and b/src/Icons/skin/logo-blank.gif differ diff --git a/src/Icons/skin/logo.gif b/src/Icons/skin/logo.gif new file mode 100644 index 000000000..61c19e2a1 Binary files /dev/null and b/src/Icons/skin/logo.gif differ diff --git a/src/Icons/skin/logo2.gif b/src/Icons/skin/logo2.gif new file mode 100644 index 000000000..fce2ad80d Binary files /dev/null and b/src/Icons/skin/logo2.gif differ diff --git a/src/Icons/skin/spacer.gif b/src/Icons/skin/spacer.gif new file mode 100644 index 000000000..099c95f3c Binary files /dev/null and b/src/Icons/skin/spacer.gif differ diff --git a/src/Icons/skin/spinner-placeholder.gif b/src/Icons/skin/spinner-placeholder.gif new file mode 100644 index 000000000..ff0c3f1fe Binary files /dev/null and b/src/Icons/skin/spinner-placeholder.gif differ diff --git a/src/Icons/skin/spinner.gif b/src/Icons/skin/spinner.gif new file mode 100644 index 000000000..879316f75 Binary files /dev/null and b/src/Icons/skin/spinner.gif differ diff --git a/src/Icons/skin/toolbox-divider2.gif b/src/Icons/skin/toolbox-divider2.gif new file mode 100644 index 000000000..bbb37c50b Binary files /dev/null and b/src/Icons/skin/toolbox-divider2.gif differ diff --git a/src/icons.qrc b/src/icons.qrc index 6a167c293..fd91c5532 100644 --- a/src/icons.qrc +++ b/src/icons.qrc @@ -319,10 +319,15 @@ Icons/oxygen/wallet-open.png Icons/oxygen/webui.png Icons/skin/arrow-right.gif + Icons/skin/bg-dropdown.gif Icons/skin/bg-handle-horizontal.gif + Icons/skin/bg-header.gif + Icons/skin/bg-panel-header.gif Icons/skin/checking.png + Icons/skin/collapse-expand.gif Icons/skin/connected.png Icons/skin/disconnected.png + Icons/skin/dock-tabs.gif Icons/skin/download.png Icons/skin/downloading.png Icons/skin/error.png @@ -333,6 +338,9 @@ Icons/skin/handle-icon-horizontal.gif Icons/skin/handle-icon.gif Icons/skin/knob.gif + Icons/skin/logo-blank.gif + Icons/skin/logo.gif + Icons/skin/logo2.gif Icons/skin/mascot.png Icons/skin/paused.png Icons/skin/qbittorrent16.png @@ -344,11 +352,15 @@ Icons/skin/ratio.png Icons/skin/seeding.png Icons/skin/slider-area.gif + Icons/skin/spacer.gif + Icons/skin/spinner-placeholder.gif + Icons/skin/spinner.gif Icons/skin/splash.png Icons/skin/stalledDL.png Icons/skin/stalledUP.png Icons/skin/tabs.gif Icons/skin/toolbox-divider.gif + Icons/skin/toolbox-divider2.gif Icons/skin/uploading.png Icons/oxygen/system-log-out.png diff --git a/src/webui/requesthandler.cpp b/src/webui/requesthandler.cpp index dea1a42ba..da049c625 100644 --- a/src/webui/requesthandler.cpp +++ b/src/webui/requesthandler.cpp @@ -260,7 +260,11 @@ void RequestHandler::action_command_upload() if (!filePath.isEmpty()) { - QBtSession::instance()->addTorrent(filePath); + QTorrentHandle h = QBtSession::instance()->addTorrent(filePath); + if (!h.is_valid()) { + status(415, "Internal Server Error"); + print(QObject::tr("Error: '%1' is not a valid torrent file.\n").arg(torrent.filename), CONTENT_TYPE_TXT); + } // Clean up fsutils::forceRemove(filePath); } diff --git a/src/webui/www/private/index.html b/src/webui/www/private/index.html index 33f5fded8..80f10c32e 100644 --- a/src/webui/www/private/index.html +++ b/src/webui/www/private/index.html @@ -1,9 +1,8 @@ - - + qBittorrent web User Interface @@ -35,77 +34,78 @@
  • _(File)
  • _(Edit)
  • _(&Tools)
  • _(&Help)
  •    - - - - - + _(&Add torrent file...) + _(Add &link to torrent...) + _(Delete) + _(Resume) + _(Pause) - - + _(Decrease priority) + _(Increase priority) - + _(Options)
    -
    +
    + - +
    diff --git a/src/webui/www/private/login.html b/src/webui/www/private/login.html index ed25e261b..4f027033d 100644 --- a/src/webui/www/private/login.html +++ b/src/webui/www/private/login.html @@ -1,4 +1,3 @@ - @@ -8,6 +7,10 @@ -