Pcbnew: Fix wrong show front/back layer icons in layer selector

This commit is contained in:
Stefan 2020-04-19 22:56:30 +00:00 committed by Ian McInerney
parent 7db355e34a
commit 02bdec1c57
5 changed files with 118 additions and 4 deletions

View File

@ -473,6 +473,8 @@ set( BMAPS_MID
show_no_layers
show_no_copper_layers
show_all_copper_layers
show_all_front_layers
show_all_back_layers
spreadsheet
svg_file
swap_layer
@ -726,4 +728,4 @@ add_library( bitmaps STATIC ${CPP_LIST} )
target_include_directories( bitmaps PUBLIC
include
)
)

View File

@ -0,0 +1,53 @@
/* Do not modify this file, it was automatically generated by the
* PNG2cpp CMake script, using a *.png file as input.
*/
#include <bitmaps_png/bitmaps_list.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
0xce, 0x00, 0x00, 0x02, 0x41, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xe5, 0x96, 0xcf, 0x6a, 0x1a,
0x51, 0x14, 0xc6, 0x9d, 0x58, 0x71, 0x91, 0x62, 0xa1, 0x8b, 0x2e, 0x34, 0x0f, 0x50, 0x0c, 0x54,
0x88, 0x59, 0x49, 0x09, 0x12, 0x82, 0x32, 0x77, 0x74, 0xfe, 0x44, 0x47, 0x4a, 0x95, 0x0e, 0x11,
0xdc, 0x08, 0x42, 0xa9, 0x6e, 0xec, 0x42, 0x08, 0xba, 0x4e, 0x18, 0x70, 0xa3, 0xd8, 0xd1, 0x37,
0xe8, 0x13, 0xb8, 0x31, 0xbb, 0xbe, 0x82, 0x50, 0x21, 0x5d, 0xb8, 0xe8, 0x46, 0x24, 0x57, 0x32,
0xa0, 0x73, 0x7a, 0x26, 0x6d, 0xad, 0x25, 0x66, 0xe2, 0x18, 0x0b, 0x81, 0x5e, 0xf8, 0x76, 0x9e,
0xf3, 0xdd, 0x73, 0x7f, 0xdf, 0xdc, 0xab, 0xc3, 0xf1, 0x98, 0x16, 0xcf, 0xf3, 0x6f, 0x44, 0x51,
0xbc, 0x8e, 0xc7, 0xe3, 0xb0, 0x8e, 0x04, 0x41, 0xb8, 0xb4, 0x34, 0x90, 0x65, 0xd9, 0x99, 0x4c,
0x26, 0xcf, 0x32, 0x99, 0x0c, 0xed, 0xf7, 0xfb, 0x60, 0x67, 0xcd, 0x66, 0x33, 0xd0, 0x34, 0x4d,
0xc7, 0x1e, 0xdf, 0x39, 0x8e, 0x0b, 0xde, 0x69, 0x12, 0x8d, 0x46, 0x9f, 0xa7, 0x52, 0xa9, 0x8b,
0x52, 0xa9, 0x44, 0x47, 0xa3, 0x91, 0x2d, 0x93, 0xf1, 0x78, 0x0c, 0xe5, 0x72, 0x99, 0x62, 0xfd,
0x17, 0x49, 0x92, 0x5e, 0x58, 0x1d, 0xd5, 0x2b, 0xdc, 0xc9, 0x50, 0x55, 0x55, 0x7d, 0x3a, 0x9d,
0xda, 0x32, 0x19, 0x0c, 0x06, 0xa0, 0x28, 0x0a, 0x4d, 0x24, 0x12, 0xed, 0x70, 0x38, 0xfc, 0xc4,
0x92, 0x07, 0xfe, 0x88, 0x76, 0xbb, 0x5d, 0x03, 0x6c, 0xae, 0x5e, 0xaf, 0x67, 0xe0, 0x51, 0x4f,
0xb0, 0x87, 0xf2, 0xcf, 0x78, 0xb4, 0x5a, 0x2d, 0xc0, 0x7a, 0xeb, 0x30, 0x3c, 0x94, 0x47, 0xa5,
0x52, 0x31, 0x99, 0xc0, 0x62, 0xed, 0xad, 0x30, 0x3c, 0x94, 0x47, 0x2e, 0x97, 0x83, 0x7a, 0xbd,
0x0e, 0x8b, 0xb5, 0x4b, 0xc3, 0x80, 0xdf, 0xc7, 0xb7, 0x75, 0xbf, 0x0f, 0xdc, 0xa0, 0xc9, 0xe5,
0x3f, 0x0c, 0x43, 0x8c, 0x8f, 0x6d, 0x26, 0x0c, 0xa5, 0x8f, 0x25, 0x38, 0xca, 0x1d, 0x81, 0xbb,
0xe1, 0x06, 0x47, 0xc7, 0x71, 0x23, 0xa6, 0xcd, 0x80, 0xbf, 0xe8, 0xd7, 0x89, 0x48, 0x36, 0x13,
0x86, 0xf4, 0x49, 0x1a, 0xf6, 0xdf, 0xef, 0x03, 0xa3, 0x31, 0x73, 0x13, 0x57, 0xd3, 0x05, 0xa1,
0x6c, 0x88, 0xb2, 0x12, 0xbb, 0x99, 0x30, 0x08, 0x09, 0x01, 0x7c, 0x55, 0xdf, 0xdc, 0xc0, 0x94,
0x47, 0xf5, 0x40, 0x44, 0x8e, 0x50, 0x9c, 0xc4, 0x3a, 0x0c, 0xd8, 0x60, 0x8f, 0x48, 0x64, 0x18,
0x28, 0x04, 0xae, 0xb7, 0xb4, 0xad, 0xbf, 0x9a, 0xdc, 0x27, 0x6f, 0xcd, 0x6b, 0xa0, 0xc1, 0x84,
0xe3, 0x39, 0xc5, 0xf2, 0xb6, 0x26, 0x02, 0x39, 0x61, 0x45, 0xf6, 0xca, 0x2c, 0xb0, 0x63, 0x60,
0xf2, 0xd8, 0xfd, 0xb0, 0x0b, 0x68, 0xb2, 0x74, 0x72, 0x3e, 0xc6, 0x5f, 0xfe, 0x4e, 0xdc, 0x53,
0xf6, 0x98, 0xfd, 0x7c, 0xf8, 0xf6, 0xf0, 0x6a, 0xbb, 0xbe, 0x6d, 0x6b, 0x0a, 0x93, 0xc7, 0xc1,
0xbb, 0x03, 0x48, 0x87, 0xd3, 0xd0, 0x70, 0x37, 0xa0, 0xe3, 0xe8, 0xdc, 0xa8, 0xcd, 0xb4, 0xa1,
0xe8, 0x2f, 0xea, 0x22, 0x11, 0x7f, 0x86, 0x01, 0x1d, 0x5f, 0x92, 0x63, 0xf2, 0x35, 0x98, 0x0f,
0x4e, 0x9c, 0x9f, 0x9c, 0xb6, 0x4c, 0x4c, 0x1e, 0xb8, 0x41, 0xc8, 0xef, 0xe5, 0x41, 0x63, 0xb4,
0xb9, 0x49, 0xd3, 0xd5, 0x84, 0x6c, 0x28, 0x4b, 0x25, 0x56, 0xfa, 0x13, 0x06, 0x3c, 0xcf, 0xb5,
0xc3, 0xc0, 0xc7, 0x79, 0xa8, 0xfa, 0xaa, 0x73, 0x03, 0x53, 0xaa, 0x47, 0x05, 0x39, 0x22, 0x53,
0x9c, 0xe4, 0x9e, 0x9b, 0x81, 0xc3, 0x67, 0x9b, 0x88, 0xf4, 0x74, 0xe7, 0xd4, 0x58, 0x6c, 0xb0,
0x8a, 0x6a, 0xde, 0x9a, 0x81, 0xb5, 0x13, 0xec, 0x61, 0x7d, 0x33, 0x48, 0x44, 0x3a, 0x4b, 0x46,
0x93, 0xf4, 0xfc, 0xd9, 0xb9, 0x2d, 0x83, 0x5b, 0x3c, 0xac, 0x9e, 0x6d, 0x3c, 0xcf, 0x0b, 0xe5,
0xb5, 0x42, 0x17, 0x81, 0xae, 0xa2, 0xa5, 0x3c, 0xee, 0x7a, 0xb6, 0x71, 0x92, 0x61, 0x21, 0x50,
0xd0, 0x17, 0x81, 0xae, 0xa2, 0x95, 0x79, 0xfc, 0x62, 0xb2, 0xfe, 0xcd, 0x10, 0x13, 0x74, 0x93,
0xe9, 0xa3, 0xfa, 0x6f, 0xf8, 0x03, 0x6c, 0xc4, 0xf8, 0x69, 0xea, 0xff, 0x8d, 0x44, 0x00, 0x00,
0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE show_all_back_layers_xpm[1] = {{ png, sizeof( png ), "show_all_back_layers_xpm" }};
//EOF

View File

@ -0,0 +1,57 @@
/* Do not modify this file, it was automatically generated by the
* PNG2cpp CMake script, using a *.png file as input.
*/
#include <bitmaps_png/bitmaps_list.h>
static const unsigned char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
0xce, 0x00, 0x00, 0x02, 0x7a, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xcd, 0x96, 0x41, 0x6b, 0xda,
0x60, 0x18, 0xc7, 0x95, 0x4d, 0xbc, 0x0c, 0x85, 0x1d, 0x76, 0xb0, 0x7e, 0x80, 0xa1, 0x30, 0xc1,
0xdd, 0xc4, 0x83, 0xeb, 0x41, 0x31, 0xd1, 0x98, 0x68, 0x22, 0x32, 0x5c, 0x65, 0x1d, 0x1e, 0x3c,
0x48, 0xc1, 0x7a, 0xa8, 0x17, 0xa1, 0x20, 0x14, 0x3c, 0x58, 0xdc, 0xbc, 0xb4, 0x88, 0xf6, 0x0b,
0x8c, 0xb1, 0xdd, 0x3d, 0xd4, 0x1c, 0x06, 0xdb, 0x27, 0x18, 0xc2, 0x84, 0x76, 0xe8, 0x61, 0x17,
0x91, 0xbe, 0x62, 0x50, 0xf3, 0xec, 0x49, 0xb7, 0xd6, 0x8c, 0xd5, 0x2c, 0xb1, 0x1b, 0xf4, 0x85,
0xe7, 0x96, 0x3c, 0xff, 0x3c, 0xef, 0xef, 0xf7, 0x26, 0x31, 0x99, 0xee, 0xd2, 0xa2, 0x19, 0x26,
0x15, 0x89, 0xc5, 0xa6, 0xd1, 0x68, 0x14, 0xd6, 0xa9, 0x08, 0xc3, 0x9c, 0x69, 0x06, 0x08, 0x82,
0x70, 0x8f, 0xe2, 0xb8, 0x5a, 0x88, 0xe7, 0x89, 0xfd, 0xf0, 0x10, 0x4c, 0x27, 0x27, 0xba, 0xcb,
0xdc, 0x6e, 0x83, 0x6b, 0x77, 0x57, 0xa2, 0x58, 0xf6, 0x3b, 0x4d, 0xd3, 0x4f, 0x57, 0x86, 0x84,
0x42, 0xa1, 0x87, 0x61, 0x8e, 0x13, 0xfd, 0x99, 0x0c, 0xb1, 0x1e, 0x1d, 0x19, 0x0a, 0xb1, 0x1c,
0x1f, 0x83, 0x6f, 0x7b, 0x9b, 0xe0, 0xfd, 0x9f, 0x38, 0x8e, 0x7b, 0xb4, 0x32, 0x84, 0x61, 0x98,
0x27, 0x38, 0xc9, 0xd0, 0x93, 0xcf, 0x4b, 0xe6, 0x56, 0xcb, 0x50, 0x88, 0xad, 0x5e, 0x87, 0xa0,
0x20, 0x10, 0x9c, 0xa4, 0x1d, 0x08, 0x04, 0xee, 0x6b, 0xf2, 0xc0, 0x8b, 0x88, 0x73, 0x7f, 0x5f,
0x36, 0x12, 0xa0, 0x94, 0xa3, 0x52, 0x91, 0xf1, 0xde, 0x09, 0xf6, 0xc8, 0xfc, 0x37, 0x1e, 0xee,
0x42, 0x01, 0x30, 0xe4, 0x46, 0x19, 0x98, 0x48, 0xe4, 0xec, 0x9f, 0xf0, 0x78, 0xb6, 0xb5, 0x05,
0xb9, 0x40, 0x00, 0xbe, 0x58, 0xad, 0x30, 0x30, 0x99, 0x2e, 0xeb, 0x9b, 0xd9, 0x0c, 0xaf, 0x5d,
0x2e, 0x89, 0xa7, 0xa8, 0x9f, 0x32, 0xdc, 0x96, 0x47, 0x24, 0x1e, 0x87, 0x8a, 0xd7, 0x0b, 0xe7,
0xd8, 0xf8, 0x2a, 0xa4, 0x67, 0xb1, 0x40, 0xc1, 0xe7, 0x23, 0x42, 0x38, 0xbc, 0x94, 0x01, 0xf7,
0xf3, 0x7c, 0xdd, 0xf3, 0xc1, 0x62, 0xbd, 0xdf, 0xd8, 0xb8, 0x0e, 0x50, 0xea, 0xb3, 0xcd, 0x06,
0x2f, 0x82, 0x41, 0x92, 0xa0, 0x28, 0x6d, 0x19, 0x18, 0x9a, 0x4e, 0xc5, 0x29, 0x8a, 0xbc, 0x75,
0x3a, 0x65, 0x75, 0x03, 0x3d, 0xf5, 0xc1, 0xe1, 0x90, 0x31, 0x60, 0x82, 0x3d, 0xb4, 0x65, 0xc0,
0xfd, 0xac, 0x3d, 0x0f, 0x85, 0xc8, 0x47, 0xbb, 0xdd, 0x50, 0x80, 0xc2, 0xa3, 0xee, 0x76, 0x03,
0x86, 0xdc, 0x38, 0x79, 0x2c, 0x16, 0x5b, 0xca, 0x80, 0xfb, 0x29, 0xe6, 0xfd, 0x7e, 0xa2, 0x06,
0xaa, 0xa7, 0x14, 0x1e, 0x7b, 0x9b, 0x9b, 0xb0, 0xb7, 0xb3, 0x03, 0xa3, 0xd1, 0x08, 0xae, 0xd6,
0x62, 0xb1, 0x80, 0x56, 0xab, 0x25, 0xe1, 0x00, 0x4b, 0x19, 0x70, 0x92, 0xe1, 0x81, 0xc7, 0x23,
0xa9, 0x81, 0xea, 0x29, 0x85, 0xc7, 0x2b, 0x7c, 0xe2, 0x37, 0xb5, 0x1a, 0xcc, 0xe7, 0xf3, 0xeb,
0x90, 0xf1, 0x78, 0x0c, 0xa5, 0x52, 0x89, 0x24, 0x93, 0xc9, 0xa5, 0x0c, 0x31, 0x9a, 0x5e, 0x5b,
0x06, 0x01, 0xcf, 0x4d, 0xf7, 0xf4, 0x14, 0xd4, 0xab, 0xdf, 0xef, 0x43, 0x06, 0x8f, 0x49, 0x22,
0x91, 0xd0, 0x96, 0x01, 0x1b, 0x78, 0x71, 0xdc, 0x61, 0xbd, 0x5e, 0x9f, 0xce, 0x66, 0x33, 0x30,
0xb2, 0xba, 0xdd, 0xae, 0xcc, 0xf3, 0xfc, 0x84, 0xd1, 0x7a, 0x33, 0x28, 0x0b, 0xc7, 0x7c, 0x89,
0x21, 0x17, 0xa2, 0x28, 0xca, 0x46, 0x02, 0x14, 0x1e, 0xcd, 0x66, 0x13, 0x30, 0x44, 0x5b, 0x06,
0x6c, 0xfe, 0x00, 0xf7, 0xf3, 0x5d, 0x2e, 0x97, 0xbb, 0x18, 0x0c, 0x06, 0x86, 0xa6, 0x50, 0x78,
0x94, 0xcb, 0x65, 0x85, 0x89, 0xb6, 0x0c, 0x98, 0xf8, 0x18, 0x43, 0xbe, 0x56, 0xab, 0xd5, 0xc9,
0x74, 0x3a, 0x35, 0x14, 0xa2, 0xf0, 0xc8, 0x66, 0xb3, 0xd0, 0x68, 0x34, 0xfe, 0x2e, 0x03, 0xcb,
0xb2, 0xeb, 0xcb, 0x20, 0x08, 0x0a, 0x97, 0xf5, 0x64, 0x40, 0x90, 0x29, 0xbc, 0x88, 0x74, 0x3a,
0x1d, 0x43, 0x9c, 0x74, 0xcb, 0x70, 0xf9, 0x66, 0xe0, 0xf9, 0x5a, 0x3a, 0x9d, 0x26, 0xbd, 0x5e,
0x0f, 0x8c, 0xca, 0xf0, 0x1b, 0x0f, 0xad, 0xcf, 0x36, 0xee, 0xa7, 0x58, 0x2c, 0x16, 0x89, 0x1a,
0xa8, 0x5e, 0x19, 0xfe, 0xe0, 0xb1, 0xea, 0xb3, 0xfd, 0xeb, 0xdc, 0x48, 0x6a, 0xa0, 0x7a, 0x65,
0xd0, 0xc5, 0xe3, 0xb6, 0x32, 0xe0, 0x04, 0x92, 0xc2, 0xf4, 0x4e, 0xfd, 0x1b, 0xfe, 0x00, 0x2f,
0xa8, 0xdb, 0xbe, 0x18, 0xf1, 0x18, 0x04, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE show_all_front_layers_xpm[1] = {{ png, sizeof( png ), "show_all_front_layers_xpm" }};
//EOF

View File

@ -427,6 +427,8 @@ EXTERN_BITMAP( show_graphics_mode_xpm )
EXTERN_BITMAP( show_mod_edge_xpm )
EXTERN_BITMAP( show_all_layers_xpm )
EXTERN_BITMAP( show_no_layers_xpm )
EXTERN_BITMAP( show_all_front_layers_xpm )
EXTERN_BITMAP( show_all_back_layers_xpm )
EXTERN_BITMAP( show_no_copper_layers_xpm )
EXTERN_BITMAP( show_all_copper_layers_xpm )
EXTERN_BITMAP( showtrack_xpm )
@ -502,4 +504,4 @@ EXTERN_BITMAP( sim_probe_xpm )
EXTERN_BITMAP( sim_add_signal_xpm )
EXTERN_BITMAP( sim_settings_xpm )
#endif // BITMAPS_PNG_BITMAPS_LIST__H
#endif // BITMAPS_PNG_BITMAPS_LIST__H

View File

@ -182,10 +182,10 @@ void PCB_LAYER_WIDGET::AddRightClickMenuItems( wxMenu& menu )
menu.AppendSeparator();
AddMenuItem( &menu, ID_SHOW_ALL_FRONT, _( "Show All Front Layers" ),
KiBitmap( show_no_layers_xpm ) );
KiBitmap( show_all_front_layers_xpm ) );
AddMenuItem( &menu, ID_SHOW_ALL_BACK, _( "Show All Back Layers" ),
KiBitmap( show_all_layers_xpm ) );
KiBitmap( show_all_back_layers_xpm ) );
}