Browse Source

[qt] [trivial] share/qt/make_spinner.py => src/qt/res/movies/makespinner.sh

* Merge make_spinner.py into makespinner.sh
* Also delete now unused imgs
* Actually use all 36 frames for the spinner animation
pull/1/head
MarcoFalke 7 years ago
parent
commit
d1acf938e6
  1. BIN
      share/qt/img/reload.png
  2. BIN
      share/qt/img/reload.xcf
  3. 38
      share/qt/make_spinner.py
  4. 2
      src/qt/guiconstants.h
  5. 7
      src/qt/res/movies/makespinner.sh
  6. BIN
      src/qt/res/movies/spinner-000.png
  7. 0
      src/qt/res/src/spinner.png

BIN
share/qt/img/reload.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 9.7 KiB

BIN
share/qt/img/reload.xcf

Binary file not shown.

38
share/qt/make_spinner.py

@ -1,38 +0,0 @@ @@ -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)

2
src/qt/guiconstants.h

@ -42,7 +42,7 @@ static const int MAX_URI_LENGTH = 255; @@ -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"

7
src/qt/res/movies/makespinner.sh

@ -1,6 +1,7 @@ @@ -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

BIN
src/qt/res/movies/spinner-000.png

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.8 KiB

After

Width:  |  Height:  |  Size: 1.8 KiB

0
src/qt/res/spinner.png → src/qt/res/src/spinner.png

Before

Width:  |  Height:  |  Size: 16 KiB

After

Width:  |  Height:  |  Size: 16 KiB

Loading…
Cancel
Save