Merge pull request #3526

f10b2d7 qt: use series of pngs for spinner (Wladimir J. van der Laan)

contrib/debian/copyright

@@ -71,7 +71,7 @@ Copyright: Bitboy (optimized for 16x16 by Wladimir van der Laan)
 License: PUB-DOM
 Comment: Site: https://bitcointalk.org/?topic=1756.0
 
-Files:  scripts/img/reload.xcf, src/qt/res/movies/update_spinner.mng
+Files:  scripts/img/reload.xcf, src/qt/res/movies/*.png
 Copyright: Everaldo (Everaldo Coelho)
 License: GPL-3+
 Comment: Icon Pack: Kids

doc/assets-attribution.md

@@ -76,7 +76,7 @@ Everaldo (Everaldo Coelho)
 * Site: [http://findicons.com/icon/17102/reload?id=17102](http://findicons.com/icon/17102/reload?id=17102)
 
 ### Assets Used
-	scripts/img/reload.xcf (modified), src/qt/res/movies/update_spinner.mng
+	scripts/img/reload.xcf (modified), src/qt/res/movies/*.png
 
 [Vignoni David](http://www.oxygen-icons.org)
 -----------------------
@@ -101,4 +101,4 @@ Jonas Schnelli
 	src/qt/res/src/bitcoin.ico, src/qt/res/src/bitcoin.png,
 	src/qt/res/src/bitcoin_testnet.png, docs/bitcoin_logo_doxygen.png,
 	src/qt/res/icons/toolbar.png, src/qt/res/icons/toolbar_testnet.png,
-	src/qt/res/images/splash.png, src/qt/res/images/splash_testnet.png
+	src/qt/res/images/splash.png, src/qt/res/images/splash_testnet.png

share/qt/make_spinner.py

@@ -1,16 +1,15 @@
 #!/usr/bin/env python
 # W.J. van der Laan, 2011
-# Make spinning .mng animation from a .png
+# 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_scaled.png'
+SRC='img/reload.png'
-DST='../../src/qt/res/movies/update_spinner.mng'
+TMPDIR='../../src/qt/res/movies/'
-TMPDIR='/tmp'
+TMPNAME='spinner-%03i.png'
-TMPNAME='tmp-%03i.png'
 NUMFRAMES=35
 FRAMERATE=10.0
 CONVERT='convert'
@@ -36,8 +35,4 @@ for frame in xrange(NUMFRAMES):
     im_new.save(outfile, 'png')
     frame_files.append(outfile)
 
-p = Popen([CONVERT, "-delay", str(FRAMERATE), "-dispose", "2"] + frame_files + [DST])
-p.communicate()
-
-
 

src/qt/Makefile.am

@@ -303,7 +303,7 @@ RES_IMAGES = \
   res/images/splash.png \
   res/images/splash_testnet.png
 
-RES_MOVIES = res/movies/update_spinner.mng
+RES_MOVIES = $(wildcard res/movies/spinner-*.png)
 
 BITCOIN_RC = res/bitcoin-qt-res.rc
 

src/qt/bitcoin.qrc

@@ -47,7 +47,41 @@
         <file alias="splash_testnet">res/images/splash_testnet.png</file>
     </qresource>
     <qresource prefix="/movies">
-        <file alias="update_spinner">res/movies/update_spinner.mng</file>
+        <file alias="spinner-000">res/movies/spinner-000.png</file>
+        <file alias="spinner-001">res/movies/spinner-001.png</file>
+        <file alias="spinner-002">res/movies/spinner-002.png</file>
+        <file alias="spinner-003">res/movies/spinner-003.png</file>
+        <file alias="spinner-004">res/movies/spinner-004.png</file>
+        <file alias="spinner-005">res/movies/spinner-005.png</file>
+        <file alias="spinner-006">res/movies/spinner-006.png</file>
+        <file alias="spinner-007">res/movies/spinner-007.png</file>
+        <file alias="spinner-008">res/movies/spinner-008.png</file>
+        <file alias="spinner-009">res/movies/spinner-009.png</file>
+        <file alias="spinner-010">res/movies/spinner-010.png</file>
+        <file alias="spinner-011">res/movies/spinner-011.png</file>
+        <file alias="spinner-012">res/movies/spinner-012.png</file>
+        <file alias="spinner-013">res/movies/spinner-013.png</file>
+        <file alias="spinner-014">res/movies/spinner-014.png</file>
+        <file alias="spinner-015">res/movies/spinner-015.png</file>
+        <file alias="spinner-016">res/movies/spinner-016.png</file>
+        <file alias="spinner-017">res/movies/spinner-017.png</file>
+        <file alias="spinner-018">res/movies/spinner-018.png</file>
+        <file alias="spinner-019">res/movies/spinner-019.png</file>
+        <file alias="spinner-020">res/movies/spinner-020.png</file>
+        <file alias="spinner-021">res/movies/spinner-021.png</file>
+        <file alias="spinner-022">res/movies/spinner-022.png</file>
+        <file alias="spinner-023">res/movies/spinner-023.png</file>
+        <file alias="spinner-024">res/movies/spinner-024.png</file>
+        <file alias="spinner-025">res/movies/spinner-025.png</file>
+        <file alias="spinner-026">res/movies/spinner-026.png</file>
+        <file alias="spinner-027">res/movies/spinner-027.png</file>
+        <file alias="spinner-028">res/movies/spinner-028.png</file>
+        <file alias="spinner-029">res/movies/spinner-029.png</file>
+        <file alias="spinner-030">res/movies/spinner-030.png</file>
+        <file alias="spinner-031">res/movies/spinner-031.png</file>
+        <file alias="spinner-032">res/movies/spinner-032.png</file>
+        <file alias="spinner-033">res/movies/spinner-033.png</file>
+        <file alias="spinner-034">res/movies/spinner-034.png</file>
     </qresource>
     <qresource prefix="/translations">
         <file alias="ach">locale/bitcoin_ach.qm</file>

src/qt/bitcoingui.cpp

@@ -39,7 +39,6 @@
 #include <QMenuBar>
 #include <QMessageBox>
 #include <QMimeData>
-#include <QMovie>
 #include <QProgressBar>
 #include <QSettings>
 #include <QStackedWidget>
@@ -68,7 +67,8 @@ BitcoinGUI::BitcoinGUI(bool fIsTestnet, QWidget *parent) :
     trayIcon(0),
     notificator(0),
     rpcConsole(0),
-    prevBlocks(0)
+    prevBlocks(0),
+    spinnerFrame(0)
 {
     GUIUtil::restoreWindowGeometry("nWindow", QSize(850, 550), this);
 
@@ -187,8 +187,6 @@ BitcoinGUI::BitcoinGUI(bool fIsTestnet, QWidget *parent) :
     statusBar()->addWidget(progressBar);
     statusBar()->addPermanentWidget(frameBlocks);
 
-    syncIconMovie = new QMovie(":/movies/update_spinner", "mng", this);
-
     connect(openRPCConsoleAction, SIGNAL(triggered()), rpcConsole, SLOT(show()));
 
     // prevents an oben debug window from becoming stuck/unusable on client shutdown
@@ -684,9 +682,13 @@ void BitcoinGUI::setNumBlocks(int count, int nTotalBlocks)
         progressBar->setVisible(true);
 
         tooltip = tr("Catching up...") + QString("<br>") + tooltip;
-        labelBlocksIcon->setMovie(syncIconMovie);
         if(count != prevBlocks)
-            syncIconMovie->jumpToNextFrame();
+        {
+            labelBlocksIcon->setPixmap(QIcon(QString(
+                ":/movies/spinner-%1").arg(spinnerFrame, 3, 10, QChar('0')))
+                .pixmap(STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE));
+            spinnerFrame = (spinnerFrame + 1) % SPINNER_FRAMES;
+        }
         prevBlocks = count;
 
 #ifdef ENABLE_WALLET

src/qt/bitcoingui.h

@@ -98,9 +98,9 @@ private:
     Notificator *notificator;
     RPCConsole *rpcConsole;
 
-    QMovie *syncIconMovie;
     /** Keep track of previous number of blocks, to detect progress */
     int prevBlocks;
+    int spinnerFrame;
 
     /** Create the main UI actions. */
     void createActions(bool fIsTestnet);

src/qt/guiconstants.h

@@ -38,4 +38,7 @@ static const int MAX_PAYMENT_REQUEST_SIZE = 50000; // bytes
 /* QRCodeDialog -- size of exported QR Code image */
 #define EXPORT_IMAGE_SIZE 256
 
+/* Number of frames in spinner animation */
+#define SPINNER_FRAMES 35
+
 #endif // GUICONSTANTS_H