Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

Remove duplicate icon apply.svg (use ckecked_ok.svg instead which is the same icon). 

Add a workaround to fix a new bug in wxWidgets 3.0 ( Windows specific ) which shows icons only with a size = 16x16 in menus which have attribute wxITEM_CHECK
pull/1/head
jean-pierre charras 12 years ago
parent
c441c287b0
commit
d6f348f41e
11 changed files with 59 additions and 504 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      bitmaps_png/CMakeLists.txt
  2. 84
      bitmaps_png/cpp_26/apply.cpp
  3. 390
      bitmaps_png/sources/apply.svg
  4. 6
      eeschema/libedit_onrightclick.cpp
  5. 16
      eeschema/onrightclick.cpp
  6. 2
      gerbview/onrightclick.cpp
  7. 1
      include/bitmaps.h
  8. 37
      include/menus_helpers.h
  9. 4
      kicad/menubar.cpp
  10. 6
      pcbnew/modedit_onclick.cpp
  11. 16
      pcbnew/onrightclick.cpp

1
bitmaps_png/CMakeLists.txt
View File

@ -151,7 +151,6 @@ set( BMAPS_MID
annotate_down_right
annotate_right_down
annotate
apply
auto_associe
auto_delete_track
auto_track_width

84
bitmaps_png/cpp_26/apply.cpp
View File

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

390
bitmaps_png/sources/apply.svg
View File

@ -1,390 +0,0 @@
<?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"
style="enable-background:new"
height="26"
width="26"
version="1.0"
id="svg2"
inkscape:version="0.48.4 r9939"
sodipodi:docname="apply.svg">
<metadata
id="metadata99">
<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="1119"
inkscape:window-height="823"
id="namedview97"
showgrid="true"
borderlayer="true"
inkscape:zoom="28.639971"
inkscape:cx="13.118885"
inkscape:cy="13.473811"
inkscape:window-x="0"
inkscape:window-y="0"
inkscape:window-maximized="0"
inkscape:current-layer="svg2">
<inkscape:grid
type="xygrid"
id="grid3080"
empspacing="2"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true"
dotted="false" />
</sodipodi:namedview>
<defs
id="defs4">
<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="c">
<stop
stop-color="#f0ff80"
offset="0"
id="stop12" />
<stop
stop-color="#f0ff80"
stop-opacity="0"
offset="1"
id="stop14" />
</linearGradient>
<radialGradient
id="ad"
fy="99.884003"
gradientUnits="userSpaceOnUse"
cy="77.542"
cx="54.537998"
gradientTransform="matrix(1.3117,5.847e-8,-4.3853e-8,0.98379,-16.906,1.3137)"
r="48">
<stop
stop-color="#66f515"
offset="0"
id="stop17" />
<stop
stop-color="#002e00"
offset="1"
id="stop19" />
</radialGradient>
<linearGradient
id="y"
y2="30.849001"
gradientUnits="userSpaceOnUse"
x2="89.091003"
gradientTransform="translate(0,4)"
y1="103.9"
x1="89.091003">
<stop
stop-color="#003100"
offset="0"
id="stop22" />
<stop
stop-color="#008c00"
offset="1"
id="stop24" />
</linearGradient>
<linearGradient
id="z"
y2="89.995003"
gradientUnits="userSpaceOnUse"
x2="83.324997"
gradientTransform="translate(-2.3932e-5,4)"
y1="24.062"
x1="83.324997">
<stop
stop-color="#bfffbf"
offset="0"
id="stop27" />
<stop
stop-color="#bfffbf"
stop-opacity="0"
offset="1"
id="stop29" />
</linearGradient>
<radialGradient
id="ae"
fx="53.16"
fy="87.081001"
gradientUnits="userSpaceOnUse"
cy="95.459"
cx="52.792"
gradientTransform="matrix(0.56466,8.5323e-8,-1.3866e-7,0.91764,24.424,0.14392)"
r="52">
<stop
stop-color="#001400"
offset="0"
id="stop32" />
<stop
stop-color="#001400"
stop-opacity="0"
offset="1"
id="stop34" />
</radialGradient>
<radialGradient
id="b"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
cy="29.375"
cx="99.765999"
gradientTransform="matrix(1.9647,3.4243e-7,-1.0415e-6,5.9753,-96.241,-146.15)"
r="3.0156" />
<radialGradient
id="af"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
cy="29.375"
cx="99.765999"
gradientTransform="matrix(1.9647,3.4243e-7,-1.0415e-6,5.9753,-167.24,-126.15)"
r="3.0156" />
<linearGradient
id="aa"
y2="47.379002"
xlink:href="#c"
gradientUnits="userSpaceOnUse"
x2="71.603996"
y1="96.884003"
x1="71.603996" />
<filter
id="ai"
color-interpolation-filters="sRGB">
<feGaussianBlur
stdDeviation="0.425"
id="feGaussianBlur40" />
</filter>
<linearGradient
id="ab"
y2="46.277"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
x2="77.138"
y1="74.838997"
x1="87.532997" />
<linearGradient
id="ac"
y2="69.837997"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
x2="83.324997"
gradientTransform="translate(0,4)"
y1="24.062"
x1="83.324997" />
<radialGradient
id="ag"
xlink:href="#c"
gradientUnits="userSpaceOnUse"
cy="29.375"
cx="99.765999"
gradientTransform="matrix(1.9647,3.4243e-7,-1.0415e-6,5.9753,-167.24,-126.15)"
r="3.0156" />
<filter
id="aj"
color-interpolation-filters="sRGB">
<feGaussianBlur
stdDeviation="0.4605"
id="feGaussianBlur46" />
</filter>
<radialGradient
id="ah"
xlink:href="#a"
gradientUnits="userSpaceOnUse"
cy="51.919998"
cx="53.632999"
gradientTransform="matrix(1.0961,0.087912,-0.10023,1.2497,1.0599,-18.687)"
r="52" />
<filter
id="ak"
color-interpolation-filters="sRGB">
<feBlend
mode="lighten"
in2="BackgroundImage"
id="feBlend50" />
</filter>
<filter
id="al"
height="1.2058001"
width="1.3647"
color-interpolation-filters="sRGB"
y="-0.10289"
x="-0.18233">
<feGaussianBlur
stdDeviation="0.45819706"
id="feGaussianBlur53" />
</filter>
<filter
id="am"
height="1.2058001"
width="1.3647"
color-interpolation-filters="sRGB"
y="-0.10289"
x="-0.18233">
<feGaussianBlur
stdDeviation="0.45819706"
id="feGaussianBlur56" />
</filter>
<filter
id="v"
height="1.3703001"
width="1.2077"
color-interpolation-filters="sRGB"
y="-0.18513"
x="-0.10383">
<feGaussianBlur
stdDeviation="0.45819702"
id="feGaussianBlur59" />
</filter>
<filter
id="w"
height="1.2058001"
width="1.3647"
color-interpolation-filters="sRGB"
y="-0.10289"
x="-0.18233">
<feGaussianBlur
stdDeviation="0.45819706"
id="feGaussianBlur62" />
</filter>
<filter
id="x"
height="1.3703001"
width="1.2077"
color-interpolation-filters="sRGB"
y="-0.18513"
x="-0.10383">
<feGaussianBlur
stdDeviation="0.45819702"
id="feGaussianBlur65" />
</filter>
<radialGradient
inkscape:collect="always"
xlink:href="#a"
id="radialGradient3076"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.9647,3.4243e-7,-1.0415e-6,5.9753,-96.241,-146.15)"
cx="99.765999"
cy="29.375"
r="3.0156" />
<radialGradient
inkscape:collect="always"
xlink:href="#a"
id="radialGradient3078"
gradientUnits="userSpaceOnUse"
gradientTransform="matrix(1.9647,3.4243e-7,-1.0415e-6,5.9753,-96.241,-146.15)"
cx="99.765999"
cy="29.375"
r="3.0156" />
</defs>
<g
transform="matrix(0.24502174,0,0,0.25091083,-2.5625062,-3.5450263)"
id="g67">
<path
d="M 54.394,74.154 C 46.246,65.804 28.631,47.75 28.631,47.75 L 16,60.698 54.394,100.05 112,41 99.367,28.053 54.394,74.154 z"
id="path69"
inkscape:connector-curvature="0"
style="fill:none;stroke:#004d00;stroke-width:8.10000038;stroke-linecap:round;stroke-linejoin:round;filter:url(#aj)" />
<path
d="M 54.394,74.154 C 46.246,65.804 28.631,47.75 28.631,47.75 L 16,60.698 54.394,100.05 112,41 99.367,28.053 54.394,74.154 z"
id="path71"
inkscape:connector-curvature="0"
style="fill:none;stroke:url(#y);stroke-width:8;stroke-linecap:round;stroke-linejoin:round" />
<path
d="M 54.394,74.154 C 46.246,65.804 28.631,47.75 28.631,47.75 L 16,60.698 54.394,100.05 112,41 99.367,28.053 54.394,74.154 z"
id="path73"
inkscape:connector-curvature="0"
style="opacity:0.28570999;fill:none;stroke:url(#ah);stroke-width:8;stroke-linecap:round;stroke-linejoin:round;filter:url(#ak)" />
<path
d="m 28.406,44.031 c -0.14989,-0.0024 -0.28658,0.01658 -0.4375,0.03125 -0.82719,0.08205 -1.5953,0.42708 -2.2188,0.96875 l 1.6875,9.6875 c 0.11092,-0.11368 0.85037,-0.84818 0.9375,-0.9375 l 0.375,0.375 3.0312,-8.3438 -0.5625,-0.5625 c -0.74135,-0.75959 -1.7633,-1.2019 -2.8125,-1.2188 z"
transform="matrix(1,0,0,-1,26,147.75)"
id="path75"
inkscape:connector-curvature="0"
style="opacity:0.40951999;fill:url(#ag);filter:url(#al)" />
<path
d="m 99.406,24.031 c -0.14989,-0.0024 -0.28658,0.01658 -0.4375,0.03125 -0.82719,0.08205 -1.5953,0.42708 -2.2188,0.96875 l 1.6875,9.6875 c 0.11092,-0.11368 0.85037,-0.84818 0.9375,-0.9375 l 0.375,0.375 3.0312,-8.3438 -0.5625,-0.5625 c -0.74135,-0.75959 -1.7633,-1.2019 -2.8125,-1.2188 z"
transform="matrix(-0.34202,0.93969,0.93969,0.34202,24.21,-42.203)"
id="path77"
inkscape:connector-curvature="0"
style="opacity:0.2381;fill:url(#radialGradient3076);filter:url(#v)" />
<path
d="m 28.406,44.031 c -0.14989,-0.0024 -0.28658,0.01658 -0.4375,0.03125 -0.82719,0.08205 -1.5953,0.42708 -2.2188,0.96875 l 1.6875,9.6875 c 0.11092,-0.11368 0.85037,-0.84818 0.9375,-0.9375 l 0.375,0.375 3.0312,-8.3438 -0.5625,-0.5625 c -0.74135,-0.75959 -1.7633,-1.2019 -2.8125,-1.2188 z"
id="path79"
inkscape:connector-curvature="0"
style="opacity:0.77619001;fill:url(#af);filter:url(#am)" />
<path
d="m 99.406,24.031 c -0.14989,-0.0024 -0.28658,0.01658 -0.4375,0.03125 -0.82719,0.08205 -1.5953,0.42708 -2.2188,0.96875 l 1.6875,9.6875 c 0.11092,-0.11368 0.85037,-0.84818 0.9375,-0.9375 l 0.375,0.375 3.0312,-8.3438 -0.5625,-0.5625 c -0.74135,-0.75959 -1.7633,-1.2019 -2.8125,-1.2188 z"
transform="matrix(0.34202,0.93969,-0.93969,0.34202,104.53,-62.203)"
id="path81"
inkscape:connector-curvature="0"
style="opacity:0.37142998;fill:url(#radialGradient3078);filter:url(#x)" />
<path
d="m 99.406,24.031 c -0.14989,-0.0024 -0.28658,0.01658 -0.4375,0.03125 -0.82719,0.08205 -1.5953,0.42708 -2.2188,0.96875 l 1.6875,9.6875 c 0.11092,-0.11368 0.85037,-0.84818 0.9375,-0.9375 l 0.375,0.375 3.0312,-8.3438 -0.5625,-0.5625 c -0.74135,-0.75959 -1.7633,-1.2019 -2.8125,-1.2188 z"
transform="translate(-2.3932e-5,0)"
id="path83"
inkscape:connector-curvature="0"
style="opacity:0.87142998;fill:url(#b);filter:url(#w)" />
<path
d="M 54.394,74.154 C 46.246,65.804 28.631,47.75 28.631,47.75 L 16,60.698 54.394,100.05 112,41 99.367,28.053 54.394,74.154 z"
id="path85"
inkscape:connector-curvature="0"
style="opacity:0.28570999;fill:none;stroke:url(#ae);stroke-width:8;stroke-linecap:round;stroke-linejoin:round" />
<path
d="M 54.394,74.154 C 46.246,65.804 28.631,47.75 28.631,47.75 L 16,60.698 54.394,100.05 112,41 99.367,28.053 54.394,74.154 z"
id="path87"
inkscape:connector-curvature="0"
style="fill:url(#ad)" />
<path
d="m 99.375,28.062 c -3e-6,0 -35.257,36.14 -44.969,46.094 C 46.258,65.806 28.625,47.75 28.625,47.75 L 16,60.688 32.469,77.563 c 0.18891,4.87e-4 0.37338,0 0.5625,0 17.53,0 34.136,-2.0931 49.031,-5.8438 l 29.937,-30.719 -12.625,-12.938 z"
id="path89"
inkscape:connector-curvature="0"
style="fill:url(#z)" />
<path
d="M 54.394,74.154 C 46.246,65.804 28.631,47.75 28.631,47.75 L 16,60.698 54.394,100.05 112,41 99.367,28.053 54.394,74.154 z"
id="path91"
inkscape:connector-curvature="0"
style="fill:none;stroke:url(#aa);filter:url(#ai)" />
<path
d="m 99.375,28.062 c 0,0 -0.40024,0.43134 -0.40625,0.4375 l 12.188,12.281 -30,30.219 c -14.927,3.6876 -31.057,6.2187 -48.625,6.2188 -0.12636,0 -0.25009,-10e-7 -0.375,0 l 0.3125,0.34375 c 0.18891,4.87e-4 0.37338,0 0.5625,0 17.53,0 34.136,-2.0931 49.031,-5.8438 l 29.936,-30.719 -12.625,-12.938 z"
transform="translate(-2.3932e-5,0)"
id="path93"
inkscape:connector-curvature="0"
style="fill:url(#ab)" />
<path
d="m 99.375,28.062 c -3e-6,0 -35.257,36.14 -44.969,46.094 C 46.258,65.806 28.625,47.75 28.625,47.75 L 16,60.688 l 0.5,0.5 12.125,-12.438 c 0,0 17.633,18.056 25.781,26.406 9.712,-9.954 44.969,-46.094 44.969,-46.094 L 111.5,41.5 112,41 99.375,28.062 z"
transform="translate(-2.3932e-5,0)"
id="path95"
inkscape:connector-curvature="0"
style="fill:url(#ac)" />
</g>
</svg>

6
eeschema/libedit_onrightclick.cpp
View File

@ -6,7 +6,7 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2004-2013 KiCad Developers, see change_log.txt for contributors.
* Copyright (C) 2004-2014 KiCad Developers, see change_log.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -216,7 +216,7 @@ bool LIB_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu )
if( item->IsNew() )
{
AddMenuItem( PopMenu, ID_POPUP_LIBEDIT_END_CREATE_ITEM, _( "Line End" ),
KiBitmap( apply_xpm ) );
KiBitmap( checked_ok_xpm ) );
}
msg = AddHotkeyName( _( "Edit Line Options" ), s_Libedit_Hokeys_Descr, HK_EDIT );
@ -328,7 +328,7 @@ void AddMenusForBlock( wxMenu* PopMenu, LIB_EDIT_FRAME* frame )
PopMenu->AppendSeparator();
AddMenuItem( PopMenu, ID_POPUP_PLACE_BLOCK, _( "Place Block" ), KiBitmap( apply_xpm ) );
AddMenuItem( PopMenu, ID_POPUP_PLACE_BLOCK, _( "Place Block" ), KiBitmap( checked_ok_xpm ) );
if( frame->GetScreen()->m_BlockLocate.GetCommand() == BLOCK_MOVE )
{

16
eeschema/onrightclick.cpp
View File

@ -1,9 +1,9 @@
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2013 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2008-2013 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 2004-2013 KiCad Developers, see change_log.txt for contributors.
* Copyright (C) 2014 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2008-2014 Wayne Stambaugh <stambaughw@verizon.net>
* Copyright (C) 2004-2014 KiCad Developers, see change_log.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -270,7 +270,7 @@ bool SCH_EDIT_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu )
default:
if( is_new )
AddMenuItem( PopMenu, ID_POPUP_END_LINE, _( "End Drawing" ),
KiBitmap( apply_xpm ) );
KiBitmap( checked_ok_xpm ) );
AddMenuItem( PopMenu, ID_POPUP_SCH_DELETE, _( "Delete Drawing" ),
KiBitmap( delete_xpm ) );
@ -677,7 +677,7 @@ void AddMenusForWire( wxMenu* PopMenu, SCH_LINE* Wire, SCH_EDIT_FRAME* frame )
if( is_new )
{
msg = AddHotkeyName( _( "Wire End" ), s_Schematic_Hokeys_Descr, HK_END_CURR_LINEWIREBUS );
AddMenuItem( PopMenu, ID_POPUP_END_LINE, msg, KiBitmap( apply_xpm ) );
AddMenuItem( PopMenu, ID_POPUP_END_LINE, msg, KiBitmap( checked_ok_xpm ) );
return;
}
@ -727,7 +727,7 @@ void AddMenusForBus( wxMenu* PopMenu, SCH_LINE* Bus, SCH_EDIT_FRAME* frame )
if( is_new )
{
msg = AddHotkeyName( _( "Bus End" ), s_Schematic_Hokeys_Descr, HK_END_CURR_LINEWIREBUS );
AddMenuItem( PopMenu, ID_POPUP_END_LINE, msg, KiBitmap( apply_xpm ) );
AddMenuItem( PopMenu, ID_POPUP_END_LINE, msg, KiBitmap( checked_ok_xpm ) );
return;
}
@ -768,7 +768,7 @@ void AddMenusForHierchicalSheet( wxMenu* PopMenu, SCH_SHEET* Sheet )
if( Sheet->GetFlags() )
{
AddMenuItem( PopMenu, ID_POPUP_SCH_END_SHEET, _( "Place Sheet" ), KiBitmap( apply_xpm ) );
AddMenuItem( PopMenu, ID_POPUP_SCH_END_SHEET, _( "Place Sheet" ), KiBitmap( checked_ok_xpm ) );
}
else
{
@ -823,7 +823,7 @@ void AddMenusForBlock( wxMenu* PopMenu, SCH_EDIT_FRAME* frame )
if( frame->GetScreen()->m_BlockLocate.GetCommand() == BLOCK_MOVE )
AddMenuItem( PopMenu, ID_POPUP_ZOOM_BLOCK, _( "Window Zoom" ), KiBitmap( zoom_area_xpm ) );
AddMenuItem( PopMenu, ID_POPUP_PLACE_BLOCK, _( "Place Block" ), KiBitmap( apply_xpm ) );
AddMenuItem( PopMenu, ID_POPUP_PLACE_BLOCK, _( "Place Block" ), KiBitmap( checked_ok_xpm ) );
// After a block move (that is also a block selection) one can reselect
// a block function.

2
gerbview/onrightclick.cpp
View File

@ -53,7 +53,7 @@ bool GERBVIEW_FRAME::OnRightClick( const wxPoint& aPosition, wxMenu* PopMenu )
_( "Cancel Block" ), KiBitmap( cancel_xpm ) );
PopMenu->AppendSeparator();
AddMenuItem( PopMenu, ID_POPUP_PLACE_BLOCK,
_( "Place Block" ), KiBitmap( apply_xpm ) );
_( "Place Block" ), KiBitmap( checked_ok_xpm ) );
AddMenuItem( PopMenu, ID_POPUP_DELETE_BLOCK,
_( "Delete Block (ctrl + drag mouse)" ), KiBitmap( delete_xpm ) );
}

