Plymouth/softWaves: visual tweaks for password input

7 files changed, 94 insertions, 27 deletions

diff --git a/softwaves-theme/plymouth/logo_circle.png b/softwaves-theme/plymouth/logo_circle.png
index cedec41..ce89052 100644
--- a/softwaves-theme/plymouth/logo_circle.png
+++ b/softwaves-theme/plymouth/logo_circle.png
diff --git a/softwaves-theme/plymouth/logo_glow.png b/softwaves-theme/plymouth/logo_glow.png
deleted file mode 100644
index 3d17530..0000000
--- a/softwaves-theme/plymouth/logo_glow.png
+++ /dev/null
diff --git a/softwaves-theme/plymouth/password_field.png b/softwaves-theme/plymouth/password_field.png
index 956b95a..c23f5b8 100644
--- a/softwaves-theme/plymouth/password_field.png
+++ b/softwaves-theme/plymouth/password_field.png
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