Ticket #3918: mythweather.diff
File mythweather.diff, 6.9 KB (added by , 17 years ago) |
---|
-
mythplugins/mythweather/mythweather/weatherScreen.cpp
old new WeatherScreen *WeatherScreen::loadScreen 14 14 return new CurrCondScreen(parent, container, id); 15 15 if (key == "Three Day Forecast") 16 16 return new ThreeDayForecastScreen(parent, container, id); 17 if (key == "Six Day Forecast") 18 return new SixDayForecastScreen(parent, container, id); 17 19 if (key == "Severe Weather Alerts") 18 20 return new SevereWeatherScreen(parent, container, id); 19 21 if (key == "Static Map") … … QString CurrCondScreen::prepareDataItem( 279 281 return value + (m_units == ENG_UNITS ? " mi" : " km"); 280 282 281 283 if (key == "appt") 282 return value == "NA" ? value : value + (m_units == ENG_UNITS ? " °F" : "°C");284 return value == "NA" ? value : value + (m_units == ENG_UNITS ? "°F" : "°C"); 283 285 284 286 if (key == "temp") 285 return value + (m_units == ENG_UNITS ? " °F" : " °C"); 287 { 288 if ( (value == "NA") || (value == "N/A") ) 289 return value; 290 else 291 return value + (m_units == ENG_UNITS ? "°F" : "°C"); 292 } 286 293 287 294 if (key == "wind_gust" || key == "wind_spdgst" || key == "wind_speed") 288 295 return value + (m_units == ENG_UNITS ? " mph" : " kph"); … … ThreeDayForecastScreen::ThreeDayForecast 296 303 { 297 304 } 298 305 306 QString ThreeDayForecastScreen::prepareDataItem(const QString &key, 307 const QString &value) 308 { 309 if (key.contains("low",FALSE) || key.contains("high",FALSE) ) 310 { 311 if ( (value == "NA") || (value == "N/A") ) 312 return value; 313 else 314 return value + (m_units == ENG_UNITS ? "°F" : "°C"); 315 } 316 317 return value; 318 } 319 320 SixDayForecastScreen::SixDayForecastScreen(Weather *parent, 321 LayerSet *container, int id) : 322 WeatherScreen(parent, container, id) 323 { 324 } 325 326 QString SixDayForecastScreen::prepareDataItem(const QString &key, 327 const QString &value) 328 { 329 if (key.contains("low",FALSE) || key.contains("high",FALSE) ) 330 { 331 if ( (value == "NA") || (value == "N/A") ) 332 return value; 333 else 334 return value + (m_units == ENG_UNITS ? "°F" : "°C"); 335 } 336 337 return value; 338 } 339 299 340 SevereWeatherScreen::SevereWeatherScreen(Weather *parent, LayerSet *container, 300 341 int id) : 301 342 WeatherScreen(parent, container, id) -
mythplugins/mythweather/mythweather/weatherScreen.h
old new class ThreeDayForecastScreen : public We 88 88 89 89 public: 90 90 ThreeDayForecastScreen(Weather *parent, LayerSet *container, int id); 91 92 protected: 93 virtual QString prepareDataItem(const QString &key, const QString &value); 94 95 }; 96 97 class SixDayForecastScreen : public WeatherScreen 98 { 99 Q_OBJECT 100 101 public: 102 SixDayForecastScreen(Weather *parent, LayerSet *container, int id); 103 104 protected: 105 virtual QString prepareDataItem(const QString &key, const QString &value); 106 91 107 }; 92 108 93 109 class SevereWeatherScreen : public WeatherScreen -
mythplugins/mythweather/mythweather/weather-ui.xml
old new 513 513 </image> 514 514 515 515 <textarea name="hilbl0" draworder="5" align="left"> 516 <area> 70,297,100,30</area>516 <area>50,297,100,30</area> 517 517 <font>lohifont2</font> 518 518 <value>High</value> 519 519 </textarea> 520 520 <textarea name="hilbl1" draworder="5" align="left"> 521 <area> 313,297,100,30</area>521 <area>293,297,100,30</area> 522 522 <font>lohifont2</font> 523 523 <value>High</value> 524 524 </textarea> 525 525 <textarea name="hilbl2" draworder="5" align="left"> 526 <area>5 56,297,100,30</area>526 <area>536,297,100,30</area> 527 527 <font>lohifont2</font> 528 528 <value>High</value> 529 529 </textarea> 530 530 <textarea name="hilbl3" draworder="5" align="left"> 531 <area> 70,497,100,30</area>531 <area>50,497,100,30</area> 532 532 <font>lohifont2</font> 533 533 <value>High</value> 534 534 </textarea> 535 535 <textarea name="hilbl4" draworder="5" align="left"> 536 <area> 313,497,100,30</area>536 <area>293,497,100,30</area> 537 537 <font>lohifont2</font> 538 538 <value>High</value> 539 539 </textarea> 540 540 <textarea name="hilbl5" draworder="5" align="left"> 541 <area>5 56,497,100,30</area>541 <area>536,497,100,30</area> 542 542 <font>lohifont2</font> 543 543 <value>High</value> 544 544 </textarea> … … 574 574 </textarea> 575 575 576 576 <textarea name="+high-0" draworder="5" align="left"> 577 <area>1 20,297,40,20</area>577 <area>110,297,60,20</area> 578 578 <font>tempdata2</font> 579 579 </textarea> 580 580 <textarea name="+high-1" draworder="5" align="left"> 581 <area>3 63,297,40,20</area>581 <area>353,297,60,20</area> 582 582 <font>tempdata2</font> 583 583 </textarea> 584 584 <textarea name="+high-2" draworder="5" align="left"> 585 <area> 606,297,40,20</area>585 <area>596,297,60,20</area> 586 586 <font>tempdata2</font> 587 587 </textarea> 588 588 <textarea name="+high-3" draworder="5" align="left"> 589 <area>1 20,497,40,20</area>589 <area>110,497,60,20</area> 590 590 <font>tempdata2</font> 591 591 </textarea> 592 592 <textarea name="+high-4" draworder="5" align="left"> 593 <area>3 63,497,40,20</area>593 <area>353,497,60,20</area> 594 594 <font>tempdata2</font> 595 595 </textarea> 596 596 <textarea name="+high-5" draworder="5" align="left"> 597 <area> 606,497,40,20</area>597 <area>596,497,60,20</area> 598 598 <font>tempdata2</font> 599 599 </textarea> 600 600 <textarea name="+low-0" draworder="5" align="left"> 601 <area>22 0,297,40,20</area>601 <area>225,297,60,20</area> 602 602 <font>tempdata2</font> 603 603 </textarea> 604 604 <textarea name="+low-1" draworder="5" align="left"> 605 <area>46 3,297,40,20</area>605 <area>468,297,60,20</area> 606 606 <font>tempdata2</font> 607 607 </textarea> 608 608 <textarea name="+low-2" draworder="5" align="left"> 609 <area>7 06,297,40,20</area>609 <area>711,297,60,20</area> 610 610 <font>tempdata2</font> 611 611 </textarea> 612 612 <textarea name="+low-3" draworder="5" align="left"> 613 <area>22 0,497,40,20</area>613 <area>225,497,60,20</area> 614 614 <font>tempdata2</font> 615 615 </textarea> 616 616 <textarea name="+low-4" draworder="5" align="left"> 617 <area>46 3,497,40,20</area>617 <area>468,497,60,20</area> 618 618 <font>tempdata2</font> 619 619 </textarea> 620 620 <textarea name="+low-5" draworder="5" align="left"> 621 <area>7 06,497,40,20</area>621 <area>711,497,60,20</area> 622 622 <font>tempdata2</font> 623 623 </textarea> 624 624