1
include/bitmaps.h
View File

@ -78,7 +78,6 @@ EXTERN_BITMAP( anchor_xpm )
EXTERN_BITMAP( annotate_down_right_xpm )
EXTERN_BITMAP( annotate_right_down_xpm )
EXTERN_BITMAP( annotate_xpm )
EXTERN_BITMAP( apply_xpm )
EXTERN_BITMAP( auto_associe_xpm )
EXTERN_BITMAP( auto_delete_track_xpm )
EXTERN_BITMAP( auto_track_width_xpm )

37
include/menus_helpers.h
View File

@ -3,6 +3,29 @@
* @brief Usefull macros and inline functions to create menus items
* in menubars or popup menus
*/
/*
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2004-2014 KiCad Developers.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version 2
* of the License, or (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program; if not, you may find one here:
* http://www.gnu.org/licenses/old-licenses/gpl-2.0.html
* or you may search the http://www.gnu.org website for the version 2 license,
* or you may write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
*/
#include <bitmaps.h>
@ -13,7 +36,7 @@
* @param aImage is the image to add the menu item.
*/
#if defined( USE_IMAGES_IN_MENUS ) && defined( __WINDOWS__ )
# define SETBITMAPS( aImage ) item->SetBitmaps( KiBitmap( apply_xpm ), KiBitmap( aImage ) )
# define SETBITMAPS( aImage ) item->SetBitmaps( KiBitmap( checked_ok_xpm ), KiBitmap( aImage ) )
#else
# define SETBITMAPS( aImage )
#endif
@ -55,7 +78,11 @@ static inline wxMenuItem* AddMenuItem( wxMenu* aMenu,
if( aType == wxITEM_CHECK )
{
#if defined( USE_IMAGES_IN_MENUS ) && defined( __WINDOWS__ )
item->SetBitmaps( KiBitmap( apply_xpm ), aImage );
item->SetBitmaps( KiBitmap( checked_ok_xpm ), aImage );
// A workaround to a strange bug on Windows, wx Widgets 3.0:
// size of bitmaps is not taken in account for wxITEM_CHECK menu
// unless we call SetFont
item->SetFont(*wxNORMAL_FONT);
#endif
}
else
@ -96,7 +123,11 @@ static inline wxMenuItem* AddMenuItem( wxMenu* aMenu,
if( aType == wxITEM_CHECK )
{
#if defined( USE_IMAGES_IN_MENUS ) && defined( __WINDOWS__ )
item->SetBitmaps( KiBitmap( apply_xpm ), aImage );
item->SetBitmaps( KiBitmap( checked_ok_xpm ), aImage );
// A workaround to a strange bug on Windows, wx Widgets 3.0:
// size of bitmaps is not taken in account for wxITEM_CHECK menu
// unless we call SetFont
item->SetFont(*wxNORMAL_FONT);
#endif
}
else

4
kicad/menubar.cpp
View File

@ -230,7 +230,7 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar()
AddMenuItem( SubMenuPdfBrowserChoice, ID_SELECT_PREFERED_PDF_BROWSER,
_( "&Favourite" ),
_( "Use your favourite PDF viewer used to browse datasheets" ),
KiBitmap( preference_xpm ),
KiBitmap( datasheet_xpm ),
wxITEM_CHECK );
SubMenuPdfBrowserChoice->Check( ID_SELECT_PREFERED_PDF_BROWSER,
!wxGetApp().UseSystemPdfBrowser() );
@ -239,7 +239,7 @@ void KICAD_MANAGER_FRAME::ReCreateMenuBar()
// Append PDF Viewer submenu to preferences
AddMenuItem( SubMenuPdfBrowserChoice,
ID_SELECT_PREFERED_PDF_BROWSER_NAME,
_( "&PDF Viewer" ),
_( "Select &PDF Viewer" ),
_( "Select your favourite PDF viewer used to browse datasheets" ),
KiBitmap( datasheet_xpm ) );

6
pcbnew/modedit_onclick.cpp
View File

@ -223,7 +223,7 @@ bool FOOTPRINT_EDIT_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopMen
KiBitmap( zoom_area_xpm ) );
PopMenu->AppendSeparator();
AddMenuItem( PopMenu, ID_POPUP_PLACE_BLOCK,
_( "Place Block" ), KiBitmap( apply_xpm ) );
_( "Place Block" ), KiBitmap( checked_ok_xpm ) );
AddMenuItem( PopMenu, ID_POPUP_COPY_BLOCK,
_( "Copy Block (shift + drag mouse)" ),
KiBitmap( copyblock_xpm ) );
@ -327,7 +327,7 @@ bool FOOTPRINT_EDIT_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopMen
{
if( (flags & IS_NEW) )
AddMenuItem( PopMenu, ID_POPUP_PCB_STOP_CURRENT_DRAWING, _( "End edge" ),
KiBitmap( apply_xpm ) );
KiBitmap( checked_ok_xpm ) );
if( !flags )
{
@ -337,7 +337,7 @@ bool FOOTPRINT_EDIT_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopMen
if( ( flags & (IS_NEW | IS_MOVED) ) == IS_MOVED )
AddMenuItem( PopMenu, ID_POPUP_PCB_PLACE_EDGE, _( "Place edge" ),
KiBitmap( apply_xpm ) );
KiBitmap( checked_ok_xpm ) );
msg = AddHotkeyName( _("Edit" ), g_Module_Editor_Hokeys_Descr, HK_EDIT_ITEM );
AddMenuItem( PopMenu, ID_POPUP_MODEDIT_EDIT_BODY_ITEM,

16
pcbnew/onrightclick.cpp
View File

@ -195,7 +195,7 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
if( (flags & IS_NEW) )
{
AddMenuItem( aPopMenu, ID_POPUP_PCB_STOP_CURRENT_DRAWING,
_( "End Drawing" ), KiBitmap( apply_xpm ) );
_( "End Drawing" ), KiBitmap( checked_ok_xpm ) );
}
if( !flags )
@ -225,7 +225,7 @@ bool PCB_EDIT_FRAME::OnRightClick( const wxPoint& aMousePos, wxMenu* aPopMenu )
if( flags & IS_NEW )
{
AddMenuItem( aPopMenu, ID_POPUP_PCB_STOP_CURRENT_EDGE_ZONE,
_( "Close Zone Outline" ), KiBitmap( apply_xpm ) );
_( "Close Zone Outline" ), KiBitmap( checked_ok_xpm ) );
AddMenuItem( aPopMenu, ID_POPUP_PCB_DELETE_ZONE_LAST_CREATED_CORNER,
_( "Delete Last Corner" ), KiBitmap( delete_xpm ) );
}
@ -452,7 +452,7 @@ void PCB_EDIT_FRAME::createPopUpBlockMenu( wxMenu* menu )
KiBitmap( cancel_xpm ) );
AddMenuItem( menu, ID_POPUP_ZOOM_BLOCK, _( "Zoom Block" ), KiBitmap( zoom_area_xpm ) );
menu->AppendSeparator();
AddMenuItem( menu, ID_POPUP_PLACE_BLOCK, _( "Place Block" ), KiBitmap( apply_xpm ) );
AddMenuItem( menu, ID_POPUP_PLACE_BLOCK, _( "Place Block" ), KiBitmap( checked_ok_xpm ) );
AddMenuItem( menu, ID_POPUP_COPY_BLOCK, _( "Copy Block" ), KiBitmap( copyblock_xpm ) );
AddMenuItem( menu, ID_POPUP_FLIP_BLOCK, _( "Flip Block" ), KiBitmap( invert_module_xpm ) );
AddMenuItem( menu, ID_POPUP_ROTATE_BLOCK, _( "Rotate Block" ), KiBitmap( rotate_ccw_xpm ) );
@ -517,7 +517,7 @@ void PCB_EDIT_FRAME::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu )
else if( flags & IS_DRAGGED ) // Drag via or node in progress
{
AddMenuItem( PopMenu, ID_POPUP_PCB_PLACE_MOVED_TRACK_NODE,
_( "Place Node" ), KiBitmap( apply_xpm ) );
_( "Place Node" ), KiBitmap( checked_ok_xpm ) );
return;
}
else // Edition in progress
@ -525,7 +525,7 @@ void PCB_EDIT_FRAME::createPopupMenuForTracks( TRACK* Track, wxMenu* PopMenu )
if( flags & IS_NEW )
{
msg = AddHotkeyName( _( "End Track" ), g_Board_Editor_Hokeys_Descr, HK_END_TRACK );
AddMenuItem( PopMenu, ID_POPUP_PCB_END_TRACK, msg, KiBitmap( apply_xpm ) );
AddMenuItem( PopMenu, ID_POPUP_PCB_END_TRACK, msg, KiBitmap( checked_ok_xpm ) );
}
msg = AddHotkeyName( _( "Place Through Via" ), g_Board_Editor_Hokeys_Descr, HK_ADD_THROUGH_VIA );
@ -646,16 +646,16 @@ void PCB_EDIT_FRAME::createPopUpMenuForZones( ZONE_CONTAINER* edge_zone, wxMenu*
if( edge_zone->GetFlags() == IS_DRAGGED )
{
AddMenuItem( aPopMenu, ID_POPUP_PCB_PLACE_DRAGGED_ZONE_OUTLINE_SEGMENT,
_( "Place Edge Outline" ), KiBitmap( apply_xpm ) );
_( "Place Edge Outline" ), KiBitmap( checked_ok_xpm ) );
}
else if( edge_zone->GetFlags() )
{
if( (edge_zone->GetFlags() & IN_EDIT ) )
AddMenuItem( aPopMenu, ID_POPUP_PCB_PLACE_ZONE_CORNER,
_( "Place Corner" ), KiBitmap( apply_xpm ) );
_( "Place Corner" ), KiBitmap( checked_ok_xpm ) );
else
AddMenuItem( aPopMenu, ID_POPUP_PCB_PLACE_ZONE_OUTLINES,
_( "Place Zone" ), KiBitmap( apply_xpm ) );
_( "Place Zone" ), KiBitmap( checked_ok_xpm ) );
}
else
{

Write Preview
Loading…
Cancel
Save