Skip to content

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

go to bitmap filenames which match the embedded bitmap variable name, i.e. lowercase

parent 82d5ed1e
Hide whitespace changes
Inline Side-by-side
Showing with 13 additions and 13 deletions
bitmaps/CMakeLists.txt → bitmaps/cmakelists.txt
View file @ da2442fe
...@@ -12,11 +12,10 @@ ...@@ -12,11 +12,10 @@
# Dick: use this one instead: # Dick: use this one instead:
set(BITMAP_SRCS set(BITMAP_SRCS
3d.xpm 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
...@@ -390,6 +389,7 @@ set(BITMAP_SRCS ...@@ -390,6 +389,7 @@ set(BITMAP_SRCS
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
tool_ratsnet.xpm tool_ratsnet.xpm
tools.xpm tools.xpm
Track_Locked.xpm Track_Locked.xpm
......
bitmaps/3d.xpm → bitmaps/three_d.xpm
View file @ da2442fe
/* XPM */ /* XPM */
#ifndef XPMMAIN #ifndef XPMMAIN
extern const char *show_3d_xpm[]; extern const char *three_d_xpm[];
#else #else
const char *show_3d_xpm[] = { const char *three_d_xpm[] = {
/* columns rows colors const chars-per-pixel */ /* columns rows colors const chars-per-pixel */
"16 15 3 1", "16 15 3 1",
"J c #FF0000", "J c #FF0000",
......
common/dialog_about/AboutDialog_main.cpp
View file @ da2442fe
...@@ -269,9 +269,9 @@ static void InitKiCadAboutNew( AboutAppInfo& info ) ...@@ -269,9 +269,9 @@ static void InitKiCadAboutNew( AboutAppInfo& info )
info.AddArtist( new Contributor( wxT( "Iñigo Zuluagaz" ), wxT( "inigo_zuluaga@yahoo.es" ), info.AddArtist( new Contributor( wxT( "Iñigo Zuluagaz" ), wxT( "inigo_zuluaga@yahoo.es" ),
wxT( "Icons by" ), KiBitmapNew( edit_module_xpm ) ) ); wxT( "Icons by" ), KiBitmapNew( edit_module_xpm ) ) );
info.AddArtist( new Contributor( wxT( "Renie Marquet" ), wxT( "reniemarquet@uol.com.br" ), info.AddArtist( new Contributor( wxT( "Renie Marquet" ), wxT( "reniemarquet@uol.com.br" ),
wxT( "3D modules by" ), KiBitmapNew( show_3d_xpm ) ) ); wxT( "3D modules by" ), KiBitmapNew( three_d_xpm ) ) );
info.AddArtist( new Contributor( wxT( "Christophe Boschat" ), wxT( "nox454@hotmail.fr" ), info.AddArtist( new Contributor( wxT( "Christophe Boschat" ), wxT( "nox454@hotmail.fr" ),
wxT( "3D modules by" ), KiBitmapNew( show_3d_xpm ) ) ); wxT( "3D modules by" ), KiBitmapNew( three_d_xpm ) ) );
} }
......
cvpcb/class_DisplayFootprintsFrame.cpp
View file @ da2442fe
...@@ -217,7 +217,7 @@ void DISPLAY_FOOTPRINTS_FRAME::ReCreateHToolbar() ...@@ -217,7 +217,7 @@ void DISPLAY_FOOTPRINTS_FRAME::ReCreateHToolbar()
_( "Zoom auto (Home)" ) ); _( "Zoom auto (Home)" ) );
m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_CVPCB_SHOW3D_FRAME, wxEmptyString, KiBitmap( show_3d_xpm ), m_HToolBar->AddTool( ID_CVPCB_SHOW3D_FRAME, wxEmptyString, KiBitmap( three_d_xpm ),
_( "3D Display" ) ); _( "3D Display" ) );
// after adding the buttons to the toolbar, must call Realize() to reflect // after adding the buttons to the toolbar, must call Realize() to reflect
......
include/bitmaps.h
View file @ da2442fe
...@@ -418,7 +418,6 @@ extern const char* select_grid_xpm[]; ...@@ -418,7 +418,6 @@ extern const char* select_grid_xpm[];
extern const char* select_layer_pair_xpm[]; extern const char* select_layer_pair_xpm[];
extern const char* select_w_layer_xpm[]; extern const char* select_w_layer_xpm[];
extern const char* sheetset_xpm[]; extern const char* sheetset_xpm[];
extern const char* show_3d_xpm[];
extern const char* show_dcodenumber_xpm[]; extern const char* show_dcodenumber_xpm[];
extern const char* show_footprint_xpm[]; extern const char* show_footprint_xpm[];
extern const char* show_mod_edge_xpm[]; extern const char* show_mod_edge_xpm[];
...@@ -428,6 +427,7 @@ extern const char* show_zone_disable_xpm[]; ...@@ -428,6 +427,7 @@ extern const char* show_zone_disable_xpm[];
extern const char* show_zone_outline_only_xpm[]; extern const char* show_zone_outline_only_xpm[];
extern const char* swap_layer_xpm[]; extern const char* swap_layer_xpm[];
extern const char* text_sketch_xpm[]; extern const char* text_sketch_xpm[];
extern const char* three_d_xpm[];
extern const char* tool_ratsnet_xpm[]; extern const char* tool_ratsnet_xpm[];
extern const char* tools_xpm[]; extern const char* tools_xpm[];
extern const char* track_locked_xpm[]; extern const char* track_locked_xpm[];
......
pcbnew/menubar_modedit.cpp
View file @ da2442fe
...@@ -237,7 +237,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar() ...@@ -237,7 +237,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateMenuBar()
ID_MENU_PCB_SHOW_3D_FRAME, ID_MENU_PCB_SHOW_3D_FRAME,
_( "3D View" ), _( "3D View" ),
_( "Show board in 3D viewer" ) ); _( "Show board in 3D viewer" ) );
SET_BITMAP( show_3d_xpm ); SET_BITMAP( three_d_xpm );
viewMenu->Append( item ); viewMenu->Append( item );
// Menu Place: // Menu Place:
......
pcbnew/menubar_pcbframe.cpp
View file @ da2442fe
...@@ -186,7 +186,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() ...@@ -186,7 +186,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
item = new wxMenuItem( submenuexport, ID_GEN_EXPORT_FILE_VRML, item = new wxMenuItem( submenuexport, ID_GEN_EXPORT_FILE_VRML,
_( "&VRML" ), _( "&VRML" ),
_( "Export a VRML board representation" ) ); _( "Export a VRML board representation" ) );
SET_BITMAP( show_3d_xpm ); SET_BITMAP( three_d_xpm );
submenuexport->Append( item ); submenuexport->Append( item );
ADD_MENUITEM_WITH_HELP_AND_SUBMENU( filesMenu, submenuexport, ADD_MENUITEM_WITH_HELP_AND_SUBMENU( filesMenu, submenuexport,
...@@ -379,7 +379,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar() ...@@ -379,7 +379,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
item = new wxMenuItem( viewMenu, ID_MENU_PCB_SHOW_3D_FRAME, item = new wxMenuItem( viewMenu, ID_MENU_PCB_SHOW_3D_FRAME,
_( "3D Display" ), _( "3D Display" ),
_( "Show board in 3D viewer" ) ); _( "Show board in 3D viewer" ) );
SET_BITMAP( show_3d_xpm ); SET_BITMAP( three_d_xpm );
viewMenu->Append( item ); viewMenu->Append( item );
// List Nets // List Nets
......
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