Merge lp:~elementary-pantheon/pantheon-greeter/fingerprint-rewrite into lp:~elementary-pantheon/pantheon-greeter/trunk

[Danielle Foré]

FingerprintIndicatorArea.vala
* Replace fingerprint.png with fingerprint.svg
* Move fingerprint related enums here
* Add styles here instead of in the system stylesheet
* Use Gtk.Image instead of manual cairo drawing
* Set margins and column spacing on the grid instead of each widget
* whitespace
* Use Switch case, not else if/else if/else if
* Use Gtk style constants
* Remove obvious comments

Please make sure this branch is actually tested. I don't have a fingerprint reader so this is all theoretical for me.

[lp:~elementary-pantheon/pantheon-greeter/fingerprint-rewrite]

493. By Danielle Foré on 2016-09-25

box doesn't need to be outside

[Zisu Andrei (matzipan)]

Wouldn't the fingerprint be a good candidate to be included in the OS icons? The same icon will need to be used in the polkit dialog.

[Zisu Andrei (matzipan)]

You forgot to change the CMakeLists.txt file to point to the .svg.

But it seems to be unable to render the icon. Are you sure it's supposed to work like this? I don't know if Gtk.Image knows how to render SVGs, but just to load rendered bitmaps.

review: Needs Fixing

[lp:~elementary-pantheon/pantheon-greeter/fingerprint-rewrite]

494. By Danielle Foré on 2016-10-11

update cmake

[Danielle Foré (danrabbit)]

I agree it would probably be a useful icon to have. I'll have to talk to Sam about coming up with an icon name. But I think this branch should probably not require a new release of icons.

Yes Gtk.Image can render svg. Updated the CMakeLists.txt

[Zisu Andrei (matzipan)]

Ok, so the icon works now.

The CSS doesn't seem to be applied, though. It gets applied if I replace the EventBox on line 81 of FingerprintIndicatorArea with Grid and remove line 83 with visible_window.

review: Needs Fixing

[lp:~elementary-pantheon/pantheon-greeter/fingerprint-rewrite]

495. By Danielle Foré on 2016-10-26

replace event box with a grid

496. By Danielle Foré on 2016-10-26

update fprint style

[Zisu Andrei (matzipan)]

LGTM. Code and test.

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2016-08-29 16:04:07 +0000
+++ CMakeLists.txt	2016-10-26 17:18:44 +0000
@@ -67,4 +67,4 @@
 install (TARGETS pantheon-greeter RUNTIME DESTINATION sbin)
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-greeter.desktop DESTINATION share/xgreeters)
 install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/pantheon-greeter.conf DESTINATION ${CONF_DIR})
-install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/fingerprint.png DESTINATION ${PKGDATADIR})
\ No newline at end of file
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/fingerprint.svg DESTINATION ${PKGDATADIR})

