Skip to content

K
kicad-source-mirror
Commit 9c1f6b73 authored by jean-pierre charras's avatar jean-pierre charras
Browse files
Options

Pcbnew: fix Bug #1304418 . Fix also a related issue which crashes Pcbnew in some corner cases. 

(for instance, when a footprint from the currently edited board is loaded in the footprint editor, and when the board is cleared or reloaded)
In footprint editor, the net names are no more shown od modifiable (becuase the footprint editor does not know anything about net names.
This change should allow the changes planned in pcbnew.
parent b427aa49
Show whitespace changes
Inline Side-by-side
Showing with 703 additions and 456 deletions
common/dialog_about/dialog_about.cpp
View file @ 9c1f6b73
...@@ -29,16 +29,9 @@ dialog_about::dialog_about(wxWindow *parent, AboutAppInfo& appInfo) ...@@ -29,16 +29,9 @@ dialog_about::dialog_about(wxWindow *parent, AboutAppInfo& appInfo)
m_staticTextBuildVersion->SetLabel( info.GetBuildVersion() ); m_staticTextBuildVersion->SetLabel( info.GetBuildVersion() );
m_staticTextLibVersion->SetLabel( info.GetLibVersion() ); m_staticTextLibVersion->SetLabel( info.GetLibVersion() );
/* Affects m_titlepanel the parent of some wxStaticText.
* Changing the text afterwards makes it under Windows necessary to call 'Layout()'
* so that the new text gets properly layout.
*/
/* m_staticTextCopyright->GetParent()->Layout();
m_staticTextBuildVersion->GetParent()->Layout();
m_staticTextLibVersion->GetParent()->Layout();
*/
DeleteNotebooks(); DeleteNotebooks();
CreateNotebooks(); CreateNotebooks();
GetSizer()->SetSizeHints(this); GetSizer()->SetSizeHints(this);
m_auiNotebook->Update(); m_auiNotebook->Update();
SetFocus(); SetFocus();
......
common/dialog_about/dialog_about_base.cpp
View file @ 9c1f6b73
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Sep 8 2010) // C++ code generated with wxFormBuilder (version Nov 6 2013)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
...@@ -46,11 +46,13 @@ dialog_about_base::dialog_about_base( wxWindow* parent, wxWindowID id, const wxS ...@@ -46,11 +46,13 @@ dialog_about_base::dialog_about_base( wxWindow* parent, wxWindowID id, const wxS
m_staticTextLibVersion->Wrap( -1 ); m_staticTextLibVersion->Wrap( -1 );
b_apptitleSizer->Add( m_staticTextLibVersion, 0, wxALIGN_CENTER|wxBOTTOM|wxLEFT|wxRIGHT, 5 ); b_apptitleSizer->Add( m_staticTextLibVersion, 0, wxALIGN_CENTER|wxBOTTOM|wxLEFT|wxRIGHT, 5 );
bSizer3->Add( b_apptitleSizer, 10, wxEXPAND, 5 ); bSizer3->Add( b_apptitleSizer, 10, wxEXPAND, 5 );
bSizer3->Add( 0, 0, 2, wxEXPAND, 5 ); bSizer3->Add( 0, 0, 2, wxEXPAND, 5 );
bSizer1->Add( bSizer3, 0, wxEXPAND, 5 ); bSizer1->Add( bSizer3, 0, wxEXPAND, 5 );
wxStaticLine* m_staticline1; wxStaticLine* m_staticline1;
...@@ -67,6 +69,7 @@ dialog_about_base::dialog_about_base( wxWindow* parent, wxWindowID id, const wxS ...@@ -67,6 +69,7 @@ dialog_about_base::dialog_about_base( wxWindow* parent, wxWindowID id, const wxS
m_buttonOK->SetDefault(); m_buttonOK->SetDefault();
bSizer1->Add( m_buttonOK, 0, wxALIGN_CENTER|wxALL, 5 ); bSizer1->Add( m_buttonOK, 0, wxALIGN_CENTER|wxALL, 5 );
this->SetSizer( bSizer1 ); this->SetSizer( bSizer1 );
this->Layout(); this->Layout();
......
common/dialog_about/dialog_about_base.fbp
View file @ 9c1f6b73
...@@ -2,11 +2,13 @@ ...@@ -2,11 +2,13 @@
<wxFormBuilder_Project> <wxFormBuilder_Project>
<FileVersion major="1" minor="11" /> <FileVersion major="1" minor="11" />
<object class="Project" expanded="1"> <object class="Project" expanded="1">
<property name="class_decoration" /> <property name="class_decoration"></property>
<property name="code_generation">C++</property> <property name="code_generation">C++</property>
<property name="disconnect_events">1</property> <property name="disconnect_events">1</property>
<property name="disconnect_mode">source_name</property> <property name="disconnect_mode">source_name</property>
<property name="disconnect_php_events">0</property>
<property name="disconnect_python_events">0</property> <property name="disconnect_python_events">0</property>
<property name="embedded_files_path">res</property>
<property name="encoding">UTF-8</property> <property name="encoding">UTF-8</property>
<property name="event_generation">connect</property> <property name="event_generation">connect</property>
<property name="file">dialog_about_base</property> <property name="file">dialog_about_base</property>
...@@ -14,73 +16,80 @@ ...@@ -14,73 +16,80 @@
<property name="help_provider">none</property> <property name="help_provider">none</property>
<property name="internationalize">1</property> <property name="internationalize">1</property>
<property name="name">MyProject</property> <property name="name">MyProject</property>
<property name="namespace" /> <property name="namespace"></property>
<property name="path">.</property> <property name="path">.</property>
<property name="precompiled_header" /> <property name="precompiled_header"></property>
<property name="relative_path">1</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="skip_python_events">1</property>
<property name="ui_table">UI</property>
<property name="use_enum">1</property> <property name="use_enum">1</property>
<property name="use_microsoft_bom">0</property> <property name="use_microsoft_bom">0</property>
<object class="Dialog" expanded="1"> <object class="Dialog" expanded="1">
<property name="bg" /> <property name="aui_managed">0</property>
<property name="center" /> <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
<property name="context_help" /> <property name="bg"></property>
<property name="center"></property>
<property name="context_help"></property>
<property name="context_menu">1</property> <property name="context_menu">1</property>
<property name="enabled">1</property> <property name="enabled">1</property>
<property name="event_handler">impl_virtual</property> <property name="event_handler">impl_virtual</property>
<property name="extra_style" /> <property name="extra_style"></property>
<property name="fg" /> <property name="fg"></property>
<property name="font" /> <property name="font"></property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="maximum_size" /> <property name="maximum_size"></property>
<property name="minimum_size">-1,-1</property> <property name="minimum_size">-1,-1</property>
<property name="name">dialog_about_base</property> <property name="name">dialog_about_base</property>
<property name="pos" /> <property name="pos"></property>
<property name="size">750,450</property> <property name="size">750,450</property>
<property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSTAY_ON_TOP</property> <property name="style">wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSTAY_ON_TOP</property>
<property name="subclass" /> <property name="subclass"></property>
<property name="title">About...</property> <property name="title">About...</property>
<property name="tooltip" /> <property name="tooltip"></property>
<property name="validator_data_type" /> <property name="window_extra_style"></property>
<property name="validator_style">wxFILTER_NONE</property> <property name="window_name"></property>
<property name="validator_type">wxDefaultValidator</property> <property name="window_style"></property>
<property name="validator_variable" /> <event name="OnActivate"></event>
<property name="window_extra_style" /> <event name="OnActivateApp"></event>
<property name="window_name" /> <event name="OnAuiFindManager"></event>
<property name="window_style" /> <event name="OnAuiPaneButton"></event>
<event name="OnActivate" /> <event name="OnAuiPaneClose"></event>
<event name="OnActivateApp" /> <event name="OnAuiPaneMaximize"></event>
<event name="OnChar" /> <event name="OnAuiPaneRestore"></event>
<event name="OnAuiRender"></event>
<event name="OnChar"></event>
<event name="OnClose">OnClose</event> <event name="OnClose">OnClose</event>
<event name="OnEnterWindow" /> <event name="OnEnterWindow"></event>
<event name="OnEraseBackground" /> <event name="OnEraseBackground"></event>
<event name="OnHibernate" /> <event name="OnHibernate"></event>
<event name="OnIconize" /> <event name="OnIconize"></event>
<event name="OnIdle" /> <event name="OnIdle"></event>
<event name="OnInitDialog" /> <event name="OnInitDialog"></event>
<event name="OnKeyDown" /> <event name="OnKeyDown"></event>
<event name="OnKeyUp" /> <event name="OnKeyUp"></event>
<event name="OnKillFocus" /> <event name="OnKillFocus"></event>
<event name="OnLeaveWindow" /> <event name="OnLeaveWindow"></event>
<event name="OnLeftDClick" /> <event name="OnLeftDClick"></event>
<event name="OnLeftDown" /> <event name="OnLeftDown"></event>
<event name="OnLeftUp" /> <event name="OnLeftUp"></event>
<event name="OnMiddleDClick" /> <event name="OnMiddleDClick"></event>
<event name="OnMiddleDown" /> <event name="OnMiddleDown"></event>
<event name="OnMiddleUp" /> <event name="OnMiddleUp"></event>
<event name="OnMotion" /> <event name="OnMotion"></event>
<event name="OnMouseEvents" /> <event name="OnMouseEvents"></event>
<event name="OnMouseWheel" /> <event name="OnMouseWheel"></event>
<event name="OnPaint" /> <event name="OnPaint"></event>
<event name="OnRightDClick" /> <event name="OnRightDClick"></event>
<event name="OnRightDown" /> <event name="OnRightDown"></event>
<event name="OnRightUp" /> <event name="OnRightUp"></event>
<event name="OnSetFocus" /> <event name="OnSetFocus"></event>
<event name="OnSize" /> <event name="OnSize"></event>
<event name="OnUpdateUI" /> <event name="OnUpdateUI"></event>
<object class="wxBoxSizer" expanded="0"> <object class="wxBoxSizer" expanded="0">
<property name="minimum_size" /> <property name="minimum_size"></property>
<property name="name">bSizer1</property> <property name="name">bSizer1</property>
<property name="orient">wxVERTICAL</property> <property name="orient">wxVERTICAL</property>
<property name="permission">none</property> <property name="permission">none</property>
...@@ -89,7 +98,7 @@ ...@@ -89,7 +98,7 @@
<property name="flag">wxEXPAND</property> <property name="flag">wxEXPAND</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxBoxSizer" expanded="0"> <object class="wxBoxSizer" expanded="0">
<property name="minimum_size" /> <property name="minimum_size"></property>
<property name="name">bSizer3</property> <property name="name">bSizer3</property>
<property name="orient">wxHORIZONTAL</property> <property name="orient">wxHORIZONTAL</property>
<property name="permission">none</property> <property name="permission">none</property>
...@@ -108,53 +117,80 @@ ...@@ -108,53 +117,80 @@
<property name="flag">wxALIGN_CENTER|wxALL</property> <property name="flag">wxALIGN_CENTER|wxALL</property>
<property name="proportion">1</property> <property name="proportion">1</property>
<object class="wxStaticBitmap" expanded="0"> <object class="wxStaticBitmap" expanded="0">
<property name="bg" /> <property name="BottomDockable">1</property>
<property name="bitmap" /> <property name="LeftDockable">1</property>
<property name="context_help" /> <property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="bitmap"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property> <property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property> <property name="enabled">1</property>
<property name="fg" /> <property name="fg"></property>
<property name="font" /> <property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="maximum_size" /> <property name="max_size"></property>
<property name="minimum_size" /> <property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_bitmapApp</property> <property name="name">m_bitmapApp</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property> <property name="permission">protected</property>
<property name="pos" /> <property name="pin_button">1</property>
<property name="size" /> <property name="pos"></property>
<property name="subclass" /> <property name="resize">Resizable</property>
<property name="tooltip" /> <property name="show">1</property>
<property name="validator_data_type" /> <property name="size"></property>
<property name="validator_style">wxFILTER_NONE</property> <property name="subclass"></property>
<property name="validator_type">wxDefaultValidator</property> <property name="toolbar_pane">0</property>
<property name="validator_variable" /> <property name="tooltip"></property>
<property name="window_extra_style" /> <property name="window_extra_style"></property>
<property name="window_name" /> <property name="window_name"></property>
<property name="window_style" /> <property name="window_style"></property>
<event name="OnChar" /> <event name="OnChar"></event>
<event name="OnEnterWindow" /> <event name="OnEnterWindow"></event>
<event name="OnEraseBackground" /> <event name="OnEraseBackground"></event>
<event name="OnKeyDown" /> <event name="OnKeyDown"></event>
<event name="OnKeyUp" /> <event name="OnKeyUp"></event>
<event name="OnKillFocus" /> <event name="OnKillFocus"></event>
<event name="OnLeaveWindow" /> <event name="OnLeaveWindow"></event>
<event name="OnLeftDClick" /> <event name="OnLeftDClick"></event>
<event name="OnLeftDown" /> <event name="OnLeftDown"></event>
<event name="OnLeftUp" /> <event name="OnLeftUp"></event>
<event name="OnMiddleDClick" /> <event name="OnMiddleDClick"></event>
<event name="OnMiddleDown" /> <event name="OnMiddleDown"></event>
<event name="OnMiddleUp" /> <event name="OnMiddleUp"></event>
<event name="OnMotion" /> <event name="OnMotion"></event>
<event name="OnMouseEvents" /> <event name="OnMouseEvents"></event>
<event name="OnMouseWheel" /> <event name="OnMouseWheel"></event>
<event name="OnPaint" /> <event name="OnPaint"></event>
<event name="OnRightDClick" /> <event name="OnRightDClick"></event>
<event name="OnRightDown" /> <event name="OnRightDown"></event>
<event name="OnRightUp" /> <event name="OnRightUp"></event>
<event name="OnSetFocus" /> <event name="OnSetFocus"></event>
<event name="OnSize" /> <event name="OnSize"></event>
<event name="OnUpdateUI" /> <event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="0">
...@@ -162,7 +198,7 @@ ...@@ -162,7 +198,7 @@
<property name="flag">wxEXPAND</property> <property name="flag">wxEXPAND</property>
<property name="proportion">10</property> <property name="proportion">10</property>
<object class="wxBoxSizer" expanded="0"> <object class="wxBoxSizer" expanded="0">
<property name="minimum_size" /> <property name="minimum_size"></property>
<property name="name">b_apptitleSizer</property> <property name="name">b_apptitleSizer</property>
<property name="orient">wxVERTICAL</property> <property name="orient">wxVERTICAL</property>
<property name="permission">none</property> <property name="permission">none</property>
...@@ -171,55 +207,82 @@ ...@@ -171,55 +207,82 @@
<property name="flag">wxALIGN_CENTER|wxALL</property> <property name="flag">wxALIGN_CENTER|wxALL</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxStaticText" expanded="0"> <object class="wxStaticText" expanded="0">
<property name="bg" /> <property name="BottomDockable">1</property>
<property name="context_help" /> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property> <property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property> <property name="enabled">1</property>
<property name="fg" /> <property name="fg"></property>
<property name="floatable">1</property>
<property name="font">,90,92,14,70,0</property> <property name="font">,90,92,14,70,0</property>
<property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">App Title</property> <property name="label">App Title</property>
<property name="maximum_size" /> <property name="max_size"></property>
<property name="minimum_size" /> <property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_staticTextAppTitle</property> <property name="name">m_staticTextAppTitle</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property> <property name="permission">protected</property>
<property name="pos" /> <property name="pin_button">1</property>
<property name="size" /> <property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxALIGN_CENTRE</property> <property name="style">wxALIGN_CENTRE</property>
<property name="subclass" /> <property name="subclass"></property>
<property name="tooltip" /> <property name="toolbar_pane">0</property>
<property name="validator_data_type" /> <property name="tooltip"></property>
<property name="validator_style">wxFILTER_NONE</property> <property name="window_extra_style"></property>
<property name="validator_type">wxDefaultValidator</property> <property name="window_name"></property>
<property name="validator_variable" /> <property name="window_style"></property>
<property name="window_extra_style" />
<property name="window_name" />
<property name="window_style" />
<property name="wrap">-1</property> <property name="wrap">-1</property>
<event name="OnChar" /> <event name="OnChar"></event>
<event name="OnEnterWindow" /> <event name="OnEnterWindow"></event>
<event name="OnEraseBackground" /> <event name="OnEraseBackground"></event>
<event name="OnKeyDown" /> <event name="OnKeyDown"></event>
<event name="OnKeyUp" /> <event name="OnKeyUp"></event>
<event name="OnKillFocus" /> <event name="OnKillFocus"></event>
<event name="OnLeaveWindow" /> <event name="OnLeaveWindow"></event>
<event name="OnLeftDClick" /> <event name="OnLeftDClick"></event>
<event name="OnLeftDown" /> <event name="OnLeftDown"></event>
<event name="OnLeftUp" /> <event name="OnLeftUp"></event>
<event name="OnMiddleDClick" /> <event name="OnMiddleDClick"></event>
<event name="OnMiddleDown" /> <event name="OnMiddleDown"></event>
<event name="OnMiddleUp" /> <event name="OnMiddleUp"></event>
<event name="OnMotion" /> <event name="OnMotion"></event>
<event name="OnMouseEvents" /> <event name="OnMouseEvents"></event>
<event name="OnMouseWheel" /> <event name="OnMouseWheel"></event>
<event name="OnPaint" /> <event name="OnPaint"></event>
<event name="OnRightDClick" /> <event name="OnRightDClick"></event>
<event name="OnRightDown" /> <event name="OnRightDown"></event>
<event name="OnRightUp" /> <event name="OnRightUp"></event>
<event name="OnSetFocus" /> <event name="OnSetFocus"></event>
<event name="OnSize" /> <event name="OnSize"></event>
<event name="OnUpdateUI" /> <event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="0">
...@@ -227,55 +290,82 @@ ...@@ -227,55 +290,82 @@
<property name="flag">wxALIGN_CENTER|wxALL</property> <property name="flag">wxALIGN_CENTER|wxALL</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxStaticText" expanded="0"> <object class="wxStaticText" expanded="0">
<property name="bg" /> <property name="BottomDockable">1</property>
<property name="context_help" /> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property> <property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property> <property name="enabled">1</property>
<property name="fg" /> <property name="fg"></property>
<property name="font" /> <property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Copyright Info</property> <property name="label">Copyright Info</property>
<property name="maximum_size" /> <property name="max_size"></property>
<property name="minimum_size" /> <property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_staticTextCopyright</property> <property name="name">m_staticTextCopyright</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property> <property name="permission">protected</property>
<property name="pos" /> <property name="pin_button">1</property>
<property name="size" /> <property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxALIGN_CENTRE</property> <property name="style">wxALIGN_CENTRE</property>
<property name="subclass" /> <property name="subclass"></property>
<property name="tooltip" /> <property name="toolbar_pane">0</property>
<property name="validator_data_type" /> <property name="tooltip"></property>
<property name="validator_style">wxFILTER_NONE</property> <property name="window_extra_style"></property>
<property name="validator_type">wxDefaultValidator</property> <property name="window_name"></property>
<property name="validator_variable" /> <property name="window_style"></property>
<property name="window_extra_style" />
<property name="window_name" />
<property name="window_style" />
<property name="wrap">-1</property> <property name="wrap">-1</property>
<event name="OnChar" /> <event name="OnChar"></event>
<event name="OnEnterWindow" /> <event name="OnEnterWindow"></event>
<event name="OnEraseBackground" /> <event name="OnEraseBackground"></event>
<event name="OnKeyDown" /> <event name="OnKeyDown"></event>
<event name="OnKeyUp" /> <event name="OnKeyUp"></event>
<event name="OnKillFocus" /> <event name="OnKillFocus"></event>
<event name="OnLeaveWindow" /> <event name="OnLeaveWindow"></event>
<event name="OnLeftDClick" /> <event name="OnLeftDClick"></event>
<event name="OnLeftDown" /> <event name="OnLeftDown"></event>
<event name="OnLeftUp" /> <event name="OnLeftUp"></event>
<event name="OnMiddleDClick" /> <event name="OnMiddleDClick"></event>
<event name="OnMiddleDown" /> <event name="OnMiddleDown"></event>
<event name="OnMiddleUp" /> <event name="OnMiddleUp"></event>
<event name="OnMotion" /> <event name="OnMotion"></event>
<event name="OnMouseEvents" /> <event name="OnMouseEvents"></event>
<event name="OnMouseWheel" /> <event name="OnMouseWheel"></event>
<event name="OnPaint" /> <event name="OnPaint"></event>
<event name="OnRightDClick" /> <event name="OnRightDClick"></event>
<event name="OnRightDown" /> <event name="OnRightDown"></event>
<event name="OnRightUp" /> <event name="OnRightUp"></event>
<event name="OnSetFocus" /> <event name="OnSetFocus"></event>
<event name="OnSize" /> <event name="OnSize"></event>
<event name="OnUpdateUI" /> <event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="0">
...@@ -283,55 +373,82 @@ ...@@ -283,55 +373,82 @@
<property name="flag">wxALIGN_CENTER|wxLEFT|wxRIGHT|wxTOP</property> <property name="flag">wxALIGN_CENTER|wxLEFT|wxRIGHT|wxTOP</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxStaticText" expanded="0"> <object class="wxStaticText" expanded="0">
<property name="bg" /> <property name="BottomDockable">1</property>
<property name="context_help" /> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property> <property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property> <property name="enabled">1</property>
<property name="fg" /> <property name="fg"></property>
<property name="font" /> <property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Build Version Info</property> <property name="label">Build Version Info</property>
<property name="maximum_size" /> <property name="max_size"></property>
<property name="minimum_size" /> <property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_staticTextBuildVersion</property> <property name="name">m_staticTextBuildVersion</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property> <property name="permission">protected</property>
<property name="pos" /> <property name="pin_button">1</property>
<property name="size" /> <property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxALIGN_CENTRE</property> <property name="style">wxALIGN_CENTRE</property>
<property name="subclass" /> <property name="subclass"></property>
<property name="tooltip" /> <property name="toolbar_pane">0</property>
<property name="validator_data_type" /> <property name="tooltip"></property>
<property name="validator_style">wxFILTER_NONE</property> <property name="window_extra_style"></property>
<property name="validator_type">wxDefaultValidator</property> <property name="window_name"></property>
<property name="validator_variable" /> <property name="window_style"></property>
<property name="window_extra_style" />
<property name="window_name" />
<property name="window_style" />
<property name="wrap">-1</property> <property name="wrap">-1</property>
<event name="OnChar" /> <event name="OnChar"></event>
<event name="OnEnterWindow" /> <event name="OnEnterWindow"></event>
<event name="OnEraseBackground" /> <event name="OnEraseBackground"></event>
<event name="OnKeyDown" /> <event name="OnKeyDown"></event>
<event name="OnKeyUp" /> <event name="OnKeyUp"></event>
<event name="OnKillFocus" /> <event name="OnKillFocus"></event>
<event name="OnLeaveWindow" /> <event name="OnLeaveWindow"></event>
<event name="OnLeftDClick" /> <event name="OnLeftDClick"></event>
<event name="OnLeftDown" /> <event name="OnLeftDown"></event>
<event name="OnLeftUp" /> <event name="OnLeftUp"></event>
<event name="OnMiddleDClick" /> <event name="OnMiddleDClick"></event>
<event name="OnMiddleDown" /> <event name="OnMiddleDown"></event>
<event name="OnMiddleUp" /> <event name="OnMiddleUp"></event>
<event name="OnMotion" /> <event name="OnMotion"></event>
<event name="OnMouseEvents" /> <event name="OnMouseEvents"></event>
<event name="OnMouseWheel" /> <event name="OnMouseWheel"></event>
<event name="OnPaint" /> <event name="OnPaint"></event>
<event name="OnRightDClick" /> <event name="OnRightDClick"></event>
<event name="OnRightDown" /> <event name="OnRightDown"></event>
<event name="OnRightUp" /> <event name="OnRightUp"></event>
<event name="OnSetFocus" /> <event name="OnSetFocus"></event>
<event name="OnSize" /> <event name="OnSize"></event>
<event name="OnUpdateUI" /> <event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="0">
...@@ -339,55 +456,82 @@ ...@@ -339,55 +456,82 @@
<property name="flag">wxALIGN_CENTER|wxBOTTOM|wxLEFT|wxRIGHT</property> <property name="flag">wxALIGN_CENTER|wxBOTTOM|wxLEFT|wxRIGHT</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxStaticText" expanded="0"> <object class="wxStaticText" expanded="0">
<property name="bg" /> <property name="BottomDockable">1</property>
<property name="context_help" /> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property> <property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property> <property name="enabled">1</property>
<property name="fg" /> <property name="fg"></property>
<property name="font" /> <property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="label">Lib Version Info</property> <property name="label">Lib Version Info</property>
<property name="maximum_size" /> <property name="max_size"></property>
<property name="minimum_size" /> <property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_staticTextLibVersion</property> <property name="name">m_staticTextLibVersion</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property> <property name="permission">protected</property>
<property name="pos" /> <property name="pin_button">1</property>
<property name="size" /> <property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxALIGN_CENTRE</property> <property name="style">wxALIGN_CENTRE</property>
<property name="subclass" /> <property name="subclass"></property>
<property name="tooltip" /> <property name="toolbar_pane">0</property>
<property name="validator_data_type" /> <property name="tooltip"></property>
<property name="validator_style">wxFILTER_NONE</property> <property name="window_extra_style"></property>
<property name="validator_type">wxDefaultValidator</property> <property name="window_name"></property>
<property name="validator_variable" /> <property name="window_style"></property>
<property name="window_extra_style" />
<property name="window_name" />
<property name="window_style" />
<property name="wrap">-1</property> <property name="wrap">-1</property>
<event name="OnChar" /> <event name="OnChar"></event>
<event name="OnEnterWindow" /> <event name="OnEnterWindow"></event>
<event name="OnEraseBackground" /> <event name="OnEraseBackground"></event>
<event name="OnKeyDown" /> <event name="OnKeyDown"></event>
<event name="OnKeyUp" /> <event name="OnKeyUp"></event>
<event name="OnKillFocus" /> <event name="OnKillFocus"></event>
<event name="OnLeaveWindow" /> <event name="OnLeaveWindow"></event>
<event name="OnLeftDClick" /> <event name="OnLeftDClick"></event>
<event name="OnLeftDown" /> <event name="OnLeftDown"></event>
<event name="OnLeftUp" /> <event name="OnLeftUp"></event>
<event name="OnMiddleDClick" /> <event name="OnMiddleDClick"></event>
<event name="OnMiddleDown" /> <event name="OnMiddleDown"></event>
<event name="OnMiddleUp" /> <event name="OnMiddleUp"></event>
<event name="OnMotion" /> <event name="OnMotion"></event>
<event name="OnMouseEvents" /> <event name="OnMouseEvents"></event>
<event name="OnMouseWheel" /> <event name="OnMouseWheel"></event>
<event name="OnPaint" /> <event name="OnPaint"></event>
<event name="OnRightDClick" /> <event name="OnRightDClick"></event>
<event name="OnRightDown" /> <event name="OnRightDown"></event>
<event name="OnRightUp" /> <event name="OnRightUp"></event>
<event name="OnSetFocus" /> <event name="OnSetFocus"></event>
<event name="OnSize" /> <event name="OnSize"></event>
<event name="OnUpdateUI" /> <event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
</object> </object>
...@@ -409,53 +553,80 @@ ...@@ -409,53 +553,80 @@
<property name="flag">wxEXPAND | wxALL</property> <property name="flag">wxEXPAND | wxALL</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxStaticLine" expanded="0"> <object class="wxStaticLine" expanded="0">
<property name="bg" /> <property name="BottomDockable">1</property>
<property name="context_help" /> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property> <property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property> <property name="enabled">1</property>
<property name="fg" /> <property name="fg"></property>
<property name="font" /> <property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="maximum_size" /> <property name="max_size"></property>
<property name="minimum_size" /> <property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_staticline1</property> <property name="name">m_staticline1</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">none</property> <property name="permission">none</property>
<property name="pos" /> <property name="pin_button">1</property>
<property name="size" /> <property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxLI_HORIZONTAL</property> <property name="style">wxLI_HORIZONTAL</property>
<property name="subclass" /> <property name="subclass"></property>
<property name="tooltip" /> <property name="toolbar_pane">0</property>
<property name="validator_data_type" /> <property name="tooltip"></property>
<property name="validator_style">wxFILTER_NONE</property> <property name="window_extra_style"></property>
<property name="validator_type">wxDefaultValidator</property> <property name="window_name"></property>
<property name="validator_variable" /> <property name="window_style"></property>
<property name="window_extra_style" /> <event name="OnChar"></event>
<property name="window_name" /> <event name="OnEnterWindow"></event>
<property name="window_style" /> <event name="OnEraseBackground"></event>
<event name="OnChar" /> <event name="OnKeyDown"></event>
<event name="OnEnterWindow" /> <event name="OnKeyUp"></event>
<event name="OnEraseBackground" /> <event name="OnKillFocus"></event>
<event name="OnKeyDown" /> <event name="OnLeaveWindow"></event>
<event name="OnKeyUp" /> <event name="OnLeftDClick"></event>
<event name="OnKillFocus" /> <event name="OnLeftDown"></event>
<event name="OnLeaveWindow" /> <event name="OnLeftUp"></event>
<event name="OnLeftDClick" /> <event name="OnMiddleDClick"></event>
<event name="OnLeftDown" /> <event name="OnMiddleDown"></event>
<event name="OnLeftUp" /> <event name="OnMiddleUp"></event>
<event name="OnMiddleDClick" /> <event name="OnMotion"></event>
<event name="OnMiddleDown" /> <event name="OnMouseEvents"></event>
<event name="OnMiddleUp" /> <event name="OnMouseWheel"></event>
<event name="OnMotion" /> <event name="OnPaint"></event>
<event name="OnMouseEvents" /> <event name="OnRightDClick"></event>
<event name="OnMouseWheel" /> <event name="OnRightDown"></event>
<event name="OnPaint" /> <event name="OnRightUp"></event>
<event name="OnRightDClick" /> <event name="OnSetFocus"></event>
<event name="OnRightDown" /> <event name="OnSize"></event>
<event name="OnRightUp" /> <event name="OnUpdateUI"></event>
<event name="OnSetFocus" />
<event name="OnSize" />
<event name="OnUpdateUI" />
</object> </object>
</object> </object>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="0">
...@@ -463,63 +634,90 @@ ...@@ -463,63 +634,90 @@
<property name="flag">wxEXPAND | wxALL</property> <property name="flag">wxEXPAND | wxALL</property>
<property name="proportion">2</property> <property name="proportion">2</property>
<object class="wxAuiNotebook" expanded="0"> <object class="wxAuiNotebook" expanded="0">
<property name="bg" /> <property name="BottomDockable">1</property>
<property name="context_help" /> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property> <property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property> <property name="enabled">1</property>
<property name="fg" /> <property name="fg"></property>
<property name="font" /> <property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_ANY</property> <property name="id">wxID_ANY</property>
<property name="maximum_size" /> <property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size">750,350</property> <property name="minimum_size">750,350</property>
<property name="moveable">1</property>
<property name="name">m_auiNotebook</property> <property name="name">m_auiNotebook</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property> <property name="permission">protected</property>
<property name="pos" /> <property name="pin_button">1</property>
<property name="size" /> <property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxAUI_NB_SCROLL_BUTTONS|wxAUI_NB_TAB_FIXED_WIDTH</property> <property name="style">wxAUI_NB_SCROLL_BUTTONS|wxAUI_NB_TAB_FIXED_WIDTH</property>
<property name="subclass" /> <property name="subclass"></property>
<property name="tab_ctrl_height">-1</property> <property name="tab_ctrl_height">-1</property>
<property name="tooltip" /> <property name="toolbar_pane">0</property>
<property name="uniform_bitmap_size" /> <property name="tooltip"></property>
<property name="validator_data_type" /> <property name="uniform_bitmap_size"></property>
<property name="validator_style">wxFILTER_NONE</property> <property name="window_extra_style"></property>
<property name="validator_type">wxDefaultValidator</property> <property name="window_name"></property>
<property name="validator_variable" /> <property name="window_style"></property>
<property name="window_extra_style" /> <event name="OnAuiNotebookAllowDND"></event>
<property name="window_name" /> <event name="OnAuiNotebookBeginDrag"></event>
<property name="window_style" /> <event name="OnAuiNotebookButton"></event>
<event name="OnAuiNotebookAllowDND" /> <event name="OnAuiNotebookDragMotion"></event>
<event name="OnAuiNotebookBeginDrag" /> <event name="OnAuiNotebookEndDrag"></event>
<event name="OnAuiNotebookButton" /> <event name="OnAuiNotebookPageChanged"></event>
<event name="OnAuiNotebookDragMotion" /> <event name="OnAuiNotebookPageChanging"></event>
<event name="OnAuiNotebookEndDrag" /> <event name="OnAuiNotebookPageClose"></event>
<event name="OnAuiNotebookPageChanged" /> <event name="OnChar"></event>
<event name="OnAuiNotebookPageChanging" /> <event name="OnEnterWindow"></event>
<event name="OnAuiNotebookPageClose" /> <event name="OnEraseBackground"></event>
<event name="OnChar" /> <event name="OnKeyDown"></event>
<event name="OnEnterWindow" /> <event name="OnKeyUp"></event>
<event name="OnEraseBackground" /> <event name="OnKillFocus"></event>
<event name="OnKeyDown" /> <event name="OnLeaveWindow"></event>
<event name="OnKeyUp" /> <event name="OnLeftDClick"></event>
<event name="OnKillFocus" /> <event name="OnLeftDown"></event>
<event name="OnLeaveWindow" /> <event name="OnLeftUp"></event>
<event name="OnLeftDClick" /> <event name="OnMiddleDClick"></event>
<event name="OnLeftDown" /> <event name="OnMiddleDown"></event>
<event name="OnLeftUp" /> <event name="OnMiddleUp"></event>
<event name="OnMiddleDClick" /> <event name="OnMotion"></event>
<event name="OnMiddleDown" /> <event name="OnMouseEvents"></event>
<event name="OnMiddleUp" /> <event name="OnMouseWheel"></event>
<event name="OnMotion" /> <event name="OnPaint"></event>
<event name="OnMouseEvents" /> <event name="OnRightDClick"></event>
<event name="OnMouseWheel" /> <event name="OnRightDown"></event>
<event name="OnPaint" /> <event name="OnRightUp"></event>
<event name="OnRightDClick" /> <event name="OnSetFocus"></event>
<event name="OnRightDown" /> <event name="OnSize"></event>
<event name="OnRightUp" /> <event name="OnUpdateUI"></event>
<event name="OnSetFocus" />
<event name="OnSize" />
<event name="OnUpdateUI" />
</object> </object>
</object> </object>
<object class="sizeritem" expanded="0"> <object class="sizeritem" expanded="0">
...@@ -527,56 +725,87 @@ ...@@ -527,56 +725,87 @@
<property name="flag">wxALIGN_CENTER|wxALL</property> <property name="flag">wxALIGN_CENTER|wxALL</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxButton" expanded="0"> <object class="wxButton" expanded="0">
<property name="bg" /> <property name="BottomDockable">1</property>
<property name="context_help" /> <property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property> <property name="context_menu">1</property>
<property name="default">1</property> <property name="default">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property> <property name="enabled">1</property>
<property name="fg" /> <property name="fg"></property>
<property name="font" /> <property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_CANCEL</property> <property name="id">wxID_CANCEL</property>
<property name="label">OK</property> <property name="label">OK</property>
<property name="maximum_size" /> <property name="max_size"></property>
<property name="minimum_size" /> <property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_buttonOK</property> <property name="name">m_buttonOK</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">private</property> <property name="permission">private</property>
<property name="pos" /> <property name="pin_button">1</property>
<property name="size" /> <property name="pos"></property>
<property name="style" /> <property name="resize">Resizable</property>
<property name="subclass" /> <property name="show">1</property>
<property name="tooltip" /> <property name="size"></property>
<property name="validator_data_type" /> <property name="style"></property>
<property name="subclass"></property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property> <property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property> <property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable" /> <property name="validator_variable"></property>
<property name="window_extra_style" /> <property name="window_extra_style"></property>
<property name="window_name" /> <property name="window_name"></property>
<property name="window_style" /> <property name="window_style"></property>
<event name="OnButtonClick">OnOkClick</event> <event name="OnButtonClick">OnOkClick</event>
<event name="OnChar" /> <event name="OnChar"></event>
<event name="OnEnterWindow" /> <event name="OnEnterWindow"></event>
<event name="OnEraseBackground" /> <event name="OnEraseBackground"></event>
<event name="OnKeyDown" /> <event name="OnKeyDown"></event>
<event name="OnKeyUp" /> <event name="OnKeyUp"></event>
<event name="OnKillFocus" /> <event name="OnKillFocus"></event>
<event name="OnLeaveWindow" /> <event name="OnLeaveWindow"></event>
<event name="OnLeftDClick" /> <event name="OnLeftDClick"></event>
<event name="OnLeftDown" /> <event name="OnLeftDown"></event>
<event name="OnLeftUp" /> <event name="OnLeftUp"></event>
<event name="OnMiddleDClick" /> <event name="OnMiddleDClick"></event>
<event name="OnMiddleDown" /> <event name="OnMiddleDown"></event>
<event name="OnMiddleUp" /> <event name="OnMiddleUp"></event>
<event name="OnMotion" /> <event name="OnMotion"></event>
<event name="OnMouseEvents" /> <event name="OnMouseEvents"></event>
<event name="OnMouseWheel" /> <event name="OnMouseWheel"></event>
<event name="OnPaint" /> <event name="OnPaint"></event>
<event name="OnRightDClick" /> <event name="OnRightDClick"></event>
<event name="OnRightDown" /> <event name="OnRightDown"></event>
<event name="OnRightUp" /> <event name="OnRightUp"></event>
<event name="OnSetFocus" /> <event name="OnSetFocus"></event>
<event name="OnSize" /> <event name="OnSize"></event>
<event name="OnUpdateUI" /> <event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
</object> </object>
......
common/dialog_about/dialog_about_base.h
View file @ 9c1f6b73
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Sep 8 2010) // C++ code generated with wxFormBuilder (version Nov 6 2013)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#ifndef __dialog_about_base__ #ifndef __DIALOG_ABOUT_BASE_H__
#define __dialog_about_base__ #define __DIALOG_ABOUT_BASE_H__
#include <wx/artprov.h>
#include <wx/xrc/xmlres.h>
#include <wx/intl.h> #include <wx/intl.h>
#include <wx/bitmap.h> #include <wx/bitmap.h>
#include <wx/image.h> #include <wx/image.h>
#include <wx/icon.h> #include <wx/icon.h>
...@@ -37,13 +38,11 @@ class dialog_about_base : public wxDialog ...@@ -37,13 +38,11 @@ class dialog_about_base : public wxDialog
wxButton* m_buttonOK; wxButton* m_buttonOK;
protected: protected:
wxStaticBitmap* m_bitmapApp; wxStaticBitmap* m_bitmapApp;
wxStaticText* m_staticTextAppTitle; wxStaticText* m_staticTextAppTitle;
wxStaticText* m_staticTextCopyright; wxStaticText* m_staticTextCopyright;
wxStaticText* m_staticTextBuildVersion; wxStaticText* m_staticTextBuildVersion;
wxStaticText* m_staticTextLibVersion; wxStaticText* m_staticTextLibVersion;
wxAuiNotebook* m_auiNotebook; wxAuiNotebook* m_auiNotebook;
// Virtual event handlers, overide them in your derived class // Virtual event handlers, overide them in your derived class
...@@ -53,9 +52,9 @@ class dialog_about_base : public wxDialog ...@@ -53,9 +52,9 @@ class dialog_about_base : public wxDialog
public: public:
dialog_about_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About..."), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 750,350 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSTAY_ON_TOP ); dialog_about_base( wxWindow* parent, wxWindowID id = wxID_ANY, const wxString& title = _("About..."), const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 750,450 ), long style = wxDEFAULT_DIALOG_STYLE|wxRESIZE_BORDER|wxSTAY_ON_TOP );
~dialog_about_base(); ~dialog_about_base();
}; };
#endif //__dialog_about_base__ #endif //__DIALOG_ABOUT_BASE_H__
pcbnew/class_netinfo.h
View file @ 9c1f6b73
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2009 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com * Copyright (C) 2009 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 1992-2012 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2012 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
...@@ -234,7 +234,7 @@ private: ...@@ -234,7 +234,7 @@ private:
/** /**
* Class NETINFO * Class NETINFO_LIST
* is a container class for NETINFO_ITEM elements, which are the nets. That makes * is a container class for NETINFO_ITEM elements, which are the nets. That makes
* this class a container for the nets. * this class a container for the nets.
*/ */
......
pcbnew/class_netinfolist.cpp
View file @ 9c1f6b73
/* /*
* This program source code file is part of KiCad, a free EDA CAD application. * This program source code file is part of KiCad, a free EDA CAD application.
* *
* Copyright (C) 2009 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com * Copyright (C) 1992-2014 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 1992-2012 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
......
pcbnew/class_pad_draw_functions.cpp
View file @ 9c1f6b73
...@@ -499,10 +499,10 @@ void D_PAD::DrawShape( EDA_RECT* aClipBox, wxDC* aDC, PAD_DRAWINFO& aDrawInfo ) ...@@ -499,10 +499,10 @@ void D_PAD::DrawShape( EDA_RECT* aClipBox, wxDC* aDC, PAD_DRAWINFO& aDrawInfo )
wxPoint tpos0 = shape_pos; // Position of the centre of text wxPoint tpos0 = shape_pos; // Position of the centre of text
wxPoint tpos = tpos0; wxPoint tpos = tpos0;
wxSize AreaSize; // size of text area, normalized to AreaSize.y < AreaSize.x wxSize AreaSize; // size of text area, normalized to AreaSize.y < AreaSize.x
int shortname_len = GetShortNetname().Len(); int shortname_len = 0;
if( !aDrawInfo.m_Display_netname ) if( aDrawInfo.m_Display_netname )
shortname_len = 0; shortname_len = GetShortNetname().Len();
if( GetShape() == PAD_CIRCLE ) if( GetShape() == PAD_CIRCLE )
angle = 0; angle = 0;
......
pcbnew/dialogs/dialog_pad_properties.cpp
View file @ 9c1f6b73
...@@ -97,11 +97,17 @@ private: ...@@ -97,11 +97,17 @@ private:
PCB_BASE_FRAME* m_parent; PCB_BASE_FRAME* m_parent;
D_PAD* m_currentPad; // pad currently being edited D_PAD* m_currentPad; // pad currently being edited
D_PAD* m_dummyPad; // a working copy used to show changes D_PAD* m_dummyPad; // a working copy used to show changes
BOARD* m_board; D_PAD* m_padMaster; // The pad used to create new pads in board or
D_PAD& m_padMaster; // footprint editor
BOARD* m_board; // the main board: this is the board handled by
// the PCB editor, if running or the dummy
// board used by the footprint editor
// (could happen when the Footprint editor will be run
// alone, outside the board editor
bool m_isFlipped; // true if the parent footprint (therefore pads) is flipped (mirrored) bool m_isFlipped; // true if the parent footprint (therefore pads) is flipped (mirrored)
// in this case, some Y coordinates values must be negated // in this case, some Y coordinates values must be negated
bool m_canUpdate; bool m_canUpdate;
bool m_canEditNetName; // true only if the called is the board editor
private: private:
void initValues(); void initValues();
...@@ -139,25 +145,31 @@ private: ...@@ -139,25 +145,31 @@ private:
void PadPropertiesAccept( wxCommandEvent& event ); void PadPropertiesAccept( wxCommandEvent& event );
}; };
void PCB_BASE_FRAME::InstallPadOptionsFrame( D_PAD* aPad )
{
DIALOG_PAD_PROPERTIES dlg( this, aPad );
dlg.ShowModal();
}
DIALOG_PAD_PROPERTIES::DIALOG_PAD_PROPERTIES( PCB_BASE_FRAME* aParent, D_PAD* aPad ) : DIALOG_PAD_PROPERTIES::DIALOG_PAD_PROPERTIES( PCB_BASE_FRAME* aParent, D_PAD* aPad ) :
DIALOG_PAD_PROPERTIES_BASE( aParent ), DIALOG_PAD_PROPERTIES_BASE( aParent )
// use aParent's parent, which is the original BOARD, not the dummy module editor BOARD,
// since FOOTPRINT_EDIT_FRAME::GetDesignSettings() is tricked out to use the PCB_EDIT_FRAME's
// BOARD, not its own BOARD.
m_padMaster( aParent->GetDesignSettings().m_Pad_Master )
{ {
m_canUpdate = false; m_canUpdate = false;
m_parent = aParent; m_parent = aParent;
m_currentPad = aPad; // aPad can be NULL, if the dialog is called m_currentPad = aPad; // aPad can be NULL, if the dialog is called
// from the module editor to set default pad characteristics // from the module editor to set default pad characteristics
m_board = m_parent->GetBoard(); m_board = m_parent->GetBoard();
m_padMaster = &m_parent->GetDesignSettings().m_Pad_Master;
m_dummyPad = new D_PAD( (MODULE*) NULL ); m_dummyPad = new D_PAD( (MODULE*) NULL );
if( aPad ) if( aPad )
m_dummyPad->Copy( aPad ); m_dummyPad->Copy( aPad );
else else // We are editing a "master" pad, i.e. a pad used to create new pads
m_dummyPad->Copy( &m_padMaster ); m_dummyPad->Copy( m_padMaster );
initValues(); initValues();
...@@ -238,19 +250,16 @@ void DIALOG_PAD_PROPERTIES::OnPaintShowPanel( wxPaintEvent& event ) ...@@ -238,19 +250,16 @@ void DIALOG_PAD_PROPERTIES::OnPaintShowPanel( wxPaintEvent& event )
} }
void PCB_BASE_FRAME::InstallPadOptionsFrame( D_PAD* aPad )
{
DIALOG_PAD_PROPERTIES dlg( this, aPad );
dlg.ShowModal();
}
void DIALOG_PAD_PROPERTIES::initValues() void DIALOG_PAD_PROPERTIES::initValues()
{ {
wxString msg; wxString msg;
double angle; double angle;
// Disable pad net name wxTextCtrl if the caller is the footprint editor
// because nets are living only in the board managed by the board editor
m_canEditNetName = m_parent->IsType( FRAME_PCB );
// Setup layers names from board // Setup layers names from board
// Should be made first, before calling m_rbCopperLayersSel->SetSelection() // Should be made first, before calling m_rbCopperLayersSel->SetSelection()
m_rbCopperLayersSel->SetString( 0, m_board->GetLayerName( LAYER_N_FRONT ) ); m_rbCopperLayersSel->SetString( 0, m_board->GetLayerName( LAYER_N_FRONT ) );
...@@ -471,7 +480,7 @@ void DIALOG_PAD_PROPERTIES::initValues() ...@@ -471,7 +480,7 @@ void DIALOG_PAD_PROPERTIES::initValues()
bool enable = m_dummyPad->GetAttribute() != PAD_HOLE_NOT_PLATED; bool enable = m_dummyPad->GetAttribute() != PAD_HOLE_NOT_PLATED;
m_PadNumCtrl->Enable( enable ); m_PadNumCtrl->Enable( enable );
m_PadNetNameCtrl->Enable( enable ); m_PadNetNameCtrl->Enable( m_canEditNetName && enable && m_currentPad != NULL );
m_LengthPadToDieCtrl->Enable( enable ); m_LengthPadToDieCtrl->Enable( enable );
if( m_dummyPad->GetDrillShape() != PAD_DRILL_OBLONG ) if( m_dummyPad->GetDrillShape() != PAD_DRILL_OBLONG )
...@@ -614,7 +623,7 @@ void DIALOG_PAD_PROPERTIES::PadTypeSelected( wxCommandEvent& event ) ...@@ -614,7 +623,7 @@ void DIALOG_PAD_PROPERTIES::PadTypeSelected( wxCommandEvent& event )
// (disable for NPTH pads (mechanical pads) // (disable for NPTH pads (mechanical pads)
bool enable = ii != 3; bool enable = ii != 3;
m_PadNumCtrl->Enable( enable ); m_PadNumCtrl->Enable( enable );
m_PadNetNameCtrl->Enable( enable ); m_PadNetNameCtrl->Enable( m_canEditNetName && enable && m_currentPad != NULL );
m_LengthPadToDieCtrl->Enable( enable ); m_LengthPadToDieCtrl->Enable( enable );
} }
...@@ -752,7 +761,9 @@ void DIALOG_PAD_PROPERTIES::PadPropertiesAccept( wxCommandEvent& event ) ...@@ -752,7 +761,9 @@ void DIALOG_PAD_PROPERTIES::PadPropertiesAccept( wxCommandEvent& event )
bool rastnestIsChanged = false; bool rastnestIsChanged = false;
int isign = m_isFlipped ? -1 : 1; int isign = m_isFlipped ? -1 : 1;
transferDataToPad( &m_padMaster ); transferDataToPad( m_padMaster );
// m_padMaster is a pattern: ensure there is no net for this pad:
m_padMaster->SetNetCode( NETINFO_LIST::UNCONNECTED );
if( m_currentPad ) // Set current Pad parameters if( m_currentPad ) // Set current Pad parameters
{ {
...@@ -768,12 +779,12 @@ void DIALOG_PAD_PROPERTIES::PadPropertiesAccept( wxCommandEvent& event ) ...@@ -768,12 +779,12 @@ void DIALOG_PAD_PROPERTIES::PadPropertiesAccept( wxCommandEvent& event )
m_currentPad->ClearFlags( DO_NOT_DRAW ); m_currentPad->ClearFlags( DO_NOT_DRAW );
// Update values // Update values
m_currentPad->SetShape( m_padMaster.GetShape() ); m_currentPad->SetShape( m_padMaster->GetShape() );
m_currentPad->SetAttribute( m_padMaster.GetAttribute() ); m_currentPad->SetAttribute( m_padMaster->GetAttribute() );
if( m_currentPad->GetPosition() != m_padMaster.GetPosition() ) if( m_currentPad->GetPosition() != m_padMaster->GetPosition() )
{ {
m_currentPad->SetPosition( m_padMaster.GetPosition() ); m_currentPad->SetPosition( m_padMaster->GetPosition() );
rastnestIsChanged = true; rastnestIsChanged = true;
} }
...@@ -785,54 +796,62 @@ void DIALOG_PAD_PROPERTIES::PadPropertiesAccept( wxCommandEvent& event ) ...@@ -785,54 +796,62 @@ void DIALOG_PAD_PROPERTIES::PadPropertiesAccept( wxCommandEvent& event )
m_currentPad->SetPos0( pt ); m_currentPad->SetPos0( pt );
m_currentPad->SetOrientation( m_padMaster.GetOrientation() * isign + module->GetOrientation() ); m_currentPad->SetOrientation( m_padMaster->GetOrientation() * isign + module->GetOrientation() );
m_currentPad->SetSize( m_padMaster.GetSize() ); m_currentPad->SetSize( m_padMaster->GetSize() );
size = m_padMaster.GetDelta(); size = m_padMaster->GetDelta();
size.y *= isign; size.y *= isign;
m_currentPad->SetDelta( size ); m_currentPad->SetDelta( size );
m_currentPad->SetDrillSize( m_padMaster.GetDrillSize() ); m_currentPad->SetDrillSize( m_padMaster->GetDrillSize() );
m_currentPad->SetDrillShape( m_padMaster.GetDrillShape() ); m_currentPad->SetDrillShape( m_padMaster->GetDrillShape() );
wxPoint offset = m_padMaster.GetOffset(); wxPoint offset = m_padMaster->GetOffset();
offset.y *= isign; offset.y *= isign;
m_currentPad->SetOffset( offset ); m_currentPad->SetOffset( offset );
m_currentPad->SetPadToDieLength( m_padMaster.GetPadToDieLength() ); m_currentPad->SetPadToDieLength( m_padMaster->GetPadToDieLength() );
if( m_currentPad->GetLayerMask() != m_padMaster.GetLayerMask() ) if( m_currentPad->GetLayerMask() != m_padMaster->GetLayerMask() )
{ {
rastnestIsChanged = true; rastnestIsChanged = true;
m_currentPad->SetLayerMask( m_padMaster.GetLayerMask() ); m_currentPad->SetLayerMask( m_padMaster->GetLayerMask() );
} }
if( m_isFlipped ) if( m_isFlipped )
m_currentPad->SetLayerMask( FlipLayerMask( m_currentPad->GetLayerMask() ) ); m_currentPad->SetLayerMask( FlipLayerMask( m_currentPad->GetLayerMask() ) );
m_currentPad->SetPadName( m_padMaster.GetPadName() ); m_currentPad->SetPadName( m_padMaster->GetPadName() );
wxString padNetname;
if( m_currentPad->GetNetname() != m_PadNetNameCtrl->GetValue() ) // For PAD_HOLE_NOT_PLATED, ensure there is no net name selected
if( m_padMaster->GetAttribute() != PAD_HOLE_NOT_PLATED )
padNetname = m_PadNetNameCtrl->GetValue();
if( m_currentPad->GetNetname() != padNetname )
{ {
if( !m_PadNetNameCtrl->GetValue().IsEmpty() && m_padMaster.GetNetCode() == 0 ) const NETINFO_ITEM* netinfo = m_board->FindNet( padNetname );
if( !padNetname.IsEmpty() && netinfo == NULL )
{ {
DisplayError( NULL, _( "Unknown netname, netname not changed" ) ); DisplayError( NULL, _( "Unknown netname, netname not changed" ) );
} }
else else
{ {
rastnestIsChanged = true; rastnestIsChanged = true;
m_currentPad->SetNetCode( m_padMaster.GetNetCode() ); m_currentPad->SetNetCode( netinfo->GetNet() );
} }
} }
m_currentPad->SetLocalClearance( m_padMaster.GetLocalClearance() ); m_currentPad->SetLocalClearance( m_padMaster->GetLocalClearance() );
m_currentPad->SetLocalSolderMaskMargin( m_padMaster.GetLocalSolderMaskMargin() ); m_currentPad->SetLocalSolderMaskMargin( m_padMaster->GetLocalSolderMaskMargin() );
m_currentPad->SetLocalSolderPasteMargin( m_padMaster.GetLocalSolderPasteMargin() ); m_currentPad->SetLocalSolderPasteMargin( m_padMaster->GetLocalSolderPasteMargin() );
m_currentPad->SetLocalSolderPasteMarginRatio( m_padMaster.GetLocalSolderPasteMarginRatio() ); m_currentPad->SetLocalSolderPasteMarginRatio( m_padMaster->GetLocalSolderPasteMarginRatio() );
m_currentPad->SetZoneConnection( m_padMaster.GetZoneConnection() ); m_currentPad->SetZoneConnection( m_padMaster->GetZoneConnection() );
m_currentPad->SetThermalWidth( m_padMaster.GetThermalWidth() ); m_currentPad->SetThermalWidth( m_padMaster->GetThermalWidth() );
m_currentPad->SetThermalGap( m_padMaster.GetThermalGap() ); m_currentPad->SetThermalGap( m_padMaster->GetThermalGap() );
module->CalculateBoundingBox(); module->CalculateBoundingBox();
m_parent->SetMsgPanel( m_currentPad ); m_parent->SetMsgPanel( m_currentPad );
...@@ -984,6 +1003,7 @@ bool DIALOG_PAD_PROPERTIES::transferDataToPad( D_PAD* aPad ) ...@@ -984,6 +1003,7 @@ bool DIALOG_PAD_PROPERTIES::transferDataToPad( D_PAD* aPad )
// Check if user has set an existing net name // Check if user has set an existing net name
const NETINFO_ITEM* netinfo = m_board->FindNet( m_PadNetNameCtrl->GetValue() ); const NETINFO_ITEM* netinfo = m_board->FindNet( m_PadNetNameCtrl->GetValue() );
if( netinfo != NULL ) if( netinfo != NULL )
aPad->SetNetCode( netinfo->GetNet() ); aPad->SetNetCode( netinfo->GetNet() );
else else
......
pcbnew/loadcmp.cpp
View file @ 9c1f6b73
...@@ -87,23 +87,28 @@ bool FOOTPRINT_EDIT_FRAME::Load_Module_From_BOARD( MODULE* aModule ) ...@@ -87,23 +87,28 @@ bool FOOTPRINT_EDIT_FRAME::Load_Module_From_BOARD( MODULE* aModule )
aModule = newModule; aModule = newModule;
GetBoard()->Add( aModule ); GetBoard()->Add( newModule );
aModule->ClearFlags(); newModule->ClearFlags();
GetBoard()->BuildListOfNets(); // Clear references to net info, because the footprint editor
// does know any thing about nets handled by the current edited board.
// Morever the main board can change or the net info relative to this main board
// can change while editing this footprint in the footprint editor
for( D_PAD* pad = newModule->Pads(); pad; pad = pad->Next() )
pad->SetNetCode( NETINFO_LIST::UNCONNECTED );
SetCrossHairPosition( wxPoint( 0, 0 ) ); SetCrossHairPosition( wxPoint( 0, 0 ) );
PlaceModule( aModule, NULL ); PlaceModule( newModule, NULL );
// Put it on FRONT layer, // Put it on FRONT layer,
// because this is the default in ModEdit, and in libs // because this is the default in ModEdit, and in libs
if( aModule->GetLayer() != LAYER_N_FRONT ) if( newModule->GetLayer() != LAYER_N_FRONT )
aModule->Flip( aModule->GetPosition() ); newModule->Flip( newModule->GetPosition() );
// Put it in orientation 0, // Put it in orientation 0,
// because this is the default orientation in ModEdit, and in libs // because this is the default orientation in ModEdit, and in libs
Rotate_Module( NULL, aModule, 0, false ); Rotate_Module( NULL, newModule, 0, false );
GetScreen()->ClrModify(); GetScreen()->ClrModify();
Zoom_Automatique( false ); Zoom_Automatique( false );
......
pcbnew/moduleframe.cpp
View file @ 9c1f6b73
...@@ -46,7 +46,6 @@ ...@@ -46,7 +46,6 @@
#include <class_module.h> #include <class_module.h>
#include <pcbnew.h> #include <pcbnew.h>
#include <protos.h>
#include <pcbnew_id.h> #include <pcbnew_id.h>
#include <hotkeys.h> #include <hotkeys.h>
#include <module_editor_frame.h> #include <module_editor_frame.h>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment