aboutsummaryrefslogtreecommitdiff
path: root/src/qt
diff options
context:
space:
mode:
authorMarcoFalke <falke.marco@gmail.com>2015-09-12 12:09:16 +0200
committerMarcoFalke <falke.marco@gmail.com>2015-09-13 17:57:12 +0200
commitd1acf938e69397347490defaf4b675524dbffcd9 (patch)
tree1820d61d496a299f7ea8a1ddb7df8d515eaca321 /src/qt
parent3224936bedd8fe777b23d43c253abd2c0cd95d22 (diff)
[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/qt')
-rw-r--r--src/qt/guiconstants.h2
-rwxr-xr-xsrc/qt/res/movies/makespinner.sh7
-rw-r--r--src/qt/res/movies/spinner-000.pngbin1835 -> 1794 bytes
-rw-r--r--src/qt/res/src/spinner.png (renamed from src/qt/res/spinner.png)bin16636 -> 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
index 1e92d859da..0dc48d0d8c 100644
--- a/src/qt/res/movies/spinner-000.png
+++ b/src/qt/res/movies/spinner-000.png
Binary files differ
diff --git a/src/qt/res/spinner.png b/src/qt/res/src/spinner.png
index b296a58481..b296a58481 100644
--- a/src/qt/res/spinner.png
+++ b/src/qt/res/src/spinner.png
Binary files differ