diff --git a/services/weatherforecast.h b/services/weatherforecast.h index c3f6b48..13f3c1e 100644 --- a/services/weatherforecast.h +++ b/services/weatherforecast.h @@ -8,6 +8,8 @@ public: cServiceCurrentWeather(void) { timeStamp = ""; temperature = ""; + minTemperature = ""; + maxTemperature = ""; apparentTemperature = ""; summary = ""; icon = ""; @@ -26,6 +28,8 @@ public: std::string timeStamp; std::string temperature; std::string apparentTemperature; + std::string minTemperature; + std::string maxTemperature; std::string summary; std::string icon; std::string precipitationIntensity; diff --git a/skins/metrixhd/themes/default/menuicons/pluginicons/weatherforecast.png b/skins/metrixhd/themes/default/menuicons/pluginicons/weatherforecast.png new file mode 100644 index 0000000..a88f11d Binary files /dev/null and b/skins/metrixhd/themes/default/menuicons/pluginicons/weatherforecast.png differ diff --git a/skins/metrixhd/xmlfiles/displaychannel.xml b/skins/metrixhd/xmlfiles/displaychannel.xml index fdf2aea..a7b33af 100644 --- a/skins/metrixhd/xmlfiles/displaychannel.xml +++ b/skins/metrixhd/xmlfiles/displaychannel.xml @@ -218,6 +218,8 @@ {timestamp} timestamp of forecast in dd.mm hh:mm {temperature} current temperature in °C {apparenttemperature} apparent (feeled) temperature + {mintemperature} minimum temperature this day + {maxtemperature} maximum temperature this day {summary} short weather summary {icon} weather icon {precipitationintensity} precipitation intensity in l/m2 @@ -233,11 +235,15 @@ {ozone} ozone value in DU --> - + - - + + + + + + diff --git a/skins/metrixhd/xmlfiles/plug-weatherforecast-weatherforecastdetailcurrent.xml b/skins/metrixhd/xmlfiles/plug-weatherforecast-weatherforecastdetailcurrent.xml new file mode 100644 index 0000000..42026d5 --- /dev/null +++ b/skins/metrixhd/xmlfiles/plug-weatherforecast-weatherforecastdetailcurrent.xml @@ -0,0 +1,66 @@ + + + + + + + + + + +
+ + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
diff --git a/views/viewhelpers.c b/views/viewhelpers.c index af2233a..8fdffaf 100644 --- a/views/viewhelpers.c +++ b/views/viewhelpers.c @@ -435,10 +435,11 @@ void cViewHelpers::SetCurrentWeatherTokens(map < string, string > &stringTokens, if (!pWeatherForecast->Service("GetCurrentWeather", ¤tWeather)) { return; } -esyslog("skindesigner: service call successfull"); stringTokens.insert(pair("timestamp", currentWeather.timeStamp)); stringTokens.insert(pair("temperature", currentWeather.temperature)); stringTokens.insert(pair("apparenttemperature", currentWeather.apparentTemperature)); + stringTokens.insert(pair("mintemperature", currentWeather.minTemperature)); + stringTokens.insert(pair("maxtemperature", currentWeather.maxTemperature)); stringTokens.insert(pair("summary", currentWeather.summary)); stringTokens.insert(pair("icon", currentWeather.icon)); stringTokens.insert(pair("precipitationintensity", currentWeather.precipitationIntensity));