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
cad5f9da
Commit
cad5f9da
authored
Dec 08, 2009
by
charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
minor bug fixed and minor enhancements
parent
47409788
Changes
13
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
13 changed files
with
1630 additions
and
1386 deletions
+1630
-1386
tool_viewlib.cpp
eeschema/tool_viewlib.cpp
+4
-4
viewlibs.cpp
eeschema/viewlibs.cpp
+6
-6
kicad.mo
internat/fr/kicad.mo
+0
-0
kicad.po
internat/fr/kicad.po
+1496
-1300
dialog_edit_module_for_BoardEditor_base.cpp
pcbnew/dialog_edit_module_for_BoardEditor_base.cpp
+2
-2
dialog_edit_module_for_BoardEditor_base.fbp
pcbnew/dialog_edit_module_for_BoardEditor_base.fbp
+2
-2
dialog_edit_module_for_Modedit_base.cpp
pcbnew/dialog_edit_module_for_Modedit_base.cpp
+1
-1
dialog_edit_module_for_Modedit_base.fbp
pcbnew/dialog_edit_module_for_Modedit_base.fbp
+1
-1
dialog_mask_clearance.cpp
pcbnew/dialog_mask_clearance.cpp
+10
-1
dialog_mask_clearance_base.cpp
pcbnew/dialog_mask_clearance_base.cpp
+4
-1
dialog_mask_clearance_base.fbp
pcbnew/dialog_mask_clearance_base.fbp
+51
-2
dialog_mask_clearance_base.h
pcbnew/dialog_mask_clearance_base.h
+2
-1
hotkeys.cpp
pcbnew/hotkeys.cpp
+51
-65
No files found.
eeschema/tool_viewlib.cpp
View file @
cad5f9da
...
@@ -144,11 +144,11 @@ void WinEDA_ViewlibFrame::ReCreateHToolbar()
...
@@ -144,11 +144,11 @@ void WinEDA_ViewlibFrame::ReCreateHToolbar()
}
}
int
jj
=
1
;
int
parts_count
=
1
;
if
(
component
)
if
(
component
)
jj
=
MAX
(
component
->
GetPartCount
(),
1
);
parts_count
=
MAX
(
component
->
GetPartCount
(),
1
);
SelpartBox
->
Clear
();
SelpartBox
->
Clear
();
for
(
ii
=
0
;
ii
<
jj
;
ii
++
)
for
(
ii
=
0
;
ii
<
parts_count
;
ii
++
)
{
{
wxString
msg
;
wxString
msg
;
msg
.
Printf
(
_
(
"Part %c"
),
'A'
+
ii
);
msg
.
Printf
(
_
(
"Part %c"
),
'A'
+
ii
);
...
@@ -156,7 +156,7 @@ void WinEDA_ViewlibFrame::ReCreateHToolbar()
...
@@ -156,7 +156,7 @@ void WinEDA_ViewlibFrame::ReCreateHToolbar()
}
}
SelpartBox
->
SetSelection
(
(
m_unit
>
0
)
?
m_unit
-
1
:
0
);
SelpartBox
->
SetSelection
(
(
m_unit
>
0
)
?
m_unit
-
1
:
0
);
SelpartBox
->
Enable
(
component
&&
component
->
HasConversion
()
);
SelpartBox
->
Enable
(
parts_count
>
1
);
m_HToolBar
->
EnableTool
(
ID_LIBVIEW_VIEWDOC
,
m_HToolBar
->
EnableTool
(
ID_LIBVIEW_VIEWDOC
,
entry
&&
(
entry
->
m_DocFile
!=
wxEmptyString
)
);
entry
&&
(
entry
->
m_DocFile
!=
wxEmptyString
)
);
...
...
eeschema/viewlibs.cpp
View file @
cad5f9da
...
@@ -98,7 +98,7 @@ bool WinEDA_ViewlibFrame::OnRightClick( const wxPoint& MousePos,
...
@@ -98,7 +98,7 @@ bool WinEDA_ViewlibFrame::OnRightClick( const wxPoint& MousePos,
}
}
/*
Affiche en Ligne d'info la librairie en cours de visualisa
tion */
/*
Displays the name of the current opened library in the cap
tion */
void
WinEDA_ViewlibFrame
::
DisplayLibInfos
()
void
WinEDA_ViewlibFrame
::
DisplayLibInfos
()
{
{
wxString
msg
;
wxString
msg
;
...
@@ -120,7 +120,7 @@ void WinEDA_ViewlibFrame::DisplayLibInfos()
...
@@ -120,7 +120,7 @@ void WinEDA_ViewlibFrame::DisplayLibInfos()
/*****************************************/
/*****************************************/
/*
Routine
to Select Current library */
/*
Function
to Select Current library */
/*****************************************/
/*****************************************/
void
WinEDA_ViewlibFrame
::
SelectCurrentLibrary
()
void
WinEDA_ViewlibFrame
::
SelectCurrentLibrary
()
{
{
...
@@ -246,10 +246,10 @@ void WinEDA_ViewlibFrame::ViewOneLibraryContent( CMP_LIBRARY* Lib, int Flag )
...
@@ -246,10 +246,10 @@ void WinEDA_ViewlibFrame::ViewOneLibraryContent( CMP_LIBRARY* Lib, int Flag )
}
}
/**
***************************************************************************/
/**
function RedrawActiveWindow
/* Routine d'affichage du composant selectionne */
* Display the current selected component.
/* Si Le composant est un alias, le composant ROOT est recherche et affiche */
* If the component is an alias, the ROOT component is displayed
/****************************************************************************
*/
*/
void
WinEDA_ViewlibFrame
::
RedrawActiveWindow
(
wxDC
*
DC
,
bool
EraseBg
)
void
WinEDA_ViewlibFrame
::
RedrawActiveWindow
(
wxDC
*
DC
,
bool
EraseBg
)
{
{
LIB_COMPONENT
*
component
;
LIB_COMPONENT
*
component
;
...
...
internat/fr/kicad.mo
View file @
cad5f9da
No preview for this file type
internat/fr/kicad.po
View file @
cad5f9da
This diff is collapsed.
Click to expand it.
pcbnew/dialog_edit_module_for_BoardEditor_base.cpp
View file @
cad5f9da
...
@@ -65,7 +65,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare
...
@@ -65,7 +65,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare
sbSizerOrientation
->
Add
(
m_staticText4
,
0
,
wxTOP
|
wxRIGHT
|
wxLEFT
,
5
);
sbSizerOrientation
->
Add
(
m_staticText4
,
0
,
wxTOP
|
wxRIGHT
|
wxLEFT
,
5
);
m_OrientValue
=
new
wxTextCtrl
(
m_PanelProperties
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_OrientValue
=
new
wxTextCtrl
(
m_PanelProperties
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
0
);
sbSizerOrientation
->
Add
(
m_OrientValue
,
0
,
wx
EXPAND
|
wxBOTTOM
|
wxRIGHT
|
wxLEFT
,
5
);
sbSizerOrientation
->
Add
(
m_OrientValue
,
0
,
wx
BOTTOM
|
wxRIGHT
|
wxLEFT
|
wxEXPAND
,
5
);
PropLeftSizer
->
Add
(
sbSizerOrientation
,
0
,
wxEXPAND
,
5
);
PropLeftSizer
->
Add
(
sbSizerOrientation
,
0
,
wxEXPAND
,
5
);
...
@@ -271,7 +271,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare
...
@@ -271,7 +271,7 @@ DIALOG_MODULE_BOARD_EDITOR_BASE::DIALOG_MODULE_BOARD_EDITOR_BASE( wxWindow* pare
m_sdbSizerStdButtonsCancel
=
new
wxButton
(
this
,
wxID_CANCEL
);
m_sdbSizerStdButtonsCancel
=
new
wxButton
(
this
,
wxID_CANCEL
);
m_sdbSizerStdButtons
->
AddButton
(
m_sdbSizerStdButtonsCancel
);
m_sdbSizerStdButtons
->
AddButton
(
m_sdbSizerStdButtonsCancel
);
m_sdbSizerStdButtons
->
Realize
();
m_sdbSizerStdButtons
->
Realize
();
m_GeneralBoxSizer
->
Add
(
m_sdbSizerStdButtons
,
0
,
wxEXPAND
|
wxALIGN_RIGHT
,
5
);
m_GeneralBoxSizer
->
Add
(
m_sdbSizerStdButtons
,
0
,
wxEXPAND
|
wxALIGN_RIGHT
|
wxALL
,
5
);
this
->
SetSizer
(
m_GeneralBoxSizer
);
this
->
SetSizer
(
m_GeneralBoxSizer
);
this
->
Layout
();
this
->
Layout
();
...
...
pcbnew/dialog_edit_module_for_BoardEditor_base.fbp
View file @
cad5f9da
...
@@ -603,7 +603,7 @@
...
@@ -603,7 +603,7 @@
</object>
</object>
<object
class=
"sizeritem"
expanded=
"1"
>
<object
class=
"sizeritem"
expanded=
"1"
>
<property
name=
"border"
>
5
</property>
<property
name=
"border"
>
5
</property>
<property
name=
"flag"
>
wx
EXPAND|wxBOTTOM|wxRIGHT|wxLEFT
</property>
<property
name=
"flag"
>
wx
BOTTOM|wxRIGHT|wxLEFT|wxEXPAND
</property>
<property
name=
"proportion"
>
0
</property>
<property
name=
"proportion"
>
0
</property>
<object
class=
"wxTextCtrl"
expanded=
"1"
>
<object
class=
"wxTextCtrl"
expanded=
"1"
>
<property
name=
"bg"
></property>
<property
name=
"bg"
></property>
...
@@ -2605,7 +2605,7 @@
...
@@ -2605,7 +2605,7 @@
</object>
</object>
<object
class=
"sizeritem"
expanded=
"1"
>
<object
class=
"sizeritem"
expanded=
"1"
>
<property
name=
"border"
>
5
</property>
<property
name=
"border"
>
5
</property>
<property
name=
"flag"
>
wxEXPAND|wxALIGN_RIGHT
</property>
<property
name=
"flag"
>
wxEXPAND|wxALIGN_RIGHT
|wxALL
</property>
<property
name=
"proportion"
>
0
</property>
<property
name=
"proportion"
>
0
</property>
<object
class=
"wxStdDialogButtonSizer"
expanded=
"1"
>
<object
class=
"wxStdDialogButtonSizer"
expanded=
"1"
>
<property
name=
"Apply"
>
0
</property>
<property
name=
"Apply"
>
0
</property>
...
...
pcbnew/dialog_edit_module_for_Modedit_base.cpp
View file @
cad5f9da
...
@@ -240,7 +240,7 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa
...
@@ -240,7 +240,7 @@ DIALOG_MODULE_MODULE_EDITOR_BASE::DIALOG_MODULE_MODULE_EDITOR_BASE( wxWindow* pa
m_sdbSizerStdButtonsCancel
=
new
wxButton
(
this
,
wxID_CANCEL
);
m_sdbSizerStdButtonsCancel
=
new
wxButton
(
this
,
wxID_CANCEL
);
m_sdbSizerStdButtons
->
AddButton
(
m_sdbSizerStdButtonsCancel
);
m_sdbSizerStdButtons
->
AddButton
(
m_sdbSizerStdButtonsCancel
);
m_sdbSizerStdButtons
->
Realize
();
m_sdbSizerStdButtons
->
Realize
();
m_GeneralBoxSizer
->
Add
(
m_sdbSizerStdButtons
,
0
,
wxEXPAND
|
wxALIGN_RIGHT
,
5
);
m_GeneralBoxSizer
->
Add
(
m_sdbSizerStdButtons
,
0
,
wxEXPAND
|
wxALIGN_RIGHT
|
wxALL
,
5
);
this
->
SetSizer
(
m_GeneralBoxSizer
);
this
->
SetSizer
(
m_GeneralBoxSizer
);
this
->
Layout
();
this
->
Layout
();
...
...
pcbnew/dialog_edit_module_for_Modedit_base.fbp
View file @
cad5f9da
...
@@ -2195,7 +2195,7 @@
...
@@ -2195,7 +2195,7 @@
</object>
</object>
<object
class=
"sizeritem"
expanded=
"1"
>
<object
class=
"sizeritem"
expanded=
"1"
>
<property
name=
"border"
>
5
</property>
<property
name=
"border"
>
5
</property>
<property
name=
"flag"
>
wxEXPAND|wxALIGN_RIGHT
</property>
<property
name=
"flag"
>
wxEXPAND|wxALIGN_RIGHT
|wxALL
</property>
<property
name=
"proportion"
>
0
</property>
<property
name=
"proportion"
>
0
</property>
<object
class=
"wxStdDialogButtonSizer"
expanded=
"1"
>
<object
class=
"wxStdDialogButtonSizer"
expanded=
"1"
>
<property
name=
"Apply"
>
0
</property>
<property
name=
"Apply"
>
0
</property>
...
...
pcbnew/dialog_mask_clearance.cpp
View file @
cad5f9da
...
@@ -42,10 +42,19 @@ void DIALOG_PADS_MASK_CLEARANCE::MyInit()
...
@@ -42,10 +42,19 @@ void DIALOG_PADS_MASK_CLEARANCE::MyInit()
PutValueInLocalUnits
(
*
m_SolderMaskMarginCtrl
,
PutValueInLocalUnits
(
*
m_SolderMaskMarginCtrl
,
g_DesignSettings
.
m_SolderMaskMargin
,
g_DesignSettings
.
m_SolderMaskMargin
,
Internal_Unit
);
Internal_Unit
);
// These 2 parameters are usually < 0, so prepare entering a negative
// value, if current is 0
PutValueInLocalUnits
(
*
m_SolderPasteMarginCtrl
,
PutValueInLocalUnits
(
*
m_SolderPasteMarginCtrl
,
g_DesignSettings
.
m_SolderPasteMargin
,
g_DesignSettings
.
m_SolderPasteMargin
,
Internal_Unit
);
Internal_Unit
);
if
(
g_DesignSettings
.
m_SolderPasteMargin
==
0
)
m_SolderPasteMarginCtrl
->
SetValue
(
wxT
(
"-"
)
+
m_SolderPasteMarginCtrl
->
GetValue
()
);
wxString
msg
;
wxString
msg
;
if
(
g_DesignSettings
.
m_SolderPasteMarginRatio
==
0
)
msg
.
Printf
(
wxT
(
"-%f"
),
g_DesignSettings
.
m_SolderPasteMarginRatio
*
100.0
);
else
msg
.
Printf
(
wxT
(
"%f"
),
g_DesignSettings
.
m_SolderPasteMarginRatio
*
100.0
);
msg
.
Printf
(
wxT
(
"%f"
),
g_DesignSettings
.
m_SolderPasteMarginRatio
*
100.0
);
m_SolderPasteMarginRatioCtrl
->
SetValue
(
msg
);
m_SolderPasteMarginRatioCtrl
->
SetValue
(
msg
);
}
}
...
...
pcbnew/dialog_mask_clearance_base.cpp
View file @
cad5f9da
...
@@ -84,13 +84,16 @@ DIALOG_PADS_MASK_CLEARANCE_BASE::DIALOG_PADS_MASK_CLEARANCE_BASE( wxWindow* pare
...
@@ -84,13 +84,16 @@ DIALOG_PADS_MASK_CLEARANCE_BASE::DIALOG_PADS_MASK_CLEARANCE_BASE( wxWindow* pare
bMainSizer
->
Add
(
bMainUpperSizer
,
1
,
wxEXPAND
,
5
);
bMainSizer
->
Add
(
bMainUpperSizer
,
1
,
wxEXPAND
,
5
);
m_staticline11
=
new
wxStaticLine
(
this
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxLI_HORIZONTAL
);
bMainSizer
->
Add
(
m_staticline11
,
0
,
wxEXPAND
|
wxALL
,
5
);
m_sdbButtonsSizer
=
new
wxStdDialogButtonSizer
();
m_sdbButtonsSizer
=
new
wxStdDialogButtonSizer
();
m_sdbButtonsSizerOK
=
new
wxButton
(
this
,
wxID_OK
);
m_sdbButtonsSizerOK
=
new
wxButton
(
this
,
wxID_OK
);
m_sdbButtonsSizer
->
AddButton
(
m_sdbButtonsSizerOK
);
m_sdbButtonsSizer
->
AddButton
(
m_sdbButtonsSizerOK
);
m_sdbButtonsSizerCancel
=
new
wxButton
(
this
,
wxID_CANCEL
);
m_sdbButtonsSizerCancel
=
new
wxButton
(
this
,
wxID_CANCEL
);
m_sdbButtonsSizer
->
AddButton
(
m_sdbButtonsSizerCancel
);
m_sdbButtonsSizer
->
AddButton
(
m_sdbButtonsSizerCancel
);
m_sdbButtonsSizer
->
Realize
();
m_sdbButtonsSizer
->
Realize
();
bMainSizer
->
Add
(
m_sdbButtonsSizer
,
0
,
wxALIGN_CENTER_HORIZONTAL
,
5
);
bMainSizer
->
Add
(
m_sdbButtonsSizer
,
0
,
wxALIGN_CENTER_HORIZONTAL
|
wxBOTTOM
,
5
);
this
->
SetSizer
(
bMainSizer
);
this
->
SetSizer
(
bMainSizer
);
this
->
Layout
();
this
->
Layout
();
...
...
pcbnew/dialog_mask_clearance_base.fbp
View file @
cad5f9da
...
@@ -32,7 +32,7 @@
...
@@ -32,7 +32,7 @@
<property
name=
"minimum_size"
></property>
<property
name=
"minimum_size"
></property>
<property
name=
"name"
>
DIALOG_PADS_MASK_CLEARANCE_BASE
</property>
<property
name=
"name"
>
DIALOG_PADS_MASK_CLEARANCE_BASE
</property>
<property
name=
"pos"
></property>
<property
name=
"pos"
></property>
<property
name=
"size"
>
3
58,237
</property>
<property
name=
"size"
>
3
61,253
</property>
<property
name=
"style"
>
wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER
</property>
<property
name=
"style"
>
wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER
</property>
<property
name=
"subclass"
></property>
<property
name=
"subclass"
></property>
<property
name=
"title"
>
Pads Mask Clearance
</property>
<property
name=
"title"
>
Pads Mask Clearance
</property>
...
@@ -691,7 +691,56 @@
...
@@ -691,7 +691,56 @@
</object>
</object>
<object
class=
"sizeritem"
expanded=
"1"
>
<object
class=
"sizeritem"
expanded=
"1"
>
<property
name=
"border"
>
5
</property>
<property
name=
"border"
>
5
</property>
<property
name=
"flag"
>
wxALIGN_CENTER_HORIZONTAL
</property>
<property
name=
"flag"
>
wxEXPAND | wxALL
</property>
<property
name=
"proportion"
>
0
</property>
<object
class=
"wxStaticLine"
expanded=
"1"
>
<property
name=
"bg"
></property>
<property
name=
"context_help"
></property>
<property
name=
"enabled"
>
1
</property>
<property
name=
"fg"
></property>
<property
name=
"font"
></property>
<property
name=
"hidden"
>
0
</property>
<property
name=
"id"
>
wxID_ANY
</property>
<property
name=
"maximum_size"
></property>
<property
name=
"minimum_size"
></property>
<property
name=
"name"
>
m_staticline11
</property>
<property
name=
"permission"
>
protected
</property>
<property
name=
"pos"
></property>
<property
name=
"size"
></property>
<property
name=
"style"
>
wxLI_HORIZONTAL
</property>
<property
name=
"subclass"
></property>
<property
name=
"tooltip"
></property>
<property
name=
"window_extra_style"
></property>
<property
name=
"window_name"
></property>
<property
name=
"window_style"
></property>
<event
name=
"OnChar"
></event>
<event
name=
"OnEnterWindow"
></event>
<event
name=
"OnEraseBackground"
></event>
<event
name=
"OnKeyDown"
></event>
<event
name=
"OnKeyUp"
></event>
<event
name=
"OnKillFocus"
></event>
<event
name=
"OnLeaveWindow"
></event>
<event
name=
"OnLeftDClick"
></event>
<event
name=
"OnLeftDown"
></event>
<event
name=
"OnLeftUp"
></event>
<event
name=
"OnMiddleDClick"
></event>
<event
name=
"OnMiddleDown"
></event>
<event
name=
"OnMiddleUp"
></event>
<event
name=
"OnMotion"
></event>
<event
name=
"OnMouseEvents"
></event>
<event
name=
"OnMouseWheel"
></event>
<event
name=
"OnPaint"
></event>
<event
name=
"OnRightDClick"
></event>
<event
name=
"OnRightDown"
></event>
<event
name=
"OnRightUp"
></event>
<event
name=
"OnSetFocus"
></event>
<event
name=
"OnSize"
></event>
<event
name=
"OnUpdateUI"
></event>
</object>
</object>
<object
class=
"sizeritem"
expanded=
"1"
>
<property
name=
"border"
>
5
</property>
<property
name=
"flag"
>
wxALIGN_CENTER_HORIZONTAL|wxBOTTOM
</property>
<property
name=
"proportion"
>
0
</property>
<property
name=
"proportion"
>
0
</property>
<object
class=
"wxStdDialogButtonSizer"
expanded=
"1"
>
<object
class=
"wxStdDialogButtonSizer"
expanded=
"1"
>
<property
name=
"Apply"
>
0
</property>
<property
name=
"Apply"
>
0
</property>
...
...
pcbnew/dialog_mask_clearance_base.h
View file @
cad5f9da
...
@@ -50,6 +50,7 @@ class DIALOG_PADS_MASK_CLEARANCE_BASE : public wxDialog
...
@@ -50,6 +50,7 @@ class DIALOG_PADS_MASK_CLEARANCE_BASE : public wxDialog
wxStaticText
*
m_staticTextRatio
;
wxStaticText
*
m_staticTextRatio
;
wxTextCtrl
*
m_SolderPasteMarginRatioCtrl
;
wxTextCtrl
*
m_SolderPasteMarginRatioCtrl
;
wxStaticText
*
m_SolderPasteRatioMarginUnits
;
wxStaticText
*
m_SolderPasteRatioMarginUnits
;
wxStaticLine
*
m_staticline11
;
wxStdDialogButtonSizer
*
m_sdbButtonsSizer
;
wxStdDialogButtonSizer
*
m_sdbButtonsSizer
;
wxButton
*
m_sdbButtonsSizerOK
;
wxButton
*
m_sdbButtonsSizerOK
;
wxButton
*
m_sdbButtonsSizerCancel
;
wxButton
*
m_sdbButtonsSizerCancel
;
...
@@ -60,7 +61,7 @@ class DIALOG_PADS_MASK_CLEARANCE_BASE : public wxDialog
...
@@ -60,7 +61,7 @@ class DIALOG_PADS_MASK_CLEARANCE_BASE : public wxDialog
public
:
public
:
DIALOG_PADS_MASK_CLEARANCE_BASE
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
_
(
"Pads Mask Clearance"
),
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
3
58
,
237
),
long
style
=
wxDEFAULT_DIALOG_STYLE
|
wxRESIZE_BORDER
);
DIALOG_PADS_MASK_CLEARANCE_BASE
(
wxWindow
*
parent
,
wxWindowID
id
=
wxID_ANY
,
const
wxString
&
title
=
_
(
"Pads Mask Clearance"
),
const
wxPoint
&
pos
=
wxDefaultPosition
,
const
wxSize
&
size
=
wxSize
(
3
61
,
253
),
long
style
=
wxDEFAULT_DIALOG_STYLE
|
wxRESIZE_BORDER
);
~
DIALOG_PADS_MASK_CLEARANCE_BASE
();
~
DIALOG_PADS_MASK_CLEARANCE_BASE
();
};
};
...
...
pcbnew/hotkeys.cpp
View file @
cad5f9da
...
@@ -35,9 +35,9 @@
...
@@ -35,9 +35,9 @@
/* local variables */
/* local variables */
/* Hotkey list: */
/* Hotkey list: */
static
Ki_HotkeyInfo
HkSwitch2CopperLayer
(
wxT
(
"Switch to Copper layer"
),
static
Ki_HotkeyInfo
HkSwitch2CopperLayer
(
wxT
(
"Switch to Copper layer"
),
HK_SWITCH_LAYER_TO_COPPER
,
WXK_PAGE
UP
);
HK_SWITCH_LAYER_TO_COPPER
,
WXK_PAGE
DOWN
);
static
Ki_HotkeyInfo
HkSwitch2ComponentLayer
(
wxT
(
"Switch to Component layer"
),
static
Ki_HotkeyInfo
HkSwitch2ComponentLayer
(
wxT
(
"Switch to Component layer"
),
HK_SWITCH_LAYER_TO_COMPONENT
,
WXK_PAGE
DOWN
);
HK_SWITCH_LAYER_TO_COMPONENT
,
WXK_PAGE
UP
);
static
Ki_HotkeyInfo
HkSwitch2InnerLayer1
(
wxT
(
"Switch to Inner layer 1"
),
static
Ki_HotkeyInfo
HkSwitch2InnerLayer1
(
wxT
(
"Switch to Inner layer 1"
),
HK_SWITCH_LAYER_TO_INNER1
,
WXK_F5
);
HK_SWITCH_LAYER_TO_INNER1
,
WXK_F5
);
static
Ki_HotkeyInfo
HkSwitch2InnerLayer2
(
wxT
(
"Switch to Inner layer 2"
),
static
Ki_HotkeyInfo
HkSwitch2InnerLayer2
(
wxT
(
"Switch to Inner layer 2"
),
...
@@ -128,54 +128,39 @@ Ki_HotkeyInfo* s_board_edit_Hotkey_List[] =
...
@@ -128,54 +128,39 @@ Ki_HotkeyInfo* s_board_edit_Hotkey_List[] =
Ki_HotkeyInfo
*
s_module_edit_Hotkey_List
[]
=
{
NULL
};
Ki_HotkeyInfo
*
s_module_edit_Hotkey_List
[]
=
{
NULL
};
// list of sections and corresponding hotkey list for pcbnew (used to create an hotkey config file)
// list of sections and corresponding hotkey list for pcbnew (used to create an hotkey config file)
struct
Ki_HotkeyInfoSectionDescriptor
s_Pcbnew_Editor_Hokeys_Descr
[]
=
{
{
struct
Ki_HotkeyInfoSectionDescriptor
s_Pcbnew_Editor_Hokeys_Descr
[]
=
&
g_CommonSectionTag
,
{
{
s_Common_Hotkey_List
,
&
g_CommonSectionTag
,
s_Common_Hotkey_List
,
"Common keys"
"Common keys"
},
},
{
{
&
&
g_BoardEditorSectionTag
,
s_board_edit_Hotkey_List
,
"Board editor keys"
g_BoardEditorSectionTag
,
},{
s_board_edit_Hotkey_List
,
&
g_ModuleEditSectionTag
,
s_module_edit_Hotkey_List
,
"Footprint editor keys"
"Board editor keys"
},{
},
{
NULL
,
NULL
,
NULL
&
g_ModuleEditSectionTag
,
s_module_edit_Hotkey_List
,
"Footprint editor keys"
},
{
NULL
,
NULL
,
NULL
}
};
}
};
// list of sections and corresponding hotkey list for the board editor (used to list current hotkeys)
// list of sections and corresponding hotkey list for the board editor (used to list current hotkeys)
struct
Ki_HotkeyInfoSectionDescriptor
s_Board_Editor_Hokeys_Descr
[]
=
{
{
struct
Ki_HotkeyInfoSectionDescriptor
s_Board_Editor_Hokeys_Descr
[]
=
{
{
&
g_CommonSectionTag
,
&
g_CommonSectionTag
,
s_Common_Hotkey_List
,
s_Common_Hotkey_List
,
NULL
NULL
},
{
},{
&
&
g_BoardEditorSectionTag
,
s_board_edit_Hotkey_List
,
NULL
g_BoardEditorSectionTag
,
},{
s_board_edit_Hotkey_List
,
NULL
,
NULL
,
NULL
NULL
},
{
NULL
,
NULL
,
NULL
}
};
}
};
// list of sections and corresponding hotkey list for the footprint editor (used to list current hotkeys)
// list of sections and corresponding hotkey list for the footprint editor (used to list current hotkeys)
struct
Ki_HotkeyInfoSectionDescriptor
s_Module_Editor_Hokeys_Descr
[]
=
{
{
struct
Ki_HotkeyInfoSectionDescriptor
&
g_CommonSectionTag
,
s_Module_Editor_Hokeys_Descr
[]
=
s_Common_Hotkey_List
,
{
{
NULL
&
g_CommonSectionTag
,
s_Common_Hotkey_List
,
NULL
},
{
},{
&
&
g_ModuleEditSectionTag
,
s_module_edit_Hotkey_List
,
NULL
g_ModuleEditSectionTag
,
},{
s_module_edit_Hotkey_List
,
NULL
,
NULL
,
NULL
NULL
},
{
NULL
,
NULL
,
NULL
}
};
}
};
/***********************************************************/
/***********************************************************/
...
@@ -485,6 +470,7 @@ void WinEDA_PcbFrame::OnHotKey( wxDC* DC, int hotkey, EDA_BaseStruct* DrawStruct
...
@@ -485,6 +470,7 @@ void WinEDA_PcbFrame::OnHotKey( wxDC* DC, int hotkey, EDA_BaseStruct* DrawStruct
else
if
(
GetCurItem
()
->
m_Flags
&
IS_NEW
)
else
if
(
GetCurItem
()
->
m_Flags
&
IS_NEW
)
{
{
TRACK
*
track
=
Begin_Route
(
(
TRACK
*
)
GetCurItem
(),
DC
);
TRACK
*
track
=
Begin_Route
(
(
TRACK
*
)
GetCurItem
(),
DC
);
// SetCurItem() must not write to the msg panel
// SetCurItem() must not write to the msg panel
// because a track info is displayed while moving the mouse cursor
// because a track info is displayed while moving the mouse cursor
if
(
track
)
// A new segment was created
if
(
track
)
// A new segment was created
...
...
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