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
59549109
Commit
59549109
authored
Jan 13, 2014
by
jean-pierre charras
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some issues in modview, relative to some a bad use of some wxAuiManager functions.
parent
f0412874
Changes
4
Expand all
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
79 additions
and
101 deletions
+79
-101
drawframe.cpp
common/drawframe.cpp
+2
-0
modview_frame.cpp
pcbnew/modview_frame.cpp
+68
-81
modview_frame.h
pcbnew/modview_frame.h
+3
-8
tool_modview.cpp
pcbnew/tool_modview.cpp
+6
-12
No files found.
common/drawframe.cpp
View file @
59549109
...
@@ -118,6 +118,8 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( wxWindow* aParent,
...
@@ -118,6 +118,8 @@ EDA_DRAW_FRAME::EDA_DRAW_FRAME( wxWindow* aParent,
m_snapToGrid
=
true
;
m_snapToGrid
=
true
;
m_MsgFrameHeight
=
EDA_MSG_PANEL
::
GetRequiredHeight
();
m_MsgFrameHeight
=
EDA_MSG_PANEL
::
GetRequiredHeight
();
m_auimgr
.
SetFlags
(
wxAUI_MGR_DEFAULT
|
wxAUI_MGR_LIVE_RESIZE
);
CreateStatusBar
(
6
);
CreateStatusBar
(
6
);
// set the size of the status bar subwindows:
// set the size of the status bar subwindows:
...
...
pcbnew/modview_frame.cpp
View file @
59549109
This diff is collapsed.
Click to expand it.
pcbnew/modview_frame.h
View file @
59549109
...
@@ -44,16 +44,11 @@ class FP_LIB_TABLE;
...
@@ -44,16 +44,11 @@ class FP_LIB_TABLE;
class
FOOTPRINT_VIEWER_FRAME
:
public
PCB_BASE_FRAME
class
FOOTPRINT_VIEWER_FRAME
:
public
PCB_BASE_FRAME
{
{
private
:
private
:
// List of libraries (for selection )
wxListBox
*
m_libList
;
// The list of libs names
wxSashLayoutWindow
*
m_LibListWindow
;
wxListBox
*
m_footprintList
;
// The list of footprint names
wxListBox
*
m_LibList
;
// The list of libs names
// List of components in the selected library
wxSashLayoutWindow
*
m_FootprintListWindow
;
wxListBox
*
m_FootprintList
;
// The list of footprint names
// Flags
// Flags
wxSemaphore
*
m_
Semaphore
;
// != NULL if the frame must emulate
a modal dialog
wxSemaphore
*
m_
semaphore
;
// != NULL if the frame emulates
a modal dialog
wxString
m_configPath
;
// subpath for configuration
wxString
m_configPath
;
// subpath for configuration
protected
:
protected
:
...
...
pcbnew/tool_modview.cpp
View file @
59549109
...
@@ -47,7 +47,9 @@ void FOOTPRINT_VIEWER_FRAME::ReCreateHToolbar()
...
@@ -47,7 +47,9 @@ void FOOTPRINT_VIEWER_FRAME::ReCreateHToolbar()
if
(
m_mainToolBar
==
NULL
)
if
(
m_mainToolBar
==
NULL
)
{
{
m_mainToolBar
=
new
wxAuiToolBar
(
this
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
m_mainToolBar
=
new
wxAuiToolBar
(
this
,
wxID_ANY
,
wxDefaultPosition
,
wxDefaultSize
,
wxAUI_TB_DEFAULT_STYLE
|
wxAUI_TB_OVERFLOW
);
wxAUI_TB_DEFAULT_STYLE
|
wxAUI_TB_OVERFLOW
);
// Set up toolbar
// Set up toolbar
m_mainToolBar
->
AddTool
(
ID_MODVIEW_SELECT_LIB
,
wxEmptyString
,
m_mainToolBar
->
AddTool
(
ID_MODVIEW_SELECT_LIB
,
wxEmptyString
,
...
@@ -93,22 +95,14 @@ void FOOTPRINT_VIEWER_FRAME::ReCreateHToolbar()
...
@@ -93,22 +95,14 @@ void FOOTPRINT_VIEWER_FRAME::ReCreateHToolbar()
m_mainToolBar
->
AddTool
(
ID_ZOOM_PAGE
,
wxEmptyString
,
m_mainToolBar
->
AddTool
(
ID_ZOOM_PAGE
,
wxEmptyString
,
KiBitmap
(
zoom_fit_in_page_xpm
),
msg
);
KiBitmap
(
zoom_fit_in_page_xpm
),
msg
);
if
(
m_Semaphore
)
// Enable this tool only if the library browser is called from
// a "load component" command
if
(
m_semaphore
)
{
{
// The library browser is called from a "load component" command
m_mainToolBar
->
AddSeparator
();
m_mainToolBar
->
AddSeparator
();
/*
this ID_MODVIEW_FOOTPRINT_EXPORT_TO_BOARD control
is broken it does not lead to a fetched footprint on linux, either 3.0 nor 2.8 wx:
and I really don't like the drop down menu here:
whoever broke it, please fix it:
m_mainToolBar
->
AddTool
(
ID_MODVIEW_FOOTPRINT_EXPORT_TO_BOARD
,
wxEmptyString
,
m_mainToolBar
->
AddTool
(
ID_MODVIEW_FOOTPRINT_EXPORT_TO_BOARD
,
wxEmptyString
,
KiBitmap
(
export_footprint_names_xpm
),
KiBitmap
(
export_footprint_names_xpm
),
_
(
"Insert footprint in board"
)
);
_
(
"Insert footprint in board"
)
);
*/
}
}
// after adding the buttons to the toolbar, must call Realize() to
// after adding the buttons to the toolbar, must call Realize() to
...
...
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