Changeset 16965


Ignore:
Timestamp:
07/04/12 19:44:05 (12 years ago)
Author:
gost
Message:

[lcdsamsung] fix weather

Location:
titan
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • titan/plugins/lcdsamsung/lcd_weather.h

    r16960 r16965  
    174174                return node;
    175175        else if(ostrstr(icon, "/sunny.gif") != NULL)
    176                 node = ostrcat(node, "%pluginpath%/samsung/skin/sunny60.png", 0, 0);
     176                node = ostrcat(node, "%pluginpath%/lcdsamsung/skin/sunny60.png", 0, 0);
    177177        else if(ostrstr(icon, "/mostly_sunny.gif") != NULL)
    178                 node = ostrcat(node, "%pluginpath%/samsung/skin/mostly_sunny60.png", 0, 0);
     178                node = ostrcat(node, "%pluginpath%/lcdsamsung/skin/mostly_sunny60.png", 0, 0);
    179179  else if(ostrstr(icon, "/chance_of_rain.gif") != NULL)
    180         node = ostrcat(node, "%pluginpath%/samsung/skin/chance_of_rain60.png", 0, 0);
     180        node = ostrcat(node, "%pluginpath%/lcdsamsung/skin/chance_of_rain60.png", 0, 0);
    181181  else if(ostrstr(icon, "/partly_cloudy.gif") != NULL)
    182         node = ostrcat(node, "%pluginpath%/samsung/skin/partly_cloudy60.png", 0, 0);
     182        node = ostrcat(node, "%pluginpath%/lcdsamsung/skin/partly_cloudy60.png", 0, 0);
    183183  else if(ostrstr(icon, "/mostly_cloudy.gif") != NULL)
    184         node = ostrcat(node, "%pluginpath%/samsung/skin/mostly_cloudy60.png", 0, 0);
     184        node = ostrcat(node, "%pluginpath%/lcdsamsung/skin/mostly_cloudy60.png", 0, 0);
    185185  else if(ostrstr(icon, "/chance_of_storm.gif") != NULL)
    186         node = ostrcat(node, "%pluginpath%/samsung/skin/chance_of_storm60.png", 0, 0);
     186        node = ostrcat(node, "%pluginpath%/lcdsamsung/skin/chance_of_storm60.png", 0, 0);
    187187        else if(ostrstr(icon, "/showers.gif") != NULL)
    188         node = ostrcat(node, "%pluginpath%/samsung/skin/showers60.png", 0, 0);
     188        node = ostrcat(node, "%pluginpath%/lcdsamsung/skin/showers60.png", 0, 0);
    189189  else if(ostrstr(icon, "/rain.gif") != NULL)
    190         node = ostrcat(node, "%pluginpath%/samsung/skin/rain60.png", 0, 0);
     190        node = ostrcat(node, "%pluginpath%/lcdsamsung/skin/rain60.png", 0, 0);
    191191  else if(ostrstr(icon, "/chance_of_snow.gif") != NULL)
    192         node = ostrcat(node, "%pluginpath%/samsung/skin/chance_of_snow60.png", 0, 0);
     192        node = ostrcat(node, "%pluginpath%/lcdsamsung/skin/chance_of_snow60.png", 0, 0);
    193193  else if(ostrstr(icon, "/cloudy.gif") != NULL)
    194         node = ostrcat(node, "%pluginpath%/samsung/skin/cloudy60.png", 0, 0);
     194        node = ostrcat(node, "%pluginpath%/lcdsamsung/skin/cloudy60.png", 0, 0);
    195195  else if(ostrstr(icon, "/storm.gif") != NULL)
    196         node = ostrcat(node, "%pluginpath%/samsung/skin/storm60.png", 0, 0);
     196        node = ostrcat(node, "%pluginpath%/lcdsamsung/skin/storm60.png", 0, 0);
    197197  else if(ostrstr(icon, "/thunderstorm.gif") != NULL)
    198         node = ostrcat(node, "%pluginpath%/samsung/skin/storm60.png", 0, 0);
     198        node = ostrcat(node, "%pluginpath%/lcdsamsung/skin/storm60.png", 0, 0);
    199199  else if(ostrstr(icon, "/chance_of_tstorm.gif") != NULL)
    200         node = ostrcat(node, "%pluginpath%/samsung/skin/chance_of_storm.png", 0, 0);
     200        node = ostrcat(node, "%pluginpath%/lcdsamsung/skin/chance_of_storm.png", 0, 0);
    201201  else if(ostrstr(icon, "/sleet.gif") != NULL)
    202         node = ostrcat(node, "%pluginpath%/samsung/skin/snow60.png", 0, 0);
     202        node = ostrcat(node, "%pluginpath%/lcdsamsung/skin/snow60.png", 0, 0);
    203203  else if(ostrstr(icon, "/snow.gif") != NULL)
    204         node = ostrcat(node, "%pluginpath%/samsung/skin/snow60.png", 0, 0);
     204        node = ostrcat(node, "%pluginpath%/lcdsamsung/skin/snow60.png", 0, 0);
    205205  else if(ostrstr(icon, "/icy.gif") != NULL)
    206         node = ostrcat(node, "%pluginpath%/samsung/skin/icy60.png", 0, 0);
     206        node = ostrcat(node, "%pluginpath%/lcdsamsung/skin/icy60.png", 0, 0);
    207207  else if(ostrstr(icon, "/dust.gif") != NULL)
    208         node = ostrcat(node, "%pluginpath%/samsung/skin/fog60.png", 0, 0);
     208        node = ostrcat(node, "%pluginpath%/lcdsamsung/skin/fog60.png", 0, 0);
    209209  else if(ostrstr(icon, "/fog.gif") != NULL)
    210         node = ostrcat(node, "%pluginpath%/samsung/skin/fog60.png", 0, 0);
     210        node = ostrcat(node, "%pluginpath%/lcdsamsung/skin/fog60.png", 0, 0);
    211211  else if(ostrstr(icon, "/smoke.gif") != NULL)
    212         node = ostrcat(node, "%pluginpath%/samsung/skin/fog60.png", 0, 0);
     212        node = ostrcat(node, "%pluginpath%/lcdsamsung/skin/fog60.png", 0, 0);
    213213  else if(ostrstr(icon, "/haze.gif") != NULL)
    214         node = ostrcat(node, "%pluginpath%/samsung/skin/fog60.png", 0, 0);
     214        node = ostrcat(node, "%pluginpath%/lcdsamsung/skin/fog60.png", 0, 0);
    215215  else if(ostrstr(icon, "/flurries.gif") != NULL)
    216         node = ostrcat(node, "%pluginpath%/samsung/skin/flurries60.png", 0, 0);
     216        node = ostrcat(node, "%pluginpath%/lcdsamsung/skin/flurries60.png", 0, 0);
    217217  return node; 
    218218}
  • titan/plugins/lcdsamsung/lcdsamsung.c

    r16963 r16965  
    103103                day3_i = getscreennode(LCD_Samsung1, "day3_i");
    104104                day3_d = getscreennode(LCD_Samsung1, "day3_d");
     105                akttime = getscreennode(LCD_Samsung1, "akttime");
    105106                if(file_exist("/tmp/lcdweather") == 1)
    106107                        system("rm /tmp/lcdweather");
  • titan/skins/lcdsamsung/skin.xml

    r16960 r16965  
    1515<node func=getpicon posx=350 posy=100 width=100 height=60/>
    1616<node halign=center func=getepgakttitle bordersize=0 bordercol=bordercol fontsize=35 posx=center posy=175 width=780 height=50 fontcol=fontcol/>
    17 <node halign=center bordersize=2 progresscol=bordercol bgcol=white halign=left func=getepgakttimeline bordercol=CD661D borderradius=5 name=epgline posy=230 posx=center width=700 height=20/>
     17<node halign=center bordersize=2 progresscol=CD661D bgcol=white halign=left func=getepgakttimeline bordercol=CD661D borderradius=5 name=epgline posy=230 posx=center width=700 height=20/>
    1818<node halign=center text="" name=akttime fontsize=100 posx=center posy=275 width=700 height=100/>
    1919<node halign=center valign=left func=getrec param1=skin name=rec posx=0 posy=440 width=100 height=20/>
    2020</screen>
    2121
    22 <screen halign=center fontcol=fontcol fontsize=30 name=LCD_spf75_Wetter posx=0 posy=0 width=320 height=240 bgcol=bgcol>
    23 <node fontsize=50 halign=center text="" func=getaktchannelname name=channelname posx=5 posy=3 width=310 height=50 fontcol=fontcol/>
    24 <node halign=center func=getepgakttitle bordersize=0 bordercol=bordercol fontsize=20 posx=10 posy=60 width=300 height=20 fontcol=fontcol/>
    25 <node halign=center bordersize=2 progresscol=bordercol bgcol=white halign=left func=getepgakttimeline bordercol=bordercol borderradius=5 name=epgline posy=85 posx=center width=290 height=15/>
    26 <node halign=center text="" name=akttime fontsize=50 posx=center posy=100 width=320 height=50/>
    27 <node halign=center text="0 C" name=day0_t fontsize=20 posx=10 posy=160 width=60 height=20/>
    28 <node halign=center text="0 C" name=day1_t fontsize=20 posx=100 posy=160 width=60 height=20/>
    29 <node halign=center text="0 C" name=day2_t fontsize=20 posx=175 posy=160 width=60 height=20/>
    30 <node halign=center text="0 C" name=day3_t fontsize=20 posx=250 posy=160 width=60 height=20/>
    31 <node pic=%pluginpath%/lcdsamsung/skin/sunny60.png halign=center name=day0_i posx=10 posy=180 width=60 height=60/>
    32 <node pic=%pluginpath%/lcdsamsung/skin/sunny60.png halign=center name=day1_i posx=100 posy=180 width=60 height=60/>
    33 <node pic=%pluginpath%/lcdsamsung/skin/sunny60.png halign=center name=day2_i posx=175 posy=180 width=60 height=60/>
    34 <node pic=%pluginpath%/lcdsamsung/skin/sunny60.png halign=center name=day3_i posx=250 posy=180 width=60 height=60/>
    35 <node halign=center valign=left func=getrec param1=skin name=rec posx=0 posy=220 width=100 height=20/>
     22<screen halign=center fontcol=fontcol fontsize=30 name=LCD_spf75_Wetter posx=0 posy=0 width=800 height=480 bgcol=000000>
     23<node fontsize=80 halign=center text="" func=getaktchannelname name=channelname posx=10 posy=15 width=690 height=80 fontcol=fontcol/>
     24<node func=getpicon posx=240 posy=100 width=100 height=60/>
     25<node halign=center func=getepgakttitle bordersize=0 bordercol=bordercol fontsize=35 posx=5 posy=175 width=695 height=50 fontcol=fontcol/>
     26<node halign=center bordersize=2 progresscol=CD661D bgcol=white halign=left func=getepgakttimeline bordercol=CD661D borderradius=5 name=epgline posy=230 posx=5 width=695 height=20/>
     27<node halign=center text="" name=akttime fontsize=100 posx=100 posy=275 width=600 height=100/>
     28<node halign=center valign=left func=getrec param1=skin name=rec posx=0 posy=440 width=100 height=20/>
     29<node halign=center text="0 C" name=day0_t fontsize=20 posx=710 posy=5 width=80 height=20/>
     30<node halign=center text="0 C" name=day1_t fontsize=20 posx=710 posy=125 width=80 height=20/>
     31<node halign=center text="0 C" name=day2_t fontsize=20 posx=710 posy=245 width=80 height=20/>
     32<node halign=center text="0 C" name=day3_t fontsize=20 posx=710 posy=365 width=80 height=20/>
     33<node halign=center text="MO" name=day0_d fontsize=20 posx=710 posy=95 width=80 height=20/>
     34<node halign=center text="DI" name=day1_d fontsize=20 posx=710 posy=215 width=80 height=20/>
     35<node halign=center text="MI" name=day2_d fontsize=20 posx=710 posy=335 width=80 height=20/>
     36<node halign=center text="DO" name=day3_d fontsize=20 posx=710 posy=455 width=80 height=20/>
     37<node pic=%pluginpath%/lcdsamsung/skin/sunny60.png halign=center name=day0_i posx=720 posy=30 width=60 height=60/>
     38<node pic=%pluginpath%/lcdsamsung/skin/sunny60.png halign=center name=day1_i posx=720 posy=150 width=60 height=60/>
     39<node pic=%pluginpath%/lcdsamsung/skin/sunny60.png halign=center name=day2_i posx=720 posy=270 width=60 height=60/>
     40<node pic=%pluginpath%/lcdsamsung/skin/sunny60.png halign=center name=day3_i posx=720 posy=390 width=60 height=60/>
    3641</screen>
    3742
     
    4651</screen>
    4752
    48 <screen halign=center fontcol=fontcol fontsize=30 name=LCD_spf75_MC_Menu posx=0 posy=0 width=320 height=240 bgcol=bgcol>
    49 <node pic=%pluginpath%/lcdsamsung/mc.png type=textbox wrap=yes fontsize=30 halign=center text="" name=title posx=0 posy=0 width=320 height=240 fontcol=fontcol/>
    50 <node type=textbox wrap=yes fontsize=30 halign=center text="Auswahl" name=title posx=5 posy=40 width=310 height=90 fontcol=fontcol/>
    51 <node halign=center text="" name=akttime fontsize=50 posx=center posy=150 width=320 height=50/>
    52 </screen>
    5353
    5454<screen halign=center fontcol=fontcol fontsize=30 name=LCD_spf87 posx=0 posy=0 width=800 height=480 bgcol=000000>
     
    5656<node func=getpicon posx=350 posy=100 width=100 height=60/>
    5757<node halign=center func=getepgakttitle bordersize=0 bordercol=bordercol fontsize=35 posx=center posy=175 width=780 height=50 fontcol=fontcol/>
    58 <node halign=center bordersize=2 progresscol=bordercol bgcol=white halign=left func=getepgakttimeline bordercol=CD661D borderradius=5 name=epgline posy=230 posx=center width=700 height=20/>
     58<node halign=center bordersize=2 progresscol=CD661D bgcol=white halign=left func=getepgakttimeline bordercol=CD661D borderradius=5 name=epgline posy=230 posx=center width=700 height=20/>
    5959<node halign=center text="" name=akttime fontsize=100 posx=center posy=275 width=700 height=100/>
    6060<node halign=center valign=left func=getrec param1=skin name=rec posx=0 posy=440 width=100 height=20/>
    6161</screen>
    6262
    63 <screen halign=center fontcol=fontcol fontsize=30 name=LCD_spf87_Wetter posx=0 posy=0 width=320 height=240 bgcol=bgcol>
    64 <node fontsize=50 halign=center text="" func=getaktchannelname name=channelname posx=5 posy=3 width=310 height=50 fontcol=fontcol/>
    65 <node halign=center func=getepgakttitle bordersize=0 bordercol=bordercol fontsize=20 posx=10 posy=60 width=300 height=20 fontcol=fontcol/>
    66 <node halign=center bordersize=2 progresscol=bordercol bgcol=white halign=left func=getepgakttimeline bordercol=bordercol borderradius=5 name=epgline posy=85 posx=center width=290 height=15/>
    67 <node halign=center text="" name=akttime fontsize=50 posx=center posy=100 width=320 height=50/>
    68 <node halign=center text="0 C" name=day0_t fontsize=20 posx=10 posy=160 width=60 height=20/>
    69 <node halign=center text="0 C" name=day1_t fontsize=20 posx=100 posy=160 width=60 height=20/>
    70 <node halign=center text="0 C" name=day2_t fontsize=20 posx=175 posy=160 width=60 height=20/>
    71 <node halign=center text="0 C" name=day3_t fontsize=20 posx=250 posy=160 width=60 height=20/>
    72 <node pic=%pluginpath%/lcdsamsung/skin/sunny60.png halign=center name=day0_i posx=10 posy=180 width=60 height=60/>
    73 <node pic=%pluginpath%/lcdsamsung/skin/sunny60.png halign=center name=day1_i posx=100 posy=180 width=60 height=60/>
    74 <node pic=%pluginpath%/lcdsamsung/skin/sunny60.png halign=center name=day2_i posx=175 posy=180 width=60 height=60/>
    75 <node pic=%pluginpath%/lcdsamsung/skin/sunny60.png halign=center name=day3_i posx=250 posy=180 width=60 height=60/>
    76 <node halign=center valign=left func=getrec param1=skin name=rec posx=0 posy=220 width=100 height=20/>
     63<screen halign=center fontcol=fontcol fontsize=30 name=LCD_spf87_Wetter posx=0 posy=0 width=800 height=480 bgcol=000000>
     64<node fontsize=80 halign=center text="" func=getaktchannelname name=channelname posx=10 posy=15 width=690 height=80 fontcol=fontcol/>
     65<node func=getpicon posx=300 posy=100 width=100 height=60/>
     66<node halign=center func=getepgakttitle bordersize=0 bordercol=bordercol fontsize=35 posx=5 posy=175 width=695 height=50 fontcol=fontcol/>
     67<node halign=center bordersize=2 progresscol=CD661D bgcol=white halign=left func=getepgakttimeline bordercol=CD661D borderradius=5 name=epgline posy=230 posx=5 width=695 height=20/>
     68<node halign=center text=" " name=akttime fontsize=100 posx=5 posy=275 width=695 height=100/>
     69<node halign=center valign=left func=getrec param1=skin name=rec posx=0 posy=440 width=100 height=20/>
     70<node halign=center text="0 C" name=day0_t fontsize=20 posx=710 posy=5 width=80 height=20/>
     71<node halign=center text="0 C" name=day1_t fontsize=20 posx=710 posy=125 width=80 height=20/>
     72<node halign=center text="0 C" name=day2_t fontsize=20 posx=710 posy=245 width=80 height=20/>
     73<node halign=center text="0 C" name=day3_t fontsize=20 posx=710 posy=365 width=80 height=20/>
     74<node halign=center text="MO" name=day0_d fontsize=20 posx=710 posy=95 width=80 height=20/>
     75<node halign=center text="DI" name=day1_d fontsize=20 posx=710 posy=215 width=80 height=20/>
     76<node halign=center text="MI" name=day2_d fontsize=20 posx=710 posy=335 width=80 height=20/>
     77<node halign=center text="DO" name=day3_d fontsize=20 posx=710 posy=455 width=80 height=20/>
     78<node pic=%pluginpath%/lcdsamsung/skin/sunny60.png halign=center name=day0_i posx=720 posy=30 width=60 height=60/>
     79<node pic=%pluginpath%/lcdsamsung/skin/sunny60.png halign=center name=day1_i posx=720 posy=150 width=60 height=60/>
     80<node pic=%pluginpath%/lcdsamsung/skin/sunny60.png halign=center name=day2_i posx=720 posy=270 width=60 height=60/>
     81<node pic=%pluginpath%/lcdsamsung/skin/sunny60.png halign=center name=day3_i posx=720 posy=390 width=60 height=60/>
    7782</screen>
    7883
     
    8691<node halign=center text="" name=akttime fontsize=50 posx=center posy=150 width=320 height=50/>
    8792</screen>
    88 
    89 <screen halign=center fontcol=fontcol fontsize=30 name=LCD_spf87_MC_Menu posx=0 posy=0 width=320 height=240 bgcol=bgcol>
    90 <node pic=%pluginpath%/lcdsamsung/mc.png type=textbox wrap=yes fontsize=30 halign=center text="" name=title posx=0 posy=0 width=320 height=240 fontcol=fontcol/>
    91 <node type=textbox wrap=yes fontsize=30 halign=center text="Auswahl" name=title posx=5 posy=40 width=310 height=90 fontcol=fontcol/>
    92 <node halign=center text="" name=akttime fontsize=50 posx=center posy=150 width=320 height=50/>
    93 </screen>
Note: See TracChangeset for help on using the changeset viewer.