Weather: snow is now using pixmap loader.

Signed-off-by: Luiz Agostini <luiz.agostini@openbossa.org>

3 files changed, 14 insertions, 2 deletions

diff --git a/weather/bootmanager.cpp b/weather/bootmanager.cpp
index cf36ecb..ed2346c 100644
--- a/weather/bootmanager.cpp
+++ b/weather/bootmanager.cpp
@@ -4,6 +4,7 @@
 #include "pixmaploader.h"
 #include "forecasthungitem.h"
 #include "forecastrain.h"
+#include "forecastsnow.h"
 
 #include <QDebug>
 
@@ -24,6 +25,7 @@ void BootManager::run()
     PixmapLoader::connectToOnIdleSignal(this, SLOT(pixmapLoaderIsIdle()));
     int count =  ForecastHungItem::loadImages();
     count += ForecastRain::loadImages();
+    count += ForecastSnow::loadImages();
 
 
     m_imagesLoaded = count == 0;
diff --git a/weather/forecastsnow.cpp b/weather/forecastsnow.cpp
index de03a77..d342c1e 100644
--- a/weather/forecastsnow.cpp
+++ b/weather/forecastsnow.cpp
@@ -31,16 +31,17 @@
 
 #include "forecastsnow.h"
 #include "settings.h"
+#include "pixmaploader.h"
 
 #include <QPainter>
 
 typedef struct
 {
     const char * const prefix;
-    QPixmap pic() const { return Settings::getScaledPic(name()); }
+    QString name() const { return prefix; }
+    QPixmap pic() const { return PixmapLoader::getPic(name()); }
 
 private:
-    QString name() const { return prefix; }
 
 } SnowFlaketData;
 
@@ -87,6 +88,13 @@ ForecastSnow::SnowFlake::SnowFlake(int type, const QSizeF &bounds)
     m_speed = QPointF(x, y);
 }
 
+int ForecastSnow::loadImages()
+{
+    for (int i = 0; i < SnowFlakeCount;++i)
+        PixmapLoader::load(SnowFlakeArray[i].name());
+    return SnowFlakeCount;
+}
+
 static inline bool doDeviation(qreal &factor)
 {
     if (qrand() % deviation2 > deviation1)
diff --git a/weather/forecastsnow.h b/weather/forecastsnow.h
index 73c15c4..809b232 100644
--- a/weather/forecastsnow.h
+++ b/weather/forecastsnow.h
@@ -43,6 +43,8 @@ class ForecastSnow : public QObject
 public:
     ForecastSnow(int count, const QRectF &bounds, QGraphicsItem *parent);
 
+    static int loadImages();
+
     void paint(QPainter *painter);
 
 public slots: