haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Many minor fixes (like bug #1477213). Better help in dialog environment variables editor (the tooltip was never shown on Windows)

This commit is contained in:
jean-pierre charras 2015-07-24 12:23:34 +02:00
parent d010703eaf
commit 9b9c7945a2
17 changed files with 187 additions and 92 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
3d-viewer/3d_draw.cpp
View File

@ -486,7 +486,7 @@ void EDA_3D_CANVAS::Redraw()
glCallList( m_glLists[GL_ID_TECH_LAYERS] ); glCallList( m_glLists[GL_ID_TECH_LAYERS] );
} }
if( isEnabled( FL_COMMENTS ) || isEnabled( FL_COMMENTS ) ) if( isEnabled( FL_COMMENTS ) || isEnabled( FL_ECO ) )
{ {
if( ! m_glLists[GL_ID_AUX_LAYERS] ) if( ! m_glLists[GL_ID_AUX_LAYERS] )
CreateDrawGL_List( &errorReporter, &activityReporter ); CreateDrawGL_List( &errorReporter, &activityReporter );

38
common/dialogs/dialog_env_var_config.cpp
View File

@ -29,6 +29,7 @@
#include <dialog_env_var_config.h> #include <dialog_env_var_config.h>
#include <validators.h> #include <validators.h>
#include <html_messagebox.h>
DIALOG_ENV_VAR_CONFIG::DIALOG_ENV_VAR_CONFIG( wxWindow* aParent, const ENV_VAR_MAP& aEnvVarMap ) : DIALOG_ENV_VAR_CONFIG::DIALOG_ENV_VAR_CONFIG( wxWindow* aParent, const ENV_VAR_MAP& aEnvVarMap ) :
@ -230,3 +231,40 @@ void DIALOG_ENV_VAR_CONFIG::OnDeleteSelectedRows( wxCommandEvent& aEvent )
n++; n++;
} }
} }
void DIALOG_ENV_VAR_CONFIG::OnHelpRequest( wxCommandEvent& aEvent )
{
wxString msg = _( "Enter the names and paths for each path.<br><br>"
"<i>Grey enteries are names that have been defined externally</i> "
"as system or user level environment variables." );
msg << wxT( "<br><br><b>" );
msg << _( "To avoid issues, names accept only upper case letters and digits." );
msg << wxT( "</b><br><br>" );
msg << _( "<b><i>KIGITHUB</b></i> is often used in Kicad packages to define "
"the URL of the repository of our official libraries." );
msg << wxT( "<br>" );
msg << _( "<b><i>KISYS3DMOD</b></i> is the base path of footprint 3D shapes (.3Dshapes folders)." );
msg << wxT( "<br>" );
msg << _( "<b><i>KISYSMOD</b></i> is the base path of local footprint libraries (.pretty folders)." );
msg << wxT( "<br><br>" );
msg << _( "A other environment variable is automatically defined by Kicad (cannot be edited):" );
msg << wxT( "<br>" );
msg << _( "<b><i>KIPRJMOD</b></i> is the absolute path of the current project" );
msg << wxT( "<br>" );
msg << _( "For instance, ${KIPRJMOD}/libs/footprints.pretty is the folder "
"libs/footprints.pretty located in the current project." );
msg << wxT( "<br><br>" );
msg << _( "Auxiliary environment variable name used by Kicad if exists:" );
msg << wxT( "<br>" );
msg << _( "<i>KICAD_PTEMPLATES</i> can be defined if you want to create "
"and use project templates (specific folders containing the template files) "
"in a given master folder" );
msg << wxT( "<br>" );
msg << _( "It is the base path of these project template folders" );
HTML_MESSAGE_BOX dlg( this, _( "Paths Definition" ), wxDefaultPosition,
wxSize( 650, 450 ) );
dlg.AddHTML_Text( msg );
dlg.ShowModal();
}

9
common/dialogs/dialog_env_var_config_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 5 2014) // C++ code generated with wxFormBuilder (version Jun 17 2015)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
@ -45,8 +45,6 @@ DIALOG_ENV_VAR_CONFIG_BASE::DIALOG_ENV_VAR_CONFIG_BASE( wxWindow* parent, wxWind
// Cell Defaults // Cell Defaults
m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP ); m_grid->SetDefaultCellAlignment( wxALIGN_LEFT, wxALIGN_TOP );
m_grid->SetToolTip( _("Enter the names and paths for each path.\n\nGrey enteries are names that have been defined externally as system or user level environment variables.") );
bSizer1->Add( m_grid, 1, wxALL|wxEXPAND, 5 ); bSizer1->Add( m_grid, 1, wxALL|wxEXPAND, 5 );
@ -72,6 +70,9 @@ DIALOG_ENV_VAR_CONFIG_BASE::DIALOG_ENV_VAR_CONFIG_BASE( wxWindow* parent, wxWind
bSizer2->Add( m_buttonDelete, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 ); bSizer2->Add( m_buttonDelete, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 );
m_buttonHelp = new wxButton( this, wxID_ANY, _("Help"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer2->Add( m_buttonHelp, 0, wxALL, 5 );
mainSizer->Add( bSizer2, 0, wxEXPAND, 5 ); mainSizer->Add( bSizer2, 0, wxEXPAND, 5 );
@ -85,6 +86,7 @@ DIALOG_ENV_VAR_CONFIG_BASE::DIALOG_ENV_VAR_CONFIG_BASE( wxWindow* parent, wxWind
// Connect Events // Connect Events
m_buttonAdd->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnAddRow ), NULL, this ); m_buttonAdd->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnAddRow ), NULL, this );
m_buttonDelete->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnDeleteSelectedRows ), NULL, this ); m_buttonDelete->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnDeleteSelectedRows ), NULL, this );
m_buttonHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnHelpRequest ), NULL, this );
} }
DIALOG_ENV_VAR_CONFIG_BASE::~DIALOG_ENV_VAR_CONFIG_BASE() DIALOG_ENV_VAR_CONFIG_BASE::~DIALOG_ENV_VAR_CONFIG_BASE()
@ -92,5 +94,6 @@ DIALOG_ENV_VAR_CONFIG_BASE::~DIALOG_ENV_VAR_CONFIG_BASE()
// Disconnect Events // Disconnect Events
m_buttonAdd->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnAddRow ), NULL, this ); m_buttonAdd->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnAddRow ), NULL, this );
m_buttonDelete->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnDeleteSelectedRows ), NULL, this ); m_buttonDelete->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnDeleteSelectedRows ), NULL, this );
m_buttonHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_ENV_VAR_CONFIG_BASE::OnHelpRequest ), NULL, this );
} }

90
common/dialogs/dialog_env_var_config_base.fbp
View File

@ -184,7 +184,7 @@
<property name="size"></property> <property name="size"></property>
<property name="subclass"></property> <property name="subclass"></property>
<property name="toolbar_pane">0</property> <property name="toolbar_pane">0</property>
<property name="tooltip">Enter the names and paths for each path.&#x0A;&#x0A;Grey enteries are names that have been defined externally as system or user level environment variables.</property> <property name="tooltip"></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>
@ -608,6 +608,94 @@
<event name="OnUpdateUI"></event> <event name="OnUpdateUI"></event>
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALL</property>
<property name="proportion">0</property>
<object class="wxButton" expanded="1">
<property name="BottomDockable">1</property>
<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="default">0</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="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Help</property>
<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"></property>
<property name="moveable">1</property>
<property name="name">m_buttonHelp</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<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_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnButtonClick">OnHelpRequest</event>
<event name="OnChar"></event>
<event name="OnEnterWindow"></event>
<event name="OnEraseBackground"></event>
<event name="OnKeyDown"></event>
<event name="OnKeyUp"></event>
<event name="OnKillFocus"></event>
<event name="OnLeaveWindow"></event>
<event name="OnLeftDClick"></event>
<event name="OnLeftDown"></event>
<event name="OnLeftUp"></event>
<event name="OnMiddleDClick"></event>
<event name="OnMiddleDown"></event>
<event name="OnMiddleUp"></event>
<event name="OnMotion"></event>
<event name="OnMouseEvents"></event>
<event name="OnMouseWheel"></event>
<event name="OnPaint"></event>
<event name="OnRightDClick"></event>
<event name="OnRightDown"></event>
<event name="OnRightUp"></event>
<event name="OnSetFocus"></event>
<event name="OnSize"></event>
<event name="OnUpdateUI"></event>
</object>
</object>
</object> </object>
</object> </object>
</object> </object>

4
common/dialogs/dialog_env_var_config_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Jun 5 2014) // C++ code generated with wxFormBuilder (version Jun 17 2015)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
@ -40,10 +40,12 @@ class DIALOG_ENV_VAR_CONFIG_BASE : public DIALOG_SHIM
wxButton* m_buttonCancel; wxButton* m_buttonCancel;
wxButton* m_buttonAdd; wxButton* m_buttonAdd;
wxButton* m_buttonDelete; wxButton* m_buttonDelete;
wxButton* m_buttonHelp;
// Virtual event handlers, overide them in your derived class // Virtual event handlers, overide them in your derived class
virtual void OnAddRow( wxCommandEvent& event ) { event.Skip(); } virtual void OnAddRow( wxCommandEvent& event ) { event.Skip(); }
virtual void OnDeleteSelectedRows( wxCommandEvent& event ) { event.Skip(); } virtual void OnDeleteSelectedRows( wxCommandEvent& event ) { event.Skip(); }
virtual void OnHelpRequest( wxCommandEvent& event ) { event.Skip(); }
public: public:

5
common/displlst.cpp
View File

@ -236,7 +236,8 @@ void EDA_LIST_DIALOG::onClose( wxCloseEvent& event )
/* Sort alphabetically, case insensitive. /* Sort alphabetically, case insensitive.
*/ */
static int wxCALLBACK MyCompareFunction( wxIntPtr aItem1, wxIntPtr aItem2, wxIntPtr aSortData ) static int wxCALLBACK myCompareFunction( wxIntPtr aItem1, wxIntPtr aItem2,
wxIntPtr WXUNUSED( aSortData ) )
{ {
wxString* component1Name = (wxString*) aItem1; wxString* component1Name = (wxString*) aItem1;
wxString* component2Name = (wxString*) aItem2; wxString* component2Name = (wxString*) aItem2;
@ -247,5 +248,5 @@ static int wxCALLBACK MyCompareFunction( wxIntPtr aItem1, wxIntPtr aItem2, wxInt
void EDA_LIST_DIALOG::sortList() void EDA_LIST_DIALOG::sortList()
{ {
m_listBox->SortItems( MyCompareFunction, 0 ); m_listBox->SortItems( myCompareFunction, 0 );
} }

2
eeschema/eeschema_id.h
View File

@ -120,7 +120,7 @@ enum id_eeschema_frm
ID_POPUP_SCH_END_SHEET, ID_POPUP_SCH_END_SHEET,
ID_POPUP_SCH_RESIZE_SHEET, ID_POPUP_SCH_RESIZE_SHEET,
ID_POPUP_SCH_CLEANUP_SHEET, ID_POPUP_SCH_CLEANUP_SHEET,
ID_POPUP_IMPORT_GLABEL, ID_POPUP_IMPORT_HLABEL_TO_SHEETPIN,
ID_POPUP_SCH_GENERIC_ORIENT_CMP, ID_POPUP_SCH_GENERIC_ORIENT_CMP,
ID_POPUP_SCH_GENERIC_EDIT_CMP, ID_POPUP_SCH_GENERIC_EDIT_CMP,
ID_POPUP_SCH_EDIT_CONVERT_CMP, ID_POPUP_SCH_EDIT_CONVERT_CMP,

2
eeschema/onrightclick.cpp
View File

@ -787,7 +787,7 @@ void AddMenusForHierchicalSheet( wxMenu* PopMenu, SCH_SHEET* Sheet )
AddMenuItem( PopMenu, ID_POPUP_SCH_RESIZE_SHEET, _( "Resize Sheet" ), AddMenuItem( PopMenu, ID_POPUP_SCH_RESIZE_SHEET, _( "Resize Sheet" ),
KiBitmap( resize_sheet_xpm ) ); KiBitmap( resize_sheet_xpm ) );
PopMenu->AppendSeparator(); PopMenu->AppendSeparator();
AddMenuItem( PopMenu, ID_POPUP_IMPORT_GLABEL, _( "Import Sheet Pins" ), AddMenuItem( PopMenu, ID_POPUP_IMPORT_HLABEL_TO_SHEETPIN, _( "Import Sheet Pins" ),
KiBitmap( import_hierarchical_label_xpm ) ); KiBitmap( import_hierarchical_label_xpm ) );
if( Sheet->HasUndefinedPins() ) // Sheet has pin labels, and can be cleaned if( Sheet->HasUndefinedPins() ) // Sheet has pin labels, and can be cleaned

6
eeschema/sch_sheet.h
View File

@ -106,10 +106,10 @@ public:
/** /**
* Virtual function IsMovableFromAnchorPoint * Virtual function IsMovableFromAnchorPoint
* Return true for items which are moved with the anchor point at mouse cursor * Return true for items which are moved with the anchor point at mouse cursor
* and false for items moved with no reference to anchor * and false for items moved with no reference to anchor (usually large items)
* @return false for a hierarchical sheet pin * @return true for a hierarchical sheet pin
*/ */
bool IsMovableFromAnchorPoint() { return false; } bool IsMovableFromAnchorPoint() { return true; }
void Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset, void Draw( EDA_DRAW_PANEL* aPanel, wxDC* aDC, const wxPoint& aOffset,
GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR ); GR_DRAWMODE aDrawMode, EDA_COLOR_T aColor = UNSPECIFIED_COLOR );

29
eeschema/sch_sheet_pin.cpp
View File

@ -161,14 +161,16 @@ enum SCH_SHEET_PIN::SHEET_SIDE SCH_SHEET_PIN::GetEdge() const
void SCH_SHEET_PIN::ConstrainOnEdge( wxPoint Pos ) void SCH_SHEET_PIN::ConstrainOnEdge( wxPoint Pos )
{ {
SCH_SHEET* Sheet = (SCH_SHEET*) GetParent(); SCH_SHEET* sheet = (SCH_SHEET*) GetParent();
if( Sheet == NULL ) if( sheet == NULL )
return; return;
wxPoint center = sheet->m_pos + ( sheet->m_size / 2 );
if( m_edge == SHEET_LEFT_SIDE || m_edge == SHEET_RIGHT_SIDE ) if( m_edge == SHEET_LEFT_SIDE || m_edge == SHEET_RIGHT_SIDE )
{ {
if( Pos.x > ( Sheet->m_pos.x + ( Sheet->m_size.x / 2 ) ) ) if( Pos.x > center.x )
{ {
SetEdge( SHEET_RIGHT_SIDE ); SetEdge( SHEET_RIGHT_SIDE );
} }
@ -179,15 +181,15 @@ void SCH_SHEET_PIN::ConstrainOnEdge( wxPoint Pos )
m_Pos.y = Pos.y; m_Pos.y = Pos.y;
if( m_Pos.y < Sheet->m_pos.y ) if( m_Pos.y < sheet->m_pos.y )
m_Pos.y = Sheet->m_pos.y; m_Pos.y = sheet->m_pos.y;
if( m_Pos.y > (Sheet->m_pos.y + Sheet->m_size.y) ) if( m_Pos.y > (sheet->m_pos.y + sheet->m_size.y) )
m_Pos.y = Sheet->m_pos.y + Sheet->m_size.y; m_Pos.y = sheet->m_pos.y + sheet->m_size.y;
} }
else /* vertical sheetpin*/ else /* vertical sheetpin*/
{ {
if( Pos.y > ( Sheet->m_pos.y + ( Sheet->m_size.y / 2 ) ) ) if( Pos.y > center.y )
{ {
SetEdge( SHEET_BOTTOM_SIDE ); //bottom SetEdge( SHEET_BOTTOM_SIDE ); //bottom
} }
@ -198,12 +200,15 @@ void SCH_SHEET_PIN::ConstrainOnEdge( wxPoint Pos )
m_Pos.x = Pos.x; m_Pos.x = Pos.x;
if( m_Pos.x < Sheet->m_pos.x ) if( m_Pos.x < sheet->m_pos.x )
m_Pos.x = Sheet->m_pos.x; m_Pos.x = sheet->m_pos.x;
if( m_Pos.x > (Sheet->m_pos.x + Sheet->m_size.x) ) if( m_Pos.x > (sheet->m_pos.x + sheet->m_size.x) )
m_Pos.x = Sheet->m_pos.x + Sheet->m_size.x; m_Pos.x = sheet->m_pos.x + sheet->m_size.x;
} }
printf( "centre %d %d, pos %d %d, pinpos %d %d, edge %d\n",
center.x, center.y, Pos.x, Pos.y, m_Pos.x, m_Pos.y, m_edge);
} }

8
eeschema/schedit.cpp
View File

@ -77,7 +77,7 @@ void SCH_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event )
case ID_POPUP_SCH_CLEANUP_SHEET: case ID_POPUP_SCH_CLEANUP_SHEET:
case ID_POPUP_SCH_END_SHEET: case ID_POPUP_SCH_END_SHEET:
case ID_POPUP_SCH_RESIZE_SHEET: case ID_POPUP_SCH_RESIZE_SHEET:
case ID_POPUP_IMPORT_GLABEL: case ID_POPUP_IMPORT_HLABEL_TO_SHEETPIN:
case ID_POPUP_SCH_INIT_CMP: case ID_POPUP_SCH_INIT_CMP:
case ID_POPUP_SCH_DISPLAYDOC_CMP: case ID_POPUP_SCH_DISPLAYDOC_CMP:
case ID_POPUP_SCH_EDIT_CONVERT_CMP: case ID_POPUP_SCH_EDIT_CONVERT_CMP:
@ -242,7 +242,7 @@ void SCH_EDIT_FRAME::Process_Special_Functions( wxCommandEvent& event )
screen->TestDanglingEnds( m_canvas, &dc ); screen->TestDanglingEnds( m_canvas, &dc );
break; break;
case ID_POPUP_IMPORT_GLABEL: case ID_POPUP_IMPORT_HLABEL_TO_SHEETPIN:
if( item != NULL && item->Type() == SCH_SHEET_T ) if( item != NULL && item->Type() == SCH_SHEET_T )
screen->SetCurItem( ImportSheetPin( (SCH_SHEET*) item, &dc ) ); screen->SetCurItem( ImportSheetPin( (SCH_SHEET*) item, &dc ) );
break; break;
@ -772,10 +772,10 @@ void SCH_EDIT_FRAME::PrepareMoveItem( SCH_ITEM* aItem, wxDC* aDC )
else else
aItem->SetStoredPos( GetCrossHairPosition() - aItem->GetPosition() ); aItem->SetStoredPos( GetCrossHairPosition() - aItem->GetPosition() );
OnModify(); OnModify();
m_canvas->SetMouseCapture( moveItemWithMouseCursor, abortMoveItem );
GetScreen()->SetCurItem( aItem ); GetScreen()->SetCurItem( aItem );
m_canvas->SetMouseCapture( moveItemWithMouseCursor, abortMoveItem );
m_canvas->Refresh(); m_canvas->Refresh();
} }

1
include/dialog_env_var_config.h
View File

@ -45,6 +45,7 @@ private:
protected: protected:
virtual void OnAddRow( wxCommandEvent& aEvent ); virtual void OnAddRow( wxCommandEvent& aEvent );
virtual void OnDeleteSelectedRows( wxCommandEvent& aEvent ); virtual void OnDeleteSelectedRows( wxCommandEvent& aEvent );
virtual void OnHelpRequest( wxCommandEvent& aEvent );
public: public:
DIALOG_ENV_VAR_CONFIG( wxWindow* parent, const ENV_VAR_MAP& aEnvVarMap ); DIALOG_ENV_VAR_CONFIG( wxWindow* parent, const ENV_VAR_MAP& aEnvVarMap );

40
pcbnew/dialogs/dialog_freeroute_exchange.cpp
View File

@ -44,9 +44,6 @@
#endif #endif
#define FREEROUTE_RUN_KEY wxT( "freeroute_command" )
void PCB_EDIT_FRAME::Access_to_External_Tool( wxCommandEvent& event ) void PCB_EDIT_FRAME::Access_to_External_Tool( wxCommandEvent& event )
{ {
DIALOG_FREEROUTE dialog( this ); DIALOG_FREEROUTE dialog( this );
@ -68,28 +65,16 @@ DIALOG_FREEROUTE::DIALOG_FREEROUTE( PCB_EDIT_FRAME* parent ):
/* Specific data initialization // Specific data initialization
*/
void DIALOG_FREEROUTE::MyInit() void DIALOG_FREEROUTE::MyInit()
{ {
SetFocus(); SetFocus();
m_freeRouterFound = false; m_freeRouterFound = false;
/* wxString msg;
wxConfigBase* cfg = Kiface().KifaceSettings();
cfg->Read( FREEROUTE_RUN_KEY, &msg );
*/
wxFileName fileName( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX ); wxFileName fileName( FindKicadFile( wxT( "freeroute.jar" ) ), wxPATH_UNIX );
if( fileName.FileExists() ) if( fileName.FileExists() )
{
m_freeRouterFound = true; m_freeRouterFound = true;
m_buttonLaunchFreeroute->SetLabel( _("Create .dsn File and Launch FreeRouter") );
}
else
m_buttonLaunchFreeroute->SetLabel( _("Create .dsn File") );
m_buttonLaunchFreeroute->Enable( m_freeRouterFound ); m_buttonLaunchFreeroute->Enable( m_freeRouterFound );
@ -98,6 +83,7 @@ void DIALOG_FREEROUTE::MyInit()
const char * s_FreeRouteHelpInfo = const char * s_FreeRouteHelpInfo =
#include <dialog_freeroute_exchange_help_html.h> #include <dialog_freeroute_exchange_help_html.h>
; ;
void DIALOG_FREEROUTE::OnHelpButtonClick( wxCommandEvent& event ) void DIALOG_FREEROUTE::OnHelpButtonClick( wxCommandEvent& event )
{ {
DIALOG_DISPLAY_HTML_TEXT_BASE help_Dlg( this, wxID_ANY, DIALOG_DISPLAY_HTML_TEXT_BASE help_Dlg( this, wxID_ANY,
@ -108,16 +94,13 @@ void DIALOG_FREEROUTE::OnHelpButtonClick( wxCommandEvent& event )
help_Dlg.ShowModal(); help_Dlg.ShowModal();
} }
/* wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_CREATE_EXPORT_DSN_FILE
*/
void DIALOG_FREEROUTE::OnExportButtonClick( wxCommandEvent& event ) void DIALOG_FREEROUTE::OnExportButtonClick( wxCommandEvent& event )
{ {
m_Parent->ExportToSpecctra( event ); m_Parent->ExportToSpecctra( event );
} }
/* wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_IMPORT_FREEROUTE_DSN_FILE
*/
void DIALOG_FREEROUTE::OnImportButtonClick( wxCommandEvent& event ) void DIALOG_FREEROUTE::OnImportButtonClick( wxCommandEvent& event )
{ {
m_Parent->ImportSpecctraSession( event ); m_Parent->ImportSpecctraSession( event );
@ -130,8 +113,7 @@ void DIALOG_FREEROUTE::OnImportButtonClick( wxCommandEvent& event )
} }
/* wxEVT_COMMAND_BUTTON_CLICKED event handler for ID_RUN_FREEROUTE // Run freeroute, if it is available (freeroute.jar found in kicad binaries)
*/
void DIALOG_FREEROUTE::OnLaunchButtonClick( wxCommandEvent& event ) void DIALOG_FREEROUTE::OnLaunchButtonClick( wxCommandEvent& event )
{ {
wxString dsnFile; wxString dsnFile;
@ -224,17 +206,3 @@ const wxString DIALOG_FREEROUTE::createDSN_File()
} }
/* wxEVT_COMMAND_BUTTON_CLICKED event handler for wxID_CLOSE
*/
void DIALOG_FREEROUTE::OnCancelButtonClick( wxCommandEvent& event )
{
EndModal(wxID_CANCEL);
}
void DIALOG_FREEROUTE::OnOKButtonClick( wxCommandEvent& event )
{
EndModal(wxID_OK);
}

2
pcbnew/dialogs/dialog_freeroute_exchange.h
View File

@ -35,12 +35,10 @@ private:
private: private:
// Virtual event handlers // Virtual event handlers
void OnOKButtonClick( wxCommandEvent& event );
void OnExportButtonClick( wxCommandEvent& event ); void OnExportButtonClick( wxCommandEvent& event );
void OnLaunchButtonClick( wxCommandEvent& event ); void OnLaunchButtonClick( wxCommandEvent& event );
void OnImportButtonClick( wxCommandEvent& event ); void OnImportButtonClick( wxCommandEvent& event );
void OnHelpButtonClick( wxCommandEvent& event ); void OnHelpButtonClick( wxCommandEvent& event );
void OnCancelButtonClick( wxCommandEvent& event );
void MyInit ( ); void MyInit ( );
const wxString createDSN_File(); const wxString createDSN_File();

20
pcbnew/dialogs/dialog_freeroute_exchange_base.cpp
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Mar 9 2015) // C++ code generated with wxFormBuilder (version Jun 17 2015)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
@ -22,11 +22,11 @@ DIALOG_FREEROUTE_BASE::DIALOG_FREEROUTE_BASE( wxWindow* parent, wxWindowID id, c
wxBoxSizer* bLeftSizer; wxBoxSizer* bLeftSizer;
bLeftSizer = new wxBoxSizer( wxVERTICAL ); bLeftSizer = new wxBoxSizer( wxVERTICAL );
m_staticText2 = new wxStaticText( this, wxID_ANY, _("Export/Import to/from FreeRoute:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextMsg = new wxStaticText( this, wxID_ANY, _("Export/Import to/from FreeRoute:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText2->Wrap( -1 ); m_staticTextMsg->Wrap( -1 );
m_staticText2->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) ); m_staticTextMsg->SetFont( wxFont( wxNORMAL_FONT->GetPointSize(), 70, 90, 92, false, wxEmptyString ) );
bLeftSizer->Add( m_staticText2, 0, wxALL, 5 ); bLeftSizer->Add( m_staticTextMsg, 0, wxALL, 5 );
wxBoxSizer* bLeftSubSizerSizer; wxBoxSizer* bLeftSubSizerSizer;
bLeftSubSizerSizer = new wxBoxSizer( wxHORIZONTAL ); bLeftSubSizerSizer = new wxBoxSizer( wxHORIZONTAL );
@ -37,17 +37,17 @@ DIALOG_FREEROUTE_BASE::DIALOG_FREEROUTE_BASE( wxWindow* parent, wxWindowID id, c
wxBoxSizer* bLeftButtonsSizer; wxBoxSizer* bLeftButtonsSizer;
bLeftButtonsSizer = new wxBoxSizer( wxVERTICAL ); bLeftButtonsSizer = new wxBoxSizer( wxVERTICAL );
m_ExportDSN = new wxButton( this, ID_BUTTON_EXPORT_DSN, _("Export a Specctra Design (*.dsn) File"), wxDefaultPosition, wxDefaultSize, 0 ); m_ExportDSN = new wxButton( this, wxID_ANY, _("Export a Specctra Design (*.dsn) File"), wxDefaultPosition, wxDefaultSize, 0 );
m_ExportDSN->SetToolTip( _("Export a Specctra DSN file (to FreeRouter)") ); m_ExportDSN->SetToolTip( _("Export a Specctra DSN file (to FreeRouter)") );
bLeftButtonsSizer->Add( m_ExportDSN, 0, wxALL|wxEXPAND, 5 ); bLeftButtonsSizer->Add( m_ExportDSN, 0, wxALL|wxEXPAND, 5 );
m_buttonLaunchFreeroute = new wxButton( this, wxID_BUTTON_LAUNCH, _("Export a Specctra Design and Launch FreeRoute"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonLaunchFreeroute = new wxButton( this, wxID_ANY, _("Export a Specctra Design and Launch FreeRoute"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonLaunchFreeroute->SetToolTip( _("FreeRouter can be run only if freeroute.jar is found in Kicad binaries folder") ); m_buttonLaunchFreeroute->SetToolTip( _("FreeRouter can be run only if freeroute.jar is found in Kicad binaries folder") );
bLeftButtonsSizer->Add( m_buttonLaunchFreeroute, 0, wxALL|wxEXPAND, 5 ); bLeftButtonsSizer->Add( m_buttonLaunchFreeroute, 0, wxALL|wxEXPAND, 5 );
m_buttonImport = new wxButton( this, wxID_BUTTON_IMPORT, _("Back Import the Specctra Session (*.ses) File"), wxDefaultPosition, wxDefaultSize, 0 ); m_buttonImport = new wxButton( this, wxID_ANY, _("Back Import the Specctra Session (*.ses) File"), wxDefaultPosition, wxDefaultSize, 0 );
m_buttonImport->SetToolTip( _("Merge a session file created by FreeRouter with the current board.") ); m_buttonImport->SetToolTip( _("Merge a session file created by FreeRouter with the current board.") );
bLeftButtonsSizer->Add( m_buttonImport, 0, wxALL|wxEXPAND, 5 ); bLeftButtonsSizer->Add( m_buttonImport, 0, wxALL|wxEXPAND, 5 );
@ -87,9 +87,7 @@ DIALOG_FREEROUTE_BASE::DIALOG_FREEROUTE_BASE( wxWindow* parent, wxWindowID id, c
m_ExportDSN->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnExportButtonClick ), NULL, this ); m_ExportDSN->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnExportButtonClick ), NULL, this );
m_buttonLaunchFreeroute->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnLaunchButtonClick ), NULL, this ); m_buttonLaunchFreeroute->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnLaunchButtonClick ), NULL, this );
m_buttonImport->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnImportButtonClick ), NULL, this ); m_buttonImport->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnImportButtonClick ), NULL, this );
m_sdbSizerCancel->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnCancelButtonClick ), NULL, this );
m_sdbSizerHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnHelpButtonClick ), NULL, this ); m_sdbSizerHelp->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnHelpButtonClick ), NULL, this );
m_sdbSizerOK->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnOKButtonClick ), NULL, this );
} }
DIALOG_FREEROUTE_BASE::~DIALOG_FREEROUTE_BASE() DIALOG_FREEROUTE_BASE::~DIALOG_FREEROUTE_BASE()
@ -98,8 +96,6 @@ DIALOG_FREEROUTE_BASE::~DIALOG_FREEROUTE_BASE()
m_ExportDSN->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnExportButtonClick ), NULL, this ); m_ExportDSN->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnExportButtonClick ), NULL, this );
m_buttonLaunchFreeroute->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnLaunchButtonClick ), NULL, this ); m_buttonLaunchFreeroute->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnLaunchButtonClick ), NULL, this );
m_buttonImport->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnImportButtonClick ), NULL, this ); m_buttonImport->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnImportButtonClick ), NULL, this );
m_sdbSizerCancel->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnCancelButtonClick ), NULL, this );
m_sdbSizerHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnHelpButtonClick ), NULL, this ); m_sdbSizerHelp->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnHelpButtonClick ), NULL, this );
m_sdbSizerOK->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( DIALOG_FREEROUTE_BASE::OnOKButtonClick ), NULL, this );
} }

12
pcbnew/dialogs/dialog_freeroute_exchange_base.fbp
View File

@ -151,7 +151,7 @@
<property name="minimize_button">0</property> <property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="moveable">1</property>
<property name="name">m_staticText2</property> <property name="name">m_staticTextMsg</property>
<property name="pane_border">1</property> <property name="pane_border">1</property>
<property name="pane_position"></property> <property name="pane_position"></property>
<property name="pane_size"></property> <property name="pane_size"></property>
@ -254,7 +254,7 @@
<property name="font"></property> <property name="font"></property>
<property name="gripper">0</property> <property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">ID_BUTTON_EXPORT_DSN</property> <property name="id">wxID_ANY</property>
<property name="label">Export a Specctra Design (*.dsn) File</property> <property name="label">Export a Specctra Design (*.dsn) File</property>
<property name="max_size"></property> <property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
@ -342,7 +342,7 @@
<property name="font"></property> <property name="font"></property>
<property name="gripper">0</property> <property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_BUTTON_LAUNCH</property> <property name="id">wxID_ANY</property>
<property name="label">Export a Specctra Design and Launch FreeRoute</property> <property name="label">Export a Specctra Design and Launch FreeRoute</property>
<property name="max_size"></property> <property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
@ -430,7 +430,7 @@
<property name="font"></property> <property name="font"></property>
<property name="gripper">0</property> <property name="gripper">0</property>
<property name="hidden">0</property> <property name="hidden">0</property>
<property name="id">wxID_BUTTON_IMPORT</property> <property name="id">wxID_ANY</property>
<property name="label">Back Import the Specctra Session (*.ses) File</property> <property name="label">Back Import the Specctra Session (*.ses) File</property>
<property name="max_size"></property> <property name="max_size"></property>
<property name="maximize_button">0</property> <property name="maximize_button">0</property>
@ -592,11 +592,11 @@
<property name="name">m_sdbSizer</property> <property name="name">m_sdbSizer</property>
<property name="permission">protected</property> <property name="permission">protected</property>
<event name="OnApplyButtonClick"></event> <event name="OnApplyButtonClick"></event>
<event name="OnCancelButtonClick">OnCancelButtonClick</event> <event name="OnCancelButtonClick"></event>
<event name="OnContextHelpButtonClick"></event> <event name="OnContextHelpButtonClick"></event>
<event name="OnHelpButtonClick">OnHelpButtonClick</event> <event name="OnHelpButtonClick">OnHelpButtonClick</event>
<event name="OnNoButtonClick"></event> <event name="OnNoButtonClick"></event>
<event name="OnOKButtonClick">OnOKButtonClick</event> <event name="OnOKButtonClick"></event>
<event name="OnSaveButtonClick"></event> <event name="OnSaveButtonClick"></event>
<event name="OnYesButtonClick"></event> <event name="OnYesButtonClick"></event>
</object> </object>

9
pcbnew/dialogs/dialog_freeroute_exchange_base.h
View File

@ -1,5 +1,5 @@
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Mar 9 2015) // C++ code generated with wxFormBuilder (version Jun 17 2015)
// http://www.wxformbuilder.org/ // http://www.wxformbuilder.org/
// //
// PLEASE DO "NOT" EDIT THIS FILE! // PLEASE DO "NOT" EDIT THIS FILE!
@ -27,9 +27,6 @@ class DIALOG_SHIM;
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
#define ID_BUTTON_EXPORT_DSN 1000
#define wxID_BUTTON_LAUNCH 1001
#define wxID_BUTTON_IMPORT 1002
/////////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////////
/// Class DIALOG_FREEROUTE_BASE /// Class DIALOG_FREEROUTE_BASE
@ -39,7 +36,7 @@ class DIALOG_FREEROUTE_BASE : public DIALOG_SHIM
private: private:
protected: protected:
wxStaticText* m_staticText2; wxStaticText* m_staticTextMsg;
wxButton* m_ExportDSN; wxButton* m_ExportDSN;
wxButton* m_buttonLaunchFreeroute; wxButton* m_buttonLaunchFreeroute;
wxButton* m_buttonImport; wxButton* m_buttonImport;
@ -53,9 +50,7 @@ class DIALOG_FREEROUTE_BASE : public DIALOG_SHIM
virtual void OnExportButtonClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnExportButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnLaunchButtonClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnLaunchButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnImportButtonClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnImportButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnCancelButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnHelpButtonClick( wxCommandEvent& event ) { event.Skip(); } virtual void OnHelpButtonClick( wxCommandEvent& event ) { event.Skip(); }
virtual void OnOKButtonClick( wxCommandEvent& event ) { event.Skip(); }
public: public: