Dialog exit: better icon.

Pcbnew:
 * graphic_item_properties_base.fbp * dialog pad edit: make some strings more easier to translate.
 * global pad edition: fix a bug that change pad position instead of pad size (round pas only).
Eeschema:
 * fix a bug: new created wires were not alwaes shows until the screen was redrawn.
This commit is contained in:
jean-pierre charras 2012-03-09 19:58:58 +01:00
parent 672b55fd05
commit 909c2a6051
13 changed files with 11291 additions and 10843 deletions

View File

@ -510,6 +510,7 @@ set( BMAPS_MID
# 48 x 48 for now # 48 x 48 for now
set( BMAPS_BIG set( BMAPS_BIG
dialog_warning
icon_3d icon_3d
icon_cvpcb icon_cvpcb
icon_eeschema icon_eeschema

View File

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

View File

@ -0,0 +1,255 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<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="48px"
id="svg7299"
inkscape:output_extension="org.inkscape.output.svg.inkscape"
inkscape:version="0.48.1 "
sodipodi:docname="dialog-warning.svg"
sodipodi:version="0.32"
width="48px"
version="1.1">
<metadata
id="metadata3">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:title />
<dc:description />
<dc:subject>
<rdf:Bag>
<rdf:li>unsorted</rdf:li>
</rdf:Bag>
</dc:subject>
<dc:publisher>
<cc:Agent
rdf:about="http://www.openclipart.org/">
<dc:title>Open Clip Art Library, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors, Source: GNOME-Colors</dc:title>
</cc:Agent>
</dc:publisher>
<dc:creator>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:creator>
<dc:rights>
<cc:Agent>
<dc:title />
</cc:Agent>
</dc:rights>
<dc:date />
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<cc:license
rdf:resource="http://creativecommons.org/licenses/GPL/2.0/" />
<dc:language>en</dc:language>
</cc:Work>
</rdf:RDF>
</metadata>
<defs
id="defs7301">
<filter
height="1.8313844"
id="filter11277"
inkscape:collect="always"
width="1.0566853"
x="-0.02834265"
y="-0.4156922">
<feGaussianBlur
id="feGaussianBlur11279"
inkscape:collect="always"
stdDeviation="0.51961525" />
</filter>
<filter
height="3.4941532"
id="filter11267"
inkscape:collect="always"
width="1.1700559"
x="-0.08502795"
y="-1.2470766">
<feGaussianBlur
id="feGaussianBlur11269"
inkscape:collect="always"
stdDeviation="1.5588457" />
</filter>
<linearGradient
gradientUnits="userSpaceOnUse"
id="linearGradient11223"
x1="4.1914001"
x2="47.319698"
y1="11.1133"
y2="56.052299">
<stop
id="stop11225"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
id="stop11227"
offset="1"
style="stop-color:#ffffff;stop-opacity:0" />
</linearGradient>
<linearGradient
gradientTransform="matrix(0.646153,0,-0.00281268,0.671002,2.320937,4.636421)"
gradientUnits="userSpaceOnUse"
id="linearGradient11177"
inkscape:collect="always"
x1="22.858232"
x2="23.075396"
xlink:href="#linearGradient11223"
y1="27.427332"
y2="77.315834" />
<linearGradient
id="linearGradient5252">
<stop
id="stop5256"
offset="0"
style="stop-color:#fed496;stop-opacity:1;" />
<stop
id="stop5254"
offset="1"
style="stop-color:#fcaf3e;stop-opacity:1;" />
</linearGradient>
<radialGradient
cx="21.080828"
cy="27.925562"
fx="21.080828"
fy="27.925562"
gradientTransform="matrix(2.794628,0,0,2.6342217,-37.832243,-46.946604)"
gradientUnits="userSpaceOnUse"
id="radialGradient11221"
inkscape:collect="always"
r="8.803154"
xlink:href="#linearGradient5252" />
<linearGradient
id="linearGradient5402"
inkscape:collect="always">
<stop
id="stop5404"
offset="0"
style="stop-color:#ffffff;stop-opacity:1;" />
<stop
id="stop5406"
offset="1"
style="stop-color:#ffffff;stop-opacity:0;" />
</linearGradient>
<radialGradient
cx="79.377068"
cy="44.534161"
fx="79.377068"
fy="44.534161"
gradientTransform="matrix(0.5111798,0,0,0.4916103,-18.445765,-11.688203)"
gradientUnits="userSpaceOnUse"
id="radialGradient11181"
inkscape:collect="always"
r="50.66839"
xlink:href="#linearGradient5402" />
</defs>
<sodipodi:namedview
bordercolor="#666666"
borderopacity="1.0"
id="base"
inkscape:current-layer="layer1"
inkscape:cx="24.055179"
inkscape:cy="24.019671"
inkscape:document-units="px"
inkscape:grid-bbox="true"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:window-height="688"
inkscape:window-width="641"
inkscape:window-x="260"
inkscape:window-y="167"
inkscape:zoom="7"
pagecolor="#ffffff"
showgrid="true"
inkscape:window-maximized="0" />
<g
id="layer1"
inkscape:groupmode="layer"
inkscape:label="Layer 1">
<rect
height="3"
id="rect11271"
rx="3.25"
ry="1.5"
style="opacity:0.3;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline;filter:url(#filter11277);enable-background:new"
transform="matrix(1,0,0,1.3333333,-296,-80.833333)"
width="44"
x="298"
y="91" />
<rect
height="3"
id="rect11249"
rx="3.25"
ry="1.5"
style="opacity:0.5;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline;filter:url(#filter11267);enable-background:new"
transform="matrix(1,0,0,1.5833333,-296,-103.95833)"
width="44"
x="298"
y="91" />
<g
id="g11137"
style="display:inline;enable-background:new"
transform="matrix(1.6642077,0,0,1.7057624,-11.330187,-28.512243)">
<g
id="g11139"
style="display:inline"
transform="matrix(0.01508284,0,0,0.01391344,34.42474,40.95434)" />
<g
id="g11147"
style="display:inline"
transform="matrix(0.01508284,0,0,0.01391344,34.42474,40.95434)" />
<path
d="M 34.661531,40.883147 22.706683,18.443515 c -0.343618,-0.623323 -0.965385,-0.969613 -1.657845,-0.969613 -0.692462,0 -1.317417,0.415547 -1.666257,1.038871 L 7.5167568,40.952406 c -0.2793053,0.554065 -0.282496,1.315904 0.061415,1.869969 0.3439093,0.554065 0.8967188,0.831097 1.5891806,0.831097 l 23.8206686,0 c 0.69246,0 1.317126,-0.34629 1.596433,-0.900356 0.34855,-0.554065 0.35145,-1.246645 0.07708,-1.869969 z"
id="path11155"
inkscape:r_cx="true"
inkscape:r_cy="true"
style="fill:#f57900;fill-opacity:1;fill-rule:nonzero;stroke:#ce5c00;stroke-width:0.63829809;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<path
d="m 12.350235,39.643509 c -0.180686,0.297681 -0.0023,0.535827 0.296738,0.535827 l 16.865083,0 c 0.299028,0 0.47946,-0.238146 0.301316,-0.535827 L 21.328843,23.806857 c -0.178145,-0.297681 -0.417365,-0.297681 -0.538248,0 l -8.44036,15.836652 z"
id="path11157"
inkscape:r_cx="true"
inkscape:r_cy="true"
style="fill:url(#radialGradient11221);fill-opacity:1;fill-rule:nonzero;stroke:none"
inkscape:connector-curvature="0" />
<path
d="M 33.589554,40.372476 22.40647,19.408588 c -0.476278,-0.903101 -0.647108,-1.192852 -1.370915,-1.192852 -0.62253,0 -0.948257,0.421984 -1.398129,1.274438 L 8.5784665,40.437181 c -0.6421717,1.176051 -0.7109747,1.482604 -0.4018775,2.000231 0.3090955,0.517628 0.7059594,0.489435 2.172334,0.5232 l 21.735721,0 c 1.365168,0.01688 1.672683,-0.08716 1.923863,-0.604785 0.313433,-0.517629 0.180116,-0.928304 -0.418953,-1.983351 z"
id="path11159"
inkscape:r_cx="true"
inkscape:r_cy="true"
sodipodi:nodetypes="ccsccscccc"
style="opacity:0.5;fill:none;stroke:url(#linearGradient11177);stroke-width:0.63829821;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none"
inkscape:connector-curvature="0" />
<g
id="g11161"
inkscape:r_cx="true"
inkscape:r_cy="true"
style="fill:#121312;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-width:0.98018837;stroke-miterlimit:4"
transform="matrix(0.561759,0,0,0.570854,7.608308,17.60115)">
<path
d="m 23.9,36.5 c -1.3,0 -2.3,-1 -2.3,-2.3 0,-1.4 0.9,-2.3 2.3,-2.3 1.4,0 2.2,0.9 2.3,2.3 0,1.3 -0.9,2.3 -2.3,2.3 l 0,0 z M 23.167629,29.066754 21.9,19.1 l 4,0 -1.267629,11.609518 -1.464742,-1.642764 z"
id="path11163"
inkscape:r_cx="true"
inkscape:r_cy="true"
sodipodi:nodetypes="csscccccccc"
style="fill:#121312;fill-opacity:1;stroke:none"
inkscape:connector-curvature="0" />
</g>
</g>
<path
d="M 23.982235,3.0642796 C 22.983955,3.0642796 22.084515,3.6634646 21.581625,4.5632536 L 6.9499354,32.262453 L 37.310435,25.017218 L 26.371965,4.4600786 C 25.876595,3.5602906 24.980525,3.0642796 23.982235,3.0642796 z"
id="path11179"
style="opacity:0.47126435;fill:url(#radialGradient11181);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.63829809;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1;display:inline;enable-background:new" />
</g>
</svg>

After

Width:  |  Height:  |  Size: 9.7 KiB

View File

@ -17,7 +17,7 @@ public:
DIALOG_EXIT( wxWindow * parent, const wxString& aMessage ) : DIALOG_EXIT( wxWindow * parent, const wxString& aMessage ) :
DIALOG_EXIT_BASE( parent ) DIALOG_EXIT_BASE( parent )
{ {
m_bitmap->SetBitmap( KiBitmap( cancel_xpm ) ); m_bitmap->SetBitmap( KiBitmap( dialog_warning_xpm ) );
if( ! aMessage.IsEmpty() ) if( ! aMessage.IsEmpty() )
m_TextInfo->SetLabel( aMessage ); m_TextInfo->SetLabel( aMessage );
GetSizer()->Fit( this ); GetSizer()->Fit( this );

View File

@ -250,7 +250,7 @@ void SCH_EDIT_FRAME::EndSegment( wxDC* DC )
screen->Append( tmp ); screen->Append( tmp );
// Correct and remove segments that need merged. // Correct and remove segments that need merged.
screen->SchematicCleanUp( m_canvas, DC ); screen->SchematicCleanUp( NULL, DC );
// A junction may be needed to connect the last segment. If the last segment was // A junction may be needed to connect the last segment. If the last segment was
// removed by a cleanup, a junction may be needed to connect the segment's end point // removed by a cleanup, a junction may be needed to connect the segment's end point
@ -276,7 +276,8 @@ void SCH_EDIT_FRAME::EndSegment( wxDC* DC )
// Now add the new wires and any required junctions to the schematic item list. // Now add the new wires and any required junctions to the schematic item list.
screen->Append( s_wires ); screen->Append( s_wires );
screen->SchematicCleanUp( m_canvas, DC ); screen->SchematicCleanUp( NULL, DC );
m_canvas->Refresh();
// Put the snap shot of the previous wire, buses, and junctions in the undo/redo list. // Put the snap shot of the previous wire, buses, and junctions in the undo/redo list.
PICKED_ITEMS_LIST oldItems; PICKED_ITEMS_LIST oldItems;

View File

@ -152,6 +152,7 @@ EXTERN_BITMAP( delete_sheet_xpm )
EXTERN_BITMAP( delete_text_xpm ) EXTERN_BITMAP( delete_text_xpm )
EXTERN_BITMAP( delete_track_xpm ) EXTERN_BITMAP( delete_track_xpm )
EXTERN_BITMAP( delete_xpm ) EXTERN_BITMAP( delete_xpm )
EXTERN_BITMAP( dialog_warning_xpm )
EXTERN_BITMAP( directory_xpm ) EXTERN_BITMAP( directory_xpm )
EXTERN_BITMAP( display_options_xpm ) EXTERN_BITMAP( display_options_xpm )
EXTERN_BITMAP( down_xpm ) EXTERN_BITMAP( down_xpm )

File diff suppressed because it is too large Load Diff

View File

@ -215,17 +215,21 @@ void DIALOG_MODEDIT_FP_BODY_ITEM_PROPERTIES::OnOkClick( wxCommandEvent& event )
wxString msg; wxString msg;
msg = m_Center_StartXCtrl->GetValue(); wxPoint coord;
m_item->SetStartX( ReturnValueFromString( g_UserUnit, msg, m_parent->GetInternalUnits() ));
msg = m_Center_StartXCtrl->GetValue();
coord.x = ReturnValueFromString( g_UserUnit, msg, m_parent->GetInternalUnits() );
msg = m_Center_StartYCtrl->GetValue(); msg = m_Center_StartYCtrl->GetValue();
m_item->SetStartY( ReturnValueFromString( g_UserUnit, msg, m_parent->GetInternalUnits() )); coord.y = ReturnValueFromString( g_UserUnit, msg, m_parent->GetInternalUnits() );
m_item->SetStart( coord );
m_item->SetStart0( coord );
msg = m_EndX_Radius_Ctrl->GetValue(); msg = m_EndX_Radius_Ctrl->GetValue();
m_item->SetEndX( ReturnValueFromString( g_UserUnit, msg, m_parent->GetInternalUnits() )); coord.x = ReturnValueFromString( g_UserUnit, msg, m_parent->GetInternalUnits() );
msg = m_EndY_Ctrl->GetValue(); msg = m_EndY_Ctrl->GetValue();
m_item->SetEndY( ReturnValueFromString( g_UserUnit, msg, m_parent->GetInternalUnits() )); coord.y = ReturnValueFromString( g_UserUnit, msg, m_parent->GetInternalUnits() );
m_item->SetEnd( coord );
m_item->SetEnd0( coord );
msg = m_ThicknessCtrl->GetValue(); msg = m_ThicknessCtrl->GetValue();
m_item->SetWidth( ReturnValueFromString( g_UserUnit, msg, m_parent->GetInternalUnits() )); m_item->SetWidth( ReturnValueFromString( g_UserUnit, msg, m_parent->GetInternalUnits() ));

View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?> <?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<wxFormBuilder_Project> <wxFormBuilder_Project>
<FileVersion major="1" minor="10" /> <FileVersion major="1" minor="11" />
<object class="Project" expanded="1"> <object class="Project" expanded="1">
<property name="class_decoration" /> <property name="class_decoration" />
<property name="code_generation">C++</property> <property name="code_generation">C++</property>

File diff suppressed because it is too large Load Diff

File diff suppressed because it is too large Load Diff

View File

@ -1,168 +1,168 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Aug 24 2011) // C++ code generated with wxFormBuilder (version Jun 30 2011)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#ifndef __DIALOG_PAD_PROPERTIES_BASE_H__ #ifndef __DIALOG_PAD_PROPERTIES_BASE_H__
#define __DIALOG_PAD_PROPERTIES_BASE_H__ #define __DIALOG_PAD_PROPERTIES_BASE_H__
#include <wx/artprov.h> #include <wx/artprov.h>
#include <wx/xrc/xmlres.h> #include <wx/xrc/xmlres.h>
#include <wx/intl.h> #include <wx/intl.h>
#include <wx/string.h> #include <wx/string.h>
#include <wx/stattext.h> #include <wx/stattext.h>
#include <wx/gdicmn.h> #include <wx/gdicmn.h>
#include <wx/font.h> #include <wx/font.h>
#include <wx/colour.h> #include <wx/colour.h>
#include <wx/settings.h> #include <wx/settings.h>
#include <wx/textctrl.h> #include <wx/textctrl.h>
#include <wx/choice.h> #include <wx/choice.h>
#include <wx/sizer.h> #include <wx/sizer.h>
#include <wx/statbox.h> #include <wx/statbox.h>
#include <wx/checkbox.h> #include <wx/checkbox.h>
#include <wx/panel.h> #include <wx/panel.h>
#include <wx/bitmap.h> #include <wx/bitmap.h>
#include <wx/image.h> #include <wx/image.h>
#include <wx/icon.h> #include <wx/icon.h>
#include <wx/notebook.h> #include <wx/notebook.h>
#include <wx/button.h> #include <wx/button.h>
#include <wx/dialog.h> #include <wx/dialog.h>
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_PAD_PROPERTIES_BASE /// Class DIALOG_PAD_PROPERTIES_BASE
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
class DIALOG_PAD_PROPERTIES_BASE : public wxDialog class DIALOG_PAD_PROPERTIES_BASE : public wxDialog
{ {
private: private:
protected: protected:
enum enum
{ {
wxID_DIALOG_EDIT_PAD = 1000, wxID_DIALOG_EDIT_PAD = 1000,
wxID_PADNUMCTRL, wxID_PADNUMCTRL,
wxID_PADNETNAMECTRL, wxID_PADNETNAMECTRL,
}; };
wxNotebook* m_notebook1; wxNotebook* m_notebook1;
wxPanel* m_panel2; wxPanel* m_panel2;
wxStaticText* m_PadNumText; wxStaticText* m_PadNumText;
wxTextCtrl* m_PadNumCtrl; wxTextCtrl* m_PadNumCtrl;
wxStaticText* m_PadNameText; wxStaticText* m_PadNameText;
wxTextCtrl* m_PadNetNameCtrl; wxTextCtrl* m_PadNetNameCtrl;
wxStaticText* m_staticText44; wxStaticText* m_staticText44;
wxChoice* m_PadType; wxChoice* m_PadType;
wxStaticText* m_staticText45; wxStaticText* m_staticText45;
wxChoice* m_PadShape; wxChoice* m_PadShape;
wxStaticText* m_staticText46; wxStaticText* m_staticText46;
wxStaticText* m_staticText4; wxStaticText* m_staticText4;
wxTextCtrl* m_PadPosition_X_Ctrl; wxTextCtrl* m_PadPosition_X_Ctrl;
wxStaticText* m_PadPosX_Unit; wxStaticText* m_PadPosX_Unit;
wxStaticText* m_staticText41; wxStaticText* m_staticText41;
wxTextCtrl* m_PadPosition_Y_Ctrl; wxTextCtrl* m_PadPosition_Y_Ctrl;
wxStaticText* m_PadPosY_Unit; wxStaticText* m_PadPosY_Unit;
wxStaticText* m_staticText12; wxStaticText* m_staticText12;
wxTextCtrl* m_ShapeSize_X_Ctrl; wxTextCtrl* m_ShapeSize_X_Ctrl;
wxStaticText* m_PadShapeSizeX_Unit; wxStaticText* m_PadShapeSizeX_Unit;
wxStaticText* m_staticText15; wxStaticText* m_staticText15;
wxTextCtrl* m_ShapeSize_Y_Ctrl; wxTextCtrl* m_ShapeSize_Y_Ctrl;
wxStaticText* m_PadShapeSizeY_Unit; wxStaticText* m_PadShapeSizeY_Unit;
wxStaticText* m_staticText48; wxStaticText* m_staticText48;
wxChoice* m_PadOrient; wxChoice* m_PadOrient;
wxStaticText* m_staticText491; wxStaticText* m_staticText491;
wxStaticText* m_PadOrientText; wxStaticText* m_PadOrientText;
wxTextCtrl* m_PadOrientCtrl; wxTextCtrl* m_PadOrientCtrl;
wxStaticText* m_customOrientUnits; wxStaticText* m_customOrientUnits;
wxStaticText* m_staticText17; wxStaticText* m_staticText17;
wxTextCtrl* m_ShapeOffset_X_Ctrl; wxTextCtrl* m_ShapeOffset_X_Ctrl;
wxStaticText* m_PadShapeOffsetX_Unit; wxStaticText* m_PadShapeOffsetX_Unit;
wxStaticText* m_staticText19; wxStaticText* m_staticText19;
wxTextCtrl* m_ShapeOffset_Y_Ctrl; wxTextCtrl* m_ShapeOffset_Y_Ctrl;
wxStaticText* m_PadShapeOffsetY_Unit; wxStaticText* m_PadShapeOffsetY_Unit;
wxStaticText* m_staticText38; wxStaticText* m_staticText38;
wxTextCtrl* m_LengthDieCtrl; wxTextCtrl* m_LengthDieCtrl;
wxStaticText* m_PadLengthDie_Unit; wxStaticText* m_PadLengthDie_Unit;
wxStaticText* m_staticText21; wxStaticText* m_staticText21;
wxTextCtrl* m_ShapeDelta_Ctrl; wxTextCtrl* m_ShapeDelta_Ctrl;
wxStaticText* m_PadShapeDelta_Unit; wxStaticText* m_PadShapeDelta_Unit;
wxStaticText* m_staticText23; wxStaticText* m_staticText23;
wxChoice* m_trapDeltaDirChoice; wxChoice* m_trapDeltaDirChoice;
wxBoxSizer* m_DrillShapeBoxSizer; wxBoxSizer* m_DrillShapeBoxSizer;
wxStaticText* m_staticTitleModuleRot; wxStaticText* m_staticTitleModuleRot;
wxStaticText* m_staticModuleRotValue; wxStaticText* m_staticModuleRotValue;
wxStaticText* m_staticTitleModuleSide; wxStaticText* m_staticTitleModuleSide;
wxStaticText* m_staticModuleSideValue; wxStaticText* m_staticModuleSideValue;
wxStaticText* m_staticTextWarningPadFlipped; wxStaticText* m_staticTextWarningPadFlipped;
wxStaticText* m_staticText47; wxStaticText* m_staticText47;
wxChoice* m_DrillShapeCtrl; wxChoice* m_DrillShapeCtrl;
wxStaticText* m_staticText51; wxStaticText* m_staticText51;
wxStaticText* m_textPadDrillX; wxStaticText* m_textPadDrillX;
wxTextCtrl* m_PadDrill_X_Ctrl; wxTextCtrl* m_PadDrill_X_Ctrl;
wxStaticText* m_PadDrill_X_Unit; wxStaticText* m_PadDrill_X_Unit;
wxStaticText* m_textPadDrillY; wxStaticText* m_textPadDrillY;
wxTextCtrl* m_PadDrill_Y_Ctrl; wxTextCtrl* m_PadDrill_Y_Ctrl;
wxStaticText* m_PadDrill_Y_Unit; wxStaticText* m_PadDrill_Y_Unit;
wxStaticText* m_staticText511; wxStaticText* m_staticText511;
wxChoice* m_rbCopperLayersSel; wxChoice* m_rbCopperLayersSel;
wxCheckBox* m_PadLayerAdhCmp; wxCheckBox* m_PadLayerAdhCmp;
wxCheckBox* m_PadLayerAdhCu; wxCheckBox* m_PadLayerAdhCu;
wxCheckBox* m_PadLayerPateCmp; wxCheckBox* m_PadLayerPateCmp;
wxCheckBox* m_PadLayerPateCu; wxCheckBox* m_PadLayerPateCu;
wxCheckBox* m_PadLayerSilkCmp; wxCheckBox* m_PadLayerSilkCmp;
wxCheckBox* m_PadLayerSilkCu; wxCheckBox* m_PadLayerSilkCu;
wxCheckBox* m_PadLayerMaskCmp; wxCheckBox* m_PadLayerMaskCmp;
wxCheckBox* m_PadLayerMaskCu; wxCheckBox* m_PadLayerMaskCu;
wxCheckBox* m_PadLayerDraft; wxCheckBox* m_PadLayerDraft;
wxCheckBox* m_PadLayerECO1; wxCheckBox* m_PadLayerECO1;
wxCheckBox* m_PadLayerECO2; wxCheckBox* m_PadLayerECO2;
wxPanel* m_panelShowPad; wxPanel* m_panelShowPad;
wxPanel* m_localSettingsPanel; wxPanel* m_localSettingsPanel;
wxStaticText* m_staticTextNetClearance; wxStaticText* m_staticTextNetClearance;
wxTextCtrl* m_NetClearanceValueCtrl; wxTextCtrl* m_NetClearanceValueCtrl;
wxStaticText* m_NetClearanceUnits; wxStaticText* m_NetClearanceUnits;
wxStaticText* m_MaskClearanceTitle; wxStaticText* m_MaskClearanceTitle;
wxTextCtrl* m_SolderMaskMarginCtrl; wxTextCtrl* m_SolderMaskMarginCtrl;
wxStaticText* m_SolderMaskMarginUnits; wxStaticText* m_SolderMaskMarginUnits;
wxStaticText* m_staticTextSolderPaste; wxStaticText* m_staticTextSolderPaste;
wxTextCtrl* m_SolderPasteMarginCtrl; wxTextCtrl* m_SolderPasteMarginCtrl;
wxStaticText* m_SolderPasteMarginUnits; wxStaticText* m_SolderPasteMarginUnits;
wxStaticText* m_staticTextRatio; wxStaticText* m_staticTextRatio;
wxTextCtrl* m_SolderPasteMarginRatioCtrl; wxTextCtrl* m_SolderPasteMarginRatioCtrl;
wxStaticText* m_SolderPasteRatioMarginUnits; wxStaticText* m_SolderPasteRatioMarginUnits;
wxStaticText* m_staticText40; wxStaticText* m_staticText40;
wxChoice* m_ZoneConnectionChoice; wxChoice* m_ZoneConnectionChoice;
wxStaticText* m_staticText43; wxStaticText* m_staticText43;
wxStaticText* m_staticText49; wxStaticText* m_staticText49;
wxTextCtrl* m_ThermalWidthCtrl; wxTextCtrl* m_ThermalWidthCtrl;
wxStaticText* m_ThermalWidthUnits; wxStaticText* m_ThermalWidthUnits;
wxStaticText* m_staticText52; wxStaticText* m_staticText52;
wxTextCtrl* m_ThermalGapCtrl; wxTextCtrl* m_ThermalGapCtrl;
wxStaticText* m_ThermalGapUnits; wxStaticText* m_ThermalGapUnits;
wxStaticText* m_staticTextWarning; wxStaticText* m_staticTextWarning;
wxStdDialogButtonSizer* m_sdbSizer1; wxStdDialogButtonSizer* m_sdbSizer1;
wxButton* m_sdbSizer1OK; wxButton* m_sdbSizer1OK;
wxButton* m_sdbSizer1Cancel; wxButton* m_sdbSizer1Cancel;
// Virtual event handlers, overide them in your derived class // Virtual event handlers, overide them in your derived class
virtual void OnValuesChanged( wxCommandEvent& event ) { event.Skip(); } virtual void OnValuesChanged( wxCommandEvent& event ) { event.Skip(); }
virtual void PadTypeSelected( wxCommandEvent& event ) { event.Skip(); } virtual void PadTypeSelected( wxCommandEvent& event ) { event.Skip(); }
virtual void OnPadShapeSelection( wxCommandEvent& event ) { event.Skip(); } virtual void OnPadShapeSelection( wxCommandEvent& event ) { event.Skip(); }
virtual void PadOrientEvent( wxCommandEvent& event ) { event.Skip(); } virtual void PadOrientEvent( wxCommandEvent& event ) { event.Skip(); }
virtual void OnSetLayers( wxCommandEvent& event ) { event.Skip(); } virtual void OnSetLayers( wxCommandEvent& event ) { event.Skip(); }
virtual void OnDrillShapeSelected( wxCommandEvent& event ) { event.Skip(); } virtual void OnDrillShapeSelected( wxCommandEvent& event ) { event.Skip(); }
virtual void OnPaintShowPanel( wxPaintEvent& event ) { event.Skip(); } virtual void OnPaintShowPanel( wxPaintEvent& event ) { event.Skip(); }
virtual void OnCancelButtonClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnCancelButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void PadPropertiesAccept( wxCommandEvent& event ) { event.Skip(); } virtual void PadPropertiesAccept( wxCommandEvent& event ) { event.Skip(); }
public: public:
DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_DIALOG_EDIT_PAD, const wxString& title = _("Pad Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 1000,750 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSUNKEN_BORDER ); DIALOG_PAD_PROPERTIES_BASE( wxWindow* parent, wxWindowID id = wxID_DIALOG_EDIT_PAD, const wxString& title = _("Pad Properties"), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 857,618 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSUNKEN_BORDER );
~DIALOG_PAD_PROPERTIES_BASE(); ~DIALOG_PAD_PROPERTIES_BASE();
}; };
#endif //__DIALOG_PAD_PROPERTIES_BASE_H__ #endif //__DIALOG_PAD_PROPERTIES_BASE_H__

View File

@ -335,7 +335,11 @@ void PCB_BASE_FRAME::GlobalChange_PadSettings( D_PAD* aPad,
} }
if( pad->GetShape() == PAD_CIRCLE ) if( pad->GetShape() == PAD_CIRCLE )
pad->SetY( pad->GetSize().x ); {
// Ensure pad size.y = pad size.x
int size = pad->GetSize().x;
pad->SetSize( wxSize( size, size ) );
}
switch( pad->GetAttribute() ) switch( pad->GetAttribute() )
{ {