Skip to content

K
kicad-source-mirror
Commit 45c5e594 authored by Dick Hollenbeck's avatar Dick Hollenbeck
Browse files
Options

zwischen punkt for migration to PNG bitmaps

parent da2442fe
Hide whitespace changes
Inline Side-by-side
Showing with 884 additions and 871 deletions
3d-viewer/3d_frame.cpp
View file @ 45c5e594
...@@ -47,7 +47,7 @@ EDA_3D_FRAME::EDA_3D_FRAME( PCB_BASE_FRAME* parent, const wxString& title, long ...@@ -47,7 +47,7 @@ EDA_3D_FRAME::EDA_3D_FRAME( PCB_BASE_FRAME* parent, const wxString& title, long
m_reloadRequest = false; m_reloadRequest = false;
// Give it an icon // Give it an icon
SetIcon( wxICON( icon_w3d ) ); SetIcon( wxICON( icon_3d ) );
GetSettings(); GetSettings();
SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y ); SetSize( m_FramePos.x, m_FramePos.y, m_FrameSize.x, m_FrameSize.y );
......
3d-viewer/3d_toolbar.cpp
View file @ 45c5e594
...@@ -31,7 +31,7 @@ void EDA_3D_FRAME::ReCreateHToolbar() ...@@ -31,7 +31,7 @@ void EDA_3D_FRAME::ReCreateHToolbar()
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_TOOL_SCREENCOPY_TOCLIBBOARD, wxEmptyString, m_HToolBar->AddTool( ID_TOOL_SCREENCOPY_TOCLIBBOARD, wxEmptyString,
KiBitmap( copy_button ), KiBitmap( copy_button_xpm ),
_( "Copy 3D Image to Clipboard" ) ); _( "Copy 3D Image to Clipboard" ) );
#endif #endif
...@@ -51,29 +51,29 @@ void EDA_3D_FRAME::ReCreateHToolbar() ...@@ -51,29 +51,29 @@ void EDA_3D_FRAME::ReCreateHToolbar()
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_ROTATE3D_X_NEG, wxEmptyString, m_HToolBar->AddTool( ID_ROTATE3D_X_NEG, wxEmptyString,
KiBitmap( rotate_neg_X_xpm ), KiBitmap( rotate_neg_x_xpm ),
_( "Rotate X <-" ) ); _( "Rotate X <-" ) );
m_HToolBar->AddTool( ID_ROTATE3D_X_POS, wxEmptyString, m_HToolBar->AddTool( ID_ROTATE3D_X_POS, wxEmptyString,
KiBitmap( rotate_pos_X_xpm ), KiBitmap( rotate_pos_x_xpm ),
_( "Rotate X ->" ) ); _( "Rotate X ->" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_ROTATE3D_Y_NEG, wxEmptyString, m_HToolBar->AddTool( ID_ROTATE3D_Y_NEG, wxEmptyString,
KiBitmap( rotate_neg_Y_xpm ), KiBitmap( rotate_neg_y_xpm ),
_( "Rotate Y <-" ) ); _( "Rotate Y <-" ) );
m_HToolBar->AddTool( ID_ROTATE3D_Y_POS, wxEmptyString, m_HToolBar->AddTool( ID_ROTATE3D_Y_POS, wxEmptyString,
KiBitmap( rotate_pos_Y_xpm ), KiBitmap( rotate_pos_y_xpm ),
_( "Rotate Y ->" ) ); _( "Rotate Y ->" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_ROTATE3D_Z_NEG, wxEmptyString, m_HToolBar->AddTool( ID_ROTATE3D_Z_NEG, wxEmptyString,
KiBitmap( rotate_neg_Z_xpm ), KiBitmap( rotate_neg_z_xpm ),
_( "Rotate Z <-" ) ); _( "Rotate Z <-" ) );
m_HToolBar->AddTool( ID_ROTATE3D_Z_POS, wxEmptyString, m_HToolBar->AddTool( ID_ROTATE3D_Z_POS, wxEmptyString,
KiBitmap( rotate_pos_Z_xpm ), KiBitmap( rotate_pos_z_xpm ),
_( "Rotate Z ->" ) ); _( "Rotate Z ->" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
......
bitmaps/cmakelists.txt → bitmaps/CMakeLists.txt
View file @ 45c5e594
...@@ -4,46 +4,43 @@ ...@@ -4,46 +4,43 @@
# Copy the *.xpm files to ${XPM_CPP_PATH}/*.cpp, on change only. # Copy the *.xpm files to ${XPM_CPP_PATH}/*.cpp, on change only.
# Compile those *.cpp files and put them into the library, then done. # Compile those *.cpp files and put them into the library, then done.
# NAKed by Dick: # bitmap file names should be all lowercase and basename thereof should also
# builds a set of all the .xpm files # be a valid C++ identifier name. This means no leading number, or embedded - or +
# file(GLOB BITMAP_SRCS *.xpm) NO, does not build proper dependency
# generation or allow renaming of bitmap files, NAKed by Dick.
# this is twice now I've had to change this.
# Dick: use this one instead:
set(BITMAP_SRCS set(BITMAP_SRCS
add_arc.xpm add_arc.xpm
add_bus2bus.xpm add_bus2bus.xpm
add_bus.xpm add_bus.xpm
add_circle.xpm add_circle.xpm
Add_Component.xpm add_component.xpm
Add_Corner.xpm add_corner.xpm
Add_Dashed_Line.xpm add_dashed_line.xpm
add_dimension.xpm add_dimension.xpm
Add_Entry.xpm add_entry.xpm
Add_GLabel.xpm add_glabel.xpm
add_hierarchical_label.xpm add_hierarchical_label.xpm
add_hierar_pin.xpm add_hierar_pin.xpm
add_hierar_subsheet.xpm add_hierar_subsheet.xpm
Add_Junction.xpm add_junction.xpm
Add_Line2Bus.xpm add_line2bus.xpm
Add_Line_Label.xpm add_line_label.xpm
Add_Line.xpm add_line.xpm
Add_Mires.xpm add_mires.xpm
Add_Polygon.xpm add_polygon.xpm
Add_Power.xpm add_power.xpm
Add_Rectangle.xpm add_rectangle.xpm
Add_Text.xpm add_text.xpm
Add_Tracks.xpm add_tracks.xpm
Add_Zone_Cutout.xpm add_zone_cutout.xpm
Add_Zone.xpm add_zone.xpm
anchor.xpm anchor.xpm
annotate_down_right.xpm annotate_down_right.xpm
annotate_right_down.xpm annotate_right_down.xpm
annotate.xpm annotate.xpm
Apply.xpm apply.xpm
auto_associe.xpm auto_associe.xpm
Auto_track_width.xpm auto_delete_track.xpm
auto_track_width.xpm
axis3d_back.xpm axis3d_back.xpm
axis3d_bottom.xpm axis3d_bottom.xpm
axis3d_front.xpm axis3d_front.xpm
...@@ -52,89 +49,88 @@ set(BITMAP_SRCS ...@@ -52,89 +49,88 @@ set(BITMAP_SRCS
axis3d_top.xpm axis3d_top.xpm
axis3d.xpm axis3d.xpm
book.xpm book.xpm
Break_Bus.xpm break_bus.xpm
Break_Line.xpm break_line.xpm
Browse_Files.xpm browse_files.xpm
cancel_tool.xpm cancel_tool.xpm
Cancel.xpm cancel.xpm
create_cmp_file.xpm create_cmp_file.xpm
checked_ok.xpm checked_ok.xpm
component_select_unit.xpm component_select_unit.xpm
component_select_alternate_shape.xpm component_select_alternate_shape.xpm
config.xpm config.xpm
CopyBlock.xpm copyblock.xpm
copyComponent.xmp copycomponent.xmp
copy.xpm copy_button.xpm
copper_layers_setup.cpp copper_layers_setup.cpp
Cursor_Shape.xpm cursor_shape.xpm
cursor.xpm cursor.xpm
cut.xpm cut_button.xpm
cvpcb.xpm cvpcb.xpm
dashline.xpm dashline.xpm
Datasheet.xpm datasheet.xpm
del_body.xpm delete_body.xpm
Delete_Arc.xpm delete_arc.xpm
delete_association.xpm delete_association.xpm
Delete_Bus.xpm delete_bus.xpm
Delete_Circle.xpm delete_circle.xpm
Delete_Connection.xpm delete_connection.xpm
Delete_Cotation.xpm delete_cotation.xpm
Delete_Field.xpm delete_field.xpm
Delete_GLabel.xpm delete_glabel.xpm
Delete_Line.xpm delete_line.xpm
Delete_Module.xpm delete_module.xpm
Delete_Net.xpm delete_net.xpm
Delete_Node.xpm delete_node.xpm
Delete_Pad.xpm delete_pad.xpm
Delete_Pinsheet.xpm delete_pinsheet.xpm
Delete_Pin.xpm delete_pin.xpm
Delete_Polygon.xpm delete_polygon.xpm
Delete_Rectangle.xpm delete_rectangle.xpm
Delete_Segment.xpm delete_segment.xpm
Delete_Sheet.xpm delete_sheet.xpm
Delete_Text.xpm delete_text.xpm
Delete_Track.xpm delete_track.xpm
delete.xpm delete.xpm
del_track.xpm
directory.xpm directory.xpm
Display_Options.xpm display_options.xpm
down.xpm down.xpm
Drag_Module.xpm drag_module.xpm
Drag_Outline_Segment.xpm drag_outline_segment.xpm
Drag_Pad.xpm drag_pad.xpm
Drag_Segment_WithSlope.xpm drag_segment_withslope.xpm
Drag_Track_Segment.xpm drag_track_segment.xpm
drc_off.xpm drc_off.xpm
drc.xpm drc.xpm
Edges_Sketch.xpm edges_sketch.xpm
Edit_Comp_Footprint.xpm edit_comp_footprint.xpm
Edit_Component.xpm edit_component.xpm
Edit_Comp_Ref.xpm edit_comp_ref.xpm
Edit_Comp_Value.xpm edit_comp_value.xpm
Edit_Module.xpm edit_module.xpm
Editor.xpm editor.xpm
Edit_Part.xpm edit_part.xpm
Edit_Sheet.xpm edit_sheet.xpm
Edit_Text.xpm edit_text.xpm
Edit.xpm edit.xpm
eeschema.xpm eeschema.xpm
Enter_Sheet.xpm enter_sheet.xpm
ercerr.xpm ercerr.xpm
ercgreen.xpm ercgreen.xpm
ercwarn.xpm ercwarn.xpm
erc.xpm erc.xpm
Exit.xpm exit.xpm
export_footprint_names.xpm export_footprint_names.xpm
Export_Module.xpm export_module.xpm
Export_Options_Pad.xpm export_options_pad.xpm
export.xpm export.xpm
fabrication.xpm fabrication.xpm
File_FootPrint.xpm file_footprint.xpm
fill_zone.xpm fill_zone.xpm
find_xpm.xpm find_xpm.xpm
Flag.xpm flag.xpm
Fonts.xpmr fonts.xpmr
Footprint_Text.xpm footprint_text.xpm
gbr_select_mode0.xpm gbr_select_mode0.xpm
gbr_select_mode1.xpm gbr_select_mode1.xpm
gbr_select_mode2.xpm gbr_select_mode2.xpm
...@@ -145,19 +141,19 @@ set(BITMAP_SRCS ...@@ -145,19 +141,19 @@ set(BITMAP_SRCS
gerber_open_dcode_file.xpm gerber_open_dcode_file.xpm
general_deletions.xpm general_deletions.xpm
general_ratsnet.xpm general_ratsnet.xpm
GLabel2Label.xpm glabel2label.xpm
GLabel2Text.xpm glabel2text.xpm
GL_Change.xpm gl_change.xpm
Global_Options_Pad.xpm global_options_pad.xpm
green.xpm green.xpm
grid_select.xpm grid_select.xpm
grid_select_axis.xpm grid_select_axis.xpm
grid.xpm grid.xpm
hammer.xpm hammer.xpm
help.xpm help.xpm
Hidden_Pin.xpm hidden_pin.xpm
Hierarchy_cursor.xpm hierarchy_cursor.xpm
Hierarchy_Nav.xpm hierarchy_nav.xpm
hotkeys.xpm hotkeys.xpm
icon_3d.xpm icon_3d.xpm
icon_cvpcb_small.xpm icon_cvpcb_small.xpm
...@@ -173,144 +169,144 @@ set(BITMAP_SRCS ...@@ -173,144 +169,144 @@ set(BITMAP_SRCS
import_cmp_from_lib.xpm import_cmp_from_lib.xpm
import_footprint_names.xpm import_footprint_names.xpm
import_hierarchical_label.xpm import_hierarchical_label.xpm
Import_Module.xpm import_module.xpm
import.xpm import.xpm
Info.xpm info.xpm
Insert_Module_Board.xpm insert_module_board.xpm
Invert_Module.xpm invert_module.xpm
invisible_text.xpm invisible_text.xpm
jigsaw.xpm jigsaw.xpm
kicad_icon_small.xpm kicad_icon_small.xpm
Label2GLabel.xpm label2glabel.xpm
Label2Text.xpm label2text.xpm
label.xpm label.xpm
Lang_Catalan.xpm lang_catalan.xpm
Lang_chinese.xpm lang_chinese.xpm
Lang_Cs.xpm lang_cs.xpm
Lang_Default.xpm lang_default.xpm
Lang_De.xpm lang_de.xpm
Lang_En.xpm lang_en.xpm
Lang_Es.xpm lang_es.xpm
Lang_Fr.xpm lang_fr.xpm
Lang_Fi.xpm lang_fi.xpm
Lang_Gr.xpm lang_gr.xpm
Lang_Hu.xpm lang_hu.xpm
Lang_It.xpm lang_it.xpm
Lang_Jp.xpm lang_jp.xpm
Lang_Ko.xpm lang_ko.xpm
Lang_Nl.xpm lang_nl.xpm
Lang_Pl.xpm lang_pl.xpm
Lang_Pt.xpm lang_pt.xpm
Lang_Ru.xpm lang_ru.xpm
Lang_Sl.xpm lang_sl.xpm
Language.xpm language.xpm
layers_manager.xpm layers_manager.xpm
Leave_Sheet.xpm leave_sheet.xpm
left.xpm left.xpm
libedit_icon.xpm libedit_icon.xpm
libedit.xpm libedit.xpm
libedprt.xpm libedprt.xpm
Lib_next.xpm lib_next.xpm
Lib_previous.xpm lib_previous.xpm
library_browse.xpm library_browse.xpm
library_update.xpm library_update.xpm
library.xpm library.xpm
libsavem.xpm libsavem.xpm
libview.xpm libview.xpm
Lines90.xpm lines90.xpm
Load_Module_Board.xpm load_module_board.xpm
Load_Module_Lib.xpm load_module_lib.xpm
local_ratsnet.xpm local_ratsnet.xpm
Locked.xpm locked.xpm
mirepcb.xpm mirepcb.xpm
Mirror_H.xpm mirror_h.xpm
Mirror_V.xpm mirror_v.xpm
modedit.xpm modedit.xpm
Mode_Module.xpm mode_module.xpm
Mode_Track.xpm mode_track.xpm
modratsnest.xpm modratsnest.xpm
Module_Check.xpm module_check.xpm
Modul_Edit.xpm modul_edit.xpm
module_filtered_list.xpm module_filtered_list.xpm
module_full_list.xpm module_full_list.xpm
module_options.xpm module_options.xpm
Module_Ratsnet.xpm module_ratsnet.xpm
module.xpm module.xpm
Morgan1.xpm morgan1.xpm
Morgan2.xpm morgan2.xpm
Move_Arc.xpm move_arc.xpm
Move_Circle.xpm move_circle.xpm
Move_Field.xpm move_field.xpm
Move_GLabel.xpm move_glabel.xpm
Move_Line.xpm move_line.xpm
Move_Module.xpm move_module.xpm
Move_Pad.xpm move_pad.xpm
Move_Pinsheet.xpm move_pinsheet.xpm
Move_Pin.xpm move_pin.xpm
Move_Polygon.xpm move_polygon.xpm
Move_Rectangle.xpm move_rectangle.xpm
Move_Sheet.xpm move_sheet.xpm
Move_Text.xpm move_text.xpm
Move_Track_Segment.xpm move_track_segment.xpm
Move_Track.xpm move_track.xpm
Move.xpm move.xpm
mw_Add_Gap.xpm mw_add_gap.xpm
mw_Add_Line.xpm mw_add_line.xpm
mw_Add_Shape.xpm mw_add_shape.xpm
mw_Add_stub_arc.xpm mw_add_stub_arc.xpm
mw_Add_Stub.xpm mw_add_stub.xpm
mw_toolbar.xpm mw_toolbar.xpm
Net_HighLight.xpm net_highlight.xpm
netlist.xpm netlist.xpm
Net_Locked.xpm net_locked.xpm
Net_UnLocked.xpm net_unlocked.xpm
new_component.xpm new_component.xpm
new_cvpcb.xpm new_cvpcb.xpm
New_FootPrint.xpm new_footprint.xpm
New_Library.xpm new_library.xpm
New_Module.xpm new_module.xpm
new_pcb.xpm new_pcb.xpm
New_Project.xpm new_project.xpm
new_sch.xpm new_sch.xpm
new_txt.xpm new_txt.xpm
new.xpm new.xpm
noconn.xpm noconn.xpm
Normal.xpm normal.xpm
online_help.xpm online_help.xpm
Open_Library.xpm open_library.xpm
Open_Project.xpm open_project.xpm
open_document.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
Options_Arc.xpm options_arc.xpm
Options_Circle.xpm options_circle.xpm
Options_Module.xpm options_module.xpm
Options_New_Pad.xpm options_new_pad.xpm
Options_Pad.xpm options_pad.xpm
Options_Pinsheet.xpm options_pinsheet.xpm
Options_Pin.xpm options_pin.xpm
Options_Rectangle.xpm options_rectangle.xpm
Options_Segment.xpm options_segment.xpm
Options_Text.xpm options_text.xpm
Options_Tracks.xpm options_tracks.xpm
Options_Track.xpm options_track.xpm
Options_Vias.xpm options_vias.xpm
opt_show_polygon.xpm opt_show_polygon.xpm
Orient.xpm orient.xpm
ortho.xpm ortho.xpm
Pad_Sketch.xpm pad_sketch.xpm
pad.xpm pad.xpm
pads_mask_layers.xpm pads_mask_layers.xpm
palette.xpm palette.xpm
part_properties.xpm part_properties.xpm
paste.xpm paste.xpm
pcbnew.xpm pcbnew.xpm
PcbOffset.xpm pcboffset.xpm
pin2pin.xpm pin2pin.xpm
Pin_Name_to.xpm pin_name_to.xpm
Pin_Number_to.xpm pin_number_to.xpm
Pin_Size_to.xpm pin_size_to.xpm
pinorient_right.xpm pinorient_right.xpm
pinorient_left.xpm pinorient_left.xpm
pinorient_up.xpm pinorient_up.xpm
...@@ -335,33 +331,33 @@ set(BITMAP_SRCS ...@@ -335,33 +331,33 @@ set(BITMAP_SRCS
pintype_opencoll.xpm pintype_opencoll.xpm
pintype_openemit.xpm pintype_openemit.xpm
pintype_noconnect.xpm pintype_noconnect.xpm
Pin_to.xpm pin_to.xpm
pin.xpm pin.xpm
plot_HPG.xpm plot_hpg.xpm
plot_PS.xpm plot_ps.xpm
plot_xpm.xpm plot_xpm.xpm
polar.xpm polar.xpm
Post_Compo.xpm post_compo.xpm
Post_Drill.xpm post_drill.xpm
Post_Module.xpm post_module.xpm
preference.xpm preference.xpm
print.xpm print_button.xpm
ratsnest.xpm ratsnest.xpm
Read_SetUp.xpm read_setup.xpm
redo.xpm redo.xpm
red.xpm red.xpm
reload2.xpm reload2.xpm
reload.xpm reload.xpm
Reset_Text.xpm reset_text.xpm
Resize_Sheet.xpm resize_sheet.xpm
right.xpm right.xpm
Rotate_Field.xpm rotate_field.xpm
Rotate_GLabel.xpm rotate_glabel.xpm
Rotate_Module-.xpm rotate_module_neg.xpm
Rotate_Module+.xpm rotate_module_pos.xpm
Rotate_Pin.xpm rotate_pin.xpm
Rotate_CCW.xpm rotate_ccw.xpm
Rotate_CW.xpm rotate_cw.xpm
rotate_neg_x.xpm rotate_neg_x.xpm
rotate_pos_x.xpm rotate_pos_x.xpm
rotate_neg_y.xpm rotate_neg_y.xpm
...@@ -369,32 +365,32 @@ set(BITMAP_SRCS ...@@ -369,32 +365,32 @@ set(BITMAP_SRCS
rotate_neg_z.xpm rotate_neg_z.xpm
rotate_pos_z.xpm rotate_pos_z.xpm
save_as.xpm save_as.xpm
Save_Library.xpm save_library.xpm
Save_NetList.xpm save_netlist.xpm
Save_Project.xpm save_project.xpm
Save_SetUp.xpm save_setup.xpm
save.xpm save.xpm
schematic.xpm schematic.xpm
select_grid.xpm select_grid.xpm
Select_Layer_Pair.xpm select_layer_pair.xpm
Select_W_Layer.xpm select_w_layer.xpm
shape_3d.xpm shape_3d.xpm
sheetset.xpm sheetset.xpm
showdcode.xpm showdcode.xpm
show_footprint.xpm show_footprint.xpm
showmodedge.xpm showmodedge.xpm
showtrack.xpm showtrack.xpm
Show_Zone.xpm show_zone.xpm
Show_Zone_Disable.xpm show_zone_disable.xpm
Show_Zone_Outline_Only.xpm show_zone_outline_only.xpm
Swap_Layer.xpm swap_layer.xpm
Text_Sketch.xpm text_sketch.xpm
three_d.xpm three_d.xpm
tool_ratsnet.xpm tool_ratsnet.xpm
tools.xpm tools.xpm
Track_Locked.xpm track_locked.xpm
Track_Sketch.xpm track_sketch.xpm
Track_UnLocked.xpm track_unlocked.xpm
transistor.xpm transistor.xpm
treensel.xpm treensel.xpm
treesel.xpm treesel.xpm
...@@ -403,18 +399,18 @@ set(BITMAP_SRCS ...@@ -403,18 +399,18 @@ set(BITMAP_SRCS
unit_inch.xpm unit_inch.xpm
unit_mm.xpm unit_mm.xpm
unknown.xpm unknown.xpm
Unlocked.xpm unlocked.xpm
unzip.xpm unzip.xpm
Update_Module_Board.xpm update_module_board.xpm
up.xpm up.xpm
Via_Sketch.xpm via_sketch.xpm
viewlibs_icon.xpm viewlibs_icon.xpm
Web_support.xpm web_support.xpm
Width_Net.xpm width_net.xpm
Width_Segment.xpm width_segment.xpm
Width_Track_Via.xpm width_track_via.xpm
Width_Track.xpm width_track.xpm
Width_Vias.xpm width_vias.xpm
window_close.xpm window_close.xpm
zip_tool.xpm zip_tool.xpm
zip.xpm zip.xpm
......
bitmaps/add_arc.xpm
View file @ 45c5e594
/* XPM */ /* XPM */
#include "bitmaps.h"
#ifndef XPMMAIN #ifndef XPMMAIN
extern const char *add_arc_xpm[]; extern const char *add_arc_xpm[];
......
bitmaps/add_zone_cutout.xpm
View file @ 45c5e594
/* XPM */ /* XPM */
#ifndef XPMMAIN #ifndef XPMMAIN
extern const char *add_zone_cutout[]; extern const char *add_zone_cutout_xpm[];
#else #else
const char * add_zone_cutout[] = { const char * add_zone_cutout_xpm[] = {
"16 16 3 1", "16 16 3 1",
" c None", " c None",
". c #007D00", ". c #007D00",
......
bitmaps/copy.xpm → bitmaps/copy_button.xpm
View file @ 45c5e594
/* XPM */ /* XPM */
#ifndef XPMMAIN #ifndef XPMMAIN
extern const char *copy_button[]; extern const char *copy_button_xpm[];
#else #else
const char *copy_button[] = { const char *copy_button_xpm[] = {
/* columns rows colors const chars-per-pixel */ /* columns rows colors const chars-per-pixel */
"16 15 4 1", "16 15 4 1",
" c None", " c None",
......
bitmaps/copycomponent.xpm
View file @ 45c5e594
/* XPM */ /* XPM */
const char *copyComponent_xpm[] = { const char *copycomponent_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"16 16 16 1", "16 16 16 1",
"; c #DC4149", "; c #DC4149",
......
bitmaps/cut.xpm → bitmaps/cut_button.xpm
View file @ 45c5e594
/* XPM */ /* XPM */
#ifndef XPMMAIN #ifndef XPMMAIN
extern const char *cut_button[]; extern const char *cut_button_xpm[];
#else #else
const char *cut_button[] = { const char *cut_button_xpm[] = {
/* columns rows colors const chars-per-pixel */ /* columns rows colors const chars-per-pixel */
"16 15 3 1", "16 15 3 1",
" c None", " c None",
......
bitmaps/icon_3d.xpm
View file @ 45c5e594
/* XPM */ /* XPM */
#ifndef XPMMAIN #ifndef XPMMAIN
extern const char * icon_w3d_xpm[]; extern const char * icon_3d_xpm[];
#else #else
const char * icon_w3d_xpm[] = const char * icon_3d_xpm[] =
{ {
"32 32 3 1", "32 32 3 1",
"J c #FF0000", "J c #FF0000",
......
bitmaps/icon_kicad.xpm
View file @ 45c5e594
/* XPM */ /* XPM */
#ifndef XPMMAIN #ifndef XPMMAIN
extern const char *kicad_icon_xpm[]; extern const char *icon_kicad_xpm[];
#else #else
const char * kicad_icon_xpm[] = const char * icon_kicad_xpm[] =
{ {
"32 32 16 1", "32 32 16 1",
" c none", " c none",
......
bitmaps/mirror_h.xpm
View file @ 45c5e594
/* XPM */ /* XPM */
#ifndef XPMMAIN #ifndef XPMMAIN
extern const char *mirror_H_xpm[]; extern const char *mirror_h_xpm[];
#else #else
const char * mirror_H_xpm[] = { const char * mirror_h_xpm[] = {
"16 16 29 1", "16 16 29 1",
" c None", " c None",
". c #000000", ". c #000000",
......
bitmaps/mirror_v.xpm
View file @ 45c5e594
/* XPM */ /* XPM */
#ifndef XPMMAIN #ifndef XPMMAIN
extern const char *mirror_V_xpm[]; extern const char *mirror_v_xpm[];
#else #else
const char * mirror_V_xpm[] = { const char * mirror_v_xpm[] = {
"16 16 30 1", "16 16 30 1",
" c None", " c None",
". c #000000", ". c #000000",
......
bitmaps/mw_add_gap.xpm
View file @ 45c5e594
/* XPM */ /* XPM */
#ifndef XPMMAIN #ifndef XPMMAIN
extern const char* mw_Add_Gap_xpm[]; extern const char* mw_add_gap_xpm[];
#else #else
const char * mw_Add_Gap_xpm[] = { const char * mw_add_gap_xpm[] = {
"16 16 13 1", "16 16 13 1",
" c None", " c None",
". c #D72E2E", ". c #D72E2E",
......
bitmaps/mw_add_line.xpm
View file @ 45c5e594
/* XPM */ /* XPM */
#ifndef XPMMAIN #ifndef XPMMAIN
extern const char* mw_Add_Line_xpm[]; extern const char* mw_add_line_xpm[];
#else #else
const char * mw_Add_Line_xpm[] = { const char * mw_add_line_xpm[] = {
"16 16 6 1", "16 16 6 1",
" c None", " c None",
". c #D72E2E", ". c #D72E2E",
......
bitmaps/mw_add_shape.xpm
View file @ 45c5e594
/* XPM */ /* XPM */
#ifndef XPMMAIN #ifndef XPMMAIN
extern const char* mw_Add_Shape_xpm[]; extern const char* mw_add_shape_xpm[];
#else #else
const char * mw_Add_Shape_xpm[] = { const char * mw_add_shape_xpm[] = {
"16 16 21 1", "16 16 21 1",
" c None", " c None",
". c #D72E2E", ". c #D72E2E",
......
bitmaps/mw_add_stub.xpm
View file @ 45c5e594
/* XPM */ /* XPM */
#ifndef XPMMAIN #ifndef XPMMAIN
extern const char* mw_Add_Stub_xpm[]; extern const char* mw_add_stub_xpm[];
#else #else
const char * mw_Add_Stub_xpm[] = { const char * mw_add_stub_xpm[] = {
"16 16 14 1", "16 16 14 1",
" c None", " c None",
". c #D72E2E", ". c #D72E2E",
......
bitmaps/mw_add_stub_arc.xpm
View file @ 45c5e594
/* XPM */ /* XPM */
#ifndef XPMMAIN #ifndef XPMMAIN
extern const char* mw_Add_stub_arc_xpm[]; extern const char* mw_add_stub_arc_xpm[];
#else #else
const char * mw_Add_stub_arc_xpm[] = { const char * mw_add_stub_arc_xpm[] = {
"16 16 55 1", "16 16 55 1",
" c None", " c None",
". c #000000", ". c #000000",
......
bitmaps/noconn.xpm
View file @ 45c5e594
/* XPM */ /* XPM */
#ifndef XPMMAIN #ifndef XPMMAIN
extern const char *noconn_button[]; extern const char *noconn_xpm[];
#else #else
const char *noconn_button[] = { const char *noconn_xpm[] = {
/* columns rows colors const chars-per-pixel */ /* columns rows colors const chars-per-pixel */
"16 15 2 1", "16 15 2 1",
" c None", " c None",
......
bitmaps/plot_hpg.xpm
View file @ 45c5e594
/* XPM */ /* XPM */
#ifndef XPMMAIN #ifndef XPMMAIN
extern const char *plot_HPG_xpm[]; extern const char *plot_hpg_xpm[];
#else #else
const char * plot_HPG_xpm[] = { const char * plot_hpg_xpm[] = {
"16 16 17 1", "16 16 17 1",
" c None", " c None",
". c #000000", ". c #000000",
......
bitmaps/plot_ps.xpm
View file @ 45c5e594
/* XPM */ /* XPM */
#ifndef XPMMAIN #ifndef XPMMAIN
extern const char *plot_PS_xpm[]; extern const char *plot_ps_xpm[];
#else #else
const char * plot_PS_xpm[] = { const char * plot_ps_xpm[] = {
"16 16 14 1", "16 16 14 1",
" c None", " c None",
"! c black", "! c black",
......
bitmaps/print.xpm → bitmaps/print_button.xpm
View file @ 45c5e594
/* XPM */ /* XPM */
#ifndef XPMMAIN #ifndef XPMMAIN
extern const char *print_button[]; extern const char *print_button_xpm[];
#else #else
const char *print_button[] = { const char *print_button_xpm[] = {
/* columns rows colors const chars-per-pixel */ /* columns rows colors const chars-per-pixel */
"16 15 5 1", "16 15 5 1",
" c None", " c None",
......
bitmaps/rotate_ccw.xpm
View file @ 45c5e594
/* XPM */ /* XPM */
const char *rotate_CCW_xpm[] = { const char *rotate_ccw_xpm[] = {
"16 16 93 2", "16 16 93 2",
" c None", " c None",
". c #202020", ". c #202020",
......
bitmaps/rotate_cw.xpm
View file @ 45c5e594
/* XPM */ /* XPM */
const char *rotate_CW_xpm[] = { const char *rotate_cw_xpm[] = {
"16 16 96 2", "16 16 96 2",
" c None", " c None",
". c #000000", ". c #000000",
......
bitmaps/rotate_neg_x.xpm
View file @ 45c5e594
/* XPM */ /* XPM */
#ifndef XPMMAIN #ifndef XPMMAIN
extern const char *rotate_neg_X_xpm[]; extern const char *rotate_neg_x_xpm[];
#else #else
const char *rotate_neg_X_xpm[] = { const char *rotate_neg_x_xpm[] = {
/* width height num_colors const chars_per_pixel */ /* width height num_colors const chars_per_pixel */
" 16 15 4 1", " 16 15 4 1",
/* colors */ /* colors */
......
bitmaps/rotate_neg_y.xpm
View file @ 45c5e594
/* XPM */ /* XPM */
#ifndef XPMMAIN #ifndef XPMMAIN
extern const char *rotate_neg_Y_xpm[]; extern const char *rotate_neg_y_xpm[];
#else #else
const char *rotate_neg_Y_xpm[] = { const char *rotate_neg_y_xpm[] = {
/* width height num_colors const chars_per_pixel */ /* width height num_colors const chars_per_pixel */
" 16 15 4 1", " 16 15 4 1",
/* colors */ /* colors */
......
bitmaps/rotate_neg_z.xpm
View file @ 45c5e594
/* XPM */ /* XPM */
#ifndef XPMMAIN #ifndef XPMMAIN
extern const char *rotate_neg_Z_xpm[]; extern const char *rotate_neg_z_xpm[];
#else #else
const char *rotate_neg_Z_xpm[] = { const char *rotate_neg_z_xpm[] = {
/* width height num_colors const chars_per_pixel */ /* width height num_colors const chars_per_pixel */
" 16 15 4 1", " 16 15 4 1",
/* colors */ /* colors */
......
bitmaps/rotate_pos_x.xpm
View file @ 45c5e594
/* XPM */ /* XPM */
#ifndef XPMMAIN #ifndef XPMMAIN
extern const char *rotate_pos_X_xpm[]; extern const char *rotate_pos_x_xpm[];
#else #else
const char *rotate_pos_X_xpm[] = { const char *rotate_pos_x_xpm[] = {
/* width height num_colors const chars_per_pixel */ /* width height num_colors const chars_per_pixel */
" 16 15 4 1", " 16 15 4 1",
/* colors */ /* colors */
......
bitmaps/rotate_pos_y.xpm
View file @ 45c5e594
/* XPM */ /* XPM */
#ifndef XPMMAIN #ifndef XPMMAIN
extern const char *rotate_pos_Y_xpm[]; extern const char *rotate_pos_y_xpm[];
#else #else
const char *rotate_pos_Y_xpm[] = { const char *rotate_pos_y_xpm[] = {
/* width height num_colors const chars_per_pixel */ /* width height num_colors const chars_per_pixel */
" 16 15 4 1", " 16 15 4 1",
/* colors */ /* colors */
......
bitmaps/rotate_pos_z.xpm
View file @ 45c5e594
/* XPM */ /* XPM */
#ifndef XPMMAIN #ifndef XPMMAIN
extern const char *rotate_pos_Z_xpm[]; extern const char *rotate_pos_z_xpm[];
#else #else
const char *rotate_pos_Z_xpm[] = { const char *rotate_pos_z_xpm[] = {
/* width height num_colors const chars_per_pixel */ /* width height num_colors const chars_per_pixel */
" 16 15 4 1", " 16 15 4 1",
/* colors */ /* colors */
......
common/basicframe.cpp
View file @ 45c5e594
...@@ -367,7 +367,7 @@ void EDA_BASE_FRAME::AddHelpVersionInfoMenuEntry( wxMenu* aMenu ) ...@@ -367,7 +367,7 @@ void EDA_BASE_FRAME::AddHelpVersionInfoMenuEntry( wxMenu* aMenu )
ADD_MENUITEM_WITH_HELP( aMenu, ID_HELP_COPY_VERSION_STRING, ADD_MENUITEM_WITH_HELP( aMenu, ID_HELP_COPY_VERSION_STRING,
_( "Copy &Version Information" ), _( "Copy &Version Information" ),
_( "Copy the version string to clipboard to send with bug reports" ), _( "Copy the version string to clipboard to send with bug reports" ),
copy_button ); copy_button_xpm );
} }
......
common/bitmap.cpp
View file @ 45c5e594
...@@ -30,18 +30,18 @@ ...@@ -30,18 +30,18 @@
#include "bitmaps.h" #include "bitmaps.h"
#if defined(USE_PNG_BITMAPS) #if defined(FUTURE_PNG_BITMAPS)
wxBitmap KiBitmap( const BITMAP_DEF& aBitmap ) wxBitmap KiBitmap( BITMAP_DEF aBitmap )
{ {
wxMemoryInputStream is( aBitmap.png, aBitmap.byteCount ); wxMemoryInputStream is( aBitmap->png, aBitmap->byteCount );
return wxBitmap( wxImage( is, wxBITMAP_TYPE_PNG, -1 ), -1 ); return wxBitmap( wxImage( is, wxBITMAP_TYPE_PNG, -1 ), -1 );
} }
wxBitmap* KiBitmapNew( const BITMAP_DEF& aBitmap ) wxBitmap* KiBitmapNew( BITMAP_DEF aBitmap )
{ {
wxMemoryInputStream is( aBitmap.png, aBitmap.byteCount ); wxMemoryInputStream is( aBitmap->png, aBitmap->byteCount );
return new wxBitmap( wxImage( is, wxBITMAP_TYPE_PNG, -1 ), -1 ); return new wxBitmap( wxImage( is, wxBITMAP_TYPE_PNG, -1 ), -1 );
} }
...@@ -51,12 +51,12 @@ wxBitmap* KiBitmapNew( const BITMAP_DEF& aBitmap ) ...@@ -51,12 +51,12 @@ wxBitmap* KiBitmapNew( const BITMAP_DEF& aBitmap )
// temporary during migration to PNG. Soon the argument to these calls becomes the // temporary during migration to PNG. Soon the argument to these calls becomes the
// opaque BITMAP_DEF&. // opaque BITMAP_DEF&.
wxBitmap KiBitmap( const BITMAP_DEF& aBitmap ) wxBitmap KiBitmap( BITMAP_DEF aBitmap )
{ {
return wxBitmap( aBitmap ); return wxBitmap( aBitmap );
} }
wxBitmap* KiBitmapNew( const BITMAP_DEF& aBitmap ) wxBitmap* KiBitmapNew( BITMAP_DEF aBitmap )
{ {
return new wxBitmap( aBitmap ); return new wxBitmap( aBitmap );
} }
......
common/dialog_about/AboutDialog_main.cpp
View file @ 45c5e594
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
* lang_xx_xpm[]; // Icons of various national flags * lang_xx_xpm[]; // Icons of various national flags
* show_3d_xpm[]; // 3D icon * show_3d_xpm[]; // 3D icon
* edit_module_xpm[]; * edit_module_xpm[];
* kicad_icon_xpm[]; // Icon of the application * icon_kicad_xpm[]; // Icon of the application
*/ */
#include "bitmaps.h" #include "bitmaps.h"
#include "wxstruct.h" #include "wxstruct.h"
...@@ -40,13 +40,20 @@ static wxString HtmlNewline( const unsigned int amount = 1 ); ...@@ -40,13 +40,20 @@ static wxString HtmlNewline( const unsigned int amount = 1 );
*/ */
static void InitKiCadAboutNew( AboutAppInfo& info ) static void InitKiCadAboutNew( AboutAppInfo& info )
{ {
/* Set application specific icon */ // Set application specific icon
const wxTopLevelWindow * const tlw = wxDynamicCast(::wxGetApp().GetTopWindow(), wxTopLevelWindow); const wxTopLevelWindow * const tlw = wxDynamicCast(::wxGetApp().GetTopWindow(), wxTopLevelWindow);
if( tlw ) if( tlw )
info.SetIcon( tlw->GetIcon() ); info.SetIcon( tlw->GetIcon() );
else else
info.SetIcon( kicad_icon_xpm ); {
wxBitmap bitmap = KiBitmap( icon_kicad_xpm );
wxIcon icon;
icon.CopyFromBitmap( bitmap );
info.SetIcon( icon );
}
/* Set title */ /* Set title */
info.SetAppName( wxT( ".: " ) + wxGetApp().GetTitle() + wxT( " :." ) ); info.SetAppName( wxT( ".: " ) + wxGetApp().GetTitle() + wxT( " :." ) );
......
eeschema/controle.cpp
View file @ 45c5e594
...@@ -143,7 +143,7 @@ SCH_ITEM* SCH_EDIT_FRAME::LocateItem( const wxPoint& aPosition, const KICAD_T aF ...@@ -143,7 +143,7 @@ SCH_ITEM* SCH_EDIT_FRAME::LocateItem( const wxPoint& aPosition, const KICAD_T aF
for( int i = 0; i < m_collectedItems.GetCount() && i < MAX_SELECT_ITEM_IDS; i++ ) for( int i = 0; i < m_collectedItems.GetCount() && i < MAX_SELECT_ITEM_IDS; i++ )
{ {
wxString text = m_collectedItems[i]->GetSelectMenuText(); wxString text = m_collectedItems[i]->GetSelectMenuText();
const char** xpm = m_collectedItems[i]->GetMenuImage(); BITMAP_DEF xpm = m_collectedItems[i]->GetMenuImage();
ADD_MENUITEM( &selectMenu, ID_SELECT_ITEM_START + i, text, xpm ); ADD_MENUITEM( &selectMenu, ID_SELECT_ITEM_START + i, text, xpm );
} }
......
eeschema/dialogs/dialog_erc.cpp
View file @ 45c5e594
...@@ -348,7 +348,7 @@ void DIALOG_ERC::ChangeErrorLevel( wxCommandEvent& event ) ...@@ -348,7 +348,7 @@ void DIALOG_ERC::ChangeErrorLevel( wxCommandEvent& event )
{ {
int id, level, ii, x, y; int id, level, ii, x, y;
wxBitmapButton* Butt; wxBitmapButton* Butt;
const char** new_bitmap_xpm = NULL; BITMAP_DEF new_bitmap_xpm = NULL;
wxPoint pos; wxPoint pos;
id = event.GetId(); id = event.GetId();
......
eeschema/dialogs/dialog_lib_edit_pin.cpp
View file @ 45c5e594
...@@ -140,7 +140,7 @@ void DIALOG_LIB_EDIT_PIN::OnPropertiesChange( wxCommandEvent& event ) ...@@ -140,7 +140,7 @@ void DIALOG_LIB_EDIT_PIN::OnPropertiesChange( wxCommandEvent& event )
void DIALOG_LIB_EDIT_PIN::SetOrientationList( const wxArrayString& list, void DIALOG_LIB_EDIT_PIN::SetOrientationList( const wxArrayString& list,
const char*** aBitmaps ) const BITMAP_DEF* aBitmaps )
{ {
for ( unsigned ii = 0; ii < list.GetCount(); ii++ ) for ( unsigned ii = 0; ii < list.GetCount(); ii++ )
{ {
...@@ -153,7 +153,7 @@ void DIALOG_LIB_EDIT_PIN::SetOrientationList( const wxArrayString& list, ...@@ -153,7 +153,7 @@ void DIALOG_LIB_EDIT_PIN::SetOrientationList( const wxArrayString& list,
void DIALOG_LIB_EDIT_PIN::SetElectricalTypeList( const wxArrayString& list, void DIALOG_LIB_EDIT_PIN::SetElectricalTypeList( const wxArrayString& list,
const char*** aBitmaps ) const BITMAP_DEF* aBitmaps )
{ {
for ( unsigned ii = 0; ii < list.GetCount(); ii++ ) for ( unsigned ii = 0; ii < list.GetCount(); ii++ )
{ {
...@@ -165,7 +165,7 @@ void DIALOG_LIB_EDIT_PIN::SetElectricalTypeList( const wxArrayString& list, ...@@ -165,7 +165,7 @@ void DIALOG_LIB_EDIT_PIN::SetElectricalTypeList( const wxArrayString& list,
} }
void DIALOG_LIB_EDIT_PIN::SetStyleList( const wxArrayString& list, const char*** aBitmaps ) void DIALOG_LIB_EDIT_PIN::SetStyleList( const wxArrayString& list, const BITMAP_DEF* aBitmaps )
{ {
for ( unsigned ii = 0; ii < list.GetCount(); ii++ ) for ( unsigned ii = 0; ii < list.GetCount(); ii++ )
{ {
......
eeschema/dialogs/dialog_lib_edit_pin.h
View file @ 45c5e594
...@@ -19,25 +19,25 @@ class DIALOG_LIB_EDIT_PIN : public DIALOG_LIB_EDIT_PIN_BASE ...@@ -19,25 +19,25 @@ class DIALOG_LIB_EDIT_PIN : public DIALOG_LIB_EDIT_PIN_BASE
LIB_PIN * m_dummyPin; // a working copy used to show changes LIB_PIN * m_dummyPin; // a working copy used to show changes
public: public:
/** Constructor */ /** Constructor */
DIALOG_LIB_EDIT_PIN( wxWindow* parent, LIB_PIN* aPin ); DIALOG_LIB_EDIT_PIN( wxWindow* parent, LIB_PIN* aPin );
~DIALOG_LIB_EDIT_PIN(); ~DIALOG_LIB_EDIT_PIN();
void SetLastSizeAndPosition(); void SetLastSizeAndPosition();
void OnCloseDialog( wxCloseEvent& event ); void OnCloseDialog( wxCloseEvent& event );
void OnCancelButtonClick( wxCommandEvent& event ); void OnCancelButtonClick( wxCommandEvent& event );
void OnOKButtonClick( wxCommandEvent& event ); void OnOKButtonClick( wxCommandEvent& event );
void OnPaintShowPanel( wxPaintEvent& event ); void OnPaintShowPanel( wxPaintEvent& event );
void OnPropertiesChange( wxCommandEvent& event ); void OnPropertiesChange( wxCommandEvent& event );
void SetOrientationList( const wxArrayString& list, const char *** aBitmaps ); void SetOrientationList( const wxArrayString& list, const BITMAP_DEF* aBitmaps );
void SetOrientation( int orientation ) void SetOrientation( int orientation )
{ {
m_choiceOrientation->SetSelection( orientation ); m_choiceOrientation->SetSelection( orientation );
} }
int GetOrientation( void ) { return m_choiceOrientation->GetSelection(); } int GetOrientation( void ) { return m_choiceOrientation->GetSelection(); }
void SetElectricalTypeList( const wxArrayString& list, const char *** aBitmaps ); void SetElectricalTypeList( const wxArrayString& list, const BITMAP_DEF* aBitmaps );
void SetElectricalType( int type ) void SetElectricalType( int type )
{ {
m_choiceElectricalType->SetSelection( type ); m_choiceElectricalType->SetSelection( type );
...@@ -47,7 +47,7 @@ public: ...@@ -47,7 +47,7 @@ public:
return m_choiceElectricalType->GetSelection(); return m_choiceElectricalType->GetSelection();
} }
void SetStyleList( const wxArrayString& list, const char *** aBitmaps ); void SetStyleList( const wxArrayString& list, const BITMAP_DEF* aBitmaps );
void SetStyle( int style ) { m_choiceStyle->SetSelection( style ); } void SetStyle( int style ) { m_choiceStyle->SetSelection( style ); }
int GetStyle( void ) { return m_choiceStyle->GetSelection(); } int GetStyle( void ) { return m_choiceStyle->GetSelection(); }
......
eeschema/lib_arc.h
View file @ 45c5e594
...@@ -121,7 +121,7 @@ public: ...@@ -121,7 +121,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) add_arc_xpm; } virtual BITMAP_DEF GetMenuImage() const { return add_arc_xpm; }
protected: protected:
virtual EDA_ITEM* doClone() const; virtual EDA_ITEM* doClone() const;
......
eeschema/lib_circle.h
View file @ 45c5e594
...@@ -89,7 +89,7 @@ public: ...@@ -89,7 +89,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) add_circle_xpm; } virtual BITMAP_DEF GetMenuImage() const { return add_circle_xpm; }
protected: protected:
virtual EDA_ITEM* doClone() const; virtual EDA_ITEM* doClone() const;
......
eeschema/lib_field.h
View file @ 45c5e594
...@@ -221,7 +221,7 @@ public: ...@@ -221,7 +221,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) move_field_xpm; } virtual BITMAP_DEF GetMenuImage() const { return move_field_xpm; }
protected: protected:
virtual EDA_ITEM* doClone() const; virtual EDA_ITEM* doClone() const;
......
eeschema/lib_pin.cpp
View file @ 45c5e594
...@@ -37,7 +37,7 @@ static const wxString pin_orientation_names[] = ...@@ -37,7 +37,7 @@ static const wxString pin_orientation_names[] =
// bitmaps to show pins orientations in dialog editor // bitmaps to show pins orientations in dialog editor
// must have same order than pin_orientation_names // must have same order than pin_orientation_names
static const char** s_icons_Pins_Orientations[] = static const BITMAP_DEF s_icons_Pins_Orientations[] =
{ {
pinorient_right_xpm, pinorient_right_xpm,
pinorient_left_xpm, pinorient_left_xpm,
...@@ -73,7 +73,7 @@ static const wxString pin_style_names[] = ...@@ -73,7 +73,7 @@ static const wxString pin_style_names[] =
// bitmaps to show pins shapes in dialog editor // bitmaps to show pins shapes in dialog editor
// must have same order than pin_style_names // must have same order than pin_style_names
static const char** s_icons_Pins_Shapes[] = static BITMAP_DEF s_icons_Pins_Shapes[] =
{ {
pinshape_normal_xpm, pinshape_normal_xpm,
pinshape_invert_xpm, pinshape_invert_xpm,
...@@ -121,7 +121,7 @@ static const wxString pin_electrical_type_names[] = ...@@ -121,7 +121,7 @@ static const wxString pin_electrical_type_names[] =
// bitmaps to show pins electrical type in dialog editor // bitmaps to show pins electrical type in dialog editor
// must have same order than pin_electrical_type_names // must have same order than pin_electrical_type_names
static const char** s_icons_Pins_Electrical_Type[] = static const BITMAP_DEF s_icons_Pins_Electrical_Type[] =
{ {
pintype_input_xpm, pintype_input_xpm,
pintype_output_xpm, pintype_output_xpm,
...@@ -2129,25 +2129,25 @@ wxArrayString LIB_PIN::GetElectricalTypeNames( void ) ...@@ -2129,25 +2129,25 @@ wxArrayString LIB_PIN::GetElectricalTypeNames( void )
} }
const char*** LIB_PIN::GetElectricalTypeSymbols( void ) const BITMAP_DEF* LIB_PIN::GetElectricalTypeSymbols()
{ {
return s_icons_Pins_Electrical_Type; return s_icons_Pins_Electrical_Type;
} }
const char*** LIB_PIN::GetOrientationSymbols() const BITMAP_DEF* LIB_PIN::GetOrientationSymbols()
{ {
return s_icons_Pins_Orientations; return s_icons_Pins_Orientations;
} }
const char*** LIB_PIN::GetStyleSymbols() const BITMAP_DEF* LIB_PIN::GetStyleSymbols()
{ {
return s_icons_Pins_Shapes; return s_icons_Pins_Shapes;
} }
const char** LIB_PIN::GetMenuImage() const BITMAP_DEF LIB_PIN::GetMenuImage() const
{ {
return s_icons_Pins_Electrical_Type[m_type]; return s_icons_Pins_Electrical_Type[m_type];
} }
......
eeschema/lib_pin.h
View file @ 45c5e594
...@@ -386,7 +386,7 @@ public: ...@@ -386,7 +386,7 @@ public:
* *
* @return List of valid pin orientation bitmaps symbols in .xpm format * @return List of valid pin orientation bitmaps symbols in .xpm format
*/ */
static const char*** GetOrientationSymbols(); static const BITMAP_DEF* GetOrientationSymbols();
/** /**
* Get the orientation code by index used to set the pin orientation. * Get the orientation code by index used to set the pin orientation.
...@@ -418,7 +418,7 @@ public: ...@@ -418,7 +418,7 @@ public:
* *
* @return List of valid pin electrical type bitmaps symbols in .xpm format. * @return List of valid pin electrical type bitmaps symbols in .xpm format.
*/ */
static const char*** GetStyleSymbols(); static const BITMAP_DEF* GetStyleSymbols();
/** /**
* Get the pin draw style code by index used to set the pin draw style. * Get the pin draw style code by index used to set the pin draw style.
...@@ -450,9 +450,9 @@ public: ...@@ -450,9 +450,9 @@ public:
* *
* @return List of valid pin electrical type bitmaps symbols in .xpm format * @return List of valid pin electrical type bitmaps symbols in .xpm format
*/ */
static const char*** GetElectricalTypeSymbols(); static const BITMAP_DEF* GetElectricalTypeSymbols();
virtual const char** GetMenuImage() const; virtual BITMAP_DEF GetMenuImage() const;
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
......
eeschema/lib_polyline.h
View file @ 45c5e594
...@@ -107,7 +107,7 @@ public: ...@@ -107,7 +107,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) add_polygon_xpm; } virtual BITMAP_DEF GetMenuImage() const { return add_polygon_xpm; }
protected: protected:
virtual EDA_ITEM* doClone() const; virtual EDA_ITEM* doClone() const;
......
eeschema/lib_rectangle.h
View file @ 45c5e594
...@@ -95,7 +95,7 @@ public: ...@@ -95,7 +95,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) add_rectangle_xpm; } virtual BITMAP_DEF GetMenuImage() const { return add_rectangle_xpm; }
protected: protected:
virtual EDA_ITEM* doClone() const; virtual EDA_ITEM* doClone() const;
......
eeschema/lib_text.h
View file @ 45c5e594
...@@ -119,7 +119,7 @@ public: ...@@ -119,7 +119,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) add_text_xpm; } virtual BITMAP_DEF GetMenuImage() const { return add_text_xpm; }
protected: protected:
virtual EDA_ITEM* doClone() const; virtual EDA_ITEM* doClone() const;
......
eeschema/libedit_onrightclick.cpp
View file @ 45c5e594
...@@ -298,9 +298,9 @@ void AddMenusForBlock( wxMenu* PopMenu, LIB_EDIT_FRAME* frame ) ...@@ -298,9 +298,9 @@ void AddMenusForBlock( wxMenu* PopMenu, LIB_EDIT_FRAME* frame )
{ {
ADD_MENUITEM( PopMenu, ID_POPUP_SELECT_ITEMS_BLOCK, _( "Select Items" ), green_xpm ); ADD_MENUITEM( PopMenu, ID_POPUP_SELECT_ITEMS_BLOCK, _( "Select Items" ), green_xpm );
ADD_MENUITEM( PopMenu, ID_POPUP_COPY_BLOCK, _( "Copy Block" ), copyblock_xpm ); ADD_MENUITEM( PopMenu, ID_POPUP_COPY_BLOCK, _( "Copy Block" ), copyblock_xpm );
ADD_MENUITEM( PopMenu, ID_POPUP_MIRROR_Y_BLOCK, _( "Mirror Block ||" ), mirror_H_xpm ); ADD_MENUITEM( PopMenu, ID_POPUP_MIRROR_Y_BLOCK, _( "Mirror Block ||" ), mirror_h_xpm );
ADD_MENUITEM( PopMenu, ID_POPUP_MIRROR_X_BLOCK, _( "Mirror Block --" ), mirror_V_xpm ); ADD_MENUITEM( PopMenu, ID_POPUP_MIRROR_X_BLOCK, _( "Mirror Block --" ), mirror_v_xpm );
ADD_MENUITEM( PopMenu, ID_POPUP_ROTATE_BLOCK, _( "Rotate Block ccw" ), rotate_CCW_xpm ); ADD_MENUITEM( PopMenu, ID_POPUP_ROTATE_BLOCK, _( "Rotate Block ccw" ), rotate_ccw_xpm );
ADD_MENUITEM( PopMenu, ID_POPUP_DELETE_BLOCK, _( "Delete Block" ), delete_xpm ); ADD_MENUITEM( PopMenu, ID_POPUP_DELETE_BLOCK, _( "Delete Block" ), delete_xpm );
} }
} }
eeschema/libeditframe.cpp
View file @ 45c5e594
...@@ -1063,7 +1063,7 @@ void LIB_EDIT_FRAME::OnRotateItem( wxCommandEvent& aEvent ) ...@@ -1063,7 +1063,7 @@ void LIB_EDIT_FRAME::OnRotateItem( wxCommandEvent& aEvent )
} }
m_drawItem->Rotate(); m_drawItem->Rotate();
OnModify(); OnModify();
if( !m_drawItem->InEditMode() ) if( !m_drawItem->InEditMode() )
m_drawItem->ClearFlags(); m_drawItem->ClearFlags();
...@@ -1129,7 +1129,7 @@ LIB_ITEM* LIB_EDIT_FRAME::locateItem( const wxPoint& aPosition, const KICAD_T aF ...@@ -1129,7 +1129,7 @@ LIB_ITEM* LIB_EDIT_FRAME::locateItem( const wxPoint& aPosition, const KICAD_T aF
for( int i = 0; i < m_collectedItems.GetCount() && i < MAX_SELECT_ITEM_IDS; i++ ) for( int i = 0; i < m_collectedItems.GetCount() && i < MAX_SELECT_ITEM_IDS; i++ )
{ {
wxString text = m_collectedItems[i]->GetSelectMenuText(); wxString text = m_collectedItems[i]->GetSelectMenuText();
const char** xpm = m_collectedItems[i]->GetMenuImage(); BITMAP_DEF xpm = m_collectedItems[i]->GetMenuImage();
ADD_MENUITEM( &selectMenu, ID_SELECT_ITEM_START + i, text, xpm ); ADD_MENUITEM( &selectMenu, ID_SELECT_ITEM_START + i, text, xpm );
} }
......
eeschema/menubar.cpp
View file @ 45c5e594
...@@ -111,7 +111,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar() ...@@ -111,7 +111,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
wxID_PRINT, wxID_PRINT,
_( "P&rint" ), _( "P&rint" ),
_( "Print schematic" ), _( "Print schematic" ),
print_button ); print_button_xpm );
// Plot submenu // Plot submenu
wxMenu* choice_plot_fmt = new wxMenu; wxMenu* choice_plot_fmt = new wxMenu;
...@@ -120,14 +120,14 @@ void SCH_EDIT_FRAME::ReCreateMenuBar() ...@@ -120,14 +120,14 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
ADD_MENUITEM_WITH_HELP( choice_plot_fmt, ID_GEN_PLOT_PS, ADD_MENUITEM_WITH_HELP( choice_plot_fmt, ID_GEN_PLOT_PS,
_( "Plot PostScript" ), _( "Plot PostScript" ),
_( "Plot schematic sheet in PostScript format" ), _( "Plot schematic sheet in PostScript format" ),
plot_PS_xpm ); plot_ps_xpm );
// Plot HPGL // Plot HPGL
ADD_MENUITEM_WITH_HELP( choice_plot_fmt, ADD_MENUITEM_WITH_HELP( choice_plot_fmt,
ID_GEN_PLOT_HPGL, ID_GEN_PLOT_HPGL,
_( "Plot HPGL" ), _( "Plot HPGL" ),
_( "Plot schematic sheet in HPGL format" ), _( "Plot schematic sheet in HPGL format" ),
plot_HPG_xpm ); plot_hpg_xpm );
// Plot SVG // Plot SVG
ADD_MENUITEM_WITH_HELP( choice_plot_fmt, ADD_MENUITEM_WITH_HELP( choice_plot_fmt,
...@@ -149,7 +149,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar() ...@@ -149,7 +149,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
ADD_MENUITEM_WITH_HELP( choice_plot_fmt, ID_GEN_COPY_SHEET_TO_CLIPBOARD, ADD_MENUITEM_WITH_HELP( choice_plot_fmt, ID_GEN_COPY_SHEET_TO_CLIPBOARD,
_( "Plot to Clipboard" ), _( "Plot to Clipboard" ),
_( "Export drawings to clipboard" ), _( "Export drawings to clipboard" ),
copy_button ); copy_button_xpm );
#endif // __WINDOWS__ #endif // __WINDOWS__
...@@ -309,7 +309,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar() ...@@ -309,7 +309,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
text = AddHotkeyName( _( "No connect flag" ), s_Schematic_Hokeys_Descr, text = AddHotkeyName( _( "No connect flag" ), s_Schematic_Hokeys_Descr,
HK_ADD_NOCONN_FLAG, false ); // add comment, not a shortcut HK_ADD_NOCONN_FLAG, false ); // add comment, not a shortcut
ADD_MENUITEM_WITH_HELP( placeMenu, ID_NOCONN_BUTT, text, HELP_PLACE_NC_FLAG, ADD_MENUITEM_WITH_HELP( placeMenu, ID_NOCONN_BUTT, text, HELP_PLACE_NC_FLAG,
noconn_button ); noconn_xpm );
// Net name // Net name
text = AddHotkeyName( _( "Label" ), s_Schematic_Hokeys_Descr, text = AddHotkeyName( _( "Label" ), s_Schematic_Hokeys_Descr,
......
eeschema/onrightclick.cpp
View file @ 45c5e594
...@@ -248,12 +248,12 @@ void AddMenusForComponent( wxMenu* PopMenu, SCH_COMPONENT* Component ) ...@@ -248,12 +248,12 @@ void AddMenusForComponent( wxMenu* PopMenu, SCH_COMPONENT* Component )
wxMenu* orientmenu = new wxMenu; wxMenu* orientmenu = new wxMenu;
msg = AddHotkeyName( _( "Rotate +" ), s_Schematic_Hokeys_Descr, HK_ROTATE ); msg = AddHotkeyName( _( "Rotate +" ), s_Schematic_Hokeys_Descr, HK_ROTATE );
ADD_MENUITEM( orientmenu, ID_POPUP_SCH_ROTATE_CMP_COUNTERCLOCKWISE, msg, rotate_CCW_xpm ); ADD_MENUITEM( orientmenu, ID_POPUP_SCH_ROTATE_CMP_COUNTERCLOCKWISE, msg, rotate_ccw_xpm );
ADD_MENUITEM( orientmenu, ID_POPUP_SCH_ROTATE_CMP_CLOCKWISE, _( "Rotate -" ), rotate_CW_xpm ); ADD_MENUITEM( orientmenu, ID_POPUP_SCH_ROTATE_CMP_CLOCKWISE, _( "Rotate -" ), rotate_cw_xpm );
msg = AddHotkeyName( _( "Mirror --" ), s_Schematic_Hokeys_Descr, HK_MIRROR_X_COMPONENT ); msg = AddHotkeyName( _( "Mirror --" ), s_Schematic_Hokeys_Descr, HK_MIRROR_X_COMPONENT );
ADD_MENUITEM( orientmenu, ID_POPUP_SCH_MIROR_X_CMP, msg, mirror_V_xpm ); ADD_MENUITEM( orientmenu, ID_POPUP_SCH_MIROR_X_CMP, msg, mirror_v_xpm );
msg = AddHotkeyName( _( "Mirror ||" ), s_Schematic_Hokeys_Descr, HK_MIRROR_Y_COMPONENT ); msg = AddHotkeyName( _( "Mirror ||" ), s_Schematic_Hokeys_Descr, HK_MIRROR_Y_COMPONENT );
ADD_MENUITEM( orientmenu, ID_POPUP_SCH_MIROR_Y_CMP, msg, mirror_H_xpm ); ADD_MENUITEM( orientmenu, ID_POPUP_SCH_MIROR_Y_CMP, msg, mirror_h_xpm );
msg = AddHotkeyName( _( "Normal" ), s_Schematic_Hokeys_Descr, HK_ORIENT_NORMAL_COMPONENT ); msg = AddHotkeyName( _( "Normal" ), s_Schematic_Hokeys_Descr, HK_ORIENT_NORMAL_COMPONENT );
ADD_MENUITEM( orientmenu, ID_POPUP_SCH_ORIENT_NORMAL_CMP, msg, normal_xpm ); ADD_MENUITEM( orientmenu, ID_POPUP_SCH_ORIENT_NORMAL_CMP, msg, normal_xpm );
ADD_MENUITEM_WITH_SUBMENU( PopMenu, orientmenu, ID_POPUP_SCH_GENERIC_ORIENT_CMP, ADD_MENUITEM_WITH_SUBMENU( PopMenu, orientmenu, ID_POPUP_SCH_GENERIC_ORIENT_CMP,
...@@ -312,7 +312,7 @@ void AddMenusForComponent( wxMenu* PopMenu, SCH_COMPONENT* Component ) ...@@ -312,7 +312,7 @@ void AddMenusForComponent( wxMenu* PopMenu, SCH_COMPONENT* Component )
{ {
msg = AddHotkeyName( _( "Copy Component" ), s_Schematic_Hokeys_Descr, msg = AddHotkeyName( _( "Copy Component" ), s_Schematic_Hokeys_Descr,
HK_COPY_COMPONENT_OR_LABEL ); HK_COPY_COMPONENT_OR_LABEL );
ADD_MENUITEM( PopMenu, ID_POPUP_SCH_COPY_ITEM, msg, copy_button ); ADD_MENUITEM( PopMenu, ID_POPUP_SCH_COPY_ITEM, msg, copy_button_xpm );
msg = AddHotkeyName( _( "Delete Component" ), s_Schematic_Hokeys_Descr, HK_DELETE ); msg = AddHotkeyName( _( "Delete Component" ), s_Schematic_Hokeys_Descr, HK_DELETE );
ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE_CMP, msg, delete_xpm ); ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE_CMP, msg, delete_xpm );
} }
...@@ -337,7 +337,7 @@ void AddMenusForGLabel( wxMenu* PopMenu, SCH_GLOBALLABEL* GLabel ) ...@@ -337,7 +337,7 @@ void AddMenusForGLabel( wxMenu* PopMenu, SCH_GLOBALLABEL* GLabel )
ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DRAG_CMP_REQUEST, msg, move_text_xpm ); ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DRAG_CMP_REQUEST, msg, move_text_xpm );
msg = AddHotkeyName( _( "Copy Global Label" ), s_Schematic_Hokeys_Descr, msg = AddHotkeyName( _( "Copy Global Label" ), s_Schematic_Hokeys_Descr,
HK_COPY_COMPONENT_OR_LABEL ); HK_COPY_COMPONENT_OR_LABEL );
ADD_MENUITEM( PopMenu, ID_POPUP_SCH_COPY_ITEM, msg, copy_button ); ADD_MENUITEM( PopMenu, ID_POPUP_SCH_COPY_ITEM, msg, copy_button_xpm );
} }
msg = AddHotkeyName( _( "Rotate Global Label" ), s_Schematic_Hokeys_Descr, HK_ROTATE ); msg = AddHotkeyName( _( "Rotate Global Label" ), s_Schematic_Hokeys_Descr, HK_ROTATE );
...@@ -374,7 +374,7 @@ void AddMenusForHLabel( wxMenu* PopMenu, SCH_HIERLABEL* HLabel ) ...@@ -374,7 +374,7 @@ void AddMenusForHLabel( wxMenu* PopMenu, SCH_HIERLABEL* HLabel )
ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DRAG_CMP_REQUEST, msg, move_text_xpm ); ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DRAG_CMP_REQUEST, msg, move_text_xpm );
msg = AddHotkeyName( _( "Copy Hierarchical Label" ), s_Schematic_Hokeys_Descr, msg = AddHotkeyName( _( "Copy Hierarchical Label" ), s_Schematic_Hokeys_Descr,
HK_COPY_COMPONENT_OR_LABEL ); HK_COPY_COMPONENT_OR_LABEL );
ADD_MENUITEM( PopMenu, ID_POPUP_SCH_COPY_ITEM, msg, copy_button ); ADD_MENUITEM( PopMenu, ID_POPUP_SCH_COPY_ITEM, msg, copy_button_xpm );
} }
msg = AddHotkeyName( _( "Rotate Hierarchical Label" ), s_Schematic_Hokeys_Descr, HK_ROTATE ); msg = AddHotkeyName( _( "Rotate Hierarchical Label" ), s_Schematic_Hokeys_Descr, HK_ROTATE );
ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ROTATE_TEXT, msg, rotate_glabel_xpm ); ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ROTATE_TEXT, msg, rotate_glabel_xpm );
...@@ -410,10 +410,10 @@ void AddMenusForLabel( wxMenu* PopMenu, SCH_LABEL* Label ) ...@@ -410,10 +410,10 @@ void AddMenusForLabel( wxMenu* PopMenu, SCH_LABEL* Label )
ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DRAG_CMP_REQUEST, msg, move_text_xpm ); ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DRAG_CMP_REQUEST, msg, move_text_xpm );
msg = AddHotkeyName( _( "Copy Label" ), s_Schematic_Hokeys_Descr, msg = AddHotkeyName( _( "Copy Label" ), s_Schematic_Hokeys_Descr,
HK_COPY_COMPONENT_OR_LABEL ); HK_COPY_COMPONENT_OR_LABEL );
ADD_MENUITEM( PopMenu, ID_POPUP_SCH_COPY_ITEM, msg, copy_button ); ADD_MENUITEM( PopMenu, ID_POPUP_SCH_COPY_ITEM, msg, copy_button_xpm );
} }
msg = AddHotkeyName( _( "Rotate Label" ), s_Schematic_Hokeys_Descr, HK_ROTATE ); msg = AddHotkeyName( _( "Rotate Label" ), s_Schematic_Hokeys_Descr, HK_ROTATE );
ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ROTATE_TEXT, msg, rotate_CCW_xpm ); ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ROTATE_TEXT, msg, rotate_ccw_xpm );
msg = AddHotkeyName( _( "Edit Label" ), s_Schematic_Hokeys_Descr, HK_EDIT ); msg = AddHotkeyName( _( "Edit Label" ), s_Schematic_Hokeys_Descr, HK_EDIT );
ADD_MENUITEM( PopMenu, ID_POPUP_SCH_EDIT_TEXT, msg, edit_text_xpm ); ADD_MENUITEM( PopMenu, ID_POPUP_SCH_EDIT_TEXT, msg, edit_text_xpm );
msg = AddHotkeyName( _( "Delete Label" ), s_Schematic_Hokeys_Descr, HK_DELETE ); msg = AddHotkeyName( _( "Delete Label" ), s_Schematic_Hokeys_Descr, HK_DELETE );
...@@ -443,11 +443,11 @@ void AddMenusForText( wxMenu* PopMenu, SCH_TEXT* Text ) ...@@ -443,11 +443,11 @@ void AddMenusForText( wxMenu* PopMenu, SCH_TEXT* Text )
ADD_MENUITEM( PopMenu, ID_POPUP_SCH_MOVE_ITEM, msg, move_text_xpm ); ADD_MENUITEM( PopMenu, ID_POPUP_SCH_MOVE_ITEM, msg, move_text_xpm );
msg = AddHotkeyName( _( "Copy Text" ), s_Schematic_Hokeys_Descr, msg = AddHotkeyName( _( "Copy Text" ), s_Schematic_Hokeys_Descr,
HK_COPY_COMPONENT_OR_LABEL ); HK_COPY_COMPONENT_OR_LABEL );
ADD_MENUITEM( PopMenu, ID_POPUP_SCH_COPY_ITEM, msg, copy_button ); ADD_MENUITEM( PopMenu, ID_POPUP_SCH_COPY_ITEM, msg, copy_button_xpm );
} }
msg = AddHotkeyName( _( "Rotate Text" ), s_Schematic_Hokeys_Descr, HK_ROTATE ); msg = AddHotkeyName( _( "Rotate Text" ), s_Schematic_Hokeys_Descr, HK_ROTATE );
ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ROTATE_TEXT, msg, rotate_CCW_xpm ); ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ROTATE_TEXT, msg, rotate_ccw_xpm );
msg = AddHotkeyName( _( "Edit Text" ), s_Schematic_Hokeys_Descr, HK_EDIT ); msg = AddHotkeyName( _( "Edit Text" ), s_Schematic_Hokeys_Descr, HK_EDIT );
ADD_MENUITEM( PopMenu, ID_POPUP_SCH_EDIT_TEXT, msg, edit_text_xpm ); ADD_MENUITEM( PopMenu, ID_POPUP_SCH_EDIT_TEXT, msg, edit_text_xpm );
msg = AddHotkeyName( _( "Delete Text" ), s_Schematic_Hokeys_Descr, HK_DELETE ); msg = AddHotkeyName( _( "Delete Text" ), s_Schematic_Hokeys_Descr, HK_DELETE );
...@@ -642,20 +642,20 @@ void AddMenusForBlock( wxMenu* PopMenu, SCH_EDIT_FRAME* frame ) ...@@ -642,20 +642,20 @@ void AddMenusForBlock( wxMenu* PopMenu, SCH_EDIT_FRAME* frame )
// a block function. // a block function.
if( frame->GetScreen()->m_BlockLocate.m_Command == BLOCK_MOVE ) if( frame->GetScreen()->m_BlockLocate.m_Command == BLOCK_MOVE )
{ {
ADD_MENUITEM( PopMenu, wxID_COPY, _( "Save Block" ), copy_button ); ADD_MENUITEM( PopMenu, wxID_COPY, _( "Save Block" ), copy_button_xpm );
ADD_MENUITEM( PopMenu, ID_POPUP_COPY_BLOCK, _( "Copy Block" ), copyblock_xpm ); ADD_MENUITEM( PopMenu, ID_POPUP_COPY_BLOCK, _( "Copy Block" ), copyblock_xpm );
msg = AddHotkeyName( _( "Drag Block" ), s_Schematic_Hokeys_Descr, msg = AddHotkeyName( _( "Drag Block" ), s_Schematic_Hokeys_Descr,
HK_MOVEBLOCK_TO_DRAGBLOCK ); HK_MOVEBLOCK_TO_DRAGBLOCK );
ADD_MENUITEM( PopMenu, ID_POPUP_DRAG_BLOCK, msg, move_xpm ); ADD_MENUITEM( PopMenu, ID_POPUP_DRAG_BLOCK, msg, move_xpm );
ADD_MENUITEM( PopMenu, ID_POPUP_DELETE_BLOCK, _( "Delete Block" ), delete_xpm ); ADD_MENUITEM( PopMenu, ID_POPUP_DELETE_BLOCK, _( "Delete Block" ), delete_xpm );
ADD_MENUITEM( PopMenu, ID_POPUP_MIRROR_Y_BLOCK, _( "Mirror Block ||" ), mirror_H_xpm ); ADD_MENUITEM( PopMenu, ID_POPUP_MIRROR_Y_BLOCK, _( "Mirror Block ||" ), mirror_h_xpm );
ADD_MENUITEM( PopMenu, ID_POPUP_MIRROR_X_BLOCK, _( "Mirror Block --" ), mirror_V_xpm ); ADD_MENUITEM( PopMenu, ID_POPUP_MIRROR_X_BLOCK, _( "Mirror Block --" ), mirror_v_xpm );
ADD_MENUITEM( PopMenu, ID_POPUP_ROTATE_BLOCK, _( "Rotate Block ccw" ), rotate_CCW_xpm ); ADD_MENUITEM( PopMenu, ID_POPUP_ROTATE_BLOCK, _( "Rotate Block ccw" ), rotate_ccw_xpm );
#if 0 #if 0
#ifdef __WINDOWS__ #ifdef __WINDOWS__
ADD_MENUITEM( menu_other_block_commands, ID_GEN_COPY_BLOCK_TO_CLIPBOARD, ADD_MENUITEM( menu_other_block_commands, ID_GEN_COPY_BLOCK_TO_CLIPBOARD,
_( "Copy to Clipboard" ), copy_button ); _( "Copy to Clipboard" ), copy_button_xpm );
#endif #endif
#endif #endif
} }
......
eeschema/sch_bus_entry.h
View file @ 45c5e594
...@@ -109,7 +109,7 @@ public: ...@@ -109,7 +109,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) add_entry_xpm; } virtual BITMAP_DEF GetMenuImage() const { return add_entry_xpm; }
private: private:
virtual bool doHitTest( const wxPoint& aPoint, int aAccuracy ) const; virtual bool doHitTest( const wxPoint& aPoint, int aAccuracy ) const;
......
eeschema/sch_component.h
View file @ 45c5e594
...@@ -381,7 +381,7 @@ public: ...@@ -381,7 +381,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) add_component_xpm; } virtual BITMAP_DEF GetMenuImage() const { return add_component_xpm; }
virtual bool operator <( const SCH_ITEM& aItem ) const; virtual bool operator <( const SCH_ITEM& aItem ) const;
......
eeschema/sch_field.cpp
View file @ 45c5e594
...@@ -458,18 +458,18 @@ wxString SCH_FIELD::GetName() const ...@@ -458,18 +458,18 @@ wxString SCH_FIELD::GetName() const
} }
const char** SCH_FIELD::GetMenuImage() const BITMAP_DEF SCH_FIELD::GetMenuImage() const
{ {
if( m_FieldId == REFERENCE ) if( m_FieldId == REFERENCE )
return (const char**) edit_comp_ref_xpm; return edit_comp_ref_xpm;
if( m_FieldId == VALUE ) if( m_FieldId == VALUE )
return (const char**) edit_comp_value_xpm; return edit_comp_value_xpm;
if( m_FieldId == FOOTPRINT ) if( m_FieldId == FOOTPRINT )
return (const char**) edit_comp_footprint_xpm; return edit_comp_footprint_xpm;
return (const char**) edit_text_xpm; return edit_text_xpm;
} }
......
eeschema/sch_field.h
View file @ 45c5e594
...@@ -175,7 +175,7 @@ public: ...@@ -175,7 +175,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const; virtual BITMAP_DEF GetMenuImage() const;
private: private:
virtual bool doHitTest( const wxPoint& aPoint, int aAccuracy ) const; virtual bool doHitTest( const wxPoint& aPoint, int aAccuracy ) const;
......
eeschema/sch_junction.h
View file @ 45c5e594
...@@ -93,7 +93,7 @@ public: ...@@ -93,7 +93,7 @@ public:
virtual wxString GetSelectMenuText() const { return wxString( _( "Junction" ) ); } virtual wxString GetSelectMenuText() const { return wxString( _( "Junction" ) ); }
virtual const char** GetMenuImage() const { return (const char**) add_junction_xpm; } virtual BITMAP_DEF GetMenuImage() const { return add_junction_xpm; }
#if defined(DEBUG) #if defined(DEBUG)
void Show( int nestLevel, std::ostream& os ); void Show( int nestLevel, std::ostream& os );
......
eeschema/sch_line.cpp
View file @ 45c5e594
...@@ -454,14 +454,14 @@ wxString SCH_LINE::GetSelectMenuText() const ...@@ -454,14 +454,14 @@ wxString SCH_LINE::GetSelectMenuText() const
} }
const char** SCH_LINE::GetMenuImage() const BITMAP_DEF SCH_LINE::GetMenuImage() const
{ {
if( m_Layer == LAYER_NOTES ) if( m_Layer == LAYER_NOTES )
return (const char**) add_dashed_line_xpm; return add_dashed_line_xpm;
else if( m_Layer == LAYER_WIRE ) else if( m_Layer == LAYER_WIRE )
return (const char**) add_line_xpm; return add_line_xpm;
return (const char**) add_bus_xpm; return add_bus_xpm;
} }
......
eeschema/sch_line.h
View file @ 45c5e594
...@@ -135,7 +135,7 @@ public: ...@@ -135,7 +135,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const; virtual BITMAP_DEF GetMenuImage() const;
virtual bool operator <( const SCH_ITEM& aItem ) const; virtual bool operator <( const SCH_ITEM& aItem ) const;
......
eeschema/sch_marker.h
View file @ 45c5e594
...@@ -99,7 +99,7 @@ public: ...@@ -99,7 +99,7 @@ public:
virtual wxString GetSelectMenuText() const { return wxString( _( "ERC Marker" ) ); } virtual wxString GetSelectMenuText() const { return wxString( _( "ERC Marker" ) ); }
virtual const char** GetMenuImage() const { return (const char**) erc_xpm; } virtual BITMAP_DEF GetMenuImage() const { return erc_xpm; }
#if defined(DEBUG) #if defined(DEBUG)
void Show( int nestLevel, std::ostream& os ); void Show( int nestLevel, std::ostream& os );
......
eeschema/sch_no_connect.h
View file @ 45c5e594
...@@ -96,7 +96,7 @@ public: ...@@ -96,7 +96,7 @@ public:
virtual wxString GetSelectMenuText() const { return wxString( _( "No Connect" ) ); } virtual wxString GetSelectMenuText() const { return wxString( _( "No Connect" ) ); }
virtual const char** GetMenuImage() const { return (const char**) noconn_button; } virtual BITMAP_DEF GetMenuImage() const { return noconn_xpm; }
private: private:
virtual bool doIsConnected( const wxPoint& aPosition ) const; virtual bool doIsConnected( const wxPoint& aPosition ) const;
......
eeschema/sch_polyline.cpp
View file @ 45c5e594
...@@ -233,14 +233,14 @@ wxString SCH_POLYLINE::GetSelectMenuText() const ...@@ -233,14 +233,14 @@ wxString SCH_POLYLINE::GetSelectMenuText() const
} }
const char** SCH_POLYLINE::GetMenuImage() const BITMAP_DEF SCH_POLYLINE::GetMenuImage() const
{ {
if( m_Layer == LAYER_NOTES ) if( m_Layer == LAYER_NOTES )
return (const char**) add_dashed_line_xpm; return add_dashed_line_xpm;
else if( m_Layer == LAYER_WIRE ) else if( m_Layer == LAYER_WIRE )
return (const char**) add_line_xpm; return add_line_xpm;
return (const char**) add_bus_xpm; return add_bus_xpm;
} }
......
eeschema/sch_polyline.h
View file @ 45c5e594
...@@ -96,7 +96,7 @@ public: ...@@ -96,7 +96,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const; virtual BITMAP_DEF GetMenuImage() const;
private: private:
virtual bool doHitTest( const wxPoint& aPoint, int aAccuracy ) const; virtual bool doHitTest( const wxPoint& aPoint, int aAccuracy ) const;
......
eeschema/sch_sheet.h
View file @ 45c5e594
...@@ -194,7 +194,7 @@ public: ...@@ -194,7 +194,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) add_hierar_pin_xpm; } virtual BITMAP_DEF GetMenuImage() const { return add_hierar_pin_xpm; }
}; };
...@@ -562,10 +562,7 @@ public: ...@@ -562,10 +562,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const virtual BITMAP_DEF GetMenuImage() const { return add_hierarchical_subsheet_xpm; }
{
return (const char**) add_hierarchical_subsheet_xpm;
}
#if defined(DEBUG) #if defined(DEBUG)
......
eeschema/sch_text.h
View file @ 45c5e594
...@@ -204,7 +204,7 @@ public: ...@@ -204,7 +204,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) add_text_xpm; } virtual BITMAP_DEF GetMenuImage() const { return add_text_xpm; }
#if defined(DEBUG) #if defined(DEBUG)
void Show( int nestLevel, std::ostream& os ); void Show( int nestLevel, std::ostream& os );
...@@ -299,7 +299,7 @@ public: ...@@ -299,7 +299,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) add_line_label_xpm; } virtual BITMAP_DEF GetMenuImage() const { return add_line_label_xpm; }
private: private:
virtual bool doHitTest( const wxPoint& aPoint, int aAccuracy ) const; virtual bool doHitTest( const wxPoint& aPoint, int aAccuracy ) const;
...@@ -403,7 +403,7 @@ public: ...@@ -403,7 +403,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) add_glabel_xpm; } virtual BITMAP_DEF GetMenuImage() const { return add_glabel_xpm; }
private: private:
virtual bool doHitTest( const wxPoint& aPoint, int aAccuracy ) const; virtual bool doHitTest( const wxPoint& aPoint, int aAccuracy ) const;
...@@ -509,7 +509,7 @@ public: ...@@ -509,7 +509,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) add_hierarchical_label_xpm; } virtual BITMAP_DEF GetMenuImage() const { return add_hierarchical_label_xpm; }
private: private:
virtual bool doHitTest( const wxPoint& aPoint, int aAccuracy ) const; virtual bool doHitTest( const wxPoint& aPoint, int aAccuracy ) const;
......
eeschema/tool_lib.cpp
View file @ 45c5e594
...@@ -101,7 +101,7 @@ void LIB_EDIT_FRAME::ReCreateHToolbar() ...@@ -101,7 +101,7 @@ void LIB_EDIT_FRAME::ReCreateHToolbar()
_( "Load component to edit from the current lib" ) ); _( "Load component to edit from the current lib" ) );
m_HToolBar->AddTool( ID_LIBEDIT_NEW_PART_FROM_EXISTING, wxEmptyString, m_HToolBar->AddTool( ID_LIBEDIT_NEW_PART_FROM_EXISTING, wxEmptyString,
KiBitmap( copyComponent_xpm ), KiBitmap( copycomponent_xpm ),
_( "Create a new component from the current one" ) ); _( "Create a new component from the current one" ) );
m_HToolBar->AddTool( ID_LIBEDIT_SAVE_CURRENT_PART, wxEmptyString, m_HToolBar->AddTool( ID_LIBEDIT_SAVE_CURRENT_PART, wxEmptyString,
......
eeschema/tool_sch.cpp
View file @ 45c5e594
...@@ -54,10 +54,10 @@ void SCH_EDIT_FRAME::ReCreateHToolbar() ...@@ -54,10 +54,10 @@ void SCH_EDIT_FRAME::ReCreateHToolbar()
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( wxID_CUT, wxEmptyString, KiBitmap( cut_button ), m_HToolBar->AddTool( wxID_CUT, wxEmptyString, KiBitmap( cut_button_xpm ),
_( "Cut selected item" ) ); _( "Cut selected item" ) );
m_HToolBar->AddTool( wxID_COPY, wxEmptyString, KiBitmap( copy_button ), m_HToolBar->AddTool( wxID_COPY, wxEmptyString, KiBitmap( copy_button_xpm ),
_( "Copy selected item" ) ); _( "Copy selected item" ) );
m_HToolBar->AddTool( wxID_PASTE, wxEmptyString, KiBitmap( paste_xpm ), m_HToolBar->AddTool( wxID_PASTE, wxEmptyString, KiBitmap( paste_xpm ),
...@@ -71,7 +71,7 @@ void SCH_EDIT_FRAME::ReCreateHToolbar() ...@@ -71,7 +71,7 @@ void SCH_EDIT_FRAME::ReCreateHToolbar()
m_HToolBar->AddTool( wxID_REDO, wxEmptyString, KiBitmap( redo_xpm ), msg ); m_HToolBar->AddTool( wxID_REDO, wxEmptyString, KiBitmap( redo_xpm ), msg );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( wxID_PRINT, wxEmptyString, KiBitmap( print_button ), m_HToolBar->AddTool( wxID_PRINT, wxEmptyString, KiBitmap( print_button_xpm ),
_( "Print schematic" ) ); _( "Print schematic" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
...@@ -154,7 +154,7 @@ void SCH_EDIT_FRAME::ReCreateVToolbar() ...@@ -154,7 +154,7 @@ void SCH_EDIT_FRAME::ReCreateVToolbar()
m_VToolBar->AddTool( ID_BUSTOBUS_ENTRY_BUTT, wxEmptyString, KiBitmap( add_bus2bus_xpm ), m_VToolBar->AddTool( ID_BUSTOBUS_ENTRY_BUTT, wxEmptyString, KiBitmap( add_bus2bus_xpm ),
HELP_PLACE_BUS2BUS_ENTRY, wxITEM_CHECK ); HELP_PLACE_BUS2BUS_ENTRY, wxITEM_CHECK );
m_VToolBar->AddTool( ID_NOCONN_BUTT, wxEmptyString, wxBitmap( noconn_button ), m_VToolBar->AddTool( ID_NOCONN_BUTT, wxEmptyString, wxBitmap( noconn_xpm ),
HELP_PLACE_NC_FLAG, wxITEM_CHECK ); HELP_PLACE_NC_FLAG, wxITEM_CHECK );
m_VToolBar->AddTool( ID_LABEL_BUTT, wxEmptyString, KiBitmap( add_line_label_xpm ), m_VToolBar->AddTool( ID_LABEL_BUTT, wxEmptyString, KiBitmap( add_line_label_xpm ),
......
gerbview/menubar.cpp
View file @ 45c5e594
...@@ -110,7 +110,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar( void ) ...@@ -110,7 +110,7 @@ void GERBVIEW_FRAME::ReCreateMenuBar( void )
wxID_PRINT, wxID_PRINT,
_( "P&rint" ), _( "P&rint" ),
_( "Print gerber" ), _( "Print gerber" ),
print_button ); print_button_xpm );
// Separator // Separator
fileMenu->AppendSeparator(); fileMenu->AppendSeparator();
......
gerbview/toolbars_gerber.cpp
View file @ 45c5e594
...@@ -38,7 +38,7 @@ void GERBVIEW_FRAME::ReCreateHToolbar( void ) ...@@ -38,7 +38,7 @@ void GERBVIEW_FRAME::ReCreateHToolbar( void )
_( "Load an excellon drill file on the current layer. Previous data will be deleted" ) ); _( "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_xpm ),
_( "Print layers" ) ); _( "Print layers" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
......
include/base_struct.h
View file @ 45c5e594
...@@ -575,7 +575,7 @@ public: ...@@ -575,7 +575,7 @@ public:
* images. * images.
* @return The menu image associated with the item. * @return The menu image associated with the item.
*/ */
virtual const char** GetMenuImage() const { return (const char**) right_xpm; } virtual BITMAP_DEF GetMenuImage() const { return right_xpm; }
/** /**
* Test if another item is less than this object. * Test if another item is less than this object.
......
include/bitmaps.h
View file @ 45c5e594
...@@ -4,36 +4,42 @@ ...@@ -4,36 +4,42 @@
#include <wx/bitmap.h> #include <wx/bitmap.h>
#define VTOOLBAR_WIDTH 26 #define VTOOLBAR_WIDTH 26
#define TOOL_SIZE 23 #define TOOL_SIZE 23
#if defined(FUTURE_PNG_BITMAPS)
#if !defined(USE_PNG_BITMAPS)
// temporary during migration to KiBitmap() and KiBitmapNew().
typedef const char** BITMAP_DEF;
#else
/// PNG memory record (file in memory). /// PNG memory record (file in memory).
struct BITMAP_DEF struct BITMAP_OPAQUE
{ {
const unsigned char* png; const unsigned char* png;
int byteCount; int byteCount;
}; };
#define EXTERN_BITMAP(x) extern const BITMAP_DEF x;
#else
// temporary during migration to KiBitmap() and KiBitmapNew().
typedef const char* BITMAP_OPAQUE;
#define EXTERN_BITMAP(x) extern const char* x[];
#endif #endif
/// a BITMAP_DEF is really a const pointer to an opaque structure. So you
/// should never need to use 'const' with it.
typedef const BITMAP_OPAQUE *BITMAP_DEF;
/** /**
* Function KiBitmap * Function KiBitmap
* constructs a wxBitmap from a memory record, held in a * constructs a wxBitmap from a memory record, held in a
* BITMAP_DEF. * BITMAP_DEF.
*/ */
wxBitmap KiBitmap( const BITMAP_DEF& aBitmap ); wxBitmap KiBitmap( BITMAP_DEF aBitmap );
/** /**
...@@ -43,432 +49,432 @@ wxBitmap KiBitmap( const BITMAP_DEF& aBitmap ); ...@@ -43,432 +49,432 @@ wxBitmap KiBitmap( const BITMAP_DEF& aBitmap );
* *
* @return wxBitmap* - caller owns it. * @return wxBitmap* - caller owns it.
*/ */
wxBitmap* KiBitmapNew( const BITMAP_DEF& aBitmap ); wxBitmap* KiBitmapNew( BITMAP_DEF aBitmap );
// Please keep list sorted alphabetically, ignoring case. // may eventually generate this file automatically.
extern const char* shape_3d_xpm[]; EXTERN_BITMAP( shape_3d_xpm )
extern const char* add_arc_xpm[]; EXTERN_BITMAP( add_arc_xpm )
extern const char* add_bus2bus_xpm[]; EXTERN_BITMAP( add_bus2bus_xpm )
extern const char* add_bus_xpm[]; EXTERN_BITMAP( add_bus_xpm )
extern const char* add_circle_xpm[]; EXTERN_BITMAP( add_circle_xpm )
extern const char* add_component_xpm[]; EXTERN_BITMAP( add_component_xpm )
extern const char* add_corner_xpm[]; EXTERN_BITMAP( add_corner_xpm )
extern const char* add_dashed_line_xpm[]; EXTERN_BITMAP( add_dashed_line_xpm )
extern const char* add_dimension_xpm[]; EXTERN_BITMAP( add_dimension_xpm )
extern const char* add_entry_xpm[]; EXTERN_BITMAP( add_entry_xpm )
extern const char* add_glabel_xpm[]; EXTERN_BITMAP( add_glabel_xpm )
extern const char* add_hierarchical_label_xpm[]; EXTERN_BITMAP( add_hierarchical_label_xpm )
extern const char* add_hierarchical_subsheet_xpm[]; EXTERN_BITMAP( add_hierarchical_subsheet_xpm )
extern const char* add_hierar_pin_xpm[]; EXTERN_BITMAP( add_hierar_pin_xpm )
extern const char* add_junction_xpm[]; EXTERN_BITMAP( add_junction_xpm )
extern const char* add_line2bus_xpm[]; EXTERN_BITMAP( add_line2bus_xpm )
extern const char* add_line_label_xpm[]; EXTERN_BITMAP( add_line_label_xpm )
extern const char* add_line_xpm[]; EXTERN_BITMAP( add_line_xpm )
extern const char* add_mires_xpm[]; EXTERN_BITMAP( add_mires_xpm )
extern const char* add_polygon_xpm[]; EXTERN_BITMAP( add_polygon_xpm )
extern const char* add_power_xpm[]; EXTERN_BITMAP( add_power_xpm )
extern const char* add_rectangle_xpm[]; EXTERN_BITMAP( add_rectangle_xpm )
extern const char* add_text_xpm[]; EXTERN_BITMAP( add_text_xpm )
extern const char* add_tracks_xpm[]; EXTERN_BITMAP( add_tracks_xpm )
extern const char* add_zone_cutout[]; EXTERN_BITMAP( add_zone_cutout_xpm )
extern const char* add_zone_xpm[]; EXTERN_BITMAP( add_zone_xpm )
extern const char* a_icon_pcbnew_xpm[]; EXTERN_BITMAP( a_icon_pcbnew_xpm )
extern const char* anchor_xpm[]; EXTERN_BITMAP( anchor_xpm )
extern const char* annotate_down_right_xpm[]; EXTERN_BITMAP( annotate_down_right_xpm )
extern const char* annotate_right_down_xpm[]; EXTERN_BITMAP( annotate_right_down_xpm )
extern const char* annotate_xpm[]; EXTERN_BITMAP( annotate_xpm )
extern const char* apply_xpm[]; EXTERN_BITMAP( apply_xpm )
extern const char* auto_associe_xpm[]; EXTERN_BITMAP( auto_associe_xpm )
extern const char* auto_delete_track_xpm[]; EXTERN_BITMAP( auto_delete_track_xpm )
extern const char* auto_track_width_xpm[]; EXTERN_BITMAP( auto_track_width_xpm )
extern const char* axis3d_back_xpm[]; EXTERN_BITMAP( axis3d_back_xpm )
extern const char* axis3d_bottom_xpm[]; EXTERN_BITMAP( axis3d_bottom_xpm )
extern const char* axis3d_front_xpm[]; EXTERN_BITMAP( axis3d_front_xpm )
extern const char* axis3d_left_xpm[]; EXTERN_BITMAP( axis3d_left_xpm )
extern const char* axis3d_right_xpm[]; EXTERN_BITMAP( axis3d_right_xpm )
extern const char* axis3d_top_xpm[]; EXTERN_BITMAP( axis3d_top_xpm )
extern const char* axis3d_xpm[]; EXTERN_BITMAP( axis3d_xpm )
extern const char* book_xpm[]; EXTERN_BITMAP( book_xpm )
extern const char* break_bus_xpm[]; EXTERN_BITMAP( break_bus_xpm )
extern const char* break_line_xpm[]; EXTERN_BITMAP( break_line_xpm )
extern const char* browse_files_xpm[]; EXTERN_BITMAP( browse_files_xpm )
extern const char* cancel_tool_xpm[]; EXTERN_BITMAP( cancel_tool_xpm )
extern const char* cancel_xpm[]; EXTERN_BITMAP( cancel_xpm )
extern const char* checked_ok_xpm[]; EXTERN_BITMAP( checked_ok_xpm )
extern const char* component_select_alternate_shape_xpm[]; EXTERN_BITMAP( component_select_alternate_shape_xpm )
extern const char* component_select_unit_xpm[]; EXTERN_BITMAP( component_select_unit_xpm )
extern const char* config_xpm[]; EXTERN_BITMAP( config_xpm )
extern const char* copper_layers_setup_xpm[]; EXTERN_BITMAP( copper_layers_setup_xpm )
extern const char* copyblock_xpm[]; EXTERN_BITMAP( copyblock_xpm )
extern const char* copyComponent_xpm[]; EXTERN_BITMAP( copycomponent_xpm )
extern const char* copy_button[]; EXTERN_BITMAP( copy_button_xpm )
extern const char* create_cmp_file_xpm[]; EXTERN_BITMAP( create_cmp_file_xpm )
extern const char* cursor_shape_xpm[]; EXTERN_BITMAP( cursor_shape_xpm )
extern const char* cursor_xpm[]; EXTERN_BITMAP( cursor_xpm )
extern const char* cut_button[]; EXTERN_BITMAP( cut_button_xpm )
extern const char* cvpcb_xpm[]; EXTERN_BITMAP( cvpcb_xpm )
extern const char* dashedline_xpm[]; EXTERN_BITMAP( dashedline_xpm )
extern const char* datasheet_xpm[]; EXTERN_BITMAP( datasheet_xpm )
extern const char* delete_arc_xpm[]; EXTERN_BITMAP( delete_arc_xpm )
extern const char* delete_association_xpm[]; EXTERN_BITMAP( delete_association_xpm )
extern const char* delete_body_xpm[]; EXTERN_BITMAP( delete_body_xpm )
extern const char* delete_bus_xpm[]; EXTERN_BITMAP( delete_bus_xpm )
extern const char* delete_circle_xpm[]; EXTERN_BITMAP( delete_circle_xpm )
extern const char* delete_connection_xpm[]; EXTERN_BITMAP( delete_connection_xpm )
extern const char* delete_cotation_xpm[]; EXTERN_BITMAP( delete_cotation_xpm )
extern const char* delete_field_xpm[]; EXTERN_BITMAP( delete_field_xpm )
extern const char* delete_glabel_xpm[]; EXTERN_BITMAP( delete_glabel_xpm )
extern const char* delete_line_xpm[]; EXTERN_BITMAP( delete_line_xpm )
extern const char* delete_module_xpm[]; EXTERN_BITMAP( delete_module_xpm )
extern const char* delete_net_xpm[]; EXTERN_BITMAP( delete_net_xpm )
extern const char* delete_node_xpm[]; EXTERN_BITMAP( delete_node_xpm )
extern const char* delete_pad_xpm[]; EXTERN_BITMAP( delete_pad_xpm )
extern const char* delete_pinsheet_xpm[]; EXTERN_BITMAP( delete_pinsheet_xpm )
extern const char* delete_pin_xpm[]; EXTERN_BITMAP( delete_pin_xpm )
extern const char* delete_polygon_xpm[]; EXTERN_BITMAP( delete_polygon_xpm )
extern const char* delete_rectangle_xpm[]; EXTERN_BITMAP( delete_rectangle_xpm )
extern const char* delete_segment_xpm[]; EXTERN_BITMAP( delete_segment_xpm )
extern const char* delete_sheet_xpm[]; EXTERN_BITMAP( delete_sheet_xpm )
extern const char* delete_text_xpm[]; EXTERN_BITMAP( delete_text_xpm )
extern const char* delete_track_xpm[]; EXTERN_BITMAP( delete_track_xpm )
extern const char* delete_xpm[]; EXTERN_BITMAP( delete_xpm )
extern const char* directory_xpm[]; EXTERN_BITMAP( directory_xpm )
extern const char* display_options_xpm[]; EXTERN_BITMAP( display_options_xpm )
extern const char* down_xpm[]; EXTERN_BITMAP( down_xpm )
extern const char* ortho_xpm[]; EXTERN_BITMAP( ortho_xpm )
extern const char* drag_module_xpm[]; EXTERN_BITMAP( drag_module_xpm )
extern const char* drag_outline_segment_xpm[]; EXTERN_BITMAP( drag_outline_segment_xpm )
extern const char* drag_pad_xpm[]; EXTERN_BITMAP( drag_pad_xpm )
extern const char* drag_segment_withslope_xpm[]; EXTERN_BITMAP( drag_segment_withslope_xpm )
extern const char* drag_track_segment_xpm[]; EXTERN_BITMAP( drag_track_segment_xpm )
extern const char* drc_off_xpm[]; EXTERN_BITMAP( drc_off_xpm )
extern const char* drc_xpm[]; EXTERN_BITMAP( drc_xpm )
extern const char* edges_sketch_xpm[]; EXTERN_BITMAP( edges_sketch_xpm )
extern const char* edit_comp_footprint_xpm[]; EXTERN_BITMAP( edit_comp_footprint_xpm )
extern const char* edit_component_xpm[]; EXTERN_BITMAP( edit_component_xpm )
extern const char* edit_comp_ref_xpm[]; EXTERN_BITMAP( edit_comp_ref_xpm )
extern const char* edit_comp_value_xpm[]; EXTERN_BITMAP( edit_comp_value_xpm )
extern const char* edit_module_xpm[]; EXTERN_BITMAP( edit_module_xpm )
extern const char* editor_xpm[]; EXTERN_BITMAP( editor_xpm )
extern const char* edit_part_xpm[]; EXTERN_BITMAP( edit_part_xpm )
extern const char* edit_sheet_xpm[]; EXTERN_BITMAP( edit_sheet_xpm )
extern const char* edit_text_xpm[]; EXTERN_BITMAP( edit_text_xpm )
extern const char* edit_xpm[]; EXTERN_BITMAP( edit_xpm )
extern const char* eeschema_xpm[]; EXTERN_BITMAP( eeschema_xpm )
extern const char* enter_sheet_xpm[]; EXTERN_BITMAP( enter_sheet_xpm )
extern const char* erc_xpm[]; EXTERN_BITMAP( erc_xpm )
extern const char* erc_green_xpm[]; EXTERN_BITMAP( erc_green_xpm )
extern const char* error_xpm[]; EXTERN_BITMAP( error_xpm )
extern const char* exit_xpm[]; EXTERN_BITMAP( exit_xpm )
extern const char* export_footprint_names_xpm[]; EXTERN_BITMAP( export_footprint_names_xpm )
extern const char* export_module_xpm[]; EXTERN_BITMAP( export_module_xpm )
extern const char* export_options_pad_xpm[]; EXTERN_BITMAP( export_options_pad_xpm )
extern const char* export_xpm[]; EXTERN_BITMAP( export_xpm )
extern const char* fabrication_xpm[]; EXTERN_BITMAP( fabrication_xpm )
extern const char* file_footprint_xpm[]; EXTERN_BITMAP( file_footprint_xpm )
extern const char* fill_zone_xpm[]; EXTERN_BITMAP( fill_zone_xpm )
extern const char* find_xpm[]; EXTERN_BITMAP( find_xpm )
extern const char* flag_xpm[]; EXTERN_BITMAP( flag_xpm )
extern const char* fonts_xpm[]; EXTERN_BITMAP( fonts_xpm )
extern const char* footprint_text_xpm[]; EXTERN_BITMAP( footprint_text_xpm )
extern const char* gbr_select_mode0_xpm[]; EXTERN_BITMAP( gbr_select_mode0_xpm )
extern const char* gbr_select_mode1_xpm[]; EXTERN_BITMAP( gbr_select_mode1_xpm )
extern const char* gbr_select_mode2_xpm[]; EXTERN_BITMAP( gbr_select_mode2_xpm )
extern const char* gerbview_drill_file_xpm[]; EXTERN_BITMAP( gerbview_drill_file_xpm )
extern const char* gerber_file_xpm[]; EXTERN_BITMAP( gerber_file_xpm )
extern const char* gerber_recent_files_xpm[]; EXTERN_BITMAP( gerber_recent_files_xpm )
extern const char* gerbview_clear_layers_xpm[]; EXTERN_BITMAP( gerbview_clear_layers_xpm )
extern const char* gerber_open_dcode_file_xpm[]; EXTERN_BITMAP( gerber_open_dcode_file_xpm )
extern const char* general_deletions_xpm[]; EXTERN_BITMAP( general_deletions_xpm )
extern const char* general_ratsnet_xpm[]; EXTERN_BITMAP( general_ratsnet_xpm )
extern const char* glabel2label_xpm[]; EXTERN_BITMAP( glabel2label_xpm )
extern const char* glabel2text_xpm[]; EXTERN_BITMAP( glabel2text_xpm )
extern const char* gl_change_xpm[]; EXTERN_BITMAP( gl_change_xpm )
extern const char* global_options_pad_xpm[]; EXTERN_BITMAP( global_options_pad_xpm )
extern const char* green_xpm[]; EXTERN_BITMAP( green_xpm )
extern const char* grid_select_axis_xpm[]; EXTERN_BITMAP( grid_select_axis_xpm )
extern const char* grid_select_xpm[]; EXTERN_BITMAP( grid_select_xpm )
extern const char* grid_xpm[]; EXTERN_BITMAP( grid_xpm )
extern const char* hammer_xpm[]; EXTERN_BITMAP( hammer_xpm )
extern const char* help_xpm[]; EXTERN_BITMAP( help_xpm )
extern const char* hidden_pin_xpm[]; EXTERN_BITMAP( hidden_pin_xpm )
extern const char* hierarchy_cursor_xpm[]; EXTERN_BITMAP( hierarchy_cursor_xpm )
extern const char* hierarchy_nav_xpm[]; EXTERN_BITMAP( hierarchy_nav_xpm )
extern const char* hotkeys_xpm[]; EXTERN_BITMAP( hotkeys_xpm )
extern const char* icon_cvpcb_small_xpm[]; EXTERN_BITMAP( icon_cvpcb_small_xpm )
extern const char* icon_cvpcb_xpm[]; EXTERN_BITMAP( icon_cvpcb_xpm )
extern const char* icon_eeschema_xpm[]; EXTERN_BITMAP( icon_eeschema_xpm )
extern const char* icon_gerbview_small_xpm[]; EXTERN_BITMAP( icon_gerbview_small_xpm )
extern const char* icon_gerbview_xpm[]; EXTERN_BITMAP( icon_gerbview_xpm )
extern const char* icon_modedit_xpm[]; EXTERN_BITMAP( icon_kicad_xpm )
extern const char* icon_txt_xpm[]; EXTERN_BITMAP( icon_modedit_xpm )
extern const char* icon_w3d_xpm[]; EXTERN_BITMAP( icon_txt_xpm )
extern const char* import_cmp_from_lib_xpm[]; EXTERN_BITMAP( icon_3d_xpm )
extern const char* import_footprint_names_xpm[]; EXTERN_BITMAP( import_cmp_from_lib_xpm )
extern const char* import_hierarchical_label_xpm[]; EXTERN_BITMAP( import_footprint_names_xpm )
extern const char* import_module_xpm[]; EXTERN_BITMAP( import_hierarchical_label_xpm )
extern const char* import_xpm[]; EXTERN_BITMAP( import_module_xpm )
extern const char* import3d_xpm[]; EXTERN_BITMAP( import_xpm )
extern const char* info_xpm[]; EXTERN_BITMAP( import3d_xpm )
extern const char* insert_module_board_xpm[]; EXTERN_BITMAP( info_xpm )
extern const char* invert_module_xpm[]; EXTERN_BITMAP( insert_module_board_xpm )
extern const char* invisible_text_xpm[]; EXTERN_BITMAP( invert_module_xpm )
extern const char* jigsaw_xpm[]; EXTERN_BITMAP( invisible_text_xpm )
extern const char* kicad_icon_small_xpm[]; EXTERN_BITMAP( jigsaw_xpm )
extern const char* kicad_icon_xpm[]; EXTERN_BITMAP( kicad_icon_small_xpm )
extern const char* label2glabel_xpm[]; EXTERN_BITMAP( label2glabel_xpm )
extern const char* label2text_xpm[]; EXTERN_BITMAP( label2text_xpm )
extern const char* label_xpm[]; EXTERN_BITMAP( label_xpm )
extern const char* lang_catalan_xpm[]; EXTERN_BITMAP( lang_catalan_xpm )
extern const char* lang_chinese_xpm[]; EXTERN_BITMAP( lang_chinese_xpm )
extern const char* lang_cs_xpm[]; EXTERN_BITMAP( lang_cs_xpm )
extern const char* lang_def_xpm[]; EXTERN_BITMAP( lang_def_xpm )
extern const char* lang_de_xpm[]; EXTERN_BITMAP( lang_de_xpm )
extern const char* lang_en_xpm[]; EXTERN_BITMAP( lang_en_xpm )
extern const char* lang_es_xpm[]; EXTERN_BITMAP( lang_es_xpm )
extern const char* lang_fr_xpm[]; EXTERN_BITMAP( lang_fr_xpm )
extern const char* lang_fi_xpm[]; EXTERN_BITMAP( lang_fi_xpm )
extern const char* lang_gr_xpm[]; EXTERN_BITMAP( lang_gr_xpm )
extern const char* lang_hu_xpm[]; EXTERN_BITMAP( lang_hu_xpm )
extern const char* lang_it_xpm[]; EXTERN_BITMAP( lang_it_xpm )
extern const char* lang_jp_xpm[]; EXTERN_BITMAP( lang_jp_xpm )
extern const char* lang_ko_xpm[]; EXTERN_BITMAP( lang_ko_xpm )
extern const char* lang_nl_xpm[]; EXTERN_BITMAP( lang_nl_xpm )
extern const char* lang_pl_xpm[]; EXTERN_BITMAP( lang_pl_xpm )
extern const char* lang_pt_xpm[]; EXTERN_BITMAP( lang_pt_xpm )
extern const char* lang_ru_xpm[]; EXTERN_BITMAP( lang_ru_xpm )
extern const char* lang_sl_xpm[]; EXTERN_BITMAP( lang_sl_xpm )
extern const char* language_xpm[]; EXTERN_BITMAP( language_xpm )
extern const char* layers_manager_xpm[]; EXTERN_BITMAP( layers_manager_xpm )
extern const char* leave_sheet_xpm[]; EXTERN_BITMAP( leave_sheet_xpm )
extern const char* left_xpm[]; EXTERN_BITMAP( left_xpm )
extern const char* libedit_icon_xpm[]; EXTERN_BITMAP( libedit_icon_xpm )
extern const char* libedit_xpm[]; EXTERN_BITMAP( libedit_xpm )
extern const char* libedit_part_xpm[]; EXTERN_BITMAP( libedit_part_xpm )
extern const char* lib_next_xpm[]; EXTERN_BITMAP( lib_next_xpm )
extern const char* lib_previous_xpm[]; EXTERN_BITMAP( lib_previous_xpm )
extern const char* library_browse_xpm[]; EXTERN_BITMAP( library_browse_xpm )
extern const char* library_update_xpm[]; EXTERN_BITMAP( library_update_xpm )
extern const char* library_xpm[]; EXTERN_BITMAP( library_xpm )
extern const char* libview_xpm[]; EXTERN_BITMAP( libview_xpm )
extern const char* lines90_xpm[]; EXTERN_BITMAP( lines90_xpm )
extern const char* load_module_board_xpm[]; EXTERN_BITMAP( load_module_board_xpm )
extern const char* load_module_lib_xpm[]; EXTERN_BITMAP( load_module_lib_xpm )
extern const char* local_ratsnet_xpm[]; EXTERN_BITMAP( local_ratsnet_xpm )
extern const char* locked_xpm[]; EXTERN_BITMAP( locked_xpm )
extern const char* mirepcb_xpm[]; EXTERN_BITMAP( mirepcb_xpm )
extern const char* mirror_H_xpm[]; EXTERN_BITMAP( mirror_h_xpm )
extern const char* mirror_V_xpm[]; EXTERN_BITMAP( mirror_v_xpm )
extern const char* modedit_xpm[]; EXTERN_BITMAP( modedit_xpm )
extern const char* mode_module_xpm[]; EXTERN_BITMAP( mode_module_xpm )
extern const char* mode_track_xpm[]; EXTERN_BITMAP( mode_track_xpm )
extern const char* mod_ratsnest_xpm[]; EXTERN_BITMAP( mod_ratsnest_xpm )
extern const char* module_check_xpm[]; EXTERN_BITMAP( module_check_xpm )
extern const char* module_edit_xpm[]; EXTERN_BITMAP( module_edit_xpm )
extern const char* module_filtered_list_xpm[]; EXTERN_BITMAP( module_filtered_list_xpm )
extern const char* module_full_list_xpm[]; EXTERN_BITMAP( module_full_list_xpm )
extern const char* module_options_xpm[]; EXTERN_BITMAP( module_options_xpm )
extern const char* module_ratsnet_xpm[]; EXTERN_BITMAP( module_ratsnet_xpm )
extern const char* module_xpm[]; EXTERN_BITMAP( module_xpm )
extern const char* morgan1_xpm[]; EXTERN_BITMAP( morgan1_xpm )
extern const char* morgan2_xpm[]; EXTERN_BITMAP( morgan2_xpm )
extern const char* move_arc_xpm[]; EXTERN_BITMAP( move_arc_xpm )
extern const char* move_circle_xpm[]; EXTERN_BITMAP( move_circle_xpm )
extern const char* move_field_xpm[]; EXTERN_BITMAP( move_field_xpm )
extern const char* move_glabel_xpm[]; EXTERN_BITMAP( move_glabel_xpm )
extern const char* move_line_xpm[]; EXTERN_BITMAP( move_line_xpm )
extern const char* move_module_xpm[]; EXTERN_BITMAP( move_module_xpm )
extern const char* move_pad_xpm[]; EXTERN_BITMAP( move_pad_xpm )
extern const char* move_pinsheet_xpm[]; EXTERN_BITMAP( move_pinsheet_xpm )
extern const char* move_pin_xpm[]; EXTERN_BITMAP( move_pin_xpm )
extern const char* move_polygon_xpm[]; EXTERN_BITMAP( move_polygon_xpm )
extern const char* move_rectangle_xpm[]; EXTERN_BITMAP( move_rectangle_xpm )
extern const char* move_sheet_xpm[]; EXTERN_BITMAP( move_sheet_xpm )
extern const char* move_text_xpm[]; EXTERN_BITMAP( move_text_xpm )
extern const char* move_track_segment_xpm[]; EXTERN_BITMAP( move_track_segment_xpm )
extern const char* move_track_xpm[]; EXTERN_BITMAP( move_track_xpm )
extern const char* move_xpm[]; EXTERN_BITMAP( move_xpm )
extern const char* mw_Add_Gap_xpm[]; EXTERN_BITMAP( mw_add_gap_xpm )
extern const char* mw_Add_Line_xpm[]; EXTERN_BITMAP( mw_add_line_xpm )
extern const char* mw_Add_Shape_xpm[]; EXTERN_BITMAP( mw_add_shape_xpm )
extern const char* mw_Add_stub_arc_xpm[]; EXTERN_BITMAP( mw_add_stub_arc_xpm )
extern const char* mw_Add_Stub_xpm[]; EXTERN_BITMAP( mw_add_stub_xpm )
extern const char* mw_toolbar_xpm[]; EXTERN_BITMAP( mw_toolbar_xpm )
extern const char* net_highlight_xpm[]; EXTERN_BITMAP( net_highlight_xpm )
extern const char* netlist_xpm[]; EXTERN_BITMAP( netlist_xpm )
extern const char* net_locked_xpm[]; EXTERN_BITMAP( net_locked_xpm )
extern const char* net_unlocked_xpm[]; EXTERN_BITMAP( net_unlocked_xpm )
extern const char* new_component_xpm[]; EXTERN_BITMAP( new_component_xpm )
extern const char* new_cvpcb_xpm[]; EXTERN_BITMAP( new_cvpcb_xpm )
extern const char* new_footprint_xpm[]; EXTERN_BITMAP( new_footprint_xpm )
extern const char* new_gerb_xpm[]; EXTERN_BITMAP( new_gerb_xpm )
extern const char* new_library_xpm[]; EXTERN_BITMAP( new_library_xpm )
extern const char* new_module_xpm[]; EXTERN_BITMAP( new_module_xpm )
extern const char* new_pcb_xpm[]; EXTERN_BITMAP( new_pcb_xpm )
extern const char* new_project_xpm[]; EXTERN_BITMAP( new_project_xpm )
extern const char* new_python_xpm[]; EXTERN_BITMAP( new_python_xpm )
extern const char* new_sch_xpm[]; EXTERN_BITMAP( new_sch_xpm )
extern const char* new_txt_xpm[]; EXTERN_BITMAP( new_txt_xpm )
extern const char* new_xpm[]; EXTERN_BITMAP( new_xpm )
extern const char* noconn_button[]; EXTERN_BITMAP( noconn_xpm )
extern const char* normal_xpm[]; EXTERN_BITMAP( normal_xpm )
extern const char* online_help_xpm[]; EXTERN_BITMAP( online_help_xpm )
extern const char* open_document_xpm[]; EXTERN_BITMAP( open_document_xpm )
extern const char* open_library_xpm[]; EXTERN_BITMAP( open_library_xpm )
extern const char* open_project_xpm[]; EXTERN_BITMAP( open_project_xpm )
extern const char* options_all_tracks_and_vias_xpm[]; EXTERN_BITMAP( options_all_tracks_and_vias_xpm )
extern const char* options_all_tracks_xpm[]; EXTERN_BITMAP( options_all_tracks_xpm )
extern const char* options_all_vias_xpm[]; EXTERN_BITMAP( options_all_vias_xpm )
extern const char* options_arc_xpm[]; EXTERN_BITMAP( options_arc_xpm )
extern const char* options_circle_xpm[]; EXTERN_BITMAP( options_circle_xpm )
extern const char* options_module_xpm[]; EXTERN_BITMAP( options_module_xpm )
extern const char* options_new_pad_xpm[]; EXTERN_BITMAP( options_new_pad_xpm )
extern const char* options_pad_xpm[]; EXTERN_BITMAP( options_pad_xpm )
extern const char* options_pinsheet_xpm[]; EXTERN_BITMAP( options_pinsheet_xpm )
extern const char* options_pin_xpm[]; EXTERN_BITMAP( options_pin_xpm )
extern const char* options_rectangle_xpm[]; EXTERN_BITMAP( options_rectangle_xpm )
extern const char* options_segment_xpm[]; EXTERN_BITMAP( options_segment_xpm )
extern const char* options_text_xpm[]; EXTERN_BITMAP( options_text_xpm )
extern const char* options_tracks_xpm[]; EXTERN_BITMAP( options_tracks_xpm )
extern const char* options_track_xpm[]; EXTERN_BITMAP( options_track_xpm )
extern const char* options_vias_xpm[]; EXTERN_BITMAP( options_vias_xpm )
extern const char* opt_show_polygon_xpm[]; EXTERN_BITMAP( opt_show_polygon_xpm )
extern const char* orient_xpm[]; EXTERN_BITMAP( orient_xpm )
extern const char* pad_sketch_xpm[]; EXTERN_BITMAP( pad_sketch_xpm )
extern const char* pad_xpm[]; EXTERN_BITMAP( pad_xpm )
extern const char* pads_mask_layers_xpm[]; EXTERN_BITMAP( pads_mask_layers_xpm )
extern const char* palette_xpm[]; EXTERN_BITMAP( palette_xpm )
extern const char* part_properties_xpm[]; EXTERN_BITMAP( part_properties_xpm )
extern const char* paste_xpm[]; EXTERN_BITMAP( paste_xpm )
extern const char* pcbnew_xpm[]; EXTERN_BITMAP( pcbnew_xpm )
extern const char* pcb_offset_xpm[]; EXTERN_BITMAP( pcb_offset_xpm )
extern const char* pin2pin_xpm[]; EXTERN_BITMAP( pin2pin_xpm )
extern const char* pin_name_to_xpm[]; EXTERN_BITMAP( pin_name_to_xpm )
extern const char* pin_number_to_xpm[]; EXTERN_BITMAP( pin_number_to_xpm )
extern const char* pin_size_to_xpm[]; EXTERN_BITMAP( pin_size_to_xpm )
extern const char* pinorient_right_xpm[]; EXTERN_BITMAP( pinorient_right_xpm )
extern const char* pinorient_left_xpm[]; EXTERN_BITMAP( pinorient_left_xpm )
extern const char* pinorient_up_xpm[]; EXTERN_BITMAP( pinorient_up_xpm )
extern const char* pinorient_down_xpm[]; EXTERN_BITMAP( pinorient_down_xpm )
extern const char* pinshape_nonlogic_xpm[]; EXTERN_BITMAP( pinshape_nonlogic_xpm )
extern const char* pinshape_normal_xpm[]; EXTERN_BITMAP( pinshape_normal_xpm )
extern const char* pinshape_invert_xpm[]; EXTERN_BITMAP( pinshape_invert_xpm )
extern const char* pinshape_clock_fall_xpm[]; EXTERN_BITMAP( pinshape_clock_fall_xpm )
extern const char* pinshape_clock_normal_xpm[]; EXTERN_BITMAP( pinshape_clock_normal_xpm )
extern const char* pinshape_clock_invert_xpm[]; EXTERN_BITMAP( pinshape_clock_invert_xpm )
extern const char* pinshape_active_low_input_xpm[]; EXTERN_BITMAP( pinshape_active_low_input_xpm )
extern const char* pinshape_clock_active_low_xpm[]; EXTERN_BITMAP( pinshape_clock_active_low_xpm )
extern const char* pinshape_active_low_output_xpm[]; EXTERN_BITMAP( pinshape_active_low_output_xpm )
extern const char* pintype_input_xpm[]; EXTERN_BITMAP( pintype_input_xpm )
extern const char* pintype_output_xpm[]; EXTERN_BITMAP( pintype_output_xpm )
extern const char* pintype_bidi_xpm[]; EXTERN_BITMAP( pintype_bidi_xpm )
extern const char* pintype_3states_xpm[]; EXTERN_BITMAP( pintype_3states_xpm )
extern const char* pintype_passive_xpm[]; EXTERN_BITMAP( pintype_passive_xpm )
extern const char* pintype_notspecif_xpm[]; EXTERN_BITMAP( pintype_notspecif_xpm )
extern const char* pintype_powerinput_xpm[]; EXTERN_BITMAP( pintype_powerinput_xpm )
extern const char* pintype_poweroutput_xpm[]; EXTERN_BITMAP( pintype_poweroutput_xpm )
extern const char* pintype_opencoll_xpm[]; EXTERN_BITMAP( pintype_opencoll_xpm )
extern const char* pintype_openemit_xpm[]; EXTERN_BITMAP( pintype_openemit_xpm )
extern const char* pintype_noconnect_xpm[]; EXTERN_BITMAP( pintype_noconnect_xpm )
extern const char* pin_to_xpm[]; EXTERN_BITMAP( pin_to_xpm )
extern const char* pin_xpm[]; EXTERN_BITMAP( pin_xpm )
extern const char* plot_HPG_xpm[]; EXTERN_BITMAP( plot_hpg_xpm )
extern const char* plot_PS_xpm[]; EXTERN_BITMAP( plot_ps_xpm )
extern const char* plot_xpm[]; EXTERN_BITMAP( plot_xpm )
extern const char* polar_coord_xpm[]; EXTERN_BITMAP( polar_coord_xpm )
extern const char* post_compo_xpm[]; EXTERN_BITMAP( post_compo_xpm )
extern const char* post_drill_xpm[]; EXTERN_BITMAP( post_drill_xpm )
extern const char* post_module_xpm[]; EXTERN_BITMAP( post_module_xpm )
extern const char* preference_xpm[]; EXTERN_BITMAP( preference_xpm )
extern const char* print_button[]; EXTERN_BITMAP( print_button_xpm )
extern const char* ratsnest_xpm[]; EXTERN_BITMAP( ratsnest_xpm )
extern const char* read_setup_xpm[]; EXTERN_BITMAP( read_setup_xpm )
extern const char* redo_xpm[]; EXTERN_BITMAP( redo_xpm )
extern const char* red_xpm[]; EXTERN_BITMAP( red_xpm )
extern const char* reload2_xpm[]; EXTERN_BITMAP( reload2_xpm )
extern const char* reload_xpm[]; EXTERN_BITMAP( reload_xpm )
extern const char* repaint_xpm[]; EXTERN_BITMAP( repaint_xpm )
extern const char* reset_text_xpm[]; EXTERN_BITMAP( reset_text_xpm )
extern const char* resize_sheet_xpm[]; EXTERN_BITMAP( resize_sheet_xpm )
extern const char* right_xpm[]; EXTERN_BITMAP( right_xpm )
extern const char* rotate_field_xpm[]; EXTERN_BITMAP( rotate_field_xpm )
extern const char* rotate_glabel_xpm[]; EXTERN_BITMAP( rotate_glabel_xpm )
extern const char* rotate_module_neg_xpm[]; EXTERN_BITMAP( rotate_module_neg_xpm )
extern const char* rotate_module_pos_xpm[]; EXTERN_BITMAP( rotate_module_pos_xpm )
extern const char* rotate_pin_xpm[]; EXTERN_BITMAP( rotate_pin_xpm )
extern const char* rotate_CW_xpm[]; EXTERN_BITMAP( rotate_cw_xpm )
extern const char* rotate_CCW_xpm[]; EXTERN_BITMAP( rotate_ccw_xpm )
extern const char* rotate_neg_X_xpm[]; EXTERN_BITMAP( rotate_neg_x_xpm )
extern const char* rotate_pos_X_xpm[]; EXTERN_BITMAP( rotate_pos_x_xpm )
extern const char* rotate_neg_Y_xpm[]; EXTERN_BITMAP( rotate_neg_y_xpm )
extern const char* rotate_pos_Y_xpm[]; EXTERN_BITMAP( rotate_pos_y_xpm )
extern const char* rotate_neg_Z_xpm[]; EXTERN_BITMAP( rotate_neg_z_xpm )
extern const char* rotate_pos_Z_xpm[]; EXTERN_BITMAP( rotate_pos_z_xpm )
extern const char* save_as_xpm[]; EXTERN_BITMAP( save_as_xpm )
extern const char* save_library_xpm[]; EXTERN_BITMAP( save_library_xpm )
extern const char* save_netlist_xpm[]; EXTERN_BITMAP( save_netlist_xpm )
extern const char* save_part_in_mem_xpm[]; EXTERN_BITMAP( save_part_in_mem_xpm )
extern const char* save_project_xpm[]; EXTERN_BITMAP( save_project_xpm )
extern const char* save_setup_xpm[]; EXTERN_BITMAP( save_setup_xpm )
extern const char* save_xpm[]; EXTERN_BITMAP( save_xpm )
extern const char* schematic_xpm[]; EXTERN_BITMAP( schematic_xpm )
extern const char* select_grid_xpm[]; EXTERN_BITMAP( select_grid_xpm )
extern const char* select_layer_pair_xpm[]; EXTERN_BITMAP( select_layer_pair_xpm )
extern const char* select_w_layer_xpm[]; EXTERN_BITMAP( select_w_layer_xpm )
extern const char* sheetset_xpm[]; EXTERN_BITMAP( sheetset_xpm )
extern const char* show_dcodenumber_xpm[]; EXTERN_BITMAP( show_dcodenumber_xpm )
extern const char* show_footprint_xpm[]; EXTERN_BITMAP( show_footprint_xpm )
extern const char* show_mod_edge_xpm[]; EXTERN_BITMAP( show_mod_edge_xpm )
extern const char* showtrack_xpm[]; EXTERN_BITMAP( showtrack_xpm )
extern const char* show_zone_xpm[]; EXTERN_BITMAP( show_zone_xpm )
extern const char* show_zone_disable_xpm[]; EXTERN_BITMAP( show_zone_disable_xpm )
extern const char* show_zone_outline_only_xpm[]; EXTERN_BITMAP( show_zone_outline_only_xpm )
extern const char* swap_layer_xpm[]; EXTERN_BITMAP( swap_layer_xpm )
extern const char* text_sketch_xpm[]; EXTERN_BITMAP( text_sketch_xpm )
extern const char* three_d_xpm[]; EXTERN_BITMAP( three_d_xpm )
extern const char* tool_ratsnet_xpm[]; EXTERN_BITMAP( tool_ratsnet_xpm )
extern const char* tools_xpm[]; EXTERN_BITMAP( tools_xpm )
extern const char* track_locked_xpm[]; EXTERN_BITMAP( track_locked_xpm )
extern const char* track_sketch_xpm[]; EXTERN_BITMAP( track_sketch_xpm )
extern const char* track_unlocked_xpm[]; EXTERN_BITMAP( track_unlocked_xpm )
extern const char* transistor_xpm[]; EXTERN_BITMAP( transistor_xpm )
extern const char* tree_nosel_xpm[]; EXTERN_BITMAP( tree_nosel_xpm )
extern const char* tree_sel_xpm[]; EXTERN_BITMAP( tree_sel_xpm )
extern const char* undelete_xpm[]; EXTERN_BITMAP( undelete_xpm )
extern const char* undo_xpm[]; EXTERN_BITMAP( undo_xpm )
extern const char* unit_inch_xpm[]; EXTERN_BITMAP( unit_inch_xpm )
extern const char* unit_mm_xpm[]; EXTERN_BITMAP( unit_mm_xpm )
extern const char* unknown_xpm[]; EXTERN_BITMAP( unknown_xpm )
extern const char* unlocked_xpm[]; EXTERN_BITMAP( unlocked_xpm )
extern const char* unzip_xpm[]; EXTERN_BITMAP( unzip_xpm )
extern const char* update_module_board_xpm[]; EXTERN_BITMAP( update_module_board_xpm )
extern const char* up_xpm[]; EXTERN_BITMAP( up_xpm )
extern const char* via_sketch_xpm[]; EXTERN_BITMAP( via_sketch_xpm )
extern const char* viewlibs_icon_xpm[]; EXTERN_BITMAP( viewlibs_icon_xpm )
extern const char* warning_xpm[]; EXTERN_BITMAP( warning_xpm )
extern const char* web_support_xpm[]; EXTERN_BITMAP( web_support_xpm )
extern const char* width_net_xpm[]; EXTERN_BITMAP( width_net_xpm )
extern const char* width_segment_xpm[]; EXTERN_BITMAP( width_segment_xpm )
extern const char* width_track_via_xpm[]; EXTERN_BITMAP( width_track_via_xpm )
extern const char* width_track_xpm[]; EXTERN_BITMAP( width_track_xpm )
extern const char* width_vias_xpm[]; EXTERN_BITMAP( width_vias_xpm )
extern const char* window_close_xpm[]; EXTERN_BITMAP( window_close_xpm )
extern const char* zip_tool_xpm[]; EXTERN_BITMAP( zip_tool_xpm )
extern const char* zip_xpm[]; EXTERN_BITMAP( zip_xpm )
extern const char* zoom_area_xpm[]; EXTERN_BITMAP( zoom_area_xpm )
extern const char* zoom_center_on_screen_xpm[]; EXTERN_BITMAP( zoom_center_on_screen_xpm )
extern const char* zoomoins3d_xpm[]; EXTERN_BITMAP( zoomoins3d_xpm )
extern const char* zoom_redraw_xpm[]; EXTERN_BITMAP( zoom_redraw_xpm )
extern const char* zoom_fit_in_page_xpm[]; EXTERN_BITMAP( zoom_fit_in_page_xpm )
extern const char* zoom_in_xpm[]; EXTERN_BITMAP( zoom_in_xpm )
extern const char* zoom_out_xpm[]; EXTERN_BITMAP( zoom_out_xpm )
extern const char* zoompage3d_xpm[]; EXTERN_BITMAP( zoompage3d_xpm )
extern const char* zoom_page_xpm[]; EXTERN_BITMAP( zoom_page_xpm )
extern const char* zoomplus3d_xpm[]; EXTERN_BITMAP( zoomplus3d_xpm )
extern const char* zoomrefr3d_xpm[]; EXTERN_BITMAP( zoomrefr3d_xpm )
extern const char* zoom_selection_xpm[]; EXTERN_BITMAP( zoom_selection_xpm )
extern const char* zoom_xpm[]; EXTERN_BITMAP( zoom_xpm )
#endif // BITMAPS_H_ #endif // BITMAPS_H_
kicad/commandframe.cpp
View file @ 45c5e594
...@@ -84,11 +84,11 @@ void RIGHT_KM_FRAME::CreateCommandToolbar( void ) ...@@ -84,11 +84,11 @@ void RIGHT_KM_FRAME::CreateCommandToolbar( void )
btn = AddBitmapButton( ID_TO_GERBVIEW, KiBitmap( icon_gerbview_xpm ) ); btn = AddBitmapButton( ID_TO_GERBVIEW, KiBitmap( icon_gerbview_xpm ) );
btn->SetToolTip( _( "GerbView (Gerber viewer)" ) ); btn->SetToolTip( _( "GerbView (Gerber viewer)" ) );
btn = AddBitmapButton( ID_TO_BITMAP_CONVERTER, KiBitmap( bitmap2component_xpm ) ); btn = AddBitmapButton( ID_TO_BITMAP_CONVERTER, bitmap2component_xpm );
btn->SetToolTip( _( "Bitmap2Component (a tool to build a logo from a bitmap)\n\ btn->SetToolTip( _( "Bitmap2Component (a tool to build a logo from a bitmap)\n\
Creates a component (for Eeschema) or a footprint (for Pcbnew) that shows a B&W picture" ) ); Creates a component (for Eeschema) or a footprint (for Pcbnew) that shows a B&W picture" ) );
btn = AddBitmapButton( ID_TO_PCB_CALCULATOR, KiBitmap( pcb_calculator_xpm ) ); btn = AddBitmapButton( ID_TO_PCB_CALCULATOR, pcb_calculator_xpm );
btn->SetToolTip( _( "Pcb calculator" ) ); btn->SetToolTip( _( "Pcb calculator" ) );
} }
......
kicad/mainframe.cpp
View file @ 45c5e594
...@@ -50,11 +50,11 @@ KICAD_MANAGER_FRAME::KICAD_MANAGER_FRAME( wxWindow* parent, ...@@ -50,11 +50,11 @@ KICAD_MANAGER_FRAME::KICAD_MANAGER_FRAME( wxWindow* parent,
SetStatusWidths( 3, dims ); SetStatusWidths( 3, dims );
// Give an icon // Give an icon
#ifdef __WINDOWS__ #ifdef __WINDOWS__
SetIcon( wxICON( a_kicad_icon ) ); SetIcon( wxICON( a_kicad_icon ) );
#else #else
SetIcon( wxICON( kicad_icon ) ); SetIcon( wxICON( icon_kicad ) );
#endif #endif
clientsize = GetClientSize(); clientsize = GetClientSize();
......
pcbnew/class_dimension.h
View file @ 45c5e594
...@@ -139,7 +139,7 @@ public: ...@@ -139,7 +139,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) add_dimension_xpm; } virtual BITMAP_DEF GetMenuImage() const { return add_dimension_xpm; }
}; };
#endif // #define DIMENSION_H #endif // #define DIMENSION_H
pcbnew/class_drawsegment.h
View file @ 45c5e594
...@@ -201,7 +201,7 @@ public: ...@@ -201,7 +201,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) add_dashed_line_xpm; } virtual BITMAP_DEF GetMenuImage() const { return add_dashed_line_xpm; }
#if defined(DEBUG) #if defined(DEBUG)
void Show( int nestLevel, std::ostream& os ); void Show( int nestLevel, std::ostream& os );
......
pcbnew/class_edge_mod.h
View file @ 45c5e594
...@@ -69,7 +69,7 @@ public: ...@@ -69,7 +69,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) show_mod_edge_xpm; } virtual BITMAP_DEF GetMenuImage() const { return show_mod_edge_xpm; }
#if defined(DEBUG) #if defined(DEBUG)
......
pcbnew/class_marker_pcb.h
View file @ 45c5e594
...@@ -117,7 +117,7 @@ public: ...@@ -117,7 +117,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) drc_xpm; } virtual BITMAP_DEF GetMenuImage() const { return drc_xpm; }
}; };
......
pcbnew/class_mire.h
View file @ 45c5e594
...@@ -92,7 +92,7 @@ public: ...@@ -92,7 +92,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) add_mires_xpm; } virtual BITMAP_DEF GetMenuImage() const { return add_mires_xpm; }
}; };
......
pcbnew/class_module.h
View file @ 45c5e594
...@@ -335,7 +335,7 @@ public: ...@@ -335,7 +335,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) module_xpm; } virtual BITMAP_DEF GetMenuImage() const { return module_xpm; }
#if defined(DEBUG) #if defined(DEBUG)
......
pcbnew/class_pad.h
View file @ 45c5e594
...@@ -369,7 +369,7 @@ public: ...@@ -369,7 +369,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) pad_xpm; } virtual BITMAP_DEF GetMenuImage() const { return pad_xpm; }
/** /**
* Function ShowPadShape * Function ShowPadShape
......
pcbnew/class_pcb_text.h
View file @ 45c5e594
...@@ -133,7 +133,7 @@ public: ...@@ -133,7 +133,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) add_text_xpm; } virtual BITMAP_DEF GetMenuImage() const { return add_text_xpm; }
#if defined(DEBUG) #if defined(DEBUG)
/** /**
......
pcbnew/class_text_mod.h
View file @ 45c5e594
...@@ -160,7 +160,7 @@ public: TEXTE_MODULE( MODULE* parent, int text_type = TEXT_is_DIVERS ); ...@@ -160,7 +160,7 @@ public: TEXTE_MODULE( MODULE* parent, int text_type = TEXT_is_DIVERS );
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) footprint_text_xpm; } virtual BITMAP_DEF GetMenuImage() const { return footprint_text_xpm; }
#if defined(DEBUG) #if defined(DEBUG)
......
pcbnew/class_track.h
View file @ 45c5e594
...@@ -288,7 +288,7 @@ public: ...@@ -288,7 +288,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) showtrack_xpm; } virtual BITMAP_DEF GetMenuImage() const { return showtrack_xpm; }
#if defined (DEBUG) #if defined (DEBUG)
...@@ -333,7 +333,7 @@ public: ...@@ -333,7 +333,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) add_zone_xpm; } virtual BITMAP_DEF GetMenuImage() const { return add_zone_xpm; }
}; };
...@@ -390,7 +390,7 @@ public: ...@@ -390,7 +390,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) via_sketch_xpm; } virtual BITMAP_DEF GetMenuImage() const { return via_sketch_xpm; }
#if defined (DEBUG) #if defined (DEBUG)
......
pcbnew/class_zone.h
View file @ 45c5e594
...@@ -431,7 +431,7 @@ public: ...@@ -431,7 +431,7 @@ public:
virtual wxString GetSelectMenuText() const; virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) add_zone_xpm; } virtual BITMAP_DEF GetMenuImage() const { return add_zone_xpm; }
}; };
......
pcbnew/controle.cpp
View file @ 45c5e594
...@@ -192,13 +192,12 @@ BOARD_ITEM* PCB_BASE_FRAME::PcbGeneralLocateAndDisplay( int aHotKeyCode ) ...@@ -192,13 +192,12 @@ BOARD_ITEM* PCB_BASE_FRAME::PcbGeneralLocateAndDisplay( int aHotKeyCode )
for( int i = 0; i<limit; ++i ) for( int i = 0; i<limit; ++i )
{ {
wxString text; wxString text;
const char** xpm;
item = (*m_Collector)[i]; item = (*m_Collector)[i];
text = item->GetSelectMenuText(); text = item->GetSelectMenuText();
xpm = item->GetMenuImage();
BITMAP_DEF xpm = item->GetMenuImage();
ADD_MENUITEM( &itemMenu, ID_POPUP_PCB_ITEM_SELECTION_START + i, text, xpm ); ADD_MENUITEM( &itemMenu, ID_POPUP_PCB_ITEM_SELECTION_START + i, text, xpm );
} }
......
pcbnew/export_vrml.cpp
View file @ 45c5e594
...@@ -759,26 +759,29 @@ static void export_vrml_tracks( BOARD* pcb ) /*{{{*/ ...@@ -759,26 +759,29 @@ static void export_vrml_tracks( BOARD* pcb ) /*{{{*/
} }
static void export_vrml_zones( BOARD* pcb ) /*{{{*/ /* not used? @todo complete
static void export_vrml_zones( BOARD* pcb )
{ {
/* Export fill segments */ // Export fill segments
for( SEGZONE* segzone = pcb->m_Zone; for( SEGZONE* segzone = pcb->m_Zone;
segzone != 0; segzone != 0;
segzone = segzone->Next() ) segzone = segzone->Next() )
{ {
/* Fill tracks are exported with low subdivisions */ // Fill tracks are exported with low subdivisions
if( segzone->Type() == TYPE_ZONE ) if( segzone->Type() == TYPE_ZONE )
export_vrml_line( segzone->GetLayer(), segzone->m_Start.x, segzone->m_Start.y, export_vrml_line( segzone->GetLayer(), segzone->m_Start.x, segzone->m_Start.y,
segzone->m_End.x, segzone->m_End.y, segzone->m_Width, 1 ); segzone->m_End.x, segzone->m_End.y, segzone->m_Width, 1 );
} }
/* Export zone outlines */ // Export zone outlines
for( int i = 0; i < pcb->GetAreaCount(); i++ ) for( int i = 0; i < pcb->GetAreaCount(); i++ )
{ {
ZONE_CONTAINER* zone = pcb->GetArea( i ); ZONE_CONTAINER* zone = pcb->GetArea( i );
if( ( zone->m_FilledPolysList.size() == 0 ) if( ( zone->m_FilledPolysList.size() == 0 )
||( zone->m_ZoneMinThickness <= 1 ) ) ||( zone->m_ZoneMinThickness <= 1 ) )
continue; continue;
int width = zone->m_ZoneMinThickness; int width = zone->m_ZoneMinThickness;
if( width > 0 ) if( width > 0 )
{ {
...@@ -786,7 +789,8 @@ static void export_vrml_zones( BOARD* pcb ) /*{{{*/ ...@@ -786,7 +789,8 @@ static void export_vrml_zones( BOARD* pcb ) /*{{{*/
int layer = zone->GetLayer(); int layer = zone->GetLayer();
CPolyPt* firstcorner = &zone->m_FilledPolysList[0]; CPolyPt* firstcorner = &zone->m_FilledPolysList[0];
CPolyPt* begincorner = firstcorner; CPolyPt* begincorner = firstcorner;
/* I'm not really positive about what he's doing here... */
// I'm not really positive about what he's doing here...
for( int ic = 1; ic <= imax; ic++ ) for( int ic = 1; ic <= imax; ic++ )
{ {
CPolyPt* endcorner = &zone->m_FilledPolysList[ic]; CPolyPt* endcorner = &zone->m_FilledPolysList[ic];
...@@ -799,7 +803,8 @@ static void export_vrml_zones( BOARD* pcb ) /*{{{*/ ...@@ -799,7 +803,8 @@ static void export_vrml_zones( BOARD* pcb ) /*{{{*/
export_vrml_line( layer, endcorner->x, endcorner->y, export_vrml_line( layer, endcorner->x, endcorner->y,
firstcorner->x, firstcorner->y, width, 1 ); firstcorner->x, firstcorner->y, width, 1 );
ic++; ic++;
/* A new contour? */
// A new contour?
if( ic < imax - 1 ) if( ic < imax - 1 )
begincorner = firstcorner = &zone->m_FilledPolysList[ic]; begincorner = firstcorner = &zone->m_FilledPolysList[ic];
} }
...@@ -809,7 +814,7 @@ static void export_vrml_zones( BOARD* pcb ) /*{{{*/ ...@@ -809,7 +814,7 @@ static void export_vrml_zones( BOARD* pcb ) /*{{{*/
} }
} }
} }
*/
static void export_vrml_text_module( TEXTE_MODULE* module ) /*{{{*/ static void export_vrml_text_module( TEXTE_MODULE* module ) /*{{{*/
{ {
......
pcbnew/menubar_pcbframe.cpp
View file @ 45c5e594
...@@ -206,14 +206,14 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() ...@@ -206,14 +206,14 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
item = new wxMenuItem( filesMenu, wxID_PRINT, item = new wxMenuItem( filesMenu, wxID_PRINT,
_( "&Print\tCtrl+P" ), _( "&Print\tCtrl+P" ),
_( "Print board" ) ); _( "Print board" ) );
SET_BITMAP( print_button ); SET_BITMAP( print_button_xpm );
filesMenu->Append( item ); filesMenu->Append( item );
// Create SVG file // Create SVG file
item = new wxMenuItem( filesMenu, ID_GEN_PLOT_SVG, item = new wxMenuItem( filesMenu, ID_GEN_PLOT_SVG,
_( "Print S&VG" ), _( "Print S&VG" ),
_( "Plot board in Scalable Vector Graphics format" ) ); _( "Plot board in Scalable Vector Graphics format" ) );
SET_BITMAP( print_button ); SET_BITMAP( print_button_xpm );
filesMenu->Append( item ); filesMenu->Append( item );
// Plot // Plot
......
pcbnew/modedit.cpp
View file @ 45c5e594
...@@ -92,8 +92,8 @@ BOARD_ITEM* FOOTPRINT_EDIT_FRAME::ModeditLocateAndDisplay( int aHotKeyCode ) ...@@ -92,8 +92,8 @@ BOARD_ITEM* FOOTPRINT_EDIT_FRAME::ModeditLocateAndDisplay( int aHotKeyCode )
for( int ii = 0; ii<limit; ++ii ) for( int ii = 0; ii<limit; ++ii )
{ {
wxString text; wxString text;
const char** xpm; BITMAP_DEF xpm;
item = (*m_Collector)[ii]; item = (*m_Collector)[ii];
......
pcbnew/modedit_onclick.cpp
View file @ 45c5e594
...@@ -224,10 +224,10 @@ bool FOOTPRINT_EDIT_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopMen ...@@ -224,10 +224,10 @@ bool FOOTPRINT_EDIT_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopMen
copyblock_xpm ); copyblock_xpm );
ADD_MENUITEM( PopMenu, ID_POPUP_MIRROR_X_BLOCK, ADD_MENUITEM( PopMenu, ID_POPUP_MIRROR_X_BLOCK,
_( "Mirror Block (alt + drag mouse)" ), _( "Mirror Block (alt + drag mouse)" ),
mirror_H_xpm ); mirror_h_xpm );
ADD_MENUITEM( PopMenu, ID_POPUP_ROTATE_BLOCK, ADD_MENUITEM( PopMenu, ID_POPUP_ROTATE_BLOCK,
_( "Rotate Block (ctrl + drag mouse)" ), _( "Rotate Block (ctrl + drag mouse)" ),
rotate_CCW_xpm ); rotate_ccw_xpm );
ADD_MENUITEM( PopMenu, ID_POPUP_DELETE_BLOCK, ADD_MENUITEM( PopMenu, ID_POPUP_DELETE_BLOCK,
_( "Delete Block (shift+ctrl + drag mouse)" ), _( "Delete Block (shift+ctrl + drag mouse)" ),
delete_xpm ); delete_xpm );
...@@ -254,7 +254,7 @@ bool FOOTPRINT_EDIT_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopMen ...@@ -254,7 +254,7 @@ bool FOOTPRINT_EDIT_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopMen
wxMenu* transform_choice = new wxMenu; wxMenu* transform_choice = new wxMenu;
ADD_MENUITEM( transform_choice, ID_MODEDIT_MODULE_ROTATE, _( "Rotate" ), ADD_MENUITEM( transform_choice, ID_MODEDIT_MODULE_ROTATE, _( "Rotate" ),
rotate_module_pos_xpm ); rotate_module_pos_xpm );
ADD_MENUITEM( transform_choice, ID_MODEDIT_MODULE_MIRROR, _( "Mirror" ), mirror_H_xpm ); ADD_MENUITEM( transform_choice, ID_MODEDIT_MODULE_MIRROR, _( "Mirror" ), mirror_h_xpm );
msg = AddHotkeyName( _( "Edit Module" ), g_Module_Editor_Hokeys_Descr, HK_EDIT_ITEM ); msg = AddHotkeyName( _( "Edit Module" ), g_Module_Editor_Hokeys_Descr, HK_EDIT_ITEM );
ADD_MENUITEM( PopMenu, ID_POPUP_PCB_EDIT_MODULE, msg, edit_module_xpm ); ADD_MENUITEM( PopMenu, ID_POPUP_PCB_EDIT_MODULE, msg, edit_module_xpm );
ADD_MENUITEM_WITH_SUBMENU( PopMenu, transform_choice, ID_MODEDIT_TRANSFORM_MODULE, ADD_MENUITEM_WITH_SUBMENU( PopMenu, transform_choice, ID_MODEDIT_TRANSFORM_MODULE,
......
pcbnew/onrightclick.cpp
View file @ 45c5e594
...@@ -379,7 +379,7 @@ void PCB_EDIT_FRAME::createPopUpBlockMenu( wxMenu* menu ) ...@@ -379,7 +379,7 @@ void PCB_EDIT_FRAME::createPopUpBlockMenu( wxMenu* menu )
ADD_MENUITEM( menu, ID_POPUP_PLACE_BLOCK, _( "Place Block" ), apply_xpm ); ADD_MENUITEM( menu, ID_POPUP_PLACE_BLOCK, _( "Place Block" ), apply_xpm );
ADD_MENUITEM( menu, ID_POPUP_COPY_BLOCK, _( "Copy Block" ), copyblock_xpm ); ADD_MENUITEM( menu, ID_POPUP_COPY_BLOCK, _( "Copy Block" ), copyblock_xpm );
ADD_MENUITEM( menu, ID_POPUP_FLIP_BLOCK, _( "Flip Block" ), invert_module_xpm ); ADD_MENUITEM( menu, ID_POPUP_FLIP_BLOCK, _( "Flip Block" ), invert_module_xpm );
ADD_MENUITEM( menu, ID_POPUP_ROTATE_BLOCK, _( "Rotate Block" ), rotate_CCW_xpm ); ADD_MENUITEM( menu, ID_POPUP_ROTATE_BLOCK, _( "Rotate Block" ), rotate_ccw_xpm );
ADD_MENUITEM( menu, ID_POPUP_DELETE_BLOCK, _( "Delete Block" ), delete_xpm ); ADD_MENUITEM( menu, ID_POPUP_DELETE_BLOCK, _( "Delete Block" ), delete_xpm );
} }
...@@ -577,7 +577,7 @@ void PCB_EDIT_FRAME::createPopUpMenuForZones( ZONE_CONTAINER* edge_zone, wxMenu* ...@@ -577,7 +577,7 @@ void PCB_EDIT_FRAME::createPopUpMenuForZones( ZONE_CONTAINER* edge_zone, wxMenu*
_( "Add Similar Zone" ), add_zone_xpm ); _( "Add Similar Zone" ), add_zone_xpm );
ADD_MENUITEM( zones_menu, ID_POPUP_PCB_ZONE_ADD_CUTOUT_ZONE, ADD_MENUITEM( zones_menu, ID_POPUP_PCB_ZONE_ADD_CUTOUT_ZONE,
_( "Add Cutout Area" ), add_zone_cutout ); _( "Add Cutout Area" ), add_zone_cutout_xpm );
zones_menu->AppendSeparator(); zones_menu->AppendSeparator();
ADD_MENUITEM( zones_menu, ID_POPUP_PCB_FILL_ZONE, _( "Fill Zone" ), fill_zone_xpm ); ADD_MENUITEM( zones_menu, ID_POPUP_PCB_FILL_ZONE, _( "Fill Zone" ), fill_zone_xpm );
...@@ -780,7 +780,7 @@ void PCB_EDIT_FRAME::createPopUpMenuForTexts( TEXTE_PCB* Text, wxMenu* menu ) ...@@ -780,7 +780,7 @@ void PCB_EDIT_FRAME::createPopUpMenuForTexts( TEXTE_PCB* Text, wxMenu* menu )
msg, move_text_xpm ); msg, move_text_xpm );
} }
msg = AddHotkeyName( _( "Rotate" ), g_Board_Editor_Hokeys_Descr, HK_ROTATE_ITEM ); msg = AddHotkeyName( _( "Rotate" ), g_Board_Editor_Hokeys_Descr, HK_ROTATE_ITEM );
ADD_MENUITEM( sub_menu_Text, ID_POPUP_PCB_ROTATE_TEXTEPCB, msg, rotate_CCW_xpm ); ADD_MENUITEM( sub_menu_Text, ID_POPUP_PCB_ROTATE_TEXTEPCB, msg, rotate_ccw_xpm );
msg = AddHotkeyName( _( "Edit" ), g_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM ); msg = AddHotkeyName( _( "Edit" ), g_Board_Editor_Hokeys_Descr, HK_EDIT_ITEM );
ADD_MENUITEM( sub_menu_Text, ID_POPUP_PCB_EDIT_TEXTEPCB, msg, edit_text_xpm ); ADD_MENUITEM( sub_menu_Text, ID_POPUP_PCB_EDIT_TEXTEPCB, msg, edit_text_xpm );
ADD_MENUITEM( sub_menu_Text, ID_POPUP_PCB_RESET_TEXT_SIZE, ADD_MENUITEM( sub_menu_Text, ID_POPUP_PCB_RESET_TEXT_SIZE,
......
pcbnew/tool_modedit.cpp
View file @ 45c5e594
...@@ -85,7 +85,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateHToolbar() ...@@ -85,7 +85,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateHToolbar()
_( "Module properties" ) ); _( "Module properties" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( wxID_PRINT, wxEmptyString, KiBitmap( print_button ), m_HToolBar->AddTool( wxID_PRINT, wxEmptyString, KiBitmap( print_button_xpm ),
_( "Print module" ) ); _( "Print module" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
......
pcbnew/tool_pcb.cpp
View file @ 45c5e594
...@@ -207,11 +207,11 @@ void PCB_EDIT_FRAME::ReCreateHToolbar() ...@@ -207,11 +207,11 @@ void PCB_EDIT_FRAME::ReCreateHToolbar()
_( "Open module editor" ) ); _( "Open module editor" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( wxID_CUT, wxEmptyString, KiBitmap( cut_button ), m_HToolBar->AddTool( wxID_CUT, wxEmptyString, KiBitmap( cut_button_xpm ),
_( "Cut selected item" ) ); _( "Cut selected item" ) );
#if 0 #if 0
m_HToolBar->AddTool( wxID_COPY, wxEmptyString, KiBitmap( copy_button ), m_HToolBar->AddTool( wxID_COPY, wxEmptyString, KiBitmap( copy_button_xpm ),
_( "Copy selected item" ) ); _( "Copy selected item" ) );
m_HToolBar->AddTool( wxID_PASTE, wxEmptyString, KiBitmap( paste_xpm ), m_HToolBar->AddTool( wxID_PASTE, wxEmptyString, KiBitmap( paste_xpm ),
...@@ -225,7 +225,7 @@ void PCB_EDIT_FRAME::ReCreateHToolbar() ...@@ -225,7 +225,7 @@ void PCB_EDIT_FRAME::ReCreateHToolbar()
m_HToolBar->AddTool( wxID_REDO, wxEmptyString, KiBitmap( redo_xpm ), HELP_REDO ); m_HToolBar->AddTool( wxID_REDO, wxEmptyString, KiBitmap( redo_xpm ), HELP_REDO );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( wxID_PRINT, wxEmptyString, KiBitmap( print_button ), m_HToolBar->AddTool( wxID_PRINT, wxEmptyString, KiBitmap( print_button_xpm ),
_( "Print board" ) ); _( "Print board" ) );
m_HToolBar->AddTool( ID_GEN_PLOT, wxEmptyString, KiBitmap( plot_xpm ), m_HToolBar->AddTool( ID_GEN_PLOT, wxEmptyString, KiBitmap( plot_xpm ),
_( "Plot (HPGL, PostScript, or GERBER format)" ) ); _( "Plot (HPGL, PostScript, or GERBER format)" ) );
...@@ -460,26 +460,26 @@ void PCB_EDIT_FRAME::ReCreateMicrowaveVToolbar() ...@@ -460,26 +460,26 @@ void PCB_EDIT_FRAME::ReCreateMicrowaveVToolbar()
// Set up toolbar // Set up toolbar
m_AuxVToolBar->AddTool( ID_PCB_MUWAVE_TOOL_SELF_CMD, wxEmptyString, m_AuxVToolBar->AddTool( ID_PCB_MUWAVE_TOOL_SELF_CMD, wxEmptyString,
KiBitmap( mw_Add_Line_xpm ), KiBitmap( mw_add_line_xpm ),
_( "Create line of specified length for microwave applications" ) ); _( "Create line of specified length for microwave applications" ) );
m_AuxVToolBar->AddTool( ID_PCB_MUWAVE_TOOL_GAP_CMD, wxEmptyString, m_AuxVToolBar->AddTool( ID_PCB_MUWAVE_TOOL_GAP_CMD, wxEmptyString,
KiBitmap( mw_Add_Gap_xpm ), KiBitmap( mw_add_gap_xpm ),
_( "Create gap of specified length for microwave applications" ) ); _( "Create gap of specified length for microwave applications" ) );
m_AuxVToolBar->AddSeparator(); m_AuxVToolBar->AddSeparator();
m_AuxVToolBar->AddTool( ID_PCB_MUWAVE_TOOL_STUB_CMD, wxEmptyString, m_AuxVToolBar->AddTool( ID_PCB_MUWAVE_TOOL_STUB_CMD, wxEmptyString,
KiBitmap( mw_Add_Stub_xpm ), KiBitmap( mw_add_stub_xpm ),
_( "Create stub of specified length for microwave applications" ) ); _( "Create stub of specified length for microwave applications" ) );
m_AuxVToolBar->AddTool( ID_PCB_MUWAVE_TOOL_STUB_ARC_CMD, wxEmptyString, m_AuxVToolBar->AddTool( ID_PCB_MUWAVE_TOOL_STUB_ARC_CMD, wxEmptyString,
KiBitmap( mw_Add_stub_arc_xpm ), KiBitmap( mw_add_stub_arc_xpm ),
_( "Create stub (arc) of specified length for microwave applications" ) _( "Create stub (arc) of specified length for microwave applications" )
); );
m_AuxVToolBar->AddTool( ID_PCB_MUWAVE_TOOL_FUNCTION_SHAPE_CMD, wxEmptyString, m_AuxVToolBar->AddTool( ID_PCB_MUWAVE_TOOL_FUNCTION_SHAPE_CMD, wxEmptyString,
KiBitmap( mw_Add_Shape_xpm ), KiBitmap( mw_add_shape_xpm ),
_( "Create a polynomial shape for microwave applications" ) ); _( "Create a polynomial shape for microwave applications" ) );
m_AuxVToolBar->Realize(); m_AuxVToolBar->Realize();
......
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