Merge pull request #1421 from jamescowens/fixsyncicon

Fix syncupdate icons

Author: jamescowens

src/Makefile.qt.include

@@ -307,8 +307,6 @@ RES_IMAGES = \
   qt/res/images/gridcoin.svg \
   qt/res/images/about_light.svg
 
-RES_MOVIES = qt/res/movies/update_spinner.gif
-
 RES_STYLESHEETS = \
   qt/res/stylesheets/light_stylesheet.qss \
   qt/res/stylesheets/native_stylesheet.qss \

src/qt/bitcoin.qrc

@@ -74,9 +74,7 @@
         <file alias="gridcoin">res/images/gridcoin.svg</file>
         <file alias="about_light">res/images/about_light.svg</file>
     </qresource>
-    <qresource prefix="/movies">
-        <file alias="update_spinner">res/movies/update_spinner.gif</file>
-    </qresource>
+    <qresource prefix="/movies"/>
     <qresource prefix="/stylesheets">
         <file alias="light">res/stylesheets/light_stylesheet.qss</file>
         <file alias="native">res/stylesheets/native_stylesheet.qss</file>

src/qt/bitcoingui.cpp

@@ -65,7 +65,6 @@
 #include <QMimeData>
 #include <QStackedWidget>
 #include <QDateTime>
-#include <QMovie>
 #include <QFileDialog>
 #include <QStandardPaths>
 #include <QTimer>
@@ -173,8 +172,6 @@ BitcoinGUI::BitcoinGUI(QWidget *parent):
     // Create status bar
     // statusBar();
 
-    syncIconMovie = new QMovie(":/movies/update_spinner", "GIF", this);
-
     // Clicking on a transaction on the overview page simply sends you to transaction history page
     connect(overviewPage, SIGNAL(transactionClicked(QModelIndex)), this, SLOT(gotoHistoryPage()));
     connect(overviewPage, SIGNAL(transactionClicked(QModelIndex)), transactionView, SLOT(focusTransaction(QModelIndex)));
@@ -735,7 +732,7 @@ void BitcoinGUI::setNumBlocks(int count, int nTotalBlocks)
         text = tr("%n day(s) ago", "", secs/(60*60*24));
     }
 
-    // Set icon state: spinning if catching up, tick otherwise
+    // Set icon state: not synced icon if catching up, tick otherwise
     if(secs < 90*60 && count >= nTotalBlocks)
     {
         tooltip = tr("Up to date") + QString(".<br>") + tooltip;
@@ -745,9 +742,8 @@ void BitcoinGUI::setNumBlocks(int count, int nTotalBlocks)
     }
     else
     {
+        labelBlocksIcon->setPixmap(QIcon(":/icons/notsynced").pixmap(STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE));
         tooltip = tr("Catching up...") + QString("<br>") + tooltip;
-        labelBlocksIcon->setMovie(syncIconMovie);
-        syncIconMovie->start();
 
         overviewPage->showOutOfSyncWarning(true);
     }
@@ -1455,9 +1451,8 @@ void BitcoinGUI::updateScraperIcon(int scraperEventtype, int status)
     }
     else if (scraperEventtype == (int)scrapereventtypes::Stats && (status == CT_NEW || status == CT_UPDATED || status == CT_UPDATING))
     {
+        labelScraperIcon->setPixmap(QIcon(":/icons/notsynced").pixmap(STATUSBAR_ICONSIZE, STATUSBAR_ICONSIZE));
         labelScraperIcon->setToolTip(tr("Scraper: downloading and processing stats."));
-        labelScraperIcon->setMovie(syncIconMovie);
-        syncIconMovie->start();
     }
     else if ((scraperEventtype == (int)scrapereventtypes::Convergence  || scraperEventtype == (int)scrapereventtypes::SBContract)
              && (status == CT_NEW || status == CT_UPDATED) && nConvergenceTime)