Ticket #5903: mythweather.2.diff

mythweather/mythweather/weatherScreen.cpp

@@ -12 +12 @@
 WeatherScreen *WeatherScreen::loadScreen(MythScreenStack *parent,
                                          ScreenListInfo *screenDefn, int id)
 {
-    QString key = screenDefn->name;
-    if (key == "Current Conditions")
-        return new CurrCondScreen(parent, "Current Conditions", screenDefn, id);
-    if (key == "Three Day Forecast")
-        return new ThreeDayForecastScreen(parent,"Three Day Forecast" , screenDefn, id);
-    if (key == "Six Day Forecast")
-        return new SixDayForecastScreen(parent, "Six Day Forecast", screenDefn, id);
+    QString key   = screenDefn->name;
+    QByteArray ba = key.toLatin1();
+    const char *screen_name = ba.data(); 
+    
     if (key == "Severe Weather Alerts")
         return new SevereWeatherScreen(parent, "Severe Weather Alerts", screenDefn, id);
     if (key == "Static Map")
@@ -26 +23 @@
     if (key == "Animated Map")
         return new AnimatedImageScreen(parent, "Animated Map", screenDefn, id);
 
-    return new WeatherScreen(parent, "Unknown Screen", screenDefn, id);
+    return new WeatherScreen(parent, screen_name, screenDefn, id);
 }
 
 WeatherScreen::WeatherScreen(MythScreenStack *parent, const char *name,
@@ -161 +158 @@
     }
 }
 
