Skip to content

K
kicad-source-mirror
Commit b5d27a56 authored by jean-pierre charras's avatar jean-pierre charras
Browse files
Options

Fix issues with new icons: 

* Replace use of wxICON by new icons declaration.
* Remove unused files.
* Fix filenames inconsistencies between old and new icons.
* dialog_erc handle variable size icons in erc matrix.
parent 1c412879
Hide whitespace changes
Inline Side-by-side
Showing with 227 additions and 162 deletions
3d-viewer/3d_frame.cpp
View file @ b5d27a56
......@@ -47,7 +47,9 @@ EDA_3D_FRAME::EDA_3D_FRAME( PCB_BASE_FRAME* parent, const wxString& title, long
m_reloadRequest = false;
// Give it an icon
SetIcon( wxICON( icon_3d ) );
wxIcon icon;
icon.CopyFromBitmap( KiBitmap( icon_3d_xpm ) );
SetIcon( icon );
GetSettings();
SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y );
......
bitmaps_png/CMakeLists.txt
View file @ b5d27a56
......@@ -197,7 +197,6 @@ set( BMAPS_MID
erc_green
ercwarn
erc
error
exit
export_footprint_names
export_module
......
bitmaps_png/cpp_26/erc_green.cpp
View file @ b5d27a56
/* 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 char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
0xce, 0x00, 0x00, 0x00, 0xb1, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7, 0x63, 0xf8, 0xff, 0xff, 0x3f,
0x03, 0x3d, 0x30, 0x82, 0xd1, 0xc0, 0xc0, 0x24, 0x50, 0x20, 0x20, 0x40, 0x4d, 0xcc, 0x90, 0xc6,
0xc0, 0x8a, 0x61, 0x91, 0x50, 0x01, 0xd7, 0x6e, 0xa1, 0x7c, 0xce, 0x2f, 0x42, 0x05, 0x9c, 0x9f,
0xa8, 0x86, 0x73, 0x38, 0x9f, 0x30, 0x84, 0x32, 0xb0, 0xc1, 0x2d, 0x12, 0x49, 0x62, 0xe0, 0x15,
0xcc, 0xe1, 0xfc, 0xa1, 0x74, 0x56, 0xe8, 0xbf, 0xd2, 0x39, 0xea, 0x61, 0x91, 0x3a, 0xee, 0x77,
0x82, 0x99, 0x1c, 0xb6, 0x70, 0x8b, 0x40, 0xde, 0x14, 0xca, 0xe3, 0xfc, 0x46, 0x4d, 0x4b, 0x40,
0x58, 0xb4, 0x99, 0xe7, 0x9d, 0x40, 0x06, 0x87, 0xc3, 0xa8, 0x45, 0xa3, 0x16, 0x8d, 0x5a, 0x34,
0x6a, 0xd1, 0xa8, 0x45, 0xa3, 0x16, 0x8d, 0x4c, 0x8b, 0x04, 0xd3, 0x04, 0xf9, 0x69, 0x62, 0x51,
0x13, 0xd0, 0xa2, 0x4c, 0x0e, 0x7b, 0xb8, 0x45, 0x40, 0xc0, 0x08, 0xb4, 0xe8, 0xbe, 0x58, 0x3b,
0xcf, 0x27, 0xb1, 0x2e, 0x9e, 0x0f, 0xd4, 0xc2, 0x42, 0xb9, 0x5c, 0x1f, 0x79, 0xb3, 0x79, 0x85,
0x51, 0x5b, 0x41, 0x59, 0x9c, 0xb2, 0x02, 0x99, 0x5c, 0x01, 0xd4, 0xc4, 0x82, 0x99, 0xdc, 0x7a,
0x18, 0xcd, 0x2d, 0x5a, 0x63, 0x00, 0xe2, 0xb1, 0x17, 0xfe, 0x13, 0xe0, 0x61, 0xbb, 0x00, 0x00,
0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42, 0x60, 0x82,
};
const BITMAP_OPAQUE erc_green_xpm[1] = {{ png, sizeof( png ), "erc_green_xpm" }};
//EOF
/* 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 char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
0xce, 0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00,
0x1a, 0x00, 0x07, 0xb2, 0x66, 0x2f, 0x00, 0x00, 0x01, 0x64, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7,
0xd5, 0x96, 0xb1, 0x4e, 0x02, 0x41, 0x10, 0x86, 0xbf, 0xb9, 0xbb, 0xa5, 0x38, 0xa3, 0x31, 0x21,
0xda, 0x28, 0x34, 0x1a, 0xe9, 0xa4, 0x35, 0x3c, 0x03, 0xa1, 0xb1, 0xb2, 0xb0, 0xf7, 0x21, 0xe4,
0x11, 0x78, 0x05, 0x0b, 0x5e, 0x81, 0xc6, 0xc6, 0x52, 0x63, 0x30, 0x34, 0x24, 0x58, 0x99, 0xa0,
0x84, 0x82, 0xc4, 0x12, 0x84, 0x53, 0xb8, 0x1d, 0x0b, 0x90, 0x28, 0x9c, 0xd1, 0x18, 0xee, 0x12,
0xff, 0x6e, 0x27, 0x9b, 0xf9, 0xb2, 0xff, 0xec, 0xce, 0x8e, 0x00, 0x04, 0x41, 0x50, 0x02, 0xca,
0x02, 0x79, 0x44, 0x0c, 0x9f, 0x24, 0x00, 0x22, 0x7c, 0x89, 0x2d, 0xac, 0xbf, 0x51, 0x08, 0xb4,
0x80, 0x8a, 0x31, 0xa6, 0x2a, 0xa3, 0xd1, 0xa8, 0x08, 0xd4, 0x54, 0x2d, 0xfd, 0xd7, 0xc1, 0xd2,
0xee, 0x48, 0xd0, 0x2f, 0xe1, 0x7e, 0xca, 0xc7, 0xb8, 0x06, 0xe0, 0x4c, 0x86, 0xc3, 0xe1, 0x35,
0x50, 0x38, 0xb9, 0x38, 0xa6, 0xf1, 0x54, 0xc7, 0x71, 0x1c, 0x56, 0xa5, 0x75, 0x6f, 0x83, 0xfa,
0x79, 0x93, 0x94, 0x97, 0xea, 0x7a, 0x6a, 0xed, 0xe1, 0xcb, 0xdb, 0x0b, 0xb7, 0x0f, 0x37, 0xac,
0x9d, 0xba, 0x20, 0xe1, 0xca, 0x40, 0xc1, 0x65, 0x40, 0xe3, 0xf1, 0x8e, 0xa3, 0xbd, 0xc2, 0xae,
0xa3, 0xaa, 0x66, 0x62, 0x43, 0x5c, 0xd7, 0x99, 0x79, 0xb2, 0x3a, 0x89, 0x11, 0x42, 0x1b, 0xa2,
0xaa, 0x38, 0xaa, 0x8a, 0xaa, 0x12, 0x97, 0x3e, 0xf2, 0x4f, 0x41, 0xd6, 0x26, 0x04, 0x4a, 0xea,
0x44, 0xc4, 0x06, 0x9a, 0xe6, 0x8e, 0xff, 0x44, 0x1a, 0x65, 0x9d, 0xc6, 0x68, 0x9d, 0xb5, 0x09,
0xd4, 0x68, 0x06, 0x8b, 0x1d, 0x34, 0xaf, 0x11, 0x89, 0xbe, 0xa3, 0x44, 0x40, 0xd6, 0xc6, 0x06,
0xd2, 0xa5, 0x1a, 0x41, 0xac, 0x35, 0x22, 0xf9, 0xce, 0x90, 0x64, 0xaf, 0xd3, 0xff, 0x7e, 0xeb,
0x48, 0x14, 0x34, 0x6b, 0x41, 0xe3, 0x18, 0x7d, 0x9b, 0xdb, 0xe7, 0xa9, 0x6a, 0xd3, 0x37, 0x7e,
0x21, 0xed, 0xa7, 0x19, 0x5c, 0xf5, 0x71, 0x3c, 0x89, 0x9a, 0x83, 0xfe, 0xa4, 0xf1, 0xf3, 0x84,
0xfd, 0xad, 0x03, 0x54, 0xb5, 0x2b, 0x9d, 0x76, 0xbb, 0x08, 0xd4, 0x7a, 0xfd, 0x1e, 0xf7, 0xbd,
0x56, 0xc4, 0xc7, 0x2f, 0x11, 0xa8, 0x08, 0xb8, 0x2c, 0x44, 0x45, 0xc8, 0x6c, 0x66, 0xc8, 0x6d,
0xe7, 0xa6, 0xe3, 0x16, 0x40, 0xa7, 0xdd, 0x2e, 0x01, 0x65, 0x20, 0x0f, 0x98, 0x9f, 0xa7, 0x8e,
0x08, 0xf8, 0x62, 0x4c, 0x24, 0x04, 0x5a, 0x02, 0x95, 0x9d, 0x6c, 0xb6, 0xfa, 0x0e, 0x74, 0x04,
0x22, 0x77, 0x71, 0x16, 0xc1, 0x16, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
0x60, 0x82,
};
const BITMAP_OPAQUE erc_green_xpm[1] = {{ png, sizeof( png ), "erc_green_xpm" }};
//EOF
bitmaps_png/cpp_26/ercgreen.cpp deleted 100644 → 0
View file @ 1c412879
/* 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 char png[] = {
0x89, 0x50, 0x4e, 0x47, 0x0d, 0x0a, 0x1a, 0x0a, 0x00, 0x00, 0x00, 0x0d, 0x49, 0x48, 0x44, 0x52,
0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00, 0x1a, 0x08, 0x06, 0x00, 0x00, 0x00, 0xa9, 0x4a, 0x4c,
0xce, 0x00, 0x00, 0x00, 0x09, 0x76, 0x70, 0x41, 0x67, 0x00, 0x00, 0x00, 0x1a, 0x00, 0x00, 0x00,
0x1a, 0x00, 0x07, 0xb2, 0x66, 0x2f, 0x00, 0x00, 0x01, 0x64, 0x49, 0x44, 0x41, 0x54, 0x48, 0xc7,
0xd5, 0x96, 0xb1, 0x4e, 0x02, 0x41, 0x10, 0x86, 0xbf, 0xb9, 0xbb, 0xa5, 0x38, 0xa3, 0x31, 0x21,
0xda, 0x28, 0x34, 0x1a, 0xe9, 0xa4, 0x35, 0x3c, 0x03, 0xa1, 0xb1, 0xb2, 0xb0, 0xf7, 0x21, 0xe4,
0x11, 0x78, 0x05, 0x0b, 0x5e, 0x81, 0xc6, 0xc6, 0x52, 0x63, 0x30, 0x34, 0x24, 0x58, 0x99, 0xa0,
0x84, 0x82, 0xc4, 0x12, 0x84, 0x53, 0xb8, 0x1d, 0x0b, 0x90, 0x28, 0x9c, 0xd1, 0x18, 0xee, 0x12,
0xff, 0x6e, 0x27, 0x9b, 0xf9, 0xb2, 0xff, 0xec, 0xce, 0x8e, 0x00, 0x04, 0x41, 0x50, 0x02, 0xca,
0x02, 0x79, 0x44, 0x0c, 0x9f, 0x24, 0x00, 0x22, 0x7c, 0x89, 0x2d, 0xac, 0xbf, 0x51, 0x08, 0xb4,
0x80, 0x8a, 0x31, 0xa6, 0x2a, 0xa3, 0xd1, 0xa8, 0x08, 0xd4, 0x54, 0x2d, 0xfd, 0xd7, 0xc1, 0xd2,
0xee, 0x48, 0xd0, 0x2f, 0xe1, 0x7e, 0xca, 0xc7, 0xb8, 0x06, 0xe0, 0x4c, 0x86, 0xc3, 0xe1, 0x35,
0x50, 0x38, 0xb9, 0x38, 0xa6, 0xf1, 0x54, 0xc7, 0x71, 0x1c, 0x56, 0xa5, 0x75, 0x6f, 0x83, 0xfa,
0x79, 0x93, 0x94, 0x97, 0xea, 0x7a, 0x6a, 0xed, 0xe1, 0xcb, 0xdb, 0x0b, 0xb7, 0x0f, 0x37, 0xac,
0x9d, 0xba, 0x20, 0xe1, 0xca, 0x40, 0xc1, 0x65, 0x40, 0xe3, 0xf1, 0x8e, 0xa3, 0xbd, 0xc2, 0xae,
0xa3, 0xaa, 0x66, 0x62, 0x43, 0x5c, 0xd7, 0x99, 0x79, 0xb2, 0x3a, 0x89, 0x11, 0x42, 0x1b, 0xa2,
0xaa, 0x38, 0xaa, 0x8a, 0xaa, 0x12, 0x97, 0x3e, 0xf2, 0x4f, 0x41, 0xd6, 0x26, 0x04, 0x4a, 0xea,
0x44, 0xc4, 0x06, 0x9a, 0xe6, 0x8e, 0xff, 0x44, 0x1a, 0x65, 0x9d, 0xc6, 0x68, 0x9d, 0xb5, 0x09,
0xd4, 0x68, 0x06, 0x8b, 0x1d, 0x34, 0xaf, 0x11, 0x89, 0xbe, 0xa3, 0x44, 0x40, 0xd6, 0xc6, 0x06,
0xd2, 0xa5, 0x1a, 0x41, 0xac, 0x35, 0x22, 0xf9, 0xce, 0x90, 0x64, 0xaf, 0xd3, 0xff, 0x7e, 0xeb,
0x48, 0x14, 0x34, 0x6b, 0x41, 0xe3, 0x18, 0x7d, 0x9b, 0xdb, 0xe7, 0xa9, 0x6a, 0xd3, 0x37, 0x7e,
0x21, 0xed, 0xa7, 0x19, 0x5c, 0xf5, 0x71, 0x3c, 0x89, 0x9a, 0x83, 0xfe, 0xa4, 0xf1, 0xf3, 0x84,
0xfd, 0xad, 0x03, 0x54, 0xb5, 0x2b, 0x9d, 0x76, 0xbb, 0x08, 0xd4, 0x7a, 0xfd, 0x1e, 0xf7, 0xbd,
0x56, 0xc4, 0xc7, 0x2f, 0x11, 0xa8, 0x08, 0xb8, 0x2c, 0x44, 0x45, 0xc8, 0x6c, 0x66, 0xc8, 0x6d,
0xe7, 0xa6, 0xe3, 0x16, 0x40, 0xa7, 0xdd, 0x2e, 0x01, 0x65, 0x20, 0x0f, 0x98, 0x9f, 0xa7, 0x8e,
0x08, 0xf8, 0x62, 0x4c, 0x24, 0x04, 0x5a, 0x02, 0x95, 0x9d, 0x6c, 0xb6, 0xfa, 0x0e, 0x74, 0x04,
0x22, 0x77, 0x71, 0x16, 0xc1, 0x16, 0x00, 0x00, 0x00, 0x00, 0x49, 0x45, 0x4e, 0x44, 0xae, 0x42,
0x60, 0x82,
};
const BITMAP_OPAQUE ercgreen_xpm[1] = {{ png, sizeof( png ), "ercgreen_xpm" }};
//EOF
bitmaps_png/sources/ercwarn.svg
View file @ b5d27a56
<svg xmlns="http://www.w3.org/2000/svg" height="48" width="48" version="1.0">
<defs>
<filter id="a" color-interpolation-filters="sRGB">
<feGaussianBlur stdDeviation="0.7125797"/>
</filter>
</defs>
<g transform="matrix(1.2114,0,0,1.1636,-5.3855,-4.35)">
<rect stroke-linejoin="round" fill-rule="evenodd" rx=".72608" ry="1.3898" height="34.248" width="33.268" stroke="#78781e" y="7.1759" x="7.775" stroke-width="1.5056" fill="#fdfd40"/>
<text opacity=".80078" style="word-spacing:0px;letter-spacing:0px" xml:space="preserve" transform="matrix(.85154 0 0 .88026 6.6875 11.812)" line-height="125%" filter="url(#a)" font-size="36.4px" y="29.40612" x="6.1734886" font-family="Sans" fill="#000000"><tspan font-family="UnDotum" y="29.40612" x="6.1734886" font-weight="bold" fill="#000000">W</tspan></text>
<text style="word-spacing:0px;letter-spacing:0px" xml:space="preserve" transform="scale(.98355 1.0167)" line-height="125%" font-size="31.515px" y="35.885643" x="10.682997" font-family="Sans" fill="#ffffff"><tspan font-family="UnDotum" y="35.885643" x="10.682997" font-weight="bold" fill="#ffffff">W</tspan></text>
</g>
<?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="48"
width="48"
version="1.0"
id="svg2"
inkscape:version="0.47 r22583"
sodipodi:docname="ercwarn.svg">
<metadata
id="metadata23">
<rdf:RDF>
<cc:Work
rdf:about="">
<dc:format>image/svg+xml</dc:format>
<dc:type
rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
</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="1280"
inkscape:window-height="949"
id="namedview21"
showgrid="false"
inkscape:zoom="4.9166667"
inkscape:cx="24"
inkscape:cy="23.59322"
inkscape:window-x="0"
inkscape:window-y="25"
inkscape:window-maximized="1"
inkscape:current-layer="svg2" />
<defs
id="defs4">
<inkscape:perspective
sodipodi:type="inkscape:persp3d"
inkscape:vp_x="0 : 24 : 1"
inkscape:vp_y="0 : 1000 : 0"
inkscape:vp_z="48 : 24 : 1"
inkscape:persp3d-origin="24 : 16 : 1"
id="perspective25" />
<filter
id="a"
color-interpolation-filters="sRGB">
<feGaussianBlur
stdDeviation="0.7125797"
id="feGaussianBlur7" />
</filter>
</defs>
<rect
style="fill:#fdfd40;fill-rule:evenodd;stroke:#78781e;stroke-width:1.78753781;stroke-linejoin:round"
id="rect11"
x="4.0331349"
y="3.9998772"
width="40.300858"
height="39.850975"
ry="1.6171712"
rx="0.87957329" />
<text
sodipodi:linespacing="125%"
id="text13"
x="6.1734886"
y="29.40612"
font-size="36.4px"
line-height="125%"
transform="matrix(1.0315556,0,0,1.0242705,1.6987885,8.9876636)"
xml:space="preserve"
style="font-size:36.40000153px;line-height:125%;letter-spacing:0px;word-spacing:0px;opacity:0.80077999;fill:#000000;filter:url(#a);font-family:Sans"><tspan
style="font-weight:bold;fill:#000000;font-family:UnDotum"
id="tspan15"
font-weight="bold"
x="6.1734886"
y="29.40612">W</tspan></text>
<text
sodipodi:linespacing="125%"
id="text17"
x="6.3035998"
y="37.831326"
font-size="31.515px"
line-height="125%"
transform="scale(1.0035609,0.99645173)"
xml:space="preserve"
style="font-size:37.41601944px;line-height:125%;letter-spacing:0px;word-spacing:0px;fill:#ffffff;font-family:Sans"><tspan
style="font-weight:bold;fill:#ffffff;font-family:UnDotum"
id="tspan19"
font-weight="bold"
x="6.3035998"
y="37.831326">W</tspan></text>
</svg>
bitmaps_png/sources/error.svg deleted 100644 → 0
View file @ 1c412879
<svg xmlns="http://www.w3.org/2000/svg" height="48" width="48" version="1.0">
<defs>
<filter id="a" color-interpolation-filters="sRGB">
<feGaussianBlur stdDeviation="0.7125797"/>
</filter>
</defs>
<g transform="matrix(1.2114,0,0,1.1636,-5.3855,-4.35)">
<rect stroke-linejoin="round" fill-rule="evenodd" rx=".72608" ry="1.3898" height="34.248" width="33.268" stroke="#78781e" y="7.1759" x="7.775" stroke-width="1.5056" fill="#fdfd40"/>
<text opacity=".80078" style="word-spacing:0px;letter-spacing:0px" xml:space="preserve" transform="matrix(.85154 0 0 .88026 6.6875 11.812)" line-height="125%" filter="url(#a)" font-size="36.4px" y="29.40612" x="6.1734886" font-family="Sans" fill="#000000"><tspan font-family="UnDotum" y="29.40612" x="6.1734886" font-weight="bold" fill="#000000">W</tspan></text>
<text style="word-spacing:0px;letter-spacing:0px" xml:space="preserve" transform="scale(.98355 1.0167)" line-height="125%" font-size="31.515px" y="35.885643" x="10.682997" font-family="Sans" fill="#ffffff"><tspan font-family="UnDotum" y="35.885643" x="10.682997" font-weight="bold" fill="#ffffff">W</tspan></text>
</g>
</svg>
bitmaps_xpm/CMakeLists.txt
View file @ b5d27a56
......@@ -116,7 +116,7 @@ set(BITMAP_SRCS
eeschema.xpm
enter_sheet.xpm
ercerr.xpm
ercgreen.xpm
erc_green.xpm
ercwarn.xpm
erc.xpm
exit.xpm
......
bitmaps_xpm/ercgreen.xpm → bitmaps_xpm/erc_green.xpm
View file @ b5d27a56
/* XPM */
#ifndef XPMMAIN
extern const char * erc_green_xpm[];
#else
const char *erc_green_xpm[] = {
/* columns rows colors const chars-per-pixel */
"11 11 2 1",
......@@ -21,5 +18,3 @@ const char *erc_green_xpm[] = {
"XXXXXXXXXXXX",
"XXXXXXXXXXXX"
};
#endif
bitmaps_xpm/ercerr.xpm
View file @ b5d27a56
/* XPM */
#ifndef XPMMAIN
extern const char * error_xpm[];
#else
const char *error_xpm[] = {
const char *ercerr_xpm[] = {
/* columns rows colors const chars-per-pixel */
"11 11 2 1",
"- c Black",
......@@ -21,5 +18,3 @@ const char *error_xpm[] = {
"X----------X",
"XXXXXXXXXXXX"
};
#endif
bitmaps_xpm/ercwarn.xpm
View file @ b5d27a56
/* XPM */
#ifndef XPMMAIN
extern const char * warning_xpm[];
#else
const char *warning_xpm[] = {
const char *ercwarn_xpm[] = {
/* columns rows colors const chars-per-pixel */
"11 11 2 1",
"- c Black",
......@@ -21,5 +18,3 @@ const char *warning_xpm[] = {
"XXX-XXX-XXX",
"XXXXXXXXXXX"
};
#endif
cvpcb/class_DisplayFootprintsFrame.cpp
View file @ b5d27a56
......@@ -55,12 +55,9 @@ DISPLAY_FOOTPRINTS_FRAME::DISPLAY_FOOTPRINTS_FRAME( CVPCB_MAINFRAME* father,
m_Draw_Axis = true; // true to draw axis.
// Give an icon
#ifdef __WINDOWS__
SetIcon( wxICON( a_icon_cvpcb ) );
#else
SetIcon( wxICON( icon_cvpcb ) );
#endif
SetTitle( title );
wxIcon icon;
icon.CopyFromBitmap( KiBitmap( icon_cvpcb_xpm ) );
SetIcon( icon );
SetBoard( new BOARD( NULL, this ) );
SetScreen( new PCB_SCREEN() );
......
eeschema/dialogs/dialog_erc.cpp
View file @ b5d27a56
/////////////////////////////////////////////////////////////////////////////
// Name: dialog_erc.cpp
// Purpose:
// Author: jean-pierre Charras
......@@ -30,12 +31,10 @@ bool DIALOG_ERC::m_writeErcFile = false;
BEGIN_EVENT_TABLE( DIALOG_ERC, DIALOG_ERC_BASE )
EVT_COMMAND_RANGE( ID_MATRIX_0, ID_MATRIX_0 + ( PIN_NMAX * PIN_NMAX ) - 1,
wxEVT_COMMAND_BUTTON_CLICKED,
DIALOG_ERC::ChangeErrorLevel )
END_EVENT_TABLE()
DIALOG_ERC::DIALOG_ERC( SCH_EDIT_FRAME* parent ) :
EVT_COMMAND_RANGE( ID_MATRIX_0, ID_MATRIX_0 + ( PIN_NMAX * PIN_NMAX ) - 1,
wxEVT_COMMAND_BUTTON_CLICKED,
DIALOG_ERC::ChangeErrorLevel )
END_EVENT_TABLE() DIALOG_ERC::DIALOG_ERC( SCH_EDIT_FRAME* parent ) :
DIALOG_ERC_BASE( parent )
{
m_Parent = parent;
......@@ -84,6 +83,7 @@ void DIALOG_ERC::OnEraseDrcMarkersClick( wxCommandEvent& event )
/* Delete the old ERC markers, over the whole hierarchy
*/
SCH_SCREENS ScreenList;
ScreenList.DeleteAllMarkers( MARK_ERC );
m_MarkersList->ClearList();
m_Parent->DrawPanel->Refresh();
......@@ -174,7 +174,7 @@ void DIALOG_ERC::OnLeftDClickMarkersList( wxCommandEvent& event )
m_Parent->m_CurrentSheet->UpdateAllScreenReferences();
}
m_Parent->GetScreen()->SetCrossHairPosition(pos);
m_Parent->GetScreen()->SetCrossHairPosition( pos );
m_Parent->RedrawScreen( pos, true );
}
......@@ -185,13 +185,16 @@ void DIALOG_ERC::ReBuildMatrixPanel()
{
int ii, jj, event_id, text_height;
wxPoint pos, BoxMatrixPosition;
#define BITMAP_SIZE 19
int bitmap_size = BITMAP_SIZE;
wxStaticText* text;
int x, y;
wxSize BoxMatrixMinSize;
// Try to know the size of bitmaps used in drc matrix
wxBitmap bitmap = KiBitmap( ercwarn_xpm );
wxSize bitmap_size = bitmap.GetSize();
bitmap_size.x += 5;
bitmap_size.y += 8; // Add a margin around the bitmap
if( !DiagErcTableInit )
{
memcpy( DiagErc, DefaultDiagErc, sizeof(DefaultDiagErc) );
......@@ -201,12 +204,12 @@ void DIALOG_ERC::ReBuildMatrixPanel()
// Get the current text size: this is a dummy text.
text = new wxStaticText( m_PanelERCOptions, -1, wxT( "W" ), pos );
text_height = text->GetRect().GetHeight();
bitmap_size = MAX( bitmap_size, text_height );
text_height = text->GetRect().GetHeight();
bitmap_size.y = MAX( bitmap_size.y, text_height );
SAFE_DELETE( text );
// compute the Y pos interval:
BoxMatrixMinSize.y = ( bitmap_size * (PIN_NMAX + 1) ) + 5;
BoxMatrixMinSize.y = ( bitmap_size.y * (PIN_NMAX + 1) ) + 5;
GetSizer()->Fit( this );
GetSizer()->SetSizeHints( this );
pos = m_MatrixSizer->GetPosition();
......@@ -222,13 +225,14 @@ void DIALOG_ERC::ReBuildMatrixPanel()
if( m_Initialized == FALSE )
{
// Print row labels
for( ii = 0; ii < PIN_NMAX; ii++ )
{
y = pos.y + (ii * bitmap_size);
int y = pos.y + (ii * bitmap_size.y);
text = new wxStaticText( m_PanelERCOptions, -1, CommentERC_H[ii],
wxPoint( 5, y ) );
wxPoint( 5, y + ( bitmap_size.y / 2) - (text_height / 2) ) );
x = text->GetRect().GetRight();
int x = text->GetRect().GetRight();
pos.x = MAX( pos.x, x );
}
......@@ -239,50 +243,52 @@ void DIALOG_ERC::ReBuildMatrixPanel()
for( ii = 0; ii < PIN_NMAX; ii++ )
{
y = pos.y + (ii * bitmap_size);
int y = pos.y + (ii * bitmap_size.y);
for( jj = 0; jj <= ii; jj++ )
{
// Add column labels (only once)
int diag = DiagErc[ii][jj];
x = pos.x + (jj * bitmap_size);
int x = pos.x + (jj * bitmap_size.x);
if( (ii == jj) && !m_Initialized )
{
wxPoint txtpos;
txtpos.x = x + 6;
txtpos.y = y - bitmap_size;
txtpos.x = x + (bitmap_size.x / 2);
txtpos.y = y - text_height;
text = new wxStaticText( m_PanelERCOptions,
-1,
CommentERC_V[ii],
txtpos );
BoxMatrixMinSize.x = MAX( BoxMatrixMinSize.x,
text->GetRect().GetRight() );
text->GetRect().GetRight() );
}
event_id = ID_MATRIX_0 + ii + ( jj * PIN_NMAX );
delete m_ButtonList[ii][jj];
// Add button on matrix
switch( diag )
{
case OK:
m_ButtonList[ii][jj] = new wxBitmapButton( m_PanelERCOptions,
event_id,
KiBitmap( erc_green_xpm ),
wxPoint( x, y ) );
event_id,
KiBitmap( erc_green_xpm ),
wxPoint( x, y ) );
break;
case WAR:
m_ButtonList[ii][jj] = new wxBitmapButton( m_PanelERCOptions,
event_id,
KiBitmap( warning_xpm ),
wxPoint( x, y ) );
event_id,
KiBitmap( ercwarn_xpm ),
wxPoint( x, y ) );
break;
case ERR:
m_ButtonList[ii][jj] = new wxBitmapButton( m_PanelERCOptions,
event_id,
KiBitmap( error_xpm ),
wxPoint( x, y ) );
event_id,
KiBitmap( ercerr_xpm ),
wxPoint( x, y ) );
break;
}
......@@ -323,10 +329,12 @@ void DIALOG_ERC::DisplayERC_MarkersList()
SCH_MARKER* Marker = (SCH_MARKER*) DrawStruct;
if( Marker->GetMarkerType() != MARK_ERC )
continue;
// Add marker without refresh the displayed list:
m_MarkersList->AppendToList( Marker, false );
}
}
m_MarkersList->Refresh();
}
......@@ -362,12 +370,12 @@ void DIALOG_ERC::ChangeErrorLevel( wxCommandEvent& event )
{
case OK:
level = WAR;
new_bitmap_xpm = warning_xpm;
new_bitmap_xpm = ercwarn_xpm;
break;
case WAR:
level = ERR;
new_bitmap_xpm = error_xpm;
new_bitmap_xpm = ercerr_xpm;
break;
case ERR:
......@@ -405,7 +413,7 @@ void DIALOG_ERC::TestErc( wxArrayString* aMessagesList )
m_writeErcFile = m_WriteResultOpt->GetValue();
/* Build the whole sheet list in hierarchy (sheet, not screen) */
SCH_SHEET_LIST sheets;
SCH_SHEET_LIST sheets;
sheets.AnnotatePowerSymbols();
if( m_Parent->CheckAnnotate( aMessagesList, false ) )
......@@ -428,8 +436,8 @@ void DIALOG_ERC::TestErc( wxArrayString* aMessagesList )
g_EESchemaVar.NbWarningErc = 0;
for( SCH_SCREEN* Screen = ScreenList.GetFirst();
Screen != NULL;
Screen = ScreenList.GetNext() )
Screen != NULL;
Screen = ScreenList.GetNext() )
{
bool ModifyWires;
ModifyWires = Screen->SchematicCleanUp( NULL );
......@@ -445,7 +453,7 @@ void DIALOG_ERC::TestErc( wxArrayString* aMessagesList )
* names can be duplicated).
*/
int errcnt = TestDuplicateSheetNames( true );
g_EESchemaVar.NbErrorErc += errcnt;
g_EESchemaVar.NbErrorErc += errcnt;
m_Parent->BuildNetListBase();
......@@ -460,8 +468,8 @@ void DIALOG_ERC::TestErc( wxArrayString* aMessagesList )
for( NetItemRef = 0; NetItemRef < g_NetObjectslist.size(); NetItemRef++ )
{
if( g_NetObjectslist[OldItem]->GetNet() != g_NetObjectslist[NetItemRef]->GetNet() )
{ // New net found:
if( g_NetObjectslist[OldItem]->GetNet() != g_NetObjectslist[NetItemRef]->GetNet() ) // New net found:
{
MinConn = NOC;
NetNbItems = 0;
StartNet = NetItemRef;
......
eeschema/tool_sch.cpp
View file @ b5d27a56
......@@ -139,6 +139,11 @@ void SCH_EDIT_FRAME::ReCreateHToolbar()
m_HToolBar->AddTool( ID_BACKANNO_ITEMS, wxEmptyString, KiBitmap( import_footprint_names_xpm ),
_( "Back annotate component foot prints" ) );
// set icon paddings
m_HToolBar->SetToolBorderPadding(3); // padding
m_HToolBar->SetToolSeparation(0);
//m_HToolBar->SetMargins(0,1); // margins width and height
// after adding the tools to the toolbar, must call Realize() to reflect the changes
m_HToolBar->Realize();
}
......@@ -219,6 +224,11 @@ void SCH_EDIT_FRAME::ReCreateVToolbar()
m_VToolBar->AddTool( ID_SCHEMATIC_DELETE_ITEM_BUTT, wxEmptyString, KiBitmap( delete_body_xpm ),
HELP_DELETE_ITEMS, wxITEM_CHECK );
// set icon paddings
m_VToolBar->SetToolBorderPadding(2); // padding
m_VToolBar->SetToolSeparation(0);
//m_VToolBar->SetMargins(1,0); // margins width and height
m_VToolBar->Realize();
}
......@@ -248,16 +258,20 @@ void SCH_EDIT_FRAME::ReCreateOptToolbar()
KiBitmap( cursor_shape_xpm ),
_( "Change cursor shape" ), wxITEM_CHECK );
m_OptionsToolBar->AddSeparator();
//m_OptionsToolBar->AddSeparator();
m_OptionsToolBar->AddTool( ID_TB_OPTIONS_HIDDEN_PINS, wxEmptyString,
KiBitmap( hidden_pin_xpm ),
_( "Show hidden pins" ), wxITEM_CHECK );
m_OptionsToolBar->AddSeparator();
//m_OptionsToolBar->AddSeparator();
m_OptionsToolBar->AddTool( ID_TB_OPTIONS_BUS_WIRES_ORIENT, wxEmptyString,
KiBitmap( lines90_xpm ),
_( "HV orientation for wires and bus" ),
wxITEM_CHECK );
// set icon paddings
m_OptionsToolBar->SetToolBorderPadding(2); // padding
m_OptionsToolBar->SetToolSeparation(0);
//m_OptionsToolBar->SetMargins(4,0); // margins width and height
m_OptionsToolBar->Realize();
}
......
include/bitmaps.h
View file @ b5d27a56
......@@ -175,8 +175,9 @@ EXTERN_BITMAP( edit_xpm )
EXTERN_BITMAP( eeschema_xpm )
EXTERN_BITMAP( enter_sheet_xpm )
EXTERN_BITMAP( erc_xpm )
EXTERN_BITMAP( ercerr_xpm )
EXTERN_BITMAP( ercwarn_xpm )
EXTERN_BITMAP( erc_green_xpm )
EXTERN_BITMAP( error_xpm )
EXTERN_BITMAP( exit_xpm )
EXTERN_BITMAP( export_footprint_names_xpm )
EXTERN_BITMAP( export_module_xpm )
......
pcbnew/dialogs/dialog_edit_module_for_BoardEditor.cpp
View file @ b5d27a56
......@@ -23,7 +23,10 @@ DIALOG_MODULE_BOARD_EDITOR::DIALOG_MODULE_BOARD_EDITOR( PCB_EDIT_FRAME* aParent
m_DC = aDC;
m_CurrentModule = aModule;
SetIcon( wxICON( icon_modedit ) ); // Give an icon
// Give an icon
wxIcon icon;
icon.CopyFromBitmap( KiBitmap( icon_modedit_xpm ) );
SetIcon( icon );
InitModeditProperties();
InitBoardProperties();
......
pcbnew/dialogs/dialog_edit_module_for_Modedit.cpp
View file @ b5d27a56
......@@ -21,7 +21,12 @@ DIALOG_MODULE_MODULE_EDITOR::DIALOG_MODULE_MODULE_EDITOR( FOOTPRINT_EDIT_FRAME*
{
m_Parent = aParent;
m_CurrentModule = aModule;
SetIcon( wxICON( icon_modedit ) ); // Give an icon
// Give an icon
wxIcon icon;
icon.CopyFromBitmap( KiBitmap( icon_modedit_xpm ) );
SetIcon( icon );
InitModeditProperties();
m_sdbSizerStdButtonsOK->SetDefault();
GetSizer()->Fit( this );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment