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)

20 files changed, 5 insertions, 57 deletions

diff --git a/share/pixmaps/addressbook16.bmp b/share/pixmaps/addressbook16.bmp
deleted file mode 100644
index c5576910b1..0000000000
--- a/share/pixmaps/addressbook16.bmp
+++ /dev/null
diff --git a/share/pixmaps/addressbook16mask.bmp b/share/pixmaps/addressbook16mask.bmp
deleted file mode 100644
index d3a478d1ad..0000000000
--- a/share/pixmaps/addressbook16mask.bmp
+++ /dev/null
diff --git a/share/pixmaps/addressbook20.bmp b/share/pixmaps/addressbook20.bmp
deleted file mode 100644
index 2b33b228aa..0000000000
--- a/share/pixmaps/addressbook20.bmp
+++ /dev/null
diff --git a/share/pixmaps/addressbook20mask.bmp b/share/pixmaps/addressbook20mask.bmp
deleted file mode 100644
index 56ce6125db..0000000000
--- a/share/pixmaps/addressbook20mask.bmp
+++ /dev/null
diff --git a/share/pixmaps/bitcoin-bc.ico b/share/pixmaps/bitcoin-bc.ico
deleted file mode 100644
index 88cc240e2d..0000000000
--- a/share/pixmaps/bitcoin-bc.ico
+++ /dev/null
diff --git a/share/pixmaps/check.ico b/share/pixmaps/check.ico
deleted file mode 100644
index 0c4e6e8147..0000000000
--- a/share/pixmaps/check.ico
+++ /dev/null
diff --git a/share/pixmaps/favicon.ico b/share/pixmaps/favicon.ico
deleted file mode 100644
index 754eebc488..0000000000
--- a/share/pixmaps/favicon.ico
+++ /dev/null
diff --git a/share/pixmaps/send16.bmp b/share/pixmaps/send16.bmp
deleted file mode 100644
index 676b5c4b49..0000000000
--- a/share/pixmaps/send16.bmp
+++ /dev/null
diff --git a/share/pixmaps/send16mask.bmp b/share/pixmaps/send16mask.bmp
deleted file mode 100644
index 06c747f934..0000000000
--- a/share/pixmaps/send16mask.bmp
+++ /dev/null
diff --git a/share/pixmaps/send16masknoshadow.bmp b/share/pixmaps/send16masknoshadow.bmp
deleted file mode 100644
index faf24e0d8a..0000000000
--- a/share/pixmaps/send16masknoshadow.bmp
+++ /dev/null
diff --git a/share/pixmaps/send20.bmp b/share/pixmaps/send20.bmp
deleted file mode 100644
index 2b90422b38..0000000000
--- a/share/pixmaps/send20.bmp
+++ /dev/null
diff --git a/share/pixmaps/send20mask.bmp b/share/pixmaps/send20mask.bmp
deleted file mode 100644
index f124d0da08..0000000000
--- a/share/pixmaps/send20mask.bmp
+++ /dev/null
diff --git a/share/qt/img/reload.png b/share/qt/img/reload.png
deleted file mode 100644
index 9068db9a63..0000000000
--- a/share/qt/img/reload.png
+++ /dev/null
diff --git a/share/qt/img/reload.xcf b/share/qt/img/reload.xcf
deleted file mode 100644
index dc8be62831..0000000000
--- a/share/qt/img/reload.xcf
+++ /dev/null
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/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"

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
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