Merge pull request #6668

9b1cdd7 [trivial] Remove obsolete pixmaps (MarcoFalke)
d1acf93 [qt] [trivial] share/qt/make_spinner.py => src/qt/res/movies/makespinner.sh (MarcoFalke)

share/qt/make_spinner.py

@@ -1,38 +0,0 @@
-#!/usr/bin/env python
-# W.J. van der Laan, 2011
-# Make spinning animation from a .png
-# Requires imagemagick 6.7+
-from __future__ import division
-from os import path
-from PIL import Image
-from subprocess import Popen
-
-SRC='img/reload.png'
-TMPDIR='../../src/qt/res/movies/'
-TMPNAME='spinner-%03i.png'
-NUMFRAMES=35
-FRAMERATE=10.0
-CONVERT='convert'
-CLOCKWISE=True
-DSIZE=(16,16)
-
-im_src = Image.open(SRC)
-
-if CLOCKWISE:
-    im_src = im_src.transpose(Image.FLIP_LEFT_RIGHT)
-
-def frame_to_filename(frame):
-    return path.join(TMPDIR, TMPNAME % frame)
-
-frame_files = []
-for frame in xrange(NUMFRAMES):
-    rotation = (frame + 0.5) / NUMFRAMES * 360.0
-    if CLOCKWISE:
-        rotation = -rotation
-    im_new = im_src.rotate(rotation, Image.BICUBIC)
-    im_new.thumbnail(DSIZE, Image.ANTIALIAS)
-    outfile = frame_to_filename(frame)
-    im_new.save(outfile, 'png')
-    frame_files.append(outfile)
-
-

share/ui.rc

@@ -1,15 +0,0 @@
-bitcoin               ICON    "pixmaps/bitcoin.ico"
-
-#include "wx/msw/wx.rc"
-
-check                 ICON    "pixmaps/check.ico"
-send16                BITMAP  "pixmaps/send16.bmp"
-send16mask            BITMAP  "pixmaps/send16mask.bmp"
-send16masknoshadow    BITMAP  "pixmaps/send16masknoshadow.bmp"
-send20                BITMAP  "pixmaps/send20.bmp"
-send20mask            BITMAP  "pixmaps/send20mask.bmp"
-addressbook16         BITMAP  "pixmaps/addressbook16.bmp"
-addressbook16mask     BITMAP  "pixmaps/addressbook16mask.bmp"
-addressbook20         BITMAP  "pixmaps/addressbook20.bmp"
-addressbook20mask     BITMAP  "pixmaps/addressbook20mask.bmp"
-favicon               ICON    "pixmaps/favicon.ico"

src/qt/guiconstants.h

@@ -42,7 +42,7 @@ static const int MAX_URI_LENGTH = 255;
 #define EXPORT_IMAGE_SIZE 256
 
 /* Number of frames in spinner animation */
-#define SPINNER_FRAMES 35
+#define SPINNER_FRAMES 36
 
 #define QAPP_ORG_NAME "Bitcoin"
 #define QAPP_ORG_DOMAIN "bitcoin.org"

src/qt/res/movies/makespinner.sh

@@ -1,6 +1,7 @@
-for i in {1..35}
+FRAMEDIR=$(dirname $0)
+for i in {0..35}
 do
-    value=$(printf "%03d" $i)
+    frame=$(printf "%03d" $i)
     angle=$(($i * 10))
-    convert spinner-000.png -background "rgba(0,0,0,0.0)" -distort SRT $angle spinner-$value.png
+    convert $FRAMEDIR/../src/spinner.png -background "rgba(0,0,0,0.0)" -distort SRT $angle $FRAMEDIR/spinner-$frame.png
 done