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
Expand all Show 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
m_reloadRequest = false;
// Give it an icon
SetIcon( wxICON( icon_w3d ) );
SetIcon( wxICON( icon_3d ) );
GetSettings();
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()
m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_TOOL_SCREENCOPY_TOCLIBBOARD, wxEmptyString,
KiBitmap( copy_button ),
KiBitmap( copy_button_xpm ),
_( "Copy 3D Image to Clipboard" ) );
#endif
......@@ -51,29 +51,29 @@ void EDA_3D_FRAME::ReCreateHToolbar()
m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_ROTATE3D_X_NEG, wxEmptyString,
KiBitmap( rotate_neg_X_xpm ),
KiBitmap( rotate_neg_x_xpm ),
_( "Rotate X <-" ) );
m_HToolBar->AddTool( ID_ROTATE3D_X_POS, wxEmptyString,
KiBitmap( rotate_pos_X_xpm ),
KiBitmap( rotate_pos_x_xpm ),
_( "Rotate X ->" ) );
m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_ROTATE3D_Y_NEG, wxEmptyString,
KiBitmap( rotate_neg_Y_xpm ),
KiBitmap( rotate_neg_y_xpm ),
_( "Rotate Y <-" ) );
m_HToolBar->AddTool( ID_ROTATE3D_Y_POS, wxEmptyString,
KiBitmap( rotate_pos_Y_xpm ),
KiBitmap( rotate_pos_y_xpm ),
_( "Rotate Y ->" ) );
m_HToolBar->AddSeparator();
m_HToolBar->AddTool( ID_ROTATE3D_Z_NEG, wxEmptyString,
KiBitmap( rotate_neg_Z_xpm ),
KiBitmap( rotate_neg_z_xpm ),
_( "Rotate Z <-" ) );
m_HToolBar->AddTool( ID_ROTATE3D_Z_POS, wxEmptyString,
KiBitmap( rotate_pos_Z_xpm ),
KiBitmap( rotate_pos_z_xpm ),
_( "Rotate Z ->" ) );
m_HToolBar->AddSeparator();
......
bitmaps/add_arc.xpm
View file @ 45c5e594
/* XPM */
#include "bitmaps.h"
#ifndef XPMMAIN
extern const char *add_arc_xpm[];
......
bitmaps/add_zone_cutout.xpm
View file @ 45c5e594
/* XPM */
#ifndef XPMMAIN
extern const char *add_zone_cutout[];
extern const char *add_zone_cutout_xpm[];
#else
const char * add_zone_cutout[] = {
const char * add_zone_cutout_xpm[] = {
"16 16 3 1",
" c None",
". c #007D00",
......
bitmaps/copy.xpm → bitmaps/copy_button.xpm
View file @ 45c5e594
/* XPM */
#ifndef XPMMAIN
extern const char *copy_button[];
extern const char *copy_button_xpm[];
#else
const char *copy_button[] = {
const char *copy_button_xpm[] = {
/* columns rows colors const chars-per-pixel */
"16 15 4 1",
" c None",
......
bitmaps/copycomponent.xpm
View file @ 45c5e594
/* XPM */
const char *copyComponent_xpm[] = {
const char *copycomponent_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 16 1",
"; c #DC4149",
......
bitmaps/cut.xpm → bitmaps/cut_button.xpm
View file @ 45c5e594
/* XPM */
#ifndef XPMMAIN
extern const char *cut_button[];
extern const char *cut_button_xpm[];
#else
const char *cut_button[] = {
const char *cut_button_xpm[] = {
/* columns rows colors const chars-per-pixel */
"16 15 3 1",
" c None",
......
bitmaps/icon_3d.xpm
View file @ 45c5e594
/* XPM */
#ifndef XPMMAIN
extern const char * icon_w3d_xpm[];
extern const char * icon_3d_xpm[];
#else
const char * icon_w3d_xpm[] =
const char * icon_3d_xpm[] =
{
"32 32 3 1",
"J c #FF0000",
......
bitmaps/icon_kicad.xpm
View file @ 45c5e594
/* XPM */
#ifndef XPMMAIN
extern const char *kicad_icon_xpm[];
extern const char *icon_kicad_xpm[];
#else
const char * kicad_icon_xpm[] =
const char * icon_kicad_xpm[] =
{
"32 32 16 1",
" c none",
......
bitmaps/mirror_h.xpm
View file @ 45c5e594
/* XPM */
#ifndef XPMMAIN
extern const char *mirror_H_xpm[];
extern const char *mirror_h_xpm[];
#else
const char * mirror_H_xpm[] = {
const char * mirror_h_xpm[] = {
"16 16 29 1",
" c None",
". c #000000",
......
bitmaps/mirror_v.xpm
View file @ 45c5e594
/* XPM */
#ifndef XPMMAIN
extern const char *mirror_V_xpm[];
extern const char *mirror_v_xpm[];
#else
const char * mirror_V_xpm[] = {
const char * mirror_v_xpm[] = {
"16 16 30 1",
" c None",
". c #000000",
......
bitmaps/mw_add_gap.xpm
View file @ 45c5e594
/* XPM */
#ifndef XPMMAIN
extern const char* mw_Add_Gap_xpm[];
extern const char* mw_add_gap_xpm[];
#else
const char * mw_Add_Gap_xpm[] = {
const char * mw_add_gap_xpm[] = {
"16 16 13 1",
" c None",
". c #D72E2E",
......
bitmaps/mw_add_line.xpm
View file @ 45c5e594
/* XPM */
#ifndef XPMMAIN
extern const char* mw_Add_Line_xpm[];
extern const char* mw_add_line_xpm[];
#else
const char * mw_Add_Line_xpm[] = {
const char * mw_add_line_xpm[] = {
"16 16 6 1",
" c None",
". c #D72E2E",
......
bitmaps/mw_add_shape.xpm
View file @ 45c5e594
/* XPM */
#ifndef XPMMAIN
extern const char* mw_Add_Shape_xpm[];
extern const char* mw_add_shape_xpm[];
#else
const char * mw_Add_Shape_xpm[] = {
const char * mw_add_shape_xpm[] = {
"16 16 21 1",
" c None",
". c #D72E2E",
......
bitmaps/mw_add_stub.xpm
View file @ 45c5e594
/* XPM */
#ifndef XPMMAIN
extern const char* mw_Add_Stub_xpm[];
extern const char* mw_add_stub_xpm[];
#else
const char * mw_Add_Stub_xpm[] = {
const char * mw_add_stub_xpm[] = {
"16 16 14 1",
" c None",
". c #D72E2E",
......
bitmaps/mw_add_stub_arc.xpm
View file @ 45c5e594
/* XPM */
#ifndef XPMMAIN
extern const char* mw_Add_stub_arc_xpm[];
extern const char* mw_add_stub_arc_xpm[];
#else
const char * mw_Add_stub_arc_xpm[] = {
const char * mw_add_stub_arc_xpm[] = {
"16 16 55 1",
" c None",
". c #000000",
......
bitmaps/noconn.xpm
View file @ 45c5e594
/* XPM */
#ifndef XPMMAIN
extern const char *noconn_button[];
extern const char *noconn_xpm[];
#else
const char *noconn_button[] = {
const char *noconn_xpm[] = {
/* columns rows colors const chars-per-pixel */
"16 15 2 1",
" c None",
......
bitmaps/plot_hpg.xpm
View file @ 45c5e594
/* XPM */
#ifndef XPMMAIN
extern const char *plot_HPG_xpm[];
extern const char *plot_hpg_xpm[];
#else
const char * plot_HPG_xpm[] = {
const char * plot_hpg_xpm[] = {
"16 16 17 1",
" c None",
". c #000000",
......
bitmaps/plot_ps.xpm
View file @ 45c5e594
/* XPM */
#ifndef XPMMAIN
extern const char *plot_PS_xpm[];
extern const char *plot_ps_xpm[];
#else
const char * plot_PS_xpm[] = {
const char * plot_ps_xpm[] = {
"16 16 14 1",
" c None",
"! c black",
......
bitmaps/print.xpm → bitmaps/print_button.xpm
View file @ 45c5e594
/* XPM */
#ifndef XPMMAIN
extern const char *print_button[];
extern const char *print_button_xpm[];
#else
const char *print_button[] = {
const char *print_button_xpm[] = {
/* columns rows colors const chars-per-pixel */
"16 15 5 1",
" c None",
......
bitmaps/rotate_ccw.xpm
View file @ 45c5e594
/* XPM */
const char *rotate_CCW_xpm[] = {
const char *rotate_ccw_xpm[] = {
"16 16 93 2",
" c None",
". c #202020",
......
bitmaps/rotate_cw.xpm
View file @ 45c5e594
/* XPM */
const char *rotate_CW_xpm[] = {
const char *rotate_cw_xpm[] = {
"16 16 96 2",
" c None",
". c #000000",
......
bitmaps/rotate_neg_x.xpm
View file @ 45c5e594
/* XPM */
#ifndef XPMMAIN
extern const char *rotate_neg_X_xpm[];
extern const char *rotate_neg_x_xpm[];
#else
const char *rotate_neg_X_xpm[] = {
const char *rotate_neg_x_xpm[] = {
/* width height num_colors const chars_per_pixel */
" 16 15 4 1",
/* colors */
......
bitmaps/rotate_neg_y.xpm
View file @ 45c5e594
/* XPM */
#ifndef XPMMAIN
extern const char *rotate_neg_Y_xpm[];
extern const char *rotate_neg_y_xpm[];
#else
const char *rotate_neg_Y_xpm[] = {
const char *rotate_neg_y_xpm[] = {
/* width height num_colors const chars_per_pixel */
" 16 15 4 1",
/* colors */
......
bitmaps/rotate_neg_z.xpm
View file @ 45c5e594
/* XPM */
#ifndef XPMMAIN
extern const char *rotate_neg_Z_xpm[];
extern const char *rotate_neg_z_xpm[];
#else
const char *rotate_neg_Z_xpm[] = {
const char *rotate_neg_z_xpm[] = {
/* width height num_colors const chars_per_pixel */
" 16 15 4 1",
/* colors */
......
bitmaps/rotate_pos_x.xpm
View file @ 45c5e594
/* XPM */
#ifndef XPMMAIN
extern const char *rotate_pos_X_xpm[];
extern const char *rotate_pos_x_xpm[];
#else
const char *rotate_pos_X_xpm[] = {
const char *rotate_pos_x_xpm[] = {
/* width height num_colors const chars_per_pixel */
" 16 15 4 1",
/* colors */
......
bitmaps/rotate_pos_y.xpm
View file @ 45c5e594
/* XPM */
#ifndef XPMMAIN
extern const char *rotate_pos_Y_xpm[];
extern const char *rotate_pos_y_xpm[];
#else
const char *rotate_pos_Y_xpm[] = {
const char *rotate_pos_y_xpm[] = {
/* width height num_colors const chars_per_pixel */
" 16 15 4 1",
/* colors */
......
bitmaps/rotate_pos_z.xpm
View file @ 45c5e594
/* XPM */
#ifndef XPMMAIN
extern const char *rotate_pos_Z_xpm[];
extern const char *rotate_pos_z_xpm[];
#else
const char *rotate_pos_Z_xpm[] = {
const char *rotate_pos_z_xpm[] = {
/* width height num_colors const chars_per_pixel */
" 16 15 4 1",
/* colors */
......
common/basicframe.cpp
View file @ 45c5e594
......@@ -367,7 +367,7 @@ void EDA_BASE_FRAME::AddHelpVersionInfoMenuEntry( wxMenu* aMenu )
ADD_MENUITEM_WITH_HELP( aMenu, ID_HELP_COPY_VERSION_STRING,
_( "Copy &Version Information" ),
_( "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 @@
#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 );
}
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 );
}
......@@ -51,12 +51,12 @@ wxBitmap* KiBitmapNew( const BITMAP_DEF& aBitmap )
// temporary during migration to PNG. Soon the argument to these calls becomes the
// opaque BITMAP_DEF&.
wxBitmap KiBitmap( const BITMAP_DEF& aBitmap )
wxBitmap KiBitmap( BITMAP_DEF aBitmap )
{
return wxBitmap( aBitmap );
}
wxBitmap* KiBitmapNew( const BITMAP_DEF& aBitmap )
wxBitmap* KiBitmapNew( BITMAP_DEF aBitmap )
{
return new wxBitmap( aBitmap );
}
......
common/dialog_about/AboutDialog_main.cpp
View file @ 45c5e594
......@@ -16,7 +16,7 @@
* lang_xx_xpm[]; // Icons of various national flags
* show_3d_xpm[]; // 3D icon
* edit_module_xpm[];
* kicad_icon_xpm[]; // Icon of the application
* icon_kicad_xpm[]; // Icon of the application
*/
#include "bitmaps.h"
#include "wxstruct.h"
......@@ -40,13 +40,20 @@ static wxString HtmlNewline( const unsigned int amount = 1 );
*/
static void InitKiCadAboutNew( AboutAppInfo& info )
{
/* Set application specific icon */
// Set application specific icon
const wxTopLevelWindow * const tlw = wxDynamicCast(::wxGetApp().GetTopWindow(), wxTopLevelWindow);
if( tlw )
info.SetIcon( tlw->GetIcon() );
else
info.SetIcon( kicad_icon_xpm );
{
wxBitmap bitmap = KiBitmap( icon_kicad_xpm );
wxIcon icon;
icon.CopyFromBitmap( bitmap );
info.SetIcon( icon );
}
/* Set title */
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
for( int i = 0; i < m_collectedItems.GetCount() && i < MAX_SELECT_ITEM_IDS; i++ )
{
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 );
}
......
eeschema/dialogs/dialog_erc.cpp
View file @ 45c5e594
......@@ -348,7 +348,7 @@ void DIALOG_ERC::ChangeErrorLevel( wxCommandEvent& event )
{
int id, level, ii, x, y;
wxBitmapButton* Butt;
const char** new_bitmap_xpm = NULL;
BITMAP_DEF new_bitmap_xpm = NULL;
wxPoint pos;
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 )
void DIALOG_LIB_EDIT_PIN::SetOrientationList( const wxArrayString& list,
const char*** aBitmaps )
const BITMAP_DEF* aBitmaps )
{
for ( unsigned ii = 0; ii < list.GetCount(); ii++ )
{
......@@ -153,7 +153,7 @@ void DIALOG_LIB_EDIT_PIN::SetOrientationList( 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++ )
{
......@@ -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++ )
{
......
eeschema/dialogs/dialog_lib_edit_pin.h
View file @ 45c5e594
......@@ -30,14 +30,14 @@ public:
void OnPaintShowPanel( wxPaintEvent& 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 )
{
m_choiceOrientation->SetSelection( orientation );
}
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 )
{
m_choiceElectricalType->SetSelection( type );
......@@ -47,7 +47,7 @@ public:
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 ); }
int GetStyle( void ) { return m_choiceStyle->GetSelection(); }
......
eeschema/lib_arc.h
View file @ 45c5e594
......@@ -121,7 +121,7 @@ public:
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:
virtual EDA_ITEM* doClone() const;
......
eeschema/lib_circle.h
View file @ 45c5e594
......@@ -89,7 +89,7 @@ public:
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:
virtual EDA_ITEM* doClone() const;
......
eeschema/lib_field.h
View file @ 45c5e594
......@@ -221,7 +221,7 @@ public:
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:
virtual EDA_ITEM* doClone() const;
......
eeschema/lib_pin.cpp
View file @ 45c5e594
......@@ -37,7 +37,7 @@ static const wxString pin_orientation_names[] =
// bitmaps to show pins orientations in dialog editor
// 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_left_xpm,
......@@ -73,7 +73,7 @@ static const wxString pin_style_names[] =
// bitmaps to show pins shapes in dialog editor
// 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_invert_xpm,
......@@ -121,7 +121,7 @@ static const wxString pin_electrical_type_names[] =
// bitmaps to show pins electrical type in dialog editor
// 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_output_xpm,
......@@ -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;
}
const char*** LIB_PIN::GetOrientationSymbols()
const BITMAP_DEF* LIB_PIN::GetOrientationSymbols()
{
return s_icons_Pins_Orientations;
}
const char*** LIB_PIN::GetStyleSymbols()
const BITMAP_DEF* LIB_PIN::GetStyleSymbols()
{
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];
}
......
eeschema/lib_pin.h
View file @ 45c5e594
......@@ -386,7 +386,7 @@ public:
*
* @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.
......@@ -418,7 +418,7 @@ public:
*
* @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.
......@@ -450,9 +450,9 @@ public:
*
* @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;
......
eeschema/lib_polyline.h
View file @ 45c5e594
......@@ -107,7 +107,7 @@ public:
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:
virtual EDA_ITEM* doClone() const;
......
eeschema/lib_rectangle.h
View file @ 45c5e594
......@@ -95,7 +95,7 @@ public:
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:
virtual EDA_ITEM* doClone() const;
......
eeschema/lib_text.h
View file @ 45c5e594
......@@ -119,7 +119,7 @@ public:
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:
virtual EDA_ITEM* doClone() const;
......
eeschema/libedit_onrightclick.cpp
View file @ 45c5e594
......@@ -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_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_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_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_ROTATE_BLOCK, _( "Rotate Block ccw" ), rotate_ccw_xpm );
ADD_MENUITEM( PopMenu, ID_POPUP_DELETE_BLOCK, _( "Delete Block" ), delete_xpm );
}
}
eeschema/libeditframe.cpp
View file @ 45c5e594
......@@ -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++ )
{
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 );
}
......
eeschema/menubar.cpp
View file @ 45c5e594
......@@ -111,7 +111,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
wxID_PRINT,
_( "P&rint" ),
_( "Print schematic" ),
print_button );
print_button_xpm );
// Plot submenu
wxMenu* choice_plot_fmt = new wxMenu;
......@@ -120,14 +120,14 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
ADD_MENUITEM_WITH_HELP( choice_plot_fmt, ID_GEN_PLOT_PS,
_( "Plot PostScript" ),
_( "Plot schematic sheet in PostScript format" ),
plot_PS_xpm );
plot_ps_xpm );
// Plot HPGL
ADD_MENUITEM_WITH_HELP( choice_plot_fmt,
ID_GEN_PLOT_HPGL,
_( "Plot HPGL" ),
_( "Plot schematic sheet in HPGL format" ),
plot_HPG_xpm );
plot_hpg_xpm );
// Plot SVG
ADD_MENUITEM_WITH_HELP( choice_plot_fmt,
......@@ -149,7 +149,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
ADD_MENUITEM_WITH_HELP( choice_plot_fmt, ID_GEN_COPY_SHEET_TO_CLIPBOARD,
_( "Plot to Clipboard" ),
_( "Export drawings to clipboard" ),
copy_button );
copy_button_xpm );
#endif // __WINDOWS__
......@@ -309,7 +309,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
text = AddHotkeyName( _( "No connect flag" ), s_Schematic_Hokeys_Descr,
HK_ADD_NOCONN_FLAG, false ); // add comment, not a shortcut
ADD_MENUITEM_WITH_HELP( placeMenu, ID_NOCONN_BUTT, text, HELP_PLACE_NC_FLAG,
noconn_button );
noconn_xpm );
// Net name
text = AddHotkeyName( _( "Label" ), s_Schematic_Hokeys_Descr,
......
eeschema/onrightclick.cpp
View file @ 45c5e594
......@@ -248,12 +248,12 @@ void AddMenusForComponent( wxMenu* PopMenu, SCH_COMPONENT* Component )
wxMenu* orientmenu = new wxMenu;
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_CLOCKWISE, _( "Rotate -" ), rotate_CW_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 );
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 );
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 );
ADD_MENUITEM( orientmenu, ID_POPUP_SCH_ORIENT_NORMAL_CMP, msg, normal_xpm );
ADD_MENUITEM_WITH_SUBMENU( PopMenu, orientmenu, ID_POPUP_SCH_GENERIC_ORIENT_CMP,
......@@ -312,7 +312,7 @@ void AddMenusForComponent( wxMenu* PopMenu, SCH_COMPONENT* Component )
{
msg = AddHotkeyName( _( "Copy Component" ), s_Schematic_Hokeys_Descr,
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 );
ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DELETE_CMP, msg, delete_xpm );
}
......@@ -337,7 +337,7 @@ void AddMenusForGLabel( wxMenu* PopMenu, SCH_GLOBALLABEL* GLabel )
ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DRAG_CMP_REQUEST, msg, move_text_xpm );
msg = AddHotkeyName( _( "Copy Global Label" ), s_Schematic_Hokeys_Descr,
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 );
......@@ -374,7 +374,7 @@ void AddMenusForHLabel( wxMenu* PopMenu, SCH_HIERLABEL* HLabel )
ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DRAG_CMP_REQUEST, msg, move_text_xpm );
msg = AddHotkeyName( _( "Copy Hierarchical Label" ), s_Schematic_Hokeys_Descr,
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 );
ADD_MENUITEM( PopMenu, ID_POPUP_SCH_ROTATE_TEXT, msg, rotate_glabel_xpm );
......@@ -410,10 +410,10 @@ void AddMenusForLabel( wxMenu* PopMenu, SCH_LABEL* Label )
ADD_MENUITEM( PopMenu, ID_POPUP_SCH_DRAG_CMP_REQUEST, msg, move_text_xpm );
msg = AddHotkeyName( _( "Copy Label" ), s_Schematic_Hokeys_Descr,
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 );
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 );
ADD_MENUITEM( PopMenu, ID_POPUP_SCH_EDIT_TEXT, msg, edit_text_xpm );
msg = AddHotkeyName( _( "Delete Label" ), s_Schematic_Hokeys_Descr, HK_DELETE );
......@@ -443,11 +443,11 @@ void AddMenusForText( wxMenu* PopMenu, SCH_TEXT* Text )
ADD_MENUITEM( PopMenu, ID_POPUP_SCH_MOVE_ITEM, msg, move_text_xpm );
msg = AddHotkeyName( _( "Copy Text" ), s_Schematic_Hokeys_Descr,
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 );
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 );
ADD_MENUITEM( PopMenu, ID_POPUP_SCH_EDIT_TEXT, msg, edit_text_xpm );
msg = AddHotkeyName( _( "Delete Text" ), s_Schematic_Hokeys_Descr, HK_DELETE );
......@@ -642,20 +642,20 @@ void AddMenusForBlock( wxMenu* PopMenu, SCH_EDIT_FRAME* frame )
// a block function.
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 );
msg = AddHotkeyName( _( "Drag Block" ), s_Schematic_Hokeys_Descr,
HK_MOVEBLOCK_TO_DRAGBLOCK );
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_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_ROTATE_BLOCK, _( "Rotate Block ccw" ), rotate_CCW_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_ROTATE_BLOCK, _( "Rotate Block ccw" ), rotate_ccw_xpm );
#if 0
#ifdef __WINDOWS__
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
}
......
eeschema/sch_bus_entry.h
View file @ 45c5e594
......@@ -109,7 +109,7 @@ public:
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:
virtual bool doHitTest( const wxPoint& aPoint, int aAccuracy ) const;
......
eeschema/sch_component.h
View file @ 45c5e594
......@@ -381,7 +381,7 @@ public:
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;
......
eeschema/sch_field.cpp
View file @ 45c5e594
......@@ -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 )
return (const char**) edit_comp_ref_xpm;
return edit_comp_ref_xpm;
if( m_FieldId == VALUE )
return (const char**) edit_comp_value_xpm;
return edit_comp_value_xpm;
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:
virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const;
virtual BITMAP_DEF GetMenuImage() const;
private:
virtual bool doHitTest( const wxPoint& aPoint, int aAccuracy ) const;
......
eeschema/sch_junction.h
View file @ 45c5e594
......@@ -93,7 +93,7 @@ public:
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)
void Show( int nestLevel, std::ostream& os );
......
eeschema/sch_line.cpp
View file @ 45c5e594
......@@ -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 )
return (const char**) add_dashed_line_xpm;
return add_dashed_line_xpm;
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:
virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const;
virtual BITMAP_DEF GetMenuImage() const;
virtual bool operator <( const SCH_ITEM& aItem ) const;
......
eeschema/sch_marker.h
View file @ 45c5e594
......@@ -99,7 +99,7 @@ public:
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)
void Show( int nestLevel, std::ostream& os );
......
eeschema/sch_no_connect.h
View file @ 45c5e594
......@@ -96,7 +96,7 @@ public:
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:
virtual bool doIsConnected( const wxPoint& aPosition ) const;
......
eeschema/sch_polyline.cpp
View file @ 45c5e594
......@@ -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 )
return (const char**) add_dashed_line_xpm;
return add_dashed_line_xpm;
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:
virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const;
virtual BITMAP_DEF GetMenuImage() const;
private:
virtual bool doHitTest( const wxPoint& aPoint, int aAccuracy ) const;
......
eeschema/sch_sheet.h
View file @ 45c5e594
......@@ -194,7 +194,7 @@ public:
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:
virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const
{
return (const char**) add_hierarchical_subsheet_xpm;
}
virtual BITMAP_DEF GetMenuImage() const { return add_hierarchical_subsheet_xpm; }
#if defined(DEBUG)
......
eeschema/sch_text.h
View file @ 45c5e594
......@@ -204,7 +204,7 @@ public:
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)
void Show( int nestLevel, std::ostream& os );
......@@ -299,7 +299,7 @@ public:
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:
virtual bool doHitTest( const wxPoint& aPoint, int aAccuracy ) const;
......@@ -403,7 +403,7 @@ public:
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:
virtual bool doHitTest( const wxPoint& aPoint, int aAccuracy ) const;
......@@ -509,7 +509,7 @@ public:
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:
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()
_( "Load component to edit from the current lib" ) );
m_HToolBar->AddTool( ID_LIBEDIT_NEW_PART_FROM_EXISTING, wxEmptyString,
KiBitmap( copyComponent_xpm ),
KiBitmap( copycomponent_xpm ),
_( "Create a new component from the current one" ) );
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()
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" ) );
m_HToolBar->AddTool( wxID_COPY, wxEmptyString, KiBitmap( copy_button ),
m_HToolBar->AddTool( wxID_COPY, wxEmptyString, KiBitmap( copy_button_xpm ),
_( "Copy selected item" ) );
m_HToolBar->AddTool( wxID_PASTE, wxEmptyString, KiBitmap( paste_xpm ),
......@@ -71,7 +71,7 @@ void SCH_EDIT_FRAME::ReCreateHToolbar()
m_HToolBar->AddTool( wxID_REDO, wxEmptyString, KiBitmap( redo_xpm ), msg );
m_HToolBar->AddSeparator();
m_HToolBar->AddTool( wxID_PRINT, wxEmptyString, KiBitmap( print_button ),
m_HToolBar->AddTool( wxID_PRINT, wxEmptyString, KiBitmap( print_button_xpm ),
_( "Print schematic" ) );
m_HToolBar->AddSeparator();
......@@ -154,7 +154,7 @@ void SCH_EDIT_FRAME::ReCreateVToolbar()
m_VToolBar->AddTool( ID_BUSTOBUS_ENTRY_BUTT, wxEmptyString, KiBitmap( add_bus2bus_xpm ),
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 );
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 )
wxID_PRINT,
_( "P&rint" ),
_( "Print gerber" ),
print_button );
print_button_xpm );
// Separator
fileMenu->AppendSeparator();
......
gerbview/toolbars_gerber.cpp
View file @ 45c5e594
......@@ -38,7 +38,7 @@ void GERBVIEW_FRAME::ReCreateHToolbar( void )
_( "Load an excellon drill file on the current layer. Previous data will be deleted" ) );
m_HToolBar->AddSeparator();
m_HToolBar->AddTool( wxID_PRINT, wxEmptyString, wxBitmap( print_button ),
m_HToolBar->AddTool( wxID_PRINT, wxEmptyString, wxBitmap( print_button_xpm ),
_( "Print layers" ) );
m_HToolBar->AddSeparator();
......
include/base_struct.h
View file @ 45c5e594
......@@ -575,7 +575,7 @@ public:
* images.
* @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.
......
include/bitmaps.h
View file @ 45c5e594
This diff is collapsed.
kicad/commandframe.cpp
View file @ 45c5e594
......@@ -84,11 +84,11 @@ void RIGHT_KM_FRAME::CreateCommandToolbar( void )
btn = AddBitmapButton( ID_TO_GERBVIEW, KiBitmap( icon_gerbview_xpm ) );
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\
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" ) );
}
......
kicad/mainframe.cpp
View file @ 45c5e594
......@@ -50,11 +50,11 @@ KICAD_MANAGER_FRAME::KICAD_MANAGER_FRAME( wxWindow* parent,
SetStatusWidths( 3, dims );
// Give an icon
#ifdef __WINDOWS__
#ifdef __WINDOWS__
SetIcon( wxICON( a_kicad_icon ) );
#else
SetIcon( wxICON( kicad_icon ) );
#endif
#else
SetIcon( wxICON( icon_kicad ) );
#endif
clientsize = GetClientSize();
......
pcbnew/class_dimension.h
View file @ 45c5e594
......@@ -139,7 +139,7 @@ public:
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
pcbnew/class_drawsegment.h
View file @ 45c5e594
......@@ -201,7 +201,7 @@ public:
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)
void Show( int nestLevel, std::ostream& os );
......
pcbnew/class_edge_mod.h
View file @ 45c5e594
......@@ -69,7 +69,7 @@ public:
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)
......
pcbnew/class_marker_pcb.h
View file @ 45c5e594
......@@ -117,7 +117,7 @@ public:
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:
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:
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)
......
pcbnew/class_pad.h
View file @ 45c5e594
......@@ -369,7 +369,7 @@ public:
virtual wxString GetSelectMenuText() const;
virtual const char** GetMenuImage() const { return (const char**) pad_xpm; }
virtual BITMAP_DEF GetMenuImage() const { return pad_xpm; }
/**
* Function ShowPadShape
......
pcbnew/class_pcb_text.h
View file @ 45c5e594
......@@ -133,7 +133,7 @@ public:
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)
/**
......
pcbnew/class_text_mod.h
View file @ 45c5e594
......@@ -160,7 +160,7 @@ public: TEXTE_MODULE( MODULE* parent, int text_type = TEXT_is_DIVERS );
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)
......
pcbnew/class_track.h
View file @ 45c5e594
......@@ -288,7 +288,7 @@ public:
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)
......@@ -333,7 +333,7 @@ public:
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:
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)
......
pcbnew/class_zone.h
View file @ 45c5e594
......@@ -431,7 +431,7 @@ public:
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
......@@ -193,12 +193,11 @@ BOARD_ITEM* PCB_BASE_FRAME::PcbGeneralLocateAndDisplay( int aHotKeyCode )
for( int i = 0; i<limit; ++i )
{
wxString text;
const char** xpm;
item = (*m_Collector)[i];
text = item->GetSelectMenuText();
xpm = item->GetMenuImage();
BITMAP_DEF xpm = item->GetMenuImage();
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 ) /*{{{*/
}
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;
segzone != 0;
segzone = segzone->Next() )
{
/* Fill tracks are exported with low subdivisions */
// Fill tracks are exported with low subdivisions
if( segzone->Type() == TYPE_ZONE )
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 );
}
/* Export zone outlines */
// Export zone outlines
for( int i = 0; i < pcb->GetAreaCount(); i++ )
{
ZONE_CONTAINER* zone = pcb->GetArea( i );
if( ( zone->m_FilledPolysList.size() == 0 )
||( zone->m_ZoneMinThickness <= 1 ) )
continue;
int width = zone->m_ZoneMinThickness;
if( width > 0 )
{
......@@ -786,7 +789,8 @@ static void export_vrml_zones( BOARD* pcb ) /*{{{*/
int layer = zone->GetLayer();
CPolyPt* firstcorner = &zone->m_FilledPolysList[0];
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++ )
{
CPolyPt* endcorner = &zone->m_FilledPolysList[ic];
......@@ -799,7 +803,8 @@ static void export_vrml_zones( BOARD* pcb ) /*{{{*/
export_vrml_line( layer, endcorner->x, endcorner->y,
firstcorner->x, firstcorner->y, width, 1 );
ic++;
/* A new contour? */
// A new contour?
if( ic < imax - 1 )
begincorner = firstcorner = &zone->m_FilledPolysList[ic];
}
......@@ -809,7 +814,7 @@ static void export_vrml_zones( BOARD* pcb ) /*{{{*/
}
}
}
*/
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()
item = new wxMenuItem( filesMenu, wxID_PRINT,
_( "&Print\tCtrl+P" ),
_( "Print board" ) );
SET_BITMAP( print_button );
SET_BITMAP( print_button_xpm );
filesMenu->Append( item );
// Create SVG file
item = new wxMenuItem( filesMenu, ID_GEN_PLOT_SVG,
_( "Print S&VG" ),
_( "Plot board in Scalable Vector Graphics format" ) );
SET_BITMAP( print_button );
SET_BITMAP( print_button_xpm );
filesMenu->Append( item );
// Plot
......
pcbnew/modedit.cpp
View file @ 45c5e594
......@@ -93,7 +93,7 @@ BOARD_ITEM* FOOTPRINT_EDIT_FRAME::ModeditLocateAndDisplay( int aHotKeyCode )
for( int ii = 0; ii<limit; ++ii )
{
wxString text;
const char** xpm;
BITMAP_DEF xpm;
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
copyblock_xpm );
ADD_MENUITEM( PopMenu, ID_POPUP_MIRROR_X_BLOCK,
_( "Mirror Block (alt + drag mouse)" ),
mirror_H_xpm );
mirror_h_xpm );
ADD_MENUITEM( PopMenu, ID_POPUP_ROTATE_BLOCK,
_( "Rotate Block (ctrl + drag mouse)" ),
rotate_CCW_xpm );
rotate_ccw_xpm );
ADD_MENUITEM( PopMenu, ID_POPUP_DELETE_BLOCK,
_( "Delete Block (shift+ctrl + drag mouse)" ),
delete_xpm );
......@@ -254,7 +254,7 @@ bool FOOTPRINT_EDIT_FRAME::OnRightClick( const wxPoint& MousePos, wxMenu* PopMen
wxMenu* transform_choice = new wxMenu;
ADD_MENUITEM( transform_choice, ID_MODEDIT_MODULE_ROTATE, _( "Rotate" ),
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 );
ADD_MENUITEM( PopMenu, ID_POPUP_PCB_EDIT_MODULE, msg, edit_module_xpm );
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 )
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_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 );
}
......@@ -577,7 +577,7 @@ void PCB_EDIT_FRAME::createPopUpMenuForZones( ZONE_CONTAINER* edge_zone, wxMenu*
_( "Add Similar Zone" ), add_zone_xpm );
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();
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 )
msg, move_text_xpm );
}
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 );
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,
......
pcbnew/tool_modedit.cpp
View file @ 45c5e594
......@@ -85,7 +85,7 @@ void FOOTPRINT_EDIT_FRAME::ReCreateHToolbar()
_( "Module properties" ) );
m_HToolBar->AddSeparator();
m_HToolBar->AddTool( wxID_PRINT, wxEmptyString, KiBitmap( print_button ),
m_HToolBar->AddTool( wxID_PRINT, wxEmptyString, KiBitmap( print_button_xpm ),
_( "Print module" ) );
m_HToolBar->AddSeparator();
......
pcbnew/tool_pcb.cpp
View file @ 45c5e594
......@@ -207,11 +207,11 @@ void PCB_EDIT_FRAME::ReCreateHToolbar()
_( "Open module editor" ) );
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" ) );
#if 0
m_HToolBar->AddTool( wxID_COPY, wxEmptyString, KiBitmap( copy_button ),
m_HToolBar->AddTool( wxID_COPY, wxEmptyString, KiBitmap( copy_button_xpm ),
_( "Copy selected item" ) );
m_HToolBar->AddTool( wxID_PASTE, wxEmptyString, KiBitmap( paste_xpm ),
......@@ -225,7 +225,7 @@ void PCB_EDIT_FRAME::ReCreateHToolbar()
m_HToolBar->AddTool( wxID_REDO, wxEmptyString, KiBitmap( redo_xpm ), HELP_REDO );
m_HToolBar->AddSeparator();
m_HToolBar->AddTool( wxID_PRINT, wxEmptyString, KiBitmap( print_button ),
m_HToolBar->AddTool( wxID_PRINT, wxEmptyString, KiBitmap( print_button_xpm ),
_( "Print board" ) );
m_HToolBar->AddTool( ID_GEN_PLOT, wxEmptyString, KiBitmap( plot_xpm ),
_( "Plot (HPGL, PostScript, or GERBER format)" ) );
......@@ -460,26 +460,26 @@ void PCB_EDIT_FRAME::ReCreateMicrowaveVToolbar()
// Set up toolbar
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" ) );
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" ) );
m_AuxVToolBar->AddSeparator();
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" ) );
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" )
);
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" ) );
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