Pcbnew, fixed (I hope) a Linux specific issue:

* For an obscure reason the focus is lost after loading a board file when starting Pcbnew
* (i.e. only when launching Pcbnew from Kicad or from a command line, with a board filename to load))
* (seems due to the recreation of the layer manager after loading the file)
* This is more a workaround than a fix.
This commit is contained in:
charras 2010-02-24 18:36:01 +00:00
parent bbd8cdd91b
commit e85cf2e0c4
1 changed files with 44 additions and 27 deletions

View File

@ -22,6 +22,7 @@
#include "drag.h" #include "drag.h"
#include "eda_dde.h" #include "eda_dde.h"
#include "colors_selection.h" #include "colors_selection.h"
#include "class_drawpanel.h"
#include "id.h" #include "id.h"
@ -32,9 +33,9 @@
// Colors for layers and items // Colors for layers and items
COLORS_DESIGN_SETTINGS g_ColorsSettings; COLORS_DESIGN_SETTINGS g_ColorsSettings;
int g_DrawDefaultLineThickness = 60; /* Default line thickness in PCBNEW units used to int g_DrawDefaultLineThickness = 60; /* Default line thickness in PCBNEW units used to
* draw/plot items having a * draw/plot items having a
* default thickness line value (Frame references) * default thickness line value (Frame references)
* (i.e. = 0 ). 0 = single pixel line width */ * (i.e. = 0 ). 0 = single pixel line width */
bool Drc_On = true; bool Drc_On = true;
bool g_AutoDeleteOldTrack = true; bool g_AutoDeleteOldTrack = true;
@ -48,39 +49,41 @@ bool g_TwoSegmentTrackBuild = true;
bool g_HighLight_Status; bool g_HighLight_Status;
extern PARAM_CFG_BASE* ParamCfgList[]; extern PARAM_CFG_BASE* ParamCfgList[];
int ModuleSegmentWidth; int ModuleSegmentWidth;
int ModuleTextWidth; int ModuleTextWidth;
int Route_Layer_TOP; int Route_Layer_TOP;
int Route_Layer_BOTTOM; int Route_Layer_BOTTOM;
int g_MaxLinksShowed; int g_MaxLinksShowed;
int g_MagneticPadOption = capture_cursor_in_track_tool; int g_MagneticPadOption = capture_cursor_in_track_tool;
int g_MagneticTrackOption = capture_cursor_in_track_tool; int g_MagneticTrackOption = capture_cursor_in_track_tool;
int g_HighLight_NetCode = -1; int g_HighLight_NetCode = -1;
wxSize ModuleTextSize; /* Default footprint texts size */ wxSize ModuleTextSize; /* Default footprint texts size */
wxPoint g_Offset_Module; /* Offset de trace du modul en depl */ wxPoint g_Offset_Module; /* Offset de trace du modul en depl */
wxString g_Current_PadName; // Last used pad name (pad num) wxString g_Current_PadName; // Last used pad name (pad num)
// Wildcard for footprint libraries filesnames // Wildcard for footprint libraries filesnames
const wxString g_FootprintLibFileWildcard( wxT( "Kicad footprint library file (*.mod)|*.mod" ) ); const wxString g_FootprintLibFileWildcard( wxT(
"Kicad footprint library file (*.mod)|*.mod" ) );
/* Name of the document footprint list /* Name of the document footprint list
* usually located in share/modules/footprints_doc * usually located in share/modules/footprints_doc
* this is of the responsability to users to create this file * this is of the responsability to users to create this file
* if they want to have a list of footprints * if they want to have a list of footprints
*/ */
wxString g_DocModulesFileName = wxT("footprints_doc/footprints.pdf"); wxString g_DocModulesFileName = wxT( "footprints_doc/footprints.pdf" );
IMPLEMENT_APP( WinEDA_App ) IMPLEMENT_APP( WinEDA_App )
/* MacOSX: Needed for file association /* MacOSX: Needed for file association
* http://wiki.wxwidgets.org/WxMac-specific_topics * http://wiki.wxwidgets.org/WxMac-specific_topics
*/ */
void WinEDA_App::MacOpenFile(const wxString &fileName) { void WinEDA_App::MacOpenFile( const wxString& fileName )
wxFileName filename = fileName; {
WinEDA_PcbFrame * frame = ((WinEDA_PcbFrame*) GetTopWindow()); wxFileName filename = fileName;
WinEDA_PcbFrame* frame = ( (WinEDA_PcbFrame*) GetTopWindow() );
if(!filename.FileExists()) if( !filename.FileExists() )
return; return;
frame->LoadOnePcbFile( fileName, FALSE ); frame->LoadOnePcbFile( fileName, FALSE );
@ -93,13 +96,14 @@ bool WinEDA_App::OnInit()
{ {
/* WXMAC application specific */ /* WXMAC application specific */
#ifdef __WXMAC__ #ifdef __WXMAC__
// wxApp::SetExitOnFrameDelete(false); // wxApp::SetExitOnFrameDelete(false);
// wxApp::s_macAboutMenuItemId = ID_KICAD_ABOUT; // wxApp::s_macAboutMenuItemId = ID_KICAD_ABOUT;
wxApp::s_macPreferencesMenuItemId = ID_OPTIONS_SETUP; wxApp::s_macPreferencesMenuItemId = ID_OPTIONS_SETUP;
#endif /* __WXMAC__ */ #endif /* __WXMAC__ */
wxFileName fn; wxFileName fn;
WinEDA_PcbFrame* frame = NULL; WinEDA_PcbFrame* frame = NULL;
InitEDA_Appl( wxT( "PCBnew" ), APP_TYPE_PCBNEW ); InitEDA_Appl( wxT( "PCBnew" ), APP_TYPE_PCBNEW );
@ -114,7 +118,7 @@ bool WinEDA_App::OnInit()
// read current setup and reopen last directory if no filename to open in command line // read current setup and reopen last directory if no filename to open in command line
bool reopenLastUsedDirectory = argc == 1; bool reopenLastUsedDirectory = argc == 1;
GetSettings(reopenLastUsedDirectory); GetSettings( reopenLastUsedDirectory );
if( argc > 1 ) if( argc > 1 )
{ {
@ -122,9 +126,10 @@ bool WinEDA_App::OnInit()
if( fn.GetExt() != BoardFileExtension ) if( fn.GetExt() != BoardFileExtension )
{ {
wxLogDebug( wxT( "PcbNew file <%s> has the wrong extension.\ wxLogDebug( wxT(
Changing extension to .brd." ), "PcbNew file <%s> has the wrong extension.\
GetChars( fn.GetFullPath() ) ); Changing extension to .brd." ),
GetChars( fn.GetFullPath() ) );
fn.SetExt( BoardFileExtension ); fn.SetExt( BoardFileExtension );
} }
@ -140,7 +145,7 @@ Changing extension to .brd." ),
frame = new WinEDA_PcbFrame( NULL, wxT( "PcbNew" ), frame = new WinEDA_PcbFrame( NULL, wxT( "PcbNew" ),
wxPoint( 0, 0 ), wxSize( 600, 400 ) ); wxPoint( 0, 0 ), wxSize( 600, 400 ) );
frame->SetTitle( GetTitle() + wxT( " " ) + GetBuildVersion() ); frame->SetTitle( GetTitle() + wxT( " " ) + GetBuildVersion() );
ActiveScreen = ScreenPcb; ActiveScreen = ScreenPcb;
@ -160,9 +165,21 @@ Changing extension to .brd." ),
if( fn.IsOk() ) if( fn.IsOk() )
{ {
frame->LoadOnePcbFile( fn.GetFullPath(), FALSE ); frame->LoadOnePcbFile( fn.GetFullPath(), FALSE );
// update the layer names in the listbox // update the layer names in the listbox
frame->ReCreateLayerBox( NULL ); frame->ReCreateLayerBox( NULL );
} }
/* For an obscure reason the focus is lost after loading a board file
* when starting (i.e. only at this point)
* (seems due to the recreation of the layer manager after loading the file)
* give focus to main window and Drawpanel
* must be done for these 2 windows (for an obscure reason ...)
* Linux specific
* This is more a workaround than a fix.
*/
frame->SetFocus();
frame->DrawPanel->SetFocus();
return true; return true;
} }