=== removed file 'data/fingerprint.png'
Binary files data/fingerprint.png	2016-08-29 17:32:50 +0000 and data/fingerprint.png	1970-01-01 00:00:00 +0000 differ
=== added file 'data/fingerprint.svg'
--- data/fingerprint.svg	1970-01-01 00:00:00 +0000
+++ data/fingerprint.svg	2016-10-26 17:18:44 +0000
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   width="24"
+   height="24"
+   viewBox="0 0 24 24"
+   id="svg2"
+   inkscape:version="0.91 r13725"
+   sodipodi:docname="fingerprint.svg">
+  <sodipodi:namedview
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1"
+     objecttolerance="10"
+     gridtolerance="10"
+     guidetolerance="10"
+     inkscape:pageopacity="0"
+     inkscape:pageshadow="2"
+     inkscape:window-width="1704"
+     inkscape:window-height="1000"
+     id="namedview6"
+     showgrid="false"
+     inkscape:zoom="14.75"
+     inkscape:cx="-6.6440678"
+     inkscape:cy="8"
+     inkscape:window-x="853"
+     inkscape:window-y="398"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="svg2" />
+  <metadata
+     id="metadata10">
+    <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="defs8" />
+  <path
+     style="display:inline;opacity:1;fill:#333333;fill-opacity:1;stroke:none;stroke-width:2;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;enable-background:new"
+     d="m 11.52247,0.002921 c -3.0228898,-0.0645 -6.0691054,0.939045 -8.5253856,3.0249 a 0.75034339,0.75034339 0 1 0 0.9711902,1.14405 C 8.3115246,0.483626 14.708665,0.619586 18.890634,4.489736 a 0.75007465,0.75007465 0 1 0 1.019535,-1.1001 C 17.545089,1.200911 14.545361,0.067421 11.52247,0.002921 Z m -0.27246,2.994135 a 9.7499955,9.7499955 0 0 0 -9.7485306,9.70458 0.75007473,0.75007473 0 0 0 0,0.0015 0.75007473,0.75007473 0 0 0 -0.00147,0.0366 0.74999965,0.74999965 0 0 0 0,0.0075 0.74999965,0.74999965 0 0 0 0,0.0045 0.75007473,0.75007473 0 0 0 0,0.0045 c -1.5e-5,0.006 1.5e-5,0.0105 0,0.01605 a 0.74999965,0.74999965 0 0 0 0.00147,0.03375 c 9.151e-4,1.926016 0.35448,3.836099 1.04736,5.633789 A 0.75054078,0.75054078 0 1 0 3.9492246,17.899271 C 3.3171996,16.25944 2.9950444,14.517626 3.0000096,12.760601 a 0.75007473,0.75007473 0 0 0 0,-0.0135 8.2499962,8.2499962 0 0 1 8.2500004,-8.25 8.2499962,8.2499962 0 0 1 8.249999,8.25 2.249999,2.249999 0 0 1 -2.25,2.250001 2.249999,2.249999 0 0 1 -2.249999,-2.250001 3.7499983,3.7499983 0 0 0 -3.75,-3.75 3.7499983,3.7499983 0 0 0 -3.7485305,3.70605 3.7499983,3.7499983 0 0 0 -0.00147,0.04395 0.75007473,0.75007473 0 0 0 0,0.009 c -0.01515,5.333789 4.2989555,9.694109 9.6357435,9.741209 a 0.75007473,0.75007473 0 1 0 0.0135,-1.5 C 12.619286,20.95741 8.9875452,17.286191 9.0003402,12.760497 a 0.75007473,0.75007473 0 0 0 0,-0.0135 2.249999,2.249999 0 0 1 2.2499998,-2.250001 2.249999,2.249999 0 0 1 2.25,2.250001 3.7499983,3.7499983 0 0 0 3.749999,3.749999 3.7499983,3.7499983 0 0 0 3.75,-3.749999 9.7499955,9.7499955 0 0 0 -9.749999,-9.750001 z m 0,3 a 6.7499969,6.7499969 0 0 0 -6.7485304,6.703125 0.75007473,0.75007473 0 0 0 0,0.02055 6.7499969,6.7499969 0 0 0 -0.00147,0.0264 0.75007473,0.75007473 0 0 0 0,0.009 c -0.012,4.100625 1.9602,7.956359 5.2924807,10.350569 a 0.75007473,0.75007473 0 0 0 0.4936497,0.14505 0.75007473,0.75007473 0 0 0 0.0747,-0.009 0.75007473,0.75007473 0 0 0 0.30615,-1.354966 C 7.7265395,19.775095 5.9897646,16.377731 5.9999946,12.760346 a 0.75007473,0.75007473 0 0 0 0,-0.0135 5.2499976,5.2499976 0 0 1 5.2500004,-5.25 5.2499976,5.2499976 0 0 1 5.250001,5.25 0.74999965,0.74999965 0 0 0 0.749998,0.75 0.74999965,0.74999965 0 0 0 0.75,-0.75 0.74999965,0.74999965 0 0 0 -0.003,-0.07035 6.7499969,6.7499969 0 0 0 -6.747059,-6.67968 z m -0.009,5.97216 a 0.75007465,0.75007465 0 0 0 -0.74121,0.75879 c 0,0.003 1.4e-5,0.0075 0,0.0105 a 0.74999965,0.74999965 0 0 0 0,0.009 0.74999965,0.74999965 0 0 0 0.0045,0.07905 c 0.04275,3.658169 3.01545,6.63849 6.685543,6.670904 a 0.75007465,0.75007465 0 1 0 0.0135,-1.5 c -2.890857,-0.02549 -5.203393,-2.360915 -5.203123,-5.24999 a 0.74999965,0.74999965 0 0 0 0,-0.015 0.75007465,0.75007465 0 0 0 -0.75879,-0.763185 z"
+     id="path4449"
+     inkscape:connector-curvature="0" />
+</svg>

=== modified file 'src/FingerprintIndicatorArea.vala'
--- src/FingerprintIndicatorArea.vala	2016-09-25 15:02:55 +0000
+++ src/FingerprintIndicatorArea.vala	2016-10-26 17:18:44 +0000
@@ -18,89 +18,116 @@
 *
 */
 
+public enum MessageText {
+    FPRINT_SWIPE,
+    FPRINT_SWIPE_AGAIN,
+    FPRINT_SWIPE_TOO_SHORT,
+    FPRINT_NOT_CENTERED,
+    FPRINT_REMOVE,
+    FPRINT_PLACE,
+    FPRINT_PLACE_AGAIN,
+    FPRINT_NO_MATCH,
+    FPRINT_TIMEOUT,
+    FPRINT_ERROR,
+    FAILED,
+    OTHER
+}
+
 public class FingerprintIndicatorArea : CredentialsArea {
-    Gtk.EventBox box = new Gtk.EventBox ();
-    Gtk.Label label = new Gtk.Label (null);
-    
+    Gtk.Label label;
+
+    const string STYLE_CSS = """
+        .fingerprint {
+            background-image:
+                linear-gradient(
+                    @bg_color,
+                    @bg_color 80%,
+                    shade (
+                        @bg_color,
+                        0.94
+                    )
+                );
+            border-radius: 50%;
+            box-shadow:
+                inset 0 0 0 1px alpha (@bg_highlight_color, 0.1),
+                inset 0 1px 0 0 alpha (@bg_highlight_color, 0.9),
+                inset 0 -1px 0 0 alpha (@bg_highlight_color, 0.3),
+                0 0 0 1px alpha (#000, 0.2),
+                0 1px 2px alpha (#000, 0.15),
+                0 2px 6px alpha (#000, 0.10);
+        }
+
+        .fingerprint-label {
+            text-shadow: 0 0 3px alpha (#000, 0.4);
+        }
+
+        .fingerprint-label.info {
+            color: alpha (#fff, 0.8);
+        }
+
+        .fingerprint-label.error {
+            color: lighter (@error_color);
+        }
+    """;
+
     public FingerprintIndicatorArea () {
-        this.margin_top = 15;
-        
-        Gdk.Pixbuf image = null;
-        var margin = 2;
-
+        var provider = new Gtk.CssProvider ();
         try {
-            image = new Gdk.Pixbuf.from_file_at_size (Constants.PKGDATADIR+"/fingerprint.png", 26, 26);
+            provider.load_from_data (STYLE_CSS, STYLE_CSS.length);
+            Gtk.StyleContext.add_provider_for_screen (Gdk.Screen.get_default (), provider, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
         } catch (Error e) {
-           warning (@"Can't load fingerprint icon due to $(e.message)");
-        }
-        
-        box.valign = Gtk.Align.START;
-        box.visible_window = false;
-        box.margin_top = 5;
-        box.margin_left = 10;
-        
-        if (image != null) {
-            box.set_size_request (image.width + 4*margin, image.height + 4*margin);
-        }
-        
-        var box_style_context = box.get_style_context ();
-
-        box_style_context.add_class ("fingerprint");
-        
-        box.draw.connect ((ctx) => {
-            int width = box.get_allocated_width () - 2*margin;
-            int height = box.get_allocated_height () - 2*margin;
-
-            if (image != null) {
-                Gdk.cairo_set_source_pixbuf (ctx, image, 2*margin, 2*margin);
-            }
-           
-            box_style_context.render_background (ctx, margin, margin, width, height);
-            box_style_context.render_frame (ctx, margin, margin, width, height);
-            
-            ctx.paint ();
-            
-            return false;
-        });
-            
-        attach(box, 0, 0,1,1);
-        
-        label.margin_left = 7;
-        label.margin_top = 2;
+            warning (e.message);
+        } 
+
+        var image = new Gtk.Image.from_file (Constants.PKGDATADIR + "/fingerprint.svg");
+        image.margin = 6;
+
+        var box = new Gtk.Grid ();
+        box.get_style_context ().add_class ("fingerprint");
+        box.add (image);
+
+        label = new Gtk.Label ("");
+        label.valign = Gtk.Align.CENTER;
         
         var label_style_context = label.get_style_context ();
-
         label_style_context.add_class ("h3");
         label_style_context.add_class ("fingerprint-label");
-                
-        attach(label, 1, 0 ,1,1);
+
+        attach (box, 0, 0, 1, 1);   
+        attach (label, 1, 0, 1, 1);
+        column_spacing = 6;
     }
-    
+
     public override void pass_focus () {
     }
-    
+
     public override void show_message (LightDM.MessageType type, MessageText messagetext = MessageText.OTHER, string text = "") {
         var label_style_context = label.get_style_context ();
         
         if (type == LightDM.MessageType.INFO) {
-            label_style_context. remove_class("error");
-            label_style_context. add_class ("info");
+            label_style_context.remove_class (Gtk.STYLE_CLASS_ERROR);
+            label_style_context.add_class (Gtk.STYLE_CLASS_INFO);
         } else {
-            label_style_context. remove_class("info");
-            label_style_context. add_class ("error");
-        }
-        
-        // some fprint messages are too long, so we override them
-        if (messagetext == MessageText.FPRINT_SWIPE) {
-            text = _("Swipe your finger");
-        } else if (messagetext == MessageText.FPRINT_PLACE) {
-            text = _("Place your finger");
-        } else if (messagetext == MessageText.FPRINT_REMOVE) {
-            text = _("Remove your finger and try again.");
-        } else if (messagetext == MessageText.FPRINT_NOT_CENTERED) {
-            text = _("Center your finger and try again.");
-        }
-                
-        label.set_text(text);
+            label_style_context.remove_class (Gtk.STYLE_CLASS_INFO);
+            label_style_context.add_class (Gtk.STYLE_CLASS_ERROR);
+        }
+
+        switch (messagetext) {
+            case MessageText.FPRINT_SWIPE:
+                label.label = _("Swipe your finger");
+                break;
+            case MessageText.FPRINT_PLACE:
+                label.label = _("Place your finger");
+                break;
+            case MessageText.FPRINT_REMOVE:
+                label.label = _("Remove your finger and try again.");
+                break;
+            case MessageText.FPRINT_NOT_CENTERED:
+                label.label = _("Center your finger and try again.");
+                break;
+            default:
+                label.label = text;
+                break;
+        }
     }
 }

=== modified file 'src/LoginMask.vala'
--- src/LoginMask.vala	2016-09-25 14:52:44 +0000
+++ src/LoginMask.vala	2016-10-26 17:18:44 +0000
@@ -52,57 +52,6 @@
     OTHER
 }
 
-public enum MessageText {
-    /**
-     * fprintd message to swipe finger
-     */
-    FPRINT_SWIPE,
-    /**
-     * fprintd message to swipe again
-     */
-    FPRINT_SWIPE_AGAIN,
-    /**
-     * fprintd message to swipe longer
-     */
-    FPRINT_SWIPE_TOO_SHORT,
-    /**
-     * fprintd message to center finger
-     */
-    FPRINT_NOT_CENTERED,
-    /**
-     * fprintd message to remove finger
-     */
-    FPRINT_REMOVE,
-    /**
-     * fprintd message to place finger on device again
-     */
-    FPRINT_PLACE,
-    /**
-     * fprintd message to place finger on device again
-     */
-    FPRINT_PLACE_AGAIN,
-    /**
-     * fprintd failure message
-     */
-    FPRINT_NO_MATCH,
-    /**
-     * fprintd timeout message
-     */
-    FPRINT_TIMEOUT,
-    /**
-     * Unknown fprintd error
-     */ 
-    FPRINT_ERROR,
-    /**
-     * Login failed
-     */ 
-    FAILED,
-    /**
-     * The message was not in the expected list
-     */
-    OTHER
-}
-
 /**
  * A LoginMask is for example a UI such as the LoginBox that communicates with
  * the user.