Implement use of the kicad nightly icon where needed
This commit is contained in:
parent
0fc8197474
commit
8030bf1cc4
|
@ -26,6 +26,8 @@
|
|||
#include <config.h>
|
||||
#include <string>
|
||||
|
||||
#include <kicad_build_version.h>
|
||||
|
||||
#include <wx/clipbrd.h>
|
||||
#include <wx/msgdlg.h>
|
||||
#include <wx/hyperlink.h>
|
||||
|
@ -76,7 +78,11 @@ DIALOG_ABOUT::DIALOG_ABOUT( EDA_BASE_FRAME *aParent, ABOUT_APP_INFO& aAppInfo )
|
|||
else
|
||||
{
|
||||
wxIcon icon;
|
||||
#if KICAD_IS_NIGHTLY
|
||||
icon.CopyFromBitmap( KiBitmap( BITMAPS::icon_kicad_nightly ) );
|
||||
#else
|
||||
icon.CopyFromBitmap( KiBitmap( BITMAPS::icon_kicad ) );
|
||||
#endif
|
||||
SetIcon( icon );
|
||||
m_bitmapApp->SetBitmap( icon );
|
||||
}
|
||||
|
|
|
@ -33,6 +33,7 @@
|
|||
#include <eda_base_frame.h>
|
||||
#include <filehistory.h>
|
||||
#include <kiplatform/app.h>
|
||||
#include <kicad_build_version.h>
|
||||
#include <kiway.h>
|
||||
#include <kiway_express.h>
|
||||
#include <launch_ext.h>
|
||||
|
@ -127,12 +128,21 @@ KICAD_MANAGER_FRAME::KICAD_MANAGER_FRAME( wxWindow* parent, const wxString& titl
|
|||
wxIcon icon;
|
||||
wxIconBundle icon_bundle;
|
||||
|
||||
#if KICAD_IS_NIGHTLY
|
||||
icon.CopyFromBitmap( KiBitmap( BITMAPS::icon_kicad_nightly ) );
|
||||
icon_bundle.AddIcon( icon );
|
||||
icon.CopyFromBitmap( KiBitmap( BITMAPS::icon_kicad_nightly_32 ) );
|
||||
icon_bundle.AddIcon( icon );
|
||||
icon.CopyFromBitmap( KiBitmap( BITMAPS::icon_kicad_nightly_16 ) );
|
||||
icon_bundle.AddIcon( icon );
|
||||
#else
|
||||
icon.CopyFromBitmap( KiBitmap( BITMAPS::icon_kicad ) );
|
||||
icon_bundle.AddIcon( icon );
|
||||
icon.CopyFromBitmap( KiBitmap( BITMAPS::icon_kicad_32 ) );
|
||||
icon_bundle.AddIcon( icon );
|
||||
icon.CopyFromBitmap( KiBitmap( BITMAPS::icon_kicad_16 ) );
|
||||
icon_bundle.AddIcon( icon );
|
||||
#endif
|
||||
|
||||
SetIcons( icon_bundle );
|
||||
|
||||
|
|
Loading…
Reference in New Issue