Hallo!
Kann man das Plugin so konfigurieren das man auch bei HD-Auflösung etwas erkennen kann?
Gruß
Norbert
Weatherng-plugin
- Murry
- Geschlossen
-
-
Hi,
geht so ohne weiteres nicht.weatherng-0.0.10-dev runter laden link
Für 1920x1080 Auflösung den patch einspielen (patch -p1 < ./weatherng-0.0.10-dev.diff) , die Änderungen an der weatherng.sh stammen hier aus dem Forum. Das Plugin kann jetzt ein paar Bilder mehr runter laden und die Vorhersage wurde auf 5 Tage reduziert weil http://xoap.weather.com nicht mehr ausspuckt.Diff
Alles anzeigendiff -uNr weatherng-0.0.10-alt/imagecache.h weatherng-0.0.10-neu/imagecache.h --- weatherng-0.0.10-alt/imagecache.h 2006-03-11 19:14:00.000000000 +0100 +++ weatherng-0.0.10-neu/imagecache.h 2010-06-17 11:44:04.824242000 +0200 @@ -19,21 +19,21 @@ item_map mItems; usage_list mUsage; - uint mMaxItems; + unsigned mMaxItems; protected: virtual void DeleteObject(const key_type &Key, data_type &Data) = 0; virtual void ResetObject(data_type &Data) = 0; public: - cxCache(uint MaxItems); + cxCache(unsigned MaxItems); virtual ~cxCache(); void Reset(void); void Flush(void); bool Contains(const key_type &Key); data_type &operator[](const key_type &Key); - uint Count(void) { return mUsage.size(); } + unsigned Count(void) { return mUsage.size(); } }; template<class key_type, class data_type> @@ -43,7 +43,7 @@ } template<class key_type, class data_type> -cxCache<key_type, data_type>::cxCache(uint MaxItems) +cxCache<key_type, data_type>::cxCache(unsigned MaxItems) { mMaxItems = MaxItems; } diff -uNr weatherng-0.0.10-alt/OsdWeather.c weatherng-0.0.10-neu/OsdWeather.c --- weatherng-0.0.10-alt/OsdWeather.c 2008-01-15 22:06:54.000000000 +0100 +++ weatherng-0.0.10-neu/OsdWeather.c 2010-06-19 17:41:33.375902000 +0200 @@ -15,7 +15,7 @@ -#define CELLWIDTH 100 +#define CELLWIDTH 150 #define TRUE 1 #define FALSE 0 @@ -216,8 +216,8 @@ /* Colors */ void cWetterOsd::SetVars(void) { - fw = 6; - fh = 26; + fw = 15; + fh = 80; cw = ( Setup.OSDWidth - (fh +8 +196 +8)); cw = cw & ~0x07; @@ -313,8 +313,8 @@ {0, 0, osdwidth -1, 2*fh, 2}, {0, 2*fh +1, cw -1, 2*fh +8 +196 +8, 2}, {cw, 2*fh +1, osdwidth -1, 2*fh +8 +196 +8, areadepth}, - {0, 2*fh +8 +196 +9, osdwidth -1, 2*fh +8 +128 +9 +3*fh +4*fh +18 -1, 2}, - {0, 2*fh +8 +128 +9 +3*fh +4*fh +18, osdwidth -1, osdheight -fh -1, 2}, + {0, 2*fh +8 +196 +9, osdwidth -1, 2*fh +8 +128 +9 +3*fh +5*fh +18 -1, 2}, + {0, 2*fh +8 +128 +9 +3*fh +5*fh +18, osdwidth -1, osdheight -fh -1, 2}, {0, osdheight -fh, osdwidth -1, osdheight -1, 4}, }; @@ -357,36 +357,36 @@ osd->DrawRectangle( 0 , fh -2 , osdwidth -1 , 2*fh , clrBG1); // infofield ok - osd->DrawRectangle( 0 , 2*fh +1 , cw -1 , 2*fh +8 +196 +8, clrBG1 ); - osd->DrawRectangle( fh , 2*fh +1 , cw -1 , 2*fh +8 +196 +8, clrBG2 ); + osd->DrawRectangle( 0 , 2*fh +1 , cw -1 , 3*fh +8 +196 +8, clrBG1 ); + osd->DrawRectangle( fh , 2*fh +1 , cw -1 , 3*fh +8 +196 +8, clrBG2 ); osd->DrawEllipse( fh , 2*fh +1 , fh +10, 2*fh +1 +10 , clrBG1, -2); osd->DrawEllipse( (cw -1) -10, 2*fh +1 , cw -1 , 2*fh +1 +10 , clrBG1, -1); - osd->DrawEllipse( fh , 2*fh +8 +196 +8 -10, fh +10, 2*fh +8 +196 +8, clrBG1, -3); - osd->DrawEllipse( (cw -1) -10, 2*fh +8 +196 +8 -10, cw -1 , 2*fh +8 +196 +8, clrBG1, -4); + osd->DrawEllipse( fh , 3*fh +8 +196 +8 -10, fh +10, 3*fh +8 +196 +8, clrBG1, -3); + osd->DrawEllipse( (cw -1) -10, 3*fh +8 +196 +8 -10, cw -1 , 3*fh +8 +196 +8, clrBG1, -4); // iconfield ok - osd->DrawRectangle( cw , 2*fh +1 , osdwidth -1 , 2*fh +8 +196 +8, clrBG1); - osd->DrawRectangle( cw +10 , 2*fh +1 , (osdwidth -1) -fh, 2*fh +8 +196 +8, clrBG2); + osd->DrawRectangle( cw , 2*fh +1 , osdwidth -1 , 3*fh +8 +196 +8, clrBG1); + osd->DrawRectangle( cw +10 , 2*fh +1 , (osdwidth -1) -fh, 3*fh +8 +196 +8, clrBG2); osd->DrawEllipse( cw +10 , 2*fh +1 , cw +20 , 2*fh +1 +10 , clrBG1, -2); osd->DrawEllipse( (osdwidth -1) -fh -10, 2*fh +1 , (osdwidth -1) -fh, 2*fh +1 +10 , clrBG1, -1); - osd->DrawEllipse( cw +10 , 2*fh +8 +196 +8 -10, cw +20 , 2*fh +8 +196 +8, clrBG1, -3); - osd->DrawEllipse( (osdwidth -1) -fh -10, 2*fh +8 +196 +8 -10, (osdwidth -1) -fh, 2*fh +8 +196 +8, clrBG1, -4); + osd->DrawEllipse( cw +10 , 3*fh +8 +196 +8 -10, cw +20 , 3*fh +8 +196 +8, clrBG1, -3); + osd->DrawEllipse( (osdwidth -1) -fh -10, 3*fh +8 +196 +8 -10, (osdwidth -1) -fh, 3*fh +8 +196 +8, clrBG1, -4); // textfield ok - osd->DrawRectangle( 0, 2*fh +8 +196 +9 , osdwidth -1 , 2*fh +8 +128 +9 +3*fh +4*fh +18 -1, clrBG1 ); - osd->DrawRectangle( fh, 2*fh +8 +196 +9 +10, (osdwidth -1)-fh, 2*fh +8 +128 +9 +3*fh +4*fh +18 -8 -1, clrBG2 ); - osd->DrawEllipse( fh, 2*fh +8 +196 +9 +10, fh +10 , 2*fh +8 +196 +9 +20 , clrBG1, -2); - osd->DrawEllipse( (osdwidth -1) -fh -10, 2*fh +8 +196 +9 +10 , (osdwidth -1) -fh, 2*fh +8 +196 +9 +20 , clrBG1, -1); - osd->DrawEllipse( fh , 2*fh +8 +128 +9 +3*fh +4*fh +18 -8 -1 -10, fh +10 , 2*fh +8 +128 +9 +3*fh +4*fh +18 -8 -1, clrBG1, -3); - osd->DrawEllipse( (osdwidth -1) -fh -10, 2*fh +8 +128 +9 +3*fh +4*fh +18 -8 -1 -10, (osdwidth -1) -fh, 2*fh +8 +128 +9 +3*fh +4*fh +18 -8 -1, clrBG1, -4); + osd->DrawRectangle( 0, 3*fh +8 +196 +9 , osdwidth -1 , 3*fh +8 +128 +9 +2*fh +2*fh +18 -1, clrBG1 ); + osd->DrawRectangle( fh, 3*fh +8 +196 +9 +10, (osdwidth -1)-fh, 3*fh +8 +128 +9 +2*fh +2*fh +18 -8 -1, clrBG2 ); + osd->DrawEllipse( fh, 3*fh +8 +196 +9 +10, fh +10 , 3*fh +8 +196 +9 +20 , clrBG1, -2); + osd->DrawEllipse( (osdwidth -1) -fh -10, 3*fh +8 +196 +9 +10 , (osdwidth -1) -fh, 3*fh +8 +196 +9 +20 , clrBG1, -1); + osd->DrawEllipse( fh , 3*fh +8 +128 +9 +2*fh +2*fh +18 -8 -1 -10, fh +10 , 3*fh +8 +128 +9 +2*fh +2*fh +18 -8 -1, clrBG1, -3); + osd->DrawEllipse( (osdwidth -1) -fh -10, 3*fh +8 +128 +9 +2*fh +2*fh +18 -8 -1 -10, (osdwidth -1) -fh, 3*fh +8 +128 +9 +2*fh +2*fh +18 -8 -1, clrBG1, -4); // datefield ok - osd->DrawRectangle( 0 , 2*fh +8 +128 +9 +3*fh +4*fh +18 , osdwidth -1 , osdheight -fh -1 , clrBG1); - osd->DrawRectangle( fh , 2*fh +8 +128 +9 +3*fh +4*fh +18 , (osdwidth -1) -fh , 2*fh +8 +128 +9 +3*fh +4*fh +18 +64 -1 -fh , clrBG2); - osd->DrawEllipse( fh , 2*fh +8 +128 +9 +3*fh +4*fh +18 , fh + 10 , 2*fh +8 +128 +9 +3*fh +4*fh +28 , clrBG1 , -2); - osd->DrawEllipse( (osdwidth -1) -fh -10, 2*fh +8 +128 +9 +3*fh +4*fh +18 , (osdwidth -1) -fh , 2*fh +8 +128 +9 +3*fh +4*fh +28 , clrBG1 , -1); - osd->DrawEllipse( fh , 2*fh +8 +128 +9 +3*fh +4*fh +8 +64 -1 -fh , fh +10 , 2*fh +8 +128 +9 +3*fh +4*fh +18 +64 -1 -fh , clrBG1 , -3); - osd->DrawEllipse( (osdwidth -1) -fh -10, 2*fh +8 +128 +9 +3*fh +4*fh +8 +64 -1 -fh , (osdwidth -1) -fh , 2*fh +8 +128 +9 +3*fh +4*fh +18 +64 -1 -fh , clrBG1 , -4); + osd->DrawRectangle( 0 , 5*fh +8 +128 +9 +1*fh +1*fh +18 , osdwidth -1 , osdheight -fh -1 , clrBG1); + osd->DrawRectangle( fh , 5*fh +8 +128 +9 +2*fh +2*fh +18 , (osdwidth -1) -fh , 6*fh +8 +128 +9 +2*fh +2*fh +18 +64 -1 -fh , clrBG2); + osd->DrawEllipse( fh , 5*fh +8 +128 +9 +2*fh +2*fh +18 , fh + 10 , 5*fh +8 +128 +9 +2*fh +2*fh +28 , clrBG1 , -2); + osd->DrawEllipse( (osdwidth -1) -fh -10, 5*fh +8 +128 +9 +2*fh +2*fh +18 , (osdwidth -1) -fh , 5*fh +8 +128 +9 +2*fh +2*fh +28 , clrBG1 , -1); + osd->DrawEllipse( fh , 6*fh +8 +128 +9 +2*fh +2*fh +8 +64 -1 -fh , fh +10 , 6*fh +8 +128 +9 +2*fh +2*fh +18 +64 -1 -fh , clrBG1 , -3); + osd->DrawEllipse( (osdwidth -1) -fh -10, 6*fh +8 +128 +9 +2*fh +2*fh +8 +64 -1 -fh , (osdwidth -1) -fh , 6*fh +8 +128 +9 +2*fh +2*fh +18 +64 -1 -fh , clrBG1 , -4); //bottom ok osd->DrawRectangle( 0 , osdheight -fh , osdwidth -1, osdheight -1, clrStatusBG); @@ -418,7 +418,7 @@ cWeatherBitmap *bmp; if((bmp = cWeatherBitmap::Load(file.c_str(), wetterSetup.w_alpha, 196, 196, colordepth )) != NULL) - osd->DrawBitmap( cw +14 , 2*fh +1 +5, bmp->Get(),clrTransparent,clrTransparent); + osd->DrawBitmap( cw +14 , 2.6*fh +1 +5, bmp->Get(),clrTransparent,clrTransparent); } else { file = ImageDir; @@ -430,7 +430,7 @@ cWeatherBitmap *bmp; if((bmp = cWeatherBitmap::Load(file.c_str(), wetterSetup.w_alpha, 196, 196, colordepth )) != NULL) - osd->DrawBitmap( cw +14 , 2*fh +1 +5, bmp->Get(),clrTransparent,clrTransparent); + osd->DrawBitmap( cw +14 , 2.6*fh +1 +5, bmp->Get(),clrTransparent,clrTransparent); } @@ -439,49 +439,49 @@ osd->DrawText(fh +10, 2*fh +1 +5, tr("High temperature: "), clrHighFG,clrBG2,font); ausgabe = parser.hi.c_str(); - ausgabe = ausgabe + " "; + ausgabe = ausgabe + " °"; ausgabe = ausgabe + tr(parser.celsius.c_str()); - osd->DrawText(cw -1 -5 -CELLWIDTH, 2*fh +1 +5, ausgabe.c_str(), clrHighFG,clrBG2,font,CELLWIDTH,20,taRight); + osd->DrawText(cw -1 -5 -CELLWIDTH, 2*fh +1 +5, ausgabe.c_str(), clrHighFG,clrBG2,font,CELLWIDTH,50,taRight); - osd->DrawText(fh +10, 2*fh +1 +5 +fh, tr("Low temperature: "), clrDateFG,clrBG2,font); + osd->DrawText(fh +10, 2*fh +1 +5 +0.5*fh, tr("Low temperature: "), clrDateFG,clrBG2,font); ausgabe = parser.low.c_str(); - ausgabe = ausgabe + " "; + ausgabe = ausgabe + " °"; ausgabe = ausgabe + tr(parser.celsius.c_str()); - osd->DrawText(cw -1 -5 -CELLWIDTH, 2*fh +1 +5 +fh, ausgabe.c_str(), clrDateFG,clrBG2,font,CELLWIDTH,20,taRight); + osd->DrawText(cw -1 -5 -CELLWIDTH, 2*fh +1 +5 +0.5*fh, ausgabe.c_str(), clrDateFG,clrBG2,font,CELLWIDTH,50,taRight); - osd->DrawText(fh +10, 2*fh +1 +5 +3*fh, tr("Wind comes from: "), clrDateFG,clrBG2,font); + osd->DrawText(fh +10, 2*fh +1 +5 +1*fh, tr("Wind comes from: "), clrDateFG,clrBG2,font); ausgabe = parser.winddir.c_str(); - osd->DrawText(cw -1 -5 -CELLWIDTH , 2*fh +1 +5 +3*fh, ausgabe.c_str(), clrDateFG,clrBG2,font,CELLWIDTH,20,taRight); + osd->DrawText(cw -1 -5 -CELLWIDTH , 2*fh +1 +5 +1*fh, ausgabe.c_str(), clrDateFG,clrBG2,font,CELLWIDTH,50,taRight); - osd->DrawText(fh +10, 2*fh +1 +5 +4*fh, tr("Wind speed: "), clrDateFG,clrBG2,font); + osd->DrawText(fh +10, 2*fh +1 +5 +1.5*fh, tr("Wind speed: "), clrDateFG,clrBG2,font); ausgabe = parser.windspeed.c_str(); ausgabe = ausgabe + " "; ausgabe = ausgabe + parser.speed.c_str(); - osd->DrawText(cw -1 -5 -CELLWIDTH , 2*fh +1 +5 +4*fh, ausgabe.c_str(), clrDateFG,clrBG2,font,CELLWIDTH,20,taRight); + osd->DrawText(cw -1 -5 -CELLWIDTH , 2*fh +1 +5 +1.5*fh, ausgabe.c_str(), clrDateFG,clrBG2,font,CELLWIDTH,50,taRight); - osd->DrawText(fh +10, 2*fh +1 +5 +5*fh, tr("Humitidy: "), clrDateFG,clrBG2,font); + osd->DrawText(fh +10, 2*fh +1 +5 +2*fh, tr("Humitidy: "), clrDateFG,clrBG2,font); ausgabe = parser.humidity.c_str(); ausgabe = ausgabe + tr(" %"); - osd->DrawText(cw -1 -5 -CELLWIDTH , 2*fh +1 +5 +5*fh, ausgabe.c_str(), clrDateFG,clrBG2,font,CELLWIDTH,20,taRight); + osd->DrawText(cw -1 -5 -CELLWIDTH , 2*fh +1 +5 +2*fh, ausgabe.c_str(), clrDateFG,clrBG2,font,CELLWIDTH,50,taRight); - osd->DrawText(fh +10, 2*fh +1 +5 +6*fh, tr("Precipitation: "), clrDateFG,clrBG2,font); + osd->DrawText(fh +10, 2*fh +1 +5 +2.5*fh, tr("Precipitation: "), clrDateFG,clrBG2,font); ausgabe = parser.raindown.c_str(); ausgabe = ausgabe + tr(" %"); - osd->DrawText(cw -1 -5 -CELLWIDTH , 2*fh +1 +5 +6*fh, ausgabe.c_str(), clrDateFG,clrBG2,font,CELLWIDTH,20,taRight); + osd->DrawText(cw -1 -5 -CELLWIDTH , 2*fh +1 +5 +2.5*fh, ausgabe.c_str(), clrDateFG,clrBG2,font,CELLWIDTH,50,taRight); if (part==0) { - osd->DrawText( 10, 0, tr("DAY"), clrIconFG, clrTopBG,font,osdwidth -20,20,taCenter); + osd->DrawText( 10, 20, tr("DAY"), clrIconFG, clrTopBG,font,osdwidth -20,20,taCenter); ausgabe = tr("On "); ausgabe = ausgabe + tr(parser.dayname.c_str()) + " " + parser.date + " "; ausgabe = ausgabe + tr("in "); ausgabe = ausgabe + parser.ort.c_str() + tr(" dayover"); - osd->DrawText( fh +10, 2*fh +8 +196 +9 +16, ausgabe.c_str(), clrTextFG, clrBG2,font, (osdwidth -2*fh -15) ,20,taLeft); + osd->DrawText( fh +10, 3*fh +8 +196 +9 +16, ausgabe.c_str(), clrTextFG, clrBG2,font, (osdwidth -2*fh -15) ,20,taLeft); ausgabe = parser.wetter; - osd->DrawText( fh +10, 3*fh +8 +196 +9 +16, tr(ausgabe.c_str()), clrTextFG, clrBG2,font, (osdwidth -2*fh -15) ,20,taLeft); + osd->DrawText( fh +10, 3.5*fh +8 +196 +9 +16, tr(ausgabe.c_str()), clrTextFG, clrBG2,font, (osdwidth -2*fh -15) ,20,taLeft); ausgabe = tr("The temperature varies between "); ausgabe = ausgabe + parser.hi.c_str() + tr(" and "); @@ -491,21 +491,21 @@ ausgabe = tr("The sun comes up at "); ausgabe = ausgabe + parser.sunrise.c_str() + tr(" and goes at "); ausgabe = ausgabe + parser.sunset.c_str() + tr(" down"); - osd->DrawText( fh +10, 5*fh +8 +196 +9 +16, ausgabe.c_str(), clrTextFG, clrBG2,font, (osdwidth -2*fh -15) ,20,taLeft); + osd->DrawText( fh +10, 4.5*fh +8 +196 +9 +16, ausgabe.c_str(), clrTextFG, clrBG2,font, (osdwidth -2*fh -15) ,20,taLeft); } if (part==1) { // osd->DrawText( cw +10 +20, 2*fh +1, tr("NIGHT"), clrIconFG, clrBG2,font,170,20,taCenter); - osd->DrawText( 10, 0, tr("NIGHT"), clrIconFG, clrTopBG,font,osdwidth -20,20,taCenter); + osd->DrawText( 10, 20, tr("NIGHT"), clrIconFG, clrTopBG,font,osdwidth -20,20,taCenter); ausgabe = tr("On "); ausgabe = ausgabe + tr(parser.dayname.c_str()) + " " + parser.date + " "; ausgabe = ausgabe + tr("in "); ausgabe = ausgabe + parser.ort.c_str() + tr(" nightover"); - osd->DrawText( fh +10, 2*fh +8 +196 +9 +16, ausgabe.c_str(), clrTextFG, clrBG2,font, (osdwidth -2*fh -15) ,20,taLeft); + osd->DrawText( fh +10, 3*fh +8 +196 +9 +16, ausgabe.c_str(), clrTextFG, clrBG2,font, (osdwidth -2*fh -15) ,20,taLeft); ausgabe = parser.wetter; - osd->DrawText( fh +10, 3*fh +8 +196 +9 +16, tr(ausgabe.c_str()), clrTextFG, clrBG2,font, (osdwidth -2*fh -15) ,20,taLeft); + osd->DrawText( fh +10, 3.5*fh +8 +196 +9 +16, tr(ausgabe.c_str()), clrTextFG, clrBG2,font, (osdwidth -2*fh -15) ,20,taLeft); ausgabe = tr("The temperature varies between "); ausgabe = ausgabe + parser.hi.c_str() + tr(" and "); @@ -515,7 +515,7 @@ ausgabe = tr("The sun comes up at "); ausgabe = ausgabe + parser.sunrise.c_str() + tr(" and goes at "); ausgabe = ausgabe + parser.sunset.c_str() + tr(" down"); - osd->DrawText( fh +10, 5*fh +8 +196 +9 +16, ausgabe.c_str(), clrTextFG, clrBG2,font, (osdwidth -2*fh -15) ,20,taLeft); + osd->DrawText( fh +10, 4.5*fh +8 +196 +9 +16, ausgabe.c_str(), clrTextFG, clrBG2,font, (osdwidth -2*fh -15) ,20,taLeft); } @@ -585,6 +585,26 @@ Radarmap="/pic5"; cWetterOsd::Satelite(); break; + + case 6: + Radarmap="/pic6"; + cWetterOsd::Satelite(); + break; + + case 7: + Radarmap="/pic7"; + cWetterOsd::Satelite(); + break; + + case 8: + Radarmap="/pic8"; + cWetterOsd::Satelite(); + break; + + case 9: + Radarmap="/pic9"; + cWetterOsd::Satelite(); + break; } } @@ -598,7 +618,7 @@ case kLeft: if(IsSatelite) { if(radar==0) { - ChangeRadar(5); + ChangeRadar(9); } else if(radar==1) { ChangeRadar(0); @@ -614,6 +634,18 @@ } else if(radar==5) { ChangeRadar(4); + } + else if(radar==6) { + ChangeRadar(5); + } + else if(radar==7) { + ChangeRadar(6); + } + else if(radar==8) { + ChangeRadar(7); + } + else if(radar==9) { + ChangeRadar(8); } } else { @@ -642,13 +674,25 @@ ChangeRadar(5); } else if(radar==5) { + ChangeRadar(6); + } + else if(radar==6) { + ChangeRadar(7); + } + else if(radar==7) { + ChangeRadar(8); + } + else if(radar==8) { + ChangeRadar(9); + } + else if(radar==9) { ChangeRadar(0); } } else { day++; - if (day>10){ - day=10; + if (day>5){ + day=5; } cWetterOsd::Show(); } diff -uNr weatherng-0.0.10-alt/po/de_DE.po weatherng-0.0.10-neu/po/de_DE.po --- weatherng-0.0.10-alt/po/de_DE.po 2008-01-15 22:48:53.000000000 +0100 +++ weatherng-0.0.10-neu/po/de_DE.po 2010-07-08 13:39:17.946028387 +0200 @@ -121,7 +121,7 @@ #: weatherng.c:22 msgid "Weather.com: Weather forecast" -msgstr "Weather.com: 10 Tage Wettervorhersage" +msgstr "Weather.com: 5 Tage Wettervorhersage" #: weatherng.c:23 msgid "Weather-NG" diff -uNr weatherng-0.0.10-alt/weatherng/weatherng/themes/current.colors weatherng-0.0.10-neu/weatherng/weatherng/themes/current.colors --- weatherng-0.0.10-alt/weatherng/weatherng/themes/current.colors 2008-01-03 04:04:00.000000000 +0100 +++ weatherng-0.0.10-neu/weatherng/weatherng/themes/current.colors 2010-06-17 16:54:15.475492000 +0200 @@ -4,27 +4,27 @@ # # ## TOP: 2 colors -<value> clrTopBG =0xFF1C2128 -<value> clrTopFG =0xFFA2F828 +<value> clrTopBG =0xFF000000 +<value> clrTopFG =0x5A8C8C8C # ## BACKGROUND1 -<value> clrBG1 =0xFF26303A +<value> clrBG1 = # ## BACKGROUND2 -<value> clrBG2 =0xFF0C0C0C +<value> clrBG2 =0xFF000000 # ## TEXT -<value> clrHighFG =0xFFF2A00C -<value> clrIconFG =0xFFDDFE00 -<value> clrTextFG =0xFFF2A00C -<value> clrDateFG =0xFF9BBAD7 +<value> clrHighFG =0xCC8C8C8C +<value> clrIconFG =0xCC8C8C8C +<value> clrTextFG =0xCC8C8C8C +<value> clrDateFG =0xCC8C8C8C # ## STATUSBAR : 6 colors -<value> clrStatusBG =0xFF1C2128 -<value> clrStatusFG =0xFFCE7B00 -<value> clrStatusRed =0xFFC00000 -<value> clrStatusGreen =0xFF00FF00 -<value> clrStatusYellow =0xFFE0E222 -<value> clrStatusBlue =0xFF3B96FD +<value> clrStatusBG =0xFF000000 +<value> clrStatusFG =0xCC8C8C8C +<value> clrStatusRed =0xFFD10000 +<value> clrStatusGreen =0xFF00CF00 +<value> clrStatusYellow =0xFFFFFF01 +<value> clrStatusBlue =0xFF0202C1 # # diff -uNr weatherng-0.0.10-alt/weatherng/weatherng/weatherng.sh weatherng-0.0.10-neu/weatherng/weatherng/weatherng.sh --- weatherng-0.0.10-alt/weatherng/weatherng/weatherng.sh 2008-01-09 00:14:00.000000000 +0100 +++ weatherng-0.0.10-neu/weatherng/weatherng/weatherng.sh 2010-07-08 14:53:21.796030600 +0200 @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # weatherng.sh # @@ -9,56 +9,88 @@ # use them. Otherwise you must change the URLs. See README or README.DE. # Change SETUPDIR if you need (Path to $VDRCONFIG [setup.con]. -SETUPDIR=/VDR/etc - +SETUPDIR=/var/lib/vdr ID1=$1 ID2=$2 ID3=$3 ## Put your key here !! example KEY="jhsbndmjk34xyz123" -KEY="" +ID= +KEY= + + +case $LANG in + de_*) + MESG='Download abgeschlossen und Radarmaps aktualisiert' + MESGERR='Download der Radarmaps nicht erfolgreich' + URLS=( + http://modul.wetter.zdf.de/data/vor-brd-0.jpg + http://modul.wetter.zdf.de/data/temp-brd-0.jpg + http://modul.wetter.zdf.de/data/vor-brd-1.jpg + http://modul.wetter.zdf.de/data/temp-brd-1.jpg + http://modul.wetter.zdf.de/data/vor-brd-2.jpg + http://modul.wetter.zdf.de/data/temp-brd-2.jpg + http://modul.wetter.zdf.de/data/vor-brd-3.jpg + http://modul.wetter.zdf.de/data/pollen-suedwest-0.jpg + http://modul.wetter.zdf.de/data/wind-brd-0.jpg + http://modul.wetter.zdf.de/data/sat-dlr-0.jpg -LANGUAGE=( `grep -s ^OSDLanguage.*[0-9]$ "$SETUPDIR/setup.conf"` ) -case "${LANGUAGE[2]}" in - 1) MESG='Download abgeschlossen und Radarmaps aktualisiert' - URLS=(\ - # Put here 6 urls for radarmaps - #1: Tagestemperatur - #2: Nachttemperatur - #3: Regenradar - #4: Pollenflug - #5: Ozonwerte - #6: Europawetter - ) - ;; - 7) MESG='Téléchargement des données Météo OK' - URLS=(\ - ) - ;; - 8) MESG='Sääkuvat päivitetty' - URLS=(\ - ) - ;; - *) MESG='Weather pictures updated' - URLS=(\ - "" \ - "" \ - "" \ - "" \ - "" \ ) ;; + esac -for i in $(seq 0 9) ; do - eval ${URLS[$i]:+ wget -t 4 -T 20 "${URLS[$i]}" -O "$SETUPDIR/plugins/weatherng/pic${i}"} +for i in ${!URLS[*]} ; do + wget -t 4 -T 20 "${URLS[$i]}" -O "$SETUPDIR/plugins/weatherng/pic${i}" done -## convert "$SETUPDIR/plugins/weatherng/pic${i}" pic${i}.xpm -wget -t 4 -T 20 "http://xoap.weather.com/weather/local/$ID1?cc=*&unit=m&dayf=10&prod=xoap&par=1004124588&key=$KEY" -O "$SETUPDIR/plugins/weatherng/data1.xml" -wget -t 4 -T 20 "http://xoap.weather.com/weather/local/$ID2?cc=*&unit=m&dayf=10&prod=xoap&par=1004124588&key=$KEY" -O "$SETUPDIR/plugins/weatherng/data2.xml" -wget -t 4 -T 20 "http://xoap.weather.com/weather/local/$ID3?cc=*&unit=m&dayf=10&prod=xoap&par=1004124588&key=$KEY" -O "$SETUPDIR/plugins/weatherng/data3.xml" +#wget -t 4 -T 20 "http://xoap.weather.com/weather/local/$ID1?cc=*&unit=m&dayf=10&prod=xoap&par=$ID&key=$KEY" -O "$SETUPDIR/plugins/weatherng/data1.xml" +#wget -t 4 -T 20 "http://xoap.weather.com/weather/local/$ID2?cc=*&unit=m&dayf=10&prod=xoap&par=$ID&key=$KEY" -O "$SETUPDIR/plugins/weatherng/data2.xml" +#wget -t 4 -T 20 "http://xoap.weather.com/weather/local/$ID3?cc=*&unit=m&dayf=10&prod=xoap&par=$ID&key=$KEY" -O "$SETUPDIR/plugins/weatherng/data3.xml" +#echo $MESG + +function DownloadWeaterXML() { + # Param 1 : StationID + # 2 : Filename + wget -t 4 -T 20 "http://xoap.weather.com/weather/local/${1}?cc=*&unit=m&dayf=10&prod=xoap&par=$ID&key=$KEY" -O "${2}" +} + +function DownloadAndCheckXML() { + # Param 1 : StationID + # 2 : Filename + XMLOK=false + let LoopCnt=0 + while [ $XMLOK = false -a $LoopCnt -lt 5 ]; do + DownloadWeaterXML $1 "${2}-a" + DownloadWeaterXML $1 "${2}-b" + diff "${2}-a" "${2}-b" >/dev/null 2>&1 + STATUS=$? + grep -q "^<?xml" "${2}-a" + if [ $? -eq 0 -a $STATUS -eq 0 ]; then + # XML file should be OK + mv -vf "${2}-a" "${2}" + printf "\nDownload $1 to ${2##*/} OK.\n" + XMLOK=true + else + printf "\nERROR: $1 ${LoopCnt}. try - The two XML files differ, retrying download.\n" + fi + let LoopCnt++ + done + # Cleanup + [ -e "${2}-a" ] && rm -f "${2}-a" + [ -e "${2}-b" ] && rm -f "${2}-b" + [ $XMLOK = true ] && return 0 || return 1 +} + +DownloadAndCheckXML $ID1 "$SETUPDIR/plugins/weatherng/data1.xml" +STATUS1=$? +DownloadAndCheckXML $ID2 "$SETUPDIR/plugins/weatherng/data2.xml" +STATUS2=$? +DownloadAndCheckXML $ID3 "$SETUPDIR/plugins/weatherng/data3.xml" +STATUS3=$? + +[ $STATUS1 -ne 0 -o $STATUS2 -ne 0 -o $STATUS3 -ne 0 ] && MESG=$MESGERR echo $MESG diff -uNr weatherng-0.0.10-alt/weatherng.c weatherng-0.0.10-neu/weatherng.c --- weatherng-0.0.10-alt/weatherng.c 2008-01-16 02:59:07.000000000 +0100 +++ weatherng-0.0.10-neu/weatherng.c 2010-07-08 13:40:01.016027825 +0200 @@ -215,8 +215,8 @@ Add(new cMenuEditIntItem(tr("Radarbitmap top"), &wetterSetup.w_top, 1, 200)); if(wetterSetup.w_hiquality) { // 4 MB FF-CARD - Add(new cMenuEditIntItem(tr("Radarbitmap width"), &wetterSetup.w_width, 100, 672)); - Add(new cMenuEditIntItem(tr("Radarbitmap height"), &wetterSetup.w_height, 100, 567)); + Add(new cMenuEditIntItem(tr("Radarbitmap width"), &wetterSetup.w_width, 100, 1920)); + Add(new cMenuEditIntItem(tr("Radarbitmap height"), &wetterSetup.w_height, 100, 1080)); } else { // 2 MB FF-CARDGruß
gst -
Hallo gst,
hattest du auch mehrere rejects? Oder ist es der falsche src?
Code
Alles anzeigenpatch < weatherng_HD.diff patching file imagecache.h patching file OsdWeather.c patching file de_DE.po Hunk #1 FAILED at 121. 1 out of 1 hunk FAILED -- saving rejects to file de_DE.po.rej patching file current.colors Hunk #1 FAILED at 4. 1 out of 1 hunk FAILED -- saving rejects to file current.colors.rej patching file weatherng.sh Hunk #1 FAILED at 1. Hunk #2 FAILED at 9. 2 out of 2 hunks FAILED -- saving rejects to file weatherng.sh.rej patching file weatherng.cGruß
Norbert
-
Hi,
geht ohne rejects, gerade noch mal ausprobiert. Habe die datei mal angehängt. Src ist aus dem link weatherng-0.0.10-dev ?Gruß
gst -
Die Version von http://www.glaserei-franz.de/VDR/Moronimo2/vdrplugins.htm ist leider auch nicht besser:
Code
Alles anzeigenpatch < weatherng_HD.diff patching file imagecache.h patching file OsdWeather.c Hunk #1 succeeded at 16 (offset 1 line). Hunk #2 succeeded at 215 (offset -1 lines). Hunk #3 succeeded at 312 (offset -1 lines). Hunk #4 succeeded at 356 (offset -1 lines). Hunk #5 succeeded at 417 (offset -1 lines). Hunk #6 succeeded at 429 (offset -1 lines). Hunk #7 succeeded at 438 (offset -1 lines). Hunk #8 succeeded at 490 (offset -1 lines). Hunk #9 succeeded at 514 (offset -1 lines). Hunk #10 succeeded at 600 (offset 15 lines). Hunk #11 succeeded at 633 (offset 15 lines). Hunk #12 succeeded at 649 (offset 15 lines). Hunk #13 succeeded at 689 (offset 15 lines). patching file de_DE.po Hunk #1 FAILED at 121. 1 out of 1 hunk FAILED -- saving rejects to file de_DE.po.rej patching file current.colors Hunk #1 FAILED at 4. 1 out of 1 hunk FAILED -- saving rejects to file current.colors.rej patching file weatherng.sh Hunk #1 FAILED at 1. Hunk #2 FAILED at 9. 2 out of 2 hunks FAILED -- saving rejects to file weatherng.sh.rej patching file weatherng.c Hunk #1 FAILED at 215. 1 out of 1 hunk FAILED -- saving rejects to file weatherng.c.rej -
Zitat
Original von gst
Hi,
geht ohne rejects, gerade noch mal ausprobiert. Habe die datei mal angehängt. Src ist aus dem link weatherng-0.0.10-dev ?Gruß
gstjetzt gehts, Danke.
-
Hi
habe gerade gesehen.
patch < weatherng_HD.diff
geht nicht.
patch -p1 < ./weatherng_HD.diff
dann klappts.Gruß
gst -
Hallo,
brauchts den Patch unter yavdr 0.3 auch ?
wenn ja, wie kann ich das Plugin nachdem ich die Sourcen runtergeladen und den Patch eingespielt habe, neu installieren ?
Geht das dann über debianize-vdrplugin und dpkg-buildpackage oder über make ?
Vielleicht hat das ja schon jemand am laufen.
Gruss -
Zitat
Original von froschi
Hallo,
brauchts den Patch unter yavdr 0.3 auch ?Nein, ist mitlerweile drin.
Gruß
Norbert
-
Alles klar. Danke.
Gruss -
Hallo!
In der aktuellen Version tritt folgendes Problem auf:
Richte vdr-plugin-weatherng ein (0.0.10-15yavdr1) ...
chown: Zugriff auf „/var/lib/vdr/plugins/weatherng“ nicht möglich: Datei oder Verzeichnis nicht gefundenGruß
Norbert
-
Setup hinweis:
In der /var/lib/vdr/plugins/weatherng/weatherng.sh fehlt eine ID und ...
Die Größe der Radarbilder kann nur in der /etc/vdr/setup.conf vergrößert werden. Vorher vdr stoppen!
weatherng.RadarHeight=800
weatherng.RadarWidth=1600Gruß
Norbert
Jetzt mitmachen!
Sie haben noch kein Benutzerkonto auf unserer Seite? Registrieren Sie sich kostenlos und nehmen Sie an unserer Community teil!