Skip to content

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

New icons: fix problems about .ico files (under Window) 

Remove or move old .ico and .pgn files and add new icons (.ico files and .png files) in bitmaps_png/icons and bitmaps_xpm/icons
.png files and .ico are used to build desktop shortcuts
Handle variable size bitmaps in kicad.
parents c1dbe747 3b381cf8
Expand all Show whitespace changes
Inline Side-by-side
Showing with 1332 additions and 1045 deletions
CMakeLists.txt
View file @ 1c412879
...@@ -76,6 +76,11 @@ if(CMAKE_COMPILER_IS_GNUCXX) ...@@ -76,6 +76,11 @@ if(CMAKE_COMPILER_IS_GNUCXX)
# Set default flags for Debug build. # Set default flags for Debug build.
set(CMAKE_C_FLAGS_DEBUG "-Wall -g3 -ggdb3 -DDEBUG") set(CMAKE_C_FLAGS_DEBUG "-Wall -g3 -ggdb3 -DDEBUG")
set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g3 -ggdb3 -DDEBUG") set(CMAKE_CXX_FLAGS_DEBUG "-Wall -g3 -ggdb3 -DDEBUG")
if( USE_PNG_BITMAPS )
#Add -DUSE_PNG_BITMAPS to windres.exe command line
set(CMAKE_RC_COMPILER windres.exe -DUSE_PNG_BITMAPS)
endif( USE_PNG_BITMAPS )
endif(CMAKE_COMPILER_IS_GNUCXX) endif(CMAKE_COMPILER_IS_GNUCXX)
if(wxUSE_UNICODE) if(wxUSE_UNICODE)
......
bitmap2component/bitmap2cmp_gui.cpp
View file @ 1c412879
...@@ -36,8 +36,6 @@ ...@@ -36,8 +36,6 @@
#include "potracelib.h" #include "potracelib.h"
#include "bitmap_io.h" #include "bitmap_io.h"
#include "bitmap2component.xpm"
#include "colors_selection.h" #include "colors_selection.h"
#include "build_version.h" #include "build_version.h"
...@@ -98,11 +96,10 @@ BM2CMP_FRAME::BM2CMP_FRAME() : BM2CMP_FRAME_BASE( NULL ) ...@@ -98,11 +96,10 @@ BM2CMP_FRAME::BM2CMP_FRAME() : BM2CMP_FRAME_BASE( NULL )
m_Config->Read( KEYWORD_LAST_INPUT_FILE, &m_BitmapFileName ); m_Config->Read( KEYWORD_LAST_INPUT_FILE, &m_BitmapFileName );
m_Config->Read( KEYWORD_LAST_OUTPUT_FILE, &m_ConvertedFileName ); m_Config->Read( KEYWORD_LAST_OUTPUT_FILE, &m_ConvertedFileName );
#ifdef __WINDOWS__ // Give an icon
SetIcon( wxICON( bitmap2component_icon ) ); wxIcon icon;
#else icon.CopyFromBitmap( KiBitmap( icon_bitmap2component_xpm ) );
SetIcon( wxICON( bitmap2component ) ); SetIcon( icon );
#endif
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
......
bitmap2component/bitmap2component.rc
View file @ 1c412879
bitmap2component_icon ICON bitmap2component.ico #ifdef USE_PNG_BITMAPS
icon_bitmap2component ICON "../bitmaps_png/icons/icon_bitmap2component.ico"
#else
icon_bitmap2component ICON "../bitmaps_xpm/icons/icon_bitmap2component.ico"
#endif
#include "wx/msw/wx.rc" #include "wx/msw/wx.rc"
bitmap2component/bitmap2component_16x16.xpm deleted 100644 → 0
View file @ c1dbe747
/* XPM */
const char *bitmap2component_16x16_xpm[] = {
/* columns rows colors chars-per-pixel */
"16 16 16 1",
"& c #128B26",
" c #0CFA0C",
"# c #A75104",
"@ c #22204C",
"O c #050304",
"; c #191327",
"X c #054306",
"* c #F27504",
"o c #0C7E0C",
": c #1ACC2E",
"$ c #51280C",
"- c #391E07",
". c #0CBE0C",
"% c #289F55",
"= c #703505",
"+ c #1C563C",
/* pixels */
" . X",
"oooooooooooo .. ",
"oXO+ooooooXO .. ",
"@@#$+%+& XX X",
"OO#*#O#=OX XOOO",
"OO#*=O$-OO;@@@: ",
"OO=OO.%:XOO***$o",
"%:% X. ;***#X",
"ooooo . .o;***#;",
"OO=$OXooOOO###;o",
"OO#*#O#$OOX+o&: ",
"OO#*=O=-OX XOOO",
"&X=;& %% XX X",
"oX;oooooooXO .. ",
"oooooooooooo .. ",
" . X"
};
bitmaps_png/sources/icon_pcbcalculator.svg
View file @ 1c412879
This source diff could not be displayed because it is too large. You can view the blob instead.
bitmaps_xpm/CMakeLists.txt
View file @ 1c412879
...@@ -164,6 +164,8 @@ set(BITMAP_SRCS ...@@ -164,6 +164,8 @@ set(BITMAP_SRCS
icon_kicad.xpm icon_kicad.xpm
icon_modedit.xpm icon_modedit.xpm
icon_pcbnew.xpm icon_pcbnew.xpm
icon_pcbcalculator.xpm
icon_bitmap2component.xpm
icon_txt.xpm icon_txt.xpm
import3d.xpm import3d.xpm
image.xpm image.xpm
......
bitmap2component/bitmap2component.xpm → bitmaps_xpm/icon_bitmap2component.xpm
View file @ 1c412879
/* XPM */ /* XPM */
const char *bitmap2component_xpm[] = { const char *icon_bitmap2component_xpm[] = {
/* columns rows colors chars-per-pixel */ /* columns rows colors chars-per-pixel */
"32 32 16 1", "32 32 16 1",
"@ c #592904", "@ c #592904",
......
bitmaps_xpm/icon_pcbcalculator.xpm 0 → 100644
View file @ 1c412879
/* XPM */
const char *icon_pcbcalculator_xpm[] = {
/* columns rows colors chars-per-pixel */
"32 32 16 1",
"o c #AC9D99",
"= c #6F5A87",
"- c #4242BA",
"& c #7E7EF7",
"# c #37357B",
"; c #9A5753",
"O c #997366",
". c #958280",
"@ c #342D4E",
"X c #B0816B",
" c None",
"$ c #3A1721",
"* c #6258B4",
": c #9C090B",
"+ c #5C433C",
"% c #6E5C55",
/* pixels */
" .XXX. ",
" oXo..OX o ",
" oX.+O.X.+@#$% ooo ",
" oX.+%X%&&&&*@+o o oo ",
" oOO%+.O&&&&&&*= o o ",
" .@@=X%+OX&&&&&&& o o ",
" oXX+@#&&&X%+%X&&&&&&& o o ",
" oOoX=&&&&OX%+OX&&&&&&& o o=$ ",
"O@O.OX..&O.%++OX&&&&&& oooooo-$o",
"+-O.+O.XX.%+++%..&&&& ooo oo--@O",
"@-*XO+++%%+++++%..&& oooo-----#+",
"$--=XO+++++%++++OX. oooo----##@@",
"$---OX..O..XO++++O ooo ---##@@@%",
"@----*OOXOOOXO+++oooo --##@@@@@.",
"%#----------OXO+oooo =#@@@@@@@@o",
".#----------*;Xooooo.X+@@@@@@%$ ",
" $=--------#$:$oooo++.X+@@@$%.+ ",
" +O+#-----$:;;:$. ++++.O+$++..+ ",
" o+O%$#--$::::::$.%++++.O. O..+ ",
" +$$::::::::;.%++++.X %..+ ",
" $:::::::::@O.%++++.X%.%+ ",
" +:::;:::::$..O.++++%.X$%o ",
" o$::+O:::::$O..+X.++++%.X ",
" ;:::Oo:::::+ O..+ X.++++%.X ",
" o$::;oo:::::$ O..+ X.++++%.o ",
" +::X o:::::$ .+$+ X.++oo.X ",
" $:o ;:::::$o %. X.% oOX ",
" +:::::::::o X.OO.X ",
" .::::::::% XXXXo ",
" +::::::$ oo ",
" +:::::o ",
" %$:$. "
};
common/hotkeys_basic.cpp
View file @ 1c412879
...@@ -339,9 +339,12 @@ void DisplayHotkeyList( EDA_DRAW_FRAME* aFrame, ...@@ -339,9 +339,12 @@ void DisplayHotkeyList( EDA_DRAW_FRAME* aFrame,
wxString keyname; wxString keyname;
Ki_HotkeyInfo** List; Ki_HotkeyInfo** List;
wxString msg = _( "<html><body>" ); wxString msg = wxT( "<html><body>" );
msg += wxT( "<H3>");
msg += _("Hotkeys List");
msg += wxT("</H3> <table cellpadding=\"0\">");
msg += _( "<H3>Hotkeys List</H3> <table cellpadding=\"0\">");
for( ; aDescList->m_HK_InfoList != NULL; aDescList++ ) for( ; aDescList->m_HK_InfoList != NULL; aDescList++ )
{ {
List = aDescList->m_HK_InfoList; List = aDescList->m_HK_InfoList;
......
cvpcb/cvframe.cpp
View file @ 1c412879
...@@ -100,11 +100,9 @@ CVPCB_MAINFRAME::CVPCB_MAINFRAME( const wxString& title, long style ) : ...@@ -100,11 +100,9 @@ CVPCB_MAINFRAME::CVPCB_MAINFRAME( const wxString& title, long style ) :
m_DocModulesFileName = DEFAULT_FOOTPRINTS_LIST_FILENAME; m_DocModulesFileName = DEFAULT_FOOTPRINTS_LIST_FILENAME;
// Give an icon // Give an icon
#ifdef __WINDOWS__ wxIcon icon;
SetIcon( wxICON( a_icon_cvpcb ) ); icon.CopyFromBitmap( KiBitmap( icon_cvpcb_xpm ) );
#else SetIcon( icon );
SetIcon( wxICON( icon_cvpcb ) );
#endif
SetAutoLayout( true ); SetAutoLayout( true );
......
cvpcb/cvpcb.rc
View file @ 1c412879
a_icon_cvpcb ICON "cvpcb.ico" #ifdef USE_PNG_BITMAPS
icon_cvpcb ICON "../bitmaps_png/icons/icon_cvpcb.ico"
#else
icon_cvpcb ICON "../bitmaps_xpm/icons/icon_cvpcb.ico"
#endif
#include "wx/msw/wx.rc" #include "wx/msw/wx.rc"
eeschema/eeschema.rc
View file @ 1c412879
a_icon_eeschema ICON eeschema.ico #ifdef USE_PNG_BITMAPS
libsch ICON libedit_icon.ico icon_eeschema ICON "../bitmaps_png/icons/icon_eeschema.ico"
viewlibs ICON viewlibs_icon.ico #else
icon_eeschema ICON "../bitmaps_xpm/icons/icon_eeschema.ico"
#endif
#include "wx/msw/wx.rc" #include "wx/msw/wx.rc"
eeschema/libeditframe.cpp
View file @ 1c412879
...@@ -184,7 +184,7 @@ LIB_EDIT_FRAME::LIB_EDIT_FRAME( SCH_EDIT_FRAME* aParent, ...@@ -184,7 +184,7 @@ LIB_EDIT_FRAME::LIB_EDIT_FRAME( SCH_EDIT_FRAME* aParent,
wxIcon icon; wxIcon icon;
icon.CopyFromBitmap( KiBitmap( libedit_xpm ) ); icon.CopyFromBitmap( KiBitmap( libedit_icon_xpm ) );
SetIcon( icon ); SetIcon( icon );
......
eeschema/schframe.cpp
View file @ 1c412879
...@@ -179,18 +179,16 @@ SCH_EDIT_FRAME::SCH_EDIT_FRAME( wxWindow* father, ...@@ -179,18 +179,16 @@ SCH_EDIT_FRAME::SCH_EDIT_FRAME( wxWindow* father,
CreateScreens(); CreateScreens();
// Give an icon // Give an icon
#ifdef __WINDOWS__ wxIcon icon;
SetIcon( wxICON( a_icon_eeschema ) ); icon.CopyFromBitmap( KiBitmap( icon_eeschema_xpm ) );
#else SetIcon( icon );
SetIcon( wxICON( icon_eeschema ) );
#endif
m_itemToRepeat = NULL; m_itemToRepeat = NULL;
/* Get config */ /* Get config */
LoadSettings(); LoadSettings();
// Internalize grid id to a default value if not found in config or bad: // Initialize grid id to a default value if not found in config or bad:
if( (m_LastGridSizeId <= 0) if( (m_LastGridSizeId <= 0)
|| ( m_LastGridSizeId < (ID_POPUP_GRID_USER - ID_POPUP_GRID_LEVEL_1000) ) ) || ( m_LastGridSizeId < (ID_POPUP_GRID_USER - ID_POPUP_GRID_LEVEL_1000) ) )
m_LastGridSizeId = ID_POPUP_GRID_LEVEL_50 - ID_POPUP_GRID_LEVEL_1000; m_LastGridSizeId = ID_POPUP_GRID_LEVEL_50 - ID_POPUP_GRID_LEVEL_1000;
......
gerbview/export_to_pcbnew.cpp
View file @ 1c412879
...@@ -8,6 +8,7 @@ ...@@ -8,6 +8,7 @@
#include "common.h" #include "common.h"
#include "class_drawpanel.h" #include "class_drawpanel.h"
#include "confirm.h" #include "confirm.h"
#include "macros.h"
#include "kicad_string.h" #include "kicad_string.h"
#include "gestfich.h" #include "gestfich.h"
#include "trigo.h" #include "trigo.h"
...@@ -57,6 +58,7 @@ GBR_TO_PCB_EXPORTER::~GBR_TO_PCB_EXPORTER() ...@@ -57,6 +58,7 @@ GBR_TO_PCB_EXPORTER::~GBR_TO_PCB_EXPORTER()
/* Export data in pcbnew format /* Export data in pcbnew format
* remember Pcbnew uses a Y reversed axis, so we must negate all Y coordinates
*/ */
void GERBVIEW_FRAME::ExportDataInPcbnewFormat( wxCommandEvent& event ) void GERBVIEW_FRAME::ExportDataInPcbnewFormat( wxCommandEvent& event )
{ {
...@@ -260,6 +262,10 @@ void GBR_TO_PCB_EXPORTER::export_non_copper_item( GERBER_DRAW_ITEM* aGbrItem, in ...@@ -260,6 +262,10 @@ void GBR_TO_PCB_EXPORTER::export_non_copper_item( GERBER_DRAW_ITEM* aGbrItem, in
} }
} }
// Reverse Y axis:
NEGATE( drawitem->m_Start.y );
NEGATE( drawitem->m_End.y );
m_pcb->Add( drawitem ); m_pcb->Add( drawitem );
} }
...@@ -291,6 +297,11 @@ void GBR_TO_PCB_EXPORTER::export_segline_copper_item( GERBER_DRAW_ITEM* aGbrItem ...@@ -291,6 +297,11 @@ void GBR_TO_PCB_EXPORTER::export_segline_copper_item( GERBER_DRAW_ITEM* aGbrItem
newtrack->m_Start = aGbrItem->m_Start; newtrack->m_Start = aGbrItem->m_Start;
newtrack->m_End = aGbrItem->m_End; newtrack->m_End = aGbrItem->m_End;
newtrack->m_Width = aGbrItem->m_Size.x; newtrack->m_Width = aGbrItem->m_Size.x;
// Reverse Y axis:
NEGATE( newtrack->m_Start.y );
NEGATE( newtrack->m_End.y );
m_pcb->Add( newtrack ); m_pcb->Add( newtrack );
} }
...@@ -323,6 +334,9 @@ void GBR_TO_PCB_EXPORTER::export_segarc_copper_item( GERBER_DRAW_ITEM* aGbrItem, ...@@ -323,6 +334,9 @@ void GBR_TO_PCB_EXPORTER::export_segarc_copper_item( GERBER_DRAW_ITEM* aGbrItem,
RotatePoint( &curr_end, aGbrItem->m_ArcCentre, rot ); RotatePoint( &curr_end, aGbrItem->m_ArcCentre, rot );
newtrack->m_End = curr_end; newtrack->m_End = curr_end;
newtrack->m_Width = aGbrItem->m_Size.x; newtrack->m_Width = aGbrItem->m_Size.x;
// Reverse Y axis:
NEGATE( newtrack->m_Start.y );
NEGATE( newtrack->m_End.y );
m_pcb->Add( newtrack ); m_pcb->Add( newtrack );
curr_start = curr_end; curr_start = curr_end;
} }
...@@ -333,6 +347,9 @@ void GBR_TO_PCB_EXPORTER::export_segarc_copper_item( GERBER_DRAW_ITEM* aGbrItem, ...@@ -333,6 +347,9 @@ void GBR_TO_PCB_EXPORTER::export_segarc_copper_item( GERBER_DRAW_ITEM* aGbrItem,
newtrack->m_Start = curr_start; newtrack->m_Start = curr_start;
newtrack->m_End = end; newtrack->m_End = end;
newtrack->m_Width = aGbrItem->m_Size.x; newtrack->m_Width = aGbrItem->m_Size.x;
// Reverse Y axis:
NEGATE( newtrack->m_Start.y );
NEGATE( newtrack->m_End.y );
m_pcb->Add( newtrack ); m_pcb->Add( newtrack );
} }
} }
...@@ -352,5 +369,8 @@ void GBR_TO_PCB_EXPORTER::export_flashed_copper_item( GERBER_DRAW_ITEM* aGbrItem ...@@ -352,5 +369,8 @@ void GBR_TO_PCB_EXPORTER::export_flashed_copper_item( GERBER_DRAW_ITEM* aGbrItem
newtrack->SetDrillDefault(); newtrack->SetDrillDefault();
newtrack->m_Start = newtrack->m_End = aGbrItem->m_Start; newtrack->m_Start = newtrack->m_End = aGbrItem->m_Start;
newtrack->m_Width = (aGbrItem->m_Size.x + aGbrItem->m_Size.y) / 2; newtrack->m_Width = (aGbrItem->m_Size.x + aGbrItem->m_Size.y) / 2;
// Reverse Y axis:
NEGATE( newtrack->m_Start.y );
NEGATE( newtrack->m_End.y );
m_pcb->Add( newtrack ); m_pcb->Add( newtrack );
} }
gerbview/gerbview.rc
View file @ 1c412879
a_icon_gerbview ICON "gerbview.ico" #ifdef USE_PNG_BITMAPS
icon_gerbview ICON "../bitmaps_png/icons/icon_gerbview.ico"
#else
icon_gerbview ICON "../bitmaps_xpm/icons/icon_gerbview.ico"
#endif
#include "wx/msw/wx.rc" #include "wx/msw/wx.rc"
gerbview/gerbview_frame.cpp
View file @ 1c412879
...@@ -50,11 +50,9 @@ GERBVIEW_FRAME::GERBVIEW_FRAME( wxWindow* father, ...@@ -50,11 +50,9 @@ GERBVIEW_FRAME::GERBVIEW_FRAME( wxWindow* father,
DrawPanel->m_Block_Enable = true; DrawPanel->m_Block_Enable = true;
// Give an icon // Give an icon
#ifdef __WINDOWS__ wxIcon icon;
SetIcon( wxICON( a_icon_gerbview ) ); icon.CopyFromBitmap( KiBitmap( icon_gerbview_xpm ) );
#else SetIcon( icon );
SetIcon( wxICON( icon_gerbview ) );
#endif
SetScreen( ScreenPcb ); SetScreen( ScreenPcb );
......
include/bitmaps.h
View file @ 1c412879
...@@ -2,7 +2,11 @@ ...@@ -2,7 +2,11 @@
#ifndef BITMAPS_H_ #ifndef BITMAPS_H_
#define BITMAPS_H_ #define BITMAPS_H_
#include <wx/bitmap.h> //FIXME: cannot include only this file in wxWidgets 2.9.3
// test if it works under stable release
// #include <wx/bitmap.h> // only to define wxBitmap
class wxBitmap; // only to define wxBitmap
#include "config.h" #include "config.h"
......
kicad/commandframe.cpp
View file @ 1c412879
...@@ -7,28 +7,30 @@ ...@@ -7,28 +7,30 @@
#include "kicad.h" #include "kicad.h"
#include "../bitmap2component/bitmap2component.xpm"
#include "../pcb_calculator/bitmaps/pcb_calculator.xpm"
RIGHT_KM_FRAME::RIGHT_KM_FRAME( KICAD_MANAGER_FRAME* parent ) : RIGHT_KM_FRAME::RIGHT_KM_FRAME( KICAD_MANAGER_FRAME* parent ) :
wxSashLayoutWindow( parent, wxID_ANY ) wxSashLayoutWindow( parent, wxID_ANY )
{ {
#define BUTTON_HEIGHT 32
m_Parent = parent; m_Parent = parent;
m_DialogWin = NULL; m_MessagesBox = NULL;
m_ButtPanel = new wxPanel( this, wxID_ANY ); m_ButtPanel = new wxPanel( this, wxID_ANY );
m_bitmapButtons_maxHeigth = 0;
m_ButtonSeparation = 10; // control of command buttons position m_ButtonSeparation = 10; // control of command buttons position
m_ButtonsListPosition.x = 10; m_ButtonsListPosition.x = m_ButtonSeparation;
m_ButtonsListPosition.y = 35 + BUTTON_HEIGHT; m_ButtonsListPosition.y = m_ButtonSeparation;
m_ButtonLastPosition = m_ButtonsListPosition; m_ButtonLastPosition = m_ButtonsListPosition;
m_ButtonsPanelHeight = m_ButtonsListPosition.y + 10;
// Add bitmap buttons to launch Kicad utilities:
CreateCommandToolbar(); CreateCommandToolbar();
m_DialogWin = new wxTextCtrl( this, wxID_ANY, wxEmptyString, m_ButtonsPanelHeight = m_ButtonsListPosition.y + m_bitmapButtons_maxHeigth + 10;
// Add the wxTextCtrl showaing all messages from Kicad:
m_MessagesBox = new wxTextCtrl( this, wxID_ANY, wxEmptyString,
wxDefaultPosition, wxDefaultSize, wxDefaultPosition, wxDefaultSize,
wxTE_MULTILINE | wxSUNKEN_BORDER | wxTE_READONLY ); wxTE_MULTILINE | wxSUNKEN_BORDER | wxTE_READONLY );
} }
void RIGHT_KM_FRAME::OnSize( wxSizeEvent& event ) void RIGHT_KM_FRAME::OnSize( wxSizeEvent& event )
{ {
#define EXTRA_MARGE 4 #define EXTRA_MARGE 4
...@@ -36,16 +38,16 @@ void RIGHT_KM_FRAME::OnSize( wxSizeEvent& event ) ...@@ -36,16 +38,16 @@ void RIGHT_KM_FRAME::OnSize( wxSizeEvent& event )
wsize.x -= EXTRA_MARGE; wsize.x -= EXTRA_MARGE;
wsize.y -= m_ButtonsPanelHeight + EXTRA_MARGE; wsize.y -= m_ButtonsPanelHeight + EXTRA_MARGE;
wxPoint wpos; wxPoint wpos;
wpos.x = EXTRA_MARGE/2; wpos.x = EXTRA_MARGE / 2;
wpos.y = m_ButtonsPanelHeight + (EXTRA_MARGE/2); wpos.y = m_ButtonsPanelHeight + (EXTRA_MARGE / 2);
if( m_DialogWin ) if( m_MessagesBox )
{ {
m_DialogWin->SetSize( wsize ); m_MessagesBox->SetSize( wsize );
m_DialogWin->SetPosition(wpos ); m_MessagesBox->SetPosition( wpos );
} }
wpos.y = EXTRA_MARGE/2; wpos.y = EXTRA_MARGE / 2;
m_ButtPanel->SetPosition(wpos ); m_ButtPanel->SetPosition( wpos );
wsize.y -= m_ButtonsPanelHeight - EXTRA_MARGE; wsize.y -= m_ButtonsPanelHeight - EXTRA_MARGE;
m_ButtPanel->SetSize( wsize ); m_ButtPanel->SetSize( wsize );
m_ButtPanel->Refresh(); m_ButtPanel->Refresh();
...@@ -59,14 +61,11 @@ EVT_SIZE( RIGHT_KM_FRAME::OnSize ) ...@@ -59,14 +61,11 @@ EVT_SIZE( RIGHT_KM_FRAME::OnSize )
END_EVENT_TABLE() END_EVENT_TABLE()
/*************************************************/
void RIGHT_KM_FRAME::CreateCommandToolbar( void )
/*************************************************/
/** /**
* Function CreateCommandToolbar * Function CreateCommandToolbar
* create the buttons to call eescheman cvpcb, pcbnew and gerbview * create the buttons to call eescheman cvpcb, pcbnew and gerbview
*/ */
void RIGHT_KM_FRAME::CreateCommandToolbar( void )
{ {
wxBitmapButton* btn; wxBitmapButton* btn;
...@@ -83,7 +82,8 @@ void RIGHT_KM_FRAME::CreateCommandToolbar( void ) ...@@ -83,7 +82,8 @@ void RIGHT_KM_FRAME::CreateCommandToolbar( void )
btn->SetToolTip( _( "GerbView (Gerber viewer)" ) ); btn->SetToolTip( _( "GerbView (Gerber viewer)" ) );
btn = AddBitmapButton( ID_TO_BITMAP_CONVERTER, KiBitmap( icon_bitmap2component_xpm ) ); btn = AddBitmapButton( ID_TO_BITMAP_CONVERTER, KiBitmap( icon_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( icon_pcbcalculator_xpm ) ); btn = AddBitmapButton( ID_TO_PCB_CALCULATOR, KiBitmap( icon_pcbcalculator_xpm ) );
...@@ -97,15 +97,19 @@ Creates a component (for Eeschema) or a footprint (for Pcbnew) that shows a B&W ...@@ -97,15 +97,19 @@ Creates a component (for Eeschema) or a footprint (for Pcbnew) that shows a B&W
* @param aId = the button id * @param aId = the button id
* @param aBitmap = the wxBitmap used to create the button * @param aBitmap = the wxBitmap used to create the button
*/ */
wxBitmapButton* RIGHT_KM_FRAME::AddBitmapButton( wxWindowID aId, const wxBitmap & aBitmap ) wxBitmapButton* RIGHT_KM_FRAME::AddBitmapButton( wxWindowID aId, const wxBitmap& aBitmap )
{ {
wxPoint buttPos = m_ButtonLastPosition; wxPoint buttPos = m_ButtonLastPosition;
wxSize buttSize; wxSize buttSize;
int btn_margin = 10; int btn_margin = 0; // extra margin around the bitmap.
buttSize.x = aBitmap.GetWidth() + btn_margin; buttSize.x = aBitmap.GetWidth() + btn_margin;
buttSize.y = aBitmap.GetHeight() + btn_margin; buttSize.y = aBitmap.GetHeight() + btn_margin;
buttPos.y -= buttSize.y;
wxBitmapButton* btn = new wxBitmapButton( m_ButtPanel, aId, aBitmap, buttPos, buttSize); if( m_bitmapButtons_maxHeigth < buttSize.y )
m_bitmapButtons_maxHeigth = buttSize.y;
wxBitmapButton* btn = new wxBitmapButton( m_ButtPanel, aId, aBitmap, buttPos, buttSize );
m_ButtonLastPosition.x += buttSize.x + m_ButtonSeparation; m_ButtonLastPosition.x += buttSize.x + m_ButtonSeparation;
return btn; return btn;
......
kicad/kicad.h
View file @ 1c412879
...@@ -71,9 +71,7 @@ public: ...@@ -71,9 +71,7 @@ public:
private: private:
int m_LeftWin_Width; int m_LeftWin_Width;
public: public: KICAD_MANAGER_FRAME( wxWindow* parent, const wxString& title,
KICAD_MANAGER_FRAME( wxWindow* parent, const wxString& title,
const wxPoint& pos, const wxSize& size ); const wxPoint& pos, const wxSize& size );
~KICAD_MANAGER_FRAME(); ~KICAD_MANAGER_FRAME();
...@@ -174,9 +172,9 @@ enum TreeFileType { ...@@ -174,9 +172,9 @@ enum TreeFileType {
class RIGHT_KM_FRAME : public wxSashLayoutWindow class RIGHT_KM_FRAME : public wxSashLayoutWindow
{ {
public: public:
wxTextCtrl* m_DialogWin; wxTextCtrl* m_MessagesBox;
private: private:
KICAD_MANAGER_FRAME* m_Parent; KICAD_MANAGER_FRAME* m_Parent; // a wxTextCtrl to displays messages frm Kicad
int m_ButtonsPanelHeight; int m_ButtonsPanelHeight;
wxPanel* m_ButtPanel; wxPanel* m_ButtPanel;
int m_ButtonSeparation; // button distance in pixels int m_ButtonSeparation; // button distance in pixels
...@@ -184,20 +182,22 @@ private: ...@@ -184,20 +182,22 @@ private:
* of the first bitmap button * of the first bitmap button
*/ */
wxPoint m_ButtonLastPosition; // position of the last button in the window wxPoint m_ButtonLastPosition; // position of the last button in the window
int m_bitmapButtons_maxHeigth; // height of bigger bitmap buttons
// Used to calculate the height of the panel.
public: public: RIGHT_KM_FRAME( KICAD_MANAGER_FRAME* parent );
RIGHT_KM_FRAME( KICAD_MANAGER_FRAME* parent );
~RIGHT_KM_FRAME() { }; ~RIGHT_KM_FRAME() { };
void OnSize( wxSizeEvent& event ); void OnSize( wxSizeEvent& event );
private: private:
/** /**
* Function CreateCommandToolbar * Function CreateCommandToolbar
* creates the main tool bar buttons (fast launch buttons) * creates the main tool bar buttons (fast launch buttons)
*/ */
void CreateCommandToolbar( void ); void CreateCommandToolbar( void );
wxBitmapButton* AddBitmapButton( wxWindowID aId, const wxBitmap & aBitmap ); wxBitmapButton* AddBitmapButton( wxWindowID aId, const wxBitmap& aBitmap );
DECLARE_EVENT_TABLE() DECLARE_EVENT_TABLE()
}; };
......
kicad/kicad.rc
View file @ 1c412879
a_kicad_icon ICON kicad.ico #ifdef USE_PNG_BITMAPS
icon_kicad ICON "../bitmaps_png/icons/icon_kicad.ico"
#else
icon_kicad ICON "../bitmaps_xpm/icons/icon_kicad.ico"
#endif
#include "wx/msw/wx.rc" #include "wx/msw/wx.rc"
kicad/mainframe.cpp
View file @ 1c412879
...@@ -48,11 +48,9 @@ KICAD_MANAGER_FRAME::KICAD_MANAGER_FRAME( wxWindow* parent, ...@@ -48,11 +48,9 @@ KICAD_MANAGER_FRAME::KICAD_MANAGER_FRAME( wxWindow* parent,
SetStatusWidths( 3, dims ); SetStatusWidths( 3, dims );
// Give an icon // Give an icon
#ifdef __WINDOWS__ wxIcon icon;
SetIcon( wxICON( a_kicad_icon ) ); icon.CopyFromBitmap( KiBitmap( icon_kicad_xpm ) );
#else SetIcon( icon );
SetIcon( wxICON( icon_kicad ) );
#endif
clientsize = GetClientSize(); clientsize = GetClientSize();
...@@ -105,7 +103,7 @@ KICAD_MANAGER_FRAME::~KICAD_MANAGER_FRAME() ...@@ -105,7 +103,7 @@ KICAD_MANAGER_FRAME::~KICAD_MANAGER_FRAME()
void KICAD_MANAGER_FRAME::PrintMsg( const wxString& aText ) void KICAD_MANAGER_FRAME::PrintMsg( const wxString& aText )
{ {
m_RightWin->m_DialogWin->AppendText( aText ); m_RightWin->m_MessagesBox->AppendText( aText );
} }
...@@ -256,7 +254,7 @@ void KICAD_MANAGER_FRAME::OnRefresh( wxCommandEvent& event ) ...@@ -256,7 +254,7 @@ void KICAD_MANAGER_FRAME::OnRefresh( wxCommandEvent& event )
void KICAD_MANAGER_FRAME::ClearMsg() void KICAD_MANAGER_FRAME::ClearMsg()
{ {
m_RightWin->m_DialogWin->Clear(); m_RightWin->m_MessagesBox->Clear();
} }
......
pcb_calculator/bitmaps/sources/pcb_calculator.svg deleted 100644 → 0
View file @ c1dbe747
This diff is collapsed.
pcb_calculator/pcb_calculator.rc
View file @ 1c412879
pcb_calculator_icon ICON pcb_calculator.ico #ifdef USE_PNG_BITMAPS
icon_pcbcalculator ICON "../bitmaps_png/icons/icon_pcbcalculator.ico"
#else
icon_pcbcalculator ICON "../bitmaps_xpm/icons/icon_pcbcalculator.ico"
#endif
#include "wx/msw/wx.rc" #include "wx/msw/wx.rc"
pcb_calculator/pcb_calculator_frame.cpp
View file @ 1c412879
...@@ -27,7 +27,8 @@ ...@@ -27,7 +27,8 @@
#include "pcb_calculator.h" #include "pcb_calculator.h"
#include "UnitSelector.h" #include "UnitSelector.h"
#include "pcb_calculator.xpm" #include "bitmaps.h"
#define KEYWORD_FRAME_POSX wxT( "Pcb_calculator_Pos_x" ) #define KEYWORD_FRAME_POSX wxT( "Pcb_calculator_Pos_x" )
#define KEYWORD_FRAME_POSY wxT( "Pcb_calculator_Pos_y" ) #define KEYWORD_FRAME_POSY wxT( "Pcb_calculator_Pos_y" )
...@@ -85,11 +86,10 @@ PCB_CALCULATOR_FRAME::PCB_CALCULATOR_FRAME( wxWindow * parent ) : ...@@ -85,11 +86,10 @@ PCB_CALCULATOR_FRAME::PCB_CALCULATOR_FRAME( wxWindow * parent ) :
ElectricalSpacingUpdateData( m_ElectricalSpacingUnitsSelector->GetUnitScale() ); ElectricalSpacingUpdateData( m_ElectricalSpacingUnitsSelector->GetUnitScale() );
#ifdef __WINDOWS__ // Give an icon
SetIcon( wxICON( pcb_calculator_icon ) ); wxIcon icon;
#else icon.CopyFromBitmap( KiBitmap( icon_pcbcalculator_xpm ) );
SetIcon( wxICON( pcb_calculator ) ); SetIcon( icon );
#endif
GetSizer()->SetSizeHints( this ); GetSizer()->SetSizeHints( this );
......
pcbnew/hotkeys.cpp
View file @ 1c412879
...@@ -153,45 +153,45 @@ static Ki_HotkeyInfo HkTrackDisplayMode( wxT( "Track Display Mode" ), ...@@ -153,45 +153,45 @@ static Ki_HotkeyInfo HkTrackDisplayMode( wxT( "Track Display Mode" ),
static Ki_HotkeyInfo HkAddModule( wxT( "Add Module" ), HK_ADD_MODULE, 'O' ); static Ki_HotkeyInfo HkAddModule( wxT( "Add Module" ), HK_ADD_MODULE, 'O' );
/* Record and play macros */ /* Record and play macros */
static Ki_HotkeyInfo HkRecordMacros0( wxT( "Record Macros 0" ), HK_RECORD_MACROS_0, GR_KB_CTRL+'0' ); static Ki_HotkeyInfo HkRecordMacros0( wxT( "Record Macro 0" ), HK_RECORD_MACROS_0, GR_KB_CTRL+'0' );
static Ki_HotkeyInfo HkCallMacros0( wxT( "Call Macross 0" ), HK_CALL_MACROS_0, '0' ); static Ki_HotkeyInfo HkCallMacros0( wxT( "Call Macro 0" ), HK_CALL_MACROS_0, '0' );
static Ki_HotkeyInfo HkRecordMacros1( wxT( "Record Macros 1" ), HK_RECORD_MACROS_1, GR_KB_CTRL+'1' ); static Ki_HotkeyInfo HkRecordMacros1( wxT( "Record Macro 1" ), HK_RECORD_MACROS_1, GR_KB_CTRL+'1' );
static Ki_HotkeyInfo HkCallMacros1( wxT( "Call Macross 1" ), HK_CALL_MACROS_1, '1' ); static Ki_HotkeyInfo HkCallMacros1( wxT( "Call Macro 1" ), HK_CALL_MACROS_1, '1' );
static Ki_HotkeyInfo HkRecordMacros2( wxT( "Record Macros 2" ), HK_RECORD_MACROS_2, GR_KB_CTRL+'2' ); static Ki_HotkeyInfo HkRecordMacros2( wxT( "Record Macro 2" ), HK_RECORD_MACROS_2, GR_KB_CTRL+'2' );
static Ki_HotkeyInfo HkCallMacros2( wxT( "Call Macross 2" ), HK_CALL_MACROS_2, '2' ); static Ki_HotkeyInfo HkCallMacros2( wxT( "Call Macro 2" ), HK_CALL_MACROS_2, '2' );
static Ki_HotkeyInfo HkRecordMacros3( wxT( "Record Macros 3" ), HK_RECORD_MACROS_3, GR_KB_CTRL+'3' ); static Ki_HotkeyInfo HkRecordMacros3( wxT( "Record Macro 3" ), HK_RECORD_MACROS_3, GR_KB_CTRL+'3' );
static Ki_HotkeyInfo HkCallMacros3( wxT( "Call Macross 3" ), HK_CALL_MACROS_3, '3' ); static Ki_HotkeyInfo HkCallMacros3( wxT( "Call Macro 3" ), HK_CALL_MACROS_3, '3' );
static Ki_HotkeyInfo HkRecordMacros4( wxT( "Record Macros 4" ), HK_RECORD_MACROS_4, GR_KB_CTRL+'4' ); static Ki_HotkeyInfo HkRecordMacros4( wxT( "Record Macro 4" ), HK_RECORD_MACROS_4, GR_KB_CTRL+'4' );
static Ki_HotkeyInfo HkCallMacros4( wxT( "Call Macross 4" ), HK_CALL_MACROS_4, '4' ); static Ki_HotkeyInfo HkCallMacros4( wxT( "Call Macro 4" ), HK_CALL_MACROS_4, '4' );
static Ki_HotkeyInfo HkRecordMacros5( wxT( "Record Macros 5" ), HK_RECORD_MACROS_5, GR_KB_CTRL+'5' ); static Ki_HotkeyInfo HkRecordMacros5( wxT( "Record Macro 5" ), HK_RECORD_MACROS_5, GR_KB_CTRL+'5' );
static Ki_HotkeyInfo HkCallMacros5( wxT( "Call Macross 5" ), HK_CALL_MACROS_5, '5' ); static Ki_HotkeyInfo HkCallMacros5( wxT( "Call Macro 5" ), HK_CALL_MACROS_5, '5' );
static Ki_HotkeyInfo HkRecordMacros6( wxT( "Record Macros 6" ), HK_RECORD_MACROS_6, GR_KB_CTRL+'6' ); static Ki_HotkeyInfo HkRecordMacros6( wxT( "Record Macro 6" ), HK_RECORD_MACROS_6, GR_KB_CTRL+'6' );
static Ki_HotkeyInfo HkCallMacros6( wxT( "Call Macross 6" ), HK_CALL_MACROS_6, '6' ); static Ki_HotkeyInfo HkCallMacros6( wxT( "Call Macro 6" ), HK_CALL_MACROS_6, '6' );
static Ki_HotkeyInfo HkRecordMacros7( wxT( "Record Macros 7" ), HK_RECORD_MACROS_7, GR_KB_CTRL+'7' ); static Ki_HotkeyInfo HkRecordMacros7( wxT( "Record Macro 7" ), HK_RECORD_MACROS_7, GR_KB_CTRL+'7' );
static Ki_HotkeyInfo HkCallMacros7( wxT( "Call Macross 7" ), HK_CALL_MACROS_7, '7' ); static Ki_HotkeyInfo HkCallMacros7( wxT( "Call Macro 7" ), HK_CALL_MACROS_7, '7' );
static Ki_HotkeyInfo HkRecordMacros8( wxT( "Record Macros 8" ), HK_RECORD_MACROS_8, GR_KB_CTRL+'8' ); static Ki_HotkeyInfo HkRecordMacros8( wxT( "Record Macro 8" ), HK_RECORD_MACROS_8, GR_KB_CTRL+'8' );
static Ki_HotkeyInfo HkCallMacros8( wxT( "Call Macross 8" ), HK_CALL_MACROS_8, '8' ); static Ki_HotkeyInfo HkCallMacros8( wxT( "Call Macro 8" ), HK_CALL_MACROS_8, '8' );
static Ki_HotkeyInfo HkRecordMacros9( wxT( "Record Macros 9" ), HK_RECORD_MACROS_9, GR_KB_CTRL+'9' ); static Ki_HotkeyInfo HkRecordMacros9( wxT( "Record Macro 9" ), HK_RECORD_MACROS_9, GR_KB_CTRL+'9' );
static Ki_HotkeyInfo HkCallMacros9( wxT( "Call Macross 9" ), HK_CALL_MACROS_9, '9' ); static Ki_HotkeyInfo HkCallMacros9( wxT( "Call Macro 9" ), HK_CALL_MACROS_9, '9' );
// List of common hotkey descriptors // List of common hotkey descriptors
Ki_HotkeyInfo* common_Hotkey_List[] = Ki_HotkeyInfo* common_Hotkey_List[] =
......
pcbnew/moduleframe.cpp
View file @ 1c412879
...@@ -120,7 +120,9 @@ FOOTPRINT_EDIT_FRAME::FOOTPRINT_EDIT_FRAME( wxWindow* father, ...@@ -120,7 +120,9 @@ FOOTPRINT_EDIT_FRAME::FOOTPRINT_EDIT_FRAME( wxWindow* father,
m_HotkeysZoomAndGridList = g_Module_Editor_Hokeys_Descr; m_HotkeysZoomAndGridList = g_Module_Editor_Hokeys_Descr;
// Give an icon // Give an icon
SetIcon( wxICON( icon_modedit ) ); wxIcon icon;
icon.CopyFromBitmap( KiBitmap( icon_modedit_xpm ) );
SetIcon( icon );
UpdateTitle(); UpdateTitle();
......
pcbnew/pcbframe.cpp
View file @ 1c412879
...@@ -307,7 +307,6 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( wxWindow* parent, const wxString& title, ...@@ -307,7 +307,6 @@ PCB_EDIT_FRAME::PCB_EDIT_FRAME( wxWindow* parent, const wxString& title,
wxIcon icon; wxIcon icon;
icon.CopyFromBitmap( KiBitmap( icon_pcbnew_xpm ) ); icon.CopyFromBitmap( KiBitmap( icon_pcbnew_xpm ) );
SetIcon( icon ); SetIcon( icon );
m_InternalUnits = PCB_INTERNAL_UNIT; // Unites internes = 1/10000 inch m_InternalUnits = PCB_INTERNAL_UNIT; // Unites internes = 1/10000 inch
......
pcbnew/pcbnew.rc
View file @ 1c412879
a_icon_pcbnew ICON "icon_pcbnew.ico" #ifdef USE_PNG_BITMAPS
icon_w3d ICON "icon_w3d.ico" icon_pcbnew ICON "../bitmaps_png/icons/icon_pcbnew.ico"
icon_modedit ICON "icon_modedit.ico" #else
icon_pcbnew ICON "../bitmaps_xpm/icons/icon_pcbnew.ico"
#endif
#include "wx/msw/wx.rc" #include "wx/msw/wx.rc"
pcbnew/surbrill.cpp
View file @ 1c412879
...@@ -39,15 +39,15 @@ void PCB_EDIT_FRAME::ListNetsAndSelect( wxCommandEvent& event ) ...@@ -39,15 +39,15 @@ void PCB_EDIT_FRAME::ListNetsAndSelect( wxCommandEvent& event )
if( netFilter.IsEmpty() ) if( netFilter.IsEmpty() )
return; return;
wxString Line;
for( unsigned ii = 0; ii < GetBoard()->m_NetInfo->GetCount(); ii++ ) for( unsigned ii = 0; ii < GetBoard()->m_NetInfo->GetCount(); ii++ )
{ {
net = GetBoard()->m_NetInfo->GetNetItem( ii ); net = GetBoard()->m_NetInfo->GetNetItem( ii );
wxString Line;
if( !WildCompareString( netFilter, net->GetNetname(), false ) ) if( !WildCompareString( netFilter, net->GetNetname(), false ) )
continue; continue;
Line.Printf( wxT( "net_code = %3.3d [%.16s] " ), net->GetNet(), Line.Printf( wxT( "net %3.3d: %s" ), net->GetNet(),
GetChars( net->GetNetname() ) ); GetChars( net->GetNetname() ) );
list.Add( Line ); list.Add( Line );
} }
......
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