diff options
| author | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-09-21 18:05:48 +0200 |
|---|---|---|
| committer | Wladimir J. van der Laan <laanwj@gmail.com> | 2015-09-21 18:05:54 +0200 |
| commit | 10fc4fb36894c2afecf030ba40056186538dcf0f (patch) | |
| tree | dcf9ed5a75277fea1ff331237a595b20631d3f69 /src/qt | |
| parent | ed55a1f5f916d09fdadf4f883e904da950bc126b (diff) | |
| parent | 9b1cdd7eeb7346704259c3416a59c0a12057fe56 (diff) | |
| download | bitcoin-10fc4fb36894c2afecf030ba40056186538dcf0f.tar.xz | |
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)
Diffstat (limited to 'src/qt')
| -rw-r--r-- | src/qt/guiconstants.h | 2 | ||||
| -rwxr-xr-x | src/qt/res/movies/makespinner.sh | 7 | ||||
| -rw-r--r-- | src/qt/res/movies/spinner-000.png | bin | 1835 -> 1794 bytes | |||
| -rw-r--r-- | src/qt/res/src/spinner.png (renamed from src/qt/res/spinner.png) | bin | 16636 -> 16636 bytes |
4 files changed, 5 insertions, 4 deletions
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 Binary files differindex 1e92d859da..0dc48d0d8c 100644 --- a/src/qt/res/movies/spinner-000.png +++ b/src/qt/res/movies/spinner-000.png diff --git a/src/qt/res/spinner.png b/src/qt/res/src/spinner.png Binary files differindex b296a58481..b296a58481 100644 --- a/src/qt/res/spinner.png +++ b/src/qt/res/src/spinner.png |
