haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed very minor things.

This commit is contained in:
jean-pierre charras 2010-06-19 12:58:50 +02:00
parent f3d5c4948b
commit 1ab68d8fb8
8 changed files with 14 additions and 1131 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
INSTALL.txt
View File

@ -106,9 +106,9 @@ Installation from source code
Some dependencies must be satisfied for the correct installation of KiCad: Some dependencies must be satisfied for the correct installation of KiCad:
wxWidgets >= 2.6.3.3 http://www.wxwidgets.org/ wxWidgets >= 2.8.11 http://www.wxwidgets.org/
CMake >= 2.4.6 http://www.cmake.org/ CMake >= 2.6.4 http://www.cmake.org/
Boost C++ Libraries http://www.boost.org/ Boost C++ Libraries (files used by kicad are provided in kicad sources) http://www.boost.org/
OpenGL OpenGL
Linux: Mesa 3D Graphics Library http://www.mesa3d.org/ Linux: Mesa 3D Graphics Library http://www.mesa3d.org/
Windows: built-in Windows: built-in

1122
bitmap2component/gui_bm2cmp.cpp
View File

File diff suppressed because it is too large Load Diff

6
eeschema/build_BOM.cpp
View File

@ -797,6 +797,10 @@ int DIALOG_BUILD_BOM::PrintComponentsListByPart(
// Store fields. Store non empty fields only. // Store fields. Store non empty fields only.
for( int jj = FOOTPRINT; jj < currCmp->GetFieldCount(); jj++ ) for( int jj = FOOTPRINT; jj < currCmp->GetFieldCount(); jj++ )
{ {
//Ensure fields exists in dummy component
if( dummyCmp.GetFieldCount() < currCmp->GetFieldCount() )
dummyCmp.AddField( *currCmp->GetField( jj ) );
// store useful data
if( !currCmp->GetField( jj )->m_Text.IsEmpty() ) if( !currCmp->GetField( jj )->m_Text.IsEmpty() )
dummyCmp.GetField( jj )->m_Text = currCmp->GetField( jj )->m_Text; dummyCmp.GetField( jj )->m_Text = currCmp->GetField( jj )->m_Text;
} }
@ -848,6 +852,8 @@ int DIALOG_BUILD_BOM::PrintComponentsListByPart(
// print fields, on demand // print fields, on demand
for( int jj = FIELD1; jj <= FIELD8 ; jj++ ) for( int jj = FIELD1; jj <= FIELD8 ; jj++ )
{ {
if( dummyCmp.GetFieldCount() >= jj )
break;
if ( IsFieldChecked( jj ) ) if ( IsFieldChecked( jj ) )
fprintf( f, "%c%4s", s_ExportSeparatorSymbol, fprintf( f, "%c%4s", s_ExportSeparatorSymbol,
CONV_TO_UTF8( dummyCmp.GetField( jj )->m_Text ) ); CONV_TO_UTF8( dummyCmp.GetField( jj )->m_Text ) );

2
eeschema/files-io.cpp
View File

@ -194,7 +194,7 @@ bool WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName, bool IsN
GetChars( fn.GetFullPath() ), GetChars( fn.GetFullPath() ),
GetChars( errMsg ) ); GetChars( errMsg ) );
DisplayError( this, prompt ); DisplayError( this, prompt );
msg += wxT( " ->Error" ); msg += _( " ->Error" );
} }
PrintMsg( msg ); PrintMsg( msg );

2
gerbview/files.cpp
View File

@ -62,7 +62,7 @@ void WinEDA_GerberFrame::Files_io( wxCommandEvent& event )
else else
{ {
wxString msg; wxString msg;
msg.Printf( _( "GerbView only supports a maximum of %d layers. You must first \ msg.Printf( _( "GerbView only supports a maximum of %d layers. You must first \
delete an existing layer to load any new layers." ), NB_LAYERS ); delete an existing layer to load any new layers." ), NB_LAYERS );
wxMessageBox( msg ); wxMessageBox( msg );
} }

3
pcbnew/automove.cpp
View File

@ -204,8 +204,7 @@ void WinEDA_PcbFrame::AutoMoveModulesOnPcb( bool PlaceModulesHorsPcb )
if( PlaceModulesHorsPcb && !EdgeExists ) if( PlaceModulesHorsPcb && !EdgeExists )
{ {
DisplayError( this, DisplayError( this,
_( "Could not automatically place modules. No board \ _( "Could not automatically place modules. No board outlines detected." ) );
edges detected." ) );
return; return;
} }

2
pcbnew/dialog_gendrill_base.cpp
View File

@ -58,7 +58,7 @@ DIALOG_GENDRILL_BASE::DIALOG_GENDRILL_BASE( wxWindow* parent, wxWindowID id, con
int m_Choice_Drill_MapNChoices = sizeof( m_Choice_Drill_MapChoices ) / sizeof( wxString ); int m_Choice_Drill_MapNChoices = sizeof( m_Choice_Drill_MapChoices ) / sizeof( wxString );
m_Choice_Drill_Map = new wxRadioBox( this, wxID_ANY, _("Drill Sheet:"), wxDefaultPosition, wxDefaultSize, m_Choice_Drill_MapNChoices, m_Choice_Drill_MapChoices, 1, wxRA_SPECIFY_COLS ); m_Choice_Drill_Map = new wxRadioBox( this, wxID_ANY, _("Drill Sheet:"), wxDefaultPosition, wxDefaultSize, m_Choice_Drill_MapNChoices, m_Choice_Drill_MapChoices, 1, wxRA_SPECIFY_COLS );
m_Choice_Drill_Map->SetSelection( 0 ); m_Choice_Drill_Map->SetSelection( 0 );
m_Choice_Drill_Map->SetToolTip( _("Creates a drill map in PSr HPGL or others formats") ); m_Choice_Drill_Map->SetToolTip( _("Creates a drill map in PS, HPGL or others formats") );
bMiddleBoxSizer->Add( m_Choice_Drill_Map, 0, wxALL|wxEXPAND, 5 ); bMiddleBoxSizer->Add( m_Choice_Drill_Map, 0, wxALL|wxEXPAND, 5 );

2
pcbnew/dialog_gendrill_base.fbp
View File

@ -335,7 +335,7 @@
<property name="size"></property> <property name="size"></property>
<property name="style">wxRA_SPECIFY_COLS</property> <property name="style">wxRA_SPECIFY_COLS</property>
<property name="subclass"></property> <property name="subclass"></property>
<property name="tooltip">Creates a drill map in PSr HPGL or others formats</property> <property name="tooltip">Creates a drill map in PS, HPGL or others formats</property>
<property name="window_extra_style"></property> <property name="window_extra_style"></property>
<property name="window_name"></property> <property name="window_name"></property>
<property name="window_style"></property> <property name="window_style"></property>