Very minor fixes.
This commit is contained in:
parent
52211afbf0
commit
d76cd0cf2c
|
@ -52,7 +52,6 @@ set(BITMAP_SRCS
|
|||
axis3d_right.xpm
|
||||
axis3d_top.xpm
|
||||
axis3d.xpm
|
||||
backanno.xpm
|
||||
book.xpm
|
||||
Break_Bus.xpm
|
||||
Break_Line.xpm
|
||||
|
|
|
@ -1,31 +0,0 @@
|
|||
/* XPM */
|
||||
#ifndef XPMMAIN
|
||||
extern const char *backanno_xpm[];
|
||||
|
||||
#else
|
||||
const char *backanno_xpm[] = {
|
||||
/* width height num_colors chars_per_pixel */
|
||||
" 16 16 3 1",
|
||||
/* colors */
|
||||
" c None",
|
||||
". c yellow",
|
||||
"# c black",
|
||||
/* pixels */
|
||||
" ",
|
||||
" .... ",
|
||||
" ...... ",
|
||||
" ...##... ",
|
||||
" ....##.... ",
|
||||
" .####....... ",
|
||||
" ..#.###..##... ",
|
||||
" .###########.. ",
|
||||
" ...##....##... ",
|
||||
" ...###.....#.. ",
|
||||
" ..#.#..##... ",
|
||||
" .#.#.####. ",
|
||||
" ........ ",
|
||||
" ...... ",
|
||||
" .... ",
|
||||
" "
|
||||
};
|
||||
#endif
|
|
@ -6,7 +6,7 @@
|
|||
#endif
|
||||
|
||||
#ifndef KICAD_BUILD_VERSION
|
||||
#define KICAD_BUILD_VERSION "(2011-06-08)"
|
||||
#define KICAD_BUILD_VERSION "(2011-07-03)"
|
||||
#endif
|
||||
|
||||
|
||||
|
|
|
@ -543,31 +543,3 @@ void SCH_EDIT_FRAME::RepeatDrawItem( wxDC* DC )
|
|||
}
|
||||
}
|
||||
|
||||
|
||||
/* Routine incrementing labels, ie for the text ending with a number, adding
|
||||
* that a number <RepeatDeltaLabel>
|
||||
*/
|
||||
void IncrementLabelMember( wxString& name )
|
||||
{
|
||||
int ii, nn;
|
||||
long number = 0;
|
||||
|
||||
ii = name.Len() - 1; nn = 0;
|
||||
|
||||
if( !isdigit( name.GetChar( ii ) ) )
|
||||
return;
|
||||
|
||||
while( (ii >= 0) && isdigit( name.GetChar( ii ) ) )
|
||||
{
|
||||
ii--; nn++;
|
||||
}
|
||||
|
||||
ii++; /* digits are starting at ii position */
|
||||
wxString litt_number = name.Right( nn );
|
||||
|
||||
if( litt_number.ToLong( &number ) )
|
||||
{
|
||||
number += g_RepeatDeltaLabel;
|
||||
name.Remove( ii ); name << number;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -301,3 +301,33 @@ void SCH_EDIT_FRAME::OnConvertTextType( wxCommandEvent& aEvent )
|
|||
delete text;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
/* Function to increment bus label members numbers,
|
||||
* i.e. when a text is ending with a number, adds
|
||||
* <RepeatDeltaLabel> to this number
|
||||
*/
|
||||
void IncrementLabelMember( wxString& name )
|
||||
{
|
||||
int ii, nn;
|
||||
long number = 0;
|
||||
|
||||
ii = name.Len() - 1; nn = 0;
|
||||
|
||||
if( !isdigit( name.GetChar( ii ) ) )
|
||||
return;
|
||||
|
||||
while( (ii >= 0) && isdigit( name.GetChar( ii ) ) )
|
||||
{
|
||||
ii--; nn++;
|
||||
}
|
||||
|
||||
ii++; /* digits are starting at ii position */
|
||||
wxString litt_number = name.Right( nn );
|
||||
|
||||
if( litt_number.ToLong( &number ) )
|
||||
{
|
||||
number += g_RepeatDeltaLabel;
|
||||
name.Remove( ii ); name << number;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -102,7 +102,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
|
|||
// Page settings
|
||||
ADD_MENUITEM_WITH_HELP( fileMenu,
|
||||
ID_SHEET_SET,
|
||||
_( "P&age settings" ),
|
||||
_( "P&age Settings" ),
|
||||
_( "Settigns for page size and information" ),
|
||||
sheetset_xpm );
|
||||
|
||||
|
@ -191,16 +191,20 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
|
|||
_( "Delete" ), HELP_DELETE_ITEMS,
|
||||
delete_body_xpm );
|
||||
|
||||
// Separator
|
||||
editMenu->AppendSeparator();
|
||||
|
||||
// Find
|
||||
editMenu->AppendSeparator();
|
||||
text = AddHotkeyName( _( "&Find" ), s_Schematic_Hokeys_Descr, HK_FIND_ITEM );
|
||||
ADD_MENUITEM_WITH_HELP( editMenu, ID_FIND_ITEMS, text, HELP_FIND,
|
||||
find_xpm );
|
||||
|
||||
// Separator
|
||||
// Backannotate
|
||||
editMenu->AppendSeparator();
|
||||
ADD_MENUITEM_WITH_HELP( editMenu,
|
||||
ID_BACKANNO_ITEMS,
|
||||
_( "&Backannotate" ),
|
||||
_( "Back annotate the footprint fields" ),
|
||||
import_footprint_names_xpm );
|
||||
|
||||
|
||||
|
||||
|
||||
|
@ -243,7 +247,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
|
|||
// Separator
|
||||
viewMenu->AppendSeparator();
|
||||
|
||||
// Hierarchy
|
||||
// Hierarchy
|
||||
ADD_MENUITEM_WITH_HELP( viewMenu,
|
||||
ID_HIERARCHY,
|
||||
_( "H&ierarchy" ),
|
||||
|
@ -437,7 +441,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
|
|||
// Library viewer
|
||||
ADD_MENUITEM_WITH_HELP( toolsMenu,
|
||||
ID_TO_LIBRARY,
|
||||
_( "Library &browser" ),
|
||||
_( "Library &Browser" ),
|
||||
_( "Library browser" ),
|
||||
library_browse_xpm );
|
||||
|
||||
|
@ -445,7 +449,7 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
|
|||
// Library editor
|
||||
ADD_MENUITEM_WITH_HELP( toolsMenu,
|
||||
ID_TO_LIBRARY,
|
||||
_( "Library &editor" ),
|
||||
_( "Library &Editor" ),
|
||||
_( "Library editor" ),
|
||||
libedit_xpm );
|
||||
|
||||
|
@ -459,13 +463,6 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
|
|||
_( "Annotate the components in the schematic" ),
|
||||
annotate_xpm );
|
||||
|
||||
// Backannotate
|
||||
ADD_MENUITEM_WITH_HELP( editMenu,
|
||||
ID_BACKANNO_ITEMS,
|
||||
_( "&Backannotate" ),
|
||||
_( "Back annotate the footprint fields" ),
|
||||
backanno_xpm );
|
||||
|
||||
// ERC
|
||||
ADD_MENUITEM_WITH_HELP( toolsMenu,
|
||||
ID_GET_ERC,
|
||||
|
@ -476,14 +473,14 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
|
|||
// Generate netlist
|
||||
ADD_MENUITEM_WITH_HELP( toolsMenu,
|
||||
ID_GET_NETLIST,
|
||||
_( "Generate &netlist" ),
|
||||
_( "Generate &Netlist" ),
|
||||
_( "Generate the component netlist" ),
|
||||
netlist_xpm );
|
||||
|
||||
// Generate bill of materials
|
||||
ADD_MENUITEM_WITH_HELP( toolsMenu,
|
||||
ID_GET_TOOLS,
|
||||
_( "Generate bill of materials" ),
|
||||
_( "Generate Bill of Materials" ),
|
||||
_( "Generate bill of materials" ),
|
||||
tools_xpm );
|
||||
|
||||
|
|
|
@ -20,6 +20,9 @@
|
|||
#include "dialog_lib_edit_pin.h"
|
||||
|
||||
|
||||
extern void IncrementLabelMember( wxString& name );
|
||||
|
||||
|
||||
static void CreateImagePins( LIB_PIN* Pin, int unit, int convert, bool asDeMorgan );
|
||||
static void AbortPinMove( EDA_DRAW_PANEL* Panel, wxDC* DC );
|
||||
static void DrawMovePin( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aPositon, bool aErase );
|
||||
|
|
|
@ -31,13 +31,6 @@ wxString DataBaseGetName( EDA_DRAW_FRAME* frame, wxString& Keys, wxString& BufNa
|
|||
/*********************/
|
||||
bool SegmentIntersect( wxPoint aSegStart, wxPoint aSegEnd, wxPoint aTestPoint );
|
||||
|
||||
|
||||
/*************************/
|
||||
/* BUS_WIRE_JUNCTION.CPP */
|
||||
/*************************/
|
||||
void IncrementLabelMember( wxString& name );
|
||||
|
||||
|
||||
/****************/
|
||||
/* EDITPART.CPP */
|
||||
/****************/
|
||||
|
|
|
@ -17,6 +17,8 @@
|
|||
#include "protos.h"
|
||||
#include "sch_text.h"
|
||||
|
||||
extern void IncrementLabelMember( wxString& name );
|
||||
|
||||
|
||||
/************************/
|
||||
/* class SCH_TEXT */
|
||||
|
|
|
@ -47,7 +47,6 @@ extern const char* axis3d_left_xpm[];
|
|||
extern const char* axis3d_right_xpm[];
|
||||
extern const char* axis3d_top_xpm[];
|
||||
extern const char* axis3d_xpm[];
|
||||
extern const char* backanno_xpm[];
|
||||
extern const char* book_xpm[];
|
||||
extern const char* break_bus_xpm[];
|
||||
extern const char* break_line_xpm[];
|
||||
|
|
|
@ -17,7 +17,7 @@
|
|||
|
||||
; General Product Description Definitions
|
||||
!define PRODUCT_NAME "KiCad"
|
||||
!define PRODUCT_VERSION "2011.06.08"
|
||||
!define PRODUCT_VERSION "2011.07.03"
|
||||
!define PRODUCT_WEB_SITE "http://iut-tice.ujf-grenoble.fr/kicad/"
|
||||
!define SOURCEFORGE_WEB_SITE "http://kicad.sourceforge.net/"
|
||||
!define COMPANY_NAME ""
|
||||
|
|
|
@ -591,7 +591,7 @@ void PCB_EDIT_FRAME::ReCreateMenuBar()
|
|||
/* Netlist */
|
||||
item = new wxMenuItem( toolsMenu, ID_GET_NETLIST,
|
||||
_( "Netlist" ),
|
||||
_( "Read or update the netlist" ) );
|
||||
_( "Read the netlist and update board connectivity" ) );
|
||||
SET_BITMAP( netlist_xpm );
|
||||
toolsMenu->Append( item );
|
||||
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
release version:
|
||||
2011 june 08
|
||||
2011 jul 03
|
||||
files (.zip,.tgz):
|
||||
kicad-2011-06-08
|
||||
kicad-2011-07-03
|
||||
|
|
Loading…
Reference in New Issue