From cbf487c5987b24cfe6d9ff986a45e34f6734b103 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Fri, 3 Apr 2015 21:10:09 +0200 Subject: [PATCH] Pcbnew: duplicate and create array: popup menus in legacy mode: remove these options for a few items which cannot be (safely) duplicated (pads in board editor, and a few others ) Modedit, GAL mode: fix a crash when a duplicated area includes the ref or value fields. Add missing bitmap for pad enumerate. fix bad flag for Portuguese language. Fix a few typo in messages. --- bitmaps_png/CMakeLists.txt | 1 + bitmaps_png/cpp_26/lang_pt.cpp | 62 ++-- bitmaps_png/cpp_26/pad_enumerate.cpp | 65 ++++ bitmaps_png/sources/lang_pt.svg | 461 ++++++++++++++++++++------ bitmaps_png/sources/pad_enumerate.svg | 91 +++++ include/bitmaps.h | 1 + pcbnew/onrightclick.cpp | 80 ++--- pcbnew/tools/common_actions.cpp | 8 +- pcbnew/tools/edit_tool.cpp | 30 +- 9 files changed, 605 insertions(+), 194 deletions(-) create mode 100644 bitmaps_png/cpp_26/pad_enumerate.cpp create mode 100644 bitmaps_png/sources/pad_enumerate.svg diff --git a/bitmaps_png/CMakeLists.txt b/bitmaps_png/CMakeLists.txt index 6576614625..773537e55b 100644 --- a/bitmaps_png/CMakeLists.txt +++ b/bitmaps_png/CMakeLists.txt @@ -430,6 +430,7 @@ set( BMAPS_MID pad_sketch pad pad_dimensions + pad_enumerate pads_mask_layers pagelayout_load pagelayout_load_default diff --git a/bitmaps_png/cpp_26/lang_pt.cpp b/bitmaps_png/cpp_26/lang_pt.cpp index 86f1e4d322..2d2062b2fc 100644 --- a/bitmaps_png/cpp_26/lang_pt.cpp +++ b/bitmaps_png/cpp_26/lang_pt.cpp @@ -8,44 +8,30 @@ 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, 0x46, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0xf8, 0xff, 0xff, 0x3f, - 0x03, 0x3d, 0x30, 0xc3, 0xa8, 0x45, 0x64, 0x5b, 0xc4, 0xd0, 0xef, 0x20, 0xc0, 0x30, 0xd1, 0x21, - 0x82, 0xa6, 0x78, 0xb2, 0x83, 0x09, 0xc8, 0x22, 0x03, 0x86, 0x49, 0xf6, 0xff, 0x69, 0x8b, 0x1d, - 0x66, 0x90, 0x6c, 0x11, 0x23, 0x10, 0x0b, 0x4d, 0xb5, 0xa6, 0xad, 0x45, 0x6a, 0x33, 0x4d, 0xff, - 0xef, 0xd9, 0xce, 0xff, 0xff, 0xe5, 0x01, 0x96, 0xff, 0x29, 0xcb, 0xd4, 0xc0, 0x96, 0x52, 0xd5, - 0x22, 0xb6, 0xc9, 0x76, 0xff, 0xab, 0x56, 0x29, 0xfc, 0xff, 0x78, 0x88, 0xe9, 0xff, 0x8f, 0xc3, - 0x0c, 0x70, 0xbc, 0x0f, 0x68, 0xa9, 0xc6, 0x2c, 0x53, 0xea, 0x58, 0x64, 0x31, 0xd7, 0xf0, 0xff, - 0xf9, 0xdd, 0x5c, 0xff, 0x5f, 0x6e, 0xe3, 0xf8, 0x5f, 0x19, 0xe9, 0xf2, 0xdf, 0x45, 0x37, 0xe1, - 0xbf, 0x89, 0x42, 0xc6, 0xff, 0x28, 0xfb, 0x90, 0xff, 0x7b, 0x26, 0x2a, 0xfc, 0xff, 0x74, 0x88, - 0xf1, 0x7f, 0x0d, 0xd0, 0x11, 0x20, 0xc7, 0x90, 0x65, 0x11, 0xdf, 0x54, 0x9b, 0xff, 0x13, 0xd7, - 0x4b, 0xfd, 0xff, 0x0e, 0x74, 0xf9, 0xd3, 0xcd, 0x5c, 0xff, 0x6d, 0x35, 0x52, 0xfe, 0x6b, 0x88, - 0xe5, 0x63, 0xe0, 0x05, 0x55, 0xfa, 0x60, 0xdf, 0x5d, 0x00, 0x3a, 0xc6, 0x6a, 0x9e, 0x01, 0x69, - 0x16, 0xf9, 0x2d, 0xd4, 0xfe, 0x7f, 0x6f, 0x1f, 0x3b, 0x3c, 0x88, 0xda, 0x9b, 0xcb, 0xfe, 0x37, - 0xf4, 0x2c, 0xfb, 0x5f, 0xd6, 0xb2, 0xe0, 0x7f, 0x61, 0xee, 0x82, 0xff, 0x8e, 0x66, 0xf5, 0xff, - 0x4d, 0x95, 0xcb, 0xc0, 0x16, 0xe9, 0xcb, 0x64, 0xff, 0x7f, 0xb8, 0x81, 0x07, 0xac, 0x0e, 0xe4, - 0xa8, 0xc9, 0x40, 0xc7, 0xf1, 0x63, 0x24, 0x16, 0x34, 0x8b, 0x24, 0xa7, 0x5b, 0xfe, 0x5f, 0xb9, - 0x59, 0x04, 0x25, 0x1e, 0xbe, 0x01, 0xe3, 0x25, 0xde, 0xbf, 0xf7, 0xbf, 0xb5, 0x76, 0xcd, 0x7f, - 0x37, 0xb3, 0xe6, 0xff, 0xd1, 0x81, 0x13, 0x81, 0x96, 0x2e, 0xff, 0xbf, 0x78, 0xf5, 0xfe, 0xff, - 0xa1, 0x11, 0xdd, 0x60, 0xcb, 0xd6, 0xb4, 0x68, 0xa0, 0xe8, 0xb9, 0xbf, 0x8f, 0xed, 0x7f, 0xc0, - 0x22, 0x6d, 0xdc, 0x16, 0xcd, 0xd8, 0x20, 0x81, 0xa2, 0x01, 0x84, 0x5f, 0x6d, 0x67, 0x87, 0x07, - 0x93, 0xb1, 0x62, 0x25, 0x98, 0xd6, 0x93, 0x29, 0xfd, 0x6f, 0x28, 0x5f, 0xfe, 0xbf, 0xb1, 0x71, - 0xf5, 0xff, 0xfe, 0x19, 0x9b, 0xfe, 0x4f, 0x2e, 0xb5, 0xc2, 0xd0, 0x07, 0x0a, 0x11, 0x75, 0x78, - 0x42, 0xc1, 0x12, 0x74, 0x3e, 0x0b, 0x75, 0xfe, 0xdf, 0x45, 0x0a, 0x36, 0x10, 0xf6, 0x36, 0xcd, - 0xfd, 0xef, 0xa0, 0xd7, 0x08, 0xb7, 0xc4, 0x5c, 0xb5, 0x16, 0x6e, 0x79, 0xb4, 0x6f, 0xdf, 0xff, - 0xa3, 0xcb, 0xbc, 0xe1, 0x6a, 0x41, 0xc1, 0x07, 0x8a, 0x5b, 0x50, 0x1c, 0x13, 0x8c, 0x23, 0xde, - 0x29, 0x36, 0xff, 0xfb, 0xd7, 0x49, 0xff, 0xff, 0x06, 0xd5, 0x3c, 0xaf, 0xc2, 0xe0, 0xbf, 0x91, - 0x42, 0xe5, 0x7f, 0x2b, 0x0d, 0x88, 0x8f, 0x40, 0x34, 0x88, 0x6f, 0xae, 0x5a, 0xf7, 0x3f, 0xc1, - 0xa3, 0xe0, 0xff, 0xe7, 0xfd, 0xcc, 0x60, 0x75, 0xe7, 0x76, 0x73, 0xff, 0x37, 0x07, 0xa6, 0x52, - 0x92, 0x93, 0xb7, 0x19, 0x50, 0xd3, 0x59, 0xa0, 0xe6, 0xef, 0x87, 0x18, 0xfe, 0x37, 0x25, 0xda, - 0xff, 0xd7, 0x14, 0xcf, 0x47, 0x09, 0xc6, 0x70, 0xfb, 0x9c, 0xff, 0xd7, 0x97, 0x0b, 0x81, 0xf3, - 0x17, 0x28, 0x9f, 0xb1, 0xe2, 0x4c, 0xe2, 0x44, 0xe4, 0x23, 0x90, 0xe6, 0x8a, 0x55, 0x8a, 0xff, - 0x3f, 0x1c, 0x64, 0xfa, 0x7f, 0x66, 0x9e, 0xc4, 0xff, 0x29, 0x05, 0xa6, 0xff, 0x5b, 0x92, 0xed, - 0xfe, 0xaf, 0x6d, 0xd5, 0xf8, 0xff, 0x71, 0x1f, 0x33, 0xb8, 0xa4, 0x00, 0x95, 0x18, 0x54, 0x2b, - 0x82, 0x54, 0x66, 0x9a, 0xfd, 0xdf, 0xb5, 0x5d, 0x00, 0x1e, 0x17, 0x2f, 0x80, 0xc5, 0x50, 0xd2, - 0x52, 0x62, 0x8b, 0x21, 0x32, 0x0a, 0xd5, 0x84, 0xa5, 0xea, 0xff, 0xe7, 0x6d, 0x14, 0xff, 0x2f, - 0x0e, 0xcc, 0x0a, 0x34, 0x2d, 0xbd, 0xc9, 0xaf, 0x26, 0x26, 0xdb, 0xe9, 0x02, 0x39, 0x1f, 0x68, - 0x8a, 0x27, 0xda, 0xf7, 0x8d, 0x36, 0x4e, 0x06, 0xbf, 0x45, 0x00, 0x67, 0x25, 0xe2, 0x78, 0xf3, - 0x1b, 0xc4, 0xf4, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, + 0xce, 0x00, 0x00, 0x01, 0x66, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0xed, 0xd6, 0x4b, 0x2b, 0x84, + 0x61, 0x18, 0x87, 0xf1, 0x3f, 0x1b, 0x9b, 0x49, 0xd2, 0x2b, 0x1b, 0x87, 0x66, 0x33, 0x28, 0x0b, + 0x51, 0xc3, 0xc4, 0xa4, 0x71, 0xa6, 0x5e, 0xa7, 0x34, 0x23, 0x8d, 0xe3, 0x8c, 0x69, 0x9a, 0x42, + 0x39, 0xc4, 0x1b, 0x52, 0x16, 0x16, 0x28, 0xcd, 0xc6, 0x82, 0x08, 0x89, 0xec, 0x84, 0x24, 0x1b, + 0x7b, 0xca, 0xd2, 0x21, 0x1b, 0x3b, 0x7c, 0x04, 0xab, 0xcb, 0xc2, 0x17, 0x98, 0xa6, 0x97, 0x94, + 0x59, 0x5c, 0xeb, 0x5f, 0xcf, 0xd3, 0x73, 0xdf, 0x3d, 0x02, 0xf4, 0x1b, 0x29, 0x05, 0x25, 0x0d, + 0x4d, 0x56, 0x29, 0x90, 0x48, 0x87, 0x2e, 0xd5, 0x23, 0x95, 0x25, 0x9b, 0x14, 0x11, 0x89, 0xb4, + 0x54, 0xa1, 0xef, 0x0b, 0x48, 0xb2, 0x7f, 0x0c, 0x2d, 0x96, 0xff, 0x20, 0x94, 0x16, 0x16, 0x2d, + 0x51, 0xd1, 0x14, 0x14, 0x66, 0xab, 0xb0, 0x1a, 0x45, 0xbc, 0x4e, 0x7c, 0xa6, 0xd9, 0x08, 0x39, + 0x06, 0x44, 0x77, 0x20, 0x93, 0x50, 0xb5, 0xc1, 0x55, 0x83, 0x87, 0x48, 0x75, 0x0e, 0x37, 0x3e, + 0x0f, 0x51, 0x4f, 0x0e, 0x43, 0x5d, 0x99, 0x7c, 0x64, 0xd8, 0x04, 0x45, 0x62, 0x62, 0x6e, 0xce, + 0x60, 0xb9, 0x48, 0x3c, 0x5a, 0x16, 0x13, 0xfe, 0x7a, 0x1e, 0x2d, 0x8b, 0x65, 0x97, 0x88, 0xf4, + 0x19, 0xcc, 0xfa, 0x6d, 0x82, 0x02, 0x21, 0xd1, 0xd1, 0x63, 0x30, 0xee, 0x14, 0x2f, 0xaf, 0xef, + 0xec, 0x5f, 0x3c, 0xf1, 0xf2, 0xfa, 0xce, 0x84, 0x53, 0x4c, 0xfb, 0x0c, 0x66, 0x7a, 0x6d, 0x82, + 0x7a, 0xfc, 0xc2, 0x6b, 0x66, 0xb1, 0x5e, 0x9c, 0xce, 0xe6, 0xf1, 0x2d, 0xbb, 0x67, 0x0f, 0x6c, + 0x9e, 0xdc, 0xb1, 0xea, 0x4a, 0x27, 0xec, 0xcb, 0x22, 0x68, 0xd7, 0x89, 0xba, 0x46, 0x45, 0x49, + 0xbf, 0xd8, 0xf0, 0x14, 0xb0, 0x15, 0x6a, 0x23, 0x7e, 0x74, 0xcf, 0x4e, 0xb4, 0x93, 0x95, 0xca, + 0x3c, 0x76, 0xe6, 0xc5, 0xf6, 0xb0, 0x4d, 0x50, 0x6d, 0xbf, 0xe8, 0x0b, 0x8a, 0x11, 0xb3, 0x80, + 0x3d, 0x6f, 0x21, 0xcf, 0xd9, 0xd9, 0x1c, 0x78, 0x0b, 0x89, 0x35, 0xe7, 0x33, 0x33, 0x25, 0xd6, + 0xda, 0x6d, 0x7c, 0xde, 0xee, 0x98, 0x30, 0x07, 0x45, 0xfb, 0x82, 0xf0, 0x9b, 0xb9, 0x5c, 0x76, + 0x88, 0x93, 0x31, 0x71, 0xed, 0xfe, 0x81, 0x81, 0x75, 0x84, 0x45, 0x65, 0x54, 0xc4, 0x82, 0xe2, + 0xdc, 0x2d, 0xde, 0x1c, 0xa9, 0x5d, 0xf7, 0xdb, 0x50, 0x8d, 0xa9, 0xb7, 0x44, 0x8a, 0x97, 0xea, + 0x0e, 0xe9, 0x34, 0xd9, 0x52, 0x9f, 0x93, 0xbf, 0x0f, 0x7d, 0x01, 0x56, 0x7c, 0x9f, 0xa0, 0xa8, + 0x66, 0x35, 0xc2, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, }; const BITMAP_OPAQUE lang_pt_xpm[1] = {{ png, sizeof( png ), "lang_pt_xpm" }}; diff --git a/bitmaps_png/cpp_26/pad_enumerate.cpp b/bitmaps_png/cpp_26/pad_enumerate.cpp new file mode 100644 index 0000000000..5639b1c037 --- /dev/null +++ b/bitmaps_png/cpp_26/pad_enumerate.cpp @@ -0,0 +1,65 @@ + +/* 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, 0x03, 0x00, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x95, 0x94, 0x4b, 0x48, 0x94, + 0x51, 0x18, 0x86, 0x3f, 0x33, 0x28, 0x2c, 0x72, 0x91, 0x45, 0x12, 0x45, 0x05, 0x2e, 0x14, 0x37, + 0x51, 0x6e, 0xba, 0xe0, 0x94, 0x48, 0x51, 0x49, 0x10, 0x49, 0x17, 0x17, 0x05, 0x2d, 0x92, 0xa8, + 0x88, 0xb0, 0x45, 0x0b, 0x9b, 0x19, 0x87, 0xdc, 0x08, 0x6d, 0x02, 0x09, 0xa4, 0x36, 0x81, 0x49, + 0xbb, 0xac, 0x29, 0x9d, 0x8a, 0x82, 0x4c, 0xb1, 0xc2, 0x34, 0x4d, 0x33, 0x8b, 0x8c, 0x4c, 0x9b, + 0x8d, 0x4a, 0x82, 0xb7, 0x6c, 0xa6, 0xf7, 0x9c, 0x79, 0xad, 0x33, 0xbf, 0xf3, 0x5f, 0x5a, 0x3c, + 0xfc, 0xe7, 0xf2, 0x7e, 0xe7, 0x3d, 0xe7, 0x3b, 0xdf, 0x7f, 0x24, 0x1e, 0x8f, 0x8b, 0x22, 0x20, + 0xe2, 0x07, 0x55, 0xf3, 0x7d, 0x2b, 0x98, 0x5b, 0x0a, 0xf6, 0x81, 0x1a, 0x70, 0x48, 0xf5, 0x1d, + 0xb4, 0xa5, 0xe0, 0x1a, 0x28, 0x01, 0xe9, 0x6a, 0x6c, 0x7e, 0xe2, 0x02, 0x88, 0x83, 0x4e, 0x87, + 0xe0, 0x5b, 0xd4, 0xf4, 0x81, 0x39, 0xd0, 0x65, 0xa3, 0xab, 0xa6, 0xae, 0x07, 0xcc, 0x82, 0xd7, + 0xda, 0x08, 0x8d, 0x27, 0xe0, 0x17, 0x07, 0x3b, 0x6d, 0x82, 0xb3, 0xc1, 0x24, 0xa8, 0x65, 0xff, + 0x22, 0x17, 0x2b, 0x4c, 0xa1, 0xbd, 0x0d, 0xea, 0xd8, 0xbe, 0x4a, 0x5d, 0xbe, 0xea, 0x34, 0x83, + 0x5c, 0x30, 0xe8, 0x72, 0xa2, 0x45, 0x60, 0x09, 0xdb, 0x21, 0x2e, 0xb0, 0xd3, 0x41, 0xbf, 0x5b, + 0x9d, 0x1a, 0x7c, 0x55, 0x69, 0x36, 0x27, 0x1c, 0x8d, 0x0c, 0x5d, 0x31, 0x98, 0x02, 0xed, 0x20, + 0xcd, 0x41, 0xf7, 0x8d, 0x9b, 0x39, 0xf7, 0xf7, 0x8e, 0xbc, 0x1a, 0x61, 0x7e, 0x17, 0x4d, 0x3e, + 0x83, 0x75, 0x2e, 0xda, 0x15, 0xe0, 0x12, 0xcd, 0x8e, 0x7a, 0x36, 0xc2, 0xdc, 0x16, 0xf0, 0x93, + 0x97, 0xbc, 0xd6, 0x46, 0xb3, 0x18, 0x1c, 0x07, 0x45, 0xec, 0x6f, 0xa2, 0xd1, 0x75, 0x5b, 0x23, + 0xb4, 0xb7, 0x81, 0x06, 0x65, 0x50, 0x5c, 0x24, 0x99, 0x95, 0xe9, 0x32, 0xaa, 0x82, 0x4e, 0x6c, + 0x94, 0xfe, 0xb2, 0x1c, 0x79, 0x5e, 0xbe, 0x46, 0xee, 0x94, 0x67, 0x8b, 0x8f, 0x85, 0xa2, 0x74, + 0xa5, 0x8c, 0x8b, 0x80, 0x11, 0x96, 0x78, 0x03, 0x8d, 0x0a, 0x9c, 0x8c, 0x8e, 0x29, 0x51, 0xc1, + 0x7e, 0x09, 0xe7, 0x1e, 0xd1, 0xe5, 0x1c, 0xb7, 0xb2, 0xf9, 0xa0, 0xc4, 0xb2, 0x4f, 0xcb, 0x0b, + 0xf6, 0xaf, 0x30, 0x2e, 0x1f, 0x34, 0xf1, 0x17, 0x18, 0x50, 0x15, 0x9a, 0x74, 0x47, 0x56, 0x50, + 0x62, 0xbe, 0x93, 0x1b, 0x64, 0x72, 0xf5, 0x19, 0x89, 0x21, 0xfa, 0x0b, 0x78, 0x05, 0x22, 0xa0, + 0x51, 0xfc, 0xf2, 0x08, 0xdf, 0x56, 0xf0, 0x01, 0xcc, 0x16, 0x6f, 0x97, 0x99, 0x92, 0xad, 0x72, + 0xd3, 0x92, 0xc6, 0x4c, 0xb3, 0x58, 0x52, 0x9a, 0x48, 0x95, 0x14, 0xe6, 0x94, 0x49, 0xcc, 0xe7, + 0x93, 0x19, 0x44, 0xb4, 0xe8, 0xc5, 0x6d, 0xc8, 0x3a, 0x2b, 0x2d, 0x87, 0xf3, 0x65, 0x3a, 0xbd, + 0x52, 0xd4, 0xea, 0x15, 0x76, 0x1b, 0x5f, 0x38, 0x10, 0x90, 0xe5, 0x60, 0x10, 0x4c, 0x70, 0xe7, + 0x8d, 0xae, 0xf8, 0xe5, 0x3e, 0xbe, 0x3f, 0x80, 0xda, 0x58, 0x9e, 0x57, 0xa3, 0x5a, 0x10, 0x43, + 0xf0, 0x4b, 0xcb, 0x82, 0x4d, 0xa0, 0x9b, 0x9b, 0xe8, 0x05, 0x4f, 0x2d, 0xf3, 0xcd, 0x60, 0x4a, + 0x82, 0xf2, 0x46, 0xee, 0x26, 0xde, 0x37, 0x5b, 0x23, 0xa9, 0x91, 0x65, 0x10, 0xce, 0xf1, 0x4e, + 0xcc, 0x1d, 0xb7, 0x61, 0x7c, 0x12, 0x6d, 0x95, 0x9e, 0x31, 0xb4, 0xd5, 0xbd, 0xcd, 0xd1, 0xd8, + 0x34, 0xeb, 0xa0, 0xc6, 0xe7, 0x6c, 0x14, 0x90, 0x1d, 0x5a, 0xe8, 0x97, 0x76, 0xcb, 0x4e, 0xa7, + 0xc1, 0x7b, 0x09, 0x49, 0xae, 0xd6, 0x55, 0xcb, 0x4a, 0xf4, 0xef, 0x69, 0xc3, 0xe4, 0x93, 0x37, + 0xd1, 0xa8, 0xc2, 0xcd, 0xe8, 0x3c, 0x85, 0x11, 0x23, 0xb8, 0x5b, 0x8f, 0xd1, 0xc4, 0xd0, 0x66, + 0x80, 0x28, 0x18, 0xb2, 0x9c, 0x6a, 0x02, 0xd4, 0xbb, 0x19, 0xdd, 0xe0, 0xee, 0xcd, 0x40, 0x75, + 0x27, 0x63, 0x29, 0x2f, 0x38, 0x20, 0x61, 0x9d, 0xca, 0x64, 0xbd, 0x32, 0xef, 0x72, 0x36, 0x0a, + 0xca, 0x65, 0x9e, 0xe8, 0xa1, 0x11, 0xd8, 0xab, 0x53, 0x54, 0x2d, 0xab, 0x92, 0x03, 0x25, 0x0d, + 0x73, 0x9f, 0xc0, 0x88, 0xc5, 0x68, 0x5c, 0xa5, 0xd5, 0xcd, 0x68, 0x0f, 0x8d, 0xcc, 0xbc, 0x3f, + 0x03, 0xbf, 0xd9, 0xce, 0x30, 0x4c, 0x42, 0xd4, 0xbe, 0x35, 0xb4, 0x61, 0x5d, 0xb1, 0x41, 0xf1, + 0xbb, 0xa5, 0x2e, 0x8b, 0xc1, 0x7d, 0x96, 0x5d, 0xf6, 0xb0, 0xd2, 0xa2, 0x5c, 0x6c, 0x80, 0xba, + 0xa1, 0x05, 0xd5, 0x99, 0x18, 0x3f, 0xe0, 0xe5, 0x3f, 0x8a, 0xf0, 0xc7, 0x7b, 0x6c, 0x31, 0x6b, + 0xd5, 0x0b, 0x07, 0x65, 0x94, 0xe9, 0xea, 0xb0, 0xcc, 0x3f, 0xd0, 0x69, 0x0b, 0xca, 0xb0, 0xfa, + 0xe9, 0xbd, 0x18, 0xad, 0x67, 0xe5, 0x44, 0x3d, 0xbd, 0x0a, 0xff, 0xe8, 0xe7, 0x69, 0xf6, 0x7a, + 0x7a, 0x19, 0x78, 0x57, 0xa7, 0x18, 0xf4, 0x9d, 0xff, 0x86, 0x93, 0x81, 0x3a, 0xc9, 0x47, 0xde, + 0x63, 0x9d, 0xe7, 0xb7, 0xce, 0x38, 0x59, 0x05, 0x53, 0x38, 0xc5, 0x34, 0x59, 0x0d, 0xd5, 0x5d, + 0xb5, 0xb1, 0xca, 0xd4, 0xa6, 0xea, 0xe6, 0x8b, 0xe5, 0xbf, 0x8c, 0x68, 0x96, 0xa7, 0xdf, 0xae, + 0xc4, 0x42, 0x71, 0x23, 0xa5, 0xe3, 0xba, 0xba, 0x12, 0x63, 0xc3, 0x76, 0xe9, 0xf2, 0x6c, 0xa4, + 0x05, 0x78, 0x20, 0xd5, 0xdb, 0xc5, 0x13, 0xd6, 0xc3, 0xf8, 0x1d, 0x9f, 0x1f, 0xbf, 0xaa, 0xae, + 0x54, 0x17, 0x9f, 0x8a, 0x3f, 0x4e, 0xf9, 0x1e, 0xe8, 0xdb, 0x0e, 0x2c, 0xf3, 0x00, 0x00, 0x00, + 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82, +}; + +const BITMAP_OPAQUE pad_enumerate_xpm[1] = {{ png, sizeof( png ), "pad_enumerate_xpm" }}; + +//EOF diff --git a/bitmaps_png/sources/lang_pt.svg b/bitmaps_png/sources/lang_pt.svg index 9319cfb3a5..eb86e2ad72 100644 --- a/bitmaps_png/sources/lang_pt.svg +++ b/bitmaps_png/sources/lang_pt.svg @@ -1,98 +1,367 @@ - - Flag of Brazil - - - - - + + + + + + image/svg+xml + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/bitmaps_png/sources/pad_enumerate.svg b/bitmaps_png/sources/pad_enumerate.svg new file mode 100644 index 0000000000..d2f7c9fedc --- /dev/null +++ b/bitmaps_png/sources/pad_enumerate.svg @@ -0,0 +1,91 @@ + + + + + + image/svg+xml + + + + + + + + + + + + + + 1,2,3 + diff --git a/include/bitmaps.h b/include/bitmaps.h index e31fd104f9..a5f61c9e81 100644 --- a/include/bitmaps.h +++ b/include/bitmaps.h @@ -399,6 +399,7 @@ EXTERN_BITMAP( orient_xpm ) EXTERN_BITMAP( pad_sketch_xpm ) EXTERN_BITMAP( pad_xpm ) EXTERN_BITMAP( pad_dimensions_xpm ) +EXTERN_BITMAP( pad_enumerate_xpm ) EXTERN_BITMAP( pads_mask_layers_xpm ) EXTERN_BITMAP( pagelayout_load_xpm ) EXTERN_BITMAP( pagelayout_load_default_xpm ) diff --git a/pcbnew/onrightclick.cpp b/pcbnew/onrightclick.cpp index 55801121ef..b1bb1b8c13 100644 --- a/pcbnew/onrightclick.cpp +++ b/pcbnew/onrightclick.cpp @@ -1,10 +1,10 @@ /* * This program source code file is part of KiCad, a free EDA CAD application. * - * Copyright (C) 2013 Jean-Pierre Charras, jp.charras at wanadoo.fr + * Copyright (C) 2015 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2013 SoftPLC Corporation, Dick Hollenbeck * Copyright (C) 2007-2013 Wayne Stambaugh - * Copyright (C) 1992-2013 KiCad Developers, see AUTHORS.txt for contributors. + * Copyright (C) 1992-2015 KiCad Developers, see AUTHORS.txt for contributors. * * This program is free software; you can redistribute it and/or * modify it under the terms of the GNU General Public License @@ -201,22 +201,22 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu ) AddMenuItem( aPopMenu, ID_POPUP_PCB_MOVE_DRAWING_REQUEST, msg, KiBitmap( move_xpm ) ); - msg = AddHotkeyName( _( "Duplicate Drawing" ), g_Module_Editor_Hokeys_Descr, + msg = AddHotkeyName( _( "Duplicate Drawing" ), g_Board_Editor_Hokeys_Descr, HK_DUPLICATE_ITEM ); AddMenuItem( aPopMenu, ID_POPUP_PCB_DUPLICATE_ITEM, msg, KiBitmap( duplicate_line_xpm ) ); - msg = AddHotkeyName( _("Move Drawing Exactly" ), g_Module_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Move Drawing Exactly" ), g_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM_EXACT ); AddMenuItem( aPopMenu, ID_POPUP_PCB_MOVE_EXACT, msg, KiBitmap( move_line_xpm ) ); - msg = AddHotkeyName( _("Create Drawing Array" ), g_Module_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Create Drawing Array" ), g_Board_Editor_Hokeys_Descr, HK_CREATE_ARRAY ); AddMenuItem( aPopMenu, ID_POPUP_PCB_CREATE_ARRAY, msg, KiBitmap( array_line_xpm ) ); - msg = AddHotkeyName( _( "Edit Drawing" ), g_Module_Editor_Hokeys_Descr, + msg = AddHotkeyName( _( "Edit Drawing" ), g_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM ); AddMenuItem( aPopMenu, ID_POPUP_PCB_EDIT_DRAWING, msg, KiBitmap( edit_xpm ) ); @@ -277,21 +277,16 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu ) AddMenuItem( aPopMenu, ID_POPUP_PCB_MOVE_TEXT_DIMENSION_REQUEST, msg, KiBitmap( move_text_xpm ) ); - msg = AddHotkeyName( _( "Duplicate Dimension" ), g_Module_Editor_Hokeys_Descr, + msg = AddHotkeyName( _( "Duplicate Dimension" ), g_Board_Editor_Hokeys_Descr, HK_DUPLICATE_ITEM ); AddMenuItem( aPopMenu, ID_POPUP_PCB_DUPLICATE_ITEM, msg, KiBitmap( duplicate_text_xpm ) ); - msg = AddHotkeyName( _("Move Dimension Exactly" ), g_Module_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Move Dimension Exactly" ), g_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM_EXACT ); AddMenuItem( aPopMenu, ID_POPUP_PCB_MOVE_EXACT, msg, KiBitmap( move_text_xpm ) ); - msg = AddHotkeyName( _("Create Dimension Array" ), g_Module_Editor_Hokeys_Descr, - HK_CREATE_ARRAY ); - AddMenuItem( aPopMenu, ID_POPUP_PCB_CREATE_ARRAY, - msg, KiBitmap( array_text_xpm ) ); - msg = AddHotkeyName( _( "Delete Dimension" ), g_Board_Editor_Hokeys_Descr, HK_DELETE ); @@ -308,17 +303,17 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu ) AddMenuItem( aPopMenu, ID_POPUP_PCB_MOVE_MIRE_REQUEST, msg, KiBitmap( move_target_xpm ) ); - msg = AddHotkeyName( _("Move Target Exactly" ), g_Module_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Move Target Exactly" ), g_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM_EXACT ); AddMenuItem( aPopMenu, ID_POPUP_PCB_MOVE_EXACT, msg, KiBitmap( move_target_xpm ) ); - msg = AddHotkeyName( _( "Duplicate Target" ), g_Module_Editor_Hokeys_Descr, + msg = AddHotkeyName( _( "Duplicate Target" ), g_Board_Editor_Hokeys_Descr, HK_DUPLICATE_ITEM ); AddMenuItem( aPopMenu, ID_POPUP_PCB_DUPLICATE_ITEM, msg, KiBitmap( duplicate_target_xpm ) ); - msg = AddHotkeyName( _("Create Target Array" ), g_Module_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Create Target Array" ), g_Board_Editor_Hokeys_Descr, HK_CREATE_ARRAY ); AddMenuItem( aPopMenu, ID_POPUP_PCB_CREATE_ARRAY, msg, KiBitmap( array_target_xpm ) ); @@ -561,17 +556,17 @@ void PCB_EDIT_FRAME::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu ) AddMenuItem( PopMenu, ID_POPUP_PCB_DRAG_TRACK_SEGMENT, msg, KiBitmap( drag_track_segment_xpm ) ); - msg = AddHotkeyName( _( "Duplicate Track" ), g_Module_Editor_Hokeys_Descr, + msg = AddHotkeyName( _( "Duplicate Track" ), g_Board_Editor_Hokeys_Descr, HK_DUPLICATE_ITEM ); AddMenuItem( PopMenu, ID_POPUP_PCB_DUPLICATE_ITEM, msg, KiBitmap( duplicate_line_xpm ) ); - msg = AddHotkeyName( _("Move Track Exactly" ), g_Module_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Move Track Exactly" ), g_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM_EXACT ); AddMenuItem( PopMenu, ID_POPUP_PCB_MOVE_EXACT, msg, KiBitmap( move_line_xpm ) ); - msg = AddHotkeyName( _("Create Track Array" ), g_Module_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Create Track Array" ), g_Board_Editor_Hokeys_Descr, HK_CREATE_ARRAY ); AddMenuItem( PopMenu, ID_POPUP_PCB_CREATE_ARRAY, msg, KiBitmap( array_line_xpm ) ); @@ -762,16 +757,6 @@ void PCB_EDIT_FRAME::createPopUpMenuForZones( ZONE_CONTAINER* edge_zone, wxMenu* AddMenuItem( zones_menu, ID_POPUP_PCB_ZONE_DUPLICATE, _( "Duplicate Zone Onto Layer" ), KiBitmap( zone_duplicate_xpm ) ); - msg = AddHotkeyName( _( "Duplicate Zone" ), g_Module_Editor_Hokeys_Descr, - HK_DUPLICATE_ITEM ); - AddMenuItem( zones_menu, ID_POPUP_PCB_DUPLICATE_ITEM, - msg, KiBitmap( zone_duplicate_xpm ) ); - - msg = AddHotkeyName( _("Create Zone Array" ), g_Module_Editor_Hokeys_Descr, - HK_CREATE_ARRAY ); - AddMenuItem( zones_menu, ID_POPUP_PCB_CREATE_ARRAY, - msg, KiBitmap( array_zone_xpm ) ); - zones_menu->AppendSeparator(); if( ! edge_zone->GetIsKeepout() ) @@ -787,7 +772,7 @@ void PCB_EDIT_FRAME::createPopUpMenuForZones( ZONE_CONTAINER* edge_zone, wxMenu* msg = AddHotkeyName( _( "Move Zone" ), g_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM ); AddMenuItem( zones_menu, ID_POPUP_PCB_MOVE_ZONE_OUTLINES, msg, KiBitmap( move_xpm ) ); - msg = AddHotkeyName( _("Move Zone Exactly" ), g_Module_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Move Zone Exactly" ), g_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM_EXACT ); AddMenuItem( zones_menu, ID_POPUP_PCB_MOVE_EXACT, msg, KiBitmap( move_zone_xpm ) ); @@ -829,17 +814,17 @@ void PCB_EDIT_FRAME::createPopUpMenuForFootprints( MODULE* aModule, wxMenu* menu AddMenuItem( sub_menu_footprint, ID_POPUP_PCB_MOVE_MODULE_REQUEST, msg, KiBitmap( move_module_xpm ) ); - msg = AddHotkeyName( _( "Duplicate" ), g_Module_Editor_Hokeys_Descr, + msg = AddHotkeyName( _( "Duplicate Footprint" ), g_Board_Editor_Hokeys_Descr, HK_DUPLICATE_ITEM ); AddMenuItem( menu, ID_POPUP_PCB_DUPLICATE_ITEM, msg, KiBitmap( duplicate_module_xpm ) ); - msg = AddHotkeyName( _("Move Exactly" ), g_Module_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Move Footprint Exactly" ), g_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM_EXACT ); AddMenuItem( menu, ID_POPUP_PCB_MOVE_EXACT, msg, KiBitmap( move_module_xpm ) ); - msg = AddHotkeyName( _("Create Array" ), g_Module_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Create Footprint Array" ), g_Board_Editor_Hokeys_Descr, HK_CREATE_ARRAY ); AddMenuItem( menu, ID_POPUP_PCB_CREATE_ARRAY, msg, KiBitmap( array_module_xpm ) ); @@ -895,32 +880,23 @@ void PCB_EDIT_FRAME::createPopUpMenuForFpTexts( TEXTE_MODULE* FpText, wxMenu* me if( !flags ) { - msg = AddHotkeyName( _( "Move" ), g_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM ); + msg = AddHotkeyName( _( "Move Text" ), g_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM ); AddMenuItem( sub_menu_Fp_text, ID_POPUP_PCB_MOVE_TEXTMODULE_REQUEST, msg, KiBitmap( move_field_xpm ) ); - msg = AddHotkeyName( _( "Duplicate" ), g_Module_Editor_Hokeys_Descr, - HK_DUPLICATE_ITEM ); - AddMenuItem( menu, ID_POPUP_PCB_DUPLICATE_ITEM, - msg, KiBitmap( duplicate_text_xpm ) ); - - msg = AddHotkeyName( _("Move Exactly" ), g_Module_Editor_Hokeys_Descr, + msg = AddHotkeyName( _("Move Text Exactly" ), g_Board_Editor_Hokeys_Descr, HK_MOVE_ITEM_EXACT ); - AddMenuItem( menu, ID_POPUP_PCB_MOVE_EXACT, + AddMenuItem( sub_menu_Fp_text, ID_POPUP_PCB_MOVE_EXACT, msg, KiBitmap( move_text_xpm ) ); - - msg = AddHotkeyName( _("Create Array" ), g_Module_Editor_Hokeys_Descr, - HK_CREATE_ARRAY ); - AddMenuItem( menu, ID_POPUP_PCB_CREATE_ARRAY, - msg, KiBitmap( array_text_xpm ) ); } - msg = AddHotkeyName( _( "Rotate" ), g_Board_Editor_Hokeys_Descr, HK_ROTATE_ITEM ); + msg = AddHotkeyName( _( "Rotate Text" ), g_Board_Editor_Hokeys_Descr, HK_ROTATE_ITEM ); AddMenuItem( sub_menu_Fp_text, ID_POPUP_PCB_ROTATE_TEXTMODULE, msg, KiBitmap( rotate_field_xpm ) ); + if( !flags ) { - msg = AddHotkeyName( _( "Edit" ), g_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM ); + msg = AddHotkeyName( _( "Edit Text" ), g_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM ); AddMenuItem( sub_menu_Fp_text, ID_POPUP_PCB_EDIT_TEXTMODULE, msg, KiBitmap( edit_text_xpm ) ); AddMenuItem( sub_menu_Fp_text, ID_POPUP_PCB_RESET_TEXT_SIZE, @@ -931,7 +907,7 @@ void PCB_EDIT_FRAME::createPopUpMenuForFpTexts( TEXTE_MODULE* FpText, wxMenu* me if( !flags && FpText->GetType() == TEXTE_MODULE::TEXT_is_DIVERS ) { AddMenuItem( sub_menu_Fp_text, ID_POPUP_PCB_DELETE_TEXTMODULE, - _( "Delete" ), KiBitmap( delete_xpm ) ); + _( "Delete Text" ), KiBitmap( delete_xpm ) ); } if( !flags ) @@ -965,12 +941,12 @@ void PCB_EDIT_FRAME::createPopUpMenuForFpPads( D_PAD* Pad, wxMenu* menu ) sub_menu_Pad = new wxMenu; AddMenuItem( menu, sub_menu_Pad, -1, msg, KiBitmap( pad_xpm ) ); - AddMenuItem( sub_menu_Pad, ID_POPUP_PCB_MOVE_PAD_REQUEST, _( "Move" ), + AddMenuItem( sub_menu_Pad, ID_POPUP_PCB_MOVE_PAD_REQUEST, _( "Move Pad" ), KiBitmap( move_pad_xpm ) ); - AddMenuItem( sub_menu_Pad, ID_POPUP_PCB_DRAG_PAD_REQUEST, _( "Drag" ), + AddMenuItem( sub_menu_Pad, ID_POPUP_PCB_DRAG_PAD_REQUEST, _( "Drag Pad" ), KiBitmap( drag_pad_xpm ) ); - msg = AddHotkeyName( _( "Edit" ), g_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM ); + msg = AddHotkeyName( _( "Edit Pad" ), g_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM ); AddMenuItem( sub_menu_Pad, ID_POPUP_PCB_EDIT_PAD, msg, KiBitmap( options_pad_xpm ) ); sub_menu_Pad->AppendSeparator(); diff --git a/pcbnew/tools/common_actions.cpp b/pcbnew/tools/common_actions.cpp index f0267a22af..599111c0e2 100644 --- a/pcbnew/tools/common_actions.cpp +++ b/pcbnew/tools/common_actions.cpp @@ -27,6 +27,8 @@ #include #include +// These members are static in class COMMON_ACTIONS: Build them here: + // Selection tool actions TOOL_ACTION COMMON_ACTIONS::selectionActivate( "pcbnew.InteractiveSelection", AS_GLOBAL, 0, @@ -373,7 +375,7 @@ TOOL_ACTION COMMON_ACTIONS::placePad( "pcbnew.ModuleEditor.placePad", TOOL_ACTION COMMON_ACTIONS::enumeratePads( "pcbnew.ModuleEditor.enumeratePads", AS_GLOBAL, 0, - _( "Enumerate pads" ), _( "Enumerate pads" ), NULL, AF_ACTIVATE ); + _( "Enumerate pads" ), _( "Enumerate pads" ), pad_enumerate_xpm, AF_ACTIVATE ); TOOL_ACTION COMMON_ACTIONS::copyItems( "pcbnew.ModuleEditor.copyItems", AS_GLOBAL, MD_CTRL + int( 'C' ), @@ -479,7 +481,7 @@ TOOL_ACTION COMMON_ACTIONS::alignBottom( "pcbnew.Place.alignBottom", TOOL_ACTION COMMON_ACTIONS::alignLeft( "pcbnew.Place.alignLeft", AS_GLOBAL, 0, _( "Align items to the left" ), - _( "Aligns selected items to the top left" ) ); + _( "Aligns selected items to the left edge" ) ); TOOL_ACTION COMMON_ACTIONS::alignRight( "pcbnew.Place.alignRight", AS_GLOBAL, 0, @@ -493,7 +495,7 @@ TOOL_ACTION COMMON_ACTIONS::distributeHorizontally( "pcbnew.Place.distributeHori TOOL_ACTION COMMON_ACTIONS::distributeVertically( "pcbnew.Place.distributeVertically", AS_GLOBAL, 0, - _( "Distribure vertically" ), + _( "Distribute vertically" ), _( "Distributes selected items along the vertical axis" ) ); diff --git a/pcbnew/tools/edit_tool.cpp b/pcbnew/tools/edit_tool.cpp index 52ca089125..a9caceb7ef 100644 --- a/pcbnew/tools/edit_tool.cpp +++ b/pcbnew/tools/edit_tool.cpp @@ -763,7 +763,15 @@ int EDIT_TOOL::Duplicate( const TOOL_EVENT& aEvent ) if( m_editModules ) new_item = editFrame->GetBoard()->m_Modules->DuplicateAndAddItem( item, increment ); else - new_item = editFrame->GetBoard()->DuplicateAndAddItem( item, increment ); + { +#if 0 + // @TODO: see if we allow zone duplication here + // Duplicate zones is especially tricky (overlaping zones must be merged) + // so zones are not duplicated + if( item->Type() != PCB_ZONE_AREA_T ) +#endif + new_item = editFrame->GetBoard()->DuplicateAndAddItem( item, increment ); + } if( new_item ) { @@ -872,18 +880,30 @@ int EDIT_TOOL::CreateArray( const TOOL_EVENT& aEvent ) BOARD_ITEM* newItem = NULL; if( ptN == 0 ) - { newItem = item; - } else { // if renumbering, no need to increment const bool increment = !array_opts->ShouldRenumberItems(); + // Some items cannot be duplicated + // i.e. the ref and value fields of a footprint or zones + // therefore newItem can be null + if( m_editModules ) newItem = editFrame->GetBoard()->m_Modules->DuplicateAndAddItem( item, increment ); else - newItem = editFrame->GetBoard()->DuplicateAndAddItem( item, increment ); + { +#if 0 + // @TODO: see if we allow zone duplication here + // Duplicate zones is especially tricky (overlaping zones must be merged) + // so zones are not duplicated + if( item->Type() == PCB_ZONE_AREA_T ) + newItem = NULL; + else +#endif + newItem = editFrame->GetBoard()->DuplicateAndAddItem( item, increment ); + } if( newItem ) { @@ -905,7 +925,7 @@ int EDIT_TOOL::CreateArray( const TOOL_EVENT& aEvent ) } // set the number if needed: - if( array_opts->ShouldRenumberItems() ) + if( newItem && array_opts->ShouldRenumberItems() ) { switch( newItem->Type() ) {