From f5e890d42e307fe338c155ea8bf55cea40fc7a94 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Aur=C3=A9lien=20COUDERC?= <zecoucou@free.fr>
Date: Mon, 9 Jan 2017 22:19:26 +0000
Subject: [PATCH] Plymouth/softWaves: visual tweaks for password input

---
 debian/changelog                              |   6 +-
 softwaves-theme/plymouth/logo_circle.png      | Bin 2928 -> 3776 bytes
 softwaves-theme/plymouth/logo_glow.png        | Bin 12969 -> 0 bytes
 softwaves-theme/plymouth/password_field.png   | Bin 279 -> 322 bytes
 softwaves-theme/plymouth/softwaves.script     |   4 +-
 .../sources/plymouth/logo_circle.svg          |  23 ++++--
 .../sources/plymouth/logo_glow.svg            |  17 ----
 .../sources/plymouth/password_field.svg       |  77 ++++++++++++++++++
 8 files changed, 98 insertions(+), 29 deletions(-)
 delete mode 100644 softwaves-theme/plymouth/logo_glow.png
 delete mode 100644 softwaves-theme/sources/plymouth/logo_glow.svg
 create mode 100644 softwaves-theme/sources/plymouth/password_field.svg

diff --git a/debian/changelog b/debian/changelog
index 8e25abf..baf1a71 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,9 +3,11 @@ desktop-base (9.0.1) UNRELEASED; urgency=medium
   [ Aurélien COUDERC ]
   * postinst: Report success even when update-grub fails, this is needed
     for installation to work inside live systems. (Closes: #850601).
-  * Plymouth/{softWaves,Lines,Joy}: provide fsckd progress support.
+  * Plymouth/{softWaves,Lines,Joy}: provide fsckd progress support. Thanks to
+    Ubuntu and Didier Roche for doing the work and providing timely info.
     (Closes: #850181)
-  * Plymouth/softWaves: raise messages and password field a little.
+  * Plymouth/softWaves: various visual tweaks, boost logo glow, improvements
+    in password input rendering. Thanks Juliette!
   * Plymouth/Lines: ensure password field doesn’t bump into the Debian image
     even for smaller height screens. (Closes: #774226)
   * Plymouth/Lines: Remove 8 from Debian8 assets.
diff --git a/softwaves-theme/plymouth/logo_circle.png b/softwaves-theme/plymouth/logo_circle.png
index cedec415348290065d4d2f3a6812db7a7e019949..ce8905213cc6ec5c92126051d99df5548149452d 100644
GIT binary patch
literal 3776
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
Lp3aqr1F!rS3jr~t

literal 2928
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
BSakpZ

diff --git a/softwaves-theme/plymouth/logo_glow.png b/softwaves-theme/plymouth/logo_glow.png
deleted file mode 100644
index 3d175300e0760b34caaec87297ee5ffcdcd761d6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 12969
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

diff --git a/softwaves-theme/plymouth/password_field.png b/softwaves-theme/plymouth/password_field.png
index 956b95a0592635b9f1e4987a30375232febd8ae2..c23f5b8e5c30d873328d74df198a07d4635989a6 100644
GIT binary patch
literal 322
zcmeAS@N?(olHy`uVBq!ia0y~yU}OifH8|LS<YzVe4?v2g*vT`50|;t3QaXTq&H|6f
zVxao#Ak65bF}ngNC|TkfQ4*Y=R#Ki=l*&+EUaps!mtCBkSdglhUz9%kosASw(SA=C
z$B>FSZ?7l{G6ga)T;z9d7UmIr;ld=6sL|-)JXxCM(X0f)*YA&1bB4Xm`&ajl`N8>2
zE4_BZV-<Vmz2BPL@ODS+y61my2_7(;$voi<qsKD_m12fTmJBCl8dCTijMx>ZEqn>&
iifng=+eNebPV@7a^8A<oF!ManD-52lelF{r5}E)n#cIg_

literal 279
zcmeAS@N?(olHy`uVBq!ia0y~yVB`g|^*Gpoq*1Jo3Xoz;@^*J&_z!{$_AZ|c6yYrJ
zh%9Dc;1&j9Muu5)B!GhKC7!;n><@S(MS0cy?eEC~g_d}_IEGZ*dV75%XM=%=YoKzU
zNWm(f$tzjPt1^#j^(s7^qxV)@&tCN;n?bfYqk`0d^uFhhbKaV9ekl7I7c159o>M`p
zA%kHNV+R|Qg7V?QAjS*^0bU0ahKmd?%mTbn3d)BIgBfsT5h0#QtOu3?js3vPe0()m
V_|fynJ%R3J@O1TaS?83{1ONbWO^^Tp

diff --git a/softwaves-theme/plymouth/softwaves.script b/softwaves-theme/plymouth/softwaves.script
index 134782e..218fef4 100644
--- a/softwaves-theme/plymouth/softwaves.script
+++ b/softwaves-theme/plymouth/softwaves.script
@@ -332,7 +332,7 @@ fun get_message_label (label, is_fake, is_action_line) {
     # Put the 2nd line below the fsck line
     if (is_action_line) {
         local.fsck_label.y = message_label.y + (first_line_height + first_line_height / 2);
-        message_label.y = local.fsck_label.y + (first_line_height * 2);
+        message_label.y = local.fsck_label.y + (first_line_height * 1.5);
     }
 
 #    Debug("action label x = " + message_label.x + " y = " + message_label.y );
@@ -480,7 +480,7 @@ fun password_dialogue_setup (message_label) {
     entry.x = Window.GetX () + Window.GetWidth () / 2 - entry.image.GetWidth () / 2;
 
     # Put the entry below the second label.
-    entry.y = message_notification[2].y + label.height;
+    entry.y = message_notification[2].y + label.height * 1.5;
 
     #DebugMedium("entry x = " + entry.x + ", y = " + entry.y);
     entry.z = 10000;
diff --git a/softwaves-theme/sources/plymouth/logo_circle.svg b/softwaves-theme/sources/plymouth/logo_circle.svg
index fa7ab68..1743a14 100644
--- a/softwaves-theme/sources/plymouth/logo_circle.svg
+++ b/softwaves-theme/sources/plymouth/logo_circle.svg
@@ -1,13 +1,20 @@
 <?xml version="1.0" encoding="utf-8"?>
 <!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
 <!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" id="root" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
 	 width="380px" height="380px" viewBox="0 0 380 380" enable-background="new 0 0 380 380" xml:space="preserve">
-<linearGradient id="logo_x5F_circleGlow_1_" gradientUnits="userSpaceOnUse" x1="220.3203" y1="650.877" x2="590.3203" y2="650.877" gradientTransform="matrix(1 0 0 1 -215.3203 -459.9199)">
-	<stop  offset="0" style="stop-color:#FFFFFF;stop-opacity:0.5"/>
-	<stop  offset="0.1281" style="stop-color:#FFFFFF;stop-opacity:0"/>
-</linearGradient>
-<path id="logo_x5F_circleGlow" fill="none" stroke="url(#logo_x5F_circleGlow_1_)" stroke-width="10" stroke-miterlimit="10" d="
-	M190,10.953c99.41,0,180,80.589,180,180c0,99.42-80.59,180.009-180,180.009c-99.411,0-180-80.589-180-180.009
-	C10,91.542,90.589,10.953,190,10.953z"/>
+<g id="root">
+	<g id="logo_x5F_circleGlow">
+		
+			<linearGradient id="SVGID_1_" gradientUnits="userSpaceOnUse" x1="-902.3987" y1="2602.4375" x2="-542.3992" y2="2602.4375" gradientTransform="matrix(1 0 0 -1 907.0649 2793.3945)">
+			<stop  offset="0" style="stop-color:#FFFFFF"/>
+			<stop  offset="0.1882" style="stop-color:#FFFFFF;stop-opacity:0"/>
+		</linearGradient>
+		<path fill="url(#SVGID_1_)" d="M184.666,23.953c44.607,0,86.544,17.371,118.085,48.914
+			c31.545,31.541,48.914,73.479,48.914,118.086c0,44.611-17.369,86.551-48.914,118.096c-31.541,31.543-73.479,48.913-118.085,48.913
+			c-44.606,0-86.545-17.37-118.087-48.913c-31.542-31.545-48.913-73.484-48.913-118.096c0-44.607,17.371-86.545,48.913-118.087
+			S140.059,23.953,184.666,23.953 M184.666,10.953c-99.411,0-180,80.589-180,180c0,99.42,80.589,180.009,180,180.009
+			c99.41,0,180-80.589,180-180.009C364.666,91.542,284.076,10.953,184.666,10.953L184.666,10.953z"/>
+	</g>
+</g>
 </svg>
diff --git a/softwaves-theme/sources/plymouth/logo_glow.svg b/softwaves-theme/sources/plymouth/logo_glow.svg
deleted file mode 100644
index a74d47c..0000000
--- a/softwaves-theme/sources/plymouth/logo_glow.svg
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
-<svg version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" width="380px"
-	 height="380px" viewBox="0 0 380 380" enable-background="new 0 0 380 380" xml:space="preserve">
-<g id="Layer_1">
-</g>
-<g id="root">
-	
-		<radialGradient id="logo_x5F_glow_1_" cx="297.6602" cy="-39.9175" r="175.0017" gradientTransform="matrix(1 0 0 -1 -107.6602 151.04)" gradientUnits="userSpaceOnUse">
-		<stop  offset="0" style="stop-color:#FFFFFF"/>
-		<stop  offset="1" style="stop-color:#FFFFFF;stop-opacity:0"/>
-	</radialGradient>
-	<path id="logo_x5F_glow" fill="url(#logo_x5F_glow_1_)" d="M190,15.954c96.649,0,175,78.351,175,175.001
-		c0,96.656-78.351,175.006-175,175.006c-96.65,0-175-78.351-175-175.006C15,94.304,93.35,15.954,190,15.954z"/>
-</g>
-</svg>
diff --git a/softwaves-theme/sources/plymouth/password_field.svg b/softwaves-theme/sources/plymouth/password_field.svg
new file mode 100644
index 0000000..5512945
--- /dev/null
+++ b/softwaves-theme/sources/plymouth/password_field.svg
@@ -0,0 +1,77 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 16.0.0, SVG Export Plug-In . SVG Version: 6.00 Build 0)  -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   x="0px"
+   y="0px"
+   width="262"
+   height="40"
+   viewBox="0 0 262.00001 40"
+   enable-background="new 0 0 262.675 40"
+   xml:space="preserve"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="password_field.svg"
+   inkscape:export-filename="/home/coucouf/hack/desktop-base/desktop-base-trunk/softwaves-theme/plymouth/password_field.png"
+   inkscape:export-xdpi="90"
+   inkscape:export-ydpi="90"><metadata
+     id="metadata20"><rdf:RDF><cc:Work
+         rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title></cc:Work></rdf:RDF></metadata><defs
+     id="defs18" /><sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1610"
+     inkscape:window-height="772"
+     id="namedview16"
+     showgrid="false"
+     fit-margin-top="0"
+     fit-margin-left="0"
+     fit-margin-right="0"
+     fit-margin-bottom="0"
+     inkscape:zoom="9.5833264"
+     inkscape:cx="20.206188"
+     inkscape:cy="17.945467"
+     inkscape:window-x="0"
+     inkscape:window-y="34"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" /><g
+     id="Layer_2" /><g
+     id="Layer_1"><g
+       id="g6"><rect
+         width="262"
+         height="40"
+         id="rect8"
+         x="0"
+         y="0"
+         style="opacity:0.3;fill:#819486" /><g
+         id="g10"
+         style="opacity:0.4"><path
+           d="m 261.675,1 0,38 L 1,39 1,1 261.675,1 m 1,-1 L 0,0 l 0,40 262.675,0 0,-40 0,0 z"
+           id="path12"
+           inkscape:connector-curvature="0"
+           style="fill:#ffffff" /></g></g><image
+       sodipodi:absref="/home/coucouf/hack/desktop-base/desktop-base-trunk/softwaves-theme/sources/plymouth/../../../../desktop-base/softwaves-theme/plymouth/password_field.png"
+       xlink:href="../../../../desktop-base/softwaves-theme/plymouth/password_field.png"
+       style="display:none;overflow:visible"
+       id="image14"
+       transform="matrix(0.9999,0,0,0.9999,-3.1665,-3)"
+       height="46"
+       width="269"
+       overflow="visible"
+       display="none" /></g></svg>
\ No newline at end of file