7
mirror of https://gitlab.com/kicad/code/kicad.git synced 2025-04-18 20:09:18 +00:00

Dialog consistency and beautification.

Small icons for dialog browse, refresh, and row operations.
Icons in B&W so they don't over-emphasize with respect to other
controls in the dialog.

Layout cleanup for consistency.  Removal of the blank space to
left of the fields list in the Global Fields Editor, and addition
of column-sizing-to-list-width.

More even spacing for buttons in html report panel.

Honor platform conventions for action button order and layout.

Move netlist importer to update-pcb-from-schematic algorithm
(display messages and then update instead of "dry run" checkbox)

(cherry picked from commit b21e19d)
This commit is contained in:
Jeff Young 2018-02-28 09:44:22 +00:00
parent c291505830
commit e9d877914d
55 changed files with 5949 additions and 6500 deletions

View File

@ -72,8 +72,9 @@ include_directories(
# A corresponding ${basename}.svg file must exist in 'sources' dir below here.
# small icons (16x16) needed in listboxes
# small icons (16x16) needed in listboxes and dialog buttons
set( BMAPS_SMALL
folder
pinorient_right
pinorient_left
pinorient_up
@ -99,6 +100,10 @@ set( BMAPS_SMALL
pintype_openemit
pintype_noconnect
refresh
small_down
small_plus
small_up
trash
tree_nosel
tree_sel
)

View File

@ -0,0 +1,28 @@
/* 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, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64,
0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc4, 0x00, 0x00, 0x0e,
0xc4, 0x01, 0x95, 0x2b, 0x0e, 0x1b, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f,
0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63,
0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x00, 0x6a, 0x49,
0x44, 0x41, 0x54, 0x38, 0x8d, 0xed, 0xd2, 0x31, 0x0a, 0x83, 0x40, 0x10, 0x85, 0xe1, 0x0f, 0x11,
0x3b, 0x9b, 0x3d, 0xb3, 0xa4, 0x30, 0xb7, 0xc8, 0x49, 0xbc, 0x8d, 0x57, 0xc8, 0x5a, 0x68, 0x8a,
0x2c, 0x11, 0xad, 0x76, 0x0d, 0x82, 0x85, 0x3f, 0x0c, 0x0c, 0x03, 0xef, 0x9f, 0xe6, 0x71, 0x15,
0x1e, 0x88, 0x58, 0x30, 0x63, 0x40, 0x5b, 0x22, 0x88, 0x08, 0x69, 0xaf, 0xf0, 0x4a, 0xd2, 0x6c,
0x96, 0xc2, 0x89, 0xe8, 0xf6, 0x82, 0x12, 0x02, 0xde, 0xff, 0x08, 0x7e, 0x99, 0xea, 0x40, 0x70,
0xc3, 0x2d, 0x58, 0x05, 0x93, 0xb5, 0x48, 0x39, 0x04, 0xdf, 0x2e, 0xa8, 0xd3, 0xe1, 0x89, 0x11,
0x4d, 0xa6, 0x60, 0x42, 0x5f, 0xf0, 0xf0, 0x44, 0x3e, 0x5a, 0x6d, 0x1d, 0x1a, 0x7b, 0xbc, 0xb7,
0x37, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE folder_xpm[1] = {{ png, sizeof( png ), "folder_xpm" }};
//EOF

View File

@ -0,0 +1,38 @@
/* 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, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64,
0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc4, 0x00, 0x00, 0x0e,
0xc4, 0x01, 0x95, 0x2b, 0x0e, 0x1b, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f,
0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63,
0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x00, 0x44, 0x74,
0x45, 0x58, 0x74, 0x43, 0x6f, 0x70, 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x00, 0x43, 0x43, 0x20,
0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x68, 0x74, 0x74, 0x70,
0x3a, 0x2f, 0x2f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x76, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
0x6e, 0x73, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x6c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x73, 0x2f,
0x62, 0x79, 0x2f, 0x34, 0x2e, 0x30, 0x2f, 0x69, 0x10, 0xd7, 0x5d, 0x00, 0x00, 0x00, 0xb5, 0x49,
0x44, 0x41, 0x54, 0x38, 0x8d, 0xbd, 0xd1, 0xb1, 0x6a, 0x02, 0x41, 0x18, 0x45, 0xe1, 0x4f, 0x3b,
0x21, 0x6c, 0xa3, 0x85, 0x10, 0x52, 0x05, 0x6c, 0x6d, 0x6c, 0x03, 0x12, 0x10, 0x52, 0xa4, 0xb0,
0xf1, 0x09, 0x7c, 0x9c, 0xc5, 0x47, 0xb2, 0xd1, 0x4e, 0x2b, 0x53, 0xd8, 0x08, 0x96, 0x96, 0x11,
0x04, 0x43, 0x8a, 0xa0, 0x16, 0xbb, 0x0b, 0x29, 0xd6, 0x9d, 0x55, 0xd1, 0x5b, 0x0d, 0x33, 0xff,
0x3d, 0x9c, 0x99, 0xe1, 0xce, 0x79, 0x41, 0xe7, 0x16, 0xc0, 0x08, 0xf3, 0xa2, 0x81, 0x6a, 0x00,
0x50, 0x0d, 0xcd, 0x84, 0x00, 0xc7, 0xc0, 0x79, 0x10, 0x00, 0x95, 0x87, 0x1a, 0x3c, 0xe5, 0x00,
0x4a, 0x1b, 0xbc, 0xe3, 0x1b, 0xfd, 0x02, 0x40, 0x13, 0x4b, 0xc4, 0x79, 0xb0, 0x1a, 0x26, 0xf8,
0xc5, 0x47, 0xba, 0x17, 0x63, 0x91, 0xae, 0xeb, 0xf8, 0xc2, 0x16, 0xed, 0x73, 0x46, 0x91, 0xe4,
0xdf, 0x7f, 0xd0, 0xfd, 0x07, 0x88, 0x30, 0xc3, 0x1e, 0x6f, 0x45, 0x57, 0x82, 0x46, 0xaa, 0xb9,
0xc3, 0x18, 0x2b, 0x4c, 0x53, 0xb3, 0x5e, 0xa8, 0x9c, 0xe5, 0x19, 0x6b, 0xc9, 0x1b, 0x1c, 0xf1,
0x87, 0x41, 0xd9, 0x72, 0x96, 0x57, 0x6c, 0x70, 0xc0, 0xf0, 0xd2, 0x72, 0x96, 0x16, 0x3e, 0xaf,
0x2d, 0x97, 0xca, 0x09, 0x31, 0x9f, 0x20, 0x35, 0xde, 0x1e, 0xd4, 0xa5, 0x00, 0x00, 0x00, 0x00,
0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE small_down_xpm[1] = {{ png, sizeof( png ), "small_down_xpm" }};
//EOF

View File

@ -0,0 +1,30 @@
/* 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, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64,
0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc4, 0x00, 0x00, 0x0e,
0xc4, 0x01, 0x95, 0x2b, 0x0e, 0x1b, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f,
0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63,
0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x00, 0x82, 0x49,
0x44, 0x41, 0x54, 0x38, 0x8d, 0x63, 0x60, 0xa0, 0x10, 0x30, 0xe2, 0x91, 0xe3, 0x64, 0x60, 0x60,
0x30, 0x84, 0xb2, 0xcf, 0x33, 0x30, 0x30, 0x7c, 0x27, 0xd5, 0x70, 0x6d, 0x06, 0x06, 0x86, 0xff,
0x50, 0xac, 0x89, 0x4b, 0x11, 0x13, 0xa9, 0xa6, 0x0e, 0x3e, 0x03, 0x58, 0xa0, 0x34, 0x07, 0x03,
0x03, 0x83, 0x38, 0x9a, 0x9c, 0x24, 0x12, 0x5b, 0x8a, 0x81, 0x81, 0xe1, 0x1b, 0x9a, 0xfc, 0x4b,
0x06, 0x06, 0x86, 0x1f, 0x30, 0x8e, 0x07, 0x03, 0x22, 0xc0, 0x88, 0xc5, 0xae, 0x54, 0xf1, 0x02,
0x2c, 0x1d, 0xf0, 0x30, 0x30, 0x30, 0x28, 0xa2, 0xc9, 0x29, 0x33, 0x30, 0x30, 0xac, 0x87, 0xb2,
0xfd, 0x19, 0x18, 0x18, 0xee, 0xa3, 0xc9, 0xdf, 0x67, 0x60, 0x60, 0xf8, 0x82, 0xcf, 0xf0, 0x91,
0x96, 0x0e, 0xb0, 0x81, 0x87, 0x0c, 0x0c, 0x0c, 0x9e, 0x50, 0xf6, 0x23, 0x4a, 0x2d, 0xc2, 0x09,
0x00, 0x17, 0x21, 0x1c, 0x73, 0x44, 0x9f, 0x4a, 0x71, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e,
0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE small_plus_xpm[1] = {{ png, sizeof( png ), "small_plus_xpm" }};
//EOF

View File

@ -0,0 +1,39 @@
/* 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, 0x10, 0x00, 0x00, 0x00, 0x10, 0x08, 0x06, 0x00, 0x00, 0x00, 0x1f, 0xf3, 0xff,
0x61, 0x00, 0x00, 0x00, 0x04, 0x73, 0x42, 0x49, 0x54, 0x08, 0x08, 0x08, 0x08, 0x7c, 0x08, 0x64,
0x88, 0x00, 0x00, 0x00, 0x09, 0x70, 0x48, 0x59, 0x73, 0x00, 0x00, 0x0e, 0xc4, 0x00, 0x00, 0x0e,
0xc4, 0x01, 0x95, 0x2b, 0x0e, 0x1b, 0x00, 0x00, 0x00, 0x19, 0x74, 0x45, 0x58, 0x74, 0x53, 0x6f,
0x66, 0x74, 0x77, 0x61, 0x72, 0x65, 0x00, 0x77, 0x77, 0x77, 0x2e, 0x69, 0x6e, 0x6b, 0x73, 0x63,
0x61, 0x70, 0x65, 0x2e, 0x6f, 0x72, 0x67, 0x9b, 0xee, 0x3c, 0x1a, 0x00, 0x00, 0x00, 0x44, 0x74,
0x45, 0x58, 0x74, 0x43, 0x6f, 0x70, 0x79, 0x72, 0x69, 0x67, 0x68, 0x74, 0x00, 0x43, 0x43, 0x20,
0x41, 0x74, 0x74, 0x72, 0x69, 0x62, 0x75, 0x74, 0x69, 0x6f, 0x6e, 0x20, 0x68, 0x74, 0x74, 0x70,
0x3a, 0x2f, 0x2f, 0x63, 0x72, 0x65, 0x61, 0x74, 0x69, 0x76, 0x65, 0x63, 0x6f, 0x6d, 0x6d, 0x6f,
0x6e, 0x73, 0x2e, 0x6f, 0x72, 0x67, 0x2f, 0x6c, 0x69, 0x63, 0x65, 0x6e, 0x73, 0x65, 0x73, 0x2f,
0x62, 0x79, 0x2f, 0x34, 0x2e, 0x30, 0x2f, 0x69, 0x10, 0xd7, 0x5d, 0x00, 0x00, 0x00, 0xcb, 0x49,
0x44, 0x41, 0x54, 0x38, 0x8d, 0xb5, 0xd0, 0x31, 0x4b, 0x82, 0x41, 0x00, 0xc6, 0xf1, 0x9f, 0x19,
0x2d, 0x0e, 0x4d, 0x49, 0x4b, 0x43, 0xa0, 0x4b, 0x6d, 0x41, 0xab, 0x93, 0x83, 0xf8, 0x09, 0xdc,
0x5b, 0xfa, 0x2e, 0x4e, 0x7d, 0x0c, 0xbf, 0x40, 0xb3, 0x4b, 0x4b, 0x10, 0x14, 0x84, 0x08, 0x82,
0x35, 0x08, 0x0e, 0x2e, 0x0e, 0x22, 0x14, 0x2f, 0xda, 0xd0, 0xbd, 0x70, 0xbc, 0xbc, 0xf9, 0x96,
0xda, 0x03, 0x07, 0x77, 0xcf, 0xdd, 0xff, 0xcf, 0xdd, 0xf1, 0xcf, 0x39, 0xc5, 0xf5, 0xb6, 0xf0,
0x09, 0x06, 0xf8, 0x44, 0xfb, 0xaf, 0xf0, 0x31, 0x9e, 0xb0, 0x0e, 0x63, 0x89, 0xc6, 0x6f, 0xe1,
0x0a, 0x1e, 0xf0, 0x81, 0x47, 0xbc, 0xe3, 0x15, 0x73, 0x5c, 0x15, 0xc1, 0x47, 0xb8, 0x47, 0x82,
0x0e, 0xba, 0x78, 0x41, 0x15, 0x43, 0xcc, 0x70, 0xf1, 0x13, 0x5c, 0x46, 0x0f, 0x2b, 0xdc, 0x84,
0xae, 0x8b, 0xe7, 0x30, 0x3f, 0xc3, 0x1b, 0x26, 0x38, 0xcf, 0x13, 0x34, 0x03, 0x7c, 0x1b, 0x75,
0xb1, 0x00, 0xea, 0x98, 0xe2, 0x2e, 0x2d, 0x0e, 0xa3, 0xcd, 0x3e, 0x6a, 0x18, 0x47, 0x5d, 0xc9,
0xf7, 0x27, 0xa6, 0x19, 0x05, 0xc9, 0x2a, 0x4f, 0x90, 0x64, 0xe0, 0x54, 0x90, 0xcd, 0x22, 0x5e,
0x1c, 0xe4, 0x1c, 0xc8, 0x0a, 0xd6, 0x9b, 0x0e, 0x14, 0x09, 0xec, 0x2a, 0xc8, 0x7b, 0xc2, 0x7e,
0x6f, 0x50, 0x94, 0x4b, 0xb4, 0x76, 0x11, 0x14, 0xe6, 0x0b, 0xb0, 0x0c, 0x26, 0x7f, 0x3a, 0x29,
0x55, 0x4c, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE small_up_xpm[1] = {{ png, sizeof( png ), "small_up_xpm" }};
//EOF

View File

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

Binary file not shown.

After

(image error) Size: 261 B

Binary file not shown.

After

(image error) Size: 707 B

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<svg xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" viewBox="0 0 16 16" version="1.1" width="16px" height="16px">
<g id="surface1">
<path style=" " d="M 2.5 2 C 1.675781 2 1 2.675781 1 3.5 L 1 12.5 C 1 13.324219 1.675781 14 2.5 14 L 13.5 14 C 14.324219 14 15 13.324219 15 12.5 L 15 5.5 C 15 4.675781 14.324219 4 13.5 4 L 6.796875 4 L 6.144531 2.789063 C 5.882813 2.300781 5.375 2 4.824219 2 Z M 2.5 3 L 4.824219 3 C 5.007813 3 5.175781 3.101563 5.265625 3.261719 L 5.664063 4 L 2 4 L 2 3.5 C 2 3.21875 2.21875 3 2.5 3 Z M 2 5 L 13.5 5 C 13.78125 5 14 5.21875 14 5.5 L 14 12.5 C 14 12.78125 13.78125 13 13.5 13 L 2.5 13 C 2.21875 13 2 12.78125 2 12.5 Z "/>
</g>
</svg>

After

(image error) Size: 738 B

View File

@ -0,0 +1,103 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Capa_1"
x="0px"
y="0px"
viewBox="0 0 16 16"
xml:space="preserve"
sodipodi:docname="small_down.svg"
inkscape:export-filename="/Users/jeff/kicad_dev/kicad/bitmaps_png/png_16/small_down.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
inkscape:version="0.92.2 5c3e80d, 2017-08-06"
width="16"
height="16"><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1285"
inkscape:window-height="741"
id="namedview39"
showgrid="false"
inkscape:zoom="40.969582"
inkscape:cx="8.1637012"
inkscape:cy="7.9438691"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="g6"
showguides="false" /><metadata
id="metadata43"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title><cc:license
rdf:resource="http://creativecommons.org/licenses/by/4.0/" /></cc:Work><cc:License
rdf:about="http://creativecommons.org/licenses/by/4.0/"><cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:requires
rdf:resource="http://creativecommons.org/ns#Notice" /><cc:requires
rdf:resource="http://creativecommons.org/ns#Attribution" /><cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /></cc:License></rdf:RDF></metadata><defs
id="defs41" /><g
transform="matrix(0.92572476,0,0,0.90254237,16.683937,-383.78814)"
id="g6"><path
style="stroke-width:0.03837077"
d="m -9.2155843,441.29567 c -0.053689,0 -0.095566,-0.0104 -0.1384947,-0.0215 -0.1610315,-0.0316 -0.2906964,-0.12374 -0.3873154,-0.24935 l -5.2698376,-5.75918 c -0.236167,-0.26171 -0.188057,-0.90327 0.08036,-1.13355 0.268412,-0.2303 0.85918,-0.23523 1.095346,0.0266 l 3.8712998,4.15212 -0.023427,-10.66693 c -7.587e-4,-0.34546 0.3680084,-0.6274 0.7222786,-0.6274 v 0 c 0.354268,0 0.7494813,0.25491 0.7509927,0.60036 l 0.023426,10.78583 3.9187933,-4.21694 c 0.1288253,-0.13609 0.4568967,-0.12799 0.6394111,-0.12799 0.1503084,0 0.2743763,0.0239 0.4032015,0.12846 0.2683723,0.23029 0.3692572,0.81775 0.1330872,1.07946 l -5.335562,5.82085 c -0.1181019,0.1361 -0.3010803,0.20913 -0.4835574,0.20913 z"
id="path2"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccsccsccscccsc" /><text
transform="scale(0.98739942,1.0127614)"
id="text67"
y="414.37564"
x="-16.295851"
style="font-style:normal;font-weight:normal;font-size:43.76079941px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.09402001"
xml:space="preserve"><tspan
y="453.09369"
x="-16.295851"
id="tspan69"
sodipodi:role="line" /></text>
</g><g
transform="translate(0,-409)"
id="g8" /><g
transform="translate(0,-409)"
id="g10" /><g
transform="translate(0,-409)"
id="g12" /><g
transform="translate(0,-409)"
id="g14" /><g
transform="translate(0,-409)"
id="g16" /><g
transform="translate(0,-409)"
id="g18" /><g
transform="translate(0,-409)"
id="g20" /><g
transform="translate(0,-409)"
id="g22" /><g
transform="translate(0,-409)"
id="g24" /><g
transform="translate(0,-409)"
id="g26" /><g
transform="translate(0,-409)"
id="g28" /><g
transform="translate(0,-409)"
id="g30" /><g
transform="translate(0,-409)"
id="g32" /><g
transform="translate(0,-409)"
id="g34" /><g
transform="translate(0,-409)"
id="g36" /></svg>

After

(image error) Size: 4.4 KiB

View File

@ -0,0 +1,129 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="16"
width="16"
version="1.1"
id="svg2"
inkscape:version="0.92.2 5c3e80d, 2017-08-06"
sodipodi:docname="small_plus.svg"
inkscape:export-filename="/Users/jeff/kicad_dev/kicad/bitmaps_png/png_16/small_plus.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
style="shape-rendering:crispEdges">
<metadata
id="metadata31">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1410"
inkscape:window-height="856"
id="namedview29"
showgrid="true"
inkscape:zoom="18.770376"
inkscape:cx="10.175262"
inkscape:cy="9.9291"
inkscape:window-x="13"
inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="g23">
<inkscape:grid
type="xygrid"
id="grid23" />
</sodipodi:namedview>
<defs
id="defs4">
<linearGradient
id="d"
y2="48.548"
gradientUnits="userSpaceOnUse"
x2="45.918999"
gradientTransform="translate(-18.018,-35.571)"
y1="36.423"
x1="34.893002">
<stop
stop-color="#729fcf"
offset="0"
id="stop7" />
<stop
stop-color="#5187d6"
offset="1"
id="stop9" />
</linearGradient>
<linearGradient
id="e"
y2="34.977001"
gradientUnits="userSpaceOnUse"
x2="27.900999"
y1="22.851999"
x1="16.875"
gradientTransform="translate(0,-22)">
<stop
stop-color="#fff"
offset="0"
id="stop12" />
<stop
stop-color="#fff"
stop-opacity=".34021"
offset="1"
id="stop14" />
</linearGradient>
<radialGradient
id="f"
gradientUnits="userSpaceOnUse"
cy="35.126999"
cx="23.070999"
gradientTransform="matrix(1.3630878,0.02411586,-0.01224054,0.40712916,-8.3582974,-1.068093)"
r="10.319">
<stop
offset="0"
id="stop17" />
<stop
stop-opacity="0"
offset="1"
id="stop19" />
</radialGradient>
</defs>
<g
id="g30"
transform="translate(0,-10)">
<g
transform="matrix(0.97457811,0,0,1,-9.5892053,11.251154)"
id="g23">
<text
xml:space="preserve"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20.25917053px;line-height:1.25;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;letter-spacing:0px;word-spacing:0px;writing-mode:lr-tb;text-anchor:start;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.15294039"
x="9.2819099"
y="13.231976"
id="text54"
transform="scale(1.0154225,0.98481175)"><tspan
sodipodi:role="line"
id="tspan52"
x="9.2819099"
y="13.231976"
style="font-style:normal;font-variant:normal;font-weight:bold;font-stretch:normal;font-size:20.25917053px;font-family:sans-serif;-inkscape-font-specification:'sans-serif, Bold';font-variant-ligatures:normal;font-variant-caps:normal;font-variant-numeric:normal;font-feature-settings:normal;text-align:start;writing-mode:lr-tb;text-anchor:start;stroke-width:1.15294039">+</tspan></text>
</g>
</g>
</svg>

After

(image error) Size: 4.1 KiB

View File

@ -0,0 +1,103 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Generator: Adobe Illustrator 18.1.1, SVG Export Plug-In . SVG Version: 6.00 Build 0) -->
<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:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
version="1.1"
id="Capa_1"
x="0px"
y="0px"
viewBox="0 0 16 16"
xml:space="preserve"
sodipodi:docname="small_up.svg"
inkscape:export-filename="/Users/jeff/kicad_dev/kicad/bitmaps_png/png_16/small_up.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96"
inkscape:version="0.92.2 5c3e80d, 2017-08-06"
width="16"
height="16"><sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1285"
inkscape:window-height="741"
id="namedview39"
showgrid="false"
inkscape:zoom="40.969582"
inkscape:cx="8.1637012"
inkscape:cy="7.9438691"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="g6"
showguides="false" /><metadata
id="metadata43"><rdf:RDF><cc:Work
rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" /><dc:title></dc:title><cc:license
rdf:resource="http://creativecommons.org/licenses/by/4.0/" /></cc:Work><cc:License
rdf:about="http://creativecommons.org/licenses/by/4.0/"><cc:permits
rdf:resource="http://creativecommons.org/ns#Reproduction" /><cc:permits
rdf:resource="http://creativecommons.org/ns#Distribution" /><cc:requires
rdf:resource="http://creativecommons.org/ns#Notice" /><cc:requires
rdf:resource="http://creativecommons.org/ns#Attribution" /><cc:permits
rdf:resource="http://creativecommons.org/ns#DerivativeWorks" /></cc:License></rdf:RDF></metadata><defs
id="defs41" /><g
transform="matrix(0.92572476,0,0,0.90254237,16.683937,-383.78814)"
id="g6"><path
style="stroke-width:0.03837077"
d="m -9.2155843,427.01648 c -0.053689,0 -0.095566,0.0104 -0.1384947,0.0215 -0.1610315,0.0316 -0.2906964,0.12374 -0.3873154,0.24935 l -5.2698376,5.75918 c -0.236167,0.26171 -0.188057,0.90327 0.08036,1.13355 0.268412,0.2303 0.85918,0.23523 1.095346,-0.0266 l 3.8712998,-4.15212 -0.023427,10.66693 c -7.587e-4,0.34546 0.3680084,0.6274 0.7222786,0.6274 v 0 c 0.354268,0 0.7494813,-0.25491 0.7509927,-0.60036 l 0.023426,-10.78583 3.9187933,4.21694 c 0.1288253,0.13609 0.4568967,0.12799 0.6394111,0.12799 0.1503084,0 0.2743763,-0.0239 0.4032015,-0.12846 0.2683723,-0.23029 0.3692572,-0.81775 0.1330872,-1.07946 l -5.335562,-5.82085 c -0.1181019,-0.1361 -0.3010803,-0.20913 -0.4835574,-0.20913 z"
id="path2"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccccccsccsccscccsc" /><text
transform="scale(0.98739942,1.0127614)"
id="text67"
y="414.37564"
x="-16.295851"
style="font-style:normal;font-weight:normal;font-size:43.76079941px;line-height:1.25;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1.09402001"
xml:space="preserve"><tspan
y="453.09369"
x="-16.295851"
id="tspan69"
sodipodi:role="line" /></text>
</g><g
transform="translate(0,-409)"
id="g8" /><g
transform="translate(0,-409)"
id="g10" /><g
transform="translate(0,-409)"
id="g12" /><g
transform="translate(0,-409)"
id="g14" /><g
transform="translate(0,-409)"
id="g16" /><g
transform="translate(0,-409)"
id="g18" /><g
transform="translate(0,-409)"
id="g20" /><g
transform="translate(0,-409)"
id="g22" /><g
transform="translate(0,-409)"
id="g24" /><g
transform="translate(0,-409)"
id="g26" /><g
transform="translate(0,-409)"
id="g28" /><g
transform="translate(0,-409)"
id="g30" /><g
transform="translate(0,-409)"
id="g32" /><g
transform="translate(0,-409)"
id="g34" /><g
transform="translate(0,-409)"
id="g36" /></svg>

After

(image error) Size: 4.4 KiB

View File

@ -0,0 +1,555 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:xlink="http://www.w3.org/1999/xlink"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
height="16"
width="16"
version="1.0"
id="svg2"
inkscape:version="0.92.2 5c3e80d, 2017-08-06"
sodipodi:docname="trash.svg"
inkscape:export-filename="/Users/jeff/kicad_dev/kicad/bitmaps_png/png_16/trash2.png"
inkscape:export-xdpi="96"
inkscape:export-ydpi="96">
<metadata
id="metadata175">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
<dc:title></dc:title>
</cc:Work>
</rdf:RDF>
</metadata>
<sodipodi:namedview
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1"
objecttolerance="10"
gridtolerance="10"
guidetolerance="10"
inkscape:pageopacity="0"
inkscape:pageshadow="2"
inkscape:window-width="1440"
inkscape:window-height="800"
id="namedview173"
showgrid="true"
inkscape:snap-grids="true"
inkscape:snap-to-guides="true"
inkscape:zoom="21.730769"
inkscape:cx="13.667257"
inkscape:cy="9.1708591"
inkscape:window-x="0"
inkscape:window-y="1"
inkscape:window-maximized="1"
inkscape:current-layer="svg2">
<inkscape:grid
type="xygrid"
id="grid3162"
empspacing="2"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true"
spacingx="0.5"
spacingy="0.5"
originx="0"
originy="0" />
</sodipodi:namedview>
<defs
id="defs4">
<linearGradient
id="linearGradient3884">
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="0"
id="stop3886" />
<stop
id="stop3896"
offset="0.2"
style="stop-color:#e6e6e6;stop-opacity:1;" />
<stop
style="stop-color:#f6f6f6;stop-opacity:1;"
offset="0.41666666"
id="stop3898" />
<stop
id="stop3894"
offset="0.5714286"
style="stop-color:#ededed;stop-opacity:1;" />
<stop
id="stop3892"
offset="0.76190478"
style="stop-color:#e6e6e6;stop-opacity:1" />
<stop
style="stop-color:#ffffff;stop-opacity:1;"
offset="1"
id="stop3888" />
</linearGradient>
<linearGradient
id="a">
<stop
stop-color="#fff"
offset="0"
id="stop7" />
<stop
stop-color="#fff"
stop-opacity="0"
offset="1"
id="stop9" />
</linearGradient>
<linearGradient
id="b">
<stop
offset="0"
id="stop12" />
<stop
stop-color="#fff"
offset="1"
id="stop14" />
</linearGradient>
<radialGradient
id="al"
gradientUnits="userSpaceOnUse"
cy="12.219"
cx="23.969"
gradientTransform="matrix(0.94564,0,0,0.32574,1.3029,8.2386)"
r="14.969">
<stop
offset="0"
id="stop17" />
<stop
stop-opacity="0"
offset="1"
id="stop19" />
</radialGradient>
<linearGradient
id="ar"
y2="17.860001"
gradientUnits="userSpaceOnUse"
x2="6.1231999"
y1="17.860001"
x1="45.631001">
<stop
stop-color="#555753"
offset="0"
id="stop22" />
<stop
stop-color="#d5d9d2"
offset=".61818"
id="stop24" />
<stop
stop-color="#888a85"
offset="1"
id="stop26" />
</linearGradient>
<linearGradient
id="as"
y2="39.25"
gradientUnits="userSpaceOnUse"
x2="42.269001"
y1="39.25"
x1="18.871">
<stop
stop-color="#fff"
offset="0"
id="stop29" />
<stop
stop-color="#fff"
stop-opacity="0"
offset="1"
id="stop31" />
</linearGradient>
<linearGradient
id="at"
y2="26.125"
xlink:href="#b"
gradientUnits="userSpaceOnUse"
x2="25.976999"
gradientTransform="matrix(0.83333,0,0,1,3.6667,1)"
y1="26.125"
x1="21.096001" />
<linearGradient
id="au"
y2="25.275999"
xlink:href="#b"
gradientUnits="userSpaceOnUse"
x2="31.362"
gradientTransform="matrix(1.1429,0,0,1,-3.8571,1)"
y1="25.188"
x1="26.997" />
<linearGradient
id="av"
y2="24.5"
xlink:href="#b"
gradientUnits="userSpaceOnUse"
x2="37.535"
gradientTransform="matrix(1.25,0,0,1,-8.875,1)"
y1="24.5"
x1="32.699001" />
<linearGradient
id="aw"
y2="25"
xlink:href="#b"
gradientUnits="userSpaceOnUse"
x2="15.672"
gradientTransform="matrix(0.83333,0,0,1,2.25,1)"
y1="24.827"
x1="6.8744998" />
<linearGradient
id="ax"
y2="25.562"
xlink:href="#b"
gradientUnits="userSpaceOnUse"
x2="20.114"
gradientTransform="matrix(1.1429,0,0,1,-3,1)"
y1="25.620001"
x1="12.02" />
<linearGradient
id="ay"
y2="39.022999"
gradientUnits="userSpaceOnUse"
x2="21.969999"
gradientTransform="matrix(0.61028,0,0,1,9.3454,0)"
y1="41"
x1="27.006001">
<stop
stop-color="#fff"
offset="0"
id="stop39" />
<stop
stop-color="#fff"
stop-opacity="0"
offset="1"
id="stop41" />
</linearGradient>
<linearGradient
id="az"
y2="37.973"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
x2="30"
gradientTransform="translate(-0.99704,5.0008e-4)"
y1="41.207001"
x1="33.398998" />
<linearGradient
id="ba"
y2="38.460999"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
x2="16.620001"
gradientTransform="translate(1.0052,-5.6326e-6)"
y1="39.688"
x1="20.002001" />
<linearGradient
id="bb"
y2="32.848"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
x2="36.562"
y1="40.759998"
x1="36.562" />
<linearGradient
id="bc"
y2="29.922001"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
x2="11.5"
y1="38.062"
x1="11.5" />
<linearGradient
id="ad"
y2="38.210999"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
x2="17.216"
gradientTransform="matrix(0.69296,0,0,1,2.0699,-0.97775)"
y1="38.813"
x1="21.445" />
<linearGradient
id="ae"
y2="37.973"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
x2="30"
gradientTransform="matrix(0.64642,0,0,1,14.071,-0.9995)"
y1="41.207001"
x1="33.398998" />
<radialGradient
id="am"
gradientUnits="userSpaceOnUse"
cy="18.468"
cx="24"
gradientTransform="matrix(1,0,0,0.30363,0,14.142)"
r="14">
<stop
offset="0"
id="stop50" />
<stop
stop-opacity="0"
offset="1"
id="stop52" />
</radialGradient>
<linearGradient
id="af"
y2="11.686"
gradientUnits="userSpaceOnUse"
x2="5.2537999"
y1="11.686"
x1="43.299999">
<stop
stop-color="#6d6f6a"
offset="0"
id="stop55" />
<stop
stop-color="#e7e8e5"
offset=".61818"
id="stop57" />
<stop
stop-color="#999b96"
offset="1"
id="stop59" />
</linearGradient>
<linearGradient
id="c"
y2="7.75"
gradientUnits="userSpaceOnUse"
x2="19"
y1="7.75"
x1="29">
<stop
stop-color="#95998e"
offset="0"
id="stop62" />
<stop
stop-color="#fff"
offset=".59524"
id="stop64" />
<stop
stop-color="#dfdfdb"
offset="1"
id="stop66" />
</linearGradient>
<linearGradient
id="ag"
y2="20.608999"
gradientUnits="userSpaceOnUse"
x2="15.96"
y1="10.081"
x1="26.965">
<stop
stop-color="#babdb6"
offset="0"
id="stop69" />
<stop
stop-color="#fff"
offset="1"
id="stop71" />
</linearGradient>
<radialGradient
id="an"
gradientUnits="userSpaceOnUse"
cy="12.5"
cx="24"
gradientTransform="matrix(1,0,0,0.3871,0,7.6613)"
r="15.5">
<stop
offset="0"
id="stop74" />
<stop
stop-opacity="0"
offset="1"
id="stop76" />
</radialGradient>
<linearGradient
id="ah"
y2="16.375"
gradientUnits="userSpaceOnUse"
x2="46.327999"
y1="16.375"
x1="18.247">
<stop
stop-color="#fff"
offset="0"
id="stop79" />
<stop
stop-color="#fff"
stop-opacity="0"
offset="1"
id="stop81" />
</linearGradient>
<radialGradient
id="ao"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
cy="27.858"
cx="18.034"
gradientTransform="matrix(1.2188,-0.17313,0.053174,0.2095,-4.4516,12.172)"
r="15.447" />
<radialGradient
id="ap"
gradientUnits="userSpaceOnUse"
cy="10.75"
cx="18.75"
gradientTransform="matrix(1,0,0,0.63636,0,3.9091)"
r="2.75">
<stop
offset="0"
id="stop85" />
<stop
stop-opacity="0"
offset="1"
id="stop87" />
</radialGradient>
<linearGradient
id="ai"
y2="10.809"
gradientUnits="userSpaceOnUse"
x2="26.127001"
y1="9.5279999"
x1="26.464001">
<stop
stop-color="#888a85"
offset="0"
id="stop90" />
<stop
stop-color="#d3d7cf"
offset="1"
id="stop92" />
</linearGradient>
<linearGradient
id="aj"
y2="-10.483"
gradientUnits="userSpaceOnUse"
x2="21.674"
y1="-8.5719004"
x1="21.084">
<stop
stop-color="#d3d7cf"
offset="0"
id="stop95" />
<stop
stop-color="#eeeeec"
offset="1"
id="stop97" />
</linearGradient>
<linearGradient
id="ak"
y2="10.94"
gradientUnits="userSpaceOnUse"
x2="6.25"
gradientTransform="translate(18)"
y1="8.2417002"
x1="6.25">
<stop
stop-opacity=".32317"
offset="0"
id="stop100" />
<stop
stop-opacity="0"
offset="1"
id="stop102" />
</linearGradient>
<radialGradient
id="aq"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
cy="17.987"
cx="12.143"
gradientTransform="matrix(1.6798,-0.03179,0.0072084,0.21318,-9.2227,10.39)"
r="15.447" />
<linearGradient
inkscape:collect="always"
xlink:href="#c"
id="linearGradient3152"
gradientUnits="userSpaceOnUse"
x1="29"
y1="7.75"
x2="19"
y2="7.75" />
<radialGradient
inkscape:collect="always"
xlink:href="#ap"
id="radialGradient3154"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.63636,0,3.9091)"
cx="18.75"
cy="10.75"
r="2.75" />
<radialGradient
inkscape:collect="always"
xlink:href="#ap"
id="radialGradient3156"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.63636,0,3.9091)"
cx="18.75"
cy="10.75"
r="2.75" />
<radialGradient
inkscape:collect="always"
xlink:href="#ap"
id="radialGradient3158"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1,0,0,0.63636,0,3.9091)"
cx="18.75"
cy="10.75"
r="2.75" />
<linearGradient
inkscape:collect="always"
xlink:href="#c"
id="linearGradient3160"
gradientUnits="userSpaceOnUse"
x1="29"
y1="7.75"
x2="19"
y2="7.75" />
</defs>
<path
id="path3871"
style="fill:#f2f2f2;fill-opacity:1;stroke:#333333;stroke-width:0.7418704;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 2.2242716,2.5440772 4.3648243,14.5 H 11.5 L 13.640553,2.5440772"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cccc" />
<path
style="fill:none;stroke:#333333;stroke-width:1.44053662;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 1.575248,1.7727273 H 14.35407"
id="path3087"
inkscape:connector-curvature="0"
sodipodi:nodetypes="cc" />
<path
sodipodi:nodetypes="cc"
style="fill:none;stroke:#333333;stroke-width:0.7418704;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 6.8621358,14.5 5.7918595,2.5440772"
id="path3859"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
id="path3865"
d="M 9.0026886,14.5 10.072964,2.5440772"
style="fill:none;stroke:#333333;stroke-width:0.7418704;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:nodetypes="cc" />
<path
sodipodi:nodetypes="cc"
style="fill:none;stroke:#333333;stroke-width:0.7418704;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 12.927035,5.6294767 H 2.9377892"
id="path3873"
inkscape:connector-curvature="0" />
<path
sodipodi:nodetypes="cc"
style="fill:none;stroke:#333333;stroke-width:0.75716829;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
d="M 12.570276,8.7148762 H 3.6513067"
id="path3877"
inkscape:connector-curvature="0" />
<path
inkscape:connector-curvature="0"
id="path3879"
d="M 11.856759,11.800275 H 4.0080656"
style="fill:none;stroke:#333333;stroke-width:0.7418704;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
sodipodi:nodetypes="cc" />
</svg>

After

(image error) Size: 14 KiB

View File

@ -131,12 +131,12 @@ void WX_HTML_REPORT_PANEL::scrollToBottom()
}
const static wxSize BADGE_SIZE_DU( 9, 9 );
const static int BADGE_FONT_SIZE = 9;
#define BADGE_SIZE 20
#define BADGE_FONT_SIZE 10
static wxBitmap makeBadge( REPORTER::SEVERITY aStyle, int aCount, wxWindow* aWindow )
{
wxSize size( aWindow->ConvertDialogToPixels( BADGE_SIZE_DU ) );
wxSize size( BADGE_SIZE, BADGE_SIZE );
wxBitmap bitmap( size );
wxBrush brush;
wxMemoryDC badgeDC;
@ -155,6 +155,9 @@ static wxBitmap makeBadge( REPORTER::SEVERITY aStyle, int aCount, wxWindow* aWin
badgeDC.SetBackground( brush );
badgeDC.Clear();
if( aCount == 0 )
return bitmap;
switch( aStyle )
{
case REPORTER::RPT_ERROR:
@ -162,8 +165,8 @@ static wxBitmap makeBadge( REPORTER::SEVERITY aStyle, int aCount, wxWindow* aWin
textColour = *wxWHITE;
break;
case REPORTER::RPT_WARNING:
badgeColour = *wxYELLOW;
textColour = *wxBLACK;
badgeColour = wxColour( 235, 120, 80 ); // Orange
textColour = *wxWHITE;
break;
case REPORTER::RPT_ACTION:
badgeColour = *wxGREEN;
@ -182,13 +185,14 @@ static wxBitmap makeBadge( REPORTER::SEVERITY aStyle, int aCount, wxWindow* aWin
badgeDC.SetPen( wxPen( badgeColour, 0 ) );
badgeDC.DrawCircle( size.x / 2 - 1, size.y / 2, ( std::max( size.x, size.y ) / 2 ) - 1 );
wxFont font( BADGE_FONT_SIZE, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD );
wxString text = wxString::Format( wxT( "%d" ), aCount );
wxSize textExtent = badgeDC.GetTextExtent( text );
wxFont font( fontSize, wxFONTFAMILY_DEFAULT, wxFONTSTYLE_NORMAL, wxFONTWEIGHT_BOLD );
badgeDC.SetFont( font );
wxString text = wxString::Format( wxT( "%d" ), aCount );
wxSize textExtent = badgeDC.GetTextExtent( text );
badgeDC.SetTextForeground( textColour );
badgeDC.DrawText( text, size.x / 2 - textExtent.x / 2, size.y / 2 - textExtent.y / 2 + 2 );
badgeDC.DrawText( text, size.x / 2 - textExtent.x / 2 - 1, size.y / 2 - textExtent.y / 2 );
return bitmap;
}
@ -197,24 +201,10 @@ static wxBitmap makeBadge( REPORTER::SEVERITY aStyle, int aCount, wxWindow* aWin
void WX_HTML_REPORT_PANEL::updateBadges()
{
int count = Count( REPORTER::RPT_ERROR );
if( count > 0 )
{
m_errorsBadge->SetBitmap( makeBadge( REPORTER::RPT_ERROR, count, m_errorsBadge ) );
m_errorsBadge->Show( true );
}
else
m_errorsBadge->Show( false );
m_errorsBadge->SetBitmap( makeBadge( REPORTER::RPT_ERROR, count, m_errorsBadge ) );
count = Count( REPORTER::RPT_WARNING );
if( count > 0 )
{
m_warningsBadge->SetBitmap( makeBadge( REPORTER::RPT_WARNING, count, m_warningsBadge ) );
m_warningsBadge->Show( true );
}
else
m_warningsBadge->Show( false );
m_warningsBadge->SetBitmap( makeBadge( REPORTER::RPT_WARNING, count, m_warningsBadge ) );
}

View File

@ -1,8 +1,8 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Oct 17 2016)
// C++ code generated with wxFormBuilder (version Dec 30 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
// PLEASE DO *NOT* EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#include "wx_html_report_panel_base.h"
@ -11,7 +11,7 @@
WX_HTML_REPORT_PANEL_BASE::WX_HTML_REPORT_PANEL_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style ) : wxPanel( parent, id, pos, size, style )
{
m_box = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Output messages:") ), wxVERTICAL );
m_box = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Output Messages") ), wxVERTICAL );
m_box->SetMinSize( wxSize( -1,130 ) );
m_fgSizer = new wxFlexGridSizer( 2, 1, 0, 0 );
@ -25,43 +25,53 @@ WX_HTML_REPORT_PANEL_BASE::WX_HTML_REPORT_PANEL_BASE( wxWindow* parent, wxWindow
m_fgSizer->Add( m_htmlView, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 2 );
wxFlexGridSizer* fgSizer3;
fgSizer3 = new wxFlexGridSizer( 1, 9, 0, 0 );
fgSizer3->AddGrowableCol( 8 );
fgSizer3->SetFlexibleDirection( wxBOTH );
fgSizer3->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
wxBoxSizer* bSizer1;
bSizer1 = new wxBoxSizer( wxHORIZONTAL );
m_staticText3 = new wxStaticText( m_box->GetStaticBox(), wxID_ANY, _("Show:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText3->Wrap( -1 );
fgSizer3->Add( m_staticText3, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
bSizer1->Add( m_staticText3, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_checkBoxShowAll = new wxCheckBox( m_box->GetStaticBox(), wxID_ANY, _("All"), wxDefaultPosition, wxDefaultSize, 0 );
m_checkBoxShowAll->SetValue(true);
fgSizer3->Add( m_checkBoxShowAll, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
bSizer1->Add( m_checkBoxShowAll, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
bSizer1->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 );
m_checkBoxShowErrors = new wxCheckBox( m_box->GetStaticBox(), wxID_ANY, _("Errors"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizer3->Add( m_checkBoxShowErrors, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
bSizer1->Add( m_checkBoxShowErrors, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
m_errorsBadge = new wxStaticBitmap( m_box->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
fgSizer3->Add( m_errorsBadge, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
m_errorsBadge->SetMinSize( wxSize( 20,20 ) );
bSizer1->Add( m_errorsBadge, 0, wxBOTTOM|wxRIGHT|wxTOP, 4 );
m_checkBoxShowWarnings = new wxCheckBox( m_box->GetStaticBox(), wxID_ANY, _("Warnings"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizer3->Add( m_checkBoxShowWarnings, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
bSizer1->Add( m_checkBoxShowWarnings, 0, wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT, 5 );
m_warningsBadge = new wxStaticBitmap( m_box->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, 0 );
fgSizer3->Add( m_warningsBadge, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
m_warningsBadge->SetMinSize( wxSize( 20,20 ) );
bSizer1->Add( m_warningsBadge, 0, wxBOTTOM|wxRIGHT|wxTOP, 4 );
m_checkBoxShowInfos = new wxCheckBox( m_box->GetStaticBox(), wxID_ANY, _("Infos"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizer3->Add( m_checkBoxShowInfos, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
bSizer1->Add( m_checkBoxShowInfos, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
bSizer1->Add( 0, 0, 0, wxEXPAND|wxRIGHT|wxLEFT, 10 );
m_checkBoxShowActions = new wxCheckBox( m_box->GetStaticBox(), wxID_ANY, _("Actions"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizer3->Add( m_checkBoxShowActions, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
m_btnSaveReportToFile = new wxButton( m_box->GetStaticBox(), wxID_ANY, _("Save Report File"), wxDefaultPosition, wxDefaultSize, 0 );
fgSizer3->Add( m_btnSaveReportToFile, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
bSizer1->Add( m_checkBoxShowActions, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
m_fgSizer->Add( fgSizer3, 1, wxEXPAND, 5 );
bSizer1->Add( 0, 0, 1, wxEXPAND|wxRIGHT|wxLEFT, 10 );
m_btnSaveReportToFile = new wxButton( m_box->GetStaticBox(), wxID_ANY, _("Save..."), wxDefaultPosition, wxDefaultSize, 0 );
bSizer1->Add( m_btnSaveReportToFile, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
m_fgSizer->Add( bSizer1, 1, wxEXPAND, 5 );
m_box->Add( m_fgSizer, 1, wxEXPAND, 5 );

View File

@ -80,7 +80,7 @@
<event name="OnUpdateUI"></event>
<object class="wxStaticBoxSizer" expanded="1">
<property name="id">wxID_ANY</property>
<property name="label">Output messages:</property>
<property name="label">Output Messages</property>
<property name="minimum_size">-1,130</property>
<property name="name">m_box</property>
<property name="orient">wxVERTICAL</property>
@ -191,21 +191,14 @@
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">1</property>
<object class="wxFlexGridSizer" expanded="1">
<property name="cols">9</property>
<property name="flexible_direction">wxBOTH</property>
<property name="growablecols">8</property>
<property name="growablerows"></property>
<property name="hgap">0</property>
<object class="wxBoxSizer" expanded="1">
<property name="minimum_size"></property>
<property name="name">fgSizer3</property>
<property name="non_flexible_grow_mode">wxFLEX_GROWMODE_SPECIFIED</property>
<property name="name">bSizer1</property>
<property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property>
<property name="rows">1</property>
<property name="vgap">0</property>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
<property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="0">
<property name="BottomDockable">1</property>
@ -374,9 +367,19 @@
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">10</property>
<property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="spacer" expanded="1">
<property name="height">0</property>
<property name="permission">protected</property>
<property name="width">0</property>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="0">
<property name="BottomDockable">1</property>
@ -463,8 +466,8 @@
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
<property name="border">4</property>
<property name="flag">wxBOTTOM|wxRIGHT|wxTOP</property>
<property name="proportion">0</property>
<object class="wxStaticBitmap" expanded="1">
<property name="BottomDockable">1</property>
@ -500,7 +503,7 @@
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="minimum_size">20,20</property>
<property name="moveable">1</property>
<property name="name">m_errorsBadge</property>
<property name="pane_border">1</property>
@ -545,7 +548,7 @@
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxCheckBox" expanded="0">
<property name="BottomDockable">1</property>
@ -632,8 +635,8 @@
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
<property name="border">4</property>
<property name="flag">wxBOTTOM|wxRIGHT|wxTOP</property>
<property name="proportion">0</property>
<object class="wxStaticBitmap" expanded="1">
<property name="BottomDockable">1</property>
@ -669,7 +672,7 @@
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="minimum_size">20,20</property>
<property name="moveable">1</property>
<property name="name">m_warningsBadge</property>
<property name="pane_border">1</property>
@ -800,6 +803,16 @@
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">10</property>
<property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="spacer" expanded="1">
<property name="height">0</property>
<property name="permission">protected</property>
<property name="width">0</property>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
@ -888,6 +901,16 @@
<event name="OnUpdateUI"></event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">10</property>
<property name="flag">wxEXPAND|wxRIGHT|wxLEFT</property>
<property name="proportion">1</property>
<object class="spacer" expanded="1">
<property name="height">0</property>
<property name="permission">protected</property>
<property name="width">0</property>
</object>
</object>
<object class="sizeritem" expanded="0">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
@ -921,7 +944,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Save Report File</property>
<property name="label">Save...</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size">-1,-1</property>

View File

@ -1,8 +1,8 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Oct 17 2016)
// C++ code generated with wxFormBuilder (version Dec 30 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
// PLEASE DO *NOT* EDIT THIS FILE!
///////////////////////////////////////////////////////////////////////////
#ifndef __WX_HTML_REPORT_PANEL_BASE_H__

View File

@ -70,6 +70,16 @@ DIALOG_PLOT_SCHEMATIC::DIALOG_PLOT_SCHEMATIC( SCH_EDIT_FRAME* parent ) :
m_configChanged = false;
m_config = Kiface().KifaceSettings();
m_browseButton->SetBitmap( KiBitmap( folder_xpm ) );
// We use a sdbSizer to get platform-dependent ordering of the action buttons, but
// that requires us to correct the button labels here.
m_sdbSizer1OK->SetLabel( _( "Plot All Pages" ) );
m_sdbSizer1Apply->SetLabel( _( "Plot Current Page" ) );
m_sdbSizer1Cancel->SetLabel( _( "Close" ) );
m_sdbSizer1->Layout();
m_sdbSizer1OK->SetDefault();
initDlg();
// Now all widgets have the size fixed, call FinishDialogSettings
@ -80,11 +90,6 @@ DIALOG_PLOT_SCHEMATIC::DIALOG_PLOT_SCHEMATIC( SCH_EDIT_FRAME* parent ) :
// Initialize the dialog options:
void DIALOG_PLOT_SCHEMATIC::initDlg()
{
m_browseButton->SetBitmap( KiBitmap( browse_files_xpm ) );
// Set paper size option
m_PaperSizeOption->SetSelection( m_pageSizeSelect );
// Set color or B&W plot option
bool tmp;
m_config->Read( PLOT_MODECOLOR_KEY, &tmp, true );
@ -99,7 +104,6 @@ void DIALOG_PLOT_SCHEMATIC::initDlg()
SetPlotOriginCenter( tmp );
m_config->Read( PLOT_HPGL_PAPERSIZE_KEY, &m_HPGLPaperSizeSelect, 0 );
m_HPGLPaperSizeOption->SetSelection( m_HPGLPaperSizeSelect );
// HPGL Pen Size is stored in mm in config
m_config->Read( PLOT_HPGL_PEN_SIZE_KEY, &m_HPGLPenSize, 0.5 );
@ -112,36 +116,19 @@ void DIALOG_PLOT_SCHEMATIC::initDlg()
switch( plotfmt )
{
default:
case PLOT_FORMAT_POST:
m_plotFormatOpt->SetSelection( 0 );
break;
case PLOT_FORMAT_PDF:
m_plotFormatOpt->SetSelection( 1 );
break;
case PLOT_FORMAT_SVG:
m_plotFormatOpt->SetSelection( 2 );
break;
case PLOT_FORMAT_DXF:
m_plotFormatOpt->SetSelection( 3 );
break;
case PLOT_FORMAT_HPGL:
m_plotFormatOpt->SetSelection( 4 );
break;
case PLOT_FORMAT_POST: m_plotFormatOpt->SetSelection( 0 ); break;
case PLOT_FORMAT_PDF: m_plotFormatOpt->SetSelection( 1 ); break;
case PLOT_FORMAT_SVG: m_plotFormatOpt->SetSelection( 2 ); break;
case PLOT_FORMAT_DXF: m_plotFormatOpt->SetSelection( 3 ); break;
case PLOT_FORMAT_HPGL: m_plotFormatOpt->SetSelection( 4 ); break;
}
// Set the default line width (pen width which should be used for
// items that do not have a pen size defined (like frame ref)
AddUnitSymbol( *m_defaultLineWidthTitle, g_UserUnit );
PutValueInLocalUnits( *m_DefaultLineSizeCtrl, GetDefaultLineThickness() );
// Initialize HPGL specific widgets
AddUnitSymbol( *m_penHPLGWidthTitle, g_UserUnit );
PutValueInLocalUnits( *m_penHPGLWidthCtrl, m_HPGLPenSize );
m_HPGLPaperSizeOption->SetSelection( m_HPGLPaperSizeSelect );
// Plot directory
wxString path = m_parent->GetPlotDirectoryName();
@ -149,10 +136,6 @@ void DIALOG_PLOT_SCHEMATIC::initDlg()
path.Replace( '/', '\\' );
#endif
m_outputDirectoryName->SetValue( path );
// Hide/show widgets that are not always displayed:
wxCommandEvent cmd_event;
OnPlotFormatSelection( cmd_event );
}
@ -179,8 +162,7 @@ void DIALOG_PLOT_SCHEMATIC::OnOutputDirectoryBrowseClicked( wxCommandEvent& even
fn = Prj().AbsolutePath( g_RootSheet->GetFileName() );
wxString defaultPath = fn.GetPathWithSep();
wxString msg;
msg.Printf( _( "Do you want to use a path relative to\n\"%s\"" ),
GetChars( defaultPath ) );
msg.Printf( _( "Do you want to use a path relative to\n\"%s\"" ), GetChars( defaultPath ) );
wxMessageDialog dialog( this, msg, _( "Plot Output Directory" ),
wxYES_NO | wxICON_QUESTION | wxYES_DEFAULT );
@ -211,9 +193,56 @@ PlotFormat DIALOG_PLOT_SCHEMATIC::GetPlotFileFormat()
}
void DIALOG_PLOT_SCHEMATIC::OnButtonCancelClick( wxCommandEvent& event )
void DIALOG_PLOT_SCHEMATIC::OnPageSizeSelected( wxCommandEvent& event )
{
EndModal( wxID_CANCEL );
if( GetPlotFileFormat() == PLOT_FORMAT_HPGL )
m_HPGLPaperSizeSelect = m_paperSizeOption->GetSelection();
else
m_pageSizeSelect = m_paperSizeOption->GetSelection();
}
void DIALOG_PLOT_SCHEMATIC::OnUpdateUI( wxUpdateUIEvent& event )
{
PlotFormat fmt = GetPlotFileFormat();
wxArrayString paperSizes;
paperSizes.push_back( _( "Schematic size" ) );
int selection;
if( fmt == PLOT_FORMAT_HPGL )
{
paperSizes.push_back( _( "A4" ) );
paperSizes.push_back( _( "A3" ) );
paperSizes.push_back( _( "A2" ) );
paperSizes.push_back( _( "A1" ) );
paperSizes.push_back( _( "A0" ) );
paperSizes.push_back( _( "A" ) );
paperSizes.push_back( _( "B" ) );
paperSizes.push_back( _( "C" ) );
paperSizes.push_back( _( "D" ) );
paperSizes.push_back( _( "E" ) );
selection = m_HPGLPaperSizeSelect;
}
else
{
paperSizes.push_back( _( "A4" ) );
paperSizes.push_back( _( "A" ) );
selection = m_pageSizeSelect;
}
m_paperSizeOption->Set( paperSizes );
m_paperSizeOption->SetSelection( selection );
m_DefaultLineSizeCtrl->Enable( fmt == PLOT_FORMAT_POST
|| fmt == PLOT_FORMAT_PDF
|| fmt == PLOT_FORMAT_SVG );
m_plotOriginOpt->Enable( fmt == PLOT_FORMAT_HPGL );
m_penHPGLWidthCtrl->Enable( fmt == PLOT_FORMAT_HPGL );
}
@ -223,13 +252,11 @@ void DIALOG_PLOT_SCHEMATIC::getPlotOptions()
m_config->Write( PLOT_FRAME_REFERENCE_KEY, getPlotFrameRef() );
m_config->Write( PLOT_FORMAT_KEY, (long) GetPlotFileFormat() );
m_config->Write( PLOT_HPGL_ORIGIN_KEY, GetPlotOriginCenter() );
m_HPGLPaperSizeSelect = m_HPGLPaperSizeOption->GetSelection();
m_config->Write( PLOT_HPGL_PAPERSIZE_KEY, m_HPGLPaperSizeSelect );
// HPGL Pen Size is stored in mm in config
m_config->Write( PLOT_HPGL_PEN_SIZE_KEY, m_HPGLPenSize/IU_PER_MM );
m_pageSizeSelect = m_PaperSizeOption->GetSelection();
SetDefaultLineThickness( ValueFromTextCtrl( *m_DefaultLineSizeCtrl ) );
// Plot directory
@ -243,59 +270,13 @@ void DIALOG_PLOT_SCHEMATIC::getPlotOptions()
}
void DIALOG_PLOT_SCHEMATIC::OnPlotFormatSelection( wxCommandEvent& event )
{
switch( GetPlotFileFormat() )
{
default:
case PLOT_FORMAT_POST:
m_paperOptionsSizer->Hide( m_paperHPGLSizer );
m_paperOptionsSizer->Show( m_PaperSizeOption );
m_PaperSizeOption->Enable( true );
m_DefaultLineSizeCtrl->Enable( true );
break;
case PLOT_FORMAT_PDF:
m_paperOptionsSizer->Hide( m_paperHPGLSizer );
m_paperOptionsSizer->Show(m_PaperSizeOption);
m_PaperSizeOption->Enable( true );
m_DefaultLineSizeCtrl->Enable( true );
break;
case PLOT_FORMAT_SVG:
m_paperOptionsSizer->Hide( m_paperHPGLSizer );
m_paperOptionsSizer->Show(m_PaperSizeOption);
m_PaperSizeOption->Enable( false );
m_DefaultLineSizeCtrl->Enable( true );
break;
case PLOT_FORMAT_DXF:
m_paperOptionsSizer->Hide( m_paperHPGLSizer );
m_paperOptionsSizer->Show(m_PaperSizeOption);
m_PaperSizeOption->Enable( false );
m_DefaultLineSizeCtrl->Enable( false );
break;
case PLOT_FORMAT_HPGL:
m_paperOptionsSizer->Show( m_paperHPGLSizer );
m_paperOptionsSizer->Hide(m_PaperSizeOption);
m_DefaultLineSizeCtrl->Enable( false );
break;
}
GetSizer()->SetSizeHints( this );
}
void DIALOG_PLOT_SCHEMATIC::OnButtonPlotCurrentClick( wxCommandEvent& event )
void DIALOG_PLOT_SCHEMATIC::OnPlotCurrent( wxCommandEvent& event )
{
PlotSchematic( false );
}
void DIALOG_PLOT_SCHEMATIC::OnButtonPlotAllClick( wxCommandEvent& event )
void DIALOG_PLOT_SCHEMATIC::OnPlotAll( wxCommandEvent& event )
{
PlotSchematic( true );
}
@ -307,28 +288,12 @@ void DIALOG_PLOT_SCHEMATIC::PlotSchematic( bool aPlotAll )
switch( GetPlotFileFormat() )
{
case PLOT_FORMAT_HPGL:
createHPGLFile( aPlotAll, getPlotFrameRef() );
break;
case PLOT_FORMAT_DXF:
CreateDXFFile( aPlotAll, getPlotFrameRef() );
break;
case PLOT_FORMAT_PDF:
createPDFFile( aPlotAll, getPlotFrameRef() );
break;
case PLOT_FORMAT_SVG:
createSVGFile( aPlotAll, getPlotFrameRef() );
break;
case PLOT_FORMAT_POST:
// Fall through. Default to Postscript.
default:
createPSFile( aPlotAll, getPlotFrameRef() );
break;
case PLOT_FORMAT_POST: createPSFile( aPlotAll, getPlotFrameRef() ); break;
case PLOT_FORMAT_DXF: CreateDXFFile( aPlotAll, getPlotFrameRef() ); break;
case PLOT_FORMAT_PDF: createPDFFile( aPlotAll, getPlotFrameRef() ); break;
case PLOT_FORMAT_SVG: createSVGFile( aPlotAll, getPlotFrameRef() ); break;
case PLOT_FORMAT_HPGL: createHPGLFile( aPlotAll, getPlotFrameRef() ); break;
}
}

View File

@ -63,10 +63,10 @@ public:
// and therefore should be saved
private:
void OnPlotFormatSelection( wxCommandEvent& event ) override;
void OnButtonPlotCurrentClick( wxCommandEvent& event ) override;
void OnButtonPlotAllClick( wxCommandEvent& event ) override;
void OnButtonCancelClick( wxCommandEvent& event ) override;
void OnPageSizeSelected( wxCommandEvent& event ) override;
void OnPlotCurrent( wxCommandEvent& event ) override;
void OnPlotAll( wxCommandEvent& event ) override;
void OnUpdateUI( wxUpdateUIEvent& event ) override;
void initDlg();

View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Apr 19 2018)
// C++ code generated with wxFormBuilder (version Dec 30 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@ -31,108 +31,108 @@ DIALOG_PLOT_SCHEMATIC_BASE::DIALOG_PLOT_SCHEMATIC_BASE( wxWindow* parent, wxWind
bSizerDir->Add( m_outputDirectoryName, 1, wxALIGN_CENTER_VERTICAL|wxLEFT, 4 );
m_browseButton = new wxBitmapButton( this, wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW );
m_browseButton->SetMinSize( wxSize( 30,28 ) );
bSizerDir->Add( m_browseButton, 0, wxRIGHT, 5 );
bMainSizer->Add( bSizerDir, 0, wxALL|wxEXPAND, 5 );
bMainSizer->Add( bSizerDir, 0, wxALL|wxEXPAND, 7 );
m_optionsSizer = new wxBoxSizer( wxHORIZONTAL );
wxString m_plotFormatOptChoices[] = { _("Postscript"), _("PDF"), _("SVG"), _("DXF"), _("HPGL") };
int m_plotFormatOptNChoices = sizeof( m_plotFormatOptChoices ) / sizeof( wxString );
m_plotFormatOpt = new wxRadioBox( this, wxID_ANY, _("Output Format:"), wxDefaultPosition, wxDefaultSize, m_plotFormatOptNChoices, m_plotFormatOptChoices, 1, wxRA_SPECIFY_COLS );
m_plotFormatOpt = new wxRadioBox( this, wxID_ANY, _("Output Format"), wxDefaultPosition, wxDefaultSize, m_plotFormatOptNChoices, m_plotFormatOptChoices, 1, wxRA_SPECIFY_COLS );
m_plotFormatOpt->SetSelection( 2 );
m_optionsSizer->Add( m_plotFormatOpt, 0, wxEXPAND|wxLEFT|wxRIGHT, 5 );
m_optionsSizer->Add( m_plotFormatOpt, 0, wxALIGN_TOP|wxEXPAND|wxLEFT|wxRIGHT, 5 );
m_paperOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Paper Options:") ), wxVERTICAL );
wxStaticBoxSizer* sbOptions;
sbOptions = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Options") ), wxVERTICAL );
wxString m_PaperSizeOptionChoices[] = { _("Schematic size"), _("A4"), _("A") };
int m_PaperSizeOptionNChoices = sizeof( m_PaperSizeOptionChoices ) / sizeof( wxString );
m_PaperSizeOption = new wxRadioBox( m_paperOptionsSizer->GetStaticBox(), wxID_ANY, _("Page Size:"), wxDefaultPosition, wxDefaultSize, m_PaperSizeOptionNChoices, m_PaperSizeOptionChoices, 1, wxRA_SPECIFY_COLS );
m_PaperSizeOption->SetSelection( 1 );
m_paperOptionsSizer->Add( m_PaperSizeOption, 0, wxBOTTOM|wxEXPAND|wxTOP, 5 );
wxGridBagSizer* gbSizer1;
gbSizer1 = new wxGridBagSizer( 0, 0 );
gbSizer1->SetFlexibleDirection( wxBOTH );
gbSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
m_paperHPGLSizer = new wxStaticBoxSizer( new wxStaticBox( m_paperOptionsSizer->GetStaticBox(), wxID_ANY, _("HPGL Options:") ), wxVERTICAL );
m_staticText4 = new wxStaticText( m_paperHPGLSizer->GetStaticBox(), wxID_ANY, _("Page size:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText4 = new wxStaticText( sbOptions->GetStaticBox(), wxID_ANY, _("Page size:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText4->Wrap( -1 );
m_paperHPGLSizer->Add( m_staticText4, 0, wxLEFT|wxRIGHT, 5 );
gbSizer1->Add( m_staticText4, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 );
wxString m_HPGLPaperSizeOptionChoices[] = { _("Schematic size"), _("A4"), _("A3"), _("A2"), _("A1"), _("A0"), _("A"), _("B"), _("C"), _("D"), _("E") };
int m_HPGLPaperSizeOptionNChoices = sizeof( m_HPGLPaperSizeOptionChoices ) / sizeof( wxString );
m_HPGLPaperSizeOption = new wxChoice( m_paperHPGLSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_HPGLPaperSizeOptionNChoices, m_HPGLPaperSizeOptionChoices, 0 );
m_HPGLPaperSizeOption->SetSelection( 0 );
m_paperHPGLSizer->Add( m_HPGLPaperSizeOption, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
wxString m_paperSizeOptionChoices[] = { _("Schematic size"), _("A4"), _("A") };
int m_paperSizeOptionNChoices = sizeof( m_paperSizeOptionChoices ) / sizeof( wxString );
m_paperSizeOption = new wxChoice( sbOptions->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_paperSizeOptionNChoices, m_paperSizeOptionChoices, 0 );
m_paperSizeOption->SetSelection( 0 );
gbSizer1->Add( m_paperSizeOption, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxRIGHT|wxLEFT, 5 );
wxString m_plotOriginOptChoices[] = { _("Bottom left"), _("Center on page") };
int m_plotOriginOptNChoices = sizeof( m_plotOriginOptChoices ) / sizeof( wxString );
m_plotOriginOpt = new wxRadioBox( m_paperHPGLSizer->GetStaticBox(), wxID_ANY, _("Align:"), wxDefaultPosition, wxDefaultSize, m_plotOriginOptNChoices, m_plotOriginOptChoices, 1, wxRA_SPECIFY_COLS );
m_plotOriginOpt->SetSelection( 0 );
m_paperHPGLSizer->Add( m_plotOriginOpt, 0, wxBOTTOM|wxTOP, 5 );
m_penHPLGWidthTitle = new wxStaticText( m_paperHPGLSizer->GetStaticBox(), wxID_ANY, _("Pen width:"), wxDefaultPosition, wxDefaultSize, 0 );
m_penHPLGWidthTitle->Wrap( -1 );
m_paperHPGLSizer->Add( m_penHPLGWidthTitle, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
m_penHPGLWidthCtrl = new wxTextCtrl( m_paperHPGLSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_paperHPGLSizer->Add( m_penHPGLWidthCtrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
m_paperOptionsSizer->Add( m_paperHPGLSizer, 1, wxEXPAND, 5 );
m_optionsSizer->Add( m_paperOptionsSizer, 0, wxEXPAND, 5 );
wxStaticBoxSizer* sbSizerPlotFormat;
sbSizerPlotFormat = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("General Options:") ), wxVERTICAL );
m_defaultLineWidthTitle = new wxStaticText( sbSizerPlotFormat->GetStaticBox(), wxID_ANY, _("Default line thickness:"), wxDefaultPosition, wxDefaultSize, 0 );
m_defaultLineWidthTitle->Wrap( -1 );
sbSizerPlotFormat->Add( m_defaultLineWidthTitle, 0, wxLEFT|wxRIGHT, 5 );
m_DefaultLineSizeCtrl = new wxTextCtrl( sbSizerPlotFormat->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_DefaultLineSizeCtrl->SetToolTip( _("Selection of the default pen thickness used to draw items, when their thickness is set to 0.") );
sbSizerPlotFormat->Add( m_DefaultLineSizeCtrl, 0, wxBOTTOM|wxRIGHT|wxLEFT|wxEXPAND, 5 );
wxString m_ModeColorOptionChoices[] = { _("Color"), _("Black and white") };
int m_ModeColorOptionNChoices = sizeof( m_ModeColorOptionChoices ) / sizeof( wxString );
m_ModeColorOption = new wxRadioBox( sbSizerPlotFormat->GetStaticBox(), wxID_ANY, _("Output Mode:"), wxDefaultPosition, wxDefaultSize, m_ModeColorOptionNChoices, m_ModeColorOptionChoices, 1, wxRA_SPECIFY_COLS );
m_ModeColorOption->SetSelection( 1 );
m_ModeColorOption->SetToolTip( _("Choose if you want to draw the sheet like it appears on screen,\nor in black and white mode, better to print it when using black and white printers") );
sbSizerPlotFormat->Add( m_ModeColorOption, 0, wxBOTTOM|wxEXPAND|wxTOP, 5 );
m_PlotFrameRefOpt = new wxCheckBox( sbSizerPlotFormat->GetStaticBox(), wxID_ANY, _("Plot border and title block"), wxDefaultPosition, wxDefaultSize, 0 );
m_PlotFrameRefOpt = new wxCheckBox( sbOptions->GetStaticBox(), wxID_ANY, _("Plot border and title block"), wxDefaultPosition, wxDefaultSize, 0 );
m_PlotFrameRefOpt->SetValue(true);
m_PlotFrameRefOpt->SetToolTip( _("Print the frame references.") );
sbSizerPlotFormat->Add( m_PlotFrameRefOpt, 0, wxALL, 5 );
gbSizer1->Add( m_PlotFrameRefOpt, wxGBPosition( 1, 0 ), wxGBSpan( 1, 2 ), wxALL, 5 );
wxStaticText* bOutputModeLabel;
bOutputModeLabel = new wxStaticText( sbOptions->GetStaticBox(), wxID_ANY, _("Output mode:"), wxDefaultPosition, wxDefaultSize, 0 );
bOutputModeLabel->Wrap( -1 );
gbSizer1->Add( bOutputModeLabel, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
wxString m_ModeColorOptionChoices[] = { _("Color"), _("Black and White") };
int m_ModeColorOptionNChoices = sizeof( m_ModeColorOptionChoices ) / sizeof( wxString );
m_ModeColorOption = new wxChoice( sbOptions->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_ModeColorOptionNChoices, m_ModeColorOptionChoices, 0 );
m_ModeColorOption->SetSelection( 0 );
gbSizer1->Add( m_ModeColorOption, wxGBPosition( 2, 1 ), wxGBSpan( 1, 1 ), wxALL, 5 );
m_defaultLineWidthTitle = new wxStaticText( sbOptions->GetStaticBox(), wxID_ANY, _("Default line thickness:"), wxDefaultPosition, wxDefaultSize, 0 );
m_defaultLineWidthTitle->Wrap( -1 );
gbSizer1->Add( m_defaultLineWidthTitle, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxLEFT, 5 );
m_DefaultLineSizeCtrl = new wxTextCtrl( sbOptions->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
m_DefaultLineSizeCtrl->SetToolTip( _("Selection of the default pen thickness used to draw items, when their thickness is set to 0.") );
gbSizer1->Add( m_DefaultLineSizeCtrl, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxRIGHT|wxLEFT, 5 );
m_optionsSizer->Add( sbSizerPlotFormat, 0, wxEXPAND|wxLEFT, 5 );
gbSizer1->AddGrowableCol( 1 );
m_ButtonsSizer = new wxBoxSizer( wxVERTICAL );
sbOptions->Add( gbSizer1, 1, wxEXPAND, 5 );
m_ButtonsSizer->Add( 0, 0, 1, wxALL|wxEXPAND, 5 );
m_optionsSizer->Add( sbOptions, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
m_buttonPlotCurrent = new wxButton( this, wxID_PRINT_CURRENT, _("Plot Current Page"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonPlotCurrent->SetDefault();
m_ButtonsSizer->Add( m_buttonPlotCurrent, 0, wxALL|wxEXPAND, 5 );
m_HPGLOptionsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("HPGL Options") ), wxVERTICAL );
m_buttonPlotAll = new wxButton( this, wxID_PRINT_ALL, _("Plot All Pages"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonPlotAll->SetDefault();
m_ButtonsSizer->Add( m_buttonPlotAll, 0, wxALL|wxEXPAND, 5 );
wxGridBagSizer* gbSizer2;
gbSizer2 = new wxGridBagSizer( 0, 0 );
gbSizer2->SetFlexibleDirection( wxBOTH );
gbSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
m_buttonQuit = new wxButton( this, wxID_CANCEL, _("Close"), wxDefaultPosition, wxDefaultSize, 0 );
m_ButtonsSizer->Add( m_buttonQuit, 0, wxALL|wxEXPAND, 5 );
wxStaticText* sPositionLabel;
sPositionLabel = new wxStaticText( m_HPGLOptionsSizer->GetStaticBox(), wxID_ANY, _("Position:"), wxDefaultPosition, wxDefaultSize, 0 );
sPositionLabel->Wrap( -1 );
gbSizer2->Add( sPositionLabel, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 );
wxString m_plotOriginOptChoices[] = { _("Bottom left"), _("Center on page") };
int m_plotOriginOptNChoices = sizeof( m_plotOriginOptChoices ) / sizeof( wxString );
m_plotOriginOpt = new wxChoice( m_HPGLOptionsSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_plotOriginOptNChoices, m_plotOriginOptChoices, 0 );
m_plotOriginOpt->SetSelection( 0 );
gbSizer2->Add( m_plotOriginOpt, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_penHPLGWidthTitle = new wxStaticText( m_HPGLOptionsSizer->GetStaticBox(), wxID_ANY, _("Pen width:"), wxDefaultPosition, wxDefaultSize, 0 );
m_penHPLGWidthTitle->Wrap( -1 );
gbSizer2->Add( m_penHPLGWidthTitle, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxLEFT, 5 );
m_penHPGLWidthCtrl = new wxTextCtrl( m_HPGLOptionsSizer->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 );
gbSizer2->Add( m_penHPGLWidthCtrl, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_optionsSizer->Add( m_ButtonsSizer, 0, 0, 5 );
gbSizer2->AddGrowableCol( 1 );
m_HPGLOptionsSizer->Add( gbSizer2, 1, wxEXPAND, 5 );
bMainSizer->Add( m_optionsSizer, 0, wxEXPAND|wxLEFT|wxRIGHT|wxTOP, 5 );
m_optionsSizer->Add( m_HPGLOptionsSizer, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
bMainSizer->Add( m_optionsSizer, 0, wxEXPAND|wxRIGHT|wxLEFT, 5 );
wxBoxSizer* bSizerMsgPanel;
bSizerMsgPanel = new wxBoxSizer( wxVERTICAL );
@ -143,7 +143,18 @@ DIALOG_PLOT_SCHEMATIC_BASE::DIALOG_PLOT_SCHEMATIC_BASE( wxWindow* parent, wxWind
bSizerMsgPanel->Add( m_MessagesBox, 1, wxEXPAND | wxALL, 5 );
bMainSizer->Add( bSizerMsgPanel, 1, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 );
bMainSizer->Add( bSizerMsgPanel, 1, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 5 );
m_sdbSizer1 = new wxStdDialogButtonSizer();
m_sdbSizer1OK = new wxButton( this, wxID_OK );
m_sdbSizer1->AddButton( m_sdbSizer1OK );
m_sdbSizer1Apply = new wxButton( this, wxID_APPLY );
m_sdbSizer1->AddButton( m_sdbSizer1Apply );
m_sdbSizer1Cancel = new wxButton( this, wxID_CANCEL );
m_sdbSizer1->AddButton( m_sdbSizer1Cancel );
m_sdbSizer1->Realize();
bMainSizer->Add( m_sdbSizer1, 0, wxALL|wxEXPAND, 5 );
this->SetSizer( bMainSizer );
@ -152,23 +163,23 @@ DIALOG_PLOT_SCHEMATIC_BASE::DIALOG_PLOT_SCHEMATIC_BASE( wxWindow* parent, wxWind
// Connect Events
this->Connect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PLOT_SCHEMATIC_BASE::OnCloseWindow ) );
this->Connect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_PLOT_SCHEMATIC_BASE::OnUpdateUI ) );
m_browseButton->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_SCHEMATIC_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );
m_plotFormatOpt->Connect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_PLOT_SCHEMATIC_BASE::OnPlotFormatSelection ), NULL, this );
m_HPGLPaperSizeOption->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_SCHEMATIC_BASE::OnHPGLPageSelected ), NULL, this );
m_buttonPlotCurrent->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_SCHEMATIC_BASE::OnButtonPlotCurrentClick ), NULL, this );
m_buttonPlotAll->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_SCHEMATIC_BASE::OnButtonPlotAllClick ), NULL, this );
m_buttonQuit->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_SCHEMATIC_BASE::OnButtonCancelClick ), NULL, this );
m_paperSizeOption->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_SCHEMATIC_BASE::OnPageSizeSelected ), NULL, this );
m_sdbSizer1Apply->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_SCHEMATIC_BASE::OnPlotCurrent ), NULL, this );
m_sdbSizer1OK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_SCHEMATIC_BASE::OnPlotAll ), NULL, this );
}
DIALOG_PLOT_SCHEMATIC_BASE::~DIALOG_PLOT_SCHEMATIC_BASE()
{
// Disconnect Events
this->Disconnect( wxEVT_CLOSE_WINDOW, wxCloseEventHandler( DIALOG_PLOT_SCHEMATIC_BASE::OnCloseWindow ) );
this->Disconnect( wxEVT_UPDATE_UI, wxUpdateUIEventHandler( DIALOG_PLOT_SCHEMATIC_BASE::OnUpdateUI ) );
m_browseButton->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_SCHEMATIC_BASE::OnOutputDirectoryBrowseClicked ), NULL, this );
m_plotFormatOpt->Disconnect( wxEVT_COMMAND_RADIOBOX_SELECTED, wxCommandEventHandler( DIALOG_PLOT_SCHEMATIC_BASE::OnPlotFormatSelection ), NULL, this );
m_HPGLPaperSizeOption->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_SCHEMATIC_BASE::OnHPGLPageSelected ), NULL, this );
m_buttonPlotCurrent->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_SCHEMATIC_BASE::OnButtonPlotCurrentClick ), NULL, this );
m_buttonPlotAll->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_SCHEMATIC_BASE::OnButtonPlotAllClick ), NULL, this );
m_buttonQuit->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_SCHEMATIC_BASE::OnButtonCancelClick ), NULL, this );
m_paperSizeOption->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( DIALOG_PLOT_SCHEMATIC_BASE::OnPageSizeSelected ), NULL, this );
m_sdbSizer1Apply->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_SCHEMATIC_BASE::OnPlotCurrent ), NULL, this );
m_sdbSizer1OK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_PLOT_SCHEMATIC_BASE::OnPlotAll ), NULL, this );
}

File diff suppressed because it is too large Load Diff

View File

@ -1,5 +1,5 @@
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Apr 19 2018)
// C++ code generated with wxFormBuilder (version Dec 30 2017)
// http://www.wxformbuilder.org/
//
// PLEASE DO *NOT* EDIT THIS FILE!
@ -29,8 +29,9 @@ class WX_HTML_REPORT_PANEL;
#include <wx/sizer.h>
#include <wx/radiobox.h>
#include <wx/choice.h>
#include <wx/statbox.h>
#include <wx/checkbox.h>
#include <wx/gbsizer.h>
#include <wx/statbox.h>
#include <wx/panel.h>
#include <wx/dialog.h>
@ -44,43 +45,35 @@ class DIALOG_PLOT_SCHEMATIC_BASE : public DIALOG_SHIM
private:
protected:
enum
{
wxID_PRINT_CURRENT = 1000,
wxID_PRINT_ALL
};
wxStaticText* m_staticTextOutputDirectory;
wxTextCtrl* m_outputDirectoryName;
wxBitmapButton* m_browseButton;
wxBoxSizer* m_optionsSizer;
wxRadioBox* m_plotFormatOpt;
wxStaticBoxSizer* m_paperOptionsSizer;
wxRadioBox* m_PaperSizeOption;
wxStaticBoxSizer* m_paperHPGLSizer;
wxStaticText* m_staticText4;
wxChoice* m_HPGLPaperSizeOption;
wxRadioBox* m_plotOriginOpt;
wxStaticText* m_penHPLGWidthTitle;
wxTextCtrl* m_penHPGLWidthCtrl;
wxChoice* m_paperSizeOption;
wxCheckBox* m_PlotFrameRefOpt;
wxChoice* m_ModeColorOption;
wxStaticText* m_defaultLineWidthTitle;
wxTextCtrl* m_DefaultLineSizeCtrl;
wxRadioBox* m_ModeColorOption;
wxCheckBox* m_PlotFrameRefOpt;
wxBoxSizer* m_ButtonsSizer;
wxButton* m_buttonPlotCurrent;
wxButton* m_buttonPlotAll;
wxButton* m_buttonQuit;
wxStaticBoxSizer* m_HPGLOptionsSizer;
wxChoice* m_plotOriginOpt;
wxStaticText* m_penHPLGWidthTitle;
wxTextCtrl* m_penHPGLWidthCtrl;
WX_HTML_REPORT_PANEL* m_MessagesBox;
wxStdDialogButtonSizer* m_sdbSizer1;
wxButton* m_sdbSizer1OK;
wxButton* m_sdbSizer1Apply;
wxButton* m_sdbSizer1Cancel;
// Virtual event handlers, overide them in your derived class
virtual void OnCloseWindow( wxCloseEvent& event ) { event.Skip(); }
virtual void OnUpdateUI( wxUpdateUIEvent& event ) { event.Skip(); }
virtual void OnOutputDirectoryBrowseClicked( wxCommandEvent& event ) { event.Skip(); }
virtual void OnPlotFormatSelection( wxCommandEvent& event ) { event.Skip(); }
virtual void OnHPGLPageSelected( wxCommandEvent& event ) { event.Skip(); }
virtual void OnButtonPlotCurrentClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnButtonPlotAllClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnButtonCancelClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnPageSizeSelected( wxCommandEvent& event ) { event.Skip(); }
virtual void OnPlotCurrent( wxCommandEvent& event ) { event.Skip(); }
virtual void OnPlotAll( wxCommandEvent& event ) { event.Skip(); }
public:

View File

@ -52,46 +52,21 @@ enum HPGL_PAGEZ_T {
static const wxChar* plot_sheet_list( int aSize )
{
const wxChar* ret;
switch( aSize )
{
default:
case PAGE_DEFAULT:
ret = NULL; break;
case HPGL_PAGE_SIZE_A4:
ret = wxT( "A4" ); break;
case HPGL_PAGE_SIZE_A3:
ret = wxT( "A3" ); break;
case HPGL_PAGE_SIZE_A2:
ret = wxT( "A2" ); break;
case HPGL_PAGE_SIZE_A1:
ret = wxT( "A1" ); break;
case HPGL_PAGE_SIZE_A0:
ret = wxT( "A0" ); break;
case HPGL_PAGE_SIZE_A:
ret = wxT( "A" ); break;
case HPGL_PAGE_SIZE_B:
ret = wxT( "B" ); break;
case HPGL_PAGE_SIZE_C:
ret = wxT( "C" ); break;
case HPGL_PAGE_SIZE_D:
ret = wxT( "D" ); break;
case HPGL_PAGE_SIZE_E:
ret = wxT( "E" ); break;
case PAGE_DEFAULT: return nullptr;
case HPGL_PAGE_SIZE_A4: return wxT( "A4" );
case HPGL_PAGE_SIZE_A3: return wxT( "A3" );
case HPGL_PAGE_SIZE_A2: return wxT( "A2" );
case HPGL_PAGE_SIZE_A1: return wxT( "A1" );
case HPGL_PAGE_SIZE_A0: return wxT( "A0" );
case HPGL_PAGE_SIZE_A: return wxT( "A" );
case HPGL_PAGE_SIZE_B: return wxT( "B" );
case HPGL_PAGE_SIZE_C: return wxT( "C" );
case HPGL_PAGE_SIZE_D: return wxT( "D" );
case HPGL_PAGE_SIZE_E: return wxT( "E" );
}
return ret;
}
@ -145,8 +120,8 @@ void DIALOG_PLOT_SCHEMATIC::createHPGLFile( bool aPlotAll, bool aPlotFrameRef )
PAGE_INFO plotPage = curPage;
// if plotting on a page size other than curPage
if( m_HPGLPaperSizeOption->GetSelection() != PAGE_DEFAULT )
plotPage.SetType( plot_sheet_list( m_HPGLPaperSizeOption->GetSelection() ) );
if( m_paperSizeOption->GetSelection() != PAGE_DEFAULT )
plotPage.SetType( plot_sheet_list( m_paperSizeOption->GetSelection() ) );
// Calculation of conversion scales.
double plot_scale = (double) plotPage.GetWidthMils() / curPage.GetWidthMils();

View File

@ -183,6 +183,7 @@ EXTERN_BITMAP( find_xpm )
EXTERN_BITMAP( find_replace_xpm )
EXTERN_BITMAP( flag_xpm )
EXTERN_BITMAP( flip_board_xpm )
EXTERN_BITMAP( folder_xpm )
EXTERN_BITMAP( fonts_xpm )
EXTERN_BITMAP( footprint_text_xpm )
EXTERN_BITMAP( gbr_select_mode0_xpm )
@ -498,6 +499,7 @@ EXTERN_BITMAP( showtrack_xpm )
EXTERN_BITMAP( show_zone_xpm )
EXTERN_BITMAP( show_zone_disable_xpm )
EXTERN_BITMAP( show_zone_outline_only_xpm )
EXTERN_BITMAP( small_plus_xpm )
EXTERN_BITMAP( spreadsheet_xpm )
EXTERN_BITMAP( svg_file_xpm )
EXTERN_BITMAP( swap_layer_xpm )
@ -510,6 +512,7 @@ EXTERN_BITMAP( track_locked_xpm )
EXTERN_BITMAP( track_sketch_xpm )
EXTERN_BITMAP( track_unlocked_xpm )
EXTERN_BITMAP( transistor_xpm )
EXTERN_BITMAP( trash_xpm )
EXTERN_BITMAP( tree_nosel_xpm )
EXTERN_BITMAP( tree_sel_xpm )
EXTERN_BITMAP( undelete_xpm )

View File

@ -38,6 +38,7 @@
#include <board_design_settings.h>
#include <class_draw_panel_gal.h>
#include <view/view.h>
#include <bitmaps.h>
#include <tool/tool_manager.h>
#include <tools/pcb_actions.h>
@ -157,10 +158,7 @@ void DIALOG_DRC_CONTROL::InitValues()
m_config->Read( RefillZonesBeforeDrc, &value, false );
m_cbRefillZones->SetValue( value );
// Set the initial "enabled" status of the browse button and the text
// field for report name
wxCommandEvent junk;
OnReportCheckBoxClicked( junk );
m_BrowseButton->SetBitmap( KiBitmap( folder_xpm ) );
Layout(); // adding the units above expanded Clearance text, now resize.

Some files were not shown because too many files have changed in this diff Show More