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
72b97ea4
Commit
72b97ea4
authored
Aug 23, 2008
by
charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
eeschema: minor changes in plot dialog. plot filled shapes Ok.
parent
88b1c9b7
Changes
16
Hide whitespace changes
Inline
Side-by-side
Showing
16 changed files
with
364 additions
and
314 deletions
+364
-314
change_log.txt
change_log.txt
+0
-2
eelibs_draw_components.cpp
eeschema/eelibs_draw_components.cpp
+33
-17
general.h
eeschema/general.h
+0
-3
libcmp.h
eeschema/libcmp.h
+4
-3
plot.cpp
eeschema/plot.cpp
+32
-0
plothpgl.cpp
eeschema/plothpgl.cpp
+9
-9
plothpgl.pjd
eeschema/plothpgl.pjd
+9
-11
plotps.cpp
eeschema/plotps.cpp
+55
-115
plotps.h
eeschema/plotps.h
+0
-3
plotps.pjd
eeschema/plotps.pjd
+3
-5
kicad.mo
internat/fr/kicad.mo
+0
-0
kicad.po
internat/fr/kicad.po
+2
-3
svg_print.cpp
share/svg_print.cpp
+67
-108
svg_print.h
share/svg_print.h
+2
-2
svg_print.pjd
share/svg_print.pjd
+147
-22
wxprint.cpp
share/wxprint.cpp
+1
-11
No files found.
change_log.txt
View file @
72b97ea4
...
...
@@ -11,8 +11,6 @@ email address.
bug solved: netlist calculations could crash eeschema under very rare circumstances.
recent bug solved: background filled shapes (filled but not solid: texts are readables inside shapes)
were drawn (and plotted) as filled (solid) shapes
enhancements needed for plotting background filled shapes, in color mode
(cannot be filled in black and white mode)
2008-Aug-18 UPDATE Jean-Pierre Charras <jean-pierre.charras@inpg.fr>
================================================================================
...
...
eeschema/eelibs_draw_components.cpp
View file @
72b97ea4
...
...
@@ -471,10 +471,12 @@ void DrawLibPartAux( WinEDA_DrawPanel* panel, wxDC* DC,
{
EXCHG
(
x1
,
x2
);
EXCHG
(
y1
,
y2
)
}
fill_option
=
Arc
->
m_Fill
&
(
~
g_PrintFillMask
);
fill_option
=
Arc
->
m_Fill
;
if
(
g_IsPrinting
&&
fill_option
==
FILLED_WITH_BG_BODYCOLOR
&&
GetGRForceBlackPenState
(
)
)
fill_option
=
NO_FILL
;
if
(
Color
<
0
)
// Normal Color Layer
{
if
(
(
fill_option
==
FILLED_WITH_BG_BODYCOLOR
)
&&
!
g_IsPrinting
)
if
(
fill_option
==
FILLED_WITH_BG_BODYCOLOR
)
GRFilledArc
(
&
panel
->
m_ClipBox
,
DC
,
xc
,
yc
,
t1
,
t2
,
Arc
->
m_Rayon
,
Arc
->
m_Width
,
CharColor
,
ReturnLayerColor
(
LAYER_DEVICE_BACKGROUND
)
);
...
...
@@ -513,10 +515,12 @@ void DrawLibPartAux( WinEDA_DrawPanel* panel, wxDC* DC,
y1
=
Pos
.
y
+
TransMat
[
1
][
0
]
*
Circle
->
m_Pos
.
x
+
TransMat
[
1
][
1
]
*
Circle
->
m_Pos
.
y
;
fill_option
=
Circle
->
m_Fill
&
(
~
g_PrintFillMask
);
fill_option
=
Circle
->
m_Fill
;
if
(
g_IsPrinting
&&
fill_option
==
FILLED_WITH_BG_BODYCOLOR
&&
GetGRForceBlackPenState
(
)
)
fill_option
=
NO_FILL
;
if
(
Color
<
0
)
{
if
(
(
fill_option
==
FILLED_WITH_BG_BODYCOLOR
)
&&
!
g_IsPrinting
)
if
(
fill_option
==
FILLED_WITH_BG_BODYCOLOR
)
GRFilledCircle
(
&
panel
->
m_ClipBox
,
DC
,
x1
,
y1
,
Circle
->
m_Rayon
,
LineWidth
,
CharColor
,
ReturnLayerColor
(
LAYER_DEVICE_BACKGROUND
)
);
...
...
@@ -567,10 +571,12 @@ void DrawLibPartAux( WinEDA_DrawPanel* panel, wxDC* DC,
+
TransMat
[
0
][
1
]
*
Square
->
m_End
.
y
;
y2
=
Pos
.
y
+
TransMat
[
1
][
0
]
*
Square
->
m_End
.
x
+
TransMat
[
1
][
1
]
*
Square
->
m_End
.
y
;
fill_option
=
Square
->
m_Fill
&
(
~
g_PrintFillMask
);
fill_option
=
Square
->
m_Fill
;
if
(
g_IsPrinting
&&
fill_option
==
FILLED_WITH_BG_BODYCOLOR
&&
GetGRForceBlackPenState
(
)
)
fill_option
=
NO_FILL
;
if
(
Color
<
0
)
{
if
(
(
fill_option
==
FILLED_WITH_BG_BODYCOLOR
)
&&
!
g_IsPrinting
)
if
(
fill_option
==
FILLED_WITH_BG_BODYCOLOR
)
GRFilledRect
(
&
panel
->
m_ClipBox
,
DC
,
x1
,
y1
,
x2
,
y2
,
CharColor
,
LineWidth
,
ReturnLayerColor
(
LAYER_DEVICE_BACKGROUND
)
);
...
...
@@ -648,10 +654,12 @@ void DrawLibPartAux( WinEDA_DrawPanel* panel, wxDC* DC,
TransMat
[
1
][
1
]
*
polyline
->
PolyList
[
i
*
2
+
1
];
}
fill_option
=
polyline
->
m_Fill
&
(
~
g_PrintFillMask
);
fill_option
=
polyline
->
m_Fill
;
if
(
g_IsPrinting
&&
fill_option
==
FILLED_WITH_BG_BODYCOLOR
&&
GetGRForceBlackPenState
(
)
)
fill_option
=
NO_FILL
;
if
(
Color
<
0
)
{
if
(
(
fill_option
==
FILLED_WITH_BG_BODYCOLOR
)
&&
!
g_IsPrinting
)
if
(
fill_option
==
FILLED_WITH_BG_BODYCOLOR
)
GRPoly
(
&
panel
->
m_ClipBox
,
DC
,
polyline
->
n
,
Buf_Poly_Drawings
,
1
,
LineWidth
,
CharColor
,
ReturnLayerColor
(
LAYER_DEVICE_BACKGROUND
)
);
...
...
@@ -962,12 +970,14 @@ void DrawLibraryDrawStruct( WinEDA_DrawPanel* panel, wxDC* DC,
{
EXCHG
(
x1
,
x2
);
EXCHG
(
y1
,
y2
)
}
fill_option
=
Arc
->
m_Fill
&
(
~
g_PrintFillMask
);
if
(
(
Arc
->
m_Fill
==
FILLED_WITH_BG_BODYCOLOR
)
&&
!
g_IsPrinting
)
fill_option
=
Arc
->
m_Fill
;
if
(
g_IsPrinting
&&
fill_option
==
FILLED_WITH_BG_BODYCOLOR
&&
GetGRForceBlackPenState
(
)
)
fill_option
=
NO_FILL
;
if
(
fill_option
==
FILLED_WITH_BG_BODYCOLOR
)
GRFilledArc
(
&
panel
->
m_ClipBox
,
DC
,
xc
,
yc
,
t1
,
t2
,
Arc
->
m_Rayon
,
CharColor
,
ReturnLayerColor
(
LAYER_DEVICE_BACKGROUND
)
);
else
if
(
Arc
->
m_Fill
==
FILLED_SHAPE
)
else
if
(
fill_option
==
FILLED_SHAPE
)
GRFilledArc
(
&
panel
->
m_ClipBox
,
DC
,
xc
,
yc
,
t1
,
t2
,
Arc
->
m_Rayon
,
LineWidth
,
CharColor
,
CharColor
);
#ifdef DRAW_ARC_WITH_ANGLE
...
...
@@ -987,8 +997,10 @@ void DrawLibraryDrawStruct( WinEDA_DrawPanel* panel, wxDC* DC,
LibDrawCircle
*
Circle
=
(
LibDrawCircle
*
)
DrawItem
;
x1
=
PartX
+
Circle
->
m_Pos
.
x
;
y1
=
PartY
-
Circle
->
m_Pos
.
y
;
fill_option
=
Circle
->
m_Fill
&
(
~
g_PrintFillMask
);
if
(
(
fill_option
==
FILLED_WITH_BG_BODYCOLOR
)
&&
!
g_IsPrinting
)
fill_option
=
Circle
->
m_Fill
;
if
(
g_IsPrinting
&&
fill_option
==
FILLED_WITH_BG_BODYCOLOR
&&
GetGRForceBlackPenState
(
)
)
fill_option
=
NO_FILL
;
if
(
fill_option
==
FILLED_WITH_BG_BODYCOLOR
)
GRFilledCircle
(
&
panel
->
m_ClipBox
,
DC
,
x1
,
y1
,
Circle
->
m_Rayon
,
LineWidth
,
CharColor
,
ReturnLayerColor
(
LAYER_DEVICE_BACKGROUND
)
);
...
...
@@ -1020,8 +1032,10 @@ void DrawLibraryDrawStruct( WinEDA_DrawPanel* panel, wxDC* DC,
y1
=
PartY
-
Square
->
m_Pos
.
y
;
x2
=
PartX
+
Square
->
m_End
.
x
;
y2
=
PartY
-
Square
->
m_End
.
y
;
fill_option
=
Square
->
m_Fill
&
(
~
g_PrintFillMask
);
if
(
(
fill_option
==
FILLED_WITH_BG_BODYCOLOR
)
&&
!
g_IsPrinting
)
fill_option
=
Square
->
m_Fill
;
if
(
g_IsPrinting
&&
fill_option
==
FILLED_WITH_BG_BODYCOLOR
&&
GetGRForceBlackPenState
(
)
)
fill_option
=
NO_FILL
;
if
(
fill_option
==
FILLED_WITH_BG_BODYCOLOR
)
GRFilledRect
(
&
panel
->
m_ClipBox
,
DC
,
x1
,
y1
,
x2
,
y2
,
CharColor
,
LineWidth
,
ReturnLayerColor
(
LAYER_DEVICE_BACKGROUND
)
);
...
...
@@ -1078,8 +1092,10 @@ void DrawLibraryDrawStruct( WinEDA_DrawPanel* panel, wxDC* DC,
Buf_Poly_Drawings
[
i
*
2
+
1
]
=
PartY
-
polyline
->
PolyList
[
i
*
2
+
1
];
}
fill_option
=
polyline
->
m_Fill
&
(
~
g_PrintFillMask
);
if
(
(
fill_option
==
FILLED_WITH_BG_BODYCOLOR
)
&&
!
g_IsPrinting
)
fill_option
=
polyline
->
m_Fill
;
if
(
g_IsPrinting
&&
fill_option
==
FILLED_WITH_BG_BODYCOLOR
&&
GetGRForceBlackPenState
(
)
)
fill_option
=
NO_FILL
;
if
(
fill_option
==
FILLED_WITH_BG_BODYCOLOR
)
GRPoly
(
&
panel
->
m_ClipBox
,
DC
,
polyline
->
n
,
Buf_Poly_Drawings
,
1
,
LineWidth
,
CharColor
,
ReturnLayerColor
(
LAYER_DEVICE_BACKGROUND
)
);
...
...
eeschema/general.h
View file @
72b97ea4
...
...
@@ -161,9 +161,6 @@ struct EESchemaVariables
};
eda_global
struct
EESchemaVariables
g_EESchemaVar
;
/* Variable fonction print */
eda_global
int
g_PrintFillMask
;
/* pour les options "FILL",
l'option reelle est m_Fill & ~PrintFillMask */
/* Variables globales pour Libview */
eda_global
wxString
g_CurrentViewLibraryName
;
/* nom de la librairie en cours d'examen */
...
...
eeschema/libcmp.h
View file @
72b97ea4
...
...
@@ -30,9 +30,10 @@
#define IEEE_SYMBOL_PIN_DIM 40
/* Dim of special pin symbol. */
#define NO_FILL 0 // Poly, Squar, Circle, Arc = option No Fill
#define FILLED_SHAPE 1 // Poly, Squar, Circle, Arc = option Fill with current color
#define FILLED_WITH_BG_BODYCOLOR 2 // Poly, Squar, Circle, Arc = option Fill
// with background body color
#define FILLED_SHAPE 1 // Poly, Squar, Circle, Arc = option Fill with current color ("Solid shape")
#define FILLED_WITH_BG_BODYCOLOR 2
/* Poly, Squar, Circle, Arc = option Fill
* with background body color, translucent (texts on this shape can be see)
* not fille in B&W plot mode */
//Offsets used in editing library component, for handle aliad dats
#define ALIAS_NAME 0
...
...
eeschema/plot.cpp
View file @
72b97ea4
...
...
@@ -187,6 +187,7 @@ void PlotLibPart( SCH_COMPONENT* DrawLibItem )
int
TransMat
[
2
][
2
],
PartX
,
PartY
,
Multi
,
convert
;
int
CharColor
=
-
1
;
wxPoint
pos
;
bool
draw_bgfill
=
false
;
Entry
=
FindLibPart
(
DrawLibItem
->
m_ChipName
.
GetData
(),
wxEmptyString
,
FIND_ROOT
);
if
(
Entry
==
NULL
)
...
...
@@ -206,7 +207,10 @@ void PlotLibPart( SCH_COMPONENT* DrawLibItem )
Plume
(
'U'
);
if
(
(
g_PlotFormat
==
PLOT_FORMAT_POST
)
&&
g_PlotPSColorOpt
)
{
SetColorMapPS
(
ReturnLayerColor
(
LAYER_DEVICE
)
);
draw_bgfill
=
true
;
}
switch
(
DEntry
->
Type
()
)
{
...
...
@@ -219,6 +223,13 @@ void PlotLibPart( SCH_COMPONENT* DrawLibItem )
pos
.
y
=
PartY
+
TransMat
[
1
][
0
]
*
Arc
->
m_Pos
.
x
+
TransMat
[
1
][
1
]
*
Arc
->
m_Pos
.
y
;
MapAngles
(
&
t1
,
&
t2
,
TransMat
);
if
(
draw_bgfill
&&
Arc
->
m_Fill
==
FILLED_WITH_BG_BODYCOLOR
)
{
SetColorMapPS
(
ReturnLayerColor
(
LAYER_DEVICE_BACKGROUND
)
);
PlotArc
(
pos
,
t1
,
t2
,
Arc
->
m_Rayon
,
true
,
0
);
}
if
(
(
g_PlotFormat
==
PLOT_FORMAT_POST
)
&&
g_PlotPSColorOpt
)
SetColorMapPS
(
ReturnLayerColor
(
LAYER_DEVICE
)
);
PlotArc
(
pos
,
t1
,
t2
,
Arc
->
m_Rayon
,
Arc
->
m_Fill
==
FILLED_SHAPE
?
true
:
false
,
Arc
->
m_Width
);
}
break
;
...
...
@@ -230,6 +241,13 @@ void PlotLibPart( SCH_COMPONENT* DrawLibItem )
TransMat
[
0
][
1
]
*
Circle
->
m_Pos
.
y
;
pos
.
y
=
PartY
+
TransMat
[
1
][
0
]
*
Circle
->
m_Pos
.
x
+
TransMat
[
1
][
1
]
*
Circle
->
m_Pos
.
y
;
if
(
draw_bgfill
&&
Circle
->
m_Fill
==
FILLED_WITH_BG_BODYCOLOR
)
{
SetColorMapPS
(
ReturnLayerColor
(
LAYER_DEVICE_BACKGROUND
)
);
PlotCercle
(
pos
,
Circle
->
m_Rayon
*
2
,
true
,
0
);
}
if
(
(
g_PlotFormat
==
PLOT_FORMAT_POST
)
&&
g_PlotPSColorOpt
)
SetColorMapPS
(
ReturnLayerColor
(
LAYER_DEVICE
)
);
PlotCercle
(
pos
,
Circle
->
m_Rayon
*
2
,
Circle
->
m_Fill
==
FILLED_SHAPE
?
true
:
false
,
Circle
->
m_Width
);
}
break
;
...
...
@@ -266,6 +284,13 @@ void PlotLibPart( SCH_COMPONENT* DrawLibItem )
y2
=
PartY
+
TransMat
[
1
][
0
]
*
Square
->
m_End
.
x
+
TransMat
[
1
][
1
]
*
Square
->
m_End
.
y
;
if
(
draw_bgfill
&&
Square
->
m_Fill
==
FILLED_WITH_BG_BODYCOLOR
)
{
SetColorMapPS
(
ReturnLayerColor
(
LAYER_DEVICE_BACKGROUND
)
);
PlotRect
(
wxPoint
(
x1
,
y1
),
wxPoint
(
x2
,
y2
),
true
,
0
);
}
if
(
(
g_PlotFormat
==
PLOT_FORMAT_POST
)
&&
g_PlotPSColorOpt
)
SetColorMapPS
(
ReturnLayerColor
(
LAYER_DEVICE
)
);
PlotRect
(
wxPoint
(
x1
,
y1
),
wxPoint
(
x2
,
y2
),
Square
->
m_Fill
==
FILLED_SHAPE
?
true
:
false
,
Square
->
m_Width
);
}
break
;
...
...
@@ -311,6 +336,13 @@ void PlotLibPart( SCH_COMPONENT* DrawLibItem )
TransMat
[
1
][
1
]
*
polyline
->
PolyList
[
ii
*
2
+
1
];
}
if
(
draw_bgfill
&&
polyline
->
m_Fill
==
FILLED_WITH_BG_BODYCOLOR
)
{
SetColorMapPS
(
ReturnLayerColor
(
LAYER_DEVICE_BACKGROUND
)
);
PlotPoly
(
ii
,
Poly
,
true
,
0
);
}
if
(
(
g_PlotFormat
==
PLOT_FORMAT_POST
)
&&
g_PlotPSColorOpt
)
SetColorMapPS
(
ReturnLayerColor
(
LAYER_DEVICE
)
);
PlotPoly
(
ii
,
Poly
,
polyline
->
m_Fill
==
FILLED_SHAPE
?
true
:
false
,
polyline
->
m_Width
);
MyFree
(
Poly
);
}
...
...
eeschema/plothpgl.cpp
View file @
72b97ea4
...
...
@@ -205,7 +205,7 @@ void WinEDA_PlotHPGLFrame::CreateControls()
SetFont
(
*
g_DialogFont
);
////@begin WinEDA_PlotHPGLFrame content construction
// Generated by DialogBlocks, 2
9/04/2008 21:13:14
(unregistered)
// Generated by DialogBlocks, 2
3/08/2008 08:33:29
(unregistered)
WinEDA_PlotHPGLFrame
*
itemDialog1
=
this
;
...
...
@@ -245,19 +245,19 @@ void WinEDA_PlotHPGLFrame::CreateControls()
itemStaticBoxSizer7
->
Add
(
itemStaticText8
,
0
,
wxALIGN_LEFT
|
wxLEFT
|
wxRIGHT
|
wxTOP
|
wxADJUST_MINSIZE
,
5
);
m_ButtPenWidth
=
new
wxSpinCtrl
(
itemDialog1
,
ID_PEN_WIDTH_UPDATED
,
_T
(
"1"
),
wxDefaultPosition
,
wxDefaultSize
,
wxSP_ARROW_KEYS
|
wxSP_WRAP
,
1
,
100
,
1
);
itemStaticBoxSizer7
->
Add
(
m_ButtPenWidth
,
0
,
wxALIGN_LEFT
|
wx
ALL
,
5
);
itemStaticBoxSizer7
->
Add
(
m_ButtPenWidth
,
0
,
wxALIGN_LEFT
|
wx
LEFT
|
wxRIGHT
|
wxBOTTOM
,
5
);
wxStaticText
*
itemStaticText10
=
new
wxStaticText
(
itemDialog1
,
wxID_STATIC
,
_
(
"Pen Speed ( cm/s )"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
itemStaticBoxSizer7
->
Add
(
itemStaticText10
,
0
,
wxALIGN_LEFT
|
wxLEFT
|
wxRIGHT
|
wxTOP
|
wxADJUST_MINSIZE
,
5
);
m_ButtPenSpeed
=
new
wxSpinCtrl
(
itemDialog1
,
ID_PEN_SPEED_UPDATED
,
_T
(
"1"
),
wxDefaultPosition
,
wxDefaultSize
,
wxSP_ARROW_KEYS
,
1
,
100
,
1
);
itemStaticBoxSizer7
->
Add
(
m_ButtPenSpeed
,
0
,
wxALIGN_CENTER_HORIZONTAL
|
wx
ALL
,
5
);
itemStaticBoxSizer7
->
Add
(
m_ButtPenSpeed
,
0
,
wxALIGN_CENTER_HORIZONTAL
|
wx
LEFT
|
wxRIGHT
|
wxBOTTOM
,
5
);
wxStaticText
*
itemStaticText12
=
new
wxStaticText
(
itemDialog1
,
wxID_STATIC
,
_
(
"Pen Number"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
itemStaticBoxSizer7
->
Add
(
itemStaticText12
,
0
,
wxALIGN_LEFT
|
wxLEFT
|
wxRIGHT
|
wxTOP
|
wxADJUST_MINSIZE
,
5
);
m_ButtPenNum
=
new
wxSpinCtrl
(
itemDialog1
,
ID_PEN_NUMBER_UPDATED
,
_T
(
"1"
),
wxDefaultPosition
,
wxDefaultSize
,
wxSP_ARROW_KEYS
,
1
,
8
,
1
);
itemStaticBoxSizer7
->
Add
(
m_ButtPenNum
,
0
,
wxALIGN_CENTER_HORIZONTAL
|
wx
ALL
,
5
);
itemStaticBoxSizer7
->
Add
(
m_ButtPenNum
,
0
,
wxALIGN_CENTER_HORIZONTAL
|
wx
LEFT
|
wxRIGHT
|
wxBOTTOM
,
5
);
wxStaticBox
*
itemStaticBoxSizer14Static
=
new
wxStaticBox
(
itemDialog1
,
wxID_ANY
,
_
(
"Page offset:"
));
wxStaticBoxSizer
*
itemStaticBoxSizer14
=
new
wxStaticBoxSizer
(
itemStaticBoxSizer14Static
,
wxVERTICAL
);
...
...
@@ -267,20 +267,21 @@ void WinEDA_PlotHPGLFrame::CreateControls()
itemStaticBoxSizer14
->
Add
(
itemStaticText15
,
0
,
wxALIGN_LEFT
|
wxLEFT
|
wxRIGHT
|
wxTOP
|
wxADJUST_MINSIZE
,
5
);
m_PlotOrgPosition_X
=
new
wxTextCtrl
(
itemDialog1
,
ID_TEXTCTRL1
,
_T
(
""
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
itemStaticBoxSizer14
->
Add
(
m_PlotOrgPosition_X
,
0
,
wxALIGN_LEFT
|
wx
ALL
,
5
);
itemStaticBoxSizer14
->
Add
(
m_PlotOrgPosition_X
,
0
,
wxALIGN_LEFT
|
wx
LEFT
|
wxRIGHT
|
wxBOTTOM
,
5
);
wxStaticText
*
itemStaticText17
=
new
wxStaticText
(
itemDialog1
,
wxID_STATIC
,
_
(
"Plot Offset Y"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
itemStaticBoxSizer14
->
Add
(
itemStaticText17
,
0
,
wxALIGN_LEFT
|
wxLEFT
|
wxRIGHT
|
wxTOP
|
wxADJUST_MINSIZE
,
5
);
m_PlotOrgPosition_Y
=
new
wxTextCtrl
(
itemDialog1
,
ID_TEXTCTRL2
,
_T
(
""
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
itemStaticBoxSizer14
->
Add
(
m_PlotOrgPosition_Y
,
0
,
wxALIGN_LEFT
|
wx
ALL
,
5
);
itemStaticBoxSizer14
->
Add
(
m_PlotOrgPosition_Y
,
0
,
wxALIGN_LEFT
|
wx
LEFT
|
wxRIGHT
|
wxBOTTOM
,
5
);
itemBoxSizer3
->
Add
(
5
,
5
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
,
5
);
wxBoxSizer
*
itemBoxSizer20
=
new
wxBoxSizer
(
wxVERTICAL
);
itemBoxSizer3
->
Add
(
itemBoxSizer20
,
0
,
wxALIGN_TOP
|
wxLEFT
|
wxTOP
|
wxBOTTOM
,
5
);
wxButton
*
itemButton21
=
new
wxButton
(
itemDialog1
,
ID_PLOT_HPGL_CURRENT_EXECUTE
,
_
(
"&Plot CURRENT"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
wxButton
*
itemButton21
=
new
wxButton
(
itemDialog1
,
ID_PLOT_HPGL_CURRENT_EXECUTE
,
_
(
"&Plot Page"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
itemButton21
->
SetDefault
();
itemButton21
->
SetForegroundColour
(
wxColour
(
0
,
128
,
0
));
itemBoxSizer20
->
Add
(
itemButton21
,
0
,
wxGROW
|
wxALL
,
5
);
...
...
@@ -289,7 +290,6 @@ void WinEDA_PlotHPGLFrame::CreateControls()
itemBoxSizer20
->
Add
(
itemButton22
,
0
,
wxGROW
|
wxALL
,
5
);
m_btClose
=
new
wxButton
(
itemDialog1
,
wxID_CANCEL
,
_
(
"&Close"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_btClose
->
SetDefault
();
m_btClose
->
SetForegroundColour
(
wxColour
(
128
,
0
,
0
));
itemBoxSizer20
->
Add
(
m_btClose
,
0
,
wxGROW
|
wxALL
,
5
);
...
...
@@ -308,7 +308,7 @@ void WinEDA_PlotHPGLFrame::CreateControls()
m_ButtPenSpeed
->
SetValidator
(
wxGenericValidator
(
&
g_HPGL_Pen_Descr
.
m_Pen_Speed
)
);
m_ButtPenNum
->
SetValidator
(
wxGenericValidator
(
&
g_HPGL_Pen_Descr
.
m_Pen_Num
)
);
////@end WinEDA_PlotHPGLFrame content construction
m_btClose
->
SetFocus
();
SetFocus
();
// Make ESC key working
}
...
...
eeschema/plothpgl.pjd
View file @
72b97ea4
...
...
@@ -136,7 +136,7 @@
<long
name=
"locked"
>
0
</long>
<string
name=
"template-name"
>
""
</string>
<bool
name=
"dirty"
>
1
</bool>
<long
name=
"makefile-last-written"
>
0
</long>
<long
name=
"makefile-last-written"
>
-851968
0
</long>
<string
name=
"Compiler name"
>
""
</string>
<string
name=
"Build mode"
>
"Debug"
</string>
<string
name=
"Unicode mode"
>
"ANSI"
</string>
...
...
@@ -605,7 +605,7 @@
<long
name=
"proxy-Border"
>
5
</long>
<bool
name=
"proxy-wxLEFT"
>
1
</bool>
<bool
name=
"proxy-wxRIGHT"
>
1
</bool>
<bool
name=
"proxy-wxTOP"
>
1
</bool>
<bool
name=
"proxy-wxTOP"
>
0
</bool>
<bool
name=
"proxy-wxBOTTOM"
>
1
</bool>
<bool
name=
"proxy-wxSHAPED"
>
0
</bool>
<bool
name=
"proxy-wxADJUST_MINSIZE"
>
0
</bool>
...
...
@@ -745,7 +745,7 @@
<long
name=
"proxy-Border"
>
5
</long>
<bool
name=
"proxy-wxLEFT"
>
1
</bool>
<bool
name=
"proxy-wxRIGHT"
>
1
</bool>
<bool
name=
"proxy-wxTOP"
>
1
</bool>
<bool
name=
"proxy-wxTOP"
>
0
</bool>
<bool
name=
"proxy-wxBOTTOM"
>
1
</bool>
<bool
name=
"proxy-wxSHAPED"
>
0
</bool>
<bool
name=
"proxy-wxADJUST_MINSIZE"
>
0
</bool>
...
...
@@ -885,7 +885,7 @@
<long
name=
"proxy-Border"
>
5
</long>
<bool
name=
"proxy-wxLEFT"
>
1
</bool>
<bool
name=
"proxy-wxRIGHT"
>
1
</bool>
<bool
name=
"proxy-wxTOP"
>
1
</bool>
<bool
name=
"proxy-wxTOP"
>
0
</bool>
<bool
name=
"proxy-wxBOTTOM"
>
1
</bool>
<bool
name=
"proxy-wxSHAPED"
>
0
</bool>
<bool
name=
"proxy-wxADJUST_MINSIZE"
>
0
</bool>
...
...
@@ -1072,14 +1072,13 @@
<long
name=
"proxy-Border"
>
5
</long>
<bool
name=
"proxy-wxLEFT"
>
1
</bool>
<bool
name=
"proxy-wxRIGHT"
>
1
</bool>
<bool
name=
"proxy-wxTOP"
>
1
</bool>
<bool
name=
"proxy-wxTOP"
>
0
</bool>
<bool
name=
"proxy-wxBOTTOM"
>
1
</bool>
<bool
name=
"proxy-wxSHAPED"
>
0
</bool>
<bool
name=
"proxy-wxADJUST_MINSIZE"
>
0
</bool>
<bool
name=
"proxy-wxFIXED_MINSIZE"
>
0
</bool>
<string
name=
"proxy-Custom arguments"
>
""
</string>
<string
name=
"proxy-Custom ctor arguments"
>
""
</string>
<bool
name=
"proxy-wxTE_LINEWRAP"
>
0
</bool>
</document>
<document>
<string
name=
"title"
>
"wxStaticText: wxID_STATIC"
</string>
...
...
@@ -1225,14 +1224,13 @@
<long
name=
"proxy-Border"
>
5
</long>
<bool
name=
"proxy-wxLEFT"
>
1
</bool>
<bool
name=
"proxy-wxRIGHT"
>
1
</bool>
<bool
name=
"proxy-wxTOP"
>
1
</bool>
<bool
name=
"proxy-wxTOP"
>
0
</bool>
<bool
name=
"proxy-wxBOTTOM"
>
1
</bool>
<bool
name=
"proxy-wxSHAPED"
>
0
</bool>
<bool
name=
"proxy-wxADJUST_MINSIZE"
>
0
</bool>
<bool
name=
"proxy-wxFIXED_MINSIZE"
>
0
</bool>
<string
name=
"proxy-Custom arguments"
>
""
</string>
<string
name=
"proxy-Custom ctor arguments"
>
""
</string>
<bool
name=
"proxy-wxTE_LINEWRAP"
>
0
</bool>
</document>
</document>
</document>
...
...
@@ -1309,8 +1307,8 @@
<string
name=
"proxy-Implementation filename"
>
""
</string>
<string
name=
"proxy-Header filename"
>
""
</string>
<string
name=
"proxy-Member variable name"
>
""
</string>
<string
name=
"proxy-Label"
>
"
&
Plot
CURRENT
"
</string>
<bool
name=
"proxy-Default"
>
0
</bool>
<string
name=
"proxy-Label"
>
"
&
Plot
Page
"
</string>
<bool
name=
"proxy-Default"
>
1
</bool>
<string
name=
"proxy-Help text"
>
""
</string>
<string
name=
"proxy-Tooltip text"
>
""
</string>
<string
name=
"proxy-Data variable"
>
""
</string>
...
...
@@ -1444,7 +1442,7 @@
<string
name=
"proxy-Header filename"
>
""
</string>
<string
name=
"proxy-Member variable name"
>
"m_btClose"
</string>
<string
name=
"proxy-Label"
>
"
&
Close"
</string>
<bool
name=
"proxy-Default"
>
1
</bool>
<bool
name=
"proxy-Default"
>
0
</bool>
<string
name=
"proxy-Help text"
>
""
</string>
<string
name=
"proxy-Tooltip text"
>
""
</string>
<string
name=
"proxy-Data variable"
>
""
</string>
...
...
eeschema/plotps.cpp
View file @
72b97ea4
...
...
@@ -101,13 +101,11 @@ IMPLEMENT_DYNAMIC_CLASS( WinEDA_PlotPSFrame, wxDialog )
BEGIN_EVENT_TABLE
(
WinEDA_PlotPSFrame
,
wxDialog
)
////@begin WinEDA_PlotPSFrame event table entries
EVT_INIT_DIALOG
(
WinEDA_PlotPSFrame
::
OnInitDialog
)
EVT_BUTTON
(
ID_PLOT_PS_CURRENT_EXECUTE
,
WinEDA_PlotPSFrame
::
OnPlotPsCurrentExecuteClick
)
EVT_BUTTON
(
ID_PLOT_PS_CURRENT_EXECUTE
,
WinEDA_PlotPSFrame
::
OnPlotPsCurrent
ExecuteClick
)
EVT_BUTTON
(
ID_PLOT_PS_ALL_EXECUTE
,
WinEDA_PlotPSFrame
::
OnPlotPsAll
ExecuteClick
)
EVT_BUTTON
(
ID_PLOT_PS_ALL_EXECUTE
,
WinEDA_PlotPSFrame
::
OnPlotPsAllExecuteClick
)
EVT_BUTTON
(
wxID_CANCEL
,
WinEDA_PlotPSFrame
::
OnCancelClick
)
EVT_BUTTON
(
wxID_CANCEL
,
WinEDA_PlotPSFrame
::
OnCancelClick
)
////@end WinEDA_PlotPSFrame event table entries
...
...
@@ -147,24 +145,22 @@ bool WinEDA_PlotPSFrame::Create( wxWindow* parent,
////@begin WinEDA_PlotPSFrame member initialisation
m_SizeOption
=
NULL
;
m_PlotPSColorOption
=
NULL
;
m_Plot_Sheet_Ref
=
NULL
;
m_Plot_Sheet_Ref
=
NULL
;
m_btClose
=
NULL
;
m_DefaultLineSizeCtrlSizer
=
NULL
;
m_MsgBox
=
NULL
;
////@end WinEDA_PlotPSFrame member initialisation
////@begin WinEDA_PlotPSFrame creation
SetExtraStyle
(
wxWS_EX_BLOCK_EVENTS
);
SetExtraStyle
(
wxWS_EX_BLOCK_EVENTS
);
wxDialog
::
Create
(
parent
,
id
,
caption
,
pos
,
size
,
style
);
CreateControls
();
if
(
GetSizer
()
)
if
(
GetSizer
()
)
{
GetSizer
()
->
SetSizeHints
(
this
);
GetSizer
()
->
SetSizeHints
(
this
);
}
Centre
();
////@end WinEDA_PlotPSFrame creation
return
true
;
}
...
...
@@ -179,114 +175,75 @@ void WinEDA_PlotPSFrame::CreateControls()
SetFont
(
*
g_DialogFont
);
////@begin WinEDA_PlotPSFrame content construction
// Generated by DialogBlocks, 2
9/04/2008 21:12:22
(unregistered)
// Generated by DialogBlocks, 2
3/08/2008 08:35:17
(unregistered)
WinEDA_PlotPSFrame
*
itemDialog1
=
this
;
wxBoxSizer
*
itemBoxSizer2
=
new
wxBoxSizer
(
wxVERTICAL
);
itemDialog1
->
SetSizer
(
itemBoxSizer2
);
wxBoxSizer
*
itemBoxSizer2
=
new
wxBoxSizer
(
wxVERTICAL
);
itemDialog1
->
SetSizer
(
itemBoxSizer2
);
wxBoxSizer
*
itemBoxSizer3
=
new
wxBoxSizer
(
wxHORIZONTAL
);
itemBoxSizer2
->
Add
(
itemBoxSizer3
,
0
,
wxALIGN_CENTER_HORIZONTAL
|
wxALL
,
5
);
wxBoxSizer
*
itemBoxSizer3
=
new
wxBoxSizer
(
wxHORIZONTAL
);
itemBoxSizer2
->
Add
(
itemBoxSizer3
,
0
,
wxALIGN_CENTER_HORIZONTAL
|
wxALL
,
5
);
wxArrayString
m_SizeOptionStrings
;
m_SizeOptionStrings
.
Add
(
_
(
"Auto"
)
);
m_SizeOptionStrings
.
Add
(
_
(
"Page Size A4"
)
);
m_SizeOptionStrings
.
Add
(
_
(
"Page Size A"
)
);
m_SizeOption
=
new
wxRadioBox
(
itemDialog1
,
ID_RADIOBOX1
,
_
(
"Plot page size:"
),
wxDefaultPosition
,
wxDefaultSize
,
m_SizeOptionStrings
,
1
,
wxRA_SPECIFY_COLS
);
m_SizeOption
->
SetSelection
(
0
);
itemBoxSizer3
->
Add
(
m_SizeOption
,
0
,
wxGROW
|
wxALL
,
5
);
itemBoxSizer3
->
Add
(
5
,
5
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
,
5
);
m_SizeOptionStrings
.
Add
(
_
(
"Auto"
));
m_SizeOptionStrings
.
Add
(
_
(
"Page Size A4"
));
m_SizeOptionStrings
.
Add
(
_
(
"Page Size A"
));
m_SizeOption
=
new
wxRadioBox
(
itemDialog1
,
ID_RADIOBOX1
,
_
(
"Plot page size:"
),
wxDefaultPosition
,
wxDefaultSize
,
m_SizeOptionStrings
,
1
,
wxRA_SPECIFY_COLS
);
m_SizeOption
->
SetSelection
(
0
);
itemBoxSizer3
->
Add
(
m_SizeOption
,
0
,
wxGROW
|
wxALL
,
5
);
wxStaticBox
*
itemStaticBoxSizer6Static
=
new
wxStaticBox
(
itemDialog1
,
wxID_ANY
,
_
(
"Plot Options:"
)
);
itemBoxSizer3
->
Add
(
5
,
5
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
,
5
);
wxStaticBoxSizer
*
itemStaticBoxSizer6
=
new
wxStaticBoxSizer
(
itemStaticBoxSizer6Static
,
wxVERTICAL
);
itemBoxSizer3
->
Add
(
itemStaticBoxSizer6
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
,
5
);
wxStaticBox
*
itemStaticBoxSizer6Static
=
new
wxStaticBox
(
itemDialog1
,
wxID_ANY
,
_
(
"Plot Options:"
));
wxStaticBoxSizer
*
itemStaticBoxSizer6
=
new
wxStaticBoxSizer
(
itemStaticBoxSizer6Static
,
wxVERTICAL
);
itemBoxSizer3
->
Add
(
itemStaticBoxSizer6
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
,
5
);
wxArrayString
m_PlotPSColorOptionStrings
;
m_PlotPSColorOptionStrings
.
Add
(
_
(
"B/W"
)
);
m_PlotPSColorOptionStrings
.
Add
(
_
(
"Color"
)
);
m_PlotPSColorOption
=
new
wxRadioBox
(
itemDialog1
,
ID_RADIOBOX
,
_
(
"Plot Color:"
),
wxDefaultPosition
,
wxDefaultSize
,
m_PlotPSColorOptionStrings
,
1
,
wxRA_SPECIFY_COLS
);
m_PlotPSColorOption
->
SetSelection
(
0
);
itemStaticBoxSizer6
->
Add
(
m_PlotPSColorOption
,
0
,
wxGROW
|
wxALL
,
5
);
m_Plot_Sheet_Ref
=
new
wxCheckBox
(
itemDialog1
,
ID_CHECKBOX
,
_
(
"Print Sheet Ref"
),
wxDefaultPosition
,
wxDefaultSize
,
wxCHK_2STATE
);
m_Plot_Sheet_Ref
->
SetValue
(
false
);
itemStaticBoxSizer6
->
Add
(
m_Plot_Sheet_Ref
,
0
,
wxGROW
|
wxALL
,
5
);
itemBoxSizer3
->
Add
(
5
,
5
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
,
5
);
wxBoxSizer
*
itemBoxSizer10
=
new
wxBoxSizer
(
wxVERTICAL
);
itemBoxSizer3
->
Add
(
itemBoxSizer10
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
,
5
);
m_PlotPSColorOptionStrings
.
Add
(
_
(
"B/W"
));
m_PlotPSColorOptionStrings
.
Add
(
_
(
"Color"
));
m_PlotPSColorOption
=
new
wxRadioBox
(
itemDialog1
,
ID_RADIOBOX
,
_
(
"Plot Color:"
),
wxDefaultPosition
,
wxDefaultSize
,
m_PlotPSColorOptionStrings
,
1
,
wxRA_SPECIFY_COLS
);
m_PlotPSColorOption
->
SetSelection
(
0
);
itemStaticBoxSizer6
->
Add
(
m_PlotPSColorOption
,
0
,
wxGROW
|
wxALL
,
5
);
wxButton
*
itemButton11
=
new
wxButton
(
itemDialog1
,
ID_PLOT_PS_CURRENT_EXECUTE
,
_
(
"&Plot CURRENT"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_Plot_Sheet_Ref
=
new
wxCheckBox
(
itemDialog1
,
ID_CHECKBOX
,
_
(
"Print Sheet Ref"
),
wxDefaultPosition
,
wxDefaultSize
,
wxCHK_2STATE
);
m_Plot_Sheet_Ref
->
SetValue
(
false
);
itemStaticBoxSizer6
->
Add
(
m_Plot_Sheet_Ref
,
0
,
wxGROW
|
wxALL
,
5
);
itemButton11
->
SetForegroundColour
(
wxColour
(
0
,
128
,
0
)
);
itemBoxSizer10
->
Add
(
itemButton11
,
0
,
wxGROW
|
wxALL
,
5
);
itemBoxSizer3
->
Add
(
5
,
5
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
,
5
);
wxButton
*
itemButton12
=
new
wxButton
(
itemDialog1
,
ID_PLOT_PS_ALL_EXECUTE
,
_
(
"Plot A&LL"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
wxBoxSizer
*
itemBoxSizer10
=
new
wxBoxSizer
(
wxVERTICAL
);
itemBoxSizer3
->
Add
(
itemBoxSizer10
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
,
5
);
itemButton12
->
SetForegroundColour
(
wxColour
(
179
,
0
,
0
)
);
itemBoxSizer10
->
Add
(
itemButton12
,
0
,
wxGROW
|
wxALL
,
5
);
wxButton
*
itemButton11
=
new
wxButton
(
itemDialog1
,
ID_PLOT_PS_CURRENT_EXECUTE
,
_
(
"&Plot Page"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
itemButton11
->
SetDefault
();
itemButton11
->
SetForegroundColour
(
wxColour
(
0
,
128
,
0
));
itemBoxSizer10
->
Add
(
itemButton11
,
0
,
wxGROW
|
wxALL
,
5
);
m_btClose
=
new
wxButton
(
itemDialog1
,
wxID_CANCEL
,
_
(
"Close"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
wxButton
*
itemButton12
=
new
wxButton
(
itemDialog1
,
ID_PLOT_PS_ALL_EXECUTE
,
_
(
"Plot A&LL"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
itemButton12
->
SetForegroundColour
(
wxColour
(
179
,
0
,
0
));
itemBoxSizer10
->
Add
(
itemButton12
,
0
,
wxGROW
|
wxALL
,
5
);
m_btClose
->
SetDefault
(
);
m_btClose
->
SetForegroundColour
(
wxColour
(
0
,
0
,
255
)
);
itemBoxSizer10
->
Add
(
m_btClose
,
0
,
wxGROW
|
wxALL
,
5
);
m_btClose
=
new
wxButton
(
itemDialog1
,
wxID_CANCEL
,
_
(
"Close"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_btClose
->
SetForegroundColour
(
wxColour
(
0
,
0
,
255
)
);
itemBoxSizer10
->
Add
(
m_btClose
,
0
,
wxGROW
|
wxALL
,
5
);
m_DefaultLineSizeCtrlSizer
=
new
wxBoxSizer
(
wxVERTICAL
);
m_DefaultLineSizeCtrlSizer
=
new
wxBoxSizer
(
wxVERTICAL
);
itemBoxSizer2
->
Add
(
m_DefaultLineSizeCtrlSizer
,
0
,
wxGROW
|
wxALL
,
5
);
itemBoxSizer2
->
Add
(
m_DefaultLineSizeCtrlSizer
,
0
,
wxGROW
|
wxALL
,
5
);
wxStaticText
*
itemStaticText15
=
new
wxStaticText
(
itemDialog1
,
wxID_STATIC
,
_
(
"Messages :"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
itemBoxSizer2
->
Add
(
itemStaticText15
,
0
,
wxALIGN_LEFT
|
wxLEFT
|
wxRIGHT
|
wxTOP
|
wxADJUST_MINSIZE
,
5
);
wxStaticText
*
itemStaticText15
=
new
wxStaticText
(
itemDialog1
,
wxID_STATIC
,
_
(
"Messages :"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
itemBoxSizer2
->
Add
(
itemStaticText15
,
0
,
wxALIGN_LEFT
|
wxLEFT
|
wxRIGHT
|
wxTOP
|
wxADJUST_MINSIZE
,
5
);
m_MsgBox
=
new
wxTextCtrl
(
itemDialog1
,
ID_TEXTCTRL
,
_T
(
""
),
wxDefaultPosition
,
wxSize
(
-
1
,
200
),
wxTE_MULTILINE
);
itemBoxSizer2
->
Add
(
m_MsgBox
,
0
,
wxGROW
|
wxALL
|
wxFIXED_MINSIZE
,
5
);
m_MsgBox
=
new
wxTextCtrl
(
itemDialog1
,
ID_TEXTCTRL
,
_T
(
""
),
wxDefaultPosition
,
wxSize
(
-
1
,
200
),
wxTE_MULTILINE
);
itemBoxSizer2
->
Add
(
m_MsgBox
,
0
,
wxGROW
|
wxALL
|
wxFIXED_MINSIZE
,
5
);
// Set validators
m_SizeOption
->
SetValidator
(
wxGenericValidator
(
&
PS_SizeSelect
)
);
m_PlotPSColorOption
->
SetValidator
(
wxGenericValidator
(
&
g_PlotPSColorOpt
)
);
m_Plot_Sheet_Ref
->
SetValidator
(
wxGenericValidator
(
&
Plot_Sheet_Ref
)
);
m_SizeOption
->
SetValidator
(
wxGenericValidator
(
&
PS_SizeSelect
)
);
m_PlotPSColorOption
->
SetValidator
(
wxGenericValidator
(
&
g_PlotPSColorOpt
)
);
m_Plot_Sheet_Ref
->
SetValidator
(
wxGenericValidator
(
&
Plot_Sheet_Ref
)
);
////@end WinEDA_PlotPSFrame content construction
m_btClose
->
SetFocus
();
SetFocus
();
// make the ESC work
m_DefaultLineSizeCtrl
=
new
WinEDA_ValueCtrl
(
this
,
_
(
"Default Line Width"
),
g_PlotPSMinimunLineWidth
,
...
...
@@ -313,9 +270,8 @@ wxBitmap WinEDA_PlotPSFrame::GetBitmapResource( const wxString& name )
{
// Bitmap retrieval
////@begin WinEDA_PlotPSFrame bitmap retrieval
wxUnusedVar
(
name
);
wxUnusedVar
(
name
);
return
wxNullBitmap
;
////@end WinEDA_PlotPSFrame bitmap retrieval
}
...
...
@@ -328,9 +284,8 @@ wxIcon WinEDA_PlotPSFrame::GetIconResource( const wxString& name )
{
// Icon retrieval
////@begin WinEDA_PlotPSFrame icon retrieval
wxUnusedVar
(
name
);
wxUnusedVar
(
name
);
return
wxNullIcon
;
////@end WinEDA_PlotPSFrame icon retrieval
}
...
...
@@ -616,18 +571,3 @@ void WinEDA_PlotPSFrame::PlotOneSheetPS( const wxString& FileName,
}
/*!
* wxEVT_INIT_DIALOG event handler for ID_DIALOG
*/
void
WinEDA_PlotPSFrame
::
OnInitDialog
(
wxInitDialogEvent
&
event
)
{
// make the ESC work
m_SizeOption
->
SetFocus
();
////@begin wxEVT_INIT_DIALOG event handler for ID_DIALOG in WinEDA_PlotPSFrame.
// Before editing this code, remove the block markers.
event
.
Skip
();
////@end wxEVT_INIT_DIALOG event handler for ID_DIALOG in WinEDA_PlotPSFrame.
}
eeschema/plotps.h
View file @
72b97ea4
...
...
@@ -83,9 +83,6 @@ public:
////@begin WinEDA_PlotPSFrame event handler declarations
/// wxEVT_INIT_DIALOG event handler for ID_DIALOG
void
OnInitDialog
(
wxInitDialogEvent
&
event
);
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_PLOT_PS_CURRENT_EXECUTE
void
OnPlotPsCurrentExecuteClick
(
wxCommandEvent
&
event
);
...
...
eeschema/plotps.pjd
View file @
72b97ea4
...
...
@@ -221,7 +221,6 @@
<string
name=
"id-suffix"
>
""
</string>
<long
name=
"use-xrc"
>
0
</long>
<long
name=
"working-mode"
>
0
</long>
<string
name=
"event-handler-0"
>
"wxEVT_INIT_DIALOG|OnInitDialog|NONE||WinEDA_PlotPSFrame"
</string>
<string
name=
"proxy-Id name"
>
"ID_DIALOG"
</string>
<long
name=
"proxy-Id value"
>
10000
</long>
<string
name=
"proxy-Class"
>
"WinEDA_PlotPSFrame"
</string>
...
...
@@ -649,8 +648,8 @@
<string
name=
"proxy-Implementation filename"
>
""
</string>
<string
name=
"proxy-Header filename"
>
""
</string>
<string
name=
"proxy-Member variable name"
>
""
</string>
<string
name=
"proxy-Label"
>
"
&
Plot
CURRENT
"
</string>
<bool
name=
"proxy-Default"
>
0
</bool>
<string
name=
"proxy-Label"
>
"
&
Plot
Page
"
</string>
<bool
name=
"proxy-Default"
>
1
</bool>
<string
name=
"proxy-Help text"
>
""
</string>
<string
name=
"proxy-Tooltip text"
>
""
</string>
<string
name=
"proxy-Data variable"
>
""
</string>
...
...
@@ -784,7 +783,7 @@
<string
name=
"proxy-Header filename"
>
""
</string>
<string
name=
"proxy-Member variable name"
>
"m_btClose"
</string>
<string
name=
"proxy-Label"
>
"Close"
</string>
<bool
name=
"proxy-Default"
>
1
</bool>
<bool
name=
"proxy-Default"
>
0
</bool>
<string
name=
"proxy-Help text"
>
""
</string>
<string
name=
"proxy-Tooltip text"
>
""
</string>
<string
name=
"proxy-Data variable"
>
""
</string>
...
...
@@ -1007,7 +1006,6 @@
<bool
name=
"proxy-wxFIXED_MINSIZE"
>
1
</bool>
<string
name=
"proxy-Custom arguments"
>
""
</string>
<string
name=
"proxy-Custom ctor arguments"
>
""
</string>
<bool
name=
"proxy-wxTE_LINEWRAP"
>
0
</bool>
</document>
</document>
</document>
...
...
internat/fr/kicad.mo
View file @
72b97ea4
No preview for this file type
internat/fr/kicad.po
View file @
72b97ea4
...
...
@@ -3,7 +3,7 @@ msgstr ""
"Project-Id-Version: kicad\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2008-08-17 18:59+0100\n"
"PO-Revision-Date: 2008-08-22 1
4:10
+0100\n"
"PO-Revision-Date: 2008-08-22 1
9:31
+0100\n"
"Last-Translator: \n"
"Language-Team: kicad team <jean-pierre.charras@ujf-grenoble.fr>\n"
"MIME-Version: 1.0\n"
...
...
@@ -8080,7 +8080,7 @@ msgstr "Imprimer cartouche"
#: eeschema/plotps.cpp:242
#: eeschema/plothpgl.cpp:283
msgid "&Plot CURRENT"
msgstr "&
Imprim
er courant"
msgstr "&
Trac
er courant"
#: eeschema/plotps.cpp:249
#: eeschema/plothpgl.cpp:287
...
...
@@ -9432,7 +9432,6 @@ msgid "PCBnew (PCB editor)"
msgstr "PCBnew (Editeur de circuits imprimés)"
#: kicad/commandframe.cpp:70
#, fuzzy
msgid "GerbView (Gerber viewer)"
msgstr "GerbView (Visualisateur Gerber)"
...
...
share/svg_print.cpp
View file @
72b97ea4
...
...
@@ -49,6 +49,11 @@
////@begin XPM images
////@end XPM images
// Keys for configuration
#define PLOTSVGPENWIDTH_KEY wxT( "PlotSVGPenWidth")
#define PLOTSVGMODECOLOR_KEY wxT( "PlotSVGModeColor" )
extern
BASE_SCREEN
*
ActiveScreen
;
#ifdef EESCHEMA
#define WIDTH_MAX_VALUE 100
...
...
@@ -102,13 +107,13 @@ IMPLEMENT_DYNAMIC_CLASS( WinEDA_PrintSVGFrame, wxDialog )
BEGIN_EVENT_TABLE
(
WinEDA_PrintSVGFrame
,
wxDialog
)
////@begin WinEDA_PrintSVGFrame event table entries
EVT_CLOSE
(
WinEDA_PrintSVGFrame
::
OnCloseWindow
)
EVT_CLOSE
(
WinEDA_PrintSVGFrame
::
OnCloseWindow
)
EVT_RADIOBOX
(
ID_RADIOBOX_SETPRINTMODE
,
WinEDA_PrintSVGFrame
::
OnRadioboxSetprintmodeSelected
)
EVT_RADIOBOX
(
ID_RADIOBOX_SETPRINTMODE
,
WinEDA_PrintSVGFrame
::
OnRadioboxSetprintmodeSelected
)
EVT_BUTTON
(
ID_PRINT_EXECUTE
,
WinEDA_PrintSVGFrame
::
OnPrintExecuteClick
)
EVT_BUTTON
(
ID_PRINT_EXECUTE
,
WinEDA_PrintSVGFrame
::
OnPrintExecuteClick
)
EVT_BUTTON
(
wxID_CLOSE
,
WinEDA_PrintSVGFrame
::
OnClose
Click
)
EVT_BUTTON
(
wxID_CANCEL
,
WinEDA_PrintSVGFrame
::
OnCancel
Click
)
////@end WinEDA_PrintSVGFrame event table entries
...
...
@@ -135,8 +140,8 @@ WinEDA_PrintSVGFrame::WinEDA_PrintSVGFrame( WinEDA_DrawFrame* parent,
wxConfig
*
Config
=
m_Parent
->
m_Parent
->
m_EDA_Config
;
if
(
Config
)
{
Config
->
Read
(
wxT
(
"PlotSVGPenWidth"
)
,
&
s_SVGPenMinWidth
);
Config
->
Read
(
wxT
(
"PlotSVGModeColor"
)
,
&
s_PlotBlackAndWhite
);
Config
->
Read
(
PLOTSVGPENWIDTH_KEY
,
&
s_SVGPenMinWidth
);
Config
->
Read
(
PLOTSVGMODECOLOR_KEY
,
&
s_PlotBlackAndWhite
);
}
Create
(
parent
,
id
,
caption
,
pos
,
size
,
style
);
...
...
@@ -158,23 +163,21 @@ bool WinEDA_PrintSVGFrame::Create( wxWindow* parent,
m_DialogPenWidthSizer
=
NULL
;
m_ModeColorOption
=
NULL
;
m_Print_Sheet_Ref
=
NULL
;
m_PagesOption
=
NULL
;
m_PagesOption
=
NULL
;
m_FileNameCtrl
=
NULL
;
m_MessagesBox
=
NULL
;
m_MessagesBox
=
NULL
;
////@end WinEDA_PrintSVGFrame member initialisation
////@begin WinEDA_PrintSVGFrame creation
SetExtraStyle
(
GetExtraStyle
()
|
wxWS_EX_BLOCK_EVENTS
);
SetExtraStyle
(
wxWS_EX_BLOCK_EVENTS
);
wxDialog
::
Create
(
parent
,
id
,
caption
,
pos
,
size
,
style
);
CreateControls
();
if
(
GetSizer
()
)
if
(
GetSizer
()
)
{
GetSizer
()
->
SetSizeHints
(
this
);
GetSizer
()
->
SetSizeHints
(
this
);
}
Centre
();
////@end WinEDA_PrintSVGFrame creation
return
true
;
}
...
...
@@ -189,114 +192,72 @@ void WinEDA_PrintSVGFrame::CreateControls()
SetFont
(
*
g_DialogFont
);
////@begin WinEDA_PrintSVGFrame content construction
// Generated by DialogBlocks, 2
4/01/2007 19:00:23
(unregistered)
// Generated by DialogBlocks, 2
3/08/2008 08:56:55
(unregistered)
WinEDA_PrintSVGFrame
*
itemDialog1
=
this
;
wxBoxSizer
*
itemBoxSizer2
=
new
wxBoxSizer
(
wxVERTICAL
);
itemDialog1
->
SetSizer
(
itemBoxSizer2
);
wxBoxSizer
*
itemBoxSizer3
=
new
wxBoxSizer
(
wxHORIZONTAL
);
itemBoxSizer2
->
Add
(
itemBoxSizer3
,
0
,
wxALIGN_CENTER_HORIZONTAL
|
wxALL
,
5
);
wxBoxSizer
*
itemBoxSizer4
=
new
wxBoxSizer
(
wxVERTICAL
);
itemBoxSizer3
->
Add
(
itemBoxSizer4
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
,
5
);
m_DialogPenWidthSizer
=
new
wxBoxSizer
(
wxVERTICAL
);
itemBoxSizer4
->
Add
(
m_DialogPenWidthSizer
,
0
,
wxGROW
|
wxALL
,
5
);
wxBoxSizer
*
itemBoxSizer2
=
new
wxBoxSizer
(
wxVERTICAL
);
itemDialog1
->
SetSizer
(
itemBoxSizer2
);
wxString
m_ModeColorOptionStrings
[]
=
{
_
(
"Color"
),
_
(
"Black and White"
)
};
m_ModeColorOption
=
new
wxRadioBox
(
itemDialog1
,
ID_RADIOBOX_SETPRINTMODE
,
_
(
"Print mode"
),
wxDefaultPosition
,
wxDefaultSize
,
2
,
m_ModeColorOptionStrings
,
1
,
wxRA_SPECIFY_COLS
);
wxBoxSizer
*
itemBoxSizer3
=
new
wxBoxSizer
(
wxHORIZONTAL
);
itemBoxSizer2
->
Add
(
itemBoxSizer3
,
0
,
wxALIGN_CENTER_HORIZONTAL
|
wxALL
,
5
);
m_ModeColorOption
->
SetSelection
(
0
);
itemBoxSizer
4
->
Add
(
m_ModeColorOption
,
0
,
wxALIGN_LEFT
|
wxALL
,
5
);
wxBoxSizer
*
itemBoxSizer4
=
new
wxBoxSizer
(
wxVERTICAL
);
itemBoxSizer
3
->
Add
(
itemBoxSizer4
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
,
5
);
m_Print_Sheet_Ref
=
new
wxCheckBox
(
itemDialog1
,
ID_CHECKBOX
,
_
(
"Print Sheet Ref"
),
wxDefaultPosition
,
wxDefaultSize
,
wxCHK_2STATE
);
m_DialogPenWidthSizer
=
new
wxBoxSizer
(
wxVERTICAL
);
itemBoxSizer4
->
Add
(
m_DialogPenWidthSizer
,
0
,
wxGROW
|
wxALL
,
5
);
m_Print_Sheet_Ref
->
SetValue
(
false
);
itemBoxSizer4
->
Add
(
m_Print_Sheet_Ref
,
0
,
wxALIGN_LEFT
|
wxALL
,
5
);
wxArrayString
m_ModeColorOptionStrings
;
m_ModeColorOptionStrings
.
Add
(
_
(
"Color"
));
m_ModeColorOptionStrings
.
Add
(
_
(
"Black and White"
));
m_ModeColorOption
=
new
wxRadioBox
(
itemDialog1
,
ID_RADIOBOX_SETPRINTMODE
,
_
(
"Print mode"
),
wxDefaultPosition
,
wxDefaultSize
,
m_ModeColorOptionStrings
,
1
,
wxRA_SPECIFY_COLS
);
m_ModeColorOption
->
SetSelection
(
0
);
itemBoxSizer4
->
Add
(
m_ModeColorOption
,
0
,
wxGROW
|
wxALL
,
5
);
itemBoxSizer3
->
Add
(
5
,
5
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
,
15
);
m_Print_Sheet_Ref
=
new
wxCheckBox
(
itemDialog1
,
ID_CHECKBOX
,
_
(
"Print Sheet Ref"
),
wxDefaultPosition
,
wxDefaultSize
,
wxCHK_2STATE
);
m_Print_Sheet_Ref
->
SetValue
(
false
);
itemBoxSizer4
->
Add
(
m_Print_Sheet_Ref
,
0
,
wxALIGN_LEFT
|
wxALL
,
5
);
wxBoxSizer
*
itemBoxSizer9
=
new
wxBoxSizer
(
wxVERTICAL
);
itemBoxSizer3
->
Add
(
5
,
5
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
,
15
);
itemBoxSizer3
->
Add
(
itemBoxSizer9
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
,
5
);
wxBoxSizer
*
itemBoxSizer9
=
new
wxBoxSizer
(
wxVERTICAL
);
itemBoxSizer3
->
Add
(
itemBoxSizer9
,
0
,
wxALIGN_CENTER_VERTICAL
|
wxALL
,
5
);
wxString
m_PagesOptionStrings
[]
=
{
_
(
"Current"
),
_
(
"All"
)
};
m_PagesOption
=
new
wxRadioBox
(
itemDialog1
,
ID_RADIOBOX1
,
_
(
"Page Print:"
),
wxDefaultPosition
,
wxDefaultSize
,
2
,
m_PagesOptionStrings
,
1
,
wxRA_SPECIFY_COLS
);
m_PagesOption
->
SetSelection
(
0
);
itemBoxSizer9
->
Add
(
m_PagesOption
,
0
,
wxALIGN_LEFT
|
wxALL
,
5
);
wxButton
*
itemButton11
=
new
wxButton
(
itemDialog1
,
ID_PRINT_EXECUTE
,
_
(
"Create &File"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
wxArrayString
m_PagesOptionStrings
;
m_PagesOptionStrings
.
Add
(
_
(
"Current"
));
m_PagesOptionStrings
.
Add
(
_
(
"All"
));
m_PagesOption
=
new
wxRadioBox
(
itemDialog1
,
ID_RADIOBOX1
,
_
(
"Page Print:"
),
wxDefaultPosition
,
wxDefaultSize
,
m_PagesOptionStrings
,
1
,
wxRA_SPECIFY_COLS
);
m_PagesOption
->
SetSelection
(
0
);
itemBoxSizer9
->
Add
(
m_PagesOption
,
0
,
wxALIGN_LEFT
|
wxALL
,
5
);
wxButton
*
itemButton11
=
new
wxButton
(
itemDialog1
,
ID_PRINT_EXECUTE
,
_
(
"Create &File"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
itemButton11
->
SetDefault
();
itemButton11
->
SetForegroundColour
(
wxColour
(
0
,
128
,
0
)
);
itemBoxSizer9
->
Add
(
itemButton11
,
0
,
wxGROW
|
wxALL
,
5
);
wxButton
*
itemButton12
=
new
wxButton
(
itemDialog1
,
wxID_CLOSE
,
_
(
"&Close"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
itemButton12
->
SetForegroundColour
(
wxColour
(
0
,
0
,
198
)
);
itemBoxSizer9
->
Add
(
itemButton12
,
0
,
wxGROW
|
wxALL
,
5
);
wxStaticText
*
itemStaticText13
=
new
wxStaticText
(
itemDialog1
,
wxID_STATIC
,
_
(
"Filename:"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
itemBoxSizer2
->
Add
(
itemStaticText13
,
0
,
wxALIGN_LEFT
|
wxLEFT
|
wxRIGHT
|
wxTOP
|
wxADJUST_MINSIZE
,
5
);
itemButton11
->
SetForegroundColour
(
wxColour
(
0
,
128
,
0
));
itemBoxSizer9
->
Add
(
itemButton11
,
0
,
wxGROW
|
wxALL
,
5
);
m_FileNameCtrl
=
new
wxTextCtrl
(
itemDialog1
,
ID_TEXTCTRL
,
_T
(
""
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
wxButton
*
itemButton12
=
new
wxButton
(
itemDialog1
,
wxID_CANCEL
,
_
(
"Cancel"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
itemButton12
->
SetForegroundColour
(
wxColour
(
0
,
0
,
198
));
itemBoxSizer9
->
Add
(
itemButton12
,
0
,
wxGROW
|
wxALL
,
5
);
itemBoxSizer2
->
Add
(
m_FileNameCtrl
,
0
,
wxGROW
|
wxALL
,
5
);
wxStaticText
*
itemStaticText13
=
new
wxStaticText
(
itemDialog1
,
wxID_STATIC
,
_
(
"Filename:"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
itemBoxSizer2
->
Add
(
itemStaticText13
,
0
,
wxALIGN_LEFT
|
wxLEFT
|
wxRIGHT
|
wxTOP
|
wxADJUST_MINSIZE
,
5
);
wxStaticText
*
itemStaticText15
=
new
wxStaticText
(
itemDialog1
,
wxID_STATIC
,
_
(
"Messages:"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_FileNameCtrl
=
new
wxTextCtrl
(
itemDialog1
,
ID_TEXTCTRL
,
_T
(
""
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
itemBoxSizer2
->
Add
(
m_FileNameCtrl
,
0
,
wxGROW
|
wxLEFT
|
wxRIGHT
|
wxBOTTOM
,
5
);
itemBoxSizer2
->
Add
(
itemStaticText15
,
0
,
wxALIGN_LEFT
|
wxLEFT
|
wxRIGHT
|
wxTOP
|
wxADJUST_MINSIZE
,
5
);
wxStaticText
*
itemStaticText15
=
new
wxStaticText
(
itemDialog1
,
wxID_STATIC
,
_
(
"Messages:"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
itemBoxSizer2
->
Add
(
itemStaticText15
,
0
,
wxALIGN_LEFT
|
wxLEFT
|
wxRIGHT
|
wxTOP
|
wxADJUST_MINSIZE
,
5
);
m_MessagesBox
=
new
wxTextCtrl
(
itemDialog1
,
ID_TEXTCTRL1
,
_T
(
""
),
wxDefaultPosition
,
wxSize
(
-
1
,
100
),
wxTE_MULTILINE
|
wxTE_READONLY
);
itemBoxSizer2
->
Add
(
m_MessagesBox
,
0
,
wxGROW
|
wxALL
,
5
);
m_MessagesBox
=
new
wxTextCtrl
(
itemDialog1
,
ID_TEXTCTRL1
,
_T
(
""
),
wxDefaultPosition
,
wxSize
(
-
1
,
100
),
wxTE_MULTILINE
|
wxTE_READONLY
);
itemBoxSizer2
->
Add
(
m_MessagesBox
,
0
,
wxGROW
|
wxLEFT
|
wxRIGHT
|
wxBOTTOM
,
5
);
// Set validators
m_ModeColorOption
->
SetValidator
(
wxGenericValidator
(
&
s_PlotBlackAndWhite
)
);
m_Print_Sheet_Ref
->
SetValidator
(
wxGenericValidator
(
&
Print_Sheet_Ref
)
);
m_ModeColorOption
->
SetValidator
(
wxGenericValidator
(
&
s_PlotBlackAndWhite
)
);
m_Print_Sheet_Ref
->
SetValidator
(
wxGenericValidator
(
&
Print_Sheet_Ref
)
);
////@end WinEDA_PrintSVGFrame content construction
SetFocus
();
// Make ESC key working
m_DialogPenWidth
=
new
WinEDA_ValueCtrl
(
this
,
_
(
"Pen width mini"
),
s_SVGPenMinWidth
,
g_UnitMetric
,
m_DialogPenWidthSizer
,
...
...
@@ -322,9 +283,8 @@ wxBitmap WinEDA_PrintSVGFrame::GetBitmapResource( const wxString& name )
{
// Bitmap retrieval
////@begin WinEDA_PrintSVGFrame bitmap retrieval
wxUnusedVar
(
name
);
wxUnusedVar
(
name
);
return
wxNullBitmap
;
////@end WinEDA_PrintSVGFrame bitmap retrieval
}
...
...
@@ -337,9 +297,8 @@ wxIcon WinEDA_PrintSVGFrame::GetIconResource( const wxString& name )
{
// Icon retrieval
////@begin WinEDA_PrintSVGFrame icon retrieval
wxUnusedVar
(
name
);
wxUnusedVar
(
name
);
return
wxNullIcon
;
////@end WinEDA_PrintSVGFrame icon retrieval
}
...
...
@@ -540,9 +499,9 @@ void WinEDA_PrintSVGFrame::OnPrintExecuteClick( wxCommandEvent& event )
* wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CLOSE
*/
void
WinEDA_PrintSVGFrame
::
OnC
lose
Click
(
wxCommandEvent
&
event
)
void
WinEDA_PrintSVGFrame
::
OnC
ancel
Click
(
wxCommandEvent
&
event
)
{
Close
(
TRUE
);
Close
(
);
}
...
...
@@ -557,10 +516,10 @@ void WinEDA_PrintSVGFrame::OnCloseWindow( wxCloseEvent& event )
if
(
Config
)
{
s_PlotBlackAndWhite
=
m_ModeColorOption
->
GetSelection
();
Config
->
Write
(
wxT
(
"PlotSVGPenWidth"
)
,
s_SVGPenMinWidth
);
Config
->
Write
(
wxT
(
"PlotSVGModeColor"
)
,
s_PlotBlackAndWhite
);
Config
->
Write
(
PLOTSVGPENWIDTH_KEY
,
s_SVGPenMinWidth
);
Config
->
Write
(
PLOTSVGMODECOLOR_KEY
,
s_PlotBlackAndWhite
);
}
event
.
Skip
(
);
EndModal
(
0
);
}
...
...
share/svg_print.h
View file @
72b97ea4
...
...
@@ -97,8 +97,8 @@ public:
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_PRINT_EXECUTE
void
OnPrintExecuteClick
(
wxCommandEvent
&
event
);
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_C
LOSE
void
OnC
lose
Click
(
wxCommandEvent
&
event
);
/// wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_C
ANCEL
void
OnC
ancel
Click
(
wxCommandEvent
&
event
);
////@end WinEDA_PrintSVGFrame event handler declarations
...
...
share/svg_print.pjd
View file @
72b97ea4
<?xml version="1.0" encoding="
windows-1252
"?>
<?xml version="1.0" encoding="
UTF-8
"?>
<anthemion-project
version=
"1.0.0.0"
xmlns=
"http://www.anthemion.co.uk"
>
<header>
<long
name=
"name_counter"
>
0
</long>
...
...
@@ -6,13 +6,14 @@
<string
name=
"title"
>
""
</string>
<string
name=
"author"
>
""
</string>
<string
name=
"description"
>
""
</string>
<long
name=
"doc_count"
>
23
</long>
<string
name=
"xrc_filename"
>
""
</string>
<bool
name=
"convert_images_to_xpm"
>
0
</bool>
<bool
name=
"inline_images"
>
0
</bool>
<bool
name=
"generate_cpp_for_xrc"
>
0
</bool>
<long
name=
"working_mode"
>
1
</long>
<bool
name=
"use_help_text_for_tooltips"
>
1
</bool>
<bool
name=
"translate_strings"
>
1
</bool>
<bool
name=
"make_unicode_strings"
>
1
</bool>
<bool
name=
"extract_strings"
>
0
</bool>
<string
name=
"user_name"
>
"jean-pierre Charras"
</string>
<string
name=
"copyright_string"
>
"License GNU"
</string>
...
...
@@ -44,12 +45,6 @@
// Licence:
/////////////////////////////////////////////////////////////////////////////
"
</string>
<string
name=
"cpp_function_comment"
>
"
/*!
* %BODY%
*/
"
</string>
<string
name=
"cpp_symbols_file_comment"
>
"/////////////////////////////////////////////////////////////////////////////
// Name: %SYMBOLS-FILENAME%
...
...
@@ -83,6 +78,14 @@
#include
"
wx/wx.h
"
#endif
"
</string>
<string
name=
"cpp_function_declaration_comment"
>
" /// %BODY%
"
</string>
<string
name=
"cpp_function_implementation_comment"
>
"
/*!
* %BODY%
*/
"
</string>
<string
name=
"resource_file_header"
>
"app_resources.h"
</string>
<string
name=
"resource_file_implementation"
>
"app_resources.cpp"
</string>
...
...
@@ -94,6 +97,7 @@
<string
name=
"external_symbol_filenames"
>
""
</string>
<string
name=
"configuration"
>
"
<
None
>
"
</string>
<string
name=
"source_encoding"
>
"
<
System
>
"
</string>
<string
name=
"xrc_encoding"
>
"utf-8"
</string>
<string
name=
"project_encoding"
>
"
<
System
>
"
</string>
<string
name=
"resource_archive"
>
""
</string>
<long
name=
"text_file_type"
>
0
</long>
...
...
@@ -104,9 +108,12 @@
<bool
name=
"use_resource_archive"
>
0
</bool>
<bool
name=
"use_generated_xrc_cpp"
>
0
</bool>
<bool
name=
"always_generate_xrc"
>
1
</bool>
<bool
name=
"use_id_name_for_name"
>
0
</bool>
<bool
name=
"archive_xrc_files"
>
1
</bool>
<bool
name=
"archive_image_files"
>
1
</bool>
<bool
name=
"archive_all_image_files"
>
0
</bool>
<bool
name=
"xrc_retain_relative_paths"
>
1
</bool>
<bool
name=
"xrc_generate_id_tags"
>
0
</bool>
</header>
<data>
<document>
...
...
@@ -129,6 +136,7 @@
<long
name=
"locked"
>
0
</long>
<string
name=
"template-name"
>
""
</string>
<bool
name=
"dirty"
>
1
</bool>
<long
name=
"makefile-last-written"
>
-8519680
</long>
<string
name=
"Compiler name"
>
""
</string>
<string
name=
"Build mode"
>
"Debug"
</string>
<string
name=
"Unicode mode"
>
"ANSI"
</string>
...
...
@@ -170,6 +178,8 @@
<string
name=
"wxWidgets build command"
>
"%AUTO%"
</string>
<string
name=
"wxWidgets clean command"
>
"%AUTO%"
</string>
<string
name=
"PATH variable"
>
"%AUTO%"
</string>
<bool
name=
"Suppress source rules"
>
0
</bool>
<bool
name=
"Enable makefile generation"
>
1
</bool>
</document>
</document>
</data>
...
...
@@ -183,7 +193,7 @@
<long
name=
"is-transient"
>
1
</long>
<long
name=
"owns-file"
>
1
</long>
<long
name=
"title-mode"
>
0
</long>
<long
name=
"locked"
>
0
</long>
<long
name=
"locked"
>
1
</long>
<document>
<string
name=
"title"
>
"Windows"
</string>
<string
name=
"type"
>
"html-document"
</string>
...
...
@@ -207,8 +217,11 @@
<long
name=
"base-id"
>
10000
</long>
<bool
name=
"use-id-prefix"
>
0
</bool>
<string
name=
"id-prefix"
>
""
</string>
<bool
name=
"use-id-suffix"
>
0
</bool>
<string
name=
"id-suffix"
>
""
</string>
<long
name=
"use-xrc"
>
0
</long>
<string
name=
"event-handler-0"
>
"wxEVT_CLOSE_WINDOW|OnCloseWindow"
</string>
<long
name=
"working-mode"
>
0
</long>
<string
name=
"event-handler-0"
>
"wxEVT_CLOSE_WINDOW|OnCloseWindow|||"
</string>
<string
name=
"proxy-Id name"
>
"ID_DIALOG"
</string>
<long
name=
"proxy-Id value"
>
10000
</long>
<string
name=
"proxy-Class"
>
"WinEDA_PrintSVGFrame"
</string>
...
...
@@ -229,10 +242,16 @@
<bool
name=
"proxy-Hidden"
>
0
</bool>
<bool
name=
"proxy-Enabled"
>
1
</bool>
<string
name=
"proxy-Platform"
>
"
<
Any platform
>
"
</string>
<string
name=
"proxy-Data source"
>
""
</string>
<string
name=
"proxy-Data class name"
>
""
</string>
<string
name=
"proxy-Data class implementation filename"
>
""
</string>
<string
name=
"proxy-Data class header filename"
>
""
</string>
<string
name=
"proxy-Data class manager window"
>
""
</string>
<string
name=
"proxy-Texture"
>
""
</string>
<string
name=
"proxy-Texture style"
>
"Tiled"
</string>
<bool
name=
"proxy-wxDEFAULT_DIALOG_STYLE"
>
0
</bool>
<bool
name=
"proxy-wxCAPTION"
>
1
</bool>
<bool
name=
"proxy-wxRESIZE_BORDER"
>
0
</bool>
<bool
name=
"proxy-wxTHICK_FRAME"
>
0
</bool>
<bool
name=
"proxy-wxSYSTEM_MENU"
>
1
</bool>
<bool
name=
"proxy-wxSTAY_ON_TOP"
>
0
</bool>
<bool
name=
"proxy-wxDIALOG_NO_PARENT"
>
0
</bool>
...
...
@@ -261,6 +280,7 @@
<long
name=
"proxy-Y"
>
-1
</long>
<long
name=
"proxy-Width"
>
400
</long>
<long
name=
"proxy-Height"
>
300
</long>
<bool
name=
"proxy-AUI manager"
>
0
</bool>
<string
name=
"proxy-Event sources"
>
""
</string>
<document>
<string
name=
"title"
>
"wxBoxSizer V"
</string>
...
...
@@ -337,7 +357,7 @@
<long
name=
"owns-file"
>
1
</long>
<long
name=
"title-mode"
>
0
</long>
<long
name=
"locked"
>
0
</long>
<string
name=
"created"
>
"2
4/1/2007
"
</string>
<string
name=
"created"
>
"2
3/8/2008
"
</string>
<string
name=
"proxy-type"
>
"wbBoxSizerProxy"
</string>
<string
name=
"proxy-Orientation"
>
"Vertical"
</string>
<string
name=
"proxy-Member variable name"
>
"m_DialogPenWidthSizer"
</string>
...
...
@@ -368,7 +388,13 @@
<string
name=
"event-handler-0"
>
"wxEVT_COMMAND_RADIOBOX_SELECTED|OnRadioboxSetprintmodeSelected"
</string>
<string
name=
"proxy-Id name"
>
"ID_RADIOBOX_SETPRINTMODE"
</string>
<long
name=
"proxy-Id value"
>
10007
</long>
<string
name=
"proxy-Name"
>
""
</string>
<string
name=
"proxy-Class"
>
"wxRadioBox"
</string>
<string
name=
"proxy-Base class"
>
"wxRadioBox"
</string>
<bool
name=
"proxy-External implementation"
>
1
</bool>
<bool
name=
"proxy-Separate files"
>
0
</bool>
<string
name=
"proxy-Implementation filename"
>
""
</string>
<string
name=
"proxy-Header filename"
>
""
</string>
<string
name=
"proxy-Member variable name"
>
"m_ModeColorOption"
</string>
<string
name=
"proxy-Label"
>
"Print mode"
</string>
<long
name=
"proxy-Major dimension count"
>
1
</long>
...
...
@@ -384,6 +410,11 @@
<string
name=
"proxy-Platform"
>
"
<
Any platform
>
"
</string>
<string
name=
"proxy-Data variable"
>
"s_PlotBlackAndWhite"
</string>
<string
name=
"proxy-Data validator"
>
"wxGenericValidator(
&
%VARIABLE%)"
</string>
<string
name=
"proxy-Data source"
>
""
</string>
<string
name=
"proxy-Data class name"
>
""
</string>
<string
name=
"proxy-Data class implementation filename"
>
""
</string>
<string
name=
"proxy-Data class header filename"
>
""
</string>
<string
name=
"proxy-Data class manager window"
>
""
</string>
<bool
name=
"proxy-wxRA_SPECIFY_ROWS"
>
0
</bool>
<bool
name=
"proxy-wxRA_SPECIFY_COLS"
>
1
</bool>
<bool
name=
"proxy-wxWANTS_CHARS"
>
0
</bool>
...
...
@@ -394,7 +425,7 @@
<long
name=
"proxy-Y"
>
-1
</long>
<long
name=
"proxy-Width"
>
-1
</long>
<long
name=
"proxy-Height"
>
-1
</long>
<string
name=
"proxy-AlignH"
>
"
Left
"
</string>
<string
name=
"proxy-AlignH"
>
"
Expand
"
</string>
<string
name=
"proxy-AlignV"
>
"Centre"
</string>
<long
name=
"proxy-Stretch factor"
>
0
</long>
<long
name=
"proxy-Border"
>
5
</long>
...
...
@@ -421,7 +452,13 @@
<string
name=
"proxy-type"
>
"wbCheckBoxProxy"
</string>
<string
name=
"proxy-Id name"
>
"ID_CHECKBOX"
</string>
<long
name=
"proxy-Id value"
>
10004
</long>
<string
name=
"proxy-Name"
>
""
</string>
<string
name=
"proxy-Class"
>
"wxCheckBox"
</string>
<string
name=
"proxy-Base class"
>
"wxCheckBox"
</string>
<bool
name=
"proxy-External implementation"
>
1
</bool>
<bool
name=
"proxy-Separate files"
>
0
</bool>
<string
name=
"proxy-Implementation filename"
>
""
</string>
<string
name=
"proxy-Header filename"
>
""
</string>
<string
name=
"proxy-Member variable name"
>
"m_Print_Sheet_Ref"
</string>
<string
name=
"proxy-Label"
>
"Print Sheet Ref"
</string>
<bool
name=
"proxy-Initial value"
>
0
</bool>
...
...
@@ -429,6 +466,11 @@
<string
name=
"proxy-Tooltip text"
>
""
</string>
<string
name=
"proxy-Data variable"
>
"Print_Sheet_Ref"
</string>
<string
name=
"proxy-Data validator"
>
"wxGenericValidator(
&
%VARIABLE%)"
</string>
<string
name=
"proxy-Data source"
>
""
</string>
<string
name=
"proxy-Data class name"
>
""
</string>
<string
name=
"proxy-Data class implementation filename"
>
""
</string>
<string
name=
"proxy-Data class header filename"
>
""
</string>
<string
name=
"proxy-Data class manager window"
>
""
</string>
<string
name=
"proxy-Background colour"
>
""
</string>
<string
name=
"proxy-Foreground colour"
>
""
</string>
<string
name=
"proxy-Font"
>
""
</string>
...
...
@@ -526,7 +568,13 @@
<string
name=
"proxy-type"
>
"wbRadioBoxProxy"
</string>
<string
name=
"proxy-Id name"
>
"ID_RADIOBOX1"
</string>
<long
name=
"proxy-Id value"
>
10008
</long>
<string
name=
"proxy-Name"
>
""
</string>
<string
name=
"proxy-Class"
>
"wxRadioBox"
</string>
<string
name=
"proxy-Base class"
>
"wxRadioBox"
</string>
<bool
name=
"proxy-External implementation"
>
1
</bool>
<bool
name=
"proxy-Separate files"
>
0
</bool>
<string
name=
"proxy-Implementation filename"
>
""
</string>
<string
name=
"proxy-Header filename"
>
""
</string>
<string
name=
"proxy-Member variable name"
>
"m_PagesOption"
</string>
<string
name=
"proxy-Label"
>
"Page Print:"
</string>
<long
name=
"proxy-Major dimension count"
>
1
</long>
...
...
@@ -542,6 +590,11 @@
<string
name=
"proxy-Platform"
>
"
<
Any platform
>
"
</string>
<string
name=
"proxy-Data variable"
>
""
</string>
<string
name=
"proxy-Data validator"
>
""
</string>
<string
name=
"proxy-Data source"
>
""
</string>
<string
name=
"proxy-Data class name"
>
""
</string>
<string
name=
"proxy-Data class implementation filename"
>
""
</string>
<string
name=
"proxy-Data class header filename"
>
""
</string>
<string
name=
"proxy-Data class manager window"
>
""
</string>
<bool
name=
"proxy-wxRA_SPECIFY_ROWS"
>
0
</bool>
<bool
name=
"proxy-wxRA_SPECIFY_COLS"
>
1
</bool>
<bool
name=
"proxy-wxWANTS_CHARS"
>
0
</bool>
...
...
@@ -580,12 +633,25 @@
<string
name=
"event-handler-0"
>
"wxEVT_COMMAND_BUTTON_CLICKED|OnPrintExecuteClick"
</string>
<string
name=
"proxy-Id name"
>
"ID_PRINT_EXECUTE"
</string>
<long
name=
"proxy-Id value"
>
10002
</long>
<string
name=
"proxy-Name"
>
""
</string>
<string
name=
"proxy-Class"
>
"wxButton"
</string>
<string
name=
"proxy-Base class"
>
"wxButton"
</string>
<bool
name=
"proxy-External implementation"
>
1
</bool>
<bool
name=
"proxy-Separate files"
>
0
</bool>
<string
name=
"proxy-Implementation filename"
>
""
</string>
<string
name=
"proxy-Header filename"
>
""
</string>
<string
name=
"proxy-Member variable name"
>
""
</string>
<string
name=
"proxy-Label"
>
"Create
&
File"
</string>
<bool
name=
"proxy-Default"
>
1
</bool>
<string
name=
"proxy-Help text"
>
""
</string>
<string
name=
"proxy-Tooltip text"
>
""
</string>
<string
name=
"proxy-Data variable"
>
""
</string>
<string
name=
"proxy-Data validator"
>
""
</string>
<string
name=
"proxy-Data source"
>
""
</string>
<string
name=
"proxy-Data class name"
>
""
</string>
<string
name=
"proxy-Data class implementation filename"
>
""
</string>
<string
name=
"proxy-Data class header filename"
>
""
</string>
<string
name=
"proxy-Data class manager window"
>
""
</string>
<string
name=
"proxy-Background colour"
>
""
</string>
<string
name=
"proxy-Foreground colour"
>
"008000"
</string>
<string
name=
"proxy-Font"
>
""
</string>
...
...
@@ -621,7 +687,7 @@
<string
name=
"proxy-Custom ctor arguments"
>
""
</string>
</document>
<document>
<string
name=
"title"
>
"wxButton: wxID_C
LOSE
"
</string>
<string
name=
"title"
>
"wxButton: wxID_C
ANCEL
"
</string>
<string
name=
"type"
>
"dialog-control-document"
</string>
<string
name=
"filename"
>
""
</string>
<string
name=
"icon-name"
>
"dialogcontrol"
</string>
...
...
@@ -631,15 +697,28 @@
<long
name=
"locked"
>
0
</long>
<string
name=
"created"
>
"5/7/2006"
</string>
<string
name=
"proxy-type"
>
"wbButtonProxy"
</string>
<string
name=
"event-handler-0"
>
"wxEVT_COMMAND_BUTTON_CLICKED|OnCloseClick"
</string>
<string
name=
"proxy-Id name"
>
"wxID_CLOSE"
</string>
<long
name=
"proxy-Id value"
>
5001
</long>
<string
name=
"event-handler-0"
>
"wxEVT_COMMAND_BUTTON_CLICKED|OnCancelClick|||WinEDA_PrintSVGFrame"
</string>
<string
name=
"proxy-Id name"
>
"wxID_CANCEL"
</string>
<long
name=
"proxy-Id value"
>
5101
</long>
<string
name=
"proxy-Name"
>
""
</string>
<string
name=
"proxy-Class"
>
"wxButton"
</string>
<string
name=
"proxy-Base class"
>
"wxButton"
</string>
<bool
name=
"proxy-External implementation"
>
1
</bool>
<bool
name=
"proxy-Separate files"
>
0
</bool>
<string
name=
"proxy-Implementation filename"
>
""
</string>
<string
name=
"proxy-Header filename"
>
""
</string>
<string
name=
"proxy-Member variable name"
>
""
</string>
<string
name=
"proxy-Label"
>
"
&
Close
"
</string>
<string
name=
"proxy-Label"
>
"
Cancel
"
</string>
<bool
name=
"proxy-Default"
>
0
</bool>
<string
name=
"proxy-Help text"
>
""
</string>
<string
name=
"proxy-Tooltip text"
>
""
</string>
<string
name=
"proxy-Data variable"
>
""
</string>
<string
name=
"proxy-Data validator"
>
""
</string>
<string
name=
"proxy-Data source"
>
""
</string>
<string
name=
"proxy-Data class name"
>
""
</string>
<string
name=
"proxy-Data class implementation filename"
>
""
</string>
<string
name=
"proxy-Data class header filename"
>
""
</string>
<string
name=
"proxy-Data class manager window"
>
""
</string>
<string
name=
"proxy-Background colour"
>
""
</string>
<string
name=
"proxy-Foreground colour"
>
"0000C6"
</string>
<string
name=
"proxy-Font"
>
""
</string>
...
...
@@ -689,7 +768,13 @@
<string
name=
"proxy-type"
>
"wbStaticTextProxy"
</string>
<string
name=
"proxy-Id name"
>
"wxID_STATIC"
</string>
<long
name=
"proxy-Id value"
>
5105
</long>
<string
name=
"proxy-Name"
>
""
</string>
<string
name=
"proxy-Class"
>
"wxStaticText"
</string>
<string
name=
"proxy-Base class"
>
"wxStaticText"
</string>
<bool
name=
"proxy-External implementation"
>
1
</bool>
<bool
name=
"proxy-Separate files"
>
0
</bool>
<string
name=
"proxy-Implementation filename"
>
""
</string>
<string
name=
"proxy-Header filename"
>
""
</string>
<string
name=
"proxy-Member variable name"
>
""
</string>
<string
name=
"proxy-Label"
>
"Filename:"
</string>
<long
name=
"proxy-Wrapping width"
>
-1
</long>
...
...
@@ -703,6 +788,11 @@
<string
name=
"proxy-Platform"
>
"
<
Any platform
>
"
</string>
<string
name=
"proxy-Data variable"
>
""
</string>
<string
name=
"proxy-Data validator"
>
""
</string>
<string
name=
"proxy-Data source"
>
""
</string>
<string
name=
"proxy-Data class name"
>
""
</string>
<string
name=
"proxy-Data class implementation filename"
>
""
</string>
<string
name=
"proxy-Data class header filename"
>
""
</string>
<string
name=
"proxy-Data class manager window"
>
""
</string>
<bool
name=
"proxy-wxALIGN_LEFT"
>
0
</bool>
<bool
name=
"proxy-wxALIGN_RIGHT"
>
0
</bool>
<bool
name=
"proxy-wxALIGN_CENTRE"
>
0
</bool>
...
...
@@ -748,7 +838,13 @@
<string
name=
"proxy-type"
>
"wbTextCtrlProxy"
</string>
<string
name=
"proxy-Id name"
>
"ID_TEXTCTRL"
</string>
<long
name=
"proxy-Id value"
>
10001
</long>
<string
name=
"proxy-Name"
>
""
</string>
<string
name=
"proxy-Class"
>
"wxTextCtrl"
</string>
<string
name=
"proxy-Base class"
>
"wxTextCtrl"
</string>
<bool
name=
"proxy-External implementation"
>
1
</bool>
<bool
name=
"proxy-Separate files"
>
0
</bool>
<string
name=
"proxy-Implementation filename"
>
""
</string>
<string
name=
"proxy-Header filename"
>
""
</string>
<string
name=
"proxy-Member variable name"
>
"m_FileNameCtrl"
</string>
<string
name=
"proxy-Initial value"
>
""
</string>
<long
name=
"proxy-Max length"
>
0
</long>
...
...
@@ -762,6 +858,11 @@
<string
name=
"proxy-Platform"
>
"
<
Any platform
>
"
</string>
<string
name=
"proxy-Data variable"
>
""
</string>
<string
name=
"proxy-Data validator"
>
""
</string>
<string
name=
"proxy-Data source"
>
""
</string>
<string
name=
"proxy-Data class name"
>
""
</string>
<string
name=
"proxy-Data class implementation filename"
>
""
</string>
<string
name=
"proxy-Data class header filename"
>
""
</string>
<string
name=
"proxy-Data class manager window"
>
""
</string>
<bool
name=
"proxy-wxTE_MULTILINE"
>
0
</bool>
<bool
name=
"proxy-wxTE_PROCESS_ENTER"
>
0
</bool>
<bool
name=
"proxy-wxTE_PROCESS_TAB"
>
0
</bool>
...
...
@@ -775,8 +876,9 @@
<bool
name=
"proxy-wxTE_CENTRE"
>
0
</bool>
<bool
name=
"proxy-wxTE_RIGHT"
>
0
</bool>
<bool
name=
"proxy-wxHSCROLL"
>
0
</bool>
<bool
name=
"proxy-wxTE_
LINE
WRAP"
>
0
</bool>
<bool
name=
"proxy-wxTE_
CHAR
WRAP"
>
0
</bool>
<bool
name=
"proxy-wxTE_WORDWRAP"
>
0
</bool>
<bool
name=
"proxy-wxTE_CAPITALIZE"
>
0
</bool>
<bool
name=
"proxy-wxNO_BORDER"
>
0
</bool>
<bool
name=
"proxy-wxSIMPLE_BORDER"
>
0
</bool>
<bool
name=
"proxy-wxDOUBLE_BORDER"
>
0
</bool>
...
...
@@ -797,7 +899,7 @@
<long
name=
"proxy-Border"
>
5
</long>
<bool
name=
"proxy-wxLEFT"
>
1
</bool>
<bool
name=
"proxy-wxRIGHT"
>
1
</bool>
<bool
name=
"proxy-wxTOP"
>
1
</bool>
<bool
name=
"proxy-wxTOP"
>
0
</bool>
<bool
name=
"proxy-wxBOTTOM"
>
1
</bool>
<bool
name=
"proxy-wxSHAPED"
>
0
</bool>
<bool
name=
"proxy-wxADJUST_MINSIZE"
>
0
</bool>
...
...
@@ -818,7 +920,13 @@
<string
name=
"proxy-type"
>
"wbStaticTextProxy"
</string>
<string
name=
"proxy-Id name"
>
"wxID_STATIC"
</string>
<long
name=
"proxy-Id value"
>
5105
</long>
<string
name=
"proxy-Name"
>
""
</string>
<string
name=
"proxy-Class"
>
"wxStaticText"
</string>
<string
name=
"proxy-Base class"
>
"wxStaticText"
</string>
<bool
name=
"proxy-External implementation"
>
1
</bool>
<bool
name=
"proxy-Separate files"
>
0
</bool>
<string
name=
"proxy-Implementation filename"
>
""
</string>
<string
name=
"proxy-Header filename"
>
""
</string>
<string
name=
"proxy-Member variable name"
>
""
</string>
<string
name=
"proxy-Label"
>
"Messages:"
</string>
<long
name=
"proxy-Wrapping width"
>
-1
</long>
...
...
@@ -832,6 +940,11 @@
<string
name=
"proxy-Platform"
>
"
<
Any platform
>
"
</string>
<string
name=
"proxy-Data variable"
>
""
</string>
<string
name=
"proxy-Data validator"
>
""
</string>
<string
name=
"proxy-Data source"
>
""
</string>
<string
name=
"proxy-Data class name"
>
""
</string>
<string
name=
"proxy-Data class implementation filename"
>
""
</string>
<string
name=
"proxy-Data class header filename"
>
""
</string>
<string
name=
"proxy-Data class manager window"
>
""
</string>
<bool
name=
"proxy-wxALIGN_LEFT"
>
0
</bool>
<bool
name=
"proxy-wxALIGN_RIGHT"
>
0
</bool>
<bool
name=
"proxy-wxALIGN_CENTRE"
>
0
</bool>
...
...
@@ -877,7 +990,13 @@
<string
name=
"proxy-type"
>
"wbTextCtrlProxy"
</string>
<string
name=
"proxy-Id name"
>
"ID_TEXTCTRL1"
</string>
<long
name=
"proxy-Id value"
>
10006
</long>
<string
name=
"proxy-Name"
>
""
</string>
<string
name=
"proxy-Class"
>
"wxTextCtrl"
</string>
<string
name=
"proxy-Base class"
>
"wxTextCtrl"
</string>
<bool
name=
"proxy-External implementation"
>
1
</bool>
<bool
name=
"proxy-Separate files"
>
0
</bool>
<string
name=
"proxy-Implementation filename"
>
""
</string>
<string
name=
"proxy-Header filename"
>
""
</string>
<string
name=
"proxy-Member variable name"
>
"m_MessagesBox"
</string>
<string
name=
"proxy-Initial value"
>
""
</string>
<long
name=
"proxy-Max length"
>
0
</long>
...
...
@@ -891,6 +1010,11 @@
<string
name=
"proxy-Platform"
>
"
<
Any platform
>
"
</string>
<string
name=
"proxy-Data variable"
>
""
</string>
<string
name=
"proxy-Data validator"
>
""
</string>
<string
name=
"proxy-Data source"
>
""
</string>
<string
name=
"proxy-Data class name"
>
""
</string>
<string
name=
"proxy-Data class implementation filename"
>
""
</string>
<string
name=
"proxy-Data class header filename"
>
""
</string>
<string
name=
"proxy-Data class manager window"
>
""
</string>
<bool
name=
"proxy-wxTE_MULTILINE"
>
1
</bool>
<bool
name=
"proxy-wxTE_PROCESS_ENTER"
>
0
</bool>
<bool
name=
"proxy-wxTE_PROCESS_TAB"
>
0
</bool>
...
...
@@ -904,8 +1028,9 @@
<bool
name=
"proxy-wxTE_CENTRE"
>
0
</bool>
<bool
name=
"proxy-wxTE_RIGHT"
>
0
</bool>
<bool
name=
"proxy-wxHSCROLL"
>
0
</bool>
<bool
name=
"proxy-wxTE_
LINE
WRAP"
>
0
</bool>
<bool
name=
"proxy-wxTE_
CHAR
WRAP"
>
0
</bool>
<bool
name=
"proxy-wxTE_WORDWRAP"
>
0
</bool>
<bool
name=
"proxy-wxTE_CAPITALIZE"
>
0
</bool>
<bool
name=
"proxy-wxNO_BORDER"
>
0
</bool>
<bool
name=
"proxy-wxSIMPLE_BORDER"
>
0
</bool>
<bool
name=
"proxy-wxDOUBLE_BORDER"
>
0
</bool>
...
...
@@ -926,7 +1051,7 @@
<long
name=
"proxy-Border"
>
5
</long>
<bool
name=
"proxy-wxLEFT"
>
1
</bool>
<bool
name=
"proxy-wxRIGHT"
>
1
</bool>
<bool
name=
"proxy-wxTOP"
>
1
</bool>
<bool
name=
"proxy-wxTOP"
>
0
</bool>
<bool
name=
"proxy-wxBOTTOM"
>
1
</bool>
<bool
name=
"proxy-wxSHAPED"
>
0
</bool>
<bool
name=
"proxy-wxADJUST_MINSIZE"
>
0
</bool>
...
...
share/wxprint.cpp
View file @
72b97ea4
...
...
@@ -172,9 +172,6 @@ void WinEDA_DrawFrame::ToPrinter( wxCommandEvent& event )
WinEDA_PrintFrame
*
frame
=
new
WinEDA_PrintFrame
(
this
);
frame
->
ShowModal
();
frame
->
Destroy
();
#ifdef EESCHEMA
g_PrintFillMask
=
0
;
#endif
}
...
...
@@ -783,10 +780,7 @@ void EDA_Printout::DrawPage()
panel
->
m_ClipBox
.
SetSize
(
wxSize
(
0x7FFFFF0
,
0x7FFFFF0
)
);
g_IsPrinting
=
TRUE
;
#ifdef EESCHEMA
if
(
s_Print_Black_and_White
)
g_PrintFillMask
=
FILLED_WITH_BG_BODYCOLOR
;
#endif
#ifdef PCBNEW
if
(
m_Print_Sheet_Ref
)
m_Parent
->
TraceWorkSheet
(
dc
,
ActiveScreen
,
0
);
...
...
@@ -832,10 +826,6 @@ void EDA_Printout::DrawPage()
panel
->
PrintPage
(
dc
,
m_Print_Sheet_Ref
,
s_PrintMaskLayer
);
#endif
#ifdef EESCHEMA
g_PrintFillMask
=
0
;
#endif
g_IsPrinting
=
FALSE
;
panel
->
m_ClipBox
=
tmp
;
...
...
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