Merge lp:~elementary-apps/pantheon-photos/video-thumbnail into lp:~pantheon-photos/pantheon-photos/trunk

[Danielle Foré]

Remove the "sprocket" from video thumbnails and replace the thumbnail image

Gets rid of the dumb sprocket and replaces the placeholder thumbnail with something a little simpler.

It's still not ideal, we're presenting a pixbuf instead of a gtk.image and ideally I think I'd like to do this with native widgets and icons and not have an image at all here. But It's way less code than the old thing

To test this you'll need to make install and to clear your video thumbnails in .cache/pantheon-photos

[lp:~elementary-apps/pantheon-photos/video-thumbnail]

3071. By Danielle Foré on 2016-12-08

kill sprockets

=== removed file 'data/icons/noninterpretable-video.png'
Binary files data/icons/noninterpretable-video.png	2010-12-03 00:51:38 +0000 and data/icons/noninterpretable-video.png	1970-01-01 00:00:00 +0000 differ
=== added file 'data/icons/noninterpretable-video.svg'
--- data/icons/noninterpretable-video.svg	1970-01-01 00:00:00 +0000
+++ data/icons/noninterpretable-video.svg	2016-12-08 22:24:42 +0000
@@ -0,0 +1,43 @@
+<?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"
+   height="300"
+   id="svg7384"
+   version="1.1"
+   width="400">
+  <title
+     id="title9167">elementary Symbolic Icon Theme</title>
+  <defs
+     id="defs7386" />
+  <rect
+     width="400"
+     height="300"
+     rx="0"
+     ry="0"
+     x="0"
+     y="0"
+     id="rect5505-21-3-8-5-2"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:1;fill:#2c2f32;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.99999994;marker:none;enable-background:accumulate" />
+  <g
+     id="layer1-1-4-3"
+     transform="matrix(4,0,0,4,168,122)"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:0.05">
+    <path
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       id="rect3032-8-6"
+       d="M 1.75,0 C 1.3345,0 1,0.3345 1,0.75 l 0,13.5 C 1,14.6655 1.3345,15 1.75,15 l 12.5,0 C 14.6655,15 15,14.6655 15,14.25 L 15,0.75 C 15,0.3345 14.6655,0 14.25,0 L 1.75,0 Z M 2,1 3,1 3,2 2,2 2,1 Z m 2.5,0 7,0 C 11.777,1 12,1.223 12,1.5 l 0,5 C 12,6.777 11.777,7 11.5,7 l -7,0 C 4.223,7 4,6.777 4,6.5 l 0,-5 C 4,1.223 4.223,1 4.5,1 Z m 8.5,0 1,0 0,1 -1,0 0,-1 z M 2,3 3,3 3,4 2,4 2,3 Z m 11,0 1,0 0,1 -1,0 0,-1 z M 2,5 3,5 3,6 2,6 2,5 Z m 11,0 1,0 0,1 -1,0 0,-1 z M 2,7 3,7 3,8 2,8 2,7 Z m 11,0 1,0 0,1 -1,0 0,-1 z m -8.5,1 7,0 C 11.777,8 12,8.223 12,8.5 l 0,5 c 0,0.277 -0.223,0.5 -0.5,0.5 l -7,0 C 4.223,14 4,13.777 4,13.5 l 0,-5 C 4,8.223 4.223,8 4.5,8 Z M 2,9 3,9 3,10 2,10 2,9 Z m 11,0 1,0 0,1 -1,0 0,-1 z m -11,2 1,0 0,1 -1,0 0,-1 z m 11,0 1,0 0,1 -1,0 0,-1 z m -11,2 1,0 0,1 -1,0 0,-1 z m 11,0 1,0 0,1 -1,0 0,-1 z" />
+  </g>
+  <g
+     id="layer1-1-4"
+     transform="matrix(4,0,0,4,168,120)"
+     style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#050b0b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate;opacity:1">
+    <path
+       style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#050b0b;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;enable-background:accumulate"
+       id="rect3032-8"
+       d="M 1.75,0 C 1.3345,0 1,0.3345 1,0.75 l 0,13.5 C 1,14.6655 1.3345,15 1.75,15 l 12.5,0 C 14.6655,15 15,14.6655 15,14.25 L 15,0.75 C 15,0.3345 14.6655,0 14.25,0 L 1.75,0 Z M 2,1 3,1 3,2 2,2 2,1 Z m 2.5,0 7,0 C 11.777,1 12,1.223 12,1.5 l 0,5 C 12,6.777 11.777,7 11.5,7 l -7,0 C 4.223,7 4,6.777 4,6.5 l 0,-5 C 4,1.223 4.223,1 4.5,1 Z m 8.5,0 1,0 0,1 -1,0 0,-1 z M 2,3 3,3 3,4 2,4 2,3 Z m 11,0 1,0 0,1 -1,0 0,-1 z M 2,5 3,5 3,6 2,6 2,5 Z m 11,0 1,0 0,1 -1,0 0,-1 z M 2,7 3,7 3,8 2,8 2,7 Z m 11,0 1,0 0,1 -1,0 0,-1 z m -8.5,1 7,0 C 11.777,8 12,8.223 12,8.5 l 0,5 c 0,0.277 -0.223,0.5 -0.5,0.5 l -7,0 C 4.223,14 4,13.777 4,13.5 l 0,-5 C 4,8.223 4.223,8 4.5,8 Z M 2,9 3,9 3,10 2,10 2,9 Z m 11,0 1,0 0,1 -1,0 0,-1 z m -11,2 1,0 0,1 -1,0 0,-1 z m 11,0 1,0 0,1 -1,0 0,-1 z m -11,2 1,0 0,1 -1,0 0,-1 z m 11,0 1,0 0,1 -1,0 0,-1 z" />
+  </g>
+</svg>

=== removed file 'data/icons/sprocket.png'
Binary files data/icons/sprocket.png	2010-12-07 23:13:21 +0000 and data/icons/sprocket.png	1970-01-01 00:00:00 +0000 differ
=== modified file 'src/MediaPage.vala'
--- src/MediaPage.vala	2016-11-21 04:25:34 +0000
+++ src/MediaPage.vala	2016-12-08 22:24:42 +0000
@@ -5,93 +5,15 @@
  */
 
 public class MediaSourceItem : CheckerboardItem {
-    private static Gdk.Pixbuf basis_sprocket_pixbuf = null;
-    private static Gdk.Pixbuf current_sprocket_pixbuf = null;
-
-    private bool enable_sprockets = false;
-
     // preserve the same constructor arguments and semantics as CheckerboardItem so that we're
     // a drop-in replacement
     public MediaSourceItem (ThumbnailSource source, Dimensions initial_pixbuf_dim, string title,
                             string? comment, bool marked_up = false, Pango.Alignment alignment = Pango.Alignment.LEFT) {
         base (source, initial_pixbuf_dim, title, comment, marked_up, alignment);
-        if (basis_sprocket_pixbuf == null)
-            basis_sprocket_pixbuf = Resources.load_icon ("sprocket.png", 0);
     }
 
-    protected override void paint_image (Cairo.Context ctx, Gdk.Pixbuf pixbuf,
-                                         Gdk.Point origin) {
-        Dimensions pixbuf_dim = Dimensions.for_pixbuf (pixbuf);
-        // sprocket geometry calculation (and possible adjustment) has to occur before we call
-        // base.paint_image( ) because the base-class method needs the correct trinket horizontal
-        // offsets
-
-        if (!enable_sprockets) {
-            set_horizontal_trinket_offset (0);
-        } else {
-            double reduction_factor = ((double) pixbuf_dim.major_axis ()) /
-                                      ((double) ThumbnailCache.Size.LARGEST);
-            int reduced_size = (int) (reduction_factor * basis_sprocket_pixbuf.width);
-
-            if (current_sprocket_pixbuf == null || reduced_size != current_sprocket_pixbuf.width) {
-                current_sprocket_pixbuf = basis_sprocket_pixbuf.scale_simple (reduced_size,
-                                          reduced_size, Gdk.InterpType.HYPER);
-            }
-
-            set_horizontal_trinket_offset (current_sprocket_pixbuf.width);
-        }
-
+    protected override void paint_image (Cairo.Context ctx, Gdk.Pixbuf pixbuf, Gdk.Point origin) {
         base.paint_image (ctx, pixbuf, origin);
-
-        if (enable_sprockets) {
-            paint_sprockets (ctx, origin, pixbuf_dim);
-        }
-    }
-
-    protected void paint_one_sprocket (Cairo.Context ctx, Gdk.Point origin) {
-        ctx.save ();
-        Gdk.cairo_set_source_pixbuf (ctx, current_sprocket_pixbuf, origin.x, origin.y);
-        ctx.paint ();
-        ctx.restore ();
-    }
-
-    protected void paint_sprockets (Cairo.Context ctx, Gdk.Point item_origin,
-                                    Dimensions item_dimensions) {
-        int num_sprockets = item_dimensions.height / current_sprocket_pixbuf.height;
-
-        Gdk.Point left_paint_location = item_origin;
-        Gdk.Point right_paint_location = item_origin;
-        right_paint_location.x += (item_dimensions.width - current_sprocket_pixbuf.width);
-        for (int i = 0; i < num_sprockets; i++) {
-            paint_one_sprocket (ctx, left_paint_location);
-            paint_one_sprocket (ctx, right_paint_location);
-
-            left_paint_location.y += current_sprocket_pixbuf.height;
-            right_paint_location.y += current_sprocket_pixbuf.height;
-        }
-
-        int straggler_pixels = item_dimensions.height % current_sprocket_pixbuf.height;
-        if (straggler_pixels > 0) {
-            ctx.save ();
-
-            Gdk.cairo_set_source_pixbuf (ctx, current_sprocket_pixbuf, left_paint_location.x,
-                                         left_paint_location.y);
-            ctx.rectangle (left_paint_location.x, left_paint_location.y,
-                           current_sprocket_pixbuf.get_width (), straggler_pixels);
-            ctx.fill ();
-
-            Gdk.cairo_set_source_pixbuf (ctx, current_sprocket_pixbuf, right_paint_location.x,
-                                         right_paint_location.y);
-            ctx.rectangle (right_paint_location.x, right_paint_location.y,
-                           current_sprocket_pixbuf.get_width (), straggler_pixels);
-            ctx.fill ();
-
-            ctx.restore ();
-        }
-    }
-
-    public void set_enable_sprockets (bool enable_sprockets) {
-        this.enable_sprockets = enable_sprockets;
     }
 }
 

=== modified file 'src/Resources.vala'
--- src/Resources.vala	2016-11-21 23:16:12 +0000
+++ src/Resources.vala	2016-12-08 22:24:42 +0000
@@ -532,7 +532,7 @@
     return AppDirs.get_resources_dir ().get_child ("ui").get_child (filename);
 }
 
-private const string NONINTERPRETABLE_BADGE_FILE = "noninterpretable-video.png";
+private const string NONINTERPRETABLE_BADGE_FILE = "noninterpretable-video.svg";
 private Gdk.Pixbuf? noninterpretable_badge_pixbuf = null;
 
 public Gdk.Pixbuf? get_noninterpretable_badge_pixbuf () {

=== modified file 'src/Thumbnail.vala'
--- src/Thumbnail.vala	2016-09-20 00:44:41 +0000
+++ src/Thumbnail.vala	2016-12-08 22:24:42 +0000
@@ -54,9 +54,6 @@
         Tag.global.container_contents_altered.connect (on_tag_contents_altered);
         Tag.global.items_altered.connect (on_tags_altered);
 
-        assert ((media is LibraryPhoto) || (media is Video));
-        set_enable_sprockets (media is Video);
-
         original_dim = media.get_dimensions ();
         dim = original_dim.get_scaled (scale, true);
 

=== modified file 'src/camera/ImportPage.vala'
--- src/camera/ImportPage.vala	2016-11-21 04:25:34 +0000
+++ src/camera/ImportPage.vala	2016-12-08 22:24:42 +0000
@@ -273,10 +273,6 @@
 
         this.duplicated_file = null;
 
-        // draw sprocket holes as visual indications on video previews
-        if (source is VideoImportSource)
-            set_enable_sprockets (true);
-
         // scale down pixbuf if necessary
         Gdk.Pixbuf pixbuf = null;
         try {