Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
K
kicad-source-mirror
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Commits
Open sidebar
Elphel
kicad-source-mirror
Commits
f1eb69a1
Commit
f1eb69a1
authored
Dec 20, 2008
by
charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
more about texts and labels options under eeschema
parent
bfb53744
Changes
32
Hide whitespace changes
Inline
Side-by-side
Showing
32 changed files
with
630 additions
and
632 deletions
+630
-632
CHANGELOG.txt
CHANGELOG.txt
+2
-2
makefile.g95
bitmaps/makefile.g95
+2
-2
drawframe.cpp
common/drawframe.cpp
+1
-1
drawtxt.cpp
common/drawtxt.cpp
+8
-7
makefile.include
common/makefile.include
+3
-1
zoom.cpp
common/zoom.cpp
+1
-1
dialog_display_options.cpp
cvpcb/dialog_display_options.cpp
+7
-7
makefile.include
cvpcb/makefile.include
+0
-5
dialog_edit_label_base.cpp
eeschema/dialog_edit_label_base.cpp
+1
-1
dialog_edit_label_base.fbp
eeschema/dialog_edit_label_base.fbp
+1
-1
eelayer.cpp
eeschema/eelayer.cpp
+2
-2
files-io.cpp
eeschema/files-io.cpp
+1
-1
lib_export.cpp
eeschema/lib_export.cpp
+1
-1
libedit.cpp
eeschema/libedit.cpp
+1
-1
libframe.cpp
eeschema/libframe.cpp
+7
-7
makefile.include
eeschema/makefile.include
+0
-14
plot.cpp
eeschema/plot.cpp
+27
-17
read_from_file_schematic_items_descriptions.cpp
eeschema/read_from_file_schematic_items_descriptions.cpp
+14
-6
symbdraw.cpp
eeschema/symbdraw.cpp
+1
-1
tool_sch.cpp
eeschema/tool_sch.cpp
+1
-1
viewlib_frame.cpp
eeschema/viewlib_frame.cpp
+3
-3
viewlibs.cpp
eeschema/viewlibs.cpp
+4
-4
makefile.include
gerbview/makefile.include
+0
-5
set_color.cpp
gerbview/set_color.cpp
+2
-2
kicad.mo
internat/fr/kicad.mo
+0
-0
kicad.po
internat/fr/kicad.po
+532
-524
basepcbframe.cpp
pcbnew/basepcbframe.cpp
+2
-2
initpcb.cpp
pcbnew/initpcb.cpp
+1
-1
makefile.include
pcbnew/makefile.include
+0
-8
sel_layer.cpp
pcbnew/sel_layer.cpp
+1
-1
set_color.cpp
pcbnew/set_color.cpp
+2
-2
setpage.cpp
share/setpage.cpp
+2
-1
No files found.
CHANGELOG.txt
View file @
f1eb69a1
...
@@ -10,8 +10,8 @@ email address.
...
@@ -10,8 +10,8 @@ email address.
++All
++All
Cleaning code to draw/plot texts (work in progress):
Cleaning code to draw/plot texts (work in progress):
Now only one function is used to draw and plot texts
Now only one function is used to draw and plot texts
(easier to maintain and ensure text
e
s have the same size in ploting and drawing)
(easier to maintain and ensure texts have the same size in ploting and drawing)
In eeschema, italic and bold texts allowed (in pcbenew, texts thicness is already adjustable)
In eeschema, italic and bold texts allowed (in pcbenew, texts thic
k
ness is already adjustable)
2008-Dec-18 UPDATE Wayne Stambaugh <stambaughw@verizon.net>
2008-Dec-18 UPDATE Wayne Stambaugh <stambaughw@verizon.net>
...
...
bitmaps/makefile.g95
View file @
f1eb69a1
...
@@ -10,5 +10,5 @@ libbitmaps.a: $(OBJECTS)
...
@@ -10,5 +10,5 @@ libbitmaps.a: $(OBJECTS)
ranlib
$@
ranlib
$@
clean
:
clean
:
rm
-f
*
.o
#
rm -f *.o
rm
-f
*
.a
"
rm
-f
*.a
common/drawframe.cpp
View file @
f1eb69a1
...
@@ -585,7 +585,7 @@ void WinEDA_DrawFrame::OnZoom( int zoom_type )
...
@@ -585,7 +585,7 @@ void WinEDA_DrawFrame::OnZoom( int zoom_type )
case
ID_POPUP_ZOOM_REDRAW
:
case
ID_POPUP_ZOOM_REDRAW
:
case
ID_ZOOM_REDRAW_KEY
:
case
ID_ZOOM_REDRAW_KEY
:
case
ID_ZOOM_REDRAW_BUTT
:
case
ID_ZOOM_REDRAW_BUTT
:
ReDrawPanel
();
DrawPanel
->
Refresh
();
break
;
break
;
case
ID_POPUP_ZOOM_CENTER
:
case
ID_POPUP_ZOOM_CENTER
:
...
...
common/drawtxt.cpp
View file @
f1eb69a1
...
@@ -75,6 +75,7 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel, wxDC* DC,
...
@@ -75,6 +75,7 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel, wxDC* DC,
aWidth
=
-
aWidth
;
aWidth
=
-
aWidth
;
sketch_mode
=
TRUE
;
sketch_mode
=
TRUE
;
}
}
int
thickness
=
aWidth
;
kk
=
0
;
kk
=
0
;
ptr
=
0
;
/* ptr = text index */
ptr
=
0
;
/* ptr = text index */
...
@@ -85,9 +86,9 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel, wxDC* DC,
...
@@ -85,9 +86,9 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel, wxDC* DC,
pitch
=
(
10
*
size_h
)
/
9
;
// this is the pitch between chars
pitch
=
(
10
*
size_h
)
/
9
;
// this is the pitch between chars
if
(
pitch
>
0
)
if
(
pitch
>
0
)
pitch
+=
ABS
(
aWidth
);
pitch
+=
ABS
(
thickness
);
else
else
pitch
-=
ABS
(
aWidth
);
pitch
-=
ABS
(
thickness
);
ox
=
cX
=
aPos
.
x
;
ox
=
cX
=
aPos
.
x
;
oy
=
cY
=
aPos
.
y
;
oy
=
cY
=
aPos
.
y
;
...
@@ -194,10 +195,10 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel, wxDC* DC,
...
@@ -194,10 +195,10 @@ void DrawGraphicText( WinEDA_DrawPanel* aPanel, wxDC* DC,
if
(
(
aSize
.
x
/
zoom
)
==
0
)
if
(
(
aSize
.
x
/
zoom
)
==
0
)
return
;
return
;
if
(
ABS
(
(
aSize
.
x
/
zoom
)
)
<
3
)
/*
chars trop petits pour etre dessines
*/
if
(
ABS
(
(
aSize
.
x
/
zoom
)
)
<
3
)
/*
shapes are too small: connot be drawn
*/
{
/*
le texte est symbolise par une barr
e */
{
/*
insteed the text is drawn as a lin
e */
dx
=
(
pitch
*
char_count
)
/
2
;
dx
=
(
pitch
*
char_count
)
/
2
;
dy
=
size_v
/
2
;
/*
Decalage du debut du texte / centre
*/
dy
=
size_v
/
2
;
/*
line is always centered
*/
ux0
=
cX
-
dx
;
ux0
=
cX
-
dx
;
uy0
=
cY
;
uy0
=
cY
;
...
@@ -328,7 +329,7 @@ static void s_Callback_plot(int x0, int y0, int xf, int yf)
...
@@ -328,7 +329,7 @@ static void s_Callback_plot(int x0, int y0, int xf, int yf)
MovePenFct
(
pend
,
'D'
);
MovePenFct
(
pend
,
'D'
);
s_Plotbegin
=
false
;
s_Plotbegin
=
false
;
}
}
else
else
{
{
if
(
PenLastPos
==
pstart
)
// this is a next segment in a polyline
if
(
PenLastPos
==
pstart
)
// this is a next segment in a polyline
...
@@ -341,7 +342,7 @@ static void s_Callback_plot(int x0, int y0, int xf, int yf)
...
@@ -341,7 +342,7 @@ static void s_Callback_plot(int x0, int y0, int xf, int yf)
MovePenFct
(
pend
,
'D'
);
MovePenFct
(
pend
,
'D'
);
}
}
}
}
PenLastPos
=
pend
;
PenLastPos
=
pend
;
}
}
/******************************************************************************************/
/******************************************************************************************/
...
...
common/makefile.include
View file @
f1eb69a1
...
@@ -8,6 +8,7 @@ OBJECTS= \
...
@@ -8,6 +8,7 @@ OBJECTS= \
about_kicad.o
\
about_kicad.o
\
base_struct.o
\
base_struct.o
\
basicframe.o
\
basicframe.o
\
drawframe.o
\
confirm.o
\
confirm.o
\
copy_to_clipboard.o
\
copy_to_clipboard.o
\
class_drawpickedstruct.o
\
class_drawpickedstruct.o
\
...
@@ -36,7 +37,8 @@ OBJECTS= \
...
@@ -36,7 +37,8 @@ OBJECTS= \
eda_dde.o
\
eda_dde.o
\
worksheet.o
\
worksheet.o
\
base_screen.o
\
base_screen.o
\
dcsvg.o
dcsvg.o
\
zoom.o
ifdef
KICAD_PYTHON
ifdef
KICAD_PYTHON
OBJECTS
+=
pyhandler.o
OBJECTS
+=
pyhandler.o
...
...
common/zoom.cpp
View file @
f1eb69a1
...
@@ -215,7 +215,7 @@ void WinEDA_DrawPanel::Process_Popup_Zoom( wxCommandEvent& event )
...
@@ -215,7 +215,7 @@ void WinEDA_DrawPanel::Process_Popup_Zoom( wxCommandEvent& event )
void
WinEDA_DrawPanel
::
OnPopupGridSelect
(
wxCommandEvent
&
event
)
void
WinEDA_DrawPanel
::
OnPopupGridSelect
(
wxCommandEvent
&
event
)
{
{
GetScreen
()
->
SetGrid
(
event
.
GetId
()
);
GetScreen
()
->
SetGrid
(
event
.
GetId
()
);
m_Parent
->
ReDrawPanel
();
Refresh
();
}
}
/*************************************************************/
/*************************************************************/
...
...
cvpcb/dialog_display_options.cpp
View file @
f1eb69a1
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// Name: dialog_display_options.cpp
// Name: dialog_display_options.cpp
// Purpose:
// Purpose:
// Author: jean-pierre Charras
// Author: jean-pierre Charras
// Modified by:
// Modified by:
// Created: 17/02/2006 17:47:55
// Created: 17/02/2006 17:47:55
// RCS-ID:
// RCS-ID:
// Copyright: License GNU
// Copyright: License GNU
// Licence:
// Licence:
/////////////////////////////////////////////////////////////////////////////
/////////////////////////////////////////////////////////////////////////////
// Generated by DialogBlocks (unregistered), 17/02/2006 17:47:55
// Generated by DialogBlocks (unregistered), 17/02/2006 17:47:55
...
@@ -130,7 +130,7 @@ bool WinEDA_FootprintDisplayOptionsFrame::Create( wxWindow* parent, wxWindowID i
...
@@ -130,7 +130,7 @@ bool WinEDA_FootprintDisplayOptionsFrame::Create( wxWindow* parent, wxWindowID i
*/
*/
void
WinEDA_FootprintDisplayOptionsFrame
::
CreateControls
()
void
WinEDA_FootprintDisplayOptionsFrame
::
CreateControls
()
{
{
SetFont
(
*
g_DialogFont
);
SetFont
(
*
g_DialogFont
);
////@begin WinEDA_FootprintDisplayOptionsFrame content construction
////@begin WinEDA_FootprintDisplayOptionsFrame content construction
...
@@ -252,7 +252,7 @@ void WinEDA_FootprintDisplayOptionsFrame::UpdateObjectSettings(void)
...
@@ -252,7 +252,7 @@ void WinEDA_FootprintDisplayOptionsFrame::UpdateObjectSettings(void)
DisplayOpt
.
DisplayModEdge
=
m_Parent
->
m_DisplayModEdge
=
DisplayOpt
.
DisplayModEdge
=
m_Parent
->
m_DisplayModEdge
=
m_EdgesDisplayOption
->
GetSelection
();
m_EdgesDisplayOption
->
GetSelection
();
DisplayOpt
.
DisplayModText
=
m_Parent
->
m_DisplayModText
=
DisplayOpt
.
DisplayModText
=
m_Parent
->
m_DisplayModText
=
m_TextDisplayOption
->
GetSelection
();
m_TextDisplayOption
->
GetSelection
();
DisplayOpt
.
DisplayPadNum
=
m_Parent
->
m_DisplayPadNum
=
DisplayOpt
.
DisplayPadNum
=
m_Parent
->
m_DisplayPadNum
=
...
@@ -261,7 +261,7 @@ void WinEDA_FootprintDisplayOptionsFrame::UpdateObjectSettings(void)
...
@@ -261,7 +261,7 @@ void WinEDA_FootprintDisplayOptionsFrame::UpdateObjectSettings(void)
DisplayOpt
.
DisplayPadFill
=
m_Parent
->
m_DisplayPadFill
=
DisplayOpt
.
DisplayPadFill
=
m_Parent
->
m_DisplayPadFill
=
m_IsShowPadFill
->
GetValue
();
m_IsShowPadFill
->
GetValue
();
m_Parent
->
ReDrawPanel
();
m_Parent
->
DrawPanel
->
Refresh
();
////@end WinEDA_FootprintDisplayOptionsFrame update settings
////@end WinEDA_FootprintDisplayOptionsFrame update settings
}
}
...
...
cvpcb/makefile.include
View file @
f1eb69a1
...
@@ -20,7 +20,6 @@ OBJECTS = $(TARGET).o \
...
@@ -20,7 +20,6 @@ OBJECTS = $(TARGET).o \
memoire.o
\
memoire.o
\
cvframe.o
\
cvframe.o
\
listboxes.o
\
listboxes.o
\
drawframe.o
\
class_pcb_text.o
\
class_pcb_text.o
\
class_cotation.o
\
class_cotation.o
\
class_mire.o
\
class_mire.o
\
...
@@ -39,7 +38,6 @@ OBJECTS = $(TARGET).o \
...
@@ -39,7 +38,6 @@ OBJECTS = $(TARGET).o \
autosel.o
\
autosel.o
\
setvisu.o
\
setvisu.o
\
dialog_display_options.o
\
dialog_display_options.o
\
zoom.o
\
tracemod.o
\
tracemod.o
\
classpcb.o
\
classpcb.o
\
class_drawsegment.o
\
class_drawsegment.o
\
...
@@ -153,9 +151,6 @@ autosel.o: autosel.cpp
...
@@ -153,9 +151,6 @@ autosel.o: autosel.cpp
setvisu.o
:
setvisu.cpp
setvisu.o
:
setvisu.cpp
zoom.o
:
../share/zoom.cpp
$(CXX)
-c
$(EDACPPFLAGS)
-o
$@
../share/
$*
.cpp
tracemod.o
:
../pcbnew/tracemod.cpp ../include/gr_basic.h
tracemod.o
:
../pcbnew/tracemod.cpp ../include/gr_basic.h
$(CXX)
-c
$(EDACPPFLAGS)
-o
$@
../pcbnew/
$*
.cpp
$(CXX)
-c
$(EDACPPFLAGS)
-o
$@
../pcbnew/
$*
.cpp
...
...
eeschema/dialog_edit_label_base.cpp
View file @
f1eb69a1
...
@@ -31,7 +31,7 @@ DialogLabelEditor_Base::DialogLabelEditor_Base( wxWindow* parent, wxWindowID id,
...
@@ -31,7 +31,7 @@ DialogLabelEditor_Base::DialogLabelEditor_Base( wxWindow* parent, wxWindowID id,
wxString
m_TextOrientChoices
[]
=
{
_
(
"Right"
),
_
(
"Up"
),
_
(
"Left"
),
_
(
"Down"
)
};
wxString
m_TextOrientChoices
[]
=
{
_
(
"Right"
),
_
(
"Up"
),
_
(
"Left"
),
_
(
"Down"
)
};
int
m_TextOrientNChoices
=
sizeof
(
m_TextOrientChoices
)
/
sizeof
(
wxString
);
int
m_TextOrientNChoices
=
sizeof
(
m_TextOrientChoices
)
/
sizeof
(
wxString
);
m_TextOrient
=
new
wxRadioBox
(
this
,
wxID_ANY
,
_
(
"
wxRadioBox
"
),
wxDefaultPosition
,
wxDefaultSize
,
m_TextOrientNChoices
,
m_TextOrientChoices
,
1
,
wxRA_SPECIFY_COLS
);
m_TextOrient
=
new
wxRadioBox
(
this
,
wxID_ANY
,
_
(
"
Direction
"
),
wxDefaultPosition
,
wxDefaultSize
,
m_TextOrientNChoices
,
m_TextOrientChoices
,
1
,
wxRA_SPECIFY_COLS
);
m_TextOrient
->
SetSelection
(
0
);
m_TextOrient
->
SetSelection
(
0
);
m_OptionsSizer
->
Add
(
m_TextOrient
,
0
,
wxALL
,
5
);
m_OptionsSizer
->
Add
(
m_TextOrient
,
0
,
wxALL
,
5
);
...
...
eeschema/dialog_edit_label_base.fbp
View file @
f1eb69a1
...
@@ -212,7 +212,7 @@
...
@@ -212,7 +212,7 @@
<property
name=
"font"
></property>
<property
name=
"font"
></property>
<property
name=
"hidden"
>
0
</property>
<property
name=
"hidden"
>
0
</property>
<property
name=
"id"
>
wxID_ANY
</property>
<property
name=
"id"
>
wxID_ANY
</property>
<property
name=
"label"
>
wxRadioBox
</property>
<property
name=
"label"
>
Direction
</property>
<property
name=
"majorDimension"
>
1
</property>
<property
name=
"majorDimension"
>
1
</property>
<property
name=
"maximum_size"
></property>
<property
name=
"maximum_size"
></property>
<property
name=
"minimum_size"
></property>
<property
name=
"minimum_size"
></property>
...
...
eeschema/eelayer.cpp
View file @
f1eb69a1
...
@@ -370,7 +370,7 @@ void WinEDA_SetColorsFrame::OnOkClick( wxCommandEvent& WXUNUSED (event) )
...
@@ -370,7 +370,7 @@ void WinEDA_SetColorsFrame::OnOkClick( wxCommandEvent& WXUNUSED (event) )
/**********************************************************************/
/**********************************************************************/
{
{
UpdateLayerSettings
();
UpdateLayerSettings
();
m_Parent
->
ReDrawPanel
();
m_Parent
->
DrawPanel
->
Refresh
();
EndModal
(
1
);
EndModal
(
1
);
}
}
...
@@ -388,7 +388,7 @@ void WinEDA_SetColorsFrame::OnApplyClick( wxCommandEvent& WXUNUSED (event) )
...
@@ -388,7 +388,7 @@ void WinEDA_SetColorsFrame::OnApplyClick( wxCommandEvent& WXUNUSED (event) )
/*******************************************************************/
/*******************************************************************/
{
{
UpdateLayerSettings
();
UpdateLayerSettings
();
m_Parent
->
ReDrawPanel
();
m_Parent
->
DrawPanel
->
Refresh
();
}
}
...
...
eeschema/files-io.cpp
View file @
f1eb69a1
...
@@ -125,7 +125,7 @@ int WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName,
...
@@ -125,7 +125,7 @@ int WinEDA_SchematicFrame::LoadOneEEProject( const wxString& FileName,
Read_Config
(
wxEmptyString
,
TRUE
);
Read_Config
(
wxEmptyString
,
TRUE
);
Zoom_Automatique
(
TRUE
);
Zoom_Automatique
(
TRUE
);
SetSheetNumberAndCount
();
SetSheetNumberAndCount
();
ReDrawPanel
();
DrawPanel
->
Refresh
();
return
1
;
return
1
;
}
}
...
...
eeschema/lib_export.cpp
View file @
f1eb69a1
...
@@ -64,7 +64,7 @@ void WinEDA_LibeditFrame::ImportOnePart()
...
@@ -64,7 +64,7 @@ void WinEDA_LibeditFrame::ImportOnePart()
{
{
ReCreateHToolbar
();
ReCreateHToolbar
();
DisplayLibInfos
();
DisplayLibInfos
();
ReDrawPanel
();
DrawPanel
->
Refresh
();
}
}
}
}
...
...
eeschema/libedit.cpp
View file @
f1eb69a1
...
@@ -117,7 +117,7 @@ EDA_LibComponentStruct *LibEntry = NULL;
...
@@ -117,7 +117,7 @@ EDA_LibComponentStruct *LibEntry = NULL;
LoadOneLibraryPartAux
(
LibEntry
,
CurrentLib
);
LoadOneLibraryPartAux
(
LibEntry
,
CurrentLib
);
ReCreateHToolbar
();
ReCreateHToolbar
();
Zoom_Automatique
(
FALSE
);
Zoom_Automatique
(
FALSE
);
ReDrawPanel
();
DrawPanel
->
Refresh
();
return
TRUE
;
return
TRUE
;
}
}
...
...
eeschema/libframe.cpp
View file @
f1eb69a1
...
@@ -351,7 +351,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
...
@@ -351,7 +351,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
LibItemToRepeat
=
NULL
;
LibItemToRepeat
=
NULL
;
CreateNewLibraryPart
();
CreateNewLibraryPart
();
GetScreen
()
->
ClearUndoRedoList
();
GetScreen
()
->
ClearUndoRedoList
();
ReDrawPanel
();
DrawPanel
->
Refresh
();
SetToolbars
();
SetToolbars
();
break
;
break
;
}
}
...
@@ -368,7 +368,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
...
@@ -368,7 +368,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
GetScreen
()
->
ClearUndoRedoList
();
GetScreen
()
->
ClearUndoRedoList
();
SetToolbars
();
SetToolbars
();
}
}
ReDrawPanel
();
DrawPanel
->
Refresh
();
break
;
break
;
case
ID_LIBEDIT_SAVE_CURRENT_PART
:
case
ID_LIBEDIT_SAVE_CURRENT_PART
:
...
@@ -388,7 +388,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
...
@@ -388,7 +388,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
LibItemToRepeat
=
NULL
;
LibItemToRepeat
=
NULL
;
ImportOnePart
();
ImportOnePart
();
GetScreen
()
->
ClearUndoRedoList
();
GetScreen
()
->
ClearUndoRedoList
();
ReDrawPanel
();
DrawPanel
->
Refresh
();
break
;
break
;
case
ID_LIBEDIT_EXPORT_PART
:
case
ID_LIBEDIT_EXPORT_PART
:
...
@@ -410,7 +410,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
...
@@ -410,7 +410,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
m_HToolBar
->
ToggleTool
(
ID_DE_MORGAN_CONVERT_BUTT
,
FALSE
);
m_HToolBar
->
ToggleTool
(
ID_DE_MORGAN_CONVERT_BUTT
,
FALSE
);
LibItemToRepeat
=
NULL
;
LibItemToRepeat
=
NULL
;
CurrentConvert
=
1
;
CurrentConvert
=
1
;
ReDrawPanel
();
DrawPanel
->
Refresh
();
break
;
break
;
case
ID_DE_MORGAN_CONVERT_BUTT
:
case
ID_DE_MORGAN_CONVERT_BUTT
:
...
@@ -418,7 +418,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
...
@@ -418,7 +418,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
m_HToolBar
->
ToggleTool
(
ID_DE_MORGAN_CONVERT_BUTT
,
TRUE
);
m_HToolBar
->
ToggleTool
(
ID_DE_MORGAN_CONVERT_BUTT
,
TRUE
);
LibItemToRepeat
=
NULL
;
LibItemToRepeat
=
NULL
;
CurrentConvert
=
2
;
CurrentConvert
=
2
;
ReDrawPanel
();
DrawPanel
->
Refresh
();
break
;
break
;
case
ID_LIBEDIT_VIEW_DOC
:
case
ID_LIBEDIT_VIEW_DOC
:
...
@@ -451,7 +451,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
...
@@ -451,7 +451,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
return
;
return
;
LibItemToRepeat
=
NULL
;
LibItemToRepeat
=
NULL
;
CurrentUnit
=
ii
+
1
;
CurrentUnit
=
ii
+
1
;
ReDrawPanel
();
DrawPanel
->
Refresh
();
}
}
break
;
break
;
...
@@ -465,7 +465,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
...
@@ -465,7 +465,7 @@ void WinEDA_LibeditFrame::Process_Special_Functions( wxCommandEvent& event )
CurrentAliasName
=
m_SelAliasBox
->
GetValue
();
CurrentAliasName
=
m_SelAliasBox
->
GetValue
();
else
else
CurrentAliasName
.
Empty
();
CurrentAliasName
.
Empty
();
ReDrawPanel
();
DrawPanel
->
Refresh
();
}
}
break
;
break
;
...
...
eeschema/makefile.include
View file @
f1eb69a1
...
@@ -32,7 +32,6 @@ OBJECTS = eeschema.o\
...
@@ -32,7 +32,6 @@ OBJECTS = eeschema.o\
tool_lib.o
\
tool_lib.o
\
tool_sch.o
\
tool_sch.o
\
tool_viewlib.o
\
tool_viewlib.o
\
drawframe.o
\
schframe.o
\
schframe.o
\
viewlib_frame.o
\
viewlib_frame.o
\
wxprint.o
\
wxprint.o
\
...
@@ -48,7 +47,6 @@ OBJECTS = eeschema.o\
...
@@ -48,7 +47,6 @@ OBJECTS = eeschema.o\
eelayer.o
\
eelayer.o
\
priorque.o eeconfig.o
\
priorque.o eeconfig.o
\
affiche.o
\
affiche.o
\
zoom.o
\
getpart.o
\
getpart.o
\
netlist.o
\
netlist.o
\
netlist_control.o
\
netlist_control.o
\
...
@@ -103,9 +101,6 @@ eeschema.o: eeschema.cpp program.h general.h $(DEPEND)
...
@@ -103,9 +101,6 @@ eeschema.o: eeschema.cpp program.h general.h $(DEPEND)
read_from_file_schematic_items_descriptions.o
:
read_from_file_schematic_items_descriptions.cpp
read_from_file_schematic_items_descriptions.o
:
read_from_file_schematic_items_descriptions.cpp
#edit_component_in_lib.o: edit_component_in_lib.cpp\
# dialog_edit_component_in_lib.cpp dialog_edit_component_in_lib.h $(DEPEND)
edit_component_in_schematic.o
:
edit_component_in_schematic.cpp
\
edit_component_in_schematic.o
:
edit_component_in_schematic.cpp
\
dialog_edit_component_in_schematic.cpp dialog_edit_component_in_schematic.h $(DEPEND)
dialog_edit_component_in_schematic.cpp dialog_edit_component_in_schematic.h $(DEPEND)
...
@@ -150,15 +145,6 @@ setpage.o: ../share/setpage.cpp $(DEPEND)
...
@@ -150,15 +145,6 @@ setpage.o: ../share/setpage.cpp $(DEPEND)
svg_print.o
:
../share/svg_print.cpp ../share/svg_print.h $(DEPEND)
svg_print.o
:
../share/svg_print.cpp ../share/svg_print.h $(DEPEND)
$(CXX)
-c
$(EDACPPFLAGS)
-o
$@
../share/
$*
.cpp
$(CXX)
-c
$(EDACPPFLAGS)
-o
$@
../share/
$*
.cpp
zoom.o
:
../share/zoom.cpp $(DEPEND)
$(CXX)
-c
$(EDACPPFLAGS)
-o
$@
../share/
$*
.cpp
treeprj.o
:
../share/treeprj.cpp $(DEPEND)
$(CXX)
-c
$(EDACPPFLAGS)
-o
$@
../share/
$*
.cpp
mdiframe.o
:
../share/mdiframe.cpp $(DEPEND)
$(CXX)
-c
$(EDACPPFLAGS)
-o
$@
../share/
$*
.cpp
buildmnu.o
:
../share/buildmnu.cpp $(DEPEND)
buildmnu.o
:
../share/buildmnu.cpp $(DEPEND)
$(CXX)
-c
$(EDACPPFLAGS)
-o
$@
../share/
$*
.cpp
$(CXX)
-c
$(EDACPPFLAGS)
-o
$@
../share/
$*
.cpp
...
...
eeschema/plot.cpp
View file @
f1eb69a1
...
@@ -245,15 +245,17 @@ void PlotLibPart( SCH_COMPONENT* DrawLibItem )
...
@@ -245,15 +245,17 @@ void PlotLibPart( SCH_COMPONENT* DrawLibItem )
case
COMPONENT_GRAPHIC_TEXT_DRAW_TYPE
:
case
COMPONENT_GRAPHIC_TEXT_DRAW_TYPE
:
{
{
LibDrawText
*
Text
=
(
LibDrawText
*
)
DEntry
;
LibDrawText
*
Text
=
(
LibDrawText
*
)
DEntry
;
/* The text orientation may need to be flipped if the
/* The text orientation may need to be flipped if the
* transformation matrix causes xy axes to be flipped. */
* transformation matrix causes xy axes to be flipped. */
t1
=
(
TransMat
[
0
][
0
]
!=
0
)
^
(
Text
->
m_Horiz
!=
0
);
t1
=
(
TransMat
[
0
][
0
]
!=
0
)
^
(
Text
->
m_Horiz
!=
0
);
pos
=
TransformCoordinate
(
TransMat
,
Text
->
m_Pos
)
+
DrawLibItem
->
m_Pos
;
pos
=
TransformCoordinate
(
TransMat
,
Text
->
m_Pos
)
+
DrawLibItem
->
m_Pos
;
SetCurrentLineWidth
(
-
1
);
SetCurrentLineWidth
(
-
1
);
int
thickness
=
Text
->
m_Width
;
// @todo: calcultae the pen tickness
int
thickness
=
Text
->
m_Width
;
PlotGraphicText
(
g_PlotFormat
,
pos
,
CharColor
,
if
(
thickness
==
0
)
//
thickness
=
MAX
(
g_PlotPSMinimunLineWidth
,
g_DrawMinimunLineWidth
);
PlotGraphicText
(
g_PlotFormat
,
pos
,
CharColor
,
Text
->
m_Text
,
Text
->
m_Text
,
t1
?
TEXT_ORIENT_HORIZ
:
TEXT_ORIENT_VERT
,
t1
?
TEXT_ORIENT_HORIZ
:
TEXT_ORIENT_VERT
,
Text
->
m_Size
,
Text
->
m_Size
,
...
@@ -465,8 +467,10 @@ static void PlotTextField( SCH_COMPONENT* DrawLibItem,
...
@@ -465,8 +467,10 @@ static void PlotTextField( SCH_COMPONENT* DrawLibItem,
}
}
}
}
SetCurrentLineWidth
(
-
1
);
int
thickness
=
field
->
m_Width
;
int
thickness
=
field
->
m_Width
;
// @todo: calculate the pen tickness
if
(
thickness
==
0
)
thickness
=
MAX
(
g_PlotPSMinimunLineWidth
,
g_DrawMinimunLineWidth
);
SetCurrentLineWidth
(
thickness
);
//@todo not sure what to do here in terms of plotting components that may have multiple REFERENCE entries.
//@todo not sure what to do here in terms of plotting components that may have multiple REFERENCE entries.
if
(
!
IsMulti
||
(
FieldNumber
!=
REFERENCE
)
)
if
(
!
IsMulti
||
(
FieldNumber
!=
REFERENCE
)
)
...
@@ -651,7 +655,6 @@ void PlotTextStruct( EDA_BaseStruct* Struct )
...
@@ -651,7 +655,6 @@ void PlotTextStruct( EDA_BaseStruct* Struct )
if
(
Size
.
x
==
0
)
if
(
Size
.
x
==
0
)
Size
=
wxSize
(
DEFAULT_SIZE_TEXT
,
DEFAULT_SIZE_TEXT
);
Size
=
wxSize
(
DEFAULT_SIZE_TEXT
,
DEFAULT_SIZE_TEXT
);
SetCurrentLineWidth
(
-
1
);
if
(
Struct
->
Type
()
==
TYPE_SCH_GLOBALLABEL
)
if
(
Struct
->
Type
()
==
TYPE_SCH_GLOBALLABEL
)
{
{
offset
=
(
(
SCH_GLOBALLABEL
*
)
Struct
)
->
m_Width
;
offset
=
(
(
SCH_GLOBALLABEL
*
)
Struct
)
->
m_Width
;
...
@@ -672,6 +675,9 @@ void PlotTextStruct( EDA_BaseStruct* Struct )
...
@@ -672,6 +675,9 @@ void PlotTextStruct( EDA_BaseStruct* Struct )
}
}
}
}
if
(
thickness
==
0
)
thickness
=
MAX
(
g_PlotPSMinimunLineWidth
,
g_DrawMinimunLineWidth
);
SetCurrentLineWidth
(
thickness
);
switch
(
Orient
)
switch
(
Orient
)
{
{
...
@@ -767,6 +773,10 @@ static void PlotSheetLabelStruct( Hierarchical_PIN_Sheet_Struct* Struct )
...
@@ -767,6 +773,10 @@ static void PlotSheetLabelStruct( Hierarchical_PIN_Sheet_Struct* Struct )
side
=
GR_TEXT_HJUSTIFY_LEFT
;
side
=
GR_TEXT_HJUSTIFY_LEFT
;
}
}
int
thickness
=
Struct
->
m_Width
;
int
thickness
=
Struct
->
m_Width
;
if
(
thickness
==
0
)
thickness
=
MAX
(
g_PlotPSMinimunLineWidth
,
g_DrawMinimunLineWidth
);
SetCurrentLineWidth
(
thickness
);
bool
italic
=
Struct
->
m_Italic
;
bool
italic
=
Struct
->
m_Italic
;
PlotGraphicText
(
g_PlotFormat
,
wxPoint
(
tposx
,
posy
),
txtcolor
,
PlotGraphicText
(
g_PlotFormat
,
wxPoint
(
tposx
,
posy
),
txtcolor
,
Struct
->
m_Text
,
TEXT_ORIENT_HORIZ
,
wxSize
(
size
,
size
),
Struct
->
m_Text
,
TEXT_ORIENT_HORIZ
,
wxSize
(
size
,
size
),
...
@@ -834,7 +844,8 @@ void PlotSheetStruct( DrawSheetStruct* Struct )
...
@@ -834,7 +844,8 @@ void PlotSheetStruct( DrawSheetStruct* Struct )
if
(
(
g_PlotFormat
==
PLOT_FORMAT_POST
)
&&
g_PlotPSColorOpt
)
if
(
(
g_PlotFormat
==
PLOT_FORMAT_POST
)
&&
g_PlotPSColorOpt
)
SetColorMapPS
(
ReturnLayerColor
(
Struct
->
m_Layer
)
);
SetColorMapPS
(
ReturnLayerColor
(
Struct
->
m_Layer
)
);
SetCurrentLineWidth
(
-
1
);
int
thickness
=
MAX
(
g_PlotPSMinimunLineWidth
,
g_DrawMinimunLineWidth
);
SetCurrentLineWidth
(
thickness
);
Move_Plume
(
Struct
->
m_Pos
,
'U'
);
Move_Plume
(
Struct
->
m_Pos
,
'U'
);
pos
=
Struct
->
m_Pos
;
pos
.
x
+=
Struct
->
m_Size
.
x
;
pos
=
Struct
->
m_Pos
;
pos
.
x
+=
Struct
->
m_Size
.
x
;
...
@@ -850,7 +861,7 @@ void PlotSheetStruct( DrawSheetStruct* Struct )
...
@@ -850,7 +861,7 @@ void PlotSheetStruct( DrawSheetStruct* Struct )
Plume
(
'U'
);
Plume
(
'U'
);
/*
Trace des textes
: SheetName */
/*
Draw texts
: SheetName */
Text
=
Struct
->
m_SheetName
;
Text
=
Struct
->
m_SheetName
;
size
=
wxSize
(
Struct
->
m_SheetNameSize
,
Struct
->
m_SheetNameSize
);
size
=
wxSize
(
Struct
->
m_SheetNameSize
,
Struct
->
m_SheetNameSize
);
pos
=
Struct
->
m_Pos
;
pos
.
y
-=
4
;
pos
=
Struct
->
m_Pos
;
pos
.
y
-=
4
;
...
@@ -858,14 +869,13 @@ void PlotSheetStruct( DrawSheetStruct* Struct )
...
@@ -858,14 +869,13 @@ void PlotSheetStruct( DrawSheetStruct* Struct )
if
(
(
g_PlotFormat
==
PLOT_FORMAT_POST
)
&&
g_PlotPSColorOpt
)
if
(
(
g_PlotFormat
==
PLOT_FORMAT_POST
)
&&
g_PlotPSColorOpt
)
SetColorMapPS
(
ReturnLayerColor
(
LAYER_SHEETNAME
)
);
SetColorMapPS
(
ReturnLayerColor
(
LAYER_SHEETNAME
)
);
int
thickness
=
0
;
//@todo use current pen width
bool
italic
=
false
;
bool
italic
=
false
;
PlotGraphicText
(
g_PlotFormat
,
pos
,
txtcolor
,
PlotGraphicText
(
g_PlotFormat
,
pos
,
txtcolor
,
Text
,
TEXT_ORIENT_HORIZ
,
size
,
Text
,
TEXT_ORIENT_HORIZ
,
size
,
GR_TEXT_HJUSTIFY_LEFT
,
GR_TEXT_VJUSTIFY_BOTTOM
,
GR_TEXT_HJUSTIFY_LEFT
,
GR_TEXT_VJUSTIFY_BOTTOM
,
thickness
,
italic
);
thickness
,
italic
);
/*
Trace des texte
s : FileName */
/*
Draw text
s : FileName */
Text
=
Struct
->
GetFileName
();
Text
=
Struct
->
GetFileName
();
size
=
wxSize
(
Struct
->
m_FileNameSize
,
Struct
->
m_FileNameSize
);
size
=
wxSize
(
Struct
->
m_FileNameSize
,
Struct
->
m_FileNameSize
);
...
@@ -879,7 +889,7 @@ void PlotSheetStruct( DrawSheetStruct* Struct )
...
@@ -879,7 +889,7 @@ void PlotSheetStruct( DrawSheetStruct* Struct )
GR_TEXT_HJUSTIFY_LEFT
,
GR_TEXT_VJUSTIFY_TOP
,
GR_TEXT_HJUSTIFY_LEFT
,
GR_TEXT_VJUSTIFY_TOP
,
thickness
,
italic
);
thickness
,
italic
);
/*
Trace des texte
s : SheetLabel */
/*
Draw text
s : SheetLabel */
SheetLabelStruct
=
Struct
->
m_Label
;
SheetLabelStruct
=
Struct
->
m_Label
;
if
(
(
g_PlotFormat
==
PLOT_FORMAT_POST
)
&&
g_PlotPSColorOpt
)
if
(
(
g_PlotFormat
==
PLOT_FORMAT_POST
)
&&
g_PlotPSColorOpt
)
SetColorMapPS
(
ReturnLayerColor
(
Struct
->
m_Layer
)
);
SetColorMapPS
(
ReturnLayerColor
(
Struct
->
m_Layer
)
);
...
...
eeschema/read_from_file_schematic_items_descriptions.cpp
View file @
f1eb69a1
...
@@ -33,7 +33,7 @@ SCH_ITEM* ReadTextDescr( FILE * aFile,
...
@@ -33,7 +33,7 @@ SCH_ITEM* ReadTextDescr( FILE * aFile,
char
Name1
[
256
];
char
Name1
[
256
];
char
Name2
[
256
];
char
Name2
[
256
];
char
Name3
[
256
];
char
Name3
[
256
];
int
width
=
0
,
size
=
0
,
orient
=
0
;
int
thickness
=
0
,
size
=
0
,
orient
=
0
;
wxPoint
pos
;
wxPoint
pos
;
char
*
SLine
=
aLine
;
char
*
SLine
=
aLine
;
...
@@ -45,7 +45,7 @@ SCH_ITEM* ReadTextDescr( FILE * aFile,
...
@@ -45,7 +45,7 @@ SCH_ITEM* ReadTextDescr( FILE * aFile,
Name1
[
0
]
=
0
;
Name2
[
0
]
=
0
;
Name3
[
0
]
=
0
;
Name1
[
0
]
=
0
;
Name2
[
0
]
=
0
;
Name3
[
0
]
=
0
;
int
ii
=
sscanf
(
SLine
,
"%s %d %d %d %d %s %s %d"
,
int
ii
=
sscanf
(
SLine
,
"%s %d %d %d %d %s %s %d"
,
Name1
,
&
pos
.
x
,
&
pos
.
y
,
&
orient
,
&
size
,
Name2
,
Name3
,
&
width
);
Name1
,
&
pos
.
x
,
&
pos
.
y
,
&
orient
,
&
size
,
Name2
,
Name3
,
&
thickness
);
if
(
ii
<
4
)
if
(
ii
<
4
)
{
{
...
@@ -75,7 +75,11 @@ SCH_ITEM* ReadTextDescr( FILE * aFile,
...
@@ -75,7 +75,11 @@ SCH_ITEM* ReadTextDescr( FILE * aFile,
TextStruct
->
m_Size
.
x
=
TextStruct
->
m_Size
.
y
=
size
;
TextStruct
->
m_Size
.
x
=
TextStruct
->
m_Size
.
y
=
size
;
TextStruct
->
m_Orient
=
orient
;
TextStruct
->
m_Orient
=
orient
;
TextStruct
->
m_Width
=
width
;
if
(
isdigit
(
Name3
[
0
])
)
{
thickness
=
atol
(
Name3
);
TextStruct
->
m_Width
=
thickness
;
}
Struct
=
TextStruct
;
Struct
=
TextStruct
;
if
(
stricmp
(
Name2
,
"Italic"
)
==
0
)
if
(
stricmp
(
Name2
,
"Italic"
)
==
0
)
TextStruct
->
m_Italic
=
1
;
TextStruct
->
m_Italic
=
1
;
...
@@ -88,7 +92,7 @@ SCH_ITEM* ReadTextDescr( FILE * aFile,
...
@@ -88,7 +92,7 @@ SCH_ITEM* ReadTextDescr( FILE * aFile,
TextStruct
->
m_Size
.
x
=
TextStruct
->
m_Size
.
y
=
size
;
TextStruct
->
m_Size
.
x
=
TextStruct
->
m_Size
.
y
=
size
;
TextStruct
->
m_Orient
=
orient
;
TextStruct
->
m_Orient
=
orient
;
TextStruct
->
m_Shape
=
NET_INPUT
;
TextStruct
->
m_Shape
=
NET_INPUT
;
TextStruct
->
m_Width
=
width
;
TextStruct
->
m_Width
=
thickness
;
if
(
stricmp
(
Name2
,
SheetLabelType
[
NET_OUTPUT
]
)
==
0
)
if
(
stricmp
(
Name2
,
SheetLabelType
[
NET_OUTPUT
]
)
==
0
)
TextStruct
->
m_Shape
=
NET_OUTPUT
;
TextStruct
->
m_Shape
=
NET_OUTPUT
;
...
@@ -109,7 +113,7 @@ SCH_ITEM* ReadTextDescr( FILE * aFile,
...
@@ -109,7 +113,7 @@ SCH_ITEM* ReadTextDescr( FILE * aFile,
TextStruct
->
m_Size
.
x
=
TextStruct
->
m_Size
.
y
=
size
;
TextStruct
->
m_Size
.
x
=
TextStruct
->
m_Size
.
y
=
size
;
TextStruct
->
m_Orient
=
orient
;
TextStruct
->
m_Orient
=
orient
;
TextStruct
->
m_Shape
=
NET_INPUT
;
TextStruct
->
m_Shape
=
NET_INPUT
;
TextStruct
->
m_Width
=
width
;
TextStruct
->
m_Width
=
thickness
;
if
(
stricmp
(
Name2
,
SheetLabelType
[
NET_OUTPUT
]
)
==
0
)
if
(
stricmp
(
Name2
,
SheetLabelType
[
NET_OUTPUT
]
)
==
0
)
TextStruct
->
m_Shape
=
NET_OUTPUT
;
TextStruct
->
m_Shape
=
NET_OUTPUT
;
...
@@ -129,7 +133,11 @@ SCH_ITEM* ReadTextDescr( FILE * aFile,
...
@@ -129,7 +133,11 @@ SCH_ITEM* ReadTextDescr( FILE * aFile,
TextStruct
->
m_Size
.
x
=
TextStruct
->
m_Size
.
y
=
size
;
TextStruct
->
m_Size
.
x
=
TextStruct
->
m_Size
.
y
=
size
;
TextStruct
->
m_Orient
=
orient
;
TextStruct
->
m_Orient
=
orient
;
TextStruct
->
m_Width
=
width
;
if
(
isdigit
(
Name3
[
0
])
)
{
thickness
=
atol
(
Name3
);
TextStruct
->
m_Width
=
thickness
;
}
if
(
strnicmp
(
Name2
,
"Italic"
,
6
)
==
0
)
if
(
strnicmp
(
Name2
,
"Italic"
,
6
)
==
0
)
TextStruct
->
m_Italic
=
1
;
TextStruct
->
m_Italic
=
1
;
...
...
eeschema/symbdraw.cpp
View file @
f1eb69a1
...
@@ -126,7 +126,7 @@ bodygraphics_PropertiesAccept( wxCommandEvent& event )
...
@@ -126,7 +126,7 @@ bodygraphics_PropertiesAccept( wxCommandEvent& event )
if
(
CurrentDrawItem
)
if
(
CurrentDrawItem
)
CurrentDrawItem
->
Display_Infos_DrawEntry
(
m_Parent
);
CurrentDrawItem
->
Display_Infos_DrawEntry
(
m_Parent
);
m_Parent
->
ReDrawPanel
();
m_Parent
->
DrawPanel
->
Refresh
();
}
}
...
...
eeschema/tool_sch.cpp
View file @
f1eb69a1
...
@@ -293,7 +293,7 @@ void WinEDA_SchematicFrame::OnSelectOptionToolbar( wxCommandEvent& event )
...
@@ -293,7 +293,7 @@ void WinEDA_SchematicFrame::OnSelectOptionToolbar( wxCommandEvent& event )
{
{
case
ID_TB_OPTIONS_SHOW_GRID
:
case
ID_TB_OPTIONS_SHOW_GRID
:
g_ShowGrid
=
m_Draw_Grid
=
m_OptionsToolBar
->
GetToolState
(
id
);
g_ShowGrid
=
m_Draw_Grid
=
m_OptionsToolBar
->
GetToolState
(
id
);
ReDrawPanel
();
DrawPanel
->
Refresh
();
break
;
break
;
case
ID_TB_OPTIONS_SELECT_UNIT_MM
:
case
ID_TB_OPTIONS_SELECT_UNIT_MM
:
...
...
eeschema/viewlib_frame.cpp
View file @
f1eb69a1
...
@@ -242,7 +242,7 @@ void WinEDA_ViewlibFrame::ReCreateListLib()
...
@@ -242,7 +242,7 @@ void WinEDA_ViewlibFrame::ReCreateListLib()
ReCreateListCmp
();
ReCreateListCmp
();
ReCreateHToolbar
();
ReCreateHToolbar
();
DisplayLibInfos
();
DisplayLibInfos
();
ReDrawPanel
();
DrawPanel
->
Refresh
();
}
}
...
@@ -283,7 +283,7 @@ void WinEDA_ViewlibFrame::ClickOnLibList( wxCommandEvent& event )
...
@@ -283,7 +283,7 @@ void WinEDA_ViewlibFrame::ClickOnLibList( wxCommandEvent& event )
return
;
return
;
g_CurrentViewLibraryName
=
name
;
g_CurrentViewLibraryName
=
name
;
ReCreateListCmp
();
ReCreateListCmp
();
ReDrawPanel
();
DrawPanel
->
Refresh
();
DisplayLibInfos
();
DisplayLibInfos
();
ReCreateHToolbar
();
ReCreateHToolbar
();
}
}
...
@@ -305,7 +305,7 @@ void WinEDA_ViewlibFrame::ClickOnCmpList( wxCommandEvent& event )
...
@@ -305,7 +305,7 @@ void WinEDA_ViewlibFrame::ClickOnCmpList( wxCommandEvent& event )
g_ViewConvert
=
1
;
g_ViewConvert
=
1
;
Zoom_Automatique
(
FALSE
);
Zoom_Automatique
(
FALSE
);
ReCreateHToolbar
();
ReCreateHToolbar
();
ReDrawPanel
();
DrawPanel
->
Refresh
();
}
}
...
...
eeschema/viewlibs.cpp
View file @
f1eb69a1
...
@@ -63,21 +63,21 @@ wxPoint pos;
...
@@ -63,21 +63,21 @@ wxPoint pos;
m_HToolBar
->
ToggleTool
(
ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT
,
TRUE
);
m_HToolBar
->
ToggleTool
(
ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT
,
TRUE
);
m_HToolBar
->
ToggleTool
(
ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT
,
FALSE
);
m_HToolBar
->
ToggleTool
(
ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT
,
FALSE
);
g_ViewConvert
=
1
;
g_ViewConvert
=
1
;
ReDrawPanel
();
DrawPanel
->
Refresh
();
break
;
break
;
case
ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT
:
case
ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT
:
m_HToolBar
->
ToggleTool
(
ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT
,
FALSE
);
m_HToolBar
->
ToggleTool
(
ID_LIBVIEW_DE_MORGAN_NORMAL_BUTT
,
FALSE
);
m_HToolBar
->
ToggleTool
(
ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT
,
TRUE
);
m_HToolBar
->
ToggleTool
(
ID_LIBVIEW_DE_MORGAN_CONVERT_BUTT
,
TRUE
);
g_ViewConvert
=
2
;
g_ViewConvert
=
2
;
ReDrawPanel
();
DrawPanel
->
Refresh
();
break
;
break
;
case
ID_LIBVIEW_SELECT_PART_NUMBER
:
case
ID_LIBVIEW_SELECT_PART_NUMBER
:
ii
=
SelpartBox
->
GetChoice
();
ii
=
SelpartBox
->
GetChoice
();
if
(
ii
<
0
)
return
;
if
(
ii
<
0
)
return
;
g_ViewUnit
=
ii
+
1
;
g_ViewUnit
=
ii
+
1
;
ReDrawPanel
();
DrawPanel
->
Refresh
();
break
;
break
;
default
:
default
:
...
@@ -143,7 +143,7 @@ LibraryStruct * Lib;
...
@@ -143,7 +143,7 @@ LibraryStruct * Lib;
if
(
m_LibList
)
if
(
m_LibList
)
{
{
ReCreateListCmp
();
ReCreateListCmp
();
ReDrawPanel
();
DrawPanel
->
Refresh
();
DisplayLibInfos
();
DisplayLibInfos
();
ReCreateHToolbar
();
ReCreateHToolbar
();
int
id
=
m_LibList
->
FindString
(
g_CurrentViewLibraryName
.
GetData
());
int
id
=
m_LibList
->
FindString
(
g_CurrentViewLibraryName
.
GetData
());
...
...
gerbview/makefile.include
View file @
f1eb69a1
...
@@ -27,7 +27,6 @@ OBJECTS= \
...
@@ -27,7 +27,6 @@ OBJECTS= \
class_track.o
\
class_track.o
\
class_drc_item.o
\
class_drc_item.o
\
class_board_connected_item.o
\
class_board_connected_item.o
\
drawframe.o
\
set_color.o
\
set_color.o
\
gerbview_config.o
\
gerbview_config.o
\
class_marker.o
\
class_marker.o
\
...
@@ -35,7 +34,6 @@ OBJECTS= \
...
@@ -35,7 +34,6 @@ OBJECTS= \
tracepcb.o
\
tracepcb.o
\
class_pcb_text.o
\
class_pcb_text.o
\
trpiste.o
\
trpiste.o
\
zoom.o
\
reglage.o
\
reglage.o
\
options.o
\
options.o
\
initpcb.o
\
initpcb.o
\
...
@@ -106,8 +104,5 @@ collectors.o: ../pcbnew/collectors.cpp
...
@@ -106,8 +104,5 @@ collectors.o: ../pcbnew/collectors.cpp
class_track.o
:
../pcbnew/class_track.cpp
class_track.o
:
../pcbnew/class_track.cpp
$(CXX)
-c
$(EDACPPFLAGS)
-o
$@
../pcbnew/
$*
.cpp
$(CXX)
-c
$(EDACPPFLAGS)
-o
$@
../pcbnew/
$*
.cpp
zoom.o
:
../share/zoom.cpp
$(CXX)
-c
$(EDACPPFLAGS)
-o
$@
../share/
$*
.cpp
undelete.o
:
../pcbnew/undelete.cpp
undelete.o
:
../pcbnew/undelete.cpp
$(CXX)
-c
$(EDACPPFLAGS)
-o
$@
../pcbnew/
$*
.cpp
$(CXX)
-c
$(EDACPPFLAGS)
-o
$@
../pcbnew/
$*
.cpp
gerbview/set_color.cpp
View file @
f1eb69a1
...
@@ -370,7 +370,7 @@ void WinEDA_SetColorsFrame::OnOkClick(wxCommandEvent& WXUNUSED(event))
...
@@ -370,7 +370,7 @@ void WinEDA_SetColorsFrame::OnOkClick(wxCommandEvent& WXUNUSED(event))
/*******************************************************************/
/*******************************************************************/
{
{
UpdateLayerSettings
();
UpdateLayerSettings
();
m_Parent
->
ReDrawPanel
();
m_Parent
->
DrawPanel
->
Refresh
();
EndModal
(
1
);
EndModal
(
1
);
}
}
...
@@ -388,7 +388,7 @@ void WinEDA_SetColorsFrame::OnApplyClick(wxCommandEvent& WXUNUSED(event))
...
@@ -388,7 +388,7 @@ void WinEDA_SetColorsFrame::OnApplyClick(wxCommandEvent& WXUNUSED(event))
/*******************************************************************/
/*******************************************************************/
{
{
UpdateLayerSettings
();
UpdateLayerSettings
();
m_Parent
->
ReDrawPanel
();
m_Parent
->
DrawPanel
->
Refresh
();
}
}
...
...
internat/fr/kicad.mo
View file @
f1eb69a1
No preview for this file type
internat/fr/kicad.po
View file @
f1eb69a1
...
@@ -2,8 +2,8 @@ msgid ""
...
@@ -2,8 +2,8 @@ msgid ""
msgstr ""
msgstr ""
"Project-Id-Version: kicad\n"
"Project-Id-Version: kicad\n"
"Report-Msgid-Bugs-To: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-12-
12 22:29
+0100\n"
"POT-Creation-Date: 2008-12-
20 14:10
+0100\n"
"PO-Revision-Date: 2008-12-
12 22:3
1+0100\n"
"PO-Revision-Date: 2008-12-
20 14:1
1+0100\n"
"Last-Translator: \n"
"Last-Translator: \n"
"Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
"Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
"MIME-Version: 1.0\n"
"MIME-Version: 1.0\n"
...
@@ -1156,13 +1156,7 @@ msgstr "Le texte est la REFERENCE!"
...
@@ -1156,13 +1156,7 @@ msgstr "Le texte est la REFERENCE!"
msgid "Text is VALUE!"
msgid "Text is VALUE!"
msgstr "Le texte est la VALEUR!"
msgstr "Le texte est la VALEUR!"
#: pcbnew/controle.cpp:172
#: pcbnew/modedit.cpp:76
msgid "Selection Clarification"
msgstr "Clarification de la Sélection"
#: pcbnew/class_marker.cpp:133
#: pcbnew/class_marker.cpp:133
#: pcbnew/class_track.cpp:805
#: pcbnew/class_drawsegment.cpp:283
#: pcbnew/class_drawsegment.cpp:283
msgid "Type"
msgid "Type"
msgstr "Type"
msgstr "Type"
...
@@ -1179,40 +1173,6 @@ msgstr "Impossible de drag ce segment: trop de segments connectés"
...
@@ -1179,40 +1173,6 @@ msgstr "Impossible de drag ce segment: trop de segments connectés"
msgid "Unable to drag this segment: two collinear segments"
msgid "Unable to drag this segment: two collinear segments"
msgstr "Impossible de drag ce segment: 2 segments alignés"
msgstr "Impossible de drag ce segment: 2 segments alignés"
#: pcbnew/class_track.cpp:822
msgid "NetName"
msgstr "NetName"
#: pcbnew/class_track.cpp:828
msgid "NetCode"
msgstr "NetCode"
#: pcbnew/class_track.cpp:833
#: pcbnew/class_drawsegment.cpp:298
msgid "Segment"
msgstr "Segment"
#: pcbnew/class_track.cpp:837
msgid "Standard"
msgstr "Standard"
#: pcbnew/class_track.cpp:845
msgid "Flags"
msgstr "Flags"
#: pcbnew/class_track.cpp:858
msgid "Stat"
msgstr "Stat"
#: pcbnew/class_track.cpp:882
msgid "Diam"
msgstr "Diam"
#: pcbnew/class_track.cpp:889
#: pcbnew/class_track.cpp:894
msgid "Drill"
msgstr "Perçage"
#: pcbnew/class_drawsegment.cpp:285
#: pcbnew/class_drawsegment.cpp:285
msgid "Shape"
msgid "Shape"
msgstr "Forme"
msgstr "Forme"
...
@@ -1221,6 +1181,14 @@ msgstr "Forme"
...
@@ -1221,6 +1181,14 @@ msgstr "Forme"
msgid "Angle"
msgid "Angle"
msgstr "Angle"
msgstr "Angle"
#: pcbnew/class_drawsegment.cpp:298
msgid "Segment"
msgstr "Segment"
#: pcbnew/modedit.cpp:76
msgid "Selection Clarification"
msgstr "Clarification de la Sélection"
#: pcbnew/modedit.cpp:269
#: pcbnew/modedit.cpp:269
msgid "Unable to find the footprint source on the main board"
msgid "Unable to find the footprint source on the main board"
msgstr "Impossible de trouver le module source sur le PCB principal"
msgstr "Impossible de trouver le module source sur le PCB principal"
...
@@ -1520,20 +1488,10 @@ msgid "Scale Opt"
...
@@ -1520,20 +1488,10 @@ msgid "Scale Opt"
msgstr "Echelle"
msgstr "Echelle"
#: pcbnew/pcbplot.cpp:423
#: pcbnew/pcbplot.cpp:423
#: pcbnew/dialog_display_options.cpp:192
#: pcbnew/dialog_display_options.cpp:222
#: pcbnew/dialog_display_options.cpp:230
#: pcbnew/dialog_display_options.cpp:245
#: pcbnew/dialog_display_options.cpp:267
msgid "Filled"
msgid "Filled"
msgstr "Plein"
msgstr "Plein"
#: pcbnew/pcbplot.cpp:423
#: pcbnew/pcbplot.cpp:423
#: pcbnew/dialog_display_options.cpp:191
#: pcbnew/dialog_display_options.cpp:223
#: pcbnew/dialog_display_options.cpp:231
#: pcbnew/dialog_display_options.cpp:244
#: pcbnew/dialog_display_options.cpp:268
msgid "Sketch"
msgid "Sketch"
msgstr "Contour"
msgstr "Contour"
...
@@ -1755,6 +1713,10 @@ msgstr "Last Change"
...
@@ -1755,6 +1713,10 @@ msgstr "Last Change"
msgid "Netlist path"
msgid "Netlist path"
msgstr "Chemin Netliste "
msgstr "Chemin Netliste "
#: pcbnew/class_module.cpp:952
msgid "Stat"
msgstr "Stat"
#: pcbnew/class_module.cpp:962
#: pcbnew/class_module.cpp:962
msgid "3D-Shape"
msgid "3D-Shape"
msgstr "Forme 3D"
msgstr "Forme 3D"
...
@@ -1815,15 +1777,15 @@ msgstr "Rotation Bloc"
...
@@ -1815,15 +1777,15 @@ msgstr "Rotation Bloc"
msgid "Zone rotation"
msgid "Zone rotation"
msgstr "Rotation Zones"
msgstr "Rotation Zones"
#: pcbnew/block.cpp:76
7
#: pcbnew/block.cpp:76
5
msgid "Block mirroring"
msgid "Block mirroring"
msgstr "Bloc Miroir"
msgstr "Bloc Miroir"
#: pcbnew/block.cpp:95
3
#: pcbnew/block.cpp:95
0
msgid "Move Block"
msgid "Move Block"
msgstr "Déplacer Bloc"
msgstr "Déplacer Bloc"
#: pcbnew/block.cpp:109
9
#: pcbnew/block.cpp:109
6
msgid "Copy Block"
msgid "Copy Block"
msgstr "Copie Bloc"
msgstr "Copie Bloc"
...
@@ -1967,6 +1929,7 @@ msgid "Keep or delete bad tracks after a netlist change"
...
@@ -1967,6 +1929,7 @@ msgid "Keep or delete bad tracks after a netlist change"
msgstr "Garder ou supprimer les mauvaises pistes après un chnagement de netliste"
msgstr "Garder ou supprimer les mauvaises pistes après un chnagement de netliste"
#: pcbnew/dialog_netlist.cpp:193
#: pcbnew/dialog_netlist.cpp:193
#: pcbnew/dialog_drc.cpp:432
msgid "Options"
msgid "Options"
msgstr "Options"
msgstr "Options"
...
@@ -2261,23 +2224,27 @@ msgstr "Impossible de créer fichier "
...
@@ -2261,23 +2224,27 @@ msgstr "Impossible de créer fichier "
msgid "unable to reopen file <%s>"
msgid "unable to reopen file <%s>"
msgstr "Ne peut pas réouvrir fichier <%s>"
msgstr "Ne peut pas réouvrir fichier <%s>"
#: pcbnew/class_pad.cpp:
788
#: pcbnew/class_pad.cpp:
379
msgid "Unknown Pad shape"
msgid "Unknown Pad shape"
msgstr "Forme Pad inconnue"
msgstr "Forme Pad inconnue"
#: pcbnew/class_pad.cpp:
874
#: pcbnew/class_pad.cpp:
465
msgid "RefP"
msgid "RefP"
msgstr "RefP"
msgstr "RefP"
#: pcbnew/class_pad.cpp:988
#: pcbnew/class_pad.cpp:576
msgid "Drill"
msgstr "Perçage"
#: pcbnew/class_pad.cpp:584
msgid "Drill X / Y"
msgid "Drill X / Y"
msgstr "Perçage X/Y"
msgstr "Perçage X/Y"
#: pcbnew/class_pad.cpp:
1003
#: pcbnew/class_pad.cpp:
599
msgid "X Pos"
msgid "X Pos"
msgstr "X Pos"
msgstr "X Pos"
#: pcbnew/class_pad.cpp:
1007
#: pcbnew/class_pad.cpp:
603
msgid "Y pos"
msgid "Y pos"
msgstr "Y pos"
msgstr "Y pos"
...
@@ -2582,10 +2549,12 @@ msgid "Layer:"
...
@@ -2582,10 +2549,12 @@ msgid "Layer:"
msgstr "Couche:"
msgstr "Couche:"
#: pcbnew/modedit_onclick.cpp:196
#: pcbnew/modedit_onclick.cpp:196
#: pcbnew/onrightclick.cpp:127
msgid "End Tool"
msgid "End Tool"
msgstr "Fin Outil"
msgstr "Fin Outil"
#: pcbnew/modedit_onclick.cpp:206
#: pcbnew/modedit_onclick.cpp:206
#: pcbnew/onrightclick.cpp:450
msgid "Cancel Block"
msgid "Cancel Block"
msgstr "Annuler Bloc"
msgstr "Annuler Bloc"
...
@@ -2594,6 +2563,7 @@ msgid "Zoom Block (drag middle mouse)"
...
@@ -2594,6 +2563,7 @@ msgid "Zoom Block (drag middle mouse)"
msgstr "Zoom Bloc (drag bouton du milieu souris)"
msgstr "Zoom Bloc (drag bouton du milieu souris)"
#: pcbnew/modedit_onclick.cpp:211
#: pcbnew/modedit_onclick.cpp:211
#: pcbnew/onrightclick.cpp:455
msgid "Place Block"
msgid "Place Block"
msgstr "Place Bloc"
msgstr "Place Bloc"
...
@@ -2614,6 +2584,8 @@ msgid "Delete Block (shift+ctrl + drag mouse)"
...
@@ -2614,6 +2584,8 @@ msgid "Delete Block (shift+ctrl + drag mouse)"
msgstr "Effacement Bloc (shift+ctrl + drag mouse)"
msgstr "Effacement Bloc (shift+ctrl + drag mouse)"
#: pcbnew/modedit_onclick.cpp:241
#: pcbnew/modedit_onclick.cpp:241
#: pcbnew/onrightclick.cpp:765
#: pcbnew/onrightclick.cpp:869
msgid "Rotate"
msgid "Rotate"
msgstr "Rotation"
msgstr "Rotation"
...
@@ -2642,14 +2614,17 @@ msgid "Move Pad"
...
@@ -2642,14 +2614,17 @@ msgid "Move Pad"
msgstr "Déplace Pad"
msgstr "Déplace Pad"
#: pcbnew/modedit_onclick.cpp:263
#: pcbnew/modedit_onclick.cpp:263
#: pcbnew/onrightclick.cpp:804
msgid "Edit Pad"
msgid "Edit Pad"
msgstr "Edit Pad"
msgstr "Edit Pad"
#: pcbnew/modedit_onclick.cpp:265
#: pcbnew/modedit_onclick.cpp:265
#: pcbnew/onrightclick.cpp:808
msgid "New Pad Settings"
msgid "New Pad Settings"
msgstr "Nouvelles Caract. Pads"
msgstr "Nouvelles Caract. Pads"
#: pcbnew/modedit_onclick.cpp:267
#: pcbnew/modedit_onclick.cpp:267
#: pcbnew/onrightclick.cpp:812
msgid "Export Pad Settings"
msgid "Export Pad Settings"
msgstr "Exporte Caract. Pads"
msgstr "Exporte Caract. Pads"
...
@@ -2658,6 +2633,7 @@ msgid "delete Pad"
...
@@ -2658,6 +2633,7 @@ msgid "delete Pad"
msgstr "Supprimer Pad"
msgstr "Supprimer Pad"
#: pcbnew/modedit_onclick.cpp:274
#: pcbnew/modedit_onclick.cpp:274
#: pcbnew/onrightclick.cpp:819
msgid "Global Pad Settings"
msgid "Global Pad Settings"
msgstr "Edition Globale des pads"
msgstr "Edition Globale des pads"
...
@@ -2690,6 +2666,9 @@ msgid "Place edge"
...
@@ -2690,6 +2666,9 @@ msgid "Place edge"
msgstr "Place contour"
msgstr "Place contour"
#: pcbnew/modedit_onclick.cpp:306
#: pcbnew/modedit_onclick.cpp:306
#: pcbnew/onrightclick.cpp:733
#: pcbnew/onrightclick.cpp:767
#: pcbnew/onrightclick.cpp:871
msgid "Edit"
msgid "Edit"
msgstr "Editer"
msgstr "Editer"
...
@@ -3275,15 +3254,6 @@ msgstr "Marqueur Suivant"
...
@@ -3275,15 +3254,6 @@ msgstr "Marqueur Suivant"
msgid "GenCAD file:"
msgid "GenCAD file:"
msgstr "Fichier GenCAD:"
msgstr "Fichier GenCAD:"
#: pcbnew/basepcbframe.cpp:171
msgid "3D Frame already opened"
msgstr "Fenetre 3D déjà ouverte"
#: pcbnew/basepcbframe.cpp:176
#: pcbnew/basepcbframe.cpp:179
msgid "3D Viewer"
msgstr "Visu 3D"
#: pcbnew/hotkeys.cpp:465
#: pcbnew/hotkeys.cpp:465
#, c-format
#, c-format
msgid "Footprint %s found, but locked"
msgid "Footprint %s found, but locked"
...
@@ -3754,10 +3724,18 @@ msgstr "N'affiche pas les couches cuivre"
...
@@ -3754,10 +3724,18 @@ msgstr "N'affiche pas les couches cuivre"
msgid "Apply"
msgid "Apply"
msgstr "Appliquer"
msgstr "Appliquer"
#: pcbnew/class_zone.cpp:889
msgid "NetName"
msgstr "NetName"
#: pcbnew/class_zone.cpp:892
#: pcbnew/class_zone.cpp:892
msgid "Non Copper Zone"
msgid "Non Copper Zone"
msgstr "Zone non Cuivre"
msgstr "Zone non Cuivre"
#: pcbnew/class_zone.cpp:897
msgid "NetCode"
msgstr "NetCode"
#: pcbnew/class_zone.cpp:905
#: pcbnew/class_zone.cpp:905
msgid "Corners"
msgid "Corners"
msgstr "Sommets"
msgstr "Sommets"
...
@@ -3803,6 +3781,15 @@ msgstr "%s pin %s non trouvée"
...
@@ -3803,6 +3781,15 @@ msgstr "%s pin %s non trouvée"
msgid "%s pin %s found"
msgid "%s pin %s found"
msgstr "%s pin %s trouvée"
msgstr "%s pin %s trouvée"
#: pcbnew/basepcbframe.cpp:171
msgid "3D Frame already opened"
msgstr "Fenetre 3D déjà ouverte"
#: pcbnew/basepcbframe.cpp:176
#: pcbnew/basepcbframe.cpp:179
msgid "3D Viewer"
msgstr "Visu 3D"
#: pcbnew/dialog_setup_libs.cpp:97
#: pcbnew/dialog_setup_libs.cpp:97
msgid "from "
msgid "from "
msgstr "De "
msgstr "De "
...
@@ -4798,6 +4785,10 @@ msgstr "Orient pad:"
...
@@ -4798,6 +4785,10 @@ msgstr "Orient pad:"
msgid "Pad Orient (0.1 deg)"
msgid "Pad Orient (0.1 deg)"
msgstr "Orient. Pad (0.1 deg)"
msgstr "Orient. Pad (0.1 deg)"
#: pcbnew/dialog_pad_properties_base.cpp:80
msgid "Standard"
msgstr "Standard"
#: pcbnew/dialog_pad_properties_base.cpp:80
#: pcbnew/dialog_pad_properties_base.cpp:80
msgid "SMD"
msgid "SMD"
msgstr "CMS"
msgstr "CMS"
...
@@ -5029,6 +5020,14 @@ msgstr "Référence ou Valeur ne peut etre effacée"
...
@@ -5029,6 +5020,14 @@ msgstr "Référence ou Valeur ne peut etre effacée"
msgid "Delete [%s]"
msgid "Delete [%s]"
msgstr "Supprimer [%s]"
msgstr "Supprimer [%s]"
#: pcbnew/class_track.cpp:912
msgid "Flags"
msgstr "Flags"
#: pcbnew/class_track.cpp:949
msgid "Diam"
msgstr "Diam"
#: eeschema/backanno.cpp:135
#: eeschema/backanno.cpp:135
msgid "Load Stuff File"
msgid "Load Stuff File"
msgstr "Charger Fichier d'échange"
msgstr "Charger Fichier d'échange"
...
@@ -5843,17 +5842,14 @@ msgid "Pin Shape:"
...
@@ -5843,17 +5842,14 @@ msgid "Pin Shape:"
msgstr "Forme Pin:"
msgstr "Forme Pin:"
#: eeschema/pinedit-dialog.cpp:264
#: eeschema/pinedit-dialog.cpp:264
#: eeschema/dialog_edit_label.cpp:160
msgid "Input"
msgid "Input"
msgstr "Entrée"
msgstr "Entrée"
#: eeschema/pinedit-dialog.cpp:265
#: eeschema/pinedit-dialog.cpp:265
#: eeschema/dialog_edit_label.cpp:161
msgid "Output"
msgid "Output"
msgstr "Sortie"
msgstr "Sortie"
#: eeschema/pinedit-dialog.cpp:266
#: eeschema/pinedit-dialog.cpp:266
#: eeschema/dialog_edit_label.cpp:162
msgid "Bidi"
msgid "Bidi"
msgstr "Bidi"
msgstr "Bidi"
...
@@ -5862,7 +5858,6 @@ msgid "3 States"
...
@@ -5862,7 +5858,6 @@ msgid "3 States"
msgstr "3 Etats"
msgstr "3 Etats"
#: eeschema/pinedit-dialog.cpp:268
#: eeschema/pinedit-dialog.cpp:268
#: eeschema/dialog_edit_label.cpp:164
msgid "Passive"
msgid "Passive"
msgstr "Passive"
msgstr "Passive"
...
@@ -6017,42 +6012,6 @@ msgstr "Racine"
...
@@ -6017,42 +6012,6 @@ msgstr "Racine"
msgid "Arc %.1f deg"
msgid "Arc %.1f deg"
msgstr "Arc %.1f deg"
msgstr "Arc %.1f deg"
#: eeschema/dialog_edit_label.cpp:68
msgid "Global Label properties"
msgstr "Propriétés du Label Global"
#: eeschema/dialog_edit_label.cpp:72
msgid "Hierarchal Label properties"
msgstr "Propriétés du Label Hiérarchique"
#: eeschema/dialog_edit_label.cpp:76
msgid "Label properties"
msgstr "Propriétés du label"
#: eeschema/dialog_edit_label.cpp:80
msgid "Text properties"
msgstr "Propriétés du texte"
#: eeschema/dialog_edit_label.cpp:139
msgid "Text "
msgstr "Texte "
#: eeschema/dialog_edit_label.cpp:153
msgid "Text Orient:"
msgstr "Orient:"
#: eeschema/dialog_edit_label.cpp:163
msgid "TriState"
msgstr "3 états"
#: eeschema/dialog_edit_label.cpp:165
msgid "Glabel Shape:"
msgstr "Forme GLabel:"
#: eeschema/dialog_edit_label.cpp:173
msgid "Size "
msgstr "Taille "
#: eeschema/netlist_control.cpp:131
#: eeschema/netlist_control.cpp:131
#: eeschema/netlist_control.cpp:253
#: eeschema/netlist_control.cpp:253
msgid "Default format"
msgid "Default format"
...
@@ -7078,87 +7037,6 @@ msgstr "Placer textes graphiques (commentaires)"
...
@@ -7078,87 +7037,6 @@ msgstr "Placer textes graphiques (commentaires)"
msgid "HV orientation for Wires and Bus"
msgid "HV orientation for Wires and Bus"
msgstr "Force direction H, V et X pour les fils et bus"
msgstr "Force direction H, V et X pour les fils et bus"
#: eeschema/build_BOM.cpp:94
msgid "Bill of materials:"
msgstr "Liste du materiel:"
#: eeschema/build_BOM.cpp:143
#: eeschema/build_BOM.cpp:182
msgid "Failed to open file "
msgstr "Erreur ouverture "
#: eeschema/build_BOM.cpp:226
#, c-format
msgid ""
"\n"
"#Global, Hierarchical Labels and PinSheets ( order = Sheet Number ) count = %d\n"
msgstr ""
"\n"
"#Labels globaux, hiérarchiques et pins de feuille ( ordre = Numéro de feuille ) nombre = %d\n"
#: eeschema/build_BOM.cpp:237
#, c-format
msgid ""
"\n"
"#Global, Hierarchical Labels and PinSheets ( order = Alphab. ) count = %d\n"
"\n"
msgstr ""
"\n"
"##Labels globaux, hiérarchiques et pins de feuille ( ordre = Alphab. ) nombre = %d\n"
"\n"
#: eeschema/build_BOM.cpp:244
msgid ""
"\n"
"#End List\n"
msgstr ""
"\n"
"#End List\n"
#: eeschema/build_BOM.cpp:619
msgid "Field"
msgstr "Champ"
#: eeschema/build_BOM.cpp:627
msgid ""
"\n"
"#Cmp ( order = Reference )"
msgstr ""
"\n"
"#Cmp ( ordre = Reference )"
#: eeschema/build_BOM.cpp:630
#: eeschema/build_BOM.cpp:726
msgid " (with SubCmp)"
msgstr "avec sub-composants"
#: eeschema/build_BOM.cpp:700
#: eeschema/build_BOM.cpp:781
msgid "#End Cmp\n"
msgstr "#End Cmp\n"
#: eeschema/build_BOM.cpp:723
msgid ""
"\n"
"#Cmp ( order = Value )"
msgstr ""
"\n"
"#Cmp ( ordre = Valeur )"
#: eeschema/build_BOM.cpp:811
#, c-format
msgid "> %-28.28s %s (Sheet %s) pos: %3.3f, %3.3f\n"
msgstr "> %-28.28s %s (Feuille %s) pos: %3.3f, %3.3f\n"
#: eeschema/build_BOM.cpp:831
#, c-format
msgid "> %-28.28s PinSheet %-7.7s (Sheet %s) pos: %3.3f, %3.3f\n"
msgstr "> %-28.28s PinSheet %-7.7s (Feuille %s) pos: %3.3f, %3.3f\n"
#: eeschema/build_BOM.cpp:846
msgid "#End labels\n"
msgstr "#End labels\n"
#: eeschema/dialog_build_BOM.cpp:247
#: eeschema/dialog_build_BOM.cpp:247
msgid "List items:"
msgid "List items:"
msgstr " Liste éléments: "
msgstr " Liste éléments: "
...
@@ -7536,51 +7414,132 @@ msgstr "Impossible de trouver le composant "
...
@@ -7536,51 +7414,132 @@ msgstr "Impossible de trouver le composant "
msgid " in library"
msgid " in library"
msgstr " en librairie"
msgstr " en librairie"
#: eeschema/dialog_eeschema_config.cpp:163
#: eeschema/build_BOM.cpp:94
msgid "save current configuration setting in the local .pro file"
msgid "Bill of materials:"
msgstr "Sauve configuration courante dans le fichier .pro local"
msgstr "Liste du materiel:"
#: eeschema/dialog_eeschema_config.cpp:169
msgid "NetList Formats:"
msgstr " Formats NetListe:"
#: eeschema/dialog_eeschema_config.cpp:191
#: eeschema/build_BOM.cpp:143
msgid "Remove"
#: eeschema/build_BOM.cpp:182
msgstr "Enlever"
msgid "Failed to open file "
msgstr "Erreur ouverture "
#: eeschema/dialog_eeschema_config.cpp:193
#: eeschema/build_BOM.cpp:226
msgid "Unload the selected library"
#, c-format
msgstr "Décharger la librairie sélectionnée"
msgid ""
"\n"
"#Global, Hierarchical Labels and PinSheets ( order = Sheet Number ) count = %d\n"
msgstr ""
"\n"
"#Labels globaux, hiérarchiques et pins de feuille ( ordre = Numéro de feuille ) nombre = %d\n"
#: eeschema/dialog_eeschema_config.cpp:199
#: eeschema/build_BOM.cpp:237
msgid "Add a new library after the selected library, add load it"
#, c-format
msgstr "Ajoute une nouvelle librairie après la librairie sélectionnée, et la charge"
msgid ""
"\n"
"#Global, Hierarchical Labels and PinSheets ( order = Alphab. ) count = %d\n"
"\n"
msgstr ""
"\n"
"##Labels globaux, hiérarchiques et pins de feuille ( ordre = Alphab. ) nombre = %d\n"
"\n"
#: eeschema/dialog_eeschema_config.cpp:204
#: eeschema/build_BOM.cpp:244
#: eeschema/dialog_eeschema_config.cpp:206
msgid ""
msgid "Add a new library beforer the selected library, add load it"
"\n"
msgstr "Ajoute une nouvelle librairie avant la librairie sélectionnée, et la charge"
"#End List\n"
msgstr ""
"\n"
"#End List\n"
#: eeschema/
dialog_eeschema_config.cpp:221
#: eeschema/
build_BOM.cpp:619
msgid "
Default library file path:
"
msgid "
Field
"
msgstr "Ch
emin par Défaut des Fichiers Librairies:
"
msgstr "Ch
amp
"
#: eeschema/
dialog_eeschema_config.cpp:228
#: eeschema/
build_BOM.cpp:627
msgid ""
msgid ""
"Default path to search libraries which have no absolute path in name,\n"
"\n"
"or a name which does not start by ./ or ../\n"
"#Cmp ( order = Reference )"
"If void, the default path is kicad/library"
msgstr ""
msgstr ""
"Chemin par défaut pour chercher les librairies qui n'ont pas de chemin absolu dans leur nom,\n"
"\n"
"ou un nom qui ne commence pas par ./ ou ../ .\n"
"#Cmp ( ordre = Reference )"
"Si vide, le chemin par défaut est kicad/library"
#: eeschema/dialog_eeschema_config.cpp:236
msgid "Cmp file Ext: "
msgstr "Ext fichier Cmp: "
#: eeschema/dialog_eeschema_config.cpp:240
#: eeschema/build_BOM.cpp:630
msgid "Net file Ext: "
#: eeschema/build_BOM.cpp:726
msgid " (with SubCmp)"
msgstr "avec sub-composants"
#: eeschema/build_BOM.cpp:700
#: eeschema/build_BOM.cpp:781
msgid "#End Cmp\n"
msgstr "#End Cmp\n"
#: eeschema/build_BOM.cpp:723
msgid ""
"\n"
"#Cmp ( order = Value )"
msgstr ""
"\n"
"#Cmp ( ordre = Valeur )"
#: eeschema/build_BOM.cpp:811
#, c-format
msgid "> %-28.28s %s (Sheet %s) pos: %3.3f, %3.3f\n"
msgstr "> %-28.28s %s (Feuille %s) pos: %3.3f, %3.3f\n"
#: eeschema/build_BOM.cpp:831
#, c-format
msgid "> %-28.28s PinSheet %-7.7s (Sheet %s) pos: %3.3f, %3.3f\n"
msgstr "> %-28.28s PinSheet %-7.7s (Feuille %s) pos: %3.3f, %3.3f\n"
#: eeschema/build_BOM.cpp:846
msgid "#End labels\n"
msgstr "#End labels\n"
#: eeschema/dialog_eeschema_config.cpp:163
msgid "save current configuration setting in the local .pro file"
msgstr "Sauve configuration courante dans le fichier .pro local"
#: eeschema/dialog_eeschema_config.cpp:169
msgid "NetList Formats:"
msgstr " Formats NetListe:"
#: eeschema/dialog_eeschema_config.cpp:191
msgid "Remove"
msgstr "Enlever"
#: eeschema/dialog_eeschema_config.cpp:193
msgid "Unload the selected library"
msgstr "Décharger la librairie sélectionnée"
#: eeschema/dialog_eeschema_config.cpp:199
msgid "Add a new library after the selected library, add load it"
msgstr "Ajoute une nouvelle librairie après la librairie sélectionnée, et la charge"
#: eeschema/dialog_eeschema_config.cpp:204
#: eeschema/dialog_eeschema_config.cpp:206
msgid "Add a new library beforer the selected library, add load it"
msgstr "Ajoute une nouvelle librairie avant la librairie sélectionnée, et la charge"
#: eeschema/dialog_eeschema_config.cpp:221
msgid "Default library file path:"
msgstr "Chemin par Défaut des Fichiers Librairies:"
#: eeschema/dialog_eeschema_config.cpp:228
msgid ""
"Default path to search libraries which have no absolute path in name,\n"
"or a name which does not start by ./ or ../\n"
"If void, the default path is kicad/library"
msgstr ""
"Chemin par défaut pour chercher les librairies qui n'ont pas de chemin absolu dans leur nom,\n"
"ou un nom qui ne commence pas par ./ ou ../ .\n"
"Si vide, le chemin par défaut est kicad/library"
#: eeschema/dialog_eeschema_config.cpp:236
msgid "Cmp file Ext: "
msgstr "Ext fichier Cmp: "
#: eeschema/dialog_eeschema_config.cpp:240
msgid "Net file Ext: "
msgstr "Ext fichier Netliste: "
msgstr "Ext fichier Netliste: "
#: eeschema/dialog_eeschema_config.cpp:244
#: eeschema/dialog_eeschema_config.cpp:244
...
@@ -7746,6 +7705,34 @@ msgstr "Ok pour effacer la LISTE des filtres de modules"
...
@@ -7746,6 +7705,34 @@ msgstr "Ok pour effacer la LISTE des filtres de modules"
msgid "New FootprintFilter:"
msgid "New FootprintFilter:"
msgstr "Nouveau Filtre de Modules:"
msgstr "Nouveau Filtre de Modules:"
#: eeschema/dialog_edit_label_base.cpp:34
msgid "Direction"
msgstr "Direction"
#: eeschema/dialog_edit_label_base.cpp:38
msgid "Italic"
msgstr "Italique"
#: eeschema/dialog_edit_label_base.cpp:38
msgid "Bold"
msgstr "Gras"
#: eeschema/dialog_edit_label_base.cpp:38
msgid "Bold Italic"
msgstr "Gras Italique"
#: eeschema/dialog_edit_label_base.cpp:40
msgid "Style"
msgstr "Style"
#: eeschema/dialog_edit_label_base.cpp:44
msgid "TriState"
msgstr "3 états"
#: eeschema/dialog_edit_label_base.cpp:46
msgid "Glabel Shape:"
msgstr "Forme GLabel:"
#: eeschema/schedit.cpp:181
#: eeschema/schedit.cpp:181
msgid "Push/Pop Hierarchy"
msgid "Push/Pop Hierarchy"
msgstr "Naviger dans Hiérarchie"
msgstr "Naviger dans Hiérarchie"
...
@@ -7790,35 +7777,10 @@ msgstr "Importer Connecteur de hiérarchie"
...
@@ -7790,35 +7777,10 @@ msgstr "Importer Connecteur de hiérarchie"
msgid "Add Power"
msgid "Add Power"
msgstr "Add Alims"
msgstr "Add Alims"
#: eeschema/edit_label.cpp:4
9
#: eeschema/edit_label.cpp:4
6
msgid "Empty Text!"
msgid "Empty Text!"
msgstr "Texte vide"
msgstr "Texte vide"
#: eeschema/load_one_schematic_file.cpp:105
msgid "Failed to open "
msgstr "Erreur ouverture "
#: eeschema/load_one_schematic_file.cpp:110
msgid "Loading "
msgstr "Chargement "
#: eeschema/load_one_schematic_file.cpp:117
#: eeschema/load_one_schematic_file.cpp:146
msgid " is NOT an EESchema file!"
msgstr " n'est PAS un fichier EESchema!"
#: eeschema/load_one_schematic_file.cpp:129
msgid " was created by a more recent version of EESchema and may not load correctly. Please consider updating!"
msgstr " a été créé par une version plus récente de Eeschema et peut ne pas être chargé correctement. SVP mettez a jour Eeschema!"
#: eeschema/load_one_schematic_file.cpp:138
msgid " was created by an older version of EESchema. It will be stored in the new file format when you save this file again."
msgstr " a été créé par une version plus ancienne de Eeschema. Il sera enregistré au nouveau format après la prochaine sauvegarde."
#: eeschema/load_one_schematic_file.cpp:497
msgid "Done Loading "
msgstr "Chargement terminé"
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:28
#: eeschema/dialog_edit_component_in_schematic_fbp.cpp:28
msgid "1"
msgid "1"
msgstr "1"
msgstr "1"
...
@@ -8274,6 +8236,47 @@ msgstr "Pas de nom de composant!"
...
@@ -8274,6 +8236,47 @@ msgstr "Pas de nom de composant!"
msgid "Component [%s] not found!"
msgid "Component [%s] not found!"
msgstr "Composant [%s] non trouvé!"
msgstr "Composant [%s] non trouvé!"
#: eeschema/dialog_edit_label.cpp:39
msgid "Global Label properties"
msgstr "Propriétés du Label Global"
#: eeschema/dialog_edit_label.cpp:43
msgid "Hierarchal Label properties"
msgstr "Propriétés du Label Hiérarchique"
#: eeschema/dialog_edit_label.cpp:47
msgid "Label properties"
msgstr "Propriétés du label"
#: eeschema/dialog_edit_label.cpp:51
msgid "Text properties"
msgstr "Propriétés du texte"
#: eeschema/load_one_schematic_file.cpp:79
msgid "Failed to open "
msgstr "Erreur ouverture "
#: eeschema/load_one_schematic_file.cpp:84
msgid "Loading "
msgstr "Chargement "
#: eeschema/load_one_schematic_file.cpp:91
#: eeschema/load_one_schematic_file.cpp:121
msgid " is NOT an EESchema file!"
msgstr " n'est PAS un fichier EESchema!"
#: eeschema/load_one_schematic_file.cpp:103
msgid " was created by a more recent version of EESchema and may not load correctly. Please consider updating!"
msgstr " a été créé par une version plus récente de Eeschema et peut ne pas être chargé correctement. SVP mettez a jour Eeschema!"
#: eeschema/load_one_schematic_file.cpp:113
msgid " was created by an older version of EESchema. It will be stored in the new file format when you save this file again."
msgstr " a été créé par une version plus ancienne de Eeschema. Il sera enregistré au nouveau format après la prochaine sauvegarde."
#: eeschema/load_one_schematic_file.cpp:401
msgid "Done Loading "
msgstr "Chargement terminé"
#: eeschema/eelibs_read_libraryfiles.cpp:117
#: eeschema/eelibs_read_libraryfiles.cpp:117
msgid "Start loading schematic libs"
msgid "Start loading schematic libs"
msgstr "Demarre chargement des librairies schématiques"
msgstr "Demarre chargement des librairies schématiques"
...
@@ -9424,12 +9427,12 @@ msgstr "Effacement Bloc (ctrl + drag mouse)"
...
@@ -9424,12 +9427,12 @@ msgstr "Effacement Bloc (ctrl + drag mouse)"
msgid "Delete Dcode items"
msgid "Delete Dcode items"
msgstr "Suppression d'éléments par DCode"
msgstr "Suppression d'éléments par DCode"
#: gerbview/rs274x.cpp:29
5
#: gerbview/rs274x.cpp:29
7
#, c-format
#, c-format
msgid "Command <%c%c> ignored by Gerbview"
msgid "Command <%c%c> ignored by Gerbview"
msgstr "Commande <%c%c> ignorée par Gerbview"
msgstr "Commande <%c%c> ignorée par Gerbview"
#: gerbview/rs274x.cpp:34
0
#: gerbview/rs274x.cpp:34
2
msgid "Too many include files!!"
msgid "Too many include files!!"
msgstr "Trop de fichiers inclus!!"
msgstr "Trop de fichiers inclus!!"
...
@@ -9470,7 +9473,6 @@ msgid "Show D codes"
...
@@ -9470,7 +9473,6 @@ msgid "Show D codes"
msgstr "Montrer DCodes"
msgstr "Montrer DCodes"
#: gerbview/process_config.cpp:117
#: gerbview/process_config.cpp:117
#: gerbview/gerbview_config.cpp:148
msgid "Save config file"
msgid "Save config file"
msgstr "Sauver config"
msgstr "Sauver config"
...
@@ -9496,7 +9498,7 @@ msgstr "%d erreurs pendant lecture fichier gerber [%s]"
...
@@ -9496,7 +9498,7 @@ msgstr "%d erreurs pendant lecture fichier gerber [%s]"
msgid "D codes files:"
msgid "D codes files:"
msgstr "Fichiers D-Codes:"
msgstr "Fichiers D-Codes:"
#: gerbview/dcode.cpp:46
0
#: gerbview/dcode.cpp:46
4
msgid "List D codes"
msgid "List D codes"
msgstr "Liste D-Codes"
msgstr "Liste D-Codes"
...
@@ -9554,6 +9556,94 @@ msgstr "Infos:"
...
@@ -9554,6 +9556,94 @@ msgstr "Infos:"
msgid "Colors"
msgid "Colors"
msgstr "Couleurs"
msgstr "Couleurs"
#: common/edaappl.cpp:57
msgid "Default"
msgstr "Defaut"
#: common/edaappl.cpp:70
msgid "French"
msgstr "French"
#: common/edaappl.cpp:76
msgid "Spanish"
msgstr "Espagnol"
#: common/edaappl.cpp:82
msgid "Portuguese"
msgstr "Portugais"
#: common/edaappl.cpp:88
msgid "Italian"
msgstr "Italien"
#: common/edaappl.cpp:94
msgid "German"
msgstr "Allemand"
#: common/edaappl.cpp:100
msgid "Slovenian"
msgstr "Slovène"
#: common/edaappl.cpp:106
msgid "Hungarian"
msgstr "Hongrois"
#: common/edaappl.cpp:112
msgid "Polish"
msgstr "Polonais"
#: common/edaappl.cpp:118
msgid "Czech"
msgstr "Tchèque"
#: common/edaappl.cpp:124
msgid "Russian"
msgstr "Russe"
#: common/edaappl.cpp:130
msgid "Korean"
msgstr "Coréen"
#: common/edaappl.cpp:136
msgid "Chinese simplified"
msgstr "Chinois Simplifié"
#: common/edaappl.cpp:142
msgid "Catalan"
msgstr "Catalan"
#: common/edaappl.cpp:148
msgid "Dutch"
msgstr "Hollandais"
#: common/edaappl.cpp:613
msgid "Language"
msgstr "Langage"
#: common/edaappl.cpp:614
msgid "Select application language (only for testing!)"
msgstr "Choisir le langage (seulement pour tests!)"
#: common/zoom.cpp:238
msgid "Center"
msgstr "Centrer"
#: common/zoom.cpp:247
msgid "Zoom select"
msgstr "Sélection Zoom"
#: common/zoom.cpp:260
msgid "Zoom: "
msgstr "Zoom: "
#: common/zoom.cpp:270
msgid "Grid Select"
msgstr "Sélection Grille"
#: common/zoom.cpp:291
msgid "Grid: "
msgstr "Grille: "
#: common/block_commande.cpp:57
#: common/block_commande.cpp:57
msgid "Block Move"
msgid "Block Move"
msgstr "Move Bloc"
msgstr "Move Bloc"
...
@@ -9594,6 +9684,18 @@ msgstr "Inversion Bloc"
...
@@ -9594,6 +9684,18 @@ msgstr "Inversion Bloc"
msgid "Block Mirror"
msgid "Block Mirror"
msgstr "Bloc Miroir"
msgstr "Bloc Miroir"
#: common/drawframe.cpp:137
msgid "Choose font type and size for dialogs, infos and status box"
msgstr "Choisir les fontes et leur taille pour les dialogues, infos et ligne d'état"
#: common/drawframe.cpp:364
msgid "Inch"
msgstr "Pouce"
#: common/drawframe.cpp:372
msgid "??"
msgstr "??"
#: common/common.cpp:105
#: common/common.cpp:105
msgid " (\"):"
msgid " (\"):"
msgstr " (\"):"
msgstr " (\"):"
...
@@ -9858,98 +9960,30 @@ msgstr ""
...
@@ -9858,98 +9960,30 @@ msgstr ""
msgid "Unable to find a PDF viewer for"
msgid "Unable to find a PDF viewer for"
msgstr "Impossible de trouver un visualisateur PDF pour"
msgstr "Impossible de trouver un visualisateur PDF pour"
#: common/basicframe.cpp:23
9
#: common/basicframe.cpp:23
6
#, c-format
#, c-format
msgid "Help file %s not found"
msgid "Help file %s not found"
msgstr "Fichier d'aide %s non trouvé"
msgstr "Fichier d'aide %s non trouvé"
#:
common/edaappl.cpp:57
#:
3d-viewer/3d_toolbar.cpp:33
msgid "
Default
"
msgid "
Reload board
"
msgstr "
Defaut
"
msgstr "
Reharger Circuit Imprimé
"
#:
common/edaappl.cpp:70
#:
3d-viewer/3d_toolbar.cpp:38
msgid "
French
"
msgid "
Copy 3D Image to Clipboard
"
msgstr "
French
"
msgstr "
Copie Image 3D dans Presse papier
"
#:
common/edaappl.cpp:7
6
#:
3d-viewer/3d_toolbar.cpp:5
6
msgid "
Spanish
"
msgid "
Rotate X <-
"
msgstr "
Espagnol
"
msgstr "
Rotation X <-
"
#:
common/edaappl.cpp:82
#:
3d-viewer/3d_toolbar.cpp:59
msgid "
Portuguese
"
msgid "
Rotate X ->
"
msgstr "
Portugais
"
msgstr "
Rotation X->
"
#: common/edaappl.cpp:88
#: 3d-viewer/3d_toolbar.cpp:63
msgid "Italian"
msgid "Rotate Y <-"
msgstr "Italien"
msgstr "Rotation Y <-"
#: common/edaappl.cpp:94
msgid "German"
msgstr "Allemand"
#: common/edaappl.cpp:100
msgid "Slovenian"
msgstr "Slovène"
#: common/edaappl.cpp:106
msgid "Hungarian"
msgstr "Hongrois"
#: common/edaappl.cpp:112
msgid "Polish"
msgstr "Polonais"
#: common/edaappl.cpp:118
msgid "Czech"
msgstr "Tchèque"
#: common/edaappl.cpp:124
msgid "Russian"
msgstr "Russe"
#: common/edaappl.cpp:130
msgid "Korean"
msgstr "Coréen"
#: common/edaappl.cpp:136
msgid "Chinese simplified"
msgstr "Chinois Simplifié"
#: common/edaappl.cpp:142
msgid "Catalan"
msgstr "Catalan"
#: common/edaappl.cpp:148
msgid "Dutch"
msgstr "Hollandais"
#: common/edaappl.cpp:606
msgid "Language"
msgstr "Langage"
#: common/edaappl.cpp:607
msgid "Select application language (only for testing!)"
msgstr "Choisir le langage (seulement pour tests!)"
#: 3d-viewer/3d_toolbar.cpp:33
msgid "Reload board"
msgstr "Reharger Circuit Imprimé"
#: 3d-viewer/3d_toolbar.cpp:38
msgid "Copy 3D Image to Clipboard"
msgstr "Copie Image 3D dans Presse papier"
#: 3d-viewer/3d_toolbar.cpp:56
msgid "Rotate X <-"
msgstr "Rotation X <-"
#: 3d-viewer/3d_toolbar.cpp:59
msgid "Rotate X ->"
msgstr "Rotation X->"
#: 3d-viewer/3d_toolbar.cpp:63
msgid "Rotate Y <-"
msgstr "Rotation Y <-"
#: 3d-viewer/3d_toolbar.cpp:66
#: 3d-viewer/3d_toolbar.cpp:66
msgid "Rotate Y ->"
msgid "Rotate Y ->"
...
@@ -10067,138 +10101,6 @@ msgstr "Non fichier Image 3D:"
...
@@ -10067,138 +10101,6 @@ msgstr "Non fichier Image 3D:"
msgid "Vertex "
msgid "Vertex "
msgstr "Vertex "
msgstr "Vertex "
#: share/setpage.cpp:276
msgid "Size A4"
msgstr "Format A4 "
#: share/setpage.cpp:277
msgid "Size A3"
msgstr "Format A3"
#: share/setpage.cpp:278
msgid "Size A2"
msgstr "Format A2"
#: share/setpage.cpp:279
msgid "Size A1"
msgstr "Format A1"
#: share/setpage.cpp:280
msgid "Size A0"
msgstr "Format A0"
#: share/setpage.cpp:281
msgid "Size A"
msgstr "Format A"
#: share/setpage.cpp:282
msgid "Size B"
msgstr "Format B"
#: share/setpage.cpp:283
msgid "Size C"
msgstr "Format C"
#: share/setpage.cpp:284
msgid "Size D"
msgstr "Format D"
#: share/setpage.cpp:285
msgid "Size E"
msgstr "Format E"
#: share/setpage.cpp:286
msgid "User size"
msgstr "Format libre"
#: share/setpage.cpp:287
msgid "Page Size:"
msgstr "Dim Page:"
#: share/setpage.cpp:294
msgid "User Page Size X: "
msgstr "Format libre dim X: "
#: share/setpage.cpp:303
msgid "User Page Size Y: "
msgstr "Format libre dim Y: "
#: share/setpage.cpp:330
#, c-format
msgid "Number of sheets: %d"
msgstr "Nombre de feuilles: %d"
#: share/setpage.cpp:336
#, c-format
msgid "Sheet number: %d"
msgstr "Numéro feuille: %d"
#: share/setpage.cpp:340
msgid "Revision:"
msgstr "Révision:"
#: share/setpage.cpp:349
#: share/setpage.cpp:363
#: share/setpage.cpp:377
#: share/setpage.cpp:391
#: share/setpage.cpp:405
#: share/setpage.cpp:419
#: share/setpage.cpp:433
msgid "Export to other sheets"
msgstr "Exporter vers autres feuilles"
#: share/setpage.cpp:368
msgid "Company:"
msgstr "Société:"
#: share/setpage.cpp:382
msgid "Comment1:"
msgstr "Commentaire1: "
#: share/setpage.cpp:396
msgid "Comment2:"
msgstr "Commentaire2:"
#: share/setpage.cpp:410
msgid "Comment3:"
msgstr "Commentaire3:"
#: share/setpage.cpp:424
msgid "Comment4:"
msgstr "Commentaire4:"
#: share/zoom.cpp:238
msgid "Center"
msgstr "Centrer"
#: share/zoom.cpp:247
msgid "Zoom select"
msgstr "Sélection Zoom"
#: share/zoom.cpp:260
msgid "Zoom: "
msgstr "Zoom: "
#: share/zoom.cpp:270
msgid "Grid Select"
msgstr "Sélection Grille"
#: share/zoom.cpp:291
msgid "Grid: "
msgstr "Grille: "
#: share/drawframe.cpp:155
msgid "Choose font type and size for dialogs, infos and status box"
msgstr "Choisir les fontes et leur taille pour les dialogues, infos et ligne d'état"
#: share/drawframe.cpp:382
msgid "Inch"
msgstr "Pouce"
#: share/drawframe.cpp:390
msgid "??"
msgstr "??"
#: share/dialog_print.cpp:146
#: share/dialog_print.cpp:146
msgid "Exclude Edges_Pcb Layer"
msgid "Exclude Edges_Pcb Layer"
msgstr "Exclure Couche Contours PCB"
msgstr "Exclure Couche Contours PCB"
...
@@ -10330,6 +10232,106 @@ msgstr "Il y a un problème d'impression"
...
@@ -10330,6 +10232,106 @@ msgstr "Il y a un problème d'impression"
msgid "Print page %d"
msgid "Print page %d"
msgstr "Print page %d"
msgstr "Print page %d"
#: share/setpage.cpp:277
msgid "Size A4"
msgstr "Format A4 "
#: share/setpage.cpp:278
msgid "Size A3"
msgstr "Format A3"
#: share/setpage.cpp:279
msgid "Size A2"
msgstr "Format A2"
#: share/setpage.cpp:280
msgid "Size A1"
msgstr "Format A1"
#: share/setpage.cpp:281
msgid "Size A0"
msgstr "Format A0"
#: share/setpage.cpp:282
msgid "Size A"
msgstr "Format A"
#: share/setpage.cpp:283
msgid "Size B"
msgstr "Format B"
#: share/setpage.cpp:284
msgid "Size C"
msgstr "Format C"
#: share/setpage.cpp:285
msgid "Size D"
msgstr "Format D"
#: share/setpage.cpp:286
msgid "Size E"
msgstr "Format E"
#: share/setpage.cpp:287
msgid "User size"
msgstr "Format libre"
#: share/setpage.cpp:288
msgid "Page Size:"
msgstr "Dim Page:"
#: share/setpage.cpp:295
msgid "User Page Size X: "
msgstr "Format libre dim X: "
#: share/setpage.cpp:304
msgid "User Page Size Y: "
msgstr "Format libre dim Y: "
#: share/setpage.cpp:331
#, c-format
msgid "Number of sheets: %d"
msgstr "Nombre de feuilles: %d"
#: share/setpage.cpp:337
#, c-format
msgid "Sheet number: %d"
msgstr "Numéro feuille: %d"
#: share/setpage.cpp:341
msgid "Revision:"
msgstr "Révision:"
#: share/setpage.cpp:350
#: share/setpage.cpp:364
#: share/setpage.cpp:378
#: share/setpage.cpp:392
#: share/setpage.cpp:406
#: share/setpage.cpp:420
#: share/setpage.cpp:434
msgid "Export to other sheets"
msgstr "Exporter vers autres feuilles"
#: share/setpage.cpp:369
msgid "Company:"
msgstr "Société:"
#: share/setpage.cpp:383
msgid "Comment1:"
msgstr "Commentaire1: "
#: share/setpage.cpp:397
msgid "Comment2:"
msgstr "Commentaire2:"
#: share/setpage.cpp:411
msgid "Comment3:"
msgstr "Commentaire3:"
#: share/setpage.cpp:425
msgid "Comment4:"
msgstr "Commentaire4:"
#: pcbnew/cleaningoptions_dialog.h:48
#: pcbnew/cleaningoptions_dialog.h:48
msgid "Cleaning options"
msgid "Cleaning options"
msgstr "Options de Nettoyage"
msgstr "Options de Nettoyage"
...
@@ -10378,58 +10380,6 @@ msgstr "??? Via"
...
@@ -10378,58 +10380,6 @@ msgstr "??? Via"
msgid "Blind/Buried Via"
msgid "Blind/Buried Via"
msgstr "Via Aveugle/Enterrée"
msgstr "Via Aveugle/Enterrée"
#: pcbnew/set_color.h:38
msgid "Pcbnew Layer Colors:"
msgstr "Pcbnew: Couleur des Couches"
#: pcbnew/set_color.h:81
msgid "Copper Layers"
msgstr "Couches Cuivre."
#: pcbnew/set_color.h:216
msgid "Tech Layers"
msgstr "Couches Tech."
#: pcbnew/set_color.h:357
msgid "Ratsnest"
msgstr "Chevelu"
#: pcbnew/set_color.h:366
msgid "Pad Cu"
msgstr "Pad Cu"
#: pcbnew/set_color.h:374
msgid "Pad Cmp"
msgstr "Pad Cmp"
#: pcbnew/set_color.h:382
msgid "Text Module Cu"
msgstr "Texte Module Cu"
#: pcbnew/set_color.h:390
msgid "Text Module Cmp"
msgstr "Texte Module Cmp"
#: pcbnew/set_color.h:398
msgid "Text Module invisible"
msgstr "Texte Module invisible"
#: pcbnew/set_color.h:406
msgid "Anchors"
msgstr "Ancres"
#: pcbnew/set_color.h:423
msgid "Show Noconnect"
msgstr "Montrer Non Conn"
#: pcbnew/set_color.h:432
msgid "Show Modules Cmp"
msgstr "Afficher Modules Cmp"
#: pcbnew/set_color.h:441
msgid "Show Modules Cu"
msgstr "Afficher Modules Cu"
#: pcbnew/gen_self.h:217
#: pcbnew/gen_self.h:217
msgid "Length(inch):"
msgid "Length(inch):"
msgstr "Longueur (pouces):"
msgstr "Longueur (pouces):"
...
@@ -10482,6 +10432,58 @@ msgstr "Propriétés du Pad"
...
@@ -10482,6 +10432,58 @@ msgstr "Propriétés du Pad"
msgid "Drill Files Generation"
msgid "Drill Files Generation"
msgstr "Génération Fichiers de Perçagee"
msgstr "Génération Fichiers de Perçagee"
#: pcbnew/set_color.h:38
msgid "Pcbnew Layer Colors:"
msgstr "Pcbnew: Couleur des Couches"
#: pcbnew/set_color.h:81
msgid "Copper Layers"
msgstr "Couches Cuivre."
#: pcbnew/set_color.h:216
msgid "Tech Layers"
msgstr "Couches Tech."
#: pcbnew/set_color.h:357
msgid "Ratsnest"
msgstr "Chevelu"
#: pcbnew/set_color.h:366
msgid "Pad Cu"
msgstr "Pad Cu"
#: pcbnew/set_color.h:374
msgid "Pad Cmp"
msgstr "Pad Cmp"
#: pcbnew/set_color.h:382
msgid "Text Module Cu"
msgstr "Texte Module Cu"
#: pcbnew/set_color.h:390
msgid "Text Module Cmp"
msgstr "Texte Module Cmp"
#: pcbnew/set_color.h:398
msgid "Text Module invisible"
msgstr "Texte Module invisible"
#: pcbnew/set_color.h:406
msgid "Anchors"
msgstr "Ancres"
#: pcbnew/set_color.h:423
msgid "Show Noconnect"
msgstr "Montrer Non Conn"
#: pcbnew/set_color.h:432
msgid "Show Modules Cmp"
msgstr "Afficher Modules Cmp"
#: pcbnew/set_color.h:441
msgid "Show Modules Cu"
msgstr "Afficher Modules Cu"
#: eeschema/annotate_dialog.h:52
#: eeschema/annotate_dialog.h:52
msgid "EESchema Annotation"
msgid "EESchema Annotation"
msgstr "Annotation des composants"
msgstr "Annotation des composants"
...
@@ -10790,6 +10792,12 @@ msgstr "Imprimer"
...
@@ -10790,6 +10792,12 @@ msgstr "Imprimer"
msgid "Create SVG file"
msgid "Create SVG file"
msgstr "Créer Fichier SVG"
msgstr "Créer Fichier SVG"
#~ msgid "Text "
#~ msgstr "Texte "
#~ msgid "Text Orient:"
#~ msgstr "Orient:"
#~ msgid "Size "
#~ msgstr "Taille "
#~ msgid "Do not Show Zones"
#~ msgid "Do not Show Zones"
#~ msgstr "Ne pas montrer Zones"
#~ msgstr "Ne pas montrer Zones"
#~ msgid "Show Zones"
#~ msgid "Show Zones"
...
...
pcbnew/basepcbframe.cpp
View file @
f1eb69a1
...
@@ -359,8 +359,8 @@ void WinEDA_BasePcbFrame::SetToolID( int id, int new_cursor_id,
...
@@ -359,8 +359,8 @@ void WinEDA_BasePcbFrame::SetToolID( int id, int new_cursor_id,
// must do this after the tool has been set, otherwise pad::Draw() does
// must do this after the tool has been set, otherwise pad::Draw() does
// not show proper color when DisplayOpt.ContrastModeDisplay is true.
// not show proper color when DisplayOpt.ContrastModeDisplay is true.
if
(
redraw
)
if
(
redraw
&&
DrawPanel
)
ReDrawPanel
();
DrawPanel
->
Refresh
();
}
}
void
WinEDA_BasePcbFrame
::
Affiche_Status_Box
()
void
WinEDA_BasePcbFrame
::
Affiche_Status_Box
()
...
...
pcbnew/initpcb.cpp
View file @
f1eb69a1
...
@@ -99,7 +99,7 @@ void WinEDA_PcbGlobalDeleteFrame::AcceptPcbDelete( wxCommandEvent& event )
...
@@ -99,7 +99,7 @@ void WinEDA_PcbGlobalDeleteFrame::AcceptPcbDelete( wxCommandEvent& event )
if
(
redraw
)
if
(
redraw
)
{
{
m_Parent
->
SetCurItem
(
NULL
);
m_Parent
->
SetCurItem
(
NULL
);
m_Parent
->
ReDrawPanel
();
m_Parent
->
DrawPanel
->
Refresh
();
}
}
EndModal
(
1
);
EndModal
(
1
);
...
...
pcbnew/makefile.include
View file @
f1eb69a1
...
@@ -61,7 +61,6 @@ OBJECTS= $(TARGET).o classpcb.o\
...
@@ -61,7 +61,6 @@ OBJECTS= $(TARGET).o classpcb.o\
class_board.o
\
class_board.o
\
class_zone.o
\
class_zone.o
\
class_zone_setting.o
\
class_zone_setting.o
\
drawframe.o
\
track.o
\
track.o
\
set_color.o
\
set_color.o
\
set_grid.o
\
set_grid.o
\
...
@@ -77,7 +76,6 @@ OBJECTS= $(TARGET).o classpcb.o\
...
@@ -77,7 +76,6 @@ OBJECTS= $(TARGET).o classpcb.o\
locate.o
\
locate.o
\
modules.o
\
modules.o
\
loadcmp.o
\
loadcmp.o
\
zoom.o
\
dialog_setup_libs.o
\
dialog_setup_libs.o
\
dialog_general_options.o
\
dialog_general_options.o
\
dialog_orient_footprints.o
\
dialog_orient_footprints.o
\
...
@@ -137,9 +135,6 @@ OBJECTS= $(TARGET).o classpcb.o\
...
@@ -137,9 +135,6 @@ OBJECTS= $(TARGET).o classpcb.o\
setpage.o
:
../share/setpage.cpp
setpage.o
:
../share/setpage.cpp
$(CXX)
-c
$(EDACPPFLAGS)
-o
$@
../share/
$*
.cpp
$(CXX)
-c
$(EDACPPFLAGS)
-o
$@
../share/
$*
.cpp
drawframe.o
:
../share/drawframe.cpp
$(CXX)
-c
$(EDACPPFLAGS)
-o
$@
../share/
$*
.cpp
menubarpcb.o
:
menubarpcb.cpp
menubarpcb.o
:
menubarpcb.cpp
dialog_general_options.o
:
dialog_general_options.cpp dialog_track_options.cpp dialog_display_options.cpp
\
dialog_general_options.o
:
dialog_general_options.cpp dialog_track_options.cpp dialog_display_options.cpp
\
...
@@ -215,9 +210,6 @@ automove.o: automove.cpp autorout.h
...
@@ -215,9 +210,6 @@ automove.o: automove.cpp autorout.h
loadcmp.o
:
loadcmp.cpp
loadcmp.o
:
loadcmp.cpp
zoom.o
:
../share/zoom.cpp
$(CXX)
-c
$(EDACPPFLAGS)
-o
$@
../share/
$*
.cpp
affiche.o
:
affiche.cpp
affiche.o
:
affiche.cpp
tr_modif.o
:
tr_modif.cpp
tr_modif.o
:
tr_modif.cpp
...
...
pcbnew/sel_layer.cpp
View file @
f1eb69a1
...
@@ -254,7 +254,7 @@ void WinEDA_BasePcbFrame::SelectLayerPair()
...
@@ -254,7 +254,7 @@ void WinEDA_BasePcbFrame::SelectLayerPair()
// because the PAD_SMD pads may change color.
// because the PAD_SMD pads may change color.
if
(
result
>=
0
&&
DisplayOpt
.
ContrastModeDisplay
)
if
(
result
>=
0
&&
DisplayOpt
.
ContrastModeDisplay
)
{
{
ReDrawPanel
();
DrawPanel
->
Refresh
();
}
}
}
}
...
...
pcbnew/set_color.cpp
View file @
f1eb69a1
...
@@ -398,7 +398,7 @@ void WinEDA_SetColorsFrame::OnOkClick( wxCommandEvent& WXUNUSED (event) )
...
@@ -398,7 +398,7 @@ void WinEDA_SetColorsFrame::OnOkClick( wxCommandEvent& WXUNUSED (event) )
/**********************************************************************/
/**********************************************************************/
{
{
UpdateLayerSettings
();
UpdateLayerSettings
();
m_Parent
->
ReDrawPanel
();
m_Parent
->
DrawPanel
->
Refresh
();
EndModal
(
1
);
EndModal
(
1
);
}
}
...
@@ -416,7 +416,7 @@ void WinEDA_SetColorsFrame::OnApplyClick(wxCommandEvent& WXUNUSED(event))
...
@@ -416,7 +416,7 @@ void WinEDA_SetColorsFrame::OnApplyClick(wxCommandEvent& WXUNUSED(event))
/*******************************************************************/
/*******************************************************************/
{
{
UpdateLayerSettings
();
UpdateLayerSettings
();
m_Parent
->
ReDrawPanel
();
m_Parent
->
DrawPanel
->
Refresh
();
}
}
...
...
share/setpage.cpp
View file @
f1eb69a1
...
@@ -70,7 +70,8 @@ void WinEDA_DrawFrame::Process_PageSettings(wxCommandEvent& event)
...
@@ -70,7 +70,8 @@ void WinEDA_DrawFrame::Process_PageSettings(wxCommandEvent& event)
{
{
WinEDA_SetPageFrame
frame
(
this
);
WinEDA_SetPageFrame
frame
(
this
);
frame
.
ShowModal
();
frame
.
ShowModal
();
ReDrawPanel
();
if
(
DrawPanel
)
DrawPanel
->
Refresh
();
}
}
/*!
/*!
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment