Skip to content

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

Gerbview: cosmetic enhancements

parents fa37d840 73c674b8
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 2190 additions and 166 deletions
bitmaps/CMakeLists.txt
View file @ 0f4a3b14
...@@ -138,6 +138,10 @@ set(BITMAP_SRCS ...@@ -138,6 +138,10 @@ set(BITMAP_SRCS
gbr_select_mode0.xpm gbr_select_mode0.xpm
gbr_select_mode1.xpm gbr_select_mode1.xpm
gbr_select_mode2.xpm gbr_select_mode2.xpm
gerber_file.xpm
gerbview_drill_file.xpm
gerbview_clear_layers.xpm
gerber_open_dcode_file.xpm
general_deletions.xpm general_deletions.xpm
general_ratsnet.xpm general_ratsnet.xpm
GLabel2Label.xpm GLabel2Label.xpm
...@@ -273,7 +277,7 @@ set(BITMAP_SRCS ...@@ -273,7 +277,7 @@ set(BITMAP_SRCS
online_help.xpm online_help.xpm
Open_Library.xpm Open_Library.xpm
Open_Project.xpm Open_Project.xpm
open.xpm open_document.xpm
options_all_tracks_and_vias.xpm options_all_tracks_and_vias.xpm
Options_All_Tracks.xpm Options_All_Tracks.xpm
Options_All_Vias.xpm Options_All_Vias.xpm
......
bitmaps/Zoom_1.xpm deleted 100644 → 0
View file @ fa37d840
/* XPM */
#ifndef XPMMAIN
extern const char * zoom_1_xpm[];
#else
const char * zoom_1_xpm[] = {
"16 16 36 1",
" c None",
". c #000000",
"+ c #262626",
"@ c #C5C5C5",
"# c #EEEEEE",
"$ c #EDEDED",
"% c #ABABAB",
"& c #464646",
"* c #878787",
"= c #F1F1F1",
"- c #FEFEFE",
"; c #FDFDFD",
"> c #FCFCFC",
", c #EAEAEA",
"' c #707070",
") c #FBFBFB",
"! c #E8E8E8",
"~ c #B0B0B0",
"{ c #434343",
"] c #FAFAFA",
"^ c #A4A4A4",
"/ c #E5E5E5",
"( c #E4E4E4",
"_ c #F9F9F9",
": c #BABABA",
"< c #E7E7E7",
"[ c #858585",
"} c #E3E3E3",
"| c #6D6D6D",
"1 c #A1A1A1",
"2 c #202020",
"3 c #686868",
"4 c #343434",
"5 c #797979",
"6 c #3A3A3A",
"7 c #1F1F1F",
" .... ",
" .+@#$%&. ",
" .*=--;>,'. ",
" &=--..;)!& ",
".~--{..;>]^. ",
".#---..;)]/. ",
".$;--..>)](. ",
".%>;;..)]_:. ",
" &,)>..]_<& ",
" .[!]]]_}|. ",
" .&^/(1&.... ",
" .... 22.. ",
" .34.. ",
" .56..",
" .37.",
" .. "};
#endif
bitmaps/gerber_file.xpm 0 → 100644
View file @ 0f4a3b14
/* XPM */
const char *gerber_file_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 16 1",
"X c #9CAA8C",
"$ c #484607",
"& c #3C6704",
"; c #BC0807",
"- c #BC6644",
"* c #30A506",
"# c #89C35C",
"% c #34B60B",
"o c #BCC990",
"O c #657642",
". c #FAFCF9",
"@ c #87904F",
"= c #BC9C6C",
" c #56692F",
": c #543A04",
"+ c #A9BC7A",
/* pixels */
" ",
" ...X .... o... ",
" ...X .... o...O",
" OOO O OO OOO ",
"ooooooo+@@+ooo#o",
"ooo+ooO$$$$@#%%%",
"ooooo@$$$$&*%%%+",
"=----$$$&*%**#oo",
";;;;;:$$***& ooo",
"=----$$$&&$$@ooo",
"ooooo+$$$$$$+ooo",
"oooooo+ $$O+oo+o",
" ",
" ...XO.... o... ",
" ...X .... o...O",
" OOO OOOO OOOOO"
};
bitmaps/gerber_open_dcode_file.xpm 0 → 100644
View file @ 0f4a3b14
/* XPM */
const char *gerber_open_dcode_file_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 16 1",
"= c #CEE4E6",
"& c #3D6C64",
"% c #A8CCD0",
"- c #EBF4F5",
"$ c #797B6C",
" c None",
": c #549AA4",
". c #B0B0AC",
"+ c #506555",
"* c #84B9C0",
"X c #8D8D82",
"@ c #36787A",
"o c #6D6F5D",
"# c #2D8694",
"; c #A4A49C",
"O c #555F4A",
/* pixels */
" .XoOOoX. ",
" XO+@##@@O$ ",
" o+####% ##&O ",
" $&#%*##=-###&$ ",
".O##-=#####*%#O;",
"o@#########=-#@$",
"O###@##########O",
"O#*-*#######%%#+",
"O#---##@###@==#O",
"O#%-*##########O",
"$@##@#########@+",
";O###:*###%=##O.",
" $&##--*##%=#@o ",
" +&#%-:####++ ",
" XO&@##@&OX ",
" XoOOoX "
};
bitmaps/gerbview_clear_layers.xpm 0 → 100644
View file @ 0f4a3b14
/* XPM */
const char *gerbview_clear_layers_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 16 1",
"* c #A02814",
"@ c #CCC07C",
"O c #B47B29",
"+ c #B0AEAD",
"X c #BCAF6C",
": c #C2AE4E",
"o c None",
"% c #FCEA74",
" c #B79059",
"# c #F1DD50",
"= c #EDD42D",
"& c #B74031",
"$ c #D7C451",
"; c #98968E",
". c #BD8E37",
"- c #DBC31E",
/* pixels */
" .Xooooooooooooo",
".O.ooooooo+ooooo",
" .O oooooooooooo",
"o.OO+@oooooooooo",
"o+O.#@ooooooo+oo",
"oX$%.&&ooooooooo",
"o@O&&&.$oooooooo",
"oo**O%#=$@oooooo",
"ooo$###=-$@ooooo",
"oooX====--@@oooo",
"oooX===----#$+oo",
"oo++---=--=$Xooo",
"o++;:----$.;;++o",
"o++;;$$-X:;;;;+o",
"oo++;X ;;;;;++oo",
"ooooo+o+++oooooo"
};
bitmaps/gerbview_drill_file.xpm 0 → 100644
View file @ 0f4a3b14
/* XPM */
const char *gerbview_drill_file_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 16 1",
"- c #AC4706",
"$ c #A68B79",
"+ c #989898",
"@ c #548E54",
": c #97674C",
"% c #3A3B3A",
" c None",
"o c #51B851",
"= c #8F706A",
". c #ABB485",
"& c #504D4D",
"; c #A1653C",
"# c #3C911B",
"* c #5C7A24",
"X c #0FB30C",
"O c #AEA9A2",
/* pixels */
" .XXXXXooo. ",
" O +@X######XX ",
"$%%%&@#******#X.",
"&%%%&@X*******Xo",
"&%%%&@X*******Xo",
" $===@X*******XX",
" +@X#######XX",
" oXXXXXXXXXX",
" ++ -;&&",
" .+ O-;=:",
" O .. $-;==",
" O .. ;-;==",
" .. O$$$=:",
" .. +==",
" O+ $=:",
" +&&"
};
bitmaps/open.xpm deleted 100644 → 0
View file @ fa37d840
/* XPM */
#ifndef XPMMAIN
extern const char *open_xpm[];
#else
const char * open_xpm[] = {
"16 16 64 1",
" c None",
". c #000000",
"+ c #E4E5DF",
"@ c #D5D6CB",
"# c #D6D7CA",
"$ c #A3A39D",
"% c #F5F6F0",
"& c #8D907B",
"* c #92957E",
"= c #90937D",
"- c #979B84",
"; c #6D705F",
"> c #EAECDB",
", c #8A8C7D",
"' c #8E917B",
") c #91947F",
"! c #8B8E7A",
"~ c #999B87",
"{ c #919480",
"] c #989B86",
"^ c #B1B4A2",
"/ c #A2A394",
"( c #F7F7F7",
"_ c #878A75",
": c #666858",
"< c #4B4D3F",
"[ c #4D4F40",
"} c #404135",
"| c #424337",
"1 c #434437",
"2 c #404236",
"3 c #3C3D32",
"4 c #48493C",
"5 c #1A1A16",
"6 c #C6C6BE",
"7 c #848672",
"8 c #25261F",
"9 c #F1F2E9",
"0 c #DDE0C7",
"a c #D6DABB",
"b c #CDD2AC",
"c c #C7CCA7",
"d c #989C80",
"e c #C6C7BE",
"f c #5F6152",
"g c #888980",
"h c #A7AB8C",
"i c #878A70",
"j c #9FA19A",
"k c #EFF0E5",
"l c #9EA284",
"m c #80817B",
"n c #96968D",
"o c #E3E5D1",
"p c #83866D",
"q c #97998D",
"r c #EDEFE2",
"s c #A2A688",
"t c #767671",
"u c #E7E9DA",
"v c #D1D3BD",
"w c #BBBF9D",
"x c #989B80",
"y c #6E715C",
" ",
" ",
" .... ",
" .+@#$. ",
" .%&*=-;..... ",
" .>,')!~{]{^/. ",
" .(_:<[}||12345 ",
" .67890abbbbbcd.",
" .efg0bbbbbbbhi.",
" .j8kabbbbbbbl. ",
" .mnobbbbbbbbp. ",
" .qrbbbbbbbbs. ",
" .tuvwwwwwwxy. ",
" ........... ",
" ",
" "};
#endif
bitmaps/open_document.xpm 0 → 100644
View file @ 0f4a3b14
/* XPM */
const char *open_document_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 16 1",
"= c #7EA7D2",
"- c #546F9C",
"% c #7C7A8C",
"@ c #737372",
"+ c #E1E3E1",
" c None",
". c #AEADAE",
"# c #544A4C",
"* c #7694C0",
"O c #969799",
"; c #4D84C3",
"$ c #D0D0D0",
"o c #888988",
"& c #8188A6",
": c #485983",
"X c #A2A4A3",
/* pixels */
" . X ",
"oOO.+XOOOOOOX+. ",
"@##o+XXXOXXXX$. ",
"ooo..@@@@@@@@$X ",
"oo% .X...... .. ",
"O@o OoooooooXO ",
"OoX&*X*******&*&",
"Oo.&===========*",
"Oo *===========&",
"OO$&===========&",
"Xo.*=======*=**.",
".o%===========& ",
".O-*****;*;*;*& ",
" @:;;;;;;;;;;-X ",
".::::::::::::-. ",
" ...X...X.... "
};
bitmaps/sources/gerber_file.svg 0 → 100644
View file @ 0f4a3b14
This diff is collapsed.
bitmaps/sources/gerber_open_dcode_file.svg 0 → 100644
View file @ 0f4a3b14
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<!-- Created with Inkscape (http://www.inkscape.org/) -->
<svg
xmlns:dc="http://purl.org/dc/elements/1.1/"
xmlns:cc="http://creativecommons.org/ns#"
xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
xmlns:svg="http://www.w3.org/2000/svg"
xmlns="http://www.w3.org/2000/svg"
xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
width="16"
height="16"
id="svg2"
version="1.1"
inkscape:version="0.48.1 "
sodipodi:docname="gerber_open_dcode_file.svg"
inkscape:export-filename="F:\kicad-launchpad\testing\bitmaps\sources\gerber_open_dcode_file.png"
inkscape:export-xdpi="90"
inkscape:export-ydpi="90">
<defs
id="defs4" />
<sodipodi:namedview
id="base"
pagecolor="#ffffff"
bordercolor="#666666"
borderopacity="1.0"
inkscape:pageopacity="0.0"
inkscape:pageshadow="2"
inkscape:zoom="46.9375"
inkscape:cx="8"
inkscape:cy="8"
inkscape:document-units="px"
inkscape:current-layer="layer1"
showgrid="true"
showborder="false"
objecttolerance="1"
gridtolerance="50"
guidetolerance="1"
inkscape:window-width="1280"
inkscape:window-height="968"
inkscape:window-x="-4"
inkscape:window-y="-4"
inkscape:window-maximized="1">
<inkscape:grid
type="xygrid"
id="grid2985"
empspacing="5"
visible="true"
enabled="true"
snapvisiblegridlinesonly="true" />
</sodipodi:namedview>
<metadata
id="metadata7">
<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>
<g
inkscape:label="Calque 1"
inkscape:groupmode="layer"
id="layer1"
transform="translate(0,-1036.3622)">
<path
sodipodi:type="arc"
style="fill:#2d8591;fill-opacity:1;stroke:#473e1d;stroke-width:0.50000000000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0.10000000000000001;stroke-opacity:1;stroke-dasharray:none"
id="path3007"
sodipodi:cx="8"
sodipodi:cy="4"
sodipodi:rx="8"
sodipodi:ry="4"
d="m 15.974455,3.6805992 a 8,4 0 1 1 -0.0074,-0.043104"
transform="matrix(0.95762857,0,0,1.9152586,0.33897144,1036.7011)"
sodipodi:start="6.20325"
sodipodi:end="12.47562"
sodipodi:open="true" />
<path
sodipodi:type="arc"
style="fill:#ffffff;fill-opacity:1;stroke:none;stroke-width:0.50000000000000000;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:0.10000000000000001;stroke-opacity:1;stroke-dasharray:none"
id="path3777"
sodipodi:cx="18"
sodipodi:cy="8"
sodipodi:rx="1"
sodipodi:ry="1"
d="m 18.996807,7.9201498 a 1,1 0 1 1 -9.22e-4,-0.010776"
transform="translate(-12.996807,1032.4421)"
sodipodi:start="6.20325"
sodipodi:end="12.47562"
sodipodi:open="true" />
<path
sodipodi:type="arc"
style="fill:#ffffff;fill-opacity:1;stroke:none"
id="path3777-1"
sodipodi:cx="18"
sodipodi:cy="8"
sodipodi:rx="1"
sodipodi:ry="1"
d="m 18.996807,7.9201498 a 1,1 0 1 1 -9.22e-4,-0.010776"
transform="translate(-8.996807,1031.4421)"
sodipodi:start="6.20325"
sodipodi:end="12.47562"
sodipodi:open="true" />
<path
sodipodi:type="arc"
style="fill:#ffffff;fill-opacity:1;stroke:none"
id="path3777-7"
sodipodi:cx="18"
sodipodi:cy="8"
sodipodi:rx="1"
sodipodi:ry="1"
d="m 18.996807,7.9201498 a 1,1 0 1 1 -9.22e-4,-0.010776"
transform="matrix(1.749909,0,0,1,-19.248362,1034.3621)"
sodipodi:start="6.20325"
sodipodi:end="12.47562"
sodipodi:open="true" />
<path
sodipodi:type="arc"
style="fill:#ffffff;fill-opacity:1;stroke:none"
id="path3777-9"
sodipodi:cx="18"
sodipodi:cy="8"
sodipodi:rx="1"
sodipodi:ry="1"
d="m 18.996807,7.9201498 a 1,1 0 1 1 -9.22e-4,-0.010776"
transform="matrix(1.499922,0,0,1.4999231,-20.495455,1036.9428)"
sodipodi:start="6.20325"
sodipodi:end="12.47562"
sodipodi:open="true" />
<path
sodipodi:type="arc"
style="fill:#ffffff;fill-opacity:1;stroke:none"
id="path3777-48"
sodipodi:cx="18"
sodipodi:cy="8"
sodipodi:rx="1"
sodipodi:ry="1"
d="m 18.996807,7.9201498 a 1,1 0 1 1 -9.22e-4,-0.010776"
transform="matrix(1.749909,0,0,1.7499103,-27.745221,1030.6929)"
sodipodi:start="6.20325"
sodipodi:end="12.47562"
sodipodi:open="true" />
<rect
style="fill:#ffffff;fill-opacity:1;stroke:none"
id="rect3839"
width="3"
height="3"
x="10"
y="9"
transform="translate(0,1036.3622)" />
</g>
</svg>
bitmaps/sources/gerbview_clear_layers.svg 0 → 100644
View file @ 0f4a3b14
This diff is collapsed.
bitmaps/sources/gerbview_drill_file.svg 0 → 100644
View file @ 0f4a3b14
This diff is collapsed.
bitmaps/sources/open_document.svg 0 → 100644
View file @ 0f4a3b14
This diff is collapsed.
common/build_version.cpp
View file @ 0f4a3b14
...@@ -6,7 +6,7 @@ ...@@ -6,7 +6,7 @@
#endif #endif
#ifndef KICAD_BUILD_VERSION #ifndef KICAD_BUILD_VERSION
#define KICAD_BUILD_VERSION "(2011-03-17)" #define KICAD_BUILD_VERSION "(2011-03-20)"
#endif #endif
// uncomment this line only when creating a stable version // uncomment this line only when creating a stable version
......
cvpcb/menubar.cpp
View file @ 0f4a3b14
...@@ -35,7 +35,7 @@ void CVPCB_MAINFRAME::ReCreateMenuBar() ...@@ -35,7 +35,7 @@ void CVPCB_MAINFRAME::ReCreateMenuBar()
item = new wxMenuItem( filesMenu, ID_LOAD_PROJECT, item = new wxMenuItem( filesMenu, ID_LOAD_PROJECT,
_( "&Open" ), _( "&Open" ),
_( "Open a net list file" ) ); _( "Open a net list file" ) );
item->SetBitmap( open_xpm ); item->SetBitmap( open_document_xpm );
filesMenu->Append( item ); filesMenu->Append( item );
/* Open Recent submenu */ /* Open Recent submenu */
......
cvpcb/tool_cvpcb.cpp
View file @ 0f4a3b14
...@@ -23,7 +23,7 @@ void CVPCB_MAINFRAME::ReCreateHToolbar() ...@@ -23,7 +23,7 @@ void CVPCB_MAINFRAME::ReCreateHToolbar()
m_HToolBar = new WinEDA_Toolbar( TOOLBAR_MAIN, this, ID_H_TOOLBAR, TRUE ); m_HToolBar = new WinEDA_Toolbar( TOOLBAR_MAIN, this, ID_H_TOOLBAR, TRUE );
m_HToolBar->AddTool( ID_CVPCB_READ_INPUT_NETLIST, wxEmptyString, m_HToolBar->AddTool( ID_CVPCB_READ_INPUT_NETLIST, wxEmptyString,
wxBitmap( open_xpm ), wxBitmap( open_document_xpm ),
_( "Open a net list file" ) ); _( "Open a net list file" ) );
m_HToolBar->AddTool( ID_CVPCB_SAVEQUITCVPCB, wxEmptyString, m_HToolBar->AddTool( ID_CVPCB_SAVEQUITCVPCB, wxEmptyString,
......
eeschema/menubar.cpp
View file @ 0f4a3b14
...@@ -52,7 +52,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar() ...@@ -52,7 +52,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
// Open // Open
item = new wxMenuItem( filesMenu, ID_LOAD_PROJECT, _( "&Open\tCtrl+O" ), item = new wxMenuItem( filesMenu, ID_LOAD_PROJECT, _( "&Open\tCtrl+O" ),
_( "Open an existing schematic project" ) ); _( "Open an existing schematic project" ) );
item->SetBitmap( open_xpm ); item->SetBitmap( open_document_xpm );
filesMenu->Append( item ); filesMenu->Append( item );
// Open Recent submenu // Open Recent submenu
......
eeschema/tool_sch.cpp
View file @ 0f4a3b14
...@@ -31,7 +31,7 @@ void SCH_EDIT_FRAME::ReCreateHToolbar() ...@@ -31,7 +31,7 @@ void SCH_EDIT_FRAME::ReCreateHToolbar()
m_HToolBar->AddTool( ID_NEW_PROJECT, wxEmptyString, wxBitmap( new_xpm ), m_HToolBar->AddTool( ID_NEW_PROJECT, wxEmptyString, wxBitmap( new_xpm ),
_( "New schematic project" ) ); _( "New schematic project" ) );
m_HToolBar->AddTool( ID_LOAD_PROJECT, wxEmptyString, wxBitmap( open_xpm ), m_HToolBar->AddTool( ID_LOAD_PROJECT, wxEmptyString, wxBitmap( open_document_xpm ),
_( "Open schematic project" ) ); _( "Open schematic project" ) );
m_HToolBar->AddTool( ID_SAVE_PROJECT, wxEmptyString, wxBitmap( save_project_xpm ), m_HToolBar->AddTool( ID_SAVE_PROJECT, wxEmptyString, wxBitmap( save_project_xpm ),
......
gerbview/menubar.cpp
View file @ 0f4a3b14
...@@ -32,17 +32,17 @@ void GERBVIEW_FRAME::ReCreateMenuBar( void ) ...@@ -32,17 +32,17 @@ void GERBVIEW_FRAME::ReCreateMenuBar( void )
ADD_MENUITEM_WITH_HELP( filesMenu, wxID_FILE, _( "Load &Gerber File" ), ADD_MENUITEM_WITH_HELP( filesMenu, wxID_FILE, _( "Load &Gerber File" ),
_( _(
"Load a new Gerber file on the current layer. Previous data will be deleted" ), "Load a new Gerber file on the current layer. Previous data will be deleted" ),
open_xpm ); gerber_file_xpm );
ADD_MENUITEM_WITH_HELP( filesMenu, ID_GERBVIEW_LOAD_DRILL_FILE, ADD_MENUITEM_WITH_HELP( filesMenu, ID_GERBVIEW_LOAD_DRILL_FILE,
_( "Load &EXCELLON Drill File" ), _( "Load &EXCELLON Drill File" ),
_( "Load excellon drill file" ), _( "Load excellon drill file" ),
open_xpm ); gerbview_drill_file_xpm );
ADD_MENUITEM_WITH_HELP( filesMenu, ID_GERBVIEW_LOAD_DCODE_FILE, ADD_MENUITEM_WITH_HELP( filesMenu, ID_GERBVIEW_LOAD_DCODE_FILE,
_( "Load &DCodes" ), _( "Load &DCodes" ),
_( "Load D-Codes definition file" ), _( "Load D-Codes definition file" ),
open_xpm ); gerber_open_dcode_file_xpm );
// Open Recent submenus // Open Recent submenus
wxMenu* openRecentGbrMenu = new wxMenu(); wxMenu* openRecentGbrMenu = new wxMenu();
...@@ -64,7 +64,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar( void ) ...@@ -64,7 +64,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar( void )
ADD_MENUITEM_WITH_HELP( filesMenu, ID_GERBVIEW_ERASE_ALL, ADD_MENUITEM_WITH_HELP( filesMenu, ID_GERBVIEW_ERASE_ALL,
_( "&Clear All" ), _( "&Clear All" ),
_( "Clear all layers. All data will be deleted" ), _( "Clear all layers. All data will be deleted" ),
delete_body_xpm ); gerbview_clear_layers_xpm );
filesMenu->AppendSeparator(); filesMenu->AppendSeparator();
ADD_MENUITEM_WITH_HELP( filesMenu, ID_GERBVIEW_EXPORT_TO_PCBNEW, ADD_MENUITEM_WITH_HELP( filesMenu, ID_GERBVIEW_EXPORT_TO_PCBNEW,
......
gerbview/toolbars_gerber.cpp
View file @ 0f4a3b14
...@@ -35,12 +35,15 @@ void GERBVIEW_FRAME::ReCreateHToolbar( void ) ...@@ -35,12 +35,15 @@ void GERBVIEW_FRAME::ReCreateHToolbar( void )
m_HToolBar = new WinEDA_Toolbar( TOOLBAR_MAIN, this, ID_H_TOOLBAR, TRUE ); m_HToolBar = new WinEDA_Toolbar( TOOLBAR_MAIN, this, ID_H_TOOLBAR, TRUE );
// Set up toolbar // Set up toolbar
m_HToolBar->AddTool( ID_NEW_BOARD, wxEmptyString, wxBitmap( new_xpm ), m_HToolBar->AddTool( ID_NEW_BOARD, wxEmptyString, wxBitmap( gerbview_clear_layers_xpm ),
_( "Erase all layers" ) ); _( "Erase all layers" ) );
m_HToolBar->AddTool( wxID_FILE, wxEmptyString, wxBitmap( open_xpm ), m_HToolBar->AddTool( wxID_FILE, wxEmptyString, wxBitmap( gerber_file_xpm ),
_( "Load a new Gerber file on the current layer. Previous data will be deleted" ) ); _( "Load a new Gerber file on the current layer. Previous data will be deleted" ) );
m_HToolBar->AddTool( ID_GERBVIEW_LOAD_DRILL_FILE, wxEmptyString, wxBitmap( gerbview_drill_file_xpm ),
_( "Load an excellon drill file on the current layer. Previous data will be deleted" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( wxID_PRINT, wxEmptyString, wxBitmap( print_button ), m_HToolBar->AddTool( wxID_PRINT, wxEmptyString, wxBitmap( print_button ),
_( "Print layers" ) ); _( "Print layers" ) );
......
include/bitmaps.h
View file @ 0f4a3b14
...@@ -132,6 +132,10 @@ extern const char* footprint_text_xpm[]; ...@@ -132,6 +132,10 @@ extern const char* footprint_text_xpm[];
extern const char* gbr_select_mode0_xpm[]; extern const char* gbr_select_mode0_xpm[];
extern const char* gbr_select_mode1_xpm[]; extern const char* gbr_select_mode1_xpm[];
extern const char* gbr_select_mode2_xpm[]; extern const char* gbr_select_mode2_xpm[];
extern const char* gerbview_drill_file_xpm[];
extern const char* gerber_file_xpm[];
extern const char* gerbview_clear_layers_xpm[];
extern const char* gerber_open_dcode_file_xpm[];
extern const char* general_deletions_xpm[]; extern const char* general_deletions_xpm[];
extern const char* general_ratsnet_xpm[]; extern const char* general_ratsnet_xpm[];
extern const char* glabel2label_xpm[]; extern const char* glabel2label_xpm[];
...@@ -265,9 +269,9 @@ extern const char* new_xpm[]; ...@@ -265,9 +269,9 @@ extern const char* new_xpm[];
extern const char* noconn_button[]; extern const char* noconn_button[];
extern const char* normal_xpm[]; extern const char* normal_xpm[];
extern const char* online_help_xpm[]; extern const char* online_help_xpm[];
extern const char* open_document_xpm[];
extern const char* open_library_xpm[]; extern const char* open_library_xpm[];
extern const char* open_project_xpm[]; extern const char* open_project_xpm[];
extern const char* open_xpm[];
extern const char* options_all_tracks_and_vias_xpm[]; extern const char* options_all_tracks_and_vias_xpm[];
extern const char* options_all_tracks_xpm[]; extern const char* options_all_tracks_xpm[];
extern const char* options_all_vias_xpm[]; extern const char* options_all_vias_xpm[];
...@@ -406,7 +410,6 @@ extern const char* width_track_xpm[]; ...@@ -406,7 +410,6 @@ extern const char* width_track_xpm[];
extern const char* width_vias_xpm[]; extern const char* width_vias_xpm[];
extern const char* zip_tool_xpm[]; extern const char* zip_tool_xpm[];
extern const char* zip_xpm[]; extern const char* zip_xpm[];
extern const char* zoom_1_xpm[];
extern const char* zoom_center_xpm[]; extern const char* zoom_center_xpm[];
extern const char* zoomoins3d_xpm[]; extern const char* zoomoins3d_xpm[];
extern const char* zoom_redraw_xpm[]; extern const char* zoom_redraw_xpm[];
......
packaging/windows/nsis/install.nsi
View file @ 0f4a3b14
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
; General Product Description Definitions ; General Product Description Definitions
!define PRODUCT_NAME "KiCad" !define PRODUCT_NAME "KiCad"
!define PRODUCT_VERSION "2011.03.17" !define PRODUCT_VERSION "2011.03.20"
!define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/" !define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
!define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/" !define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
!define COMPANY_NAME "" !define COMPANY_NAME ""
......
pcbnew/menubar_modedit.cpp
View file @ 0f4a3b14
...@@ -70,7 +70,7 @@ void WinEDA_ModuleEditFrame::ReCreateMenuBar() ...@@ -70,7 +70,7 @@ void WinEDA_ModuleEditFrame::ReCreateMenuBar()
/* Append openSubmenu to fileMenu */ /* Append openSubmenu to fileMenu */
ADD_MENUITEM_WITH_HELP_AND_SUBMENU( fileMenu, openSubmenu, -1, _( "&Load Module" ), ADD_MENUITEM_WITH_HELP_AND_SUBMENU( fileMenu, openSubmenu, -1, _( "&Load Module" ),
_( "Load a footprint module" ), open_xpm ); _( "Load a footprint module" ), open_document_xpm );
/* Save module */ /* Save module */
item = new wxMenuItem( fileMenu, ID_MODEDIT_SAVE_LIBMODULE, item = new wxMenuItem( fileMenu, ID_MODEDIT_SAVE_LIBMODULE,
......
pcbnew/menubar_pcbframe.cpp
View file @ 0f4a3b14
...@@ -48,7 +48,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() ...@@ -48,7 +48,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
item = new wxMenuItem( filesMenu, ID_LOAD_FILE, item = new wxMenuItem( filesMenu, ID_LOAD_FILE,
_( "&Open\tCtrl+O" ), _( "&Open\tCtrl+O" ),
_( "Delete current board and load new board" ) ); _( "Delete current board and load new board" ) );
item->SetBitmap( open_xpm ); item->SetBitmap( open_document_xpm );
filesMenu->Append( item ); filesMenu->Append( item );
// Load Recent submenu // Load Recent submenu
......
pcbnew/tool_pcb.cpp
View file @ 0f4a3b14
...@@ -193,7 +193,7 @@ void PCB_EDIT_FRAME::ReCreateHToolbar() ...@@ -193,7 +193,7 @@ void PCB_EDIT_FRAME::ReCreateHToolbar()
// Set up toolbar // Set up toolbar
m_HToolBar->AddTool( ID_NEW_BOARD, wxEmptyString, wxBitmap( new_xpm ), m_HToolBar->AddTool( ID_NEW_BOARD, wxEmptyString, wxBitmap( new_xpm ),
_( "New board" ) ); _( "New board" ) );
m_HToolBar->AddTool( ID_LOAD_FILE, wxEmptyString, wxBitmap( open_xpm ), m_HToolBar->AddTool( ID_LOAD_FILE, wxEmptyString, wxBitmap( open_document_xpm ),
_( "Open existing board" ) ); _( "Open existing board" ) );
m_HToolBar->AddTool( ID_SAVE_BOARD, wxEmptyString, wxBitmap( save_xpm ), m_HToolBar->AddTool( ID_SAVE_BOARD, wxEmptyString, wxBitmap( save_xpm ),
_( "Save board" ) ); _( "Save board" ) );
......
version.txt
View file @ 0f4a3b14
release version: release version:
2011 mar 17 2011 mar 17
files (.zip,.tgz): files (.zip,.tgz):
kicad-2011-03-17 kicad-2011-03-20
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