Merge pull request #12893 from Chocobo1/icon

Move qbittorrent32.png to WebUI images folder
5 years ago · 1c1c82ce4f
7 changed files with 12 additions and 15 deletions
--- a/src/icons/.svgo.yml
+++ b/src/icons/.svgo.yml
@ -1,8 +0,0 @@
				@@ -1,8 +0,0 @@
-# config file for [SVGO](https://github.com/svg/svgo)
-# SVGO: Node.js tool for optimizing SVG files
-#   svgo --config=<this file> <svg file>
-
-multipass: true
-js2svg:
-  pretty: true
-  indent: '  '
--- a/src/icons/README.md
+++ b/src/icons/README.md
@ -1,7 +1,12 @@
				@@ -1,7 +1,12 @@
-qBittorrent Theme Icons
------------------------------------------
+# qBittorrent Icons
+
 Initial `qbt-theme` icons created by Bert Verhelst (<verhelstbert@gmail.com>).

 Icons are based on the `Font-Awesome` icon-set: [link](http://fontawesome.io/icons/).

 If you need to add an icon that qBittorrent does not already use, you can take an icon from the SVG fork of `Font-Awesome`: [link](https://github.com/encharm/Font-Awesome-SVG-PNG).
+
+
+## Optimizing SVG
+
+Use [svgcleaner](https://github.com/RazrFalcon/svgcleaner)
--- a/src/icons/icons.qrc
+++ b/src/icons/icons.qrc
@ -329,7 +329,6 @@
				@@ -329,7 +329,6 @@
        <file>qbittorrent-tray-with-font.svg</file>
        <file>qbittorrent-tray.svg</file>
        <file>qbittorrent.ico</file>
-        <file>qbittorrent32.png</file>
        <file>qbittorrent_file.ico</file>
        <file>queued.svg</file>
        <file>ratio.svg</file>
--- a/src/webui/www/private/index.html
+++ b/src/webui/www/private/index.html
@ -5,7 +5,7 @@
				@@ -5,7 +5,7 @@
    <meta charset="UTF-8" />
    <meta http-equiv="X-UA-Compatible" content="IE=10" />
    <title>qBittorrent Web UI</title>
-    <link rel="icon" type="image/png" href="icons/qbittorrent32.png" />
+    <link rel="icon" type="image/png" href="images/qbittorrent32.png" />
    <link rel="icon" type="image/svg+xml" href="icons/qbittorrent-tray.svg" />
    <link rel="stylesheet" type="text/css" href="css/dynamicTable.css?v=${CACHEID}" />
    <link rel="stylesheet" type="text/css" href="css/style.css?v=${CACHEID}" />
--- a/src/webui/www/public/images/qbittorrent32.png
+++ b/src/webui/www/public/images/qbittorrent32.png
--- a/src/webui/www/public/index.html
+++ b/src/webui/www/public/index.html
@ -4,7 +4,7 @@
				@@ -4,7 +4,7 @@
 <head>
    <meta charset="UTF-8" />
    <title>qBittorrent QBT_TR(Web UI)QBT_TR[CONTEXT=OptionsDialog]</title>
-    <link rel="icon" type="image/png" href="icons/qbittorrent32.png" />
+    <link rel="icon" type="image/png" href="images/qbittorrent32.png" />
    <link rel="icon" type="image/svg+xml" href="icons/qbittorrent-tray.svg" />
    <link rel="stylesheet" type="text/css" href="css/login.css?v=${CACHEID}" />
    <noscript>
--- a/src/webui/www/webui.qrc
+++ b/src/webui/www/webui.qrc
@ -74,6 +74,7 @@
				@@ -74,6 +74,7 @@
        <file>private/views/transferlist.html</file>
        <file>public/css/login.css</file>
        <file>public/css/noscript.css</file>
+        <file>public/images/qbittorrent32.png</file>
        <file>public/index.html</file>
        <file>public/scripts/login.js</file>
    </qresource>