Author: duncan
Date: Wed Sep 26 15:21:26 2007
New Revision: 9908
Log:
Added a look up for a sub-directory of weather for the skin name
Updated the icons from the Yahoo information as they seem to match correctly
Modified:
branches/rel-1/freevo/share/skins/plugins/weather.fxd
branches/rel-1/freevo/src/plugins/oneclick.py
Modified: branches/rel-1/freevo/share/skins/plugins/weather.fxd
==============================================================================
--- branches/rel-1/freevo/share/skins/plugins/weather.fxd (original)
+++ branches/rel-1/freevo/share/skins/plugins/weather.fxd Wed Sep 26
15:21:26 2007
@@ -10,8 +10,8 @@
<weather>
<screen layout="screen" x="0" y="0" width="800" height="600"/>
<title visible="not idlebar" layout="title" x="10" y="10" width="780"
height="80"/>
- <subtitle layout="subtitle" x="15" y="100" width="770" height="50"/>
- <content layout="weather" x="10" y="140" width="780" height="450"/>
+ <subtitle layout="subtitle" x="15" y="60" width="770" height="50"/>
+ <content layout="weather" x="10" y="100" width="780" height="450"/>
</weather>
<layout label="weather">
Modified: branches/rel-1/freevo/src/plugins/oneclick.py
==============================================================================
--- branches/rel-1/freevo/src/plugins/oneclick.py (original)
+++ branches/rel-1/freevo/src/plugins/oneclick.py Wed Sep 26 15:21:26 2007
@@ -71,59 +71,63 @@
#check every 1 hour
WEATHER_AGE = 3600
WEATHER_DIR = os.path.join(config.SHARE_DIR, 'images', 'weather')
+if os.path.isdir(os.path.join(WEATHER_DIR, config.SKIN_XML_FILE)):
+ WEATHER_DIR = os.path.join(WEATHER_DIR, config.SKIN_XML_FILE)
+_debug_('WEATHER_AGE=%d' % WEATHER_AGE)
+_debug_('WEATHER_DIR=%r' % WEATHER_DIR)
-#FIXME Not sure that all of these are correctly named
+#From the Yahoo! weather
WEATHER_ICONS = {
-# icon twc.com image fallback
- '0': ( 'twc/0.png', 'thunderstorm.png', 'thunshowers.png'),
- '1': ( 'twc/1.png', 'thunderstorm.png', 'thunshowers.png'),
- '2': ( 'twc/2.png', 'thunderstorm.png', 'thunshowers.png'),
- '3': ( 'twc/3.png', 'thunderstorm.png', 'thunshowers.png'),
- '4': ( 'twc/4.png', 'thunderstorm.png', 'thunshowers.png'),
- '5': ( 'twc/5.png', 'sleet.png', 'rainsnow.png'),
- '6': ( 'twc/6.png', 'hail.png', 'rainsnow.png'),
- '7': ( 'twc/7.png', 'mixed.png', 'rainsnow.png'),
- '8': ( 'twc/8.png', 'freezingfog.png', 'fog.png'),
- '9': ( 'twc/9.png', 'drizzle.png', 'fog.png'),
- '10': ('twc/10.png', 'freezingrain.png', 'rainsnow.png'),
- '11': ('twc/11.png', 'lightrain.png', 'lshowers.png'),
- '12': ('twc/12.png', 'rain.png', 'showers.png'),
- '13': ('twc/13.png', 'lightsnowshowers.png', 'flurries.png'),
- '14': ('twc/14.png', 'mediumsnowshowers.png', 'flurries.png'),
- '15': ('twc/15.png', 'freshsnow.png', 'flurries.png'),
- '16': ('twc/16.png', 'snow.png', 'flurries.png'),
- '17': ('twc/17.png', 'thunderstorm.png', 'thunshowers.png'),
- '18': ('twc/18.png', 'drizzle.png', 'showers.png'),
- '19': ('twc/19.png', 'dust.png', 'fog.png'),
- '20': ('twc/20.png', 'mist.png', 'fog.png'),
- '21': ('twc/21.png', 'haze.png', 'fog.png'),
- '22': ('twc/22.png', 'smoke.png', 'fog.png'),
- '23': ('twc/23.png', 'windy.png', 'pcloudy.png'),
- '24': ('twc/24.png', 'windy.png', 'pcloudy.png'),
- '25': ('twc/25.png', 'freezing.png', 'pcloudy.png'),
- '26': ('twc/26.png', 'cloudy-n.png', 'pcloudy.png'),
- '27': ('twc/27.png', 'mostlycloudy-n.png', 'mcloudy.png'),
- '28': ('twc/28.png', 'mostlycloudy.png', 'mcloudy.png'),
- '29': ('twc/29.png', 'partlycloudy-n.png', 'pcloudy.png'),
- '30': ('twc/30.png', 'partlycloudy.png', 'pcloudy.png'),
- '31': ('twc/31.png', 'clear-n.png', 'sunny.png'),
- '32': ('twc/32.png', 'sunny.png', 'sunny.png'),
- '33': ('twc/33.png', 'mostlyclear.png', 'sunny.png'),
- '34': ('twc/34.png', 'mostlysunny.png', 'sunny.png'),
- '35': ('twc/35.png', 'thunderstorm.png', 'thunshowers.png'),
- '36': ('twc/36.png', 'hotandsunny.png', 'sunny.png'),
- '37': ('twc/37.png', 'isolatedthunderstorms.png', 'thunshowers.png'),
- '38': ('twc/38.png', 'scatteredthunderstorms.png', 'thunshowers.png'),
- '39': ('twc/39.png', 'sunnyintervals.png', 'showers.png'),
- '40': ('twc/40.png', 'heavyrain.png', 'showers.png'),
- '41': ('twc/41.png', 'snowshowers.png', 'snowshow.png'),
- '42': ('twc/42.png', 'snow.png', 'rainsnow.png'),
- '43': ('twc/43.png', 'snow.png', 'rainsnow.png'),
- '44': ('twc/44.png', 'na.png', 'unknown.png'),
- '45': ('twc/45.png', 'rainshowers-n.png', 'rainsnow.png'),
- '46': ('twc/46.png', 'snowshowers-n.png', 'snowshow.png'),
- '47': ('twc/47.png', 'scatteredthunderstorms-n.png', 'thunshowers.png'),
- 'na': ('twc/na.png', 'na.png', 'unknown.png'),
+# icon twc.com image fallback
+ '0': ( 'twc/0.png', 'tornado.png', 'thunshowers.png'),
+ '1': ( 'twc/1.png', 'tropical_storm.png', 'thunshowers.png'),
+ '2': ( 'twc/2.png', 'hurricane.png', 'thunshowers.png'),
+ '3': ( 'twc/3.png', 'severe_thunderstorms.png', 'thunshowers.png'),
+ '4': ( 'twc/4.png', 'thunderstorms.png', 'thunshowers.png'),
+ '5': ( 'twc/5.png', 'mixed_rain_and_snow.png', 'rainsnow.png'),
+ '6': ( 'twc/6.png', 'mixed_rain_and_sleet.png', 'rainsnow.png'),
+ '7': ( 'twc/7.png', 'mixed_snow_and_sleet.png', 'rainsnow.png'),
+ '8': ( 'twc/8.png', 'freezing drizzle.png', 'fog.png'),
+ '9': ( 'twc/9.png', 'drizzle.png', 'fog.png'),
+ '10': ('twc/10.png', 'freezing_rain.png', 'rainsnow.png'),
+ '11': ('twc/11.png', 'showers.png', 'lshowers.png'),
+ '12': ('twc/12.png', 'showers.png', 'showers.png'),
+ '13': ('twc/13.png', 'snow_flurries.png', 'flurries.png'),
+ '14': ('twc/14.png', 'light_snow_showers.png', 'flurries.png'),
+ '15': ('twc/15.png', 'blowing_snow.png', 'flurries.png'),
+ '16': ('twc/16.png', 'snow.png', 'flurries.png'),
+ '17': ('twc/17.png', 'hail.png', 'thunshowers.png'),
+ '18': ('twc/18.png', 'sleet.png', 'showers.png'),
+ '19': ('twc/19.png', 'dust.png', 'fog.png'),
+ '20': ('twc/20.png', 'foggy.png', 'fog.png'),
+ '21': ('twc/21.png', 'haze.png', 'fog.png'),
+ '22': ('twc/22.png', 'smoke.png', 'fog.png'),
+ '23': ('twc/23.png', 'blustery.png', 'pcloudy.png'),
+ '24': ('twc/24.png', 'wind.png', 'pcloudy.png'),
+ '25': ('twc/25.png', 'cold.png', 'pcloudy.png'),
+ '26': ('twc/26.png', 'cloudy.png', 'pcloudy.png'),
+ '27': ('twc/27.png', 'mostly_cloudy_night.png', 'mcloudy.png'),
+ '28': ('twc/28.png', 'mostly_cloudy_day.png', 'mcloudy.png'),
+ '29': ('twc/29.png', 'partly_cloudy_night.png', 'pcloudy.png'),
+ '30': ('twc/30.png', 'partly_cloudy_day.png', 'pcloudy.png'),
+ '31': ('twc/31.png', 'clear_night.png', 'sunny.png'),
+ '32': ('twc/32.png', 'sunny.png', 'sunny.png'),
+ '33': ('twc/33.png', 'fair_night.png', 'sunny.png'),
+ '34': ('twc/34.png', 'fair_day.png', 'sunny.png'),
+ '35': ('twc/35.png', 'mixed_rain_and_hail.png', 'thunshowers.png'),
+ '36': ('twc/36.png', 'hot.png', 'sunny.png'),
+ '37': ('twc/37.png', 'isolated_thunderstorms.png', 'thunshowers.png'),
+ '38': ('twc/38.png', 'scattered_thunderstorms.png', 'thunshowers.png'),
+ '39': ('twc/39.png', 'scattered_thunderstorms.png', 'thunshowers.png'),
+ '40': ('twc/40.png', 'scattered_showers.png', 'showers.png'),
+ '41': ('twc/41.png', 'heavy_snow.png', 'snowshow.png'),
+ '42': ('twc/42.png', 'scattered_snow_showers.png', 'rainsnow.png'),
+ '43': ('twc/43.png', 'heavy_snow.png', 'rainsnow.png'),
+ '44': ('twc/44.png', 'na.png', 'unknown.png'),
+ '45': ('twc/45.png', 'thundershowers-n.png', 'rainsnow.png'),
+ '46': ('twc/46.png', 'snow_showers-n.png', 'snowshow.png'),
+ '47': ('twc/47.png', 'isolated_thundershowers-n.png', 'thunshowers.png'),
+ 'na': ('twc/na.png', 'na.png', 'unknown.png'),
}
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2005.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
Freevo-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/freevo-cvslog
