Implemented icon theme option.

Changes in this commit include:
 * The option itself;
 * A method of updating the option right after Apply or Ok is pressed
   in the settings dialog;
 * A new WeatherIconPrivate class to store the methods previously
   in WeatherIcons, as well as the settings;
 * Improved icon name helper function in METAR parser;
 * A few cleanups to the WeatherIcon class.

Signed-off-by: Mavridis Philippe <mavridisf@gmail.com>

1 files changed, 13 insertions, 7 deletions

diff --git a/kweather/weatherservice.cpp b/kweather/weatherservice.cpp
index f54d803..556a015 100644
--- a/kweather/weatherservice.cpp
+++ b/kweather/weatherservice.cpp
@@ -30,6 +30,7 @@
 #include "weatherlib.h"
 #include "weatherservice.h"
 #include "stationdatabase.h"
+#include "weather_icon.h"
 #include "sun.h"
 
 WeatherService::WeatherService(TQObject *parent, const char *name) : TQObject (parent, name),  DCOPObject("WeatherService")
@@ -150,13 +151,18 @@ TQString WeatherService::currentIconString(const TQString &stationID)
 
 TQString WeatherService::iconFileName(const TQString &stationID)
 {
-	TQString _name = m_weatherLib->iconName(stationID);
-	TQString icon  = kapp->iconLoader()->iconPath(_name, TDEIcon::Desktop, true);
-	if( icon.isNull() )
-	{
-		icon = locate( "data", "kweather/" + _name + ".png" );
-	}
-	return icon;
+	return m_weatherLib->iconPath(stationID);
+}
+
+void WeatherService::useIconTheme(bool use)
+{
+	kdDebug() << "[!!!] received signal to set useIconTheme to " << use << endl;
+	WeatherIconPrivate::instance()->useIconTheme(use);
+}
+
+bool WeatherService::usingIconTheme()
+{
+	return WeatherIconPrivate::instance()->usingIconTheme();
 }
 
 TQString WeatherService::date(const TQString &stationID)