Skip to content

K
kicad-source-mirror
Commit 441a8d3d authored by Mikhail Karpenko's avatar Mikhail Karpenko
Browse files
Options

Merge branch 'master' into teardrops

parents 9db22f0a b2745c4b
Show whitespace changes
Inline Side-by-side
Showing with 819 additions and 207 deletions
bitmaps_png/CMakeLists.txt
View file @ 441a8d3d
......@@ -337,6 +337,7 @@ set( BMAPS_MID
library_table
libview
lines90
list_nets
load_module_board
load_module_lib
local_ratsnest
......
bitmaps_png/cpp_26/add_hierarchical_subsheet.cpp
View file @ 441a8d3d
......@@ -8,55 +8,86 @@
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, 0xef, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xbd, 0x96, 0x4f, 0x48, 0x14,
0x51, 0x1c, 0xc7, 0xbf, 0xbf, 0xa7, 0xa6, 0xe9, 0xe6, 0x29, 0x3c, 0x25, 0x44, 0xe0, 0x41, 0xaa,
0x53, 0xeb, 0xea, 0x55, 0xf3, 0xde, 0xa1, 0x53, 0x97, 0xee, 0x9d, 0xa4, 0x4b, 0x48, 0x50, 0x50,
0x90, 0x50, 0x74, 0xe9, 0x90, 0x07, 0x8f, 0xae, 0xee, 0xc1, 0x43, 0x20, 0x94, 0x45, 0xe6, 0xa1,
0x5b, 0x2e, 0x2a, 0x0a, 0xfe, 0x01, 0x09, 0x9d, 0xdd, 0x6d, 0x51, 0x07, 0x2a, 0x91, 0x26, 0xa7,
0x79, 0x33, 0xef, 0xd7, 0x61, 0x77, 0xb6, 0x37, 0x6f, 0x77, 0x47, 0x2d, 0xf2, 0x07, 0x8f, 0x19,
0x66, 0xde, 0x7c, 0x3f, 0xf3, 0xfd, 0xce, 0x6f, 0xde, 0x0c, 0x31, 0x33, 0x4e, 0xa3, 0x04, 0x4e,
0xa9, 0x1a, 0xc3, 0x1d, 0x22, 0x3a, 0x3f, 0x34, 0x34, 0x74, 0xbf, 0xa3, 0xa3, 0xa3, 0xed, 0x6f,
0xc5, 0x36, 0x36, 0x36, 0xf6, 0xd2, 0xe9, 0xf4, 0xc3, 0x5a, 0xe7, 0x28, 0x8c, 0x8e, 0x88, 0x3a,
0xad, 0x5c, 0x6e, 0xad, 0xa5, 0xe5, 0xec, 0x39, 0x21, 0x08, 0x44, 0x04, 0x41, 0xa5, 0x2d, 0x11,
0x01, 0xe1, 0x7e, 0x69, 0x72, 0x65, 0xab, 0xd7, 0xda, 0xea, 0xea, 0x76, 0x5f, 0x5f, 0xdf, 0xa5,
0x58, 0x47, 0x65, 0x18, 0x35, 0x34, 0x08, 0x64, 0xb3, 0x59, 0x28, 0xa5, 0x2a, 0x20, 0x6d, 0x02,
0x28, 0x7a, 0x41, 0x44, 0xec, 0x4b, 0xa1, 0xd0, 0x3e, 0x36, 0x36, 0x76, 0x47, 0x4a, 0xa9, 0x26,
0x26, 0x26, 0xa6, 0x99, 0x79, 0xb7, 0xa6, 0xa3, 0x7c, 0xa1, 0xb0, 0xde, 0xd6, 0xda, 0x9a, 0xf8,
0x34, 0x3f, 0x8f, 0x54, 0x2a, 0x55, 0x72, 0x25, 0x44, 0xc5, 0x95, 0xe9, 0x86, 0x6a, 0xc1, 0x4b,
0x15, 0x24, 0x12, 0x89, 0x24, 0x33, 0x2f, 0xd7, 0x73, 0x04, 0x12, 0x02, 0x82, 0x08, 0xcc, 0x8c,
0xdd, 0xdd, 0x5d, 0xec, 0xed, 0xed, 0xfd, 0x11, 0x2c, 0x8b, 0xc6, 0xba, 0x2c, 0x27, 0x03, 0xe0,
0x32, 0x11, 0x35, 0x01, 0xf8, 0xca, 0xcc, 0x5b, 0x51, 0x10, 0x00, 0x51, 0x7e, 0x1e, 0x42, 0x08,
0x6c, 0x6e, 0x6e, 0x62, 0xf0, 0xfa, 0x20, 0x02, 0x15, 0x54, 0x8e, 0x47, 0x9c, 0xd5, 0x8f, 0x52,
0xfc, 0x70, 0x9c, 0x34, 0x01, 0x18, 0x19, 0x19, 0x79, 0x01, 0xe0, 0x6e, 0x4d, 0x47, 0xe1, 0x5d,
0x0b, 0x21, 0x10, 0xa8, 0x00, 0x41, 0x10, 0x40, 0x69, 0x8d, 0x11, 0x19, 0x86, 0x2b, 0xdd, 0x2b,
0x88, 0xd0, 0xd4, 0xd4, 0x44, 0x55, 0xd1, 0xc1, 0x70, 0x44, 0x00, 0x84, 0x10, 0xa5, 0xc6, 0xd0,
0x9f, 0x95, 0x01, 0xaa, 0x44, 0x69, 0x38, 0xd4, 0x23, 0x6e, 0x34, 0xc2, 0x8d, 0xb6, 0x75, 0x59,
0x3c, 0x84, 0x08, 0xed, 0x98, 0x0e, 0x09, 0x05, 0x89, 0xe8, 0xe8, 0x17, 0x36, 0xb4, 0x1d, 0x4e,
0x16, 0x9a, 0x90, 0x0e, 0x10, 0x75, 0x22, 0x3c, 0x11, 0x08, 0xfa, 0x45, 0x9a, 0x30, 0x97, 0x3b,
0x31, 0xec, 0xc8, 0x93, 0x42, 0x62, 0x1d, 0xe9, 0x2b, 0x82, 0x09, 0x09, 0xa3, 0x84, 0x31, 0xff,
0xd8, 0x20, 0x1d, 0x10, 0x11, 0xd0, 0x22, 0xd3, 0x9b, 0xc2, 0x04, 0x1c, 0xff, 0x19, 0x95, 0x45,
0x75, 0xa0, 0x20, 0x82, 0x32, 0x9a, 0x22, 0xce, 0x4d, 0x3d, 0x58, 0xb5, 0xa3, 0x98, 0x18, 0x4d,
0xc8, 0x3f, 0x81, 0x62, 0x23, 0x34, 0xce, 0x99, 0xae, 0x98, 0x19, 0x41, 0x10, 0x40, 0x5b, 0x3f,
0x8f, 0x06, 0x45, 0x3a, 0x91, 0xb9, 0x0a, 0x6c, 0x42, 0x7c, 0xdf, 0x87, 0xeb, 0xba, 0x38, 0x3c,
0x3c, 0x84, 0x94, 0x12, 0x00, 0x70, 0xa6, 0xb9, 0x19, 0xae, 0xe7, 0x57, 0x7f, 0x61, 0xa5, 0x94,
0x81, 0x10, 0x22, 0xb2, 0x6e, 0x51, 0x8d, 0x38, 0x4c, 0x98, 0xef, 0xfb, 0x38, 0x38, 0x38, 0x80,
0x6d, 0xdb, 0xb0, 0x2c, 0x0b, 0x5b, 0x5b, 0x5b, 0xc8, 0xe5, 0x72, 0xc8, 0x2e, 0x2e, 0x3a, 0x33,
0xaf, 0xdf, 0x8e, 0x9b, 0xa0, 0x6f, 0x3d, 0x3d, 0x3d, 0x37, 0xba, 0xba, 0xba, 0xfa, 0xad, 0x5c,
0x6e, 0x99, 0x8c, 0x85, 0xb2, 0x16, 0x8c, 0x88, 0xa0, 0x94, 0x82, 0xe3, 0x38, 0xd8, 0xdf, 0xdf,
0x47, 0xb1, 0x58, 0x44, 0x32, 0x99, 0x44, 0x6f, 0x6f, 0x0a, 0x3f, 0x5d, 0x57, 0xde, 0x1b, 0x1e,
0x4e, 0xad, 0xac, 0x2c, 0x2c, 0x45, 0xa2, 0x63, 0x66, 0x07, 0xc0, 0x47, 0x00, 0x48, 0x4f, 0x4e,
0x7e, 0x8f, 0x34, 0x47, 0xcc, 0xbb, 0xa2, 0x94, 0x82, 0xeb, 0xba, 0x70, 0x1c, 0x07, 0xed, 0xed,
0xed, 0xf0, 0xbc, 0x5f, 0x78, 0x37, 0x3b, 0xeb, 0x3d, 0x7f, 0xfa, 0xec, 0xea, 0xea, 0xd2, 0xd2,
0x66, 0xd5, 0x87, 0x4f, 0xaf, 0x81, 0x81, 0x81, 0x9b, 0xdd, 0xdd, 0xdd, 0x17, 0x6d, 0xdb, 0xbe,
0x96, 0xc9, 0x64, 0x6e, 0xd5, 0x6a, 0x80, 0x70, 0x48, 0x29, 0x61, 0xdb, 0x36, 0xf2, 0xf9, 0x3c,
0x3a, 0x3b, 0x2f, 0x60, 0xfa, 0xcd, 0xcc, 0xfe, 0xab, 0xa9, 0xa9, 0x2b, 0x73, 0x73, 0x73, 0xc5,
0x88, 0x28, 0x33, 0xd7, 0x1d, 0xfd, 0xfd, 0xfd, 0xb7, 0x3d, 0xcf, 0x63, 0xcf, 0xf3, 0x58, 0x4a,
0xc9, 0xbe, 0xef, 0xb3, 0xef, 0xfb, 0x1c, 0x04, 0x01, 0x2b, 0xa5, 0x98, 0x99, 0x59, 0x4a, 0xc9,
0x3b, 0x3b, 0x3b, 0xfc, 0xfe, 0xc3, 0x1c, 0x3f, 0x78, 0xf4, 0x78, 0x1d, 0x40, 0x4b, 0x2d, 0xad,
0xd8, 0xae, 0xb3, 0x2c, 0x6b, 0xfb, 0xe5, 0xe8, 0xe8, 0xb8, 0x20, 0xaa, 0xfb, 0x5b, 0xc6, 0x00,
0x3c, 0x3f, 0xc0, 0xc2, 0xe2, 0xf2, 0xe7, 0xa9, 0xcc, 0xf8, 0x13, 0x66, 0xf6, 0x63, 0xff, 0x82,
0xfe, 0x77, 0xfd, 0x06, 0x86, 0xd4, 0x50, 0x62, 0x0e, 0x3a, 0xfd, 0x94, 0x00, 0x00, 0x00, 0x00,
0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
0xce, 0x00, 0x00, 0x04, 0xde, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xad, 0x96, 0x5f, 0x48, 0x5b,
0x57, 0x1c, 0xc7, 0x03, 0x7b, 0x19, 0x53, 0xc6, 0xc6, 0xf0, 0x41, 0x06, 0x7b, 0xd8, 0x60, 0x08,
0xdd, 0xc3, 0xc0, 0x81, 0x30, 0x99, 0xe0, 0xc3, 0xd8, 0x1f, 0xca, 0x1e, 0x5a, 0xd8, 0x60, 0xb5,
0xeb, 0xa8, 0x7d, 0xe9, 0xa8, 0xad, 0xb5, 0x50, 0x10, 0x62, 0x15, 0x59, 0x19, 0x2d, 0x9b, 0x56,
0x23, 0xfb, 0xe3, 0x9c, 0xb6, 0x0a, 0xda, 0x6a, 0xe2, 0x9f, 0x68, 0xab, 0xcb, 0xd4, 0x32, 0x35,
0x06, 0xd4, 0xb4, 0x9a, 0xc4, 0x3f, 0x49, 0x6a, 0x8c, 0xab, 0x89, 0x9a, 0xff, 0x31, 0x31, 0xc6,
0x44, 0xfd, 0xee, 0xfc, 0x8e, 0xb9, 0x97, 0x24, 0x5e, 0x59, 0x1f, 0x76, 0xe1, 0xcb, 0xb9, 0xf7,
0xdc, 0x9b, 0xdf, 0xe7, 0xf7, 0xef, 0x9c, 0x13, 0x59, 0x66, 0x66, 0xe6, 0x89, 0xc2, 0xc2, 0xc2,
0x6f, 0xfe, 0x0f, 0xe5, 0xe6, 0xe6, 0x7e, 0x2d, 0x93, 0xc9, 0x5e, 0x07, 0x20, 0x4b, 0x97, 0xac,
0xa0, 0xa0, 0xe0, 0x7c, 0x28, 0x14, 0x86, 0xcf, 0xe7, 0x83, 0xcf, 0xef, 0x47, 0x20, 0x18, 0x44,
0x50, 0xd0, 0xd6, 0x16, 0xb6, 0x42, 0x21, 0x84, 0xc2, 0x61, 0x84, 0x93, 0xb5, 0xbd, 0x2d, 0x6a,
0x3b, 0x21, 0xba, 0x5f, 0xb6, 0xd9, 0xbc, 0x0c, 0xf4, 0xf6, 0xb1, 0x20, 0x7f, 0x20, 0x08, 0x97,
0xdb, 0x8d, 0x35, 0x87, 0x03, 0xcf, 0xd7, 0xd6, 0xf8, 0xe8, 0x70, 0x3a, 0xe1, 0x5c, 0x5f, 0xc7,
0xfa, 0xc6, 0x06, 0x36, 0x48, 0x9b, 0x9b, 0xd8, 0x4c, 0x96, 0xcb, 0xc5, 0xe5, 0x4a, 0x88, 0xee,
0x97, 0xcc, 0xe6, 0x00, 0x03, 0x9d, 0x60, 0x7a, 0x85, 0xe9, 0xe5, 0x23, 0x20, 0xf2, 0xdc, 0xe3,
0xf5, 0xa2, 0xb1, 0xb1, 0x11, 0x73, 0x06, 0x03, 0x0c, 0x46, 0x23, 0x8c, 0x26, 0x13, 0x4c, 0x82,
0xe6, 0xe7, 0x31, 0x9f, 0xac, 0x85, 0x05, 0xae, 0x85, 0x34, 0xb1, 0x6f, 0xf7, 0x67, 0x67, 0x67,
0x5d, 0x06, 0x83, 0x61, 0xbd, 0xa4, 0xa4, 0x44, 0x75, 0x04, 0x44, 0xe9, 0xf1, 0xb2, 0xd4, 0xa9,
0x54, 0x2a, 0xee, 0xb9, 0x75, 0x6a, 0x0a, 0xed, 0xa7, 0x4e, 0x61, 0x79, 0x66, 0x86, 0xcf, 0x53,
0x4a, 0xfd, 0x81, 0x00, 0x02, 0xa4, 0xe4, 0xb4, 0x26, 0x52, 0xcb, 0xd3, 0x9b, 0xa6, 0xe6, 0xe6,
0xe6, 0x31, 0x89, 0x1a, 0x85, 0xb8, 0xa1, 0xee, 0xee, 0x6e, 0x9e, 0x42, 0xd3, 0xd0, 0x10, 0xfa,
0x2a, 0x2a, 0xd0, 0x70, 0xe6, 0x0c, 0x14, 0x45, 0x45, 0x18, 0x19, 0x1c, 0xc4, 0xc4, 0xc4, 0xc4,
0xa1, 0xb4, 0x5a, 0x68, 0x49, 0x93, 0x93, 0x98, 0x24, 0xe9, 0x74, 0x5c, 0xba, 0x34, 0x95, 0x97,
0x97, 0xeb, 0x59, 0xfa, 0xde, 0x17, 0x45, 0x20, 0x2a, 0x24, 0x79, 0x4a, 0xa0, 0x79, 0x8d, 0x06,
0x43, 0xe5, 0xe5, 0xa8, 0x2d, 0x29, 0xe1, 0xd1, 0xb8, 0xdc, 0x1e, 0x78, 0x58, 0xfe, 0x3d, 0x1e,
0x8f, 0xd8, 0x30, 0x7e, 0xa9, 0x08, 0xd3, 0x9a, 0x88, 0xcd, 0x1f, 0xb0, 0x31, 0x4e, 0x32, 0x9b,
0xcd, 0x2e, 0x0e, 0xa2, 0xae, 0xa1, 0x97, 0x3d, 0x3d, 0x3d, 0xb0, 0xe9, 0xf5, 0x18, 0xaf, 0xab,
0x43, 0xdd, 0x95, 0x2b, 0xdc, 0x08, 0x45, 0xe8, 0x66, 0x10, 0xaa, 0xa1, 0x64, 0x1a, 0x93, 0x52,
0x98, 0x92, 0x3e, 0xd6, 0x9d, 0x82, 0x58, 0xf3, 0x84, 0x0f, 0x41, 0x91, 0x08, 0x7f, 0x49, 0x20,
0xf2, 0x76, 0x71, 0x78, 0x18, 0xf5, 0x57, 0xaf, 0x72, 0x23, 0x04, 0x49, 0x07, 0x90, 0xd7, 0x82,
0x71, 0xa5, 0xe6, 0x09, 0xae, 0xd7, 0xf6, 0x8b, 0xba, 0xdd, 0x32, 0x0a, 0x3d, 0x4b, 0xbb, 0xd7,
0x66, 0x03, 0xd9, 0xa5, 0x20, 0x58, 0x57, 0x1e, 0x82, 0x22, 0x3b, 0x3b, 0x7c, 0x7d, 0x10, 0xe8,
0x69, 0x67, 0x27, 0xba, 0x2f, 0x5c, 0x40, 0xed, 0xa5, 0x4b, 0x10, 0x9a, 0x44, 0x84, 0xa4, 0xad,
0xad, 0x25, 0xa7, 0x1e, 0xdf, 0x29, 0x2a, 0xa0, 0xb7, 0x8f, 0x20, 0xc2, 0x8c, 0x92, 0x9d, 0x1d,
0x09, 0xb9, 0xdd, 0xee, 0x43, 0x10, 0x3d, 0x10, 0xb9, 0xb7, 0xb7, 0x17, 0x6e, 0xb6, 0x8e, 0xe6,
0x94, 0x4a, 0xd4, 0x97, 0x96, 0x72, 0x63, 0x7c, 0x11, 0x27, 0xa2, 0x38, 0x5d, 0xfd, 0x33, 0xbe,
0xa8, 0x6c, 0xc0, 0xc5, 0xfa, 0x36, 0xfe, 0xfd, 0xe5, 0xae, 0x0f, 0xa0, 0x78, 0x5c, 0x8a, 0xb3,
0xad, 0x6f, 0x22, 0x1a, 0x8d, 0x22, 0xba, 0xbb, 0x8b, 0x5d, 0x09, 0xb1, 0xfa, 0x26, 0x40, 0xec,
0x23, 0xf2, 0x88, 0x40, 0xe4, 0xad, 0x65, 0x74, 0x14, 0x95, 0x27, 0x4f, 0xf2, 0x28, 0x93, 0xa3,
0xb8, 0x75, 0xff, 0x11, 0xaa, 0xdb, 0xd4, 0x68, 0x19, 0x1a, 0xe7, 0x9e, 0x5e, 0x56, 0xe6, 0x22,
0x14, 0x09, 0xf2, 0x31, 0x16, 0x8b, 0xa5, 0x28, 0x1e, 0x8f, 0x73, 0xd1, 0xbd, 0x08, 0x22, 0x4f,
0xe8, 0x87, 0x04, 0x22, 0xe3, 0x9e, 0xd5, 0x55, 0xdc, 0x61, 0xa9, 0xa3, 0x1c, 0x13, 0x84, 0xea,
0x47, 0xf3, 0x5a, 0xa3, 0x19, 0x63, 0x06, 0x33, 0xe6, 0x9e, 0xad, 0x72, 0xef, 0x09, 0x60, 0xdd,
0x7c, 0x82, 0x8b, 0x0f, 0xde, 0x13, 0x0d, 0x4b, 0x49, 0x04, 0x51, 0x78, 0x14, 0x3a, 0x81, 0x28,
0x25, 0x42, 0x74, 0x34, 0x6e, 0x25, 0x20, 0x04, 0x25, 0x67, 0xe8, 0x3b, 0xfa, 0x9e, 0x3c, 0xed,
0xd4, 0xdf, 0x42, 0x71, 0x73, 0x21, 0xda, 0xa6, 0x6e, 0x70, 0x83, 0x7b, 0x7b, 0x7b, 0x92, 0xf2,
0x7a, 0xbd, 0xa9, 0xa0, 0xbe, 0xbe, 0x3e, 0xd1, 0x20, 0xdd, 0x0b, 0x4d, 0x42, 0xf0, 0x74, 0x88,
0xe0, 0xed, 0x39, 0xf9, 0x7d, 0x54, 0xfd, 0xaa, 0xe1, 0xaa, 0xbe, 0xd3, 0x8b, 0xfe, 0xa2, 0x62,
0xec, 0xef, 0xef, 0xa7, 0x28, 0x05, 0x44, 0xe2, 0xc6, 0x19, 0x88, 0x0c, 0xaa, 0xd5, 0x6a, 0x50,
0xed, 0x78, 0x84, 0x69, 0x10, 0xa7, 0xdf, 0x06, 0x7f, 0xd8, 0x85, 0xf8, 0x5e, 0x1c, 0x65, 0x75,
0xf7, 0x8e, 0x18, 0x3e, 0x38, 0x38, 0x48, 0x11, 0x5b, 0xe8, 0x09, 0x10, 0xfb, 0xb1, 0x00, 0x22,
0xcf, 0xe9, 0x9e, 0x40, 0xd1, 0x44, 0x93, 0x08, 0x73, 0x42, 0x24, 0x9a, 0xc5, 0x16, 0xa8, 0x9e,
0xfe, 0x88, 0x1f, 0x34, 0x5f, 0x61, 0xd2, 0xd6, 0x2b, 0x69, 0x5c, 0xb8, 0x52, 0x40, 0xb1, 0x64,
0x50, 0xc2, 0x73, 0x01, 0xc4, 0xd7, 0x01, 0xdb, 0xd1, 0x4d, 0xed, 0x5d, 0x68, 0xed, 0x9f, 0xe1,
0xba, 0xa9, 0xac, 0xe4, 0x75, 0x89, 0xc5, 0x77, 0x45, 0x48, 0xeb, 0x5f, 0x93, 0xf8, 0x49, 0xa9,
0x41, 0x8b, 0x46, 0x2b, 0x46, 0x46, 0xf5, 0xa1, 0x51, 0x12, 0x44, 0xc6, 0xe9, 0x99, 0x40, 0x34,
0xc7, 0xd3, 0xc7, 0xd6, 0xd2, 0xa6, 0xc5, 0x0a, 0x83, 0xc5, 0x01, 0xa3, 0xd5, 0x89, 0xd6, 0xf1,
0x7a, 0x18, 0x1d, 0x7f, 0x8b, 0x10, 0xba, 0x6e, 0x77, 0xfe, 0x89, 0xd2, 0x5f, 0x1e, 0xe0, 0xfb,
0xf6, 0x01, 0xde, 0xa5, 0xb4, 0xc3, 0xd0, 0xde, 0x48, 0xeb, 0x6f, 0x7d, 0x23, 0xb1, 0x05, 0xc5,
0x58, 0x3a, 0x24, 0x41, 0x6c, 0x14, 0x9e, 0x85, 0xe2, 0x93, 0x97, 0x8f, 0xe6, 0x7f, 0x83, 0x7c,
0xe0, 0x13, 0x96, 0xba, 0x2f, 0xf1, 0x8f, 0x6f, 0x91, 0x83, 0xe8, 0x1d, 0x19, 0x75, 0xb2, 0x03,
0xd3, 0xc6, 0xb6, 0x1f, 0xb6, 0x91, 0x62, 0x69, 0x69, 0x89, 0x9f, 0x6d, 0x9a, 0x91, 0xc7, 0x1b,
0xb2, 0xec, 0xec, 0xec, 0x8f, 0xe4, 0x72, 0x79, 0x03, 0xa9, 0xa6, 0xa6, 0xc6, 0x9e, 0x0c, 0x12,
0x22, 0x15, 0x40, 0x42, 0xbb, 0x06, 0x23, 0x6e, 0x04, 0x22, 0x2e, 0x5c, 0xeb, 0xf9, 0x10, 0x72,
0xd5, 0xb7, 0xfc, 0x1d, 0xed, 0x1e, 0xab, 0x6c, 0xfd, 0x8d, 0x8d, 0x8d, 0x61, 0x7a, 0x7a, 0x9a,
0x1f, 0x90, 0xab, 0xab, 0x76, 0x0c, 0x8f, 0x8e, 0x44, 0xdf, 0xc9, 0xc9, 0xc9, 0x4d, 0x39, 0xd7,
0x15, 0x0a, 0xc5, 0xc3, 0x17, 0x01, 0x09, 0x29, 0x73, 0x04, 0xac, 0xb8, 0xfe, 0xc7, 0x4d, 0x98,
0x9e, 0x6b, 0xb1, 0x46, 0x5b, 0xd7, 0xdc, 0x1c, 0xac, 0x56, 0x2b, 0x7f, 0xbf, 0xb3, 0x13, 0x41,
0x8f, 0x5a, 0xbd, 0x93, 0x93, 0x93, 0xf3, 0x2e, 0x3f, 0xf8, 0x92, 0x41, 0x65, 0x65, 0x65, 0xed,
0x2b, 0x2b, 0x2b, 0x5e, 0xbb, 0xdd, 0xee, 0x6b, 0x6a, 0x6a, 0x0a, 0x49, 0x81, 0x92, 0x5b, 0x78,
0x63, 0x6b, 0x05, 0xd3, 0xf6, 0x41, 0x18, 0xec, 0x5a, 0x2c, 0x2f, 0x2f, 0x63, 0x88, 0x1d, 0x98,
0xd4, 0xa5, 0x94, 0xc2, 0xe6, 0xd6, 0x7b, 0xa1, 0xfc, 0xfc, 0xfc, 0xb7, 0xc4, 0x13, 0x36, 0xe5,
0xb8, 0x95, 0xc9, 0x5e, 0x63, 0x7a, 0x83, 0x94, 0x95, 0x95, 0x75, 0xee, 0xbf, 0x40, 0x74, 0xd1,
0x1c, 0x15, 0xdd, 0x62, 0xb1, 0xf0, 0xdd, 0x84, 0x0e, 0x48, 0x79, 0x55, 0xd5, 0xb3, 0xbc, 0xbc,
0xbc, 0x57, 0x53, 0x6c, 0x4b, 0xfd, 0x35, 0x22, 0xb1, 0xda, 0x9d, 0x7e, 0x51, 0x10, 0xd5, 0x87,
0x22, 0x52, 0x0f, 0x3c, 0xdc, 0x3f, 0x5b, 0x7c, 0xbe, 0x8f, 0x39, 0xfa, 0xd2, 0x91, 0xbf, 0x5b,
0xc7, 0x81, 0x32, 0x32, 0x32, 0x3e, 0xee, 0xe8, 0xe8, 0x18, 0x67, 0xc7, 0xbb, 0x4e, 0x10, 0x3b,
0xaf, 0x24, 0xd5, 0xa5, 0x54, 0xe9, 0x7e, 0xbf, 0x7b, 0x57, 0xf7, 0xe9, 0xe7, 0x9f, 0x5d, 0x3b,
0xce, 0xde, 0xbf, 0xf0, 0x98, 0xa8, 0x79, 0x89, 0xa3, 0xb6, 0xe9, 0x00, 0x00, 0x00, 0x00, 0x49,
0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE add_hierarchical_subsheet_xpm[1] = {{ png, sizeof( png ), "add_hierarchical_subsheet_xpm" }};
......
bitmaps_png/cpp_26/list_nets.cpp 0 → 100644
View file @ 441a8d3d
/* Do not modify this file, it was automatically generated by the
* PNG2cpp CMake script, using a *.png file as input.
*/
#include <bitmaps.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, 0x3a, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xbd, 0x94, 0x3f, 0x68, 0x13,
0x51, 0x1c, 0xc7, 0xdf, 0xa5, 0x43, 0xc0, 0x14, 0xeb, 0xe8, 0x18, 0x6e, 0x70, 0x76, 0x30, 0x43,
0x08, 0xb1, 0xc5, 0x16, 0x74, 0xb0, 0xa5, 0x94, 0x0c, 0x0d, 0x55, 0x32, 0x78, 0xe2, 0xd2, 0x82,
0x52, 0x08, 0xa5, 0x90, 0x90, 0x10, 0xcc, 0x35, 0x90, 0xbb, 0xa3, 0x1d, 0x4c, 0x6a, 0x23, 0x15,
0x85, 0x90, 0xa1, 0xe0, 0x94, 0xc9, 0x2d, 0x43, 0x1a, 0x50, 0xe8, 0x22, 0xe2, 0x98, 0x0e, 0x3d,
0x34, 0x84, 0x52, 0x6b, 0x0c, 0x09, 0xa9, 0xf9, 0xf9, 0x7b, 0xd2, 0xab, 0x77, 0x47, 0x8e, 0x77,
0x97, 0xfe, 0x19, 0x3e, 0xcb, 0xfd, 0xde, 0x97, 0x0f, 0xf7, 0xf8, 0xbd, 0x2f, 0x01, 0x00, 0x62,
0x46, 0x25, 0x24, 0x82, 0x1c, 0x22, 0xca, 0xa0, 0xf9, 0x30, 0x67, 0xad, 0xc2, 0xfb, 0x08, 0x20,
0x27, 0xc8, 0x18, 0x43, 0x64, 0xeb, 0xac, 0x55, 0xf8, 0xfb, 0x69, 0x98, 0x72, 0x93, 0x21, 0xb2,
0x75, 0x76, 0xe0, 0xc7, 0x03, 0x0c, 0x7f, 0x74, 0xbb, 0x61, 0x9f, 0xe3, 0x2e, 0x56, 0x44, 0x36,
0x88, 0x9b, 0x6c, 0x93, 0x1b, 0x14, 0xdf, 0x03, 0xdf, 0xa3, 0xe5, 0xd9, 0x99, 0xde, 0xfb, 0xad,
0x2d, 0x88, 0x3d, 0x5e, 0x80, 0xd9, 0xfb, 0x77, 0x25, 0x6d, 0x36, 0x88, 0xaf, 0x1e, 0xf2, 0xe3,
0xdb, 0x35, 0x02, 0x94, 0xf4, 0x3d, 0x72, 0xeb, 0x6c, 0xf6, 0x8e, 0x78, 0x0c, 0x22, 0xf2, 0x96,
0x3c, 0x41, 0x8e, 0x11, 0xa0, 0x4c, 0x3e, 0x9b, 0x04, 0x55, 0x55, 0xcf, 0x88, 0x44, 0x23, 0xc0,
0xbd, 0xe6, 0x40, 0x9b, 0x3b, 0xa0, 0x8f, 0xc8, 0x7a, 0xd1, 0xae, 0x36, 0x74, 0x6d, 0xba, 0x60,
0x29, 0xbe, 0x64, 0x10, 0xed, 0x7c, 0xd8, 0x01, 0x4f, 0xcc, 0x33, 0x8c, 0x88, 0xd2, 0x26, 0x09,
0xe2, 0xd2, 0x44, 0x33, 0xc8, 0x01, 0x72, 0x44, 0x19, 0x7f, 0x3a, 0xde, 0xd3, 0x8b, 0xe6, 0x9f,
0xcf, 0xff, 0xe1, 0xde, 0x70, 0x47, 0xda, 0xdc, 0xcc, 0x68, 0x9e, 0xf4, 0xaf, 0xe7, 0x08, 0x50,
0xb8, 0x6d, 0xf2, 0x53, 0x37, 0x53, 0xf1, 0x0a, 0x57, 0x2c, 0x97, 0x21, 0x10, 0x08, 0x04, 0x57,
0xa6, 0xa6, 0xba, 0xeb, 0xab, 0xab, 0x10, 0x9b, 0x9e, 0x86, 0x85, 0x60, 0xf0, 0xc5, 0xa5, 0x6d,
0x1d, 0x0d, 0xef, 0x8d, 0x8c, 0x5c, 0xfe, 0x7a, 0x5f, 0xd9, 0x3b, 0xb2, 0x0a, 0x27, 0x12, 0x09,
0x1f, 0x32, 0xa1, 0xe7, 0x13, 0xcf, 0x1f, 0x7e, 0xf6, 0x7a, 0x81, 0xf2, 0x4a, 0x10, 0xe6, 0xcc,
0xf3, 0x53, 0x6e, 0xdb, 0x16, 0xe1, 0xe1, 0x3b, 0xc9, 0x64, 0xf2, 0x44, 0x92, 0xa4, 0x5f, 0x7a,
0xd6, 0x45, 0xb1, 0xbf, 0x21, 0x8a, 0x40, 0x91, 0x25, 0xa9, 0x65, 0x9e, 0x53, 0x68, 0xce, 0x89,
0x68, 0x42, 0x96, 0xe5, 0x56, 0xb7, 0xdb, 0x05, 0xa7, 0x88, 0xa2, 0xd8, 0xbe, 0x5a, 0x91, 0xbe,
0x82, 0xac, 0x6a, 0x65, 0xf1, 0xe5, 0xe2, 0x43, 0x14, 0xfd, 0xa6, 0xc1, 0x50, 0x28, 0x04, 0x7e,
0xbf, 0x9f, 0x49, 0x38, 0x1c, 0xfe, 0x2f, 0x32, 0x57, 0x90, 0x15, 0xde, 0xbc, 0x17, 0xd6, 0x94,
0xb5, 0x7f, 0xc1, 0x46, 0xa3, 0x01, 0xf5, 0x7a, 0x9d, 0x49, 0xb3, 0xd9, 0x34, 0x88, 0x76, 0xed,
0xd4, 0x89, 0x5e, 0x14, 0x8d, 0x46, 0x41, 0x10, 0x04, 0x26, 0xa9, 0x54, 0xca, 0x20, 0x32, 0x54,
0x90, 0x55, 0xad, 0xf0, 0x79, 0xbe, 0x85, 0xa2, 0x3e, 0x0d, 0x56, 0x2a, 0x15, 0x28, 0x97, 0xcb,
0x4c, 0x6a, 0xb5, 0xda, 0xf9, 0x96, 0xa1, 0x58, 0x2c, 0x42, 0x26, 0x93, 0x61, 0x92, 0xcb, 0xe5,
0xa0, 0xd3, 0xe9, 0x0c, 0x2f, 0x2a, 0x95, 0x4a, 0xa0, 0x28, 0x0a, 0x93, 0x42, 0xa1, 0x70, 0xbe,
0x3f, 0xa2, 0x57, 0x62, 0xe7, 0xea, 0xaa, 0xd5, 0x2a, 0x53, 0xf4, 0x45, 0x27, 0x1a, 0x33, 0x8b,
0xe2, 0xf1, 0xb8, 0xad, 0x65, 0xa0, 0x4b, 0xc3, 0x12, 0xcd, 0x21, 0x7b, 0xc8, 0xb2, 0xae, 0xe7,
0x2e, 0xbe, 0x19, 0x06, 0x41, 0x45, 0xd9, 0x6c, 0xb6, 0x4d, 0xdf, 0x90, 0x53, 0xd2, 0xe9, 0x74,
0xc7, 0x89, 0x88, 0xc7, 0x77, 0x71, 0x8c, 0x05, 0xd9, 0x73, 0x0a, 0xe6, 0x9a, 0x7f, 0x01, 0x31,
0x67, 0x9a, 0xae, 0x6b, 0x45, 0x2e, 0x01, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae,
0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE list_nets_xpm[1] = {{ png, sizeof( png ), "list_nets_xpm" }};
//EOF
bitmaps_png/sources/add_hierarchical_subsheet.svg
View file @ 441a8d3d
......@@ -13,7 +13,7 @@
version="1.1"
viewBox="0 0 48 48"
id="svg2"
inkscape:version="0.47 r22583"
inkscape:version="0.48.4 r9939"
sodipodi:docname="add_hierarchical_subsheet.svg">
<metadata
id="metadata102">
......@@ -23,7 +23,7 @@
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
......@@ -36,15 +36,15 @@
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="640"
inkscape:window-height="495"
inkscape:window-width="1492"
inkscape:window-height="841"
id="namedview100"
showgrid="false"
inkscape:zoom="4.9166667"
inkscape:cx="24"
inkscape:cx="-9.1525423"
inkscape:cy="23.59322"
inkscape:window-x="0"
inkscape:window-y="25"
inkscape:window-x="74"
inkscape:window-y="52"
inkscape:window-maximized="0"
inkscape:current-layer="svg2" />
<defs
......@@ -188,90 +188,289 @@
offset="1"
id="stop63" />
</linearGradient>
<radialGradient
inkscape:collect="always"
xlink:href="#j"
id="radialGradient3385"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.875,0,0,0.85714,10,17.143)"
cx="102"
cy="112.3"
r="139.56" />
<radialGradient
inkscape:collect="always"
xlink:href="#k"
id="radialGradient3387"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.85638,0,0,0.84156,11.191,18.14)"
cx="99.081"
cy="109.33"
r="139.56" />
<linearGradient
inkscape:collect="always"
xlink:href="#i"
id="linearGradient3389"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.875,0,0,0.85714,10,17.143)"
x1="96"
y1="104"
x2="86.572"
y2="94.104" />
<radialGradient
inkscape:collect="always"
xlink:href="#j"
id="radialGradient3403"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.875,0,0,0.85714,10,17.143)"
cx="102"
cy="112.3"
r="139.56" />
<radialGradient
inkscape:collect="always"
xlink:href="#k"
id="radialGradient3405"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.85638,0,0,0.84156,11.191,18.14)"
cx="99.081"
cy="109.33"
r="139.56" />
<linearGradient
inkscape:collect="always"
xlink:href="#i"
id="linearGradient3407"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(0.875,0,0,0.85714,10,17.143)"
x1="96"
y1="104"
x2="86.572"
y2="94.104" />
<filter
color-interpolation-filters="sRGB"
inkscape:collect="always"
id="filter3945-1">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.05617153"
id="feGaussianBlur3947-7" />
</filter>
<filter
color-interpolation-filters="sRGB"
inkscape:collect="always"
id="filter3941-4">
<feGaussianBlur
inkscape:collect="always"
stdDeviation="0.05617153"
id="feGaussianBlur3943-0" />
</filter>
</defs>
<g
transform="matrix(.35996 0 0 .33328 3.0568 3.6295)"
id="g65">
<use
xlink:href="#l"
transform="translate(-12,-12)"
height="128"
width="128"
y="0"
id="use67"
x="0"
id="use67" />
y="0"
width="128"
height="128"
transform="translate(-4.9688493,-4.474196)"
xlink:href="#l" />
<g
id="l"
transform="translate(-4,-8)">
transform="matrix(0.41407077,0,0,0.37284967,-3.2763202,-2.8011047)"
id="l">
<path
opacity=".6"
d="m23 25v96h53.525c0.464 0 30.475-29.398 30.475-29.853v-66.147h-84z"
style="opacity:0.6;filter:url(#g)"
inkscape:connector-curvature="0"
id="path70"
transform="matrix(1.0476,0,0,1.0417,-2.0952,-4.0417)"
filter="url(#g)"
id="path70" />
d="m 23,25 v 96 H 76.525 C 76.989,121 107,91.602 107,91.147 V 25 H 23 z" />
<path
fill="url(#j)"
d="m24 24v96h53.525c0.464 0 30.475-29.398 30.475-29.853v-66.147h-84z"
id="path72" />
inkscape:connector-curvature="0"
style="fill:url(#radialGradient3403)"
id="path72"
d="m 24,24 v 96 H 77.525 C 77.989,120 108,90.602 108,90.147 V 24 H 24 z" />
<path
fill="url(#k)"
d="m26.606 25.714c-0.47187 0-0.85638 0.37786-0.85638 0.84156v90.888c0 0.46455 0.38452 0.84157 0.85638 0.84157h50.674c0.22523 0 0.44618-0.0892 0.60546-0.24658l28.115-27.618c0.16013-0.15737 0.25092-0.37365 0.25092-0.59498v-63.262c0-0.4637-0.38366-0.84156-0.85639-0.84156h-78.787z"
id="path74" />
inkscape:connector-curvature="0"
style="fill:url(#radialGradient3405)"
id="path74"
d="m 26.606,25.714 c -0.47187,0 -0.85638,0.37786 -0.85638,0.84156 v 90.888 c 0,0.46455 0.38452,0.84157 0.85638,0.84157 H 77.28 c 0.22523,0 0.44618,-0.0892 0.60546,-0.24658 l 28.115,-27.618 c 0.16013,-0.15737 0.25092,-0.37365 0.25092,-0.59498 v -63.262 c 0,-0.4637 -0.38366,-0.84156 -0.85639,-0.84156 h -78.787 z" />
<path
opacity=".5"
filter="url(#h)"
d="m76.526 120s11.662-9 16.474-13.714c4.812-4.72 14-16.143 14-16.143s-8 5.853-24 5.853c0 16-6.4745 24-6.4745 24z"
id="path76" />
style="opacity:0.5;filter:url(#h)"
inkscape:connector-curvature="0"
id="path76"
d="m 76.526,120 c 0,0 11.662,-9 16.474,-13.714 4.812,-4.72 14,-16.143 14,-16.143 0,0 -8,5.853 -24,5.853 0,16 -6.4745,24 -6.4745,24 z" />
<path
fill="url(#i)"
d="m77.526 120s11.662-9 16.474-13.714c4.812-4.72 14-16.143 14-16.143s-8 5.853-24 5.853c0 16-6.4745 24-6.4745 24z"
id="path78" />
inkscape:connector-curvature="0"
style="fill:url(#linearGradient3407)"
id="path78"
d="m 77.526,120 c 0,0 11.662,-9 16.474,-13.714 4.812,-4.72 14,-16.143 14,-16.143 0,0 -8,5.853 -24,5.853 0,16 -6.4745,24 -6.4745,24 z" />
</g>
<g
transform="translate(8,4)"
id="g80">
id="g3325-9"
transform="translate(55.627118,-0.30508476)">
<path
opacity=".6"
d="m23 25v96h53.525c0.464 0 30.475-29.398 30.475-29.853v-66.147h-84z"
transform="matrix(1.0476,0,0,1.0417,-2.0952,-4.0417)"
filter="url(#g)"
id="path82" />
sodipodi:nodetypes="cccc"
inkscape:connector-curvature="0"
id="path2990-4"
d="m -44.404022,8.4646518 0,14.5961202 12.928636,-7.29806 z"
style="fill:#fafafa;fill-opacity:1;stroke:#800000;stroke-width:1.08151615;stroke-linecap:butt;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path3766-8"
d="m -31.475386,15.762712 2.742438,0"
style="fill:#f0f0f0;fill-opacity:1;stroke:#800000;stroke-width:1.08151615;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
fill="url(#j)"
d="m24 24v96h53.525c0.464 0 30.475-29.398 30.475-29.853v-66.147h-84z"
id="path84" />
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path3768-8"
d="m -44.404022,13.108872 -3.134215,0"
style="fill:#f0f0f0;fill-opacity:1;stroke:#800000;stroke-width:1.08151615;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
fill="url(#k)"
d="m26.606 25.714c-0.47187 0-0.85638 0.37786-0.85638 0.84156v90.888c0 0.46455 0.38452 0.84157 0.85638 0.84157h50.674c0.22523 0 0.44618-0.0892 0.60546-0.24658l28.115-27.618c0.16013-0.15737 0.25092-0.37365 0.25092-0.59498v-63.262c0-0.4637-0.38366-0.84156-0.85639-0.84156h-78.787z"
id="path86" />
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path3770-2"
d="m -44.404022,18.416552 -3.134215,0"
style="fill:#f0f0f0;fill-opacity:1;stroke:#800000;stroke-width:1.08151615;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
opacity=".5"
filter="url(#h)"
d="m76.526 120s11.662-9 16.474-13.714c4.812-4.72 14-16.143 14-16.143s-8 5.853-24 5.853c0 16-6.4745 24-6.4745 24z"
id="path88" />
transform="matrix(0.7835537,0,0,0.66346002,-48.321791,7.1377318)"
style="opacity:0.75;fill:none;stroke:#800000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter3945-1)"
d="M 12.265694,2.5 23.5,13.734306"
id="path3767-4"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
fill="url(#i)"
d="m77.526 120s11.662-9 16.474-13.714c4.812-4.72 14-16.143 14-16.143s-8 5.853-24 5.853c0 16-6.4745 24-6.4745 24z"
id="path90" />
transform="matrix(0.7835537,0,0,0.66346002,-48.321791,7.1377318)"
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path3769-5"
d="M 23.5,2.5 12.265694,13.734306"
style="opacity:0.75;fill:none;stroke:#800000;stroke-width:0;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;filter:url(#filter3941-4)" />
</g>
<g
id="g80"
transform="matrix(0.41407077,0,0,0.37284967,2.9128681,2.2832608)">
<path
style="opacity:0.6;filter:url(#g)"
inkscape:connector-curvature="0"
id="path82"
transform="matrix(1.0476,0,0,1.0417,-2.0952,-4.0417)"
d="m 23,25 v 96 H 76.525 C 76.989,121 107,91.602 107,91.147 V 25 H 23 z" />
<path
inkscape:connector-curvature="0"
style="fill:url(#radialGradient3385)"
id="path84"
d="m 24,24 v 96 H 77.525 C 77.989,120 108,90.602 108,90.147 V 24 H 24 z" />
<path
inkscape:connector-curvature="0"
style="fill:url(#radialGradient3387)"
id="path86"
d="m 26.606,25.714 c -0.47187,0 -0.85638,0.37786 -0.85638,0.84156 v 90.888 c 0,0.46455 0.38452,0.84157 0.85638,0.84157 H 77.28 c 0.22523,0 0.44618,-0.0892 0.60546,-0.24658 l 28.115,-27.618 c 0.16013,-0.15737 0.25092,-0.37365 0.25092,-0.59498 v -63.262 c 0,-0.4637 -0.38366,-0.84156 -0.85639,-0.84156 h -78.787 z" />
<path
style="opacity:0.5;filter:url(#h)"
inkscape:connector-curvature="0"
id="path88"
d="m 76.526,120 c 0,0 11.662,-9 16.474,-13.714 4.812,-4.72 14,-16.143 14,-16.143 0,0 -8,5.853 -24,5.853 0,16 -6.4745,24 -6.4745,24 z" />
<path
inkscape:connector-curvature="0"
style="fill:url(#linearGradient3389)"
id="path90"
d="m 77.526,120 c 0,0 11.662,-9 16.474,-13.714 4.812,-4.72 14,-16.143 14,-16.143 0,0 -8,5.853 -24,5.853 0,16 -6.4745,24 -6.4745,24 z" />
</g>
<g
transform="matrix(3.433,0,0,3.1874,24.180386,21.397169)"
id="g92">
<path
d="M 12,5.5 9.4826,4.1505 6.9438,5.4592 7.4494,2.648 5.4202,0.6379 8.25,0.25 9.5347,-2.301 10.778,0.2704 13.601,0.70392 11.54,2.68102 z"
transform="matrix(0.86499,0,0,0.86499,3.3638,-4.5167)"
id="path94"
style="fill:#afaf00" />
<path
d="M 12,5.5 9.4826,4.1505 6.9438,5.4592 7.4494,2.648 5.4202,0.6379 8.25,0.25 9.5347,-2.301 10.778,0.2704 13.601,0.70392 11.54,2.68102 z"
transform="matrix(0.61624,0,0,0.61624,5.7296,-4.1188)"
id="path96"
style="fill:#ebeb00" />
<path
d="M 12,5.5 9.4826,4.1505 6.9438,5.4592 7.4494,2.648 5.4202,0.6379 8.25,0.25 9.5347,-2.301 10.778,0.2704 13.601,0.70392 11.54,2.68102 z"
transform="matrix(0.3815,0,0,0.3815,7.9622,-3.7434)"
id="path98"
style="fill:#ffff00" />
id="g4443"
transform="matrix(1.7182008,0,0,1.2501281,125.49259,-9.2593964)">
<path
inkscape:connector-curvature="0"
id="path576"
d="m -58.047066,33.822057 h -3.413668"
style="color:#000000;fill:#4e9a06;fill-opacity:0.75;fill-rule:evenodd;stroke:#204a87;stroke-width:0.76987934;stroke-linecap:round;stroke-linejoin:round" />
<path
inkscape:connector-curvature="0"
id="path578"
d="m -58.083021,30.559582 v 6.668227"
style="color:#000000;fill:#4e9a06;fill-opacity:0.75;fill-rule:evenodd;stroke:#4e9a06;stroke-width:0.76987934;stroke-linecap:round;stroke-linejoin:round" />
<path
inkscape:connector-curvature="0"
id="path580"
d="m -55.202482,37.659269 v 2.000468"
style="color:#000000;fill:#4e9a06;fill-opacity:0.75;fill-rule:evenodd;stroke:#204a87;stroke-width:0.76987934;stroke-linecap:round;stroke-linejoin:round" />
<path
inkscape:connector-curvature="0"
id="path582"
d="m -55.202482,37.659269 -2.844584,-2.000414"
style="color:#000000;fill:#4e9a06;fill-opacity:0.75;fill-rule:evenodd;stroke:#4e9a06;stroke-width:0.76987934;stroke-linecap:round;stroke-linejoin:round" />
<path
inkscape:connector-curvature="0"
id="path584"
d="m -54.064314,39.875412 h -2.275778"
style="color:#000000;fill:#4e9a06;fill-opacity:0.75;fill-rule:evenodd;stroke:#4e9a06;stroke-width:0.76987934;stroke-linecap:round;stroke-linejoin:round" />
<path
inkscape:connector-curvature="0"
id="path586"
d="M -55.202482,30.991042 V 26.990215"
style="color:#000000;fill:#4e9a06;fill-opacity:0.75;fill-rule:evenodd;stroke:#204a87;stroke-width:0.76987934;stroke-linecap:round;stroke-linejoin:round" />
<path
inkscape:connector-curvature="0"
id="path588"
d="m -55.202482,30.991042 -2.844751,2.000468"
style="color:#000000;fill:#4e9a06;fill-opacity:0.75;fill-rule:evenodd;stroke:#4e9a06;stroke-width:0.76987934;stroke-linecap:round;stroke-linejoin:round" />
<path
inkscape:connector-curvature="0"
id="path590"
d="m -55.094617,20.352907 v 2.000468"
style="color:#000000;fill:#4e9a06;fill-opacity:0.75;fill-rule:evenodd;stroke:#204a87;stroke-width:0.76987934;stroke-linecap:round;stroke-linejoin:round" />
<path
inkscape:connector-curvature="0"
id="path592"
d="m -54.130306,26.990215 h -2.126616 v -4.667813 h 2.126097 v 4.667813"
style="color:#000000;fill:none;stroke:#4e9a06;stroke-width:1.05235922;stroke-linecap:round;stroke-linejoin:round" />
<path
inkscape:connector-curvature="0"
id="path594"
d="m -55.202482,28.823822 h 4.117959"
style="color:#000000;fill:#4e9a06;fill-opacity:0.75;fill-rule:evenodd;stroke:#204a87;stroke-width:0.73229092;stroke-linecap:round;stroke-linejoin:round" />
<path
inkscape:connector-curvature="0"
id="path596"
d="m -61.18439,22.809615 h 3.029155"
style="color:#000000;fill:none;stroke:#29647e;stroke-width:1.03190243;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
id="path598"
d="m -61.151966,24.898089 h 2.901145"
style="color:#000000;fill:none;stroke:#29647e;stroke-width:1;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
inkscape:connector-curvature="0"
id="path600"
d="m -53.495509,33.658441 h 2.844753"
style="color:#000000;fill:none;stroke:#29647e;stroke-width:0.76987934;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
<path
inkscape:connector-curvature="0"
id="path602"
d="m -53.495509,34.99187 h 2.844753"
style="color:#000000;fill:none;stroke:#29647e;stroke-width:0.76987934;stroke-linecap:round;stroke-linejoin:round;stroke-opacity:1" />
<path
sodipodi:nodetypes="cccc"
inkscape:connector-curvature="0"
id="path604"
d="m -55.166528,37.741679 -0.859245,-2.388772 -1.12329,3 z"
style="color:#000000;fill:#4e9a06;fill-rule:evenodd" />
<path
style="fill:#a40000"
inkscape:connector-curvature="0"
id="path606"
d="m -61.463082,33.786103 a 0.703681,0.67693359 0 0 1 -1.407362,0 0.703681,0.67693359 0 1 1 1.407362,0 z" />
<path
inkscape:connector-curvature="0"
id="path608"
d="m -55.203985,19.806641 h 4.551558"
style="color:#000000;fill:#4e9a06;fill-opacity:0.75;fill-rule:evenodd;stroke:#204a87;stroke-width:0.76987934;stroke-linecap:round;stroke-linejoin:round" />
<path
style="fill:#a40000"
inkscape:connector-curvature="0"
id="path610"
d="m -50.430402,28.859777 a 0.70368138,0.67693397 0 0 1 -1.407362,0 0.70368138,0.67693397 0 1 1 1.407362,0 z" />
<path
style="fill:#a40000"
inkscape:connector-curvature="0"
id="path612"
d="m -48.993962,19.806641 a 0.70368104,0.67693364 0 0 1 -1.407362,0 0.70368104,0.67693364 0 1 1 1.407362,0 z" />
</g>
</svg>
bitmaps_png/sources/list_nets.svg 0 → 100644
View file @ 441a8d3d
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="26"
width="26"
version="1.1"
id="svg2"
inkscape:version="0.48.4 r9939"
sodipodi:docname="list_nets.svg">
<metadata
id="metadata40">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title />
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="995"
inkscape:window-height="567"
id="namedview38"
showgrid="true"
inkscape:snap-to-guides="false"
inkscape:snap-grids="true"
inkscape:zoom="8.1181296"
inkscape:cx="4.378389"
inkscape:cy="20.862016"
inkscape:window-x="296"
inkscape:window-y="85"
inkscape:window-maximized="0"
inkscape:current-layer="svg2">
<inkscape:grid
type="xygrid"
id="grid3017"
empspacing="2"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true"
spacingx="0.5px"
spacingy="0.5px" />
</sodipodi:namedview>
<defs
id="defs4">
<radialGradient
id="u"
xlink:href="#s"
gradientUnits="userSpaceOnUse"
cy="43.5"
cx="4.993"
gradientTransform="matrix(2.0038,0,0,1.4,27.988,-17.4)"
r="2.5" />
<linearGradient
id="s">
<stop
offset="0"
id="stop92" />
<stop
stop-opacity="0"
offset="1"
id="stop94" />
</linearGradient>
<radialGradient
id="v"
xlink:href="#s"
gradientUnits="userSpaceOnUse"
cy="43.5"
cx="4.993"
gradientTransform="matrix(2.0038,0,0,1.4,-20.012,-104.4)"
r="2.5" />
<linearGradient
id="linearGradient4201">
<stop
offset="0"
id="stop4203" />
<stop
stop-opacity="0"
offset="1"
id="stop4205" />
</linearGradient>
<linearGradient
id="t"
y2="39.999001"
gradientUnits="userSpaceOnUse"
x2="25.058001"
y1="47.028"
x1="25.058001">
<stop
stop-opacity="0"
offset="0"
id="stop83" />
<stop
offset=".5"
id="stop85" />
<stop
stop-opacity="0"
offset="1"
id="stop87" />
</linearGradient>
<radialGradient
id="ae"
gradientUnits="userSpaceOnUse"
cy="35.356998"
cx="-30.25"
gradientTransform="matrix(3.9957,0,0,1.935,0.62141,28.833)"
r="18">
<stop
stop-color="#f6f6f5"
offset="0"
id="stop78" />
<stop
stop-color="#d3d7cf"
offset="1"
id="stop80" />
</radialGradient>
<linearGradient
id="ai"
y2="-22.502001"
gradientUnits="userSpaceOnUse"
x2="-62.75"
gradientTransform="translate(-90,60)"
y1="49.021"
x1="-47.5">
<stop
stop-color="#888a85"
offset="0"
id="stop73" />
<stop
stop-color="#babdb6"
offset="1"
id="stop75" />
</linearGradient>
<radialGradient
id="ac"
gradientUnits="userSpaceOnUse"
cy="5.3000002"
cx="4"
gradientTransform="matrix(1.886,0,0,1.1765,-3.5441,-4.2353)"
r="17">
<stop
stop-color="#fff"
offset="0"
id="stop68" />
<stop
stop-color="#fff"
stop-opacity="0"
offset="1"
id="stop70" />
</radialGradient>
<linearGradient
id="aj"
y2="67.799004"
gradientUnits="userSpaceOnUse"
x2="61.181"
gradientTransform="translate(-180,0)"
y1="70.751999"
x1="58.282001">
<stop
offset="0"
id="stop63" />
<stop
stop-opacity="0"
offset="1"
id="stop65" />
</linearGradient>
<radialGradient
id="ad"
gradientUnits="userSpaceOnUse"
cy="10.108"
cx="-26.305"
gradientTransform="matrix(0.40734,-0.27983,0.75103,1.0932,-115.18,51.562)"
r="7.0421">
<stop
stop-color="#fff"
offset="0"
id="stop56" />
<stop
stop-color="#fff"
offset=".47534"
id="stop58" />
<stop
stop-color="#fff"
stop-opacity="0"
offset="1"
id="stop60" />
</radialGradient>
<linearGradient
id="ah"
y2="14.07"
gradientUnits="userSpaceOnUse"
x2="-28.789"
gradientTransform="matrix(0.92231,0,0,0.91858,-92.447,61.326)"
y1="11.053"
x1="-18.589001">
<stop
stop-opacity=".41296"
offset="0"
id="stop51" />
<stop
stop-opacity="0"
offset="1"
id="stop53" />
</linearGradient>
<linearGradient
id="ag"
y2="9.6875"
gradientUnits="userSpaceOnUse"
x2="-24.75"
y1="11.566"
x1="-26.754">
<stop
stop-color="#fff"
offset="0"
id="stop46" />
<stop
stop-color="#fff"
stop-opacity="0"
offset="1"
id="stop48" />
</linearGradient>
</defs>
<g
transform="translate(-0.89713014,-1.0494139)"
id="g3432">
<path
style="fill:#999999;stroke:#e60000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 18.5,2.5 0,21"
id="path3764-1"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<g
id="g16-7"
transform="matrix(1.6382539,0,0,1.5572263,1.2572207,0.36314149)">
<rect
style="fill-opacity:0"
id="rect18-4"
x="0"
y="0"
width="16"
height="16" />
</g>
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path3765-0"
d="m 7.5,2.5 0,21"
style="fill:none;stroke:#e60000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path3762-9"
d="m 23.5,18.5 -21,0"
style="fill:none;stroke:#00a000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
style="fill:none;stroke:#00a000;stroke-width:3;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
d="m 23.5,7.5 -21,0"
id="path2990-4"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
transform="translate(-6.5,-5.5)"
d="m 16.5,13 c 0,1.380712 -1.119288,2.5 -2.5,2.5 -1.380712,0 -2.5,-1.119288 -2.5,-2.5 0,-1.380712 1.119288,-2.5 2.5,-2.5 1.380712,0 2.5,1.119288 2.5,2.5 z"
sodipodi:ry="2.5"
sodipodi:rx="2.5"
sodipodi:cy="13"
sodipodi:cx="14"
id="path2992-8"
style="fill:#e6e6e6;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
sodipodi:type="arc" />
<path
sodipodi:type="arc"
style="fill:#e6e6e6;fill-opacity:1;stroke:#1a1a1a;stroke-width:0.5;stroke-linecap:square;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
id="path2994"
sodipodi:cx="14"
sodipodi:cy="13"
sodipodi:rx="2.5"
sodipodi:ry="2.5"
d="m 16.5,13 c 0,1.380712 -1.119288,2.5 -2.5,2.5 -1.380712,0 -2.5,-1.119288 -2.5,-2.5 0,-1.380712 1.119288,-2.5 2.5,-2.5 1.380712,0 2.5,1.119288 2.5,2.5 z"
transform="translate(4.5,5.5)" />
</g>
<g
transform="matrix(1.105905,0,0,1.0949297,-19.20355,-6.1626394)"
id="g3255">
<path
sodipodi:nodetypes="ccccc"
inkscape:connector-curvature="0"
id="rect3938"
d="m 27.577426,16.859847 12.961754,0 0,11.985901 -12.961754,0 c 0,-3.9953 0,-7.990602 0,-11.985901 z"
style="fill:#f9f9f9;stroke:#808080;stroke-width:0.99121374;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:10;stroke-opacity:1;stroke-dasharray:none" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path3943"
d="m 29.604984,19.848364 8.936437,0"
style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path3943-7"
d="m 29.589803,21.888008 8.936437,0"
style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path3943-8"
d="m 29.679194,23.88441 8.936437,0"
style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
<path
sodipodi:nodetypes="cc"
inkscape:connector-curvature="0"
id="path3943-2"
d="m 29.649397,25.910609 8.936437,0"
style="fill:none;stroke:#333333;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none" />
</g>
</svg>
common/basicframe.cpp
View file @ 441a8d3d
......@@ -551,7 +551,7 @@ static inline const char* KICAD_BUILD_OPTIONS_SIGNATURE()
" (release,"
#endif
__WX_BO_UNICODE __ABI_VERSION __BO_COMPILER __WX_BO_STL
__WX_BO_WXWIN_COMPAT_2_4 __WX_BO_WXWIN_COMPAT_2_6 ")"
__WX_BO_WXWIN_COMPAT_2_6 __WX_BO_WXWIN_COMPAT_2_8 ")"
;
}
......@@ -572,9 +572,9 @@ void EDA_BASE_FRAME::CopyVersionInfoToClipboard( wxCommandEvent& event )
tmp = wxT( "Application: " ) + Pgm().App().GetAppName() + wxT( "\n" );
tmp << wxT( "Version: " ) << GetBuildVersion()
#ifdef DEBUG
<< wxT( " Debug" )
<< wxT( " debug" )
#else
<< wxT( " Release" )
<< wxT( " release" )
#endif
<< wxT( " build\n" );
tmp << wxT( "wxWidgets: Version " ) << FROM_UTF8( wxVERSION_NUM_DOT_STRING )
......@@ -632,7 +632,7 @@ void EDA_BASE_FRAME::CopyVersionInfoToClipboard( wxCommandEvent& event )
tmp << wxT( "OFF\n" );
#endif
wxMessageBox( tmp, _("Version Information (copied to the clipboard)") );
wxMessageBox( tmp, _( "Version Information (copied to the clipboard)" ) );
wxTheClipboard->SetData( new wxTextDataObject( tmp ) );
wxTheClipboard->Close();
......
common/dialog_about/AboutDialog_main.cpp
View file @ 441a8d3d
......@@ -26,6 +26,7 @@
#include <aboutinfo.h>
#include <wx/aboutdlg.h>
#include <wx/textctrl.h>
#include <boost/version.hpp>
/* Used icons:
......@@ -50,7 +51,7 @@ static wxString HtmlNewline( const unsigned int amount = 1 );
/**
* Initializes the <code>AboutAppInfo</code> object with applicaion specific information.
* Initializes the <code>AboutAppInfo</code> object with application specific information.
*
* This the object which holds all information about the application
*/
......@@ -79,7 +80,14 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
/* KiCad build version */
wxString version;
version << wxT( "Build: " ) << GetBuildVersion();
version << wxT( "Version: " ) << GetBuildVersion()
#ifdef DEBUG
<< wxT( ", debug" )
#else
<< wxT( ", release" )
#endif
<< wxT( " build" );
info.SetBuildVersion( version );
/* wxWidgets version */
......@@ -90,46 +98,25 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
<< wxMINOR_VERSION << wxT( "." )
<< wxRELEASE_NUMBER
/* Unicode or Ansi version */
/* Unicode or ANSI version */
#if wxUSE_UNICODE
<< wxT( " Unicode " );
#else
<< wxT( " Ansi " );
<< wxT( " ANSI " );
#endif
libVersion << wxT( "and boost C++ libraries" );
libVersion << wxT( "\n" );
/* Operating System Information */
#if defined __WIN64__
libVersion << wxT( "on 64 Bits Windows" );
// Just in case someone builds KiCad with the platform native of Boost instead of
// the version included with the KiCad source.
libVersion << wxT( "and Boost " ) << ( BOOST_VERSION / 100000 ) << wxT( "." )
<< ( BOOST_VERSION / 100 % 1000 ) << wxT( "." ) << ( BOOST_VERSION % 100 )
<< wxT( "\n" );
# elif defined __WINDOWS__
libVersion << wxT( "on 32 Bits Windows" );
// Operating System Information
/* Check for wxMAC */
# elif defined __WXMAC__
libVersion << wxT( "on Macintosh" );
wxPlatformInfo platformInfo;
/* Linux 64 bits */
# elif defined _LP64 && __LINUX__
libVersion << wxT( "on 64 Bits GNU/Linux" );
/* Linux 32 bits */
# elif defined __LINUX__
libVersion << wxT( "on 32 Bits GNU/Linux" );
/* OpenBSD */
# elif defined __OpenBSD__
libVersion << wxT( "on OpenBSD" );
/* FreeBSD */
# elif defined __FreeBSD__
libVersion << wxT( "on FreeBSD" );
#endif
libVersion << wxT( "Platform: " ) << wxGetOsDescription() << wxT( ", " )
<< platformInfo.GetArchName();
info.SetLibVersion( libVersion );
......@@ -153,7 +140,7 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
description << wxT( "<p>" );
description << wxT( "<b><u>" ) << _( "KiCad on the web" ) << wxT( "</u></b>" ); // bold & underlined font for caption
// bulletet list with some http links
// bullet-ed list with some http links
description << wxT( "<ul>" );
description << wxT( "<li>" ) << HtmlHyperlink( wxT(
"http://iut-tice.ujf-grenoble.fr/kicad" ),
......@@ -175,7 +162,7 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
description << wxT( "<p>" );
description << wxT( "<b><u>" ) << _( "Contribute to KiCad" ) << wxT( "</u></b>" ); // bold & underlined font caption
// bulletet list with some http links
// bullet-ed list with some http links
description << wxT( "<ul>" );
description << wxT( "<li>" ) <<
HtmlHyperlink( wxT( "https://bugs.launchpad.net/kicad" ),
......
include/bitmaps.h
View file @ 441a8d3d
......@@ -305,6 +305,7 @@ EXTERN_BITMAP( library_xpm )
EXTERN_BITMAP( library_table_xpm )
EXTERN_BITMAP( libview_xpm )
EXTERN_BITMAP( lines90_xpm )
EXTERN_BITMAP( list_nets_xpm )
EXTERN_BITMAP( load_module_board_xpm )
EXTERN_BITMAP( load_module_lib_xpm )
EXTERN_BITMAP( local_ratsnest_xpm )
......
pcb_calculator/dialogs/pcb_calculator_frame_base.cpp
View file @ 441a8d3d
......@@ -707,7 +707,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow
m_SubsPrm7_choiceUnit->SetSelection( 0 );
fgSizerSubstPrms->Add( m_SubsPrm7_choiceUnit, 0, wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_substrate_prm8_label = new wxStaticText( m_panelTransline, wxID_ANY, _("Mur"), wxDefaultPosition, wxDefaultSize, 0 );
m_substrate_prm8_label = new wxStaticText( m_panelTransline, wxID_ANY, _("mu Rel"), wxDefaultPosition, wxDefaultSize, 0 );
m_substrate_prm8_label->Wrap( -1 );
fgSizerSubstPrms->Add( m_substrate_prm8_label, 0, wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT|wxRIGHT|wxLEFT, 5 );
......@@ -720,7 +720,7 @@ PCB_CALCULATOR_FRAME_BASE::PCB_CALCULATOR_FRAME_BASE( wxWindow* parent, wxWindow
m_SubsPrm8_choiceUnit->SetSelection( 0 );
fgSizerSubstPrms->Add( m_SubsPrm8_choiceUnit, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
m_substrate_prm9_label = new wxStaticText( m_panelTransline, wxID_ANY, _("MurC"), wxDefaultPosition, wxDefaultSize, 0 );
m_substrate_prm9_label = new wxStaticText( m_panelTransline, wxID_ANY, _("mu Rel C"), wxDefaultPosition, wxDefaultSize, 0 );
m_substrate_prm9_label->Wrap( -1 );
fgSizerSubstPrms->Add( m_substrate_prm9_label, 0, wxALL|wxALIGN_CENTER_VERTICAL|wxALIGN_RIGHT, 5 );
......
pcb_calculator/dialogs/pcb_calculator_frame_base.fbp
View file @ 441a8d3d
......@@ -10426,7 +10426,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Mur</property>
<property name="label">mu Rel</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
......@@ -10688,7 +10688,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">MurC</property>
<property name="label">mu Rel C</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
pcb_calculator/transline_ident.cpp
View file @ 441a8d3d
......@@ -171,10 +171,10 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, ROUGH_PRM,
_( "Rough" ), _( "Conductor Roughness" ), 0.0, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MUR_PRM,
_( "Mur" ),
_( "Relative Permeability of Substrate" ), 1, false ) );
_( "mu Rel S" ),
_( "Relative Permeability (mu) of Substrate" ), 1, false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM,
_( "MurC" ), _( "Relative Permeability of Conductor" ), 1,
_( "mu Rel C" ), _( "Relative Permeability (mu) of Conductor" ), 1,
false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_WIDTH_PRM,
......@@ -204,7 +204,7 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, T_PRM,
_( "T" ), _( "Strip Thickness" ), 0.035, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM,
_( "MurC" ), _( "Relative Permeability of Conductor" ), 1,
_( "mu Rel C" ), _( "Relative Permeability (mu) of Conductor" ), 1,
false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_WIDTH_PRM,
......@@ -236,7 +236,7 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, T_PRM,
_( "T" ), _( "Strip Thickness" ), 0.035, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM,
_( "MurC" ), _( "Relative Permeability of Conductor" ), 1,
_( "mu Rel C" ), _( "Relative Permeability (mu) of Conductor" ), 1,
false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_WIDTH_PRM,
......@@ -267,11 +267,11 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
m_Messages.Add( _( "TM-Modes" ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MUR_PRM,
_( "Mur" ), _( "Relative Permeability of Insulator" ), 1, false ) );
_( "mu Rel I" ), _( "Relative Permeability (mu) of Insulator" ), 1, false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, TANM_PRM,
_( "TanM" ), _( "Magnetic Loss Tangent" ), 0, false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM,
_( "MurC" ), _( "Relative Permeability of Conductor" ), 1,
_( "mu Rel C" ), _( "Relative Permeability (mu) of Conductor" ), 1,
false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_WIDTH_PRM,
......@@ -300,9 +300,9 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
m_Messages.Add( _( "TM-Modes" ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MUR_PRM,
_( "Mur" ), _( "Relative Permeability of Insulator" ), 1, false ) );
_( "mu Rel I" ), _( "Relative Permeability (mu) of Insulator" ), 1, false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM,
_( "MurC" ), _( "Relative Permeability of Conductor" ), 1,
_( "mu Rel C" ), _( "Relative Permeability (mu) of Conductor" ), 1,
false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_DIAM_IN_PRM,
......@@ -341,7 +341,7 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, ROUGH_PRM,
_( "Rough" ), _( "Conductor Roughness" ), 0.0, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM,
_( "MurC" ), _( "Relative Permeability of Conductor" ), 1,
_( "mu Rel C" ), _( "Relative Permeability (mu) of Conductor" ), 1,
false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_WIDTH_PRM,
......@@ -376,7 +376,7 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, T_PRM,
_( "T" ), _( "Strip Thickness" ), 0.035, true ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM,
_( "MurC" ), _( "Relative Permeability of Conductor" ), 1,
_( "mu Rel C" ), _( "Relative Permeability (mu) of Conductor" ), 1,
false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_PHYS, PHYS_WIDTH_PRM,
......@@ -404,7 +404,7 @@ TRANSLINE_IDENT::TRANSLINE_IDENT( enum TRANSLINE_TYPE_ID aType )
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, TWISTEDPAIR_TWIST_PRM,
_( "Twists" ), _( "Number of Twists per Length" ), 0.0, false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, MURC_PRM,
_( "MurC" ), _( "Relative Permeability of Conductor" ), 1,
_( "mu Rel C" ), _( "Relative Permeability (mu) of Conductor" ), 1,
false ) );
AddPrm( new TRANSLINE_PRM( PRM_TYPE_SUBS, TWISTEDPAIR_EPSILONR_ENV_PRM,
_( "ErEnv" ), _( "Relative Permittivity of Environment" ), 1,
......
pcbnew/menubar_pcbframe.cpp
View file @ 441a8d3d
......@@ -351,7 +351,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
AddMenuItem( viewMenu, ID_MENU_LIST_NETS,
_( "&List Nets" ), _( "View a list of nets with names and id's" ),
KiBitmap( tools_xpm ) );
KiBitmap( list_nets_xpm ) );
viewMenu->AppendSeparator();
......
pcbnew/onrightclick.cpp
View file @ 441a8d3d
......@@ -60,8 +60,6 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
// to display menus relative to tracks twice
bool blockActive = !GetScreen()->m_BlockLocate.IsIdle();
wxClientDC dc( m_canvas );
BOARD_ITEM* item = GetCurItem();
m_canvas->SetCanStartBlock( -1 ); // Avoid to start a block command when clicking on menu
......@@ -76,8 +74,6 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
return true;
}
m_canvas->CrossHairOff( &dc );
if( GetToolId() != ID_NO_TOOL_SELECTED )
{
if( item && item->GetFlags() )
......@@ -130,7 +126,6 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
if( m_canvas->GetAbortRequest() )
{
m_canvas->CrossHairOn( &dc );
return false;
}
}
......@@ -489,7 +484,6 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
break;
}
m_canvas->CrossHairOn( &dc );
return true;
}
......
pcbnew/router/pns_line.cpp
View file @ 441a8d3d
......@@ -233,8 +233,6 @@ bool PNS_LINE::Walkaround( SHAPE_LINE_CHAIN aObstacle, SHAPE_LINE_CHAIN& aPre,
aWalk.SetClosed( false );
aWalk.Append( nearest.p );
int i = nearest.their.Index();
assert( nearest.their.Index() >= 0 );
assert( farthest.their.Index() >= 0 );
......@@ -246,7 +244,7 @@ bool PNS_LINE::Walkaround( SHAPE_LINE_CHAIN aObstacle, SHAPE_LINE_CHAIN& aPre,
int i_first = aObstacle.Find( nearest.p );
int i_last = aObstacle.Find( farthest.p );
i = i_first;
int i = i_first;
while( i != i_last )
{
......
pcbnew/zones_by_polygon.cpp
View file @ 441a8d3d
......@@ -123,6 +123,16 @@ void PCB_EDIT_FRAME::duplicateZone( wxDC* aDC, ZONE_CONTAINER* aZone )
else
success = InvokeNonCopperZonesEditor( this, aZone, &zoneSettings );
// If the new zone is on the same layer as the the initial zone,
// do nothing
if( success && ( aZone->GetLayer() == zoneSettings.m_CurrentZone_Layer ) )
{
DisplayError( this,
_( "The duplicated zone is on the same layer as the initial zone, which has no sense.\n"
"Please, chose an other layer for the new zone") );
success = false;
}
if( success )
{
zoneSettings.ExportSetting( *newZone );
......@@ -148,7 +158,8 @@ void PCB_EDIT_FRAME::duplicateZone( wxDC* aDC, ZONE_CONTAINER* aZone )
if( GetBoard()->GetAreaIndex( newZone ) >= 0
&& GetBoard()->Test_Drc_Areas_Outlines_To_Areas_Outlines( newZone, true ) )
{
DisplayError( this, _( "Duplicate Zone: The outline of the duplicated zone fails DRC check!" ) );
DisplayError( this,
_( "The outline of the duplicated zone fails DRC check!" ) );
}
UpdateCopyOfZonesList( s_PickedList, s_AuxiliaryList, GetBoard() );
......
pcbnew/zones_functions_for_undo_redo.cpp
View file @ 441a8d3d
......@@ -257,9 +257,13 @@ void UpdateCopyOfZonesList( PICKED_ITEMS_LIST& aPickList,
}
}
wxASSERT_MSG( notfound != true,
wxT( "UpdateCopyOfZonesList() error: item not found in "
"aAuxiliaryList" ) );
if( notfound ) // happens when the new zone overlaps an existing zone
// and these zones are combined
{
DBG( printf(
"UpdateCopyOfZonesList(): item not found in aAuxiliaryList,"
"combined with an other zone\n" ) );
}
break;
}
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment