Weather: stars are 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 ed2346c..6a19fbf 100644
--- a/weather/bootmanager.cpp
+++ b/weather/bootmanager.cpp
@@ -5,6 +5,7 @@
 #include "forecasthungitem.h"
 #include "forecastrain.h"
 #include "forecastsnow.h"
+#include "forecaststars.h"
 
 #include <QDebug>
 
@@ -26,6 +27,7 @@ void BootManager::run()
     int count =  ForecastHungItem::loadImages();
     count += ForecastRain::loadImages();
     count += ForecastSnow::loadImages();
+    count += ForecastStars::loadImages();
 
 
     m_imagesLoaded = count == 0;
diff --git a/weather/forecaststars.cpp b/weather/forecaststars.cpp
index fd26e3a..7d18f20 100644
--- a/weather/forecaststars.cpp
+++ b/weather/forecaststars.cpp
@@ -31,6 +31,7 @@
 
 #include "forecaststars.h"
 #include "settings.h"
+#include "pixmaploader.h"
 
 #include <QTime>
 #include <QPropertyAnimation>
@@ -39,10 +40,10 @@ typedef struct
 {
     const char * const prefix;
     const qreal radius;
-    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; }
 
 } StarObjectData;
 
@@ -73,6 +74,13 @@ ForecastStars::ForecastStars(int count, QGraphicsItem *parent)
         m_starts.append(new Star(qrand() % 3, this));
 }
 
+int ForecastStars::loadImages()
+{
+    for (int i = 0; i < StarTypesCount;++i)
+        PixmapLoader::load(StarObjectsData[i].name());
+    return StarTypesCount;
+}
+
 QAbstractAnimation *ForecastStars::getAnimation()
 {
     QPropertyAnimation *result = new QPropertyAnimation(this, "progress");
diff --git a/weather/forecaststars.h b/weather/forecaststars.h
index abb4a3f..fb6fb62 100644
--- a/weather/forecaststars.h
+++ b/weather/forecaststars.h
@@ -45,6 +45,8 @@ public:
     ForecastStars(int count, QGraphicsItem *parent = 0);
     QAbstractAnimation *getAnimation();
 
+    static int loadImages();
+
     QRectF rect() const;
     void setRect(QRectF rect);