haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Implement use of the kicad nightly icon where needed

This commit is contained in:
Marek Roszko 2022-01-23 09:20:50 -05:00
parent 0fc8197474
commit 8030bf1cc4
2 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/dialog_about/dialog_about.cpp
View File

@ -26,6 +26,8 @@
#include <config.h> #include <config.h>
#include <string> #include <string>
#include <kicad_build_version.h>
#include <wx/clipbrd.h> #include <wx/clipbrd.h>
#include <wx/msgdlg.h> #include <wx/msgdlg.h>
#include <wx/hyperlink.h> #include <wx/hyperlink.h>
@ -76,7 +78,11 @@ DIALOG_ABOUT::DIALOG_ABOUT( EDA_BASE_FRAME *aParent, ABOUT_APP_INFO& aAppInfo )
else else
{ {
wxIcon icon; wxIcon icon;
#if KICAD_IS_NIGHTLY
icon.CopyFromBitmap( KiBitmap( BITMAPS::icon_kicad_nightly ) );
#else
icon.CopyFromBitmap( KiBitmap( BITMAPS::icon_kicad ) ); icon.CopyFromBitmap( KiBitmap( BITMAPS::icon_kicad ) );
#endif
SetIcon( icon ); SetIcon( icon );
m_bitmapApp->SetBitmap( icon ); m_bitmapApp->SetBitmap( icon );
} }

10
kicad/kicad_manager_frame.cpp
View File

@ -33,6 +33,7 @@
#include <eda_base_frame.h> #include <eda_base_frame.h>
#include <filehistory.h> #include <filehistory.h>
#include <kiplatform/app.h> #include <kiplatform/app.h>
#include <kicad_build_version.h>
#include <kiway.h> #include <kiway.h>
#include <kiway_express.h> #include <kiway_express.h>
#include <launch_ext.h> #include <launch_ext.h>
@ -127,12 +128,21 @@ KICAD_MANAGER_FRAME::KICAD_MANAGER_FRAME( wxWindow* parent, const wxString& titl
wxIcon icon; wxIcon icon;
wxIconBundle icon_bundle; 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.CopyFromBitmap( KiBitmap( BITMAPS::icon_kicad ) );
icon_bundle.AddIcon( icon ); icon_bundle.AddIcon( icon );
icon.CopyFromBitmap( KiBitmap( BITMAPS::icon_kicad_32 ) ); icon.CopyFromBitmap( KiBitmap( BITMAPS::icon_kicad_32 ) );
icon_bundle.AddIcon( icon ); icon_bundle.AddIcon( icon );
icon.CopyFromBitmap( KiBitmap( BITMAPS::icon_kicad_16 ) ); icon.CopyFromBitmap( KiBitmap( BITMAPS::icon_kicad_16 ) );
icon_bundle.AddIcon( icon ); icon_bundle.AddIcon( icon );
#endif
SetIcons( icon_bundle ); SetIcons( icon_bundle );