-QString WeatherScreen::prepareDataItem(const QString &key, const QString &value)
-{
-    (void) key;
-    return value;
-}
-
-bool WeatherScreen::keyPressEvent(QKeyEvent *event)
-{
-    if (GetFocusWidget() && GetFocusWidget()->keyPressEvent(event))
-        return true;
-
-    return false;
-}
-
-CurrCondScreen::CurrCondScreen(MythScreenStack *parent, const char *name,
-                               ScreenListInfo *screenDefn, int id)
-    : WeatherScreen(parent, name, screenDefn, id)
-{
-}
-
-QString CurrCondScreen::prepareDataItem(const QString &key,
-                                        const QString &value)
+QString WeatherScreen::formatDataItem(const QString &key, const QString &value)
 {
     if (key == "relative_humidity")
         return value + " %";
@@ -193 +169 @@
     if (key == "visibility")
         return value + (m_units == ENG_UNITS ? " mi" : " km");
 
-    if (key == "appt")
-        return value == "NA" ? value : value + getTemperatureUnit();
-
-    if (key == "temp")
+    if (key == "temp" || key == "appt" || key.contains("low",Qt::CaseInsensitive) || 
+        key.contains("high",Qt::CaseInsensitive))
     {
        if ( (value == "NA") || (value == "N/A") )
           return value;
@@ -207 +181 @@
     if (key == "wind_gust" || key == "wind_spdgst" || key == "wind_speed")
         return value + (m_units == ENG_UNITS ? " mph" : " kph");
 
-    return value;
-}
-
-ThreeDayForecastScreen::ThreeDayForecastScreen(MythScreenStack *parent,
-                                               const char *name,
-                                               ScreenListInfo *screenDefn, int id)
-    : WeatherScreen(parent, name, screenDefn, id)
-{
-}
-
-QString ThreeDayForecastScreen::prepareDataItem(const QString &key,
-                                        const QString &value)
-{
-    if (key.contains("low",  Qt::CaseInsensitive) ||
-        key.contains("high", Qt::CaseInsensitive) )
-    {
-       if ( (value == "NA") || (value == "N/A") )
-          return value;
-       else
-          return value + getTemperatureUnit();
-    }
-
     /*The days of the week will be translated if the script sends elements from
      the enum DaysOfWeek.*/
     if (key.startsWith("date-"))
@@ -270 +222 @@
     return value;
 }
 
-SixDayForecastScreen::SixDayForecastScreen(MythScreenStack *parent,
-                                            const char *name,
-                                            ScreenListInfo *screenDefn, int id)
-    : WeatherScreen(parent, name, screenDefn, id)
+QString WeatherScreen::prepareDataItem(const QString &key, const QString &value)
 {
+//    (void) key;
+//    return value;
+    return formatDataItem(key, value);
 }
 
-QString SixDayForecastScreen::prepareDataItem(const QString &key,
-                                        const QString &value)
+bool WeatherScreen::keyPressEvent(QKeyEvent *event)
 {
-    if (key.contains("low",  Qt::CaseInsensitive) ||
-        key.contains("high", Qt::CaseInsensitive) )
-    {
-       if ( (value == "NA") || (value == "N/A") )
-          return value;
-       else
-          return value + getTemperatureUnit();
-    }
+    if (GetFocusWidget() && GetFocusWidget()->keyPressEvent(event))
+        return true;
 
-    return value;
+    return false;
 }
 
 SevereWeatherScreen::SevereWeatherScreen(MythScreenStack *parent, const char *name,

mythweather/mythweather/weatherScreen.h

@@ -65 +65 @@
     virtual void prepareWidget(MythUIType *widget);
     virtual void prepareScreen();
     virtual QString getTemperatureUnit();
+    QString formatDataItem(const QString &key, const QString &value);
 
   private:
     QMap<QString, QString> m_dataValueMap;
@@ -74 +75 @@
     int m_id;
 };
 
-class CurrCondScreen : public WeatherScreen
-{
-    Q_OBJECT
-
-  public:
-    CurrCondScreen(MythScreenStack *parent, const char *name,
-                               ScreenListInfo *screenDefn, int id);
-
-  protected:
-    virtual QString prepareDataItem(const QString &key, const QString &value);
-};
-
-class ThreeDayForecastScreen : public WeatherScreen
-{
-    Q_OBJECT
-
-  public:
-    ThreeDayForecastScreen(MythScreenStack *parent, const char *name,
-                               ScreenListInfo *screenDefn, int id);
-
-  protected:
-    virtual QString prepareDataItem(const QString &key, const QString &value);
-
-};
-
-class SixDayForecastScreen : public WeatherScreen
-{
-    Q_OBJECT
-
-  public:
-    SixDayForecastScreen(MythScreenStack *parent, const char *name,
-                               ScreenListInfo *screenDefn, int id);
-
-  protected:
-    virtual QString prepareDataItem(const QString &key, const QString &value);
-
-};
-
 class SevereWeatherScreen : public WeatherScreen
 {
     Q_OBJECT

mythweather/mythweather/weatherUtils.cpp

@@ -3 +3 @@
 #include <QStringList>
 
 #include <mythdirs.h>
+#include "mythmainwindow.h"
+#include "mythuihelper.h"
 
 // MythWeather headers
 #include "weatherUtils.h"
 
 ScreenListMap loadScreens()
 {
-    ScreenListMap screens;
-    QDomDocument doc;
+    ScreenListMap screens;   
+    QList<QString> searchpath = GetMythUI()->GetThemeSearchPath();
+    
+    // Check the theme first if it has its own weather-screens.xml
+    
+    QList<QString>::iterator i;
+    for (i = searchpath.begin(); i != searchpath.end(); i++)
+    {
+        QString filename = *i + "weather-screens.xml";
+        if (doLoadScreens(filename, screens))
+        {
+            VERBOSE(VB_GENERAL, QString("Loading from: %1").arg(filename));
+            break;
+        }
+    }
 
-    QFile f(GetShareDir() + "mythweather/weather-screens.xml");
+    //  Also load from the default file in case the theme file doesn't
+    //  exist or the theme file doesn't define all the screens
+    
+    QString filename = GetShareDir() + "mythweather/weather-screens.xml";
+    
+    if (!doLoadScreens(filename, screens))
+    {
+        VERBOSE(VB_IMPORTANT, QString("Unable to parse weather-screens.xml"));
+    }
 
+    return screens;
+}
+
+bool doLoadScreens(const QString &filename, ScreenListMap &screens)
+{
+    QFile f(filename);
+    QDomDocument doc;
+        
     if (!f.open(QIODevice::ReadOnly))
     {
-        VERBOSE(VB_FILE, QString("Unable to open weather-screens.xml"));
-        return screens;
+        return false;
     }
 
-    if ( !doc.setContent( &f ) ) {
-        VERBOSE(VB_IMPORTANT, QString("Unable to parse weather-screens.xml"));
+    if ( !doc.setContent( &f ) ) 
+    {
         f.close();
-        return screens;
+        return false;
     }
     f.close();
 
@@ -35 +65 @@
         QDomElement e = n.toElement();
         if (!e.isNull())
         {
-            if (e.tagName() == "screen")
+            if ( (e.tagName() == "screen") && !screens.contains(e.attribute("name")) )
             {
                 ScreenListInfo *screendef = new ScreenListInfo();
                 screendef->name = e.attribute("name");
@@ -49 +79 @@
             }
         }
     }
-
-    return screens;
+    return true;
 }
 
 QStringList loadScreen(QDomElement ScreenListInfo)

mythweather/mythweather/weatherUtils.h

@@ -70 +70 @@
 
 ScreenListMap loadScreens();
 QStringList loadScreen(QDomElement ScreenListInfo);
+bool doLoadScreens(const QString &filename, ScreenListMap &screens);
 
 #endif