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

rename dialog_clean_pcb.pjd, other minor changes

This commit is contained in:
CHARRAS 2007-10-21 16:46:13 +00:00
parent 5d2817fffd
commit 9b58687c50
13 changed files with 817 additions and 783 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
change_log.txt
View File

@ -4,6 +4,18 @@ Started 2007-June-11
Please add newer entries at the top, list the date and your name with Please add newer entries at the top, list the date and your name with
email address. email address.
2007-Oct-21 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
================================================================================
+ pcbnew:
rename dialog_clean_pcb.pjd to cleaningoptions_dialog.pjd,
accordind to the corresponding cpp filename.
enter the new tool tips in cleaningoptions_dialog.pjd.
+all:
USE_RESIZE_BORDER is now defined (default) in fctsys.h.
Therefore, under windows, dialogs are now resizable (like under unix)
2007-Oct-21 UPDATE Geoff Harland <gharlandau@yahoo.com.au> 2007-Oct-21 UPDATE Geoff Harland <gharlandau@yahoo.com.au>
================================================================================ ================================================================================
+ eeschema & pcbnew & gerbview + eeschema & pcbnew & gerbview

2
common/selcolor.cpp
View File

@ -158,7 +158,7 @@ bool ColorFound = false;
line = new wxStaticLine( this, -1, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); line = new wxStaticLine( this, -1, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
OuterBoxSizer->Add(line, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP, 5); OuterBoxSizer->Add(line, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP, 5);
#ifdef 0 #if 0
BottomBoxSizer = new wxBoxSizer(wxHORIZONTAL); BottomBoxSizer = new wxBoxSizer(wxHORIZONTAL);
OuterBoxSizer->Add(BottomBoxSizer, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5); OuterBoxSizer->Add(BottomBoxSizer, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);

5
eeschema/edit_component_in_lib.cpp
View File

@ -466,7 +466,7 @@ void WinEDA_PartPropertiesFrame::BuildPanelBasic()
/*********************************************************/ /*********************************************************/
void WinEDA_PartPropertiesFrame::BuildPanelEditField() void WinEDA_PartPropertiesFrame::BuildPanelEditField()
/**********************************************************/ /*********************************************************/
/* Create and build the panel managing the fields (REF, VALUE ...) /* Create and build the panel managing the fields (REF, VALUE ...)
* of the component * of the component
@ -515,7 +515,7 @@ void WinEDA_PartPropertiesFrame::BuildPanelEditField()
// Create the box for text editing (text, size) // Create the box for text editing (text, size)
m_FieldTextCtrl = new WinEDA_GraphicTextCtrl( m_PanelField, m_FieldTextCtrl = new WinEDA_GraphicTextCtrl( m_PanelField,
_( "Value:" ), _( "Value/Chip Name:" ),
m_FieldText[FieldId], m_FieldSize[FieldId], m_FieldText[FieldId], m_FieldSize[FieldId],
g_UnitMetric, LeftBoxSizer, 200 ); g_UnitMetric, LeftBoxSizer, 200 );
@ -548,6 +548,7 @@ void WinEDA_PartPropertiesFrame::BuildPanelEditField()
else else
fieldnamelist[ii] = m_FieldName[ii]; fieldnamelist[ii] = m_FieldName[ii];
} }
fieldnamelist[VALUE] << wxT("/") << _("Chip Name");
m_FieldSelection = new wxRadioBox( m_PanelField, ID_ON_SELECT_FIELD, m_FieldSelection = new wxRadioBox( m_PanelField, ID_ON_SELECT_FIELD,
_( "Field to edit" ), wxDefaultPosition, wxDefaultSize, _( "Field to edit" ), wxDefaultPosition, wxDefaultSize,

4
gerbview/export_to_pcbnew.cpp
View File

@ -173,7 +173,7 @@ static int SavePcbFormatAscii( WinEDA_GerberFrame* frame, FILE* File,
// replace spots with vias when possible // replace spots with vias when possible
if( (track->m_Shape == S_SPOT_CIRCLE) if( (track->m_Shape == S_SPOT_CIRCLE)
|| (track->m_Shape == S_SPOT_RECT) || (track->m_Shape == S_SPOT_RECT)
|| (track->m_Shape == S_SPOT_OVALE) ) || (track->m_Shape == S_SPOT_OVALE) )
{ {
newtrack = new SEGVIA( (const SEGVIA&) *track ); newtrack = new SEGVIA( (const SEGVIA&) *track );
@ -185,7 +185,7 @@ static int SavePcbFormatAscii( WinEDA_GerberFrame* frame, FILE* File,
newtrack->SetLayer( 0x0F ); // Layers are 0 to 15 (Cu/Cmp) newtrack->SetLayer( 0x0F ); // Layers are 0 to 15 (Cu/Cmp)
newtrack->m_Drill = -1; newtrack->m_Drill = -1;
// Compute the via position from track position ( Via position is the // Compute the via position from track position ( Via position is the
// position of the middle of the track segment ) // position of the middle of the track segment )
newtrack->m_Start.x = (newtrack->m_Start.x + newtrack->m_End.x) / 2; newtrack->m_Start.x = (newtrack->m_Start.x + newtrack->m_End.x) / 2;

2
include/build_version.h
View File

@ -5,7 +5,7 @@
COMMON_GLOBL wxString g_BuildVersion COMMON_GLOBL wxString g_BuildVersion
#ifdef EDA_BASE #ifdef EDA_BASE
(wxT("(2007-10-08)")) (wxT("(2007-10-21)"))
#endif #endif
; ;

2
include/fctsys.h
View File

@ -74,7 +74,7 @@
#define FALSE ((bool)0) #define FALSE ((bool)0)
#endif #endif
#define USE_RESIZE_BORDER
#if defined(__UNIX__) || defined(USE_RESIZE_BORDER) #if defined(__UNIX__) || defined(USE_RESIZE_BORDER)
#define MAYBE_RESIZE_BORDER wxRESIZE_BORDER // linux users like resizeable borders #define MAYBE_RESIZE_BORDER wxRESIZE_BORDER // linux users like resizeable borders
#else #else

BIN
internat/fr/kicad.mo
View File

Binary file not shown.

1523
internat/fr/kicad.po
View File

File diff suppressed because it is too large Load Diff

1
pcbnew/class_track.h
View File

@ -13,7 +13,6 @@
#define VIA_BURIED 2 /* this via can be on internal layers */ #define VIA_BURIED 2 /* this via can be on internal layers */
#define VIA_BLIND 1 /* this via which connect from internal layers to an external layer */ #define VIA_BLIND 1 /* this via which connect from internal layers to an external layer */
#define VIA_NOT_DEFINED 0 /* reserved (unused) */ #define VIA_NOT_DEFINED 0 /* reserved (unused) */
#define VIA_SQUARE_SHAPE 0x80000000 /* Flag pour forme carree */
/***/ /***/

31
pcbnew/cleaningoptions_dialog.cpp
View File

@ -133,7 +133,7 @@ void WinEDA_CleaningOptionsFrame::Init()
void WinEDA_CleaningOptionsFrame::CreateControls() void WinEDA_CleaningOptionsFrame::CreateControls()
{ {
////@begin WinEDA_CleaningOptionsFrame content construction ////@begin WinEDA_CleaningOptionsFrame content construction
// Generated by DialogBlocks, 21/06/2007 19:58:26 (unregistered) // Generated by DialogBlocks, 21/10/2007 19:42:47 (unregistered)
WinEDA_CleaningOptionsFrame* itemDialog1 = this; WinEDA_CleaningOptionsFrame* itemDialog1 = this;
@ -149,29 +149,34 @@ void WinEDA_CleaningOptionsFrame::CreateControls()
m_CleanViasOpt = new wxCheckBox( itemDialog1, ID_CHECKBOX_CLEAN_VIAS, _("Delete redundant vias"), wxDefaultPosition, wxDefaultSize, 0 ); m_CleanViasOpt = new wxCheckBox( itemDialog1, ID_CHECKBOX_CLEAN_VIAS, _("Delete redundant vias"), wxDefaultPosition, wxDefaultSize, 0 );
m_CleanViasOpt->SetValue(false); m_CleanViasOpt->SetValue(false);
if (ShowToolTips())
m_CleanViasOpt->SetToolTip(_("remove vias on pads with a through hole"));
itemStaticBoxSizer4->Add(m_CleanViasOpt, 0, wxALIGN_LEFT|wxALL, 5); itemStaticBoxSizer4->Add(m_CleanViasOpt, 0, wxALIGN_LEFT|wxALL, 5);
m_MergetSegmOpt = new wxCheckBox( itemDialog1, ID_CHECKBOX_MERGE_SEGMENTS, _("Merge segments"), wxDefaultPosition, wxDefaultSize, 0 ); m_MergetSegmOpt = new wxCheckBox( itemDialog1, ID_CHECKBOX_MERGE_SEGMENTS, _("Merge segments"), wxDefaultPosition, wxDefaultSize, 0 );
m_MergetSegmOpt->SetValue(false); m_MergetSegmOpt->SetValue(false);
if (ShowToolTips())
m_MergetSegmOpt->SetToolTip(_("merge aligned track segments, and remove null segments"));
itemStaticBoxSizer4->Add(m_MergetSegmOpt, 0, wxALIGN_LEFT|wxALL, 5); itemStaticBoxSizer4->Add(m_MergetSegmOpt, 0, wxALIGN_LEFT|wxALL, 5);
m_DeleteunconnectedOpt = new wxCheckBox( itemDialog1, ID_CHECKBOX1, _("Delete unconnected tracks"), wxDefaultPosition, wxDefaultSize, 0 ); m_DeleteunconnectedOpt = new wxCheckBox( itemDialog1, ID_CHECKBOX1, _("Delete unconnected tracks"), wxDefaultPosition, wxDefaultSize, 0 );
m_DeleteunconnectedOpt->SetValue(false); m_DeleteunconnectedOpt->SetValue(false);
if (ShowToolTips())
m_DeleteunconnectedOpt->SetToolTip(_("delete track segment having a dangling end"));
itemStaticBoxSizer4->Add(m_DeleteunconnectedOpt, 0, wxALIGN_LEFT|wxALL, 5); itemStaticBoxSizer4->Add(m_DeleteunconnectedOpt, 0, wxALIGN_LEFT|wxALL, 5);
m_ConnectToPadsOpt = new wxCheckBox( itemDialog1, ID_CHECKBOX, _("Connect to Pads"), wxDefaultPosition, wxDefaultSize, 0 ); m_ConnectToPadsOpt = new wxCheckBox( itemDialog1, ID_CHECKBOX, _("Connect to Pads"), wxDefaultPosition, wxDefaultSize, 0 );
m_ConnectToPadsOpt->SetToolTip( _("Extend dangling tracks which partially cover a pad or via, all the way to pad or via center") );
m_ConnectToPadsOpt->SetValue(false); m_ConnectToPadsOpt->SetValue(false);
if (ShowToolTips())
m_ConnectToPadsOpt->SetToolTip(_("Extend dangling tracks which partially cover a pad or via, all the way to pad or via center"));
itemStaticBoxSizer4->Add(m_ConnectToPadsOpt, 0, wxALIGN_LEFT|wxALL, 5); itemStaticBoxSizer4->Add(m_ConnectToPadsOpt, 0, wxALIGN_LEFT|wxALL, 5);
itemStaticBoxSizer4->Add(5, 5, 0, wxGROW|wxALL, 5); wxBoxSizer* itemBoxSizer9 = new wxBoxSizer(wxVERTICAL);
itemBoxSizer3->Add(itemBoxSizer9, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5);
wxBoxSizer* itemBoxSizer10 = new wxBoxSizer(wxVERTICAL); wxButton* itemButton10 = new wxButton( itemDialog1, ID_BUTTON_EXECUTE, _("Clean pcb"), wxDefaultPosition, wxDefaultSize, 0 );
itemBoxSizer3->Add(itemBoxSizer10, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5); itemButton10->SetDefault();
itemBoxSizer9->Add(itemButton10, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
wxButton* itemButton11 = new wxButton( itemDialog1, ID_BUTTON_EXECUTE, _("Clean pcb"), wxDefaultPosition, wxDefaultSize, 0 );
itemButton11->SetDefault();
itemBoxSizer10->Add(itemButton11, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
// Set validators // Set validators
m_CleanViasOpt->SetValidator( wxGenericValidator(& s_CleanVias) ); m_CleanViasOpt->SetValidator( wxGenericValidator(& s_CleanVias) );
@ -234,14 +239,6 @@ void WinEDA_CleaningOptionsFrame::OnButtonExecuteClick( wxCommandEvent& event )
} }
/*! /*!
* wxEVT_CLOSE_WINDOW event handler for ID_WIN_EDA_CLEANINGOPTIONSFRAME * wxEVT_CLOSE_WINDOW event handler for ID_WIN_EDA_CLEANINGOPTIONSFRAME
*/ */

2
pcbnew/cleaningoptions_dialog.h
View File

@ -44,7 +44,7 @@
#define ID_CHECKBOX1 10005 #define ID_CHECKBOX1 10005
#define ID_CHECKBOX 10004 #define ID_CHECKBOX 10004
#define ID_BUTTON_EXECUTE 10006 #define ID_BUTTON_EXECUTE 10006
#define SYMBOL_WINEDA_CLEANINGOPTIONSFRAME_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX|MAYBE_RESIZE_BORDER #define SYMBOL_WINEDA_CLEANINGOPTIONSFRAME_STYLE wxCAPTION|wxSYSTEM_MENU|wxCLOSE_BOX
#define SYMBOL_WINEDA_CLEANINGOPTIONSFRAME_TITLE _("Cleaning options") #define SYMBOL_WINEDA_CLEANINGOPTIONSFRAME_TITLE _("Cleaning options")
#define SYMBOL_WINEDA_CLEANINGOPTIONSFRAME_IDNAME ID_WIN_EDA_CLEANINGOPTIONSFRAME #define SYMBOL_WINEDA_CLEANINGOPTIONSFRAME_IDNAME ID_WIN_EDA_CLEANINGOPTIONSFRAME
#define SYMBOL_WINEDA_CLEANINGOPTIONSFRAME_SIZE wxSize(400, 300) #define SYMBOL_WINEDA_CLEANINGOPTIONSFRAME_SIZE wxSize(400, 300)

12
pcbnew/dialog_clean_pcb.pjd → pcbnew/cleaningoptions_dialog.pjd
View File

@ -366,7 +366,7 @@
<string name="proxy-Label">"Delete redundant vias"</string> <string name="proxy-Label">"Delete redundant vias"</string>
<bool name="proxy-Initial value">0</bool> <bool name="proxy-Initial value">0</bool>
<string name="proxy-Help text">""</string> <string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string> <string name="proxy-Tooltip text">"remove vias on pads with a through hole"</string>
<string name="proxy-Data variable">"s_CleanVias"</string> <string name="proxy-Data variable">"s_CleanVias"</string>
<string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string> <string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
<string name="proxy-Background colour">""</string> <string name="proxy-Background colour">""</string>
@ -424,7 +424,7 @@
<string name="proxy-Label">"Merge segments"</string> <string name="proxy-Label">"Merge segments"</string>
<bool name="proxy-Initial value">0</bool> <bool name="proxy-Initial value">0</bool>
<string name="proxy-Help text">""</string> <string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string> <string name="proxy-Tooltip text">"merge aligned track segments, and remove null segments"</string>
<string name="proxy-Data variable">"s_MergeSegments"</string> <string name="proxy-Data variable">"s_MergeSegments"</string>
<string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string> <string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
<string name="proxy-Background colour">""</string> <string name="proxy-Background colour">""</string>
@ -482,7 +482,7 @@
<string name="proxy-Label">"Delete unconnected tracks"</string> <string name="proxy-Label">"Delete unconnected tracks"</string>
<bool name="proxy-Initial value">0</bool> <bool name="proxy-Initial value">0</bool>
<string name="proxy-Help text">""</string> <string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string> <string name="proxy-Tooltip text">"delete track segment having a dangling end"</string>
<string name="proxy-Data variable">"s_DeleteUnconnectedSegm"</string> <string name="proxy-Data variable">"s_DeleteUnconnectedSegm"</string>
<string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string> <string name="proxy-Data validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
<string name="proxy-Background colour">""</string> <string name="proxy-Background colour">""</string>
@ -540,7 +540,7 @@
<string name="proxy-Label">"Connect to Pads"</string> <string name="proxy-Label">"Connect to Pads"</string>
<bool name="proxy-Initial value">0</bool> <bool name="proxy-Initial value">0</bool>
<string name="proxy-Help text">""</string> <string name="proxy-Help text">""</string>
<string name="proxy-Tooltip text">""</string> <string name="proxy-Tooltip text">"Extend dangling tracks which partially cover a pad or via, all the way to pad or via center"</string>
<string name="proxy-Data variable">""</string> <string name="proxy-Data variable">""</string>
<string name="proxy-Data validator">""</string> <string name="proxy-Data validator">""</string>
<string name="proxy-Background colour">""</string> <string name="proxy-Background colour">""</string>
@ -675,9 +675,9 @@
<long name="title-mode">0</long> <long name="title-mode">0</long>
<long name="locked">1</long> <long name="locked">1</long>
<document> <document>
<string name="title">"dialog_clean_pcb.rc"</string> <string name="title">"cleaningoptions_dialog.rc"</string>
<string name="type">"source-editor-document"</string> <string name="type">"source-editor-document"</string>
<string name="filename">"dialog_clean_pcb.rc"</string> <string name="filename">"cleaningoptions_dialog.rc"</string>
<string name="icon-name">"source-editor"</string> <string name="icon-name">"source-editor"</string>
<long name="is-transient">0</long> <long name="is-transient">0</long>
<long name="owns-file">0</long> <long name="owns-file">0</long>

4
pcbnew/set_color.h
View File

@ -265,7 +265,7 @@ static ColorButton Via_Aveugle_Butt =
TRUE // Toggle ITEM_NOT_SHOW bit of the color variable TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
}; };
static ColorButton Via_Borgne_Butt = static ColorButton BLIND_VIA_Butt =
{ {
wxT( "*" ), wxT( "*" ),
VIA_BURIED, // Layer VIA_BURIED, // Layer
@ -416,7 +416,7 @@ static ColorButton* laytool_list[] = {
&Msg_Others_Items, &Msg_Others_Items,
&VIA_THROUGH_Butt, &VIA_THROUGH_Butt,
&Via_Aveugle_Butt, &Via_Aveugle_Butt,
&Via_Borgne_Butt, &BLIND_VIA_Butt,
&Ratsnest_Butt, &Ratsnest_Butt,
&Pad_Cu_Butt, &Pad_Cu_Butt,
&Pad_Cmp_Butt, &Pad_Cmp_Butt,