[Marble-commits] branches/KDE/4.4/kdeedu/marble

[Torsten Rahn]

SVN commit 1071865 by rahn:

- Reducing the package size for Marble:

Backport of commit Rev. 1071846. 
Getting rid of the Weather Monster SVGs (SVG -> PNG)



 M  +24 -24    data/CMakeLists.txt  
 AM            data/weather/weather-clear-night.png  
 D             data/weather/weather-clear-night.svgz  
 AM            data/weather/weather-clear.png  
 D             data/weather/weather-clear.svgz  
 AM            data/weather/weather-clouds-night.png  
 D             data/weather/weather-clouds-night.svgz  
 AM            data/weather/weather-clouds.png  
 D             data/weather/weather-clouds.svgz  
 AM            data/weather/weather-few-clouds-night.png  
 D             data/weather/weather-few-clouds-night.svgz  
 AM            data/weather/weather-few-clouds.png  
 D             data/weather/weather-few-clouds.svgz  
 AM            data/weather/weather-freezing-rain.png  
 AM            data/weather/weather-hail.png  
 D             data/weather/weather-hail.svgz  
 AM            data/weather/weather-many-clouds.png  
 D             data/weather/weather-many-clouds.svg  
 AM            data/weather/weather-mist.png  
 D             data/weather/weather-mist.svgz  
 AM            data/weather/weather-none-available.png  
 D             data/weather/weather-none-available.svgz  
 AM            data/weather/weather-showers-day.png  
 D             data/weather/weather-showers-day.svgz  
 AM            data/weather/weather-showers-night.png  
 D             data/weather/weather-showers-night.svgz  
 AM            data/weather/weather-showers-scattered-day.png  
 D             data/weather/weather-showers-scattered-day.svgz  
 AM            data/weather/weather-showers-scattered-night.png  
 D             data/weather/weather-showers-scattered-night.svgz  
 AM            data/weather/weather-showers-scattered.png  
 D             data/weather/weather-showers-scattered.svgz  
 AM            data/weather/weather-showers.png  
 D             data/weather/weather-showers.svgz  
 AM            data/weather/weather-snow-rain.png  
 D             data/weather/weather-snow-rain.svgz  
 AM            data/weather/weather-snow-scattered-day.png  
 D             data/weather/weather-snow-scattered-day.svgz  
 AM            data/weather/weather-snow-scattered-night.png  
 D             data/weather/weather-snow-scattered-night.svgz  
 AM            data/weather/weather-snow-scattered.png  
 D             data/weather/weather-snow-scattered.svgz  
 AM            data/weather/weather-snow.png  
 D             data/weather/weather-snow.svgz  
 AM            data/weather/weather-storm-day.png  
 D             data/weather/weather-storm-day.svgz  
 AM            data/weather/weather-storm-night.png  
 D             data/weather/weather-storm-night.svgz  
 AM            data/weather/weather-storm.png  
 D             data/weather/weather-storm.svgz  
 M  +31 -31    src/plugins/render/weather/WeatherData.cpp  
 M  +2 -2      src/plugins/render/weather/WeatherData.h  
 M  +1 -1      src/plugins/render/weather/WeatherItem.cpp  
 M  +1 -1      src/plugins/render/weather/WeatherPlugin.cpp  


--- branches/KDE/4.4/kdeedu/marble/data/CMakeLists.txt #1071864:1071865
@@ -170,30 +170,30 @@
 
 install (FILES
 weather/bbc-stations.xml
-weather/weather-clear-night.svgz
-weather/weather-clear.svgz
-weather/weather-clouds-night.svgz
-weather/weather-clouds.svgz
-weather/weather-few-clouds-night.svgz
-weather/weather-few-clouds.svgz
-weather/weather-hail.svgz
-weather/weather-many-clouds.svg
-weather/weather-mist.svgz
-weather/weather-none-available.svgz
-weather/weather-showers-day.svgz
-weather/weather-showers-night.svgz
-weather/weather-showers-scattered-day.svgz
-weather/weather-showers-scattered-night.svgz
-weather/weather-showers-scattered.svgz
-weather/weather-showers.svgz
-weather/weather-snow-rain.svgz
-weather/weather-snow-scattered-day.svgz
-weather/weather-snow-scattered-night.svgz
-weather/weather-snow-scattered.svgz
-weather/weather-snow.svgz
-weather/weather-storm-day.svgz
-weather/weather-storm-night.svgz
-weather/weather-storm.svgz
+weather/weather-clear-night.png
+weather/weather-clear.png
+weather/weather-clouds-night.png
+weather/weather-clouds.png
+weather/weather-few-clouds-night.png
+weather/weather-few-clouds.png
+weather/weather-hail.png
+weather/weather-many-clouds.png
+weather/weather-mist.png
+weather/weather-none-available.png
+weather/weather-showers-day.png
+weather/weather-showers-night.png
+weather/weather-showers-scattered-day.png
+weather/weather-showers-scattered-night.png
+weather/weather-showers-scattered.png
+weather/weather-showers.png
+weather/weather-snow-rain.png
+weather/weather-snow-scattered-day.png
+weather/weather-snow-scattered-night.png
+weather/weather-snow-scattered.png
+weather/weather-snow.png
+weather/weather-storm-day.png
+weather/weather-storm-night.png
+weather/weather-storm.png
 weather/wind-arrows.svgz
 DESTINATION ${MARBLE_DATA_INSTALL_PATH}/weather)
 
** branches/KDE/4.4/kdeedu/marble/data/weather/weather-clear-night.png #property svn:mime-type
   + application/octet-stream
** branches/KDE/4.4/kdeedu/marble/data/weather/weather-clear.png #property svn:mime-type
   + application/octet-stream
** branches/KDE/4.4/kdeedu/marble/data/weather/weather-clouds-night.png #property svn:mime-type
   + application/octet-stream
** branches/KDE/4.4/kdeedu/marble/data/weather/weather-clouds.png #property svn:mime-type
   + application/octet-stream
** branches/KDE/4.4/kdeedu/marble/data/weather/weather-few-clouds-night.png #property svn:mime-type
   + application/octet-stream
** branches/KDE/4.4/kdeedu/marble/data/weather/weather-few-clouds.png #property svn:mime-type
   + application/octet-stream
** branches/KDE/4.4/kdeedu/marble/data/weather/weather-freezing-rain.png #property svn:mime-type
   + application/octet-stream
** branches/KDE/4.4/kdeedu/marble/data/weather/weather-hail.png #property svn:mime-type
   + application/octet-stream
** branches/KDE/4.4/kdeedu/marble/data/weather/weather-many-clouds.png #property svn:mime-type
   + application/octet-stream
** branches/KDE/4.4/kdeedu/marble/data/weather/weather-mist.png #property svn:mime-type
   + application/octet-stream
** branches/KDE/4.4/kdeedu/marble/data/weather/weather-none-available.png #property svn:mime-type
   + application/octet-stream
** branches/KDE/4.4/kdeedu/marble/data/weather/weather-showers-day.png #property svn:mime-type
   + application/octet-stream
** branches/KDE/4.4/kdeedu/marble/data/weather/weather-showers-night.png #property svn:mime-type
   + application/octet-stream
** branches/KDE/4.4/kdeedu/marble/data/weather/weather-showers-scattered-day.png #property svn:mime-type
   + application/octet-stream
** branches/KDE/4.4/kdeedu/marble/data/weather/weather-showers-scattered-night.png #property svn:mime-type
   + application/octet-stream
** branches/KDE/4.4/kdeedu/marble/data/weather/weather-showers-scattered.png #property svn:mime-type
   + application/octet-stream
** branches/KDE/4.4/kdeedu/marble/data/weather/weather-showers.png #property svn:mime-type
   + application/octet-stream
** branches/KDE/4.4/kdeedu/marble/data/weather/weather-snow-rain.png #property svn:mime-type
   + application/octet-stream
** branches/KDE/4.4/kdeedu/marble/data/weather/weather-snow-scattered-day.png #property svn:mime-type
   + application/octet-stream
** branches/KDE/4.4/kdeedu/marble/data/weather/weather-snow-scattered-night.png #property svn:mime-type
   + application/octet-stream
** branches/KDE/4.4/kdeedu/marble/data/weather/weather-snow-scattered.png #property svn:mime-type
   + application/octet-stream
** branches/KDE/4.4/kdeedu/marble/data/weather/weather-snow.png #property svn:mime-type
   + application/octet-stream
** branches/KDE/4.4/kdeedu/marble/data/weather/weather-storm-day.png #property svn:mime-type
   + application/octet-stream
** branches/KDE/4.4/kdeedu/marble/data/weather/weather-storm-night.png #property svn:mime-type
   + application/octet-stream
** branches/KDE/4.4/kdeedu/marble/data/weather/weather-storm.png #property svn:mime-type
   + application/octet-stream
--- branches/KDE/4.4/kdeedu/marble/src/plugins/render/weather/WeatherData.cpp #1071864:1071865
@@ -22,7 +22,7 @@
 #include <QtCore/QDateTime>
 #include <QtCore/QHash>
 #include <QtCore/QLocale>
-#include <QtGui/QIcon>
+#include <QtGui/QImage>
 
 #include <cmath>
 
@@ -103,59 +103,59 @@
         if( s_iconPath.size() == 0 ) {
             // Clouds
             s_iconPath.insert( WeatherData::ConditionNotAvailable,
-                            MarbleDirs::path( "weather/weather-none-available.svgz" ) );
+                            MarbleDirs::path( "weather/weather-none-available.png" ) );
             s_iconPath.insert( WeatherData::ClearDay,
-                            MarbleDirs::path( "weather/weather-clear.svgz" ) );
+                            MarbleDirs::path( "weather/weather-clear.png" ) );
             s_iconPath.insert( WeatherData::ClearNight,
-                            MarbleDirs::path( "weather/weather-clear-night.svgz" ) );
+                            MarbleDirs::path( "weather/weather-clear-night.png" ) );
             s_iconPath.insert( WeatherData::FewCloudsDay,
-                            MarbleDirs::path( "weather/weather-few-clouds.svgz" ) );
+                            MarbleDirs::path( "weather/weather-few-clouds.png" ) );
             s_iconPath.insert( WeatherData::FewCloudsNight,
-                            MarbleDirs::path( "weather/weather-few-clouds-night.svgz" ) );
+                            MarbleDirs::path( "weather/weather-few-clouds-night.png" ) );
             s_iconPath.insert( WeatherData::PartlyCloudyDay,
-                            MarbleDirs::path( "weather/weather-clouds.svgz" ) );
+                            MarbleDirs::path( "weather/weather-clouds.png" ) );
             s_iconPath.insert( WeatherData::PartlyCloudyNight,
-                            MarbleDirs::path( "weather/weather-clouds-night.svgz" ) );
+                            MarbleDirs::path( "weather/weather-clouds-night.png" ) );
             s_iconPath.insert( WeatherData::Overcast,
-                            MarbleDirs::path( "weather/weather-many-clouds.svg" ) );
+                            MarbleDirs::path( "weather/weather-many-clouds.png" ) );
 
             // Rain
             s_iconPath.insert( WeatherData::LightShowersDay,
-                            MarbleDirs::path( "weather/weather-showers-scattered-day.svgz" ) );
+                            MarbleDirs::path( "weather/weather-showers-scattered-day.png" ) );
             s_iconPath.insert( WeatherData::LightShowersNight,
-                            MarbleDirs::path( "weather/weather-showers-scattered-night.svgz" ) );
+                            MarbleDirs::path( "weather/weather-showers-scattered-night.png" ) );
             s_iconPath.insert( WeatherData::ShowersDay,
-                            MarbleDirs::path( "weather/weather-showers-day.svgz" ) );
+                            MarbleDirs::path( "weather/weather-showers-day.png" ) );
             s_iconPath.insert( WeatherData::ShowersNight,
-                            MarbleDirs::path( "weather/weather-showers-night.svgz" ) );
+                            MarbleDirs::path( "weather/weather-showers-night.png" ) );
             s_iconPath.insert( WeatherData::LightRain,
-                            MarbleDirs::path( "weather/weather-showers-scattered.svgz" ) );
+                            MarbleDirs::path( "weather/weather-showers-scattered.png" ) );
             s_iconPath.insert( WeatherData::Rain,
-                            MarbleDirs::path( "weather/weather-showers.svgz" ) );
+                            MarbleDirs::path( "weather/weather-showers.png" ) );
 
             // Special
             s_iconPath.insert( WeatherData::ChanceThunderstormDay,
-                            MarbleDirs::path( "weather/weather-storm-day.svgz" ) );
+                            MarbleDirs::path( "weather/weather-storm-day.png" ) );
             s_iconPath.insert( WeatherData::ChanceThunderstormNight,
-                            MarbleDirs::path( "weather/weather-storm-night.svgz" ) );
+                            MarbleDirs::path( "weather/weather-storm-night.png" ) );
             s_iconPath.insert( WeatherData::Thunderstorm,
-                            MarbleDirs::path( "weather/weather-storm.svgz" ) );
+                            MarbleDirs::path( "weather/weather-storm.png" ) );
             s_iconPath.insert( WeatherData::Hail,
-                            MarbleDirs::path( "weather/weather-hail.svgz" ) );
+                            MarbleDirs::path( "weather/weather-hail.png" ) );
             s_iconPath.insert( WeatherData::ChanceSnowDay,
-                            MarbleDirs::path( "weather/weather-snow-scattered-day.svgz" ) );
+                            MarbleDirs::path( "weather/weather-snow-scattered-day.png" ) );
             s_iconPath.insert( WeatherData::ChanceSnowNight,
-                            MarbleDirs::path( "weather/weather-snow-scattered-night.svgz" ) );
+                            MarbleDirs::path( "weather/weather-snow-scattered-night.png" ) );
             s_iconPath.insert( WeatherData::LightSnow,
-                            MarbleDirs::path( "weather/weather-snow-scattered.svgz" ) );
+                            MarbleDirs::path( "weather/weather-snow-scattered.png" ) );
             s_iconPath.insert( WeatherData::Snow,
-                            MarbleDirs::path( "weather/weather-snow.svgz" ) );
+                            MarbleDirs::path( "weather/weather-snow.png" ) );
             s_iconPath.insert( WeatherData::RainSnow,
-                            MarbleDirs::path( "weather/weather-snow-rain.svgz" ) );
+                            MarbleDirs::path( "weather/weather-snow-rain.png" ) );
             s_iconPath.insert( WeatherData::Mist,
-                            MarbleDirs::path( "weather/weather-mist.svgz" ) );
+                            MarbleDirs::path( "weather/weather-mist.png" ) );
             s_iconPath.insert( WeatherData::SandStorm,
-                            MarbleDirs::path( "weather/weather-none-available.svgz" ) );
+                            MarbleDirs::path( "weather/weather-none-available.png" ) );
         }
     }
     
@@ -266,12 +266,12 @@
     
     QAtomicInt ref;
     
-    static QHash<WeatherData::WeatherCondition, QIcon> s_icons;
+    static QHash<WeatherData::WeatherCondition, QImage> s_icons;
     static QHash<WeatherData::WeatherCondition, QString> s_iconPath;
     static WeatherData::TemperatureUnit s_standardTemperatureUnit;
 };
 
-QHash<WeatherData::WeatherCondition, QIcon> WeatherDataPrivate::s_icons = QHash<WeatherData::WeatherCondition, QIcon>();
+QHash<WeatherData::WeatherCondition, QImage> WeatherDataPrivate::s_icons = QHash<WeatherData::WeatherCondition, QImage>();
 QHash<WeatherData::WeatherCondition, QString> WeatherDataPrivate::s_iconPath = QHash<WeatherData::WeatherCondition, QString>();
 WeatherData::TemperatureUnit WeatherDataPrivate::s_standardTemperatureUnit = WeatherData::Celsius;
 
@@ -406,9 +406,9 @@
     }
 }
 
-QIcon WeatherData::icon() const
+QImage WeatherData::icon() const
 {
-    QIcon icon = WeatherDataPrivate::s_icons.value( condition() );
+    QImage icon = WeatherDataPrivate::s_icons.value( condition() );
     
     // If the icon is in the hash, simply return it.
     if ( !icon.isNull() ) {
@@ -416,7 +416,7 @@
     }
     // If it isn't in the hash, the icon will be created (from the value stored in s_iconPath).
     else {
-        icon.addFile( WeatherDataPrivate::s_iconPath.value( condition() ) );
+        icon = QImage( WeatherDataPrivate::s_iconPath.value( condition() ) );
         WeatherDataPrivate::s_icons.insert( condition(), icon );
         return icon;
     }
--- branches/KDE/4.4/kdeedu/marble/src/plugins/render/weather/WeatherData.h #1071864:1071865
@@ -16,7 +16,7 @@
 
 class QDate;
 class QDateTime;
-class QIcon;
+class QImage;
 
 namespace Marble
 {
@@ -164,7 +164,7 @@
     /**
      * Get the icon showing the current condition.
      */
-    QIcon icon() const;
+    QImage icon() const;
     
     WeatherData::WindDirection windDirection() const;
     void setWindDirection( WeatherData::WindDirection direction );
--- branches/KDE/4.4/kdeedu/marble/src/plugins/render/weather/WeatherItem.cpp #1071864:1071865
@@ -150,7 +150,7 @@
     void updateLabels()
     {
         if ( isConditionShown() ) {
-            m_conditionLabel->setIcon( m_currentWeather.icon(), imageSize );
+            m_conditionLabel->setImage( m_currentWeather.icon(), imageSize );
         }
         else {
             m_conditionLabel->clear();
--- branches/KDE/4.4/kdeedu/marble/src/plugins/render/weather/WeatherPlugin.cpp #1071864:1071865
@@ -105,7 +105,7 @@
         authors.append( bholst );
         m_aboutDialog->setAuthors( authors );
         m_aboutDialog->setDataText( tr( "Supported by backstage.bbc.co.uk.\nWeather data from UK MET Office" ) );
-        m_icon.addFile( MarbleDirs::path( "weather/weather-clear.svgz" ) );
+        m_icon.addFile( MarbleDirs::path( "weather/weather-clear.png" ) );
         m_aboutDialog->setPixmap( m_icon.pixmap( 62, 62 ) );
     }
     return m_aboutDialog;