From e2c7e6bf0290acd5dd1ca935427396b51e22c875 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Sat, 9 May 2015 10:37:50 +0200 Subject: [PATCH] onrightclick.cpp: remove useless wxClientDC, which was used only the hide/show (to the same location) the on-grid cursor during the creation of the popup menu (perhaps a trace of legacy code). Minor changes in pcb_calculator GUI messages to make easier translation of these messages. Cosmetic enhancements for 2 icons --- bitmaps_png/CMakeLists.txt | 1 + .../cpp_26/add_hierarchical_subsheet.cpp | 129 +++--- bitmaps_png/cpp_26/list_nets.cpp | 53 +++ .../sources/add_hierarchical_subsheet.svg | 369 ++++++++++++++---- bitmaps_png/sources/list_nets.svg | 333 ++++++++++++++++ include/bitmaps.h | 1 + .../dialogs/pcb_calculator_frame_base.cpp | 4 +- .../dialogs/pcb_calculator_frame_base.fbp | 4 +- pcb_calculator/transline_ident.cpp | 24 +- pcbnew/menubar_pcbframe.cpp | 2 +- pcbnew/onrightclick.cpp | 6 - pcbnew/router/pns_line.cpp | 4 +- 12 files changed, 770 insertions(+), 160 deletions(-) create mode 100644 bitmaps_png/cpp_26/list_nets.cpp create mode 100644 bitmaps_png/sources/list_nets.svg diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt index 24c4d5a421..28f2c943c2 100644 --- a/bitmaps_png/CMakeLists.txt +++ b/bitmaps_png/CMakeLists.txt @@ -337,6 +337,7 @@ set( BMAPS_MID library_table libview lines90 + list_nets load_module_board load_module_lib local_ratsnest diff --git a/bitmaps_png/cpp_26/add_hierarchical_subsheet.cpp b/bitmaps_png/cpp_26/add_hierarchical_subsheet.cpp index ce55f12087..5d36d25cbb 100644 --- a/bitmaps_png/cpp_26/add_hierarchical_subsheet.cpp +++ b/bitmaps_png/cpp_26/add_hierarchical_subsheet.cpp @@ -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" }}; diff --git a/bitmaps_png/cpp_26/list_nets.cpp b/bitmaps_png/cpp_26/list_nets.cpp new file mode 100644 index 0000000000..766883fb80 --- /dev/null +++ b/bitmaps_png/cpp_26/list_nets.cpp @@ -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 + +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 diff --git a/bitmaps_png/sources/add_hierarchical_subsheet.svg b/bitmaps_png/sources/add_hierarchical_subsheet.svg index fe1c175082..912df5bc83 100644 --- a/bitmaps_png/sources/add_hierarchical_subsheet.svg +++ b/bitmaps_png/sources/add_hierarchical_subsheet.svg @@ -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"> @@ -23,7 +23,7 @@ image/svg+xml - + @@ -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" /> + + + + + + + + + + + + + - - - - - - - - - - - - - - - + transform="matrix(0.41407077,0,0,0.37284967,-3.2763202,-2.8011047)" + id="l"> + + + + + + id="g3325-9" + transform="translate(55.627118,-0.30508476)"> + 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" /> + 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" /> + 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" /> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/bitmaps_png/sources/list_nets.svg b/bitmaps_png/sources/list_nets.svg new file mode 100644 index 0000000000..138847132a --- /dev/null +++ b/bitmaps_png/sources/list_nets.svg @@ -0,0 +1,333 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/include/bitmaps.h b/include/bitmaps.h index 26f61878b9..5cd445460b 100644 --- a/include/bitmaps.h +++ b/include/bitmaps.h @@ -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 ) diff --git a/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp b/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp index 0c0496cfa6..26ee9e5c8e 100644 --- a/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp +++ b/pcb_calculator/dialogs/pcb_calculator_frame_base.cpp @@ -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 ); diff --git a/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp b/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp index 2ccc08de96..89eb6a490b 100644 --- a/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp +++ b/pcb_calculator/dialogs/pcb_calculator_frame_base.fbp @@ -10426,7 +10426,7 @@ 0 0 wxID_ANY - Mur + mu Rel 0 @@ -10688,7 +10688,7 @@ 0 0 wxID_ANY - MurC + mu Rel C 0 diff --git a/pcb_calculator/transline_ident.cpp b/pcb_calculator/transline_ident.cpp index 36cd44854a..0346d2d166 100644 --- a/pcb_calculator/transline_ident.cpp +++ b/pcb_calculator/transline_ident.cpp @@ -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, diff --git a/pcbnew/menubar_pcbframe.cpp b/pcbnew/menubar_pcbframe.cpp index 93921ba9d3..d4bf039706 100644 --- a/pcbnew/menubar_pcbframe.cpp +++ b/pcbnew/menubar_pcbframe.cpp @@ -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(); diff --git a/pcbnew/onrightclick.cpp b/pcbnew/onrightclick.cpp index 7ba344a5e8..e3571c36b3 100644 --- a/pcbnew/onrightclick.cpp +++ b/pcbnew/onrightclick.cpp @@ -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; } diff --git a/pcbnew/router/pns_line.cpp b/pcbnew/router/pns_line.cpp index dd346e4cae..e36579d1e2 100644 --- a/pcbnew/router/pns_line.cpp +++ b/pcbnew/router/pns_line.cpp @@ -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 ) {