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
ddaa8c9d
Commit
ddaa8c9d
authored
Oct 15, 2008
by
charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
typo in menus & dialogs
parent
5bfcc884
Changes
6
Hide whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
4562 additions
and
3953 deletions
+4562
-3953
onrightclick.cpp
eeschema/onrightclick.cpp
+9
-9
tool_sch.cpp
eeschema/tool_sch.cpp
+2
-2
kicad.mo
internat/fr/kicad.mo
+0
-0
kicad.po
internat/fr/kicad.po
+4543
-3934
dialog_copper_zones_frame.cpp
pcbnew/dialog_copper_zones_frame.cpp
+6
-6
dialog_copper_zones_frame.fbp
pcbnew/dialog_copper_zones_frame.fbp
+2
-2
No files found.
eeschema/onrightclick.cpp
View file @
ddaa8c9d
...
@@ -354,10 +354,10 @@ void AddMenusForGLabel( wxMenu* PopMenu, SCH_GLOBALLABEL* GLabel )
...
@@ -354,10 +354,10 @@ void AddMenusForGLabel( wxMenu* PopMenu, SCH_GLOBALLABEL* GLabel )
wxMenu
*
menu_change_type
=
new
wxMenu
;
wxMenu
*
menu_change_type
=
new
wxMenu
;
if
(
!
GLabel
->
m_Flags
)
if
(
!
GLabel
->
m_Flags
)
ADD_MENUITEM
(
PopMenu
,
ID_POPUP_SCH_MOVE_ITEM_REQUEST
,
_
(
"Move
G
label"
),
move_text_xpm
);
ADD_MENUITEM
(
PopMenu
,
ID_POPUP_SCH_MOVE_ITEM_REQUEST
,
_
(
"Move
global
label"
),
move_text_xpm
);
ADD_MENUITEM
(
PopMenu
,
ID_POPUP_SCH_ROTATE_TEXT
,
_
(
"Rotate
GL
abel"
),
rotate_glabel_xpm
);
ADD_MENUITEM
(
PopMenu
,
ID_POPUP_SCH_ROTATE_TEXT
,
_
(
"Rotate
global l
abel"
),
rotate_glabel_xpm
);
ADD_MENUITEM
(
PopMenu
,
ID_POPUP_SCH_EDIT_TEXT
,
_
(
"Edit
GL
abel"
),
edit_text_xpm
);
ADD_MENUITEM
(
PopMenu
,
ID_POPUP_SCH_EDIT_TEXT
,
_
(
"Edit
global l
abel"
),
edit_text_xpm
);
ADD_MENUITEM
(
PopMenu
,
ID_POPUP_SCH_DELETE
,
_
(
"Delete
G
label"
),
delete_text_xpm
);
ADD_MENUITEM
(
PopMenu
,
ID_POPUP_SCH_DELETE
,
_
(
"Delete
global
label"
),
delete_text_xpm
);
// add menu change type text (to label, glabel, text):
// add menu change type text (to label, glabel, text):
ADD_MENUITEM
(
menu_change_type
,
ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_HLABEL
,
ADD_MENUITEM
(
menu_change_type
,
ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_HLABEL
,
...
@@ -375,16 +375,16 @@ void AddMenusForGLabel( wxMenu* PopMenu, SCH_GLOBALLABEL* GLabel )
...
@@ -375,16 +375,16 @@ void AddMenusForGLabel( wxMenu* PopMenu, SCH_GLOBALLABEL* GLabel )
void
AddMenusForHLabel
(
wxMenu
*
PopMenu
,
SCH_HIERLABEL
*
HLabel
)
void
AddMenusForHLabel
(
wxMenu
*
PopMenu
,
SCH_HIERLABEL
*
HLabel
)
/*******************************************************************/
/*******************************************************************/
/* Add menu commands for a hierarchal Label
/* Add menu commands for a hierarch
ic
al Label
*/
*/
{
{
wxMenu
*
menu_change_type
=
new
wxMenu
;
wxMenu
*
menu_change_type
=
new
wxMenu
;
if
(
!
HLabel
->
m_Flags
)
if
(
!
HLabel
->
m_Flags
)
ADD_MENUITEM
(
PopMenu
,
ID_POPUP_SCH_MOVE_ITEM_REQUEST
,
_
(
"Move
H
label"
),
move_text_xpm
);
ADD_MENUITEM
(
PopMenu
,
ID_POPUP_SCH_MOVE_ITEM_REQUEST
,
_
(
"Move
hierarchical
label"
),
move_text_xpm
);
ADD_MENUITEM
(
PopMenu
,
ID_POPUP_SCH_ROTATE_TEXT
,
_
(
"Rotate
H
Label"
),
rotate_glabel_xpm
);
ADD_MENUITEM
(
PopMenu
,
ID_POPUP_SCH_ROTATE_TEXT
,
_
(
"Rotate
hierarchical
Label"
),
rotate_glabel_xpm
);
ADD_MENUITEM
(
PopMenu
,
ID_POPUP_SCH_EDIT_TEXT
,
_
(
"Edit
H
Label"
),
edit_text_xpm
);
ADD_MENUITEM
(
PopMenu
,
ID_POPUP_SCH_EDIT_TEXT
,
_
(
"Edit
hierarchical
Label"
),
edit_text_xpm
);
ADD_MENUITEM
(
PopMenu
,
ID_POPUP_SCH_DELETE
,
_
(
"Delete
H
label"
),
delete_text_xpm
);
ADD_MENUITEM
(
PopMenu
,
ID_POPUP_SCH_DELETE
,
_
(
"Delete
hierarchical
label"
),
delete_text_xpm
);
// add menu change type text (to label, glabel, text):
// add menu change type text (to label, glabel, text):
ADD_MENUITEM
(
menu_change_type
,
ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_LABEL
,
ADD_MENUITEM
(
menu_change_type
,
ID_POPUP_SCH_CHANGE_TYPE_TEXT_TO_LABEL
,
...
...
eeschema/tool_sch.cpp
View file @
ddaa8c9d
...
@@ -206,12 +206,12 @@ void WinEDA_SchematicFrame::ReCreateVToolbar()
...
@@ -206,12 +206,12 @@ void WinEDA_SchematicFrame::ReCreateVToolbar()
m_VToolBar
->
AddTool
(
ID_IMPORT_GLABEL_BUTT
,
wxEmptyString
,
m_VToolBar
->
AddTool
(
ID_IMPORT_GLABEL_BUTT
,
wxEmptyString
,
BITMAP
(
import_hierarchical_label_xpm
),
BITMAP
(
import_hierarchical_label_xpm
),
_
(
"Place
the pin sheet (imported hierarchical label from sheet)
"
),
_
(
"Place
a pin sheet , imported from a hierarchical label in sheet
"
),
wxITEM_CHECK
);
wxITEM_CHECK
);
m_VToolBar
->
AddTool
(
ID_SHEET_LABEL_BUTT
,
wxEmptyString
,
m_VToolBar
->
AddTool
(
ID_SHEET_LABEL_BUTT
,
wxEmptyString
,
BITMAP
(
add_hierar_pin_xpm
),
BITMAP
(
add_hierar_pin_xpm
),
_
(
"Place hierachical pin to sheet"
),
wxITEM_CHECK
);
_
(
"Place hiera
r
chical pin to sheet"
),
wxITEM_CHECK
);
m_VToolBar
->
AddSeparator
();
m_VToolBar
->
AddSeparator
();
m_VToolBar
->
AddTool
(
ID_LINE_COMMENT_BUTT
,
wxEmptyString
,
m_VToolBar
->
AddTool
(
ID_LINE_COMMENT_BUTT
,
wxEmptyString
,
...
...
internat/fr/kicad.mo
View file @
ddaa8c9d
No preview for this file type
internat/fr/kicad.po
View file @
ddaa8c9d
This source diff could not be displayed because it is too large. You can
view the blob
instead.
pcbnew/dialog_copper_zones_frame.cpp
View file @
ddaa8c9d
...
@@ -31,7 +31,7 @@ dialog_copper_zone_frame::dialog_copper_zone_frame( wxWindow* parent, wxWindowID
...
@@ -31,7 +31,7 @@ dialog_copper_zone_frame::dialog_copper_zone_frame( wxWindow* parent, wxWindowID
m_LeftBoxSizer
=
new
wxBoxSizer
(
wxVERTICAL
);
m_LeftBoxSizer
=
new
wxBoxSizer
(
wxVERTICAL
);
wxStaticBoxSizer
*
m_FillOptionsBox
;
wxStaticBoxSizer
*
m_FillOptionsBox
;
m_FillOptionsBox
=
new
wxStaticBoxSizer
(
new
wxStaticBox
(
this
,
wxID_ANY
,
_
(
"Zone
fill options
"
)
),
wxVERTICAL
);
m_FillOptionsBox
=
new
wxStaticBoxSizer
(
new
wxStaticBox
(
this
,
wxID_ANY
,
_
(
"Zone
Fill Options:
"
)
),
wxVERTICAL
);
wxString
m_GridCtrlChoices
[]
=
{
_
(
"0.00000"
),
_
(
"0.00000"
),
_
(
"0.00000"
),
_
(
"0.00000"
),
_
(
"No Grid (For tests only!)"
)
};
wxString
m_GridCtrlChoices
[]
=
{
_
(
"0.00000"
),
_
(
"0.00000"
),
_
(
"0.00000"
),
_
(
"0.00000"
),
_
(
"No Grid (For tests only!)"
)
};
int
m_GridCtrlNChoices
=
sizeof
(
m_GridCtrlChoices
)
/
sizeof
(
wxString
);
int
m_GridCtrlNChoices
=
sizeof
(
m_GridCtrlChoices
)
/
sizeof
(
wxString
);
...
@@ -46,9 +46,9 @@ dialog_copper_zone_frame::dialog_copper_zone_frame( wxWindow* parent, wxWindowID
...
@@ -46,9 +46,9 @@ dialog_copper_zone_frame::dialog_copper_zone_frame( wxWindow* parent, wxWindowID
m_ZoneClearanceCtrl
=
new
wxTextCtrl
(
this
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_ZoneClearanceCtrl
=
new
wxTextCtrl
(
this
,
wxID_ANY
,
wxEmptyString
,
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_FillOptionsBox
->
Add
(
m_ZoneClearanceCtrl
,
0
,
wxEXPAND
|
wxBOTTOM
|
wxRIGHT
|
wxLEFT
,
5
);
m_FillOptionsBox
->
Add
(
m_ZoneClearanceCtrl
,
0
,
wxEXPAND
|
wxBOTTOM
|
wxRIGHT
|
wxLEFT
,
5
);
wxString
m_FillOptChoices
[]
=
{
_
(
"Include
pads"
),
_
(
"Thermal relief"
),
_
(
"Exclude p
ads"
)
};
wxString
m_FillOptChoices
[]
=
{
_
(
"Include
Pads"
),
_
(
"Thermal Relief"
),
_
(
"Exclude P
ads"
)
};
int
m_FillOptNChoices
=
sizeof
(
m_FillOptChoices
)
/
sizeof
(
wxString
);
int
m_FillOptNChoices
=
sizeof
(
m_FillOptChoices
)
/
sizeof
(
wxString
);
m_FillOpt
=
new
wxRadioBox
(
this
,
wxID_ANY
,
_
(
"Pad in
z
one:"
),
wxDefaultPosition
,
wxDefaultSize
,
m_FillOptNChoices
,
m_FillOptChoices
,
1
,
wxRA_SPECIFY_COLS
);
m_FillOpt
=
new
wxRadioBox
(
this
,
wxID_ANY
,
_
(
"Pad in
Z
one:"
),
wxDefaultPosition
,
wxDefaultSize
,
m_FillOptNChoices
,
m_FillOptChoices
,
1
,
wxRA_SPECIFY_COLS
);
m_FillOpt
->
SetSelection
(
1
);
m_FillOpt
->
SetSelection
(
1
);
m_FillOptionsBox
->
Add
(
m_FillOpt
,
0
,
wxALL
|
wxEXPAND
,
5
);
m_FillOptionsBox
->
Add
(
m_FillOpt
,
0
,
wxALL
|
wxEXPAND
,
5
);
...
@@ -77,8 +77,8 @@ dialog_copper_zone_frame::dialog_copper_zone_frame( wxWindow* parent, wxWindowID
...
@@ -77,8 +77,8 @@ dialog_copper_zone_frame::dialog_copper_zone_frame( wxWindow* parent, wxWindowID
wxString
m_OutlineAppearanceCtrlChoices
[]
=
{
_
(
"Line"
),
_
(
"Hatched Outline"
),
_
(
"Full Hatched"
)
};
wxString
m_OutlineAppearanceCtrlChoices
[]
=
{
_
(
"Line"
),
_
(
"Hatched Outline"
),
_
(
"Full Hatched"
)
};
int
m_OutlineAppearanceCtrlNChoices
=
sizeof
(
m_OutlineAppearanceCtrlChoices
)
/
sizeof
(
wxString
);
int
m_OutlineAppearanceCtrlNChoices
=
sizeof
(
m_OutlineAppearanceCtrlChoices
)
/
sizeof
(
wxString
);
m_OutlineAppearanceCtrl
=
new
wxRadioBox
(
this
,
ID_RADIOBOX_OUTLINES_OPTION
,
_
(
"Outlines Appearance"
),
wxDefaultPosition
,
wxDefaultSize
,
m_OutlineAppearanceCtrlNChoices
,
m_OutlineAppearanceCtrlChoices
,
1
,
wxRA_SPECIFY_COLS
);
m_OutlineAppearanceCtrl
=
new
wxRadioBox
(
this
,
ID_RADIOBOX_OUTLINES_OPTION
,
_
(
"Outlines Appearance"
),
wxDefaultPosition
,
wxDefaultSize
,
m_OutlineAppearanceCtrlNChoices
,
m_OutlineAppearanceCtrlChoices
,
1
,
wxRA_SPECIFY_COLS
);
m_OutlineAppearanceCtrl
->
SetSelection
(
1
);
m_OutlineAppearanceCtrl
->
SetSelection
(
0
);
m_OutlineAppearanceCtrl
->
SetToolTip
(
_
(
"
How a zone outline is shoved:
\n
Single line
\n
Short hatching
\n
Full
area hatched"
)
);
m_OutlineAppearanceCtrl
->
SetToolTip
(
_
(
"
Choose how a zone outline is displayed
\n
- Single line
\n
- Short hatching
\n
- Full zone
area hatched"
)
);
m_OutilinesBoxOpt
->
Add
(
m_OutlineAppearanceCtrl
,
0
,
wxALL
|
wxEXPAND
,
5
);
m_OutilinesBoxOpt
->
Add
(
m_OutlineAppearanceCtrl
,
0
,
wxALL
|
wxEXPAND
,
5
);
...
@@ -107,7 +107,7 @@ dialog_copper_zone_frame::dialog_copper_zone_frame( wxWindow* parent, wxWindowID
...
@@ -107,7 +107,7 @@ dialog_copper_zone_frame::dialog_copper_zone_frame( wxWindow* parent, wxWindowID
m_ButtonCancel
=
new
wxButton
(
this
,
wxID_CANCEL
,
_
(
"Cancel"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_ButtonCancel
=
new
wxButton
(
this
,
wxID_CANCEL
,
_
(
"Cancel"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_RightBoxSizer
->
Add
(
m_ButtonCancel
,
0
,
wxALL
|
wxALIGN_CENTER_HORIZONTAL
,
5
);
m_RightBoxSizer
->
Add
(
m_ButtonCancel
,
0
,
wxALL
|
wxALIGN_CENTER_HORIZONTAL
,
5
);
m_UnFillZoneButton
=
new
wxButton
(
this
,
wxID_ANY
,
_
(
"Un
fill z
one"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_UnFillZoneButton
=
new
wxButton
(
this
,
wxID_ANY
,
_
(
"Un
Fill Z
one"
),
wxDefaultPosition
,
wxDefaultSize
,
0
);
m_RightBoxSizer
->
Add
(
m_UnFillZoneButton
,
0
,
wxALL
|
wxALIGN_CENTER_HORIZONTAL
,
5
);
m_RightBoxSizer
->
Add
(
m_UnFillZoneButton
,
0
,
wxALL
|
wxALIGN_CENTER_HORIZONTAL
,
5
);
...
...
pcbnew/dialog_copper_zones_frame.fbp
View file @
ddaa8c9d
...
@@ -438,11 +438,11 @@
...
@@ -438,11 +438,11 @@
<property
name=
"name"
>
m_OutlineAppearanceCtrl
</property>
<property
name=
"name"
>
m_OutlineAppearanceCtrl
</property>
<property
name=
"permission"
>
protected
</property>
<property
name=
"permission"
>
protected
</property>
<property
name=
"pos"
></property>
<property
name=
"pos"
></property>
<property
name=
"selection"
>
1
</property>
<property
name=
"selection"
>
0
</property>
<property
name=
"size"
></property>
<property
name=
"size"
></property>
<property
name=
"style"
>
wxRA_SPECIFY_COLS
</property>
<property
name=
"style"
>
wxRA_SPECIFY_COLS
</property>
<property
name=
"subclass"
></property>
<property
name=
"subclass"
></property>
<property
name=
"tooltip"
>
How a zone outline is shoved:


Single line


Short hatching


Full
area hatched
</property>
<property
name=
"tooltip"
>
Choose how a zone outline is displayed


- Single line


- Short hatching


- Full zone
area hatched
</property>
<property
name=
"window_extra_style"
></property>
<property
name=
"window_extra_style"
></property>
<property
name=
"window_name"
></property>
<property
name=
"window_name"
></property>
<property
name=
"window_style"
></property>
<property
name=
"window_style"
></property>
...
...
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