From d1acf938e69397347490defaf4b675524dbffcd9 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sat, 12 Sep 2015 12:09:16 +0200 Subject: [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 --- share/qt/img/reload.png | Bin 9886 -> 0 bytes share/qt/img/reload.xcf | Bin 25292 -> 0 bytes share/qt/make_spinner.py | 38 -------------------------------------- src/qt/guiconstants.h | 2 +- src/qt/res/movies/makespinner.sh | 7 ++++--- src/qt/res/movies/spinner-000.png | Bin 1835 -> 1794 bytes src/qt/res/spinner.png | Bin 16636 -> 0 bytes src/qt/res/src/spinner.png | Bin 0 -> 16636 bytes 8 files changed, 5 insertions(+), 42 deletions(-) delete mode 100644 share/qt/img/reload.png delete mode 100644 share/qt/img/reload.xcf delete mode 100755 share/qt/make_spinner.py delete mode 100644 src/qt/res/spinner.png create mode 100644 src/qt/res/src/spinner.png diff --git a/share/qt/img/reload.png b/share/qt/img/reload.png deleted file mode 100644 index 9068db9a63..0000000000 Binary files a/share/qt/img/reload.png and /dev/null differ diff --git a/share/qt/img/reload.xcf b/share/qt/img/reload.xcf deleted file mode 100644 index dc8be62831..0000000000 Binary files a/share/qt/img/reload.xcf and /dev/null differ diff --git a/share/qt/make_spinner.py b/share/qt/make_spinner.py deleted file mode 100755 index bb19e91508..0000000000 --- a/share/qt/make_spinner.py +++ /dev/null @@ -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) - - diff --git a/src/qt/guiconstants.h b/src/qt/guiconstants.h index a0a2993ea3..7d3e48ff32 100644 --- a/src/qt/guiconstants.h +++ b/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" diff --git a/src/qt/res/movies/makespinner.sh b/src/qt/res/movies/makespinner.sh index 625fb17173..a4c2fddbbf 100755 --- a/src/qt/res/movies/makespinner.sh +++ b/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 diff --git a/src/qt/res/movies/spinner-000.png b/src/qt/res/movies/spinner-000.png index 1e92d859da..0dc48d0d8c 100644 Binary files a/src/qt/res/movies/spinner-000.png and b/src/qt/res/movies/spinner-000.png differ diff --git a/src/qt/res/spinner.png b/src/qt/res/spinner.png deleted file mode 100644 index b296a58481..0000000000 Binary files a/src/qt/res/spinner.png and /dev/null differ diff --git a/src/qt/res/src/spinner.png b/src/qt/res/src/spinner.png new file mode 100644 index 0000000000..b296a58481 Binary files /dev/null and b/src/qt/res/src/spinner.png differ -- cgit v1.2.3 From 9b1cdd7eeb7346704259c3416a59c0a12057fe56 Mon Sep 17 00:00:00 2001 From: MarcoFalke Date: Sat, 12 Sep 2015 12:20:11 +0200 Subject: [trivial] Remove obsolete pixmaps --- share/pixmaps/addressbook16.bmp | Bin 1334 -> 0 bytes share/pixmaps/addressbook16mask.bmp | Bin 126 -> 0 bytes share/pixmaps/addressbook20.bmp | Bin 1478 -> 0 bytes share/pixmaps/addressbook20mask.bmp | Bin 142 -> 0 bytes share/pixmaps/bitcoin-bc.ico | Bin 22486 -> 0 bytes share/pixmaps/check.ico | Bin 766 -> 0 bytes share/pixmaps/favicon.ico | Bin 1150 -> 0 bytes share/pixmaps/send16.bmp | Bin 1334 -> 0 bytes share/pixmaps/send16mask.bmp | Bin 126 -> 0 bytes share/pixmaps/send16masknoshadow.bmp | Bin 126 -> 0 bytes share/pixmaps/send20.bmp | Bin 1478 -> 0 bytes share/pixmaps/send20mask.bmp | Bin 142 -> 0 bytes share/ui.rc | 15 --------------- 13 files changed, 15 deletions(-) delete mode 100644 share/pixmaps/addressbook16.bmp delete mode 100644 share/pixmaps/addressbook16mask.bmp delete mode 100644 share/pixmaps/addressbook20.bmp delete mode 100644 share/pixmaps/addressbook20mask.bmp delete mode 100644 share/pixmaps/bitcoin-bc.ico delete mode 100644 share/pixmaps/check.ico delete mode 100644 share/pixmaps/favicon.ico delete mode 100644 share/pixmaps/send16.bmp delete mode 100644 share/pixmaps/send16mask.bmp delete mode 100644 share/pixmaps/send16masknoshadow.bmp delete mode 100644 share/pixmaps/send20.bmp delete mode 100644 share/pixmaps/send20mask.bmp delete mode 100644 share/ui.rc diff --git a/share/pixmaps/addressbook16.bmp b/share/pixmaps/addressbook16.bmp deleted file mode 100644 index c5576910b1..0000000000 Binary files a/share/pixmaps/addressbook16.bmp and /dev/null differ diff --git a/share/pixmaps/addressbook16mask.bmp b/share/pixmaps/addressbook16mask.bmp deleted file mode 100644 index d3a478d1ad..0000000000 Binary files a/share/pixmaps/addressbook16mask.bmp and /dev/null differ diff --git a/share/pixmaps/addressbook20.bmp b/share/pixmaps/addressbook20.bmp deleted file mode 100644 index 2b33b228aa..0000000000 Binary files a/share/pixmaps/addressbook20.bmp and /dev/null differ diff --git a/share/pixmaps/addressbook20mask.bmp b/share/pixmaps/addressbook20mask.bmp deleted file mode 100644 index 56ce6125db..0000000000 Binary files a/share/pixmaps/addressbook20mask.bmp and /dev/null differ diff --git a/share/pixmaps/bitcoin-bc.ico b/share/pixmaps/bitcoin-bc.ico deleted file mode 100644 index 88cc240e2d..0000000000 Binary files a/share/pixmaps/bitcoin-bc.ico and /dev/null differ diff --git a/share/pixmaps/check.ico b/share/pixmaps/check.ico deleted file mode 100644 index 0c4e6e8147..0000000000 Binary files a/share/pixmaps/check.ico and /dev/null differ diff --git a/share/pixmaps/favicon.ico b/share/pixmaps/favicon.ico deleted file mode 100644 index 754eebc488..0000000000 Binary files a/share/pixmaps/favicon.ico and /dev/null differ diff --git a/share/pixmaps/send16.bmp b/share/pixmaps/send16.bmp deleted file mode 100644 index 676b5c4b49..0000000000 Binary files a/share/pixmaps/send16.bmp and /dev/null differ diff --git a/share/pixmaps/send16mask.bmp b/share/pixmaps/send16mask.bmp deleted file mode 100644 index 06c747f934..0000000000 Binary files a/share/pixmaps/send16mask.bmp and /dev/null differ diff --git a/share/pixmaps/send16masknoshadow.bmp b/share/pixmaps/send16masknoshadow.bmp deleted file mode 100644 index faf24e0d8a..0000000000 Binary files a/share/pixmaps/send16masknoshadow.bmp and /dev/null differ diff --git a/share/pixmaps/send20.bmp b/share/pixmaps/send20.bmp deleted file mode 100644 index 2b90422b38..0000000000 Binary files a/share/pixmaps/send20.bmp and /dev/null differ diff --git a/share/pixmaps/send20mask.bmp b/share/pixmaps/send20mask.bmp deleted file mode 100644 index f124d0da08..0000000000 Binary files a/share/pixmaps/send20mask.bmp and /dev/null differ diff --git a/share/ui.rc b/share/ui.rc deleted file mode 100644 index 063641cba2..0000000000 --- a/share/ui.rc +++ /dev/null @@ -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" -- cgit v1.2.3