Skip to content

K
kicad-source-mirror
Commit 9b58687c authored by CHARRAS's avatar CHARRAS
Browse files
Options

rename dialog_clean_pcb.pjd, other minor changes

parent 5d2817ff
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 1540 additions and 1506 deletions
change_log.txt
View file @ 9b58687c
......@@ -4,6 +4,18 @@ Started 2007-June-11
Please add newer entries at the top, list the date and your name with
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>
================================================================================
+ eeschema & pcbnew & gerbview
......
common/selcolor.cpp
View file @ 9b58687c
......@@ -158,7 +158,7 @@ bool ColorFound = false;
line = new wxStaticLine( this, -1, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
OuterBoxSizer->Add(line, 0, wxGROW|wxLEFT|wxRIGHT|wxTOP, 5);
#ifdef 0
#if 0
BottomBoxSizer = new wxBoxSizer(wxHORIZONTAL);
OuterBoxSizer->Add(BottomBoxSizer, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
......
eeschema/edit_component_in_lib.cpp
View file @ 9b58687c
......@@ -466,7 +466,7 @@ void WinEDA_PartPropertiesFrame::BuildPanelBasic()
/*********************************************************/
void WinEDA_PartPropertiesFrame::BuildPanelEditField()
/**********************************************************/
/*********************************************************/
/* Create and build the panel managing the fields (REF, VALUE ...)
* of the component
......@@ -515,7 +515,7 @@ void WinEDA_PartPropertiesFrame::BuildPanelEditField()
// Create the box for text editing (text, size)
m_FieldTextCtrl = new WinEDA_GraphicTextCtrl( m_PanelField,
_( "Value:" ),
_( "Value/Chip Name:" ),
m_FieldText[FieldId], m_FieldSize[FieldId],
g_UnitMetric, LeftBoxSizer, 200 );
......@@ -548,6 +548,7 @@ void WinEDA_PartPropertiesFrame::BuildPanelEditField()
else
fieldnamelist[ii] = m_FieldName[ii];
}
fieldnamelist[VALUE] << wxT("/") << _("Chip Name");
m_FieldSelection = new wxRadioBox( m_PanelField, ID_ON_SELECT_FIELD,
_( "Field to edit" ), wxDefaultPosition, wxDefaultSize,
......
gerbview/export_to_pcbnew.cpp
View file @ 9b58687c
......@@ -173,7 +173,7 @@ static int SavePcbFormatAscii( WinEDA_GerberFrame* frame, FILE* File,
// replace spots with vias when possible
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) )
{
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->m_Drill = -1;
// Compute the via position from track position ( Via position is the
// position of the middle of the track segment )
newtrack->m_Start.x = (newtrack->m_Start.x + newtrack->m_End.x) / 2;
......
include/build_version.h
View file @ 9b58687c
......@@ -5,7 +5,7 @@
COMMON_GLOBL wxString g_BuildVersion
#ifdef EDA_BASE
(wxT("(2007-10-08)"))
(wxT("(2007-10-21)"))
#endif
;
......
include/fctsys.h
View file @ 9b58687c
......@@ -74,7 +74,7 @@
#define FALSE ((bool)0)
#endif
#define USE_RESIZE_BORDER
#if defined(__UNIX__) || defined(USE_RESIZE_BORDER)
#define MAYBE_RESIZE_BORDER wxRESIZE_BORDER // linux users like resizeable borders
#else
......
internat/fr/kicad.mo
View file @ 9b58687c
No preview for this file type
internat/fr/kicad.po
View file @ 9b58687c
This diff is collapsed.
pcbnew/class_track.h
View file @ 9b58687c
......@@ -13,7 +13,6 @@
#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_NOT_DEFINED 0 /* reserved (unused) */
#define VIA_SQUARE_SHAPE 0x80000000 /* Flag pour forme carree */
/***/
......
pcbnew/cleaningoptions_dialog.cpp
View file @ 9b58687c
......@@ -133,7 +133,7 @@ void WinEDA_CleaningOptionsFrame::Init()
void WinEDA_CleaningOptionsFrame::CreateControls()
{
////@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;
......@@ -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->SetValue(false);
if (ShowToolTips())
m_CleanViasOpt->SetToolTip(_("remove vias on pads with a through hole"));
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->SetValue(false);
if (ShowToolTips())
m_MergetSegmOpt->SetToolTip(_("merge aligned track segments, and remove null segments"));
itemStaticBoxSizer4->Add(m_MergetSegmOpt, 0, wxALIGN_LEFT|wxALL, 5);
m_DeleteunconnectedOpt = new wxCheckBox( itemDialog1, ID_CHECKBOX1, _("Delete unconnected tracks"), wxDefaultPosition, wxDefaultSize, 0 );
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);
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);
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(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);
itemBoxSizer3->Add(itemBoxSizer10, 0, wxALIGN_CENTER_VERTICAL|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);
wxButton* itemButton10 = new wxButton( itemDialog1, ID_BUTTON_EXECUTE, _("Clean pcb"), wxDefaultPosition, wxDefaultSize, 0 );
itemButton10->SetDefault();
itemBoxSizer9->Add(itemButton10, 0, wxALIGN_CENTER_HORIZONTAL|wxALL, 5);
// Set validators
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
*/
......
pcbnew/cleaningoptions_dialog.h
View file @ 9b58687c
......@@ -44,7 +44,7 @@
#define ID_CHECKBOX1 10005
#define ID_CHECKBOX 10004
#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_IDNAME ID_WIN_EDA_CLEANINGOPTIONSFRAME
#define SYMBOL_WINEDA_CLEANINGOPTIONSFRAME_SIZE wxSize(400, 300)
......
pcbnew/dialog_clean_pcb.pjd → pcbnew/cleaningoptions_dialog.pjd
View file @ 9b58687c
......@@ -366,7 +366,7 @@
<string name="proxy-Label">"Delete redundant vias"</string>
<bool name="proxy-Initial value">0</bool>
<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 validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
<string name="proxy-Background colour">""</string>
......@@ -424,7 +424,7 @@
<string name="proxy-Label">"Merge segments"</string>
<bool name="proxy-Initial value">0</bool>
<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 validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
<string name="proxy-Background colour">""</string>
......@@ -482,7 +482,7 @@
<string name="proxy-Label">"Delete unconnected tracks"</string>
<bool name="proxy-Initial value">0</bool>
<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 validator">"wxGenericValidator(&amp; %VARIABLE%)"</string>
<string name="proxy-Background colour">""</string>
......@@ -540,7 +540,7 @@
<string name="proxy-Label">"Connect to Pads"</string>
<bool name="proxy-Initial value">0</bool>
<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 validator">""</string>
<string name="proxy-Background colour">""</string>
......@@ -675,9 +675,9 @@
<long name="title-mode">0</long>
<long name="locked">1</long>
<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="filename">"dialog_clean_pcb.rc"</string>
<string name="filename">"cleaningoptions_dialog.rc"</string>
<string name="icon-name">"source-editor"</string>
<long name="is-transient">0</long>
<long name="owns-file">0</long>
......
pcbnew/set_color.h
View file @ 9b58687c
......@@ -265,7 +265,7 @@ static ColorButton Via_Aveugle_Butt =
TRUE // Toggle ITEM_NOT_SHOW bit of the color variable
};
static ColorButton Via_Borgne_Butt =
static ColorButton BLIND_VIA_Butt =
{
wxT( "*" ),
VIA_BURIED, // Layer
......@@ -416,7 +416,7 @@ static ColorButton* laytool_list[] = {
&Msg_Others_Items,
&VIA_THROUGH_Butt,
&Via_Aveugle_Butt,
&Via_Borgne_Butt,
&BLIND_VIA_Butt,
&Ratsnest_Butt,
&Pad_Cu_Butt,
&Pad_Cmp_Butt,
......
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