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
148ba430
Commit
148ba430
authored
Apr 10, 2015
by
Chris Pavlina
Committed by
Wayne Stambaugh
Apr 10, 2015
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Make tab order more sensible for DIALOG_PCB_TEXT_PROPERTIES.
parent
5a387ce5
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
20 additions
and
6 deletions
+20
-6
dialog_pcb_text_properties.cpp
pcbnew/dialogs/dialog_pcb_text_properties.cpp
+15
-3
dialog_pcb_text_properties_base.cpp
pcbnew/dialogs/dialog_pcb_text_properties_base.cpp
+1
-1
dialog_pcb_text_properties_base.fbp
pcbnew/dialogs/dialog_pcb_text_properties_base.fbp
+3
-1
dialog_pcb_text_properties_base.h
pcbnew/dialogs/dialog_pcb_text_properties_base.h
+1
-1
No files found.
pcbnew/dialogs/dialog_pcb_text_properties.cpp
View file @
148ba430
...
...
@@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2004-2010 Jean-Pierre Charras <jean-pierre.charras@gpisa-lab.inpg.fr>
* Copyright (C) 2010 KiCad Developers, see change_log.txt for contributors.
* Copyright (C) 2010
-2015
KiCad Developers, see change_log.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
...
...
@@ -153,6 +153,18 @@ void DIALOG_PCB_TEXT_PROPERTIES::MyInit()
EDA_TEXT_HJUSTIFY_T
hJustify
=
m_SelectedPCBText
->
GetHorizJustify
();
m_justifyChoice
->
SetSelection
(
(
int
)
hJustify
+
1
);
// Manually set tab order
m_SizeXCtrl
->
MoveAfterInTabOrder
(
m_TextContentCtrl
);
m_SizeYCtrl
->
MoveAfterInTabOrder
(
m_SizeXCtrl
);
m_ThicknessCtrl
->
MoveAfterInTabOrder
(
m_SizeYCtrl
);
m_PositionXCtrl
->
MoveAfterInTabOrder
(
m_ThicknessCtrl
);
m_PositionYCtrl
->
MoveAfterInTabOrder
(
m_PositionXCtrl
);
m_OrientationCtrl
->
MoveAfterInTabOrder
(
m_PositionYCtrl
);
m_LayerSelectionCtrl
->
MoveAfterInTabOrder
(
m_OrientationCtrl
);
m_StyleCtrl
->
MoveAfterInTabOrder
(
m_LayerSelectionCtrl
);
m_DisplayCtrl
->
MoveAfterInTabOrder
(
m_StyleCtrl
);
m_justifyChoice
->
MoveAfterInTabOrder
(
m_DisplayCtrl
);
// Set focus on most important control
m_TextContentCtrl
->
SetFocus
();
m_TextContentCtrl
->
SetSelection
(
-
1
,
-
1
);
...
...
@@ -178,7 +190,7 @@ void DIALOG_PCB_TEXT_PROPERTIES::OnOkClick( wxCommandEvent& event )
// having texts on edge cut layer for instance
if
(
m_LayerSelectionCtrl
->
GetLayerSelection
()
<
0
)
{
wxMessageBox
(
wxT
(
"No layer selected, Please select the text layer"
)
);
wxMessageBox
(
_
(
"No layer selected, Please select the text layer"
)
);
return
;
}
...
...
@@ -236,7 +248,7 @@ void DIALOG_PCB_TEXT_PROPERTIES::OnOkClick( wxCommandEvent& event )
// Set the new thickness
m_SelectedPCBText
->
SetThickness
(
ValueFromString
(
g_UserUnit
,
m_ThicknessCtrl
->
GetValue
()
)
);
m_ThicknessCtrl
->
GetValue
()
)
);
// Test for acceptable values for thickness and size and clamp if fails
int
maxthickness
=
Clamp_Text_PenSize
(
m_SelectedPCBText
->
GetThickness
(),
...
...
pcbnew/dialogs/dialog_pcb_text_properties_base.cpp
View file @
148ba430
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Oct 8 2012
)
// C++ code generated with wxFormBuilder (version
Mar 13 2015
)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
...
...
pcbnew/dialogs/dialog_pcb_text_properties_base.fbp
View file @
148ba430
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<wxFormBuilder_Project>
<FileVersion
major=
"1"
minor=
"1
1
"
/>
<FileVersion
major=
"1"
minor=
"1
3
"
/>
<object
class=
"Project"
expanded=
"1"
>
<property
name=
"class_decoration"
></property>
<property
name=
"code_generation"
>
C++
</property>
...
...
@@ -20,8 +20,10 @@
<property
name=
"path"
>
.
</property>
<property
name=
"precompiled_header"
></property>
<property
name=
"relative_path"
>
1
</property>
<property
name=
"skip_lua_events"
>
1
</property>
<property
name=
"skip_php_events"
>
1
</property>
<property
name=
"skip_python_events"
>
1
</property>
<property
name=
"ui_table"
>
UI
</property>
<property
name=
"use_enum"
>
0
</property>
<property
name=
"use_microsoft_bom"
>
0
</property>
<object
class=
"Dialog"
expanded=
"1"
>
...
...
pcbnew/dialogs/dialog_pcb_text_properties_base.h
View file @
148ba430
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version
Oct 8 2012
)
// C++ code generated with wxFormBuilder (version
Mar 13 2015
)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
...
...
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