Merge pull request #1308 from jp2images/svg-icons-d

Sort the icon folders by source and redraw the convert-shape icons (#1269)

ico/128x128/terminalstrip.svg

@@ -1,48 +0,0 @@
-<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 128 128" width="128" height="128">
-  <!-- DIN rail -->
-  <rect x="6" y="86" width="116" height="18" rx="3" fill="#7f8c8d"/>
-  <rect x="6" y="92" width="116" height="6" fill="#4d4d4d"/>
-  <!-- six terminal blocks: L, L, N, PE, L, spare -->
-  <g fill="#eff0f1">
-    <rect x="12" y="26" width="16" height="66" rx="2"/>
-    <rect x="30" y="26" width="16" height="66" rx="2"/>
-    <rect x="48" y="26" width="16" height="66" rx="2"/>
-    <rect x="66" y="26" width="16" height="66" rx="2"/>
-    <rect x="84" y="26" width="16" height="66" rx="2"/>
-    <rect x="102" y="26" width="16" height="66" rx="2"/>
-  </g>
-  <!-- right-hand shading of each block -->
-  <g fill="#bdc3c7">
-    <rect x="24" y="28" width="4" height="62"/>
-    <rect x="42" y="28" width="4" height="62"/>
-    <rect x="60" y="28" width="4" height="62"/>
-    <rect x="78" y="28" width="4" height="62"/>
-    <rect x="96" y="28" width="4" height="62"/>
-    <rect x="114" y="28" width="4" height="62"/>
-  </g>
-  <!-- colored marker bands -->
-  <rect x="12" y="26" width="16" height="10" rx="2" fill="#7f8c8d"/>
-  <rect x="30" y="26" width="16" height="10" rx="2" fill="#7f8c8d"/>
-  <rect x="48" y="26" width="16" height="10" rx="2" fill="#3daee9"/>
-  <rect x="66" y="26" width="16" height="10" rx="2" fill="#27ae60"/>
-  <rect x="70" y="26" width="8" height="10" fill="#fdbc4b"/>
-  <rect x="84" y="26" width="16" height="10" rx="2" fill="#7f8c8d"/>
-  <rect x="102" y="26" width="16" height="10" rx="2" fill="#da4453"/>
-  <!-- screws -->
-  <g fill="#31363b">
-    <circle cx="20" cy="50" r="4.5"/><circle cx="20" cy="74" r="4.5"/>
-    <circle cx="38" cy="50" r="4.5"/><circle cx="38" cy="74" r="4.5"/>
-    <circle cx="56" cy="50" r="4.5"/><circle cx="56" cy="74" r="4.5"/>
-    <circle cx="74" cy="50" r="4.5"/><circle cx="74" cy="74" r="4.5"/>
-    <circle cx="92" cy="50" r="4.5"/><circle cx="92" cy="74" r="4.5"/>
-    <circle cx="110" cy="50" r="4.5"/><circle cx="110" cy="74" r="4.5"/>
-  </g>
-  <g fill="#eff0f1">
-    <rect x="16" y="49" width="8" height="2"/><rect x="16" y="73" width="8" height="2"/>
-    <rect x="34" y="49" width="8" height="2"/><rect x="34" y="73" width="8" height="2"/>
-    <rect x="52" y="49" width="8" height="2"/><rect x="52" y="73" width="8" height="2"/>
-    <rect x="70" y="49" width="8" height="2"/><rect x="70" y="73" width="8" height="2"/>
-    <rect x="88" y="49" width="8" height="2"/><rect x="88" y="73" width="8" height="2"/>
-    <rect x="106" y="49" width="8" height="2"/><rect x="106" y="73" width="8" height="2"/>
-  </g>
-</svg>

ico/README.md

@@ -0,0 +1,37 @@
+# Icons
+
+QElectroTech loads most icons by name from an icon theme, for example
+`QIcon::fromTheme("document-save")`. An icon theme is a folder of icons
+sorted by size, with an `index.theme` file that lists the sizes. QET
+has two themes, `qet` for light windows and `qet-dark` for dark ones.
+`misc/make_icon_themes.py` builds both from the source folders below.
+
+| Folder | Contents | Source | Built by a script | License |
+|---|---|---|---|---|
+| `qet/traced/` | QET's icons as SVG, at 16 and 22 px, with smooth versions for larger sizes | Traced from QET's former PNG icons, or drawn by contributors | No | GPL-2.0-or-later |
+| `qet/scalable/` | QET's SVG icons drawn on a 24 px canvas; `16/` holds 16 px versions | Drawn by contributors | No | GPL-2.0-or-later |
+| `qet/pages/` | Settings page icons | Drawn by contributors | No | GPL-2.0-or-later |
+| `breeze/` | KDE Breeze icons, in folders by pixel size | KDE Breeze | `misc/import_breeze_icons.py` | LGPL-3.0-or-later |
+| `breeze/added/` | 16 px versions of Breeze icons that Breeze lacks or draws in another style | Drawn by contributors in the Breeze style | No | LGPL-3.0-or-later |
+| `flags/` | Language flags | Damien Sorel's flag pack | No | Public domain |
+| `colors/` | Color swatches for the element editor | Contributed in 2020 | No | GPL-2.0-or-later |
+| `themes/` | The `qet` and `qet-dark` themes; `generated/` holds intermediate files | Built from the folders above | `misc/make_icon_themes.py` | Same as the source file |
+| `breeze-icons/` | App and file-type icons in the Breeze style | Nuri | No | CC-BY-ND-3.0 |
+| `256x256/` | QET logo for windows, the tray and the About menu; app icon | Nuri | No | CC-BY-ND-3.0 |
+| `mac_icon/`, `windows_icon/` | App and file-type icons for macOS and Windows | Nuri | No | CC-BY-ND-3.0 |
+| `splash.png` | Splash screen | Nuri | No | CC-BY-ND-3.0 |
+
+`icon-themes.qrc` lists the theme files for the Qt resource system and
+is written by `misc/make_icon_themes.py`. Do not edit it by hand.
+
+`copyright` is the Debian copyright file for the whole project. It
+holds the full license and credit for each icon.
+
+## Adding an icon
+
+1. Put the SVG in `qet/scalable/` and add it to `SVGS` in
+   `misc/make_icon_themes.py`. For a Breeze icon, add its name to
+   `BREEZE` there instead and run `misc/import_breeze_icons.py`.
+2. Run `python3 misc/make_icon_themes.py`.
+3. Load it with `QIcon::fromTheme("<name>")`.
+4. Credit it in `copyright`.