diff options
| author | MarcoFalke <[email protected]> | 2015-09-12 12:09:16 +0200 |
|---|---|---|
| committer | MarcoFalke <[email protected]> | 2015-09-13 17:57:12 +0200 |
| commit | d1acf938e69397347490defaf4b675524dbffcd9 (patch) | |
| tree | 1820d61d496a299f7ea8a1ddb7df8d515eaca321 /src | |
| parent | Merge pull request #6635 (diff) | |
| download | discoin-d1acf938e69397347490defaf4b675524dbffcd9.tar.xz discoin-d1acf938e69397347490defaf4b675524dbffcd9.zip | |
[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
Diffstat (limited to 'src')
| -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 a0a2993ea..7d3e48ff3 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 625fb1717..a4c2fddbb 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 1e92d859d..0dc48d0d8 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 b296a5848..b296a5848 100644 --- a/src/qt/res/spinner.png +++ b/src/qt/res/src/spinner.png |