Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added and integrated smoky, tornado, and windy icons. #69

Merged
merged 1 commit into from
Nov 27, 2018
Merged

Added and integrated smoky, tornado, and windy icons. #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Binary file added Artwork/weather_smoky.hvif
View file
Open in desktop
Binary file not shown.
Binary file added Artwork/weather_tornado.hvif
View file
Open in desktop
Binary file not shown.
Binary file added Artwork/weather_windy.hvif
View file
Open in desktop
Binary file not shown.
14 changes: 9 additions & 5 deletions Source/ForecastView.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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");
}


Expand Down Expand Up @@ -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);
}


Expand Down Expand Up @@ -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
Expand All @@ -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)
Expand Down
5 changes: 4 additions & 1 deletion Source/ForecastView.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
13 changes: 8 additions & 5 deletions Source/Weather.rdef
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down