Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

Add multiple size icons for programs 

In theory, the WM should now choose the closest size icon for its
purpose, making it easier to distinguish in space-constrained settings

Fixes https://gitlab.com/kicad/code/kicad/issues/6798
6.0.7
Seth Hillbrand 5 years ago
parent
9828f56c08
commit
61ac9c8d90
10 changed files with 83 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 10
      bitmap2component/bitmap2cmp_gui.cpp
  2. 2
      bitmaps_png/include/bitmaps_png/bitmaps_list.h
  3. 10
      eeschema/sch_edit_frame.cpp
  4. 10
      eeschema/symbol_editor/symbol_edit_frame.cpp
  5. 10
      gerbview/gerbview_frame.cpp
  6. 10
      kicad/kicad_manager_frame.cpp
  7. 10
      pagelayout_editor/pl_editor_frame.cpp
  8. 10
      pcb_calculator/pcb_calculator_frame.cpp
  9. 10
      pcbnew/footprint_edit_frame.cpp
  10. 12
      pcbnew/pcb_edit_frame.cpp

10
bitmap2component/bitmap2cmp_gui.cpp
View File

@ -171,8 +171,16 @@ BM2CMP_FRAME::BM2CMP_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
// Give an icon
wxIcon icon;
wxIconBundle icon_bundle;
icon.CopyFromBitmap( KiBitmap( icon_bitmap2component_xpm ) );
SetIcon( icon );
icon_bundle.AddIcon( icon );
icon.CopyFromBitmap( KiBitmap( icon_bitmap2component_32_xpm ) );
icon_bundle.AddIcon( icon );
icon.CopyFromBitmap( KiBitmap( icon_bitmap2component_16_xpm ) );
icon_bundle.AddIcon( icon );
SetIcons( icon_bundle );
GetSizer()->SetSizeHints( this );

2
bitmaps_png/include/bitmaps_png/bitmaps_list.h
View File

@ -242,7 +242,7 @@ EXTERN_BITMAP( icon_pcbnew_16_xpm )
EXTERN_BITMAP( icon_bitmap2component_32_xpm )
EXTERN_BITMAP( icon_eeschema_32_xpm )
EXTERN_BITMAP( icon_gerbview_32_xpm )
EXTERN_BITMAP( icon_kicad_132_xpm )
EXTERN_BITMAP( icon_kicad_32_xpm )
EXTERN_BITMAP( icon_libedit_32_xpm )
EXTERN_BITMAP( icon_modedit_32_xpm )
EXTERN_BITMAP( icon_pagelayout_editor_32_xpm )

10
eeschema/sch_edit_frame.cpp
View File

@ -222,8 +222,16 @@ SCH_EDIT_FRAME::SCH_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
// Give an icon
wxIcon icon;
wxIconBundle icon_bundle;
icon.CopyFromBitmap( KiBitmap( icon_eeschema_xpm ) );
SetIcon( icon );
icon_bundle.AddIcon( icon );
icon.CopyFromBitmap( KiBitmap( icon_eeschema_32_xpm ) );
icon_bundle.AddIcon( icon );
icon.CopyFromBitmap( KiBitmap( icon_eeschema_16_xpm ) );
icon_bundle.AddIcon( icon );
SetIcons( icon_bundle );
LoadSettings( eeconfig() );

10
eeschema/symbol_editor/symbol_edit_frame.cpp
View File

@ -111,8 +111,16 @@ SYMBOL_EDIT_FRAME::SYMBOL_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
m_aboutTitle = _( "Symbol Editor" );
wxIcon icon;
wxIconBundle icon_bundle;
icon.CopyFromBitmap( KiBitmap( icon_libedit_xpm ) );
SetIcon( icon );
icon_bundle.AddIcon( icon );
icon.CopyFromBitmap( KiBitmap( icon_libedit_32_xpm ) );
icon_bundle.AddIcon( icon );
icon.CopyFromBitmap( KiBitmap( icon_libedit_16_xpm ) );
icon_bundle.AddIcon( icon );
SetIcons( icon_bundle );
m_settings = Pgm().GetSettingsManager().GetAppSettings<SYMBOL_EDITOR_SETTINGS>();
LoadSettings( m_settings );

10
gerbview/gerbview_frame.cpp
View File

@ -111,8 +111,16 @@ GERBVIEW_FRAME::GERBVIEW_FRAME( KIWAY* aKiway, wxWindow* aParent )
// Give an icon
wxIcon icon;
wxIconBundle icon_bundle;
icon.CopyFromBitmap( KiBitmap( icon_gerbview_xpm ) );
SetIcon( icon );
icon_bundle.AddIcon( icon );
icon.CopyFromBitmap( KiBitmap( icon_gerbview_32_xpm ) );
icon_bundle.AddIcon( icon );
icon.CopyFromBitmap( KiBitmap( icon_gerbview_16_xpm ) );
icon_bundle.AddIcon( icon );
SetIcons( icon_bundle );
// Be sure a page info is set. this default value will be overwritten later.
PAGE_INFO pageInfo( wxT( "GERBER" ) );

10
kicad/kicad_manager_frame.cpp
View File

@ -112,8 +112,16 @@ KICAD_MANAGER_FRAME::KICAD_MANAGER_FRAME( wxWindow* parent, const wxString& titl
// Give an icon
wxIcon icon;
wxIconBundle icon_bundle;
icon.CopyFromBitmap( KiBitmap( icon_kicad_xpm ) );
SetIcon( icon );
icon_bundle.AddIcon( icon );
icon.CopyFromBitmap( KiBitmap( icon_kicad_32_xpm ) );
icon_bundle.AddIcon( icon );
icon.CopyFromBitmap( KiBitmap( icon_kicad_16_xpm ) );
icon_bundle.AddIcon( icon );
SetIcons( icon_bundle );
// Load the settings
LoadSettings( config() );

10
pagelayout_editor/pl_editor_frame.cpp
View File

@ -97,8 +97,16 @@ PL_EDITOR_FRAME::PL_EDITOR_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
// Give an icon
wxIcon icon;
wxIconBundle icon_bundle;
icon.CopyFromBitmap( KiBitmap( icon_pagelayout_editor_xpm ) );
SetIcon( icon );
icon_bundle.AddIcon( icon );
icon.CopyFromBitmap( KiBitmap( icon_pagelayout_editor_32_xpm ) );
icon_bundle.AddIcon( icon );
icon.CopyFromBitmap( KiBitmap( icon_pagelayout_editor_16_xpm ) );
icon_bundle.AddIcon( icon );
SetIcons( icon_bundle );
// Create GAL canvas
auto* drawPanel = new PL_DRAW_PANEL_GAL( this, -1, wxPoint( 0, 0 ), m_frameSize,

10
pcb_calculator/pcb_calculator_frame.cpp
View File

@ -87,8 +87,16 @@ PCB_CALCULATOR_FRAME::PCB_CALCULATOR_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
// Give an icon
wxIcon icon;
wxIconBundle icon_bundle;
icon.CopyFromBitmap( KiBitmap( icon_pcbcalculator_xpm ) );
SetIcon( icon );
icon_bundle.AddIcon( icon );
icon.CopyFromBitmap( KiBitmap( icon_pcbcalculator_32_xpm ) );
icon_bundle.AddIcon( icon );
icon.CopyFromBitmap( KiBitmap( icon_pcbcalculator_16_xpm ) );
icon_bundle.AddIcon( icon );
SetIcons( icon_bundle );
GetSizer()->SetSizeHints( this );

10
pcbnew/footprint_edit_frame.cpp
View File

@ -121,8 +121,16 @@ FOOTPRINT_EDIT_FRAME::FOOTPRINT_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent,
// Give an icon
wxIcon icon;
wxIconBundle icon_bundle;
icon.CopyFromBitmap( KiBitmap( icon_modedit_xpm ) );
SetIcon( icon );
icon_bundle.AddIcon( icon );
icon.CopyFromBitmap( KiBitmap( icon_modedit_32_xpm ) );
icon_bundle.AddIcon( icon );
icon.CopyFromBitmap( KiBitmap( icon_modedit_16_xpm ) );
icon_bundle.AddIcon( icon );
SetIcons( icon_bundle );
// Create GAL canvas
if( aBackend == EDA_DRAW_PANEL_GAL::GAL_TYPE_UNKNOWN )

12
pcbnew/pcb_edit_frame.cpp
View File

@ -197,9 +197,17 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( KIWAY* aKiway, wxWindow* aParent ) :
SetBoard( new BOARD() );
wxIcon icon;
wxIcon icon;
wxIconBundle icon_bundle;
icon.CopyFromBitmap( KiBitmap( icon_pcbnew_xpm ) );
SetIcon( icon );
icon_bundle.AddIcon( icon );
icon.CopyFromBitmap( KiBitmap( icon_pcbnew_32_xpm ) );
icon_bundle.AddIcon( icon );
icon.CopyFromBitmap( KiBitmap( icon_pcbnew_16_xpm ) );
icon_bundle.AddIcon( icon );
SetIcons( icon_bundle );
// LoadSettings() *after* creating m_LayersManager, because LoadSettings()
// initialize parameters in m_LayersManager

Write Preview
Loading…
Cancel
Save