Merge pull request #69 from AUNaseef/master

Added and integrated smoky, tornado, and windy icons.
HaikuArchives · Nov 27, 2018 · 2aa633e · 2aa633e
2 parents 024a64d + ab37b7a
commit 2aa633e
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 11 deletions.
diff --git a/Artwork/weather_smoky.hvif b/Artwork/weather_smoky.hvif
diff --git a/Artwork/weather_tornado.hvif b/Artwork/weather_tornado.hvif
diff --git a/Artwork/weather_windy.hvif b/Artwork/weather_windy.hvif
diff --git a/Source/ForecastView.cpp b/Source/ForecastView.cpp
@@ -527,11 +527,13 @@ ForecastView::_LoadBitmaps()
 	_LoadIcons(fSnow, 'rGFX', "Artwork/weather_snow.hvif");
 	_LoadIcons(fStorm, 'rGFX', "Artwork/weather_storm.hvif");
 	_LoadIcons(fThunder, 'rGFX', "Artwork/weather_thunder.hvif");
+	_LoadIcons(fTornado, 'rGFX', "Artwork/weather_tornado.hvif");
 	_LoadIcons(fTropicalStorm, 'rGFX', "Artwork/weather_tropical_storm.hvif");
 	_LoadIcons(fCloud, 'rGFX', "Artwork/weather_cloud.hvif");
 	_LoadIcons(fHurricane, 'rGFX', "Artwork/weather_hurricane.hvif");
-	_LoadIcons(fSnowShowers, 'rGFX', "Artwork/weather_snow_showers.hvif");
+	_LoadIcons(fSmoky, 'rGFX', "Artwork/weather_smoky.hvif");
 	_LoadIcons(fScatteredSnowShowers, 'rGFX', "Artwork/weather_scattered_snow_showers.hvif");
+	_LoadIcons(fSnowShowers, 'rGFX', "Artwork/weather_snow_showers.hvif");
 }
 
 
@@ -562,11 +564,13 @@ ForecastView::_DeleteBitmaps()
 	_DeleteIcons(fSnow);
 	_DeleteIcons(fStorm);
 	_DeleteIcons(fThunder);
+	_DeleteIcons(fTornado);
 	_DeleteIcons(fTropicalStorm);
 	_DeleteIcons(fCloud);
 	_DeleteIcons(fHurricane);
-	_DeleteIcons(fSnowShowers);
 	_DeleteIcons(fScatteredSnowShowers);
+	_DeleteIcons(fSmoky);
+	_DeleteIcons(fSnowShowers);
 }
 
 
@@ -706,7 +710,7 @@ BBitmap*
 ForecastView::GetWeatherIcon(int32 condition, weatherIconSize iconSize)
 {
 	switch (condition) {	// https://developer.yahoo.com/weather/documentation.html
-		case 0:	 										// tornado
+		case 0:	return fTornado[iconSize];				// tornado
 		case 1:	return fTropicalStorm[iconSize];		// tropical storm
 		case 2:	return fHurricane[iconSize];			// hurricane
 		case 3:	return fSevereThunderstorm[iconSize];	// severe thunderstorms
@@ -729,9 +733,9 @@ ForecastView::GetWeatherIcon(int32 condition, weatherIconSize iconSize)
 		case 19: break;									//*dust
 		case 20: return fFog[iconSize];					// fog
 		case 21: break;									//*haze
-		case 22: break;									//*smoky
+		case 22: return fSmoky[iconSize];				//*smoky
 		case 23: break;									//*blustery
-		case 24: break;									//*windy
+		case 24: return fWindy[iconSize];				//*windy
 		case 25: return fCold[iconSize];				//*cold
 		case 26: return	fCloud[iconSize];				// cloudy
 		case 27: return fMostlyCloudyNight[iconSize];	// mostly cloudy (night)

diff --git a/Source/ForecastView.h b/Source/ForecastView.h
@@ -146,13 +146,16 @@ status_t			SaveState(BMessage* into, bool deep = true) const;
 	BBitmap* 		fSnow[3];
 	BBitmap* 		fStorm[3];
 	BBitmap* 		fThunder[3];
+	BBitmap* 		fTornado[3];
 	BBitmap* 		fTropicalStorm[3];
 	BBitmap* 		fCloud[3];
 	BBitmap* 		fIsolatedThunderstorm[3];
 	BBitmap* 		fIsolatedThundershowers[3];
 	BBitmap* 		fHurricane[3];
-	BBitmap* 		fSnowShowers[3];
 	BBitmap* 		fScatteredSnowShowers[3];
+	BBitmap* 		fSmoky[3];
+	BBitmap* 		fSnowShowers[3];
+	BBitmap* 		fWindy[3];
 	BGroupView*		fInfoView;
 	BGroupView*		fNumberView;
 	BGroupView* 	fForecastView;

diff --git a/Source/Weather.rdef b/Source/Weather.rdef
@@ -39,11 +39,14 @@ resource(22, "Artwork/weather_shiny.hvif")				#'rGFX' import "../Artwork/weather
 resource(23, "Artwork/weather_snow.hvif")				#'rGFX' import "../Artwork/weather_snow.hvif" ;
 resource(24, "Artwork/weather_storm.hvif")				#'rGFX' import "../Artwork/weather_storm.hvif" ;
 resource(25, "Artwork/weather_thunder.hvif")			#'rGFX' import "../Artwork/weather_thunder.hvif" ;
-resource(26, "Artwork/weather_tropical_storm.hvif")	#'rGFX' import "../Artwork/weather_tropical_storm.hvif" ;
-resource(27, "Artwork/weather_cloud.hvif")				#'rGFX' import "../Artwork/weather_cloud.hvif" ;
-resource(28, "Artwork/weather_hurricane.hvif")				#'rGFX' import "../Artwork/weather_hurricane.hvif" ;
-resource(29, "Artwork/weather_scattered_snow_showers.hvif")	#'rGFX' import "../Artwork/weather_scattered_snow_showers.hvif" ;
-resource(30, "Artwork/weather_snow_showers.hvif")				#'rGFX' import "../Artwork/weather_snow_showers.hvif" ;
+resource(26, "Artwork/weather_tornado.hvif")			#'rGFX' import "../Artwork/weather_tornado.hvif" ;
+resource(27, "Artwork/weather_tropical_storm.hvif")	#'rGFX' import "../Artwork/weather_tropical_storm.hvif" ;
+resource(28, "Artwork/weather_cloud.hvif")				#'rGFX' import "../Artwork/weather_cloud.hvif" ;
+resource(29, "Artwork/weather_hurricane.hvif")				#'rGFX' import "../Artwork/weather_hurricane.hvif" ;
+resource(30, "Artwork/weather_scattered_snow_showers.hvif")	#'rGFX' import "../Artwork/weather_scattered_snow_showers.hvif" ;
+resource(31, "Artwork/weather_smoky.hvif")				#'rGFX' import "../Artwork/weather_smoky.hvif" ;
+resource(32, "Artwork/weather_snow_showers.hvif")				#'rGFX' import "../Artwork/weather_snow_showers.hvif" ;
+resource(33, "Artwork/weather_windy.hvif")				#'rGFX' import "../Artwork/weather_windy.hvif" ;
 
 resource vector_icon {
 	$"6E6369660904003903C57235020106020000003D8000BD400000000049600048"