Skip to content

Commit

Permalink
Added splash to VSCP Works
Browse files Browse the repository at this point in the history
  • Loading branch information
@grodansparadis
grodansparadis committed Apr 29, 2016
1 parent 9c6cf1d commit 16ff648
Show file tree
Hide file tree
Showing 4 changed files with 1,338 additions and 10 deletions.
4 changes: 3 additions & 1 deletion src/vscp/vscpworks/devicebootloaderwizard_images.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4035,4 +4035,6 @@ static const char *vscp_logo_xpm[] = {
" ",
" ",
" "
};
};


8 changes: 6 additions & 2 deletions src/vscp/vscpworks/frmmain.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -553,9 +553,9 @@ void frmMain::CreateControls()
strVersion += _( VSCPD_DISPLAY_VERSION );
m_pitemStatusBar->SetStatusText( strVersion );

wxBitmap bitmap( itemMainFrame->GetBitmapResource( wxT("vscp_logo_xpm") ) );
wxBitmap bitmap( itemMainFrame->GetBitmapResource( wxT("works_splash_xpm") ) );
if ( /*bitmap.LoadFile("splash16.png", wxBITMAP_TYPE_PNG )*/ 1 ) {
wxSplashScreen* splash = new wxSplashScreen( GetBitmapResource( _("../../../docs/vscp/logo/vscp_logo.jpg") ),
wxSplashScreen* splash = new wxSplashScreen( GetBitmapResource( _("../../../docs/vscp/logo/works_splash.jpg") ),
wxSPLASH_CENTRE_ON_SCREEN|wxSPLASH_TIMEOUT,
3000,
NULL,
Expand Down Expand Up @@ -593,6 +593,10 @@ wxBitmap frmMain::GetBitmapResource( const wxString& name )
wxBitmap bitmap(vscp_logo_xpm);
return bitmap;
}
else if ( name == _T("../../../docs/vscp/logo/works_splash.jpg") ) {
wxBitmap bitmap(works_splash_xpm);
return bitmap;
}

return wxNullBitmap;

Expand Down
Loading

0 comments on commit 16ff648

Please sign in to comment.