From ffc256ba8709a36639567664c4ae38da69904702 Mon Sep 17 00:00:00 2001
From: piotr <nwg.piotr@gmail.com>
Date: Thu, 1 Feb 2024 01:09:13 +0100
Subject: [PATCH] fix Makefile; modify icons

---
 Makefile     |  5 ++--
 img/exit.svg | 41 +++++++++++++++-----------------
 img/lock.svg | 66 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 88 insertions(+), 24 deletions(-)
 create mode 100644 img/lock.svg

diff --git a/Makefile b/Makefile
index 14ae57e..3f72f2e 100644
--- a/Makefile
+++ b/Makefile
@@ -16,11 +16,12 @@ install:
 	sleep 1
 	mkdir -p /usr/share/nwg-drawer
 	cp -r desktop-directories /usr/share/nwg-drawer
+	cp -r img /usr/share/nwg-drawer
 	cp drawer.css /usr/share/nwg-drawer
 	cp bin/nwg-drawer /usr/bin
 
-	cp LICENSE /usr/share/licenses/nwg-shell-drawer/LICENSE
-	cp README.md /usr/share/doc/nwg-shell-drawer/README.md
+	install -Dm 644 -t "/usr/share/licenses/nwg-drawer" LICENSE
+	install -Dm 644 -t "/usr/share/doc/nwg-drawer" README.md
 
 uninstall:
 	rm -r /usr/share/nwg-drawer
diff --git a/img/exit.svg b/img/exit.svg
index f6db074..7a36f22 100644
--- a/img/exit.svg
+++ b/img/exit.svg
@@ -5,7 +5,7 @@
    viewBox="0 0 48 48"
    height="48"
    width="48"
-   sodipodi:docname="exit.svg"
+   sodipodi:docname="exit1.svg"
    inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
@@ -23,16 +23,23 @@
      inkscape:pageopacity="0.0"
      inkscape:pagecheckerboard="0"
      inkscape:deskcolor="#d1d1d1"
-     inkscape:zoom="11.039097"
-     inkscape:cx="24.005586"
-     inkscape:cy="27.085548"
-     inkscape:window-width="1912"
-     inkscape:window-height="1012"
+     inkscape:zoom="9.4201949"
+     inkscape:cx="17.197096"
+     inkscape:cy="24.256398"
+     inkscape:window-width="2552"
+     inkscape:window-height="1372"
      inkscape:window-x="0"
      inkscape:window-y="0"
      inkscape:window-maximized="1"
      inkscape:current-layer="svg8"
-     showgrid="false" />
+     showgrid="false"
+     showguides="true">
+    <sodipodi:guide
+       position="-17.76063,69.315161"
+       orientation="0,-1"
+       id="guide1"
+       inkscape:locked="false" />
+  </sodipodi:namedview>
   <defs
      id="defs2" />
   <metadata
@@ -49,19 +56,9 @@
   <path
      id="path831"
      style="opacity:1;vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:3.75;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke markers fill"
-     d="M 24,4 C 12.954305,4 4,12.954305 4,24 4,35.045695 12.954305,44 24,44 35.045695,44 44,35.045695 44,24 44,12.954305 35.045695,4 24,4 Z m 0,1.25 C 34.355339,5.25 42.75,13.644661 42.75,24 42.75,34.355339 34.355339,42.75 24,42.75 13.644661,42.75 5.25,34.355339 5.25,24 5.25,13.644661 13.644661,5.25 24,5.25 Z" />
-  <g
-     id="g1"
-     transform="translate(1,1)">
-    <path
-       id="path2"
-       style="opacity:1;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:4.59844;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke markers fill"
-       d="m 22.571647,20.10504 v 1.877474 h -7.454459 v 2.034973 h 7.454459 v 1.877473 l 5.366467,-2.894961 z"
-       sodipodi:nodetypes="cccccccc" />
-    <path
-       id="rect3"
-       style="color:#000000;fill:#f2f2f2;fill-opacity:1;-inkscape-stroke:none"
-       d="m 17.162109,13.658203 c -1.121783,0 -2.044921,0.919234 -2.044921,2.041016 v 4.259765 h 1.25 v -4.259765 c 0,-0.450906 0.344016,-0.791016 0.794921,-0.791016 h 11.679688 c 0.450905,0 0.791015,0.34011 0.791015,0.791016 v 14.599609 c 0,0.450907 -0.34011,0.792969 -0.791015,0.792969 H 17.162109 c -0.450905,0 -0.794921,-0.342063 -0.794921,-0.792969 v -4.257812 h -1.25 v 4.257812 c 0,1.121783 0.923138,2.042969 2.044921,2.042969 h 11.679688 c 1.121783,0 2.041015,-0.921186 2.041015,-2.042969 V 15.699219 c 0,-1.121782 -0.919232,-2.041016 -2.041015,-2.041016 z"
-       sodipodi:nodetypes="ssccssssssssccsssssss" />
-  </g>
+     d="M 24 4 C 12.954338 4 4 12.954338 4 24 C 4 35.045662 12.954338 44 24 44 C 31.79942 44 38.549265 39.531179 41.845703 33.017578 L 40.427734 33.017578 C 37.240509 38.816001 31.084255 42.75 24 42.75 C 13.644691 42.75 5.25 34.355309 5.25 24 C 5.25 13.644691 13.644691 5.25 24 5.25 C 31.084255 5.25 37.240509 9.1839991 40.427734 14.982422 L 41.845703 14.982422 C 38.549265 8.4688214 31.79942 4 24 4 z " />
+  <path
+     id="path5"
+     style="color:#000000;fill:#f2f2f2;fill-opacity:1;stroke-linejoin:bevel;-inkscape-stroke:none"
+     d="M 34.980469,18.517578 V 19.8125 l 6.347656,3.591797 -16.929687,-0.115235 -0.0078,1.125 18.927734,0.128907 v -1.304688 z" />
 </svg>
diff --git a/img/lock.svg b/img/lock.svg
new file mode 100644
index 0000000..372c46a
--- /dev/null
+++ b/img/lock.svg
@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<svg
+   width="48"
+   height="48"
+   viewBox="0 0 48 48"
+   version="1.1"
+   id="svg8"
+   sodipodi:docname="lock.svg"
+   inkscape:version="1.3.2 (091e20ef0f, 2023-11-25, custom)"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:dc="http://purl.org/dc/elements/1.1/">
+  <sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:zoom="16.208306"
+     inkscape:cx="23.876647"
+     inkscape:cy="20.76096"
+     inkscape:window-width="2552"
+     inkscape:window-height="1372"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="1"
+     inkscape:current-layer="svg8"
+     showgrid="false" />
+  <defs
+     id="defs2" />
+  <metadata
+     id="metadata5">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <path
+     style="vector-effect:none;fill:#f2f2f2;fill-opacity:1;stroke:none;stroke-width:3.75238;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;paint-order:stroke markers fill"
+     d="m 117.78998,28.062266 -1.08641,0.0064 2e-5,0.0024 -37.799575,0.0816 -0.007,-1.249983 37.379655,-0.0791 c -1.83062,-8.704176 -9.52473,-14.924431 -18.41926,-14.890941 -8.428083,0.0507 -15.786638,5.718662 -17.987023,13.854598 l -1.291486,0.0077 C 80.806771,16.95191 88.730946,10.732773 97.849919,10.670451 107.928,10.61958 116.47101,18.070836 117.78998,28.062266 Z m -0.43153,7.507607 C 115.13057,44.412889 107.20639,50.632007 98.087432,50.694325 88.009353,50.745197 79.466338,43.293941 78.147368,33.30251 l 1.086411,-0.0064 -1.4e-5,-0.0024 38.306055,-0.0816 0.007,1.249983 -37.886139,0.0791 c 1.830589,8.704029 9.524477,14.924242 18.418861,14.890942 8.428078,-0.0507 15.786638,-5.718664 17.987018,-13.854598 z"
+     id="path817"
+     sodipodi:nodetypes="cccccccccccccccccccccc" />
+  <path
+     id="path2"
+     style="color:#000000;opacity:1;fill:#f2f2f2;fill-opacity:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:2;-inkscape-stroke:none"
+     d="M 4.28125 20.666016 C 4.0995845 21.748484 4 22.858366 4 23.992188 C 4 35.02783 12.958497 43.986328 23.994141 43.986328 C 35.029785 43.986328 43.988281 35.02783 43.988281 23.992188 C 43.988281 22.858366 43.888701 21.748484 43.707031 20.666016 L 43.542969 20.666016 L 42.566406 20.666016 L 5.421875 20.666016 L 4.5546875 20.666016 L 4.28125 20.666016 z M 5.2597656 21.791016 L 42.728516 21.791016 C 42.813924 22.51349 42.863281 23.246468 42.863281 23.992188 C 42.863281 34.419838 34.421791 42.861328 23.994141 42.861328 C 13.566489 42.861328 5.125 34.419838 5.125 23.992188 C 5.125 23.246468 5.1743575 22.51349 5.2597656 21.791016 z " />
+  <path
+     id="path1"
+     style="color:#000000;opacity:1;fill:#f2f2f2;fill-opacity:1;stroke-width:0.928946;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:2;-inkscape-stroke:none"
+     d="M 23.994141,4 C 16.924668,4 10.84601,8.9380574 8.1814139,15.996094 h 0.6775437 0.3842787 29.5018087 0.301692 0.76013 C 37.142272,8.9380574 31.063612,4 23.994141,4 Z m 0,1.125 c 6.142069,0 11.48054,3.9335741 14.253702,9.746094 H 9.7404393 C 12.5136,9.0585741 17.85207,5.125 23.994141,5.125 Z" />
+  <path
+     style="color:#000000;fill:#f2f2f2;fill-opacity:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:2;-inkscape-stroke:none"
+     d="m 23.880859,30.039062 c -1.679508,0 -3.048828,1.369321 -3.048828,3.048829 v 1.808593 c 0,1.679508 1.36932,3.048828 3.048828,3.048828 h 0.226563 c 1.679508,0 3.048828,-1.36932 3.048828,-3.048828 v -1.808593 c 0,-1.679508 -1.36932,-3.048829 -3.048828,-3.048829 z m 0,1.125 h 0.226563 c 1.075718,0 1.923828,0.848111 1.923828,1.923829 v 1.808593 c 0,1.075718 -0.84811,1.923828 -1.923828,1.923828 h -0.226563 c -1.075718,0 -1.923828,-0.84811 -1.923828,-1.923828 v -1.808593 c 0,-1.075718 0.84811,-1.923828 1.923828,-1.923829 z"
+     id="rect2" />
+</svg>