diff --git a/cvpcb/cvframe.cpp b/cvpcb/cvframe.cpp index 6426a62409..5829fa762d 100644 --- a/cvpcb/cvframe.cpp +++ b/cvpcb/cvframe.cpp @@ -172,7 +172,7 @@ void WinEDA_CvpcbFrame::OnCloseWindow( wxCloseEvent& Event ) if( modified ) { - unsigned ii; + unsigned ii; wxMessageDialog dialog( this, _( "Netlist and Cmp list modified, Save before exit ?" ), _( "Confirmation" ), wxYES_NO | wxCANCEL | wxICON_EXCLAMATION | @@ -450,10 +450,16 @@ void WinEDA_CvpcbFrame::SetLanguage( wxCommandEvent& event ) void WinEDA_CvpcbFrame::DisplayDocFile( wxCommandEvent& event ) /*************************************************************/ { - wxString msg = FindKicadHelpPath(); + wxString DocModuleFileName, fullfilename; - msg += wxT( "pcbnew/footprints.pdf" ); - GetAssociatedDocument( this, wxEmptyString, msg ); + DocModuleFileName = g_EDA_Appl->m_EDA_CommonConfig->Read( DOC_FOOTPRINTS_LIST_KEY, + DEFAULT_FOOTPRINTS_LIST_FILENAME ); + if( wxIsAbsolutePath(DocModuleFileName) ) + fullfilename = DocModuleFileName; + else + fullfilename = FindKicadHelpPath() + wxT("../") + DocModuleFileName; + + GetAssociatedDocument( this, wxEmptyString, fullfilename ); } diff --git a/cvpcb/cvpcb.h b/cvpcb/cvpcb.h index 99a156304f..f0bd28ba41 100644 --- a/cvpcb/cvpcb.h +++ b/cvpcb/cvpcb.h @@ -14,7 +14,12 @@ #include "gr_basic.h" #include "colors.h" -// Define print format d to display a schematic component line +// config for footprints doc file acces +#define DOC_FOOTPRINTS_LIST_KEY wxT("footprints_doc_file") +#define DEFAULT_FOOTPRINTS_LIST_FILENAME wxT("footprints_doc/footprints.pdf") + + +// Define print format to display a schematic component line #define CMP_FORMAT wxT( "%3d %8s - %16s : %-.32s" ) #define FILTERFOOTPRINTKEY "FilterFootprint" diff --git a/cvpcb/dialog_cvpcb_config.cpp b/cvpcb/dialog_cvpcb_config.cpp index 1b3a54dd57..43e44c6d73 100644 --- a/cvpcb/dialog_cvpcb_config.cpp +++ b/cvpcb/dialog_cvpcb_config.cpp @@ -85,6 +85,7 @@ wxString title; bool KiConfigCvpcbFrame::Create( wxWindow* parent, wxWindowID id, const wxString& caption, const wxPoint& pos, const wxSize& size, long style ) { ////@begin KiConfigCvpcbFrame member initialisation + m_OkButton = NULL; m_NetFormatBox = NULL; m_FileExtList = NULL; m_RightBoxSizer = NULL; @@ -118,7 +119,7 @@ void KiConfigCvpcbFrame::CreateControls() SetFont(*g_DialogFont); ////@begin KiConfigCvpcbFrame content construction - // Generated by DialogBlocks, 27/10/2007 10:35:43 (unregistered) + // Generated by DialogBlocks, 11/06/2008 14:26:13 (unregistered) KiConfigCvpcbFrame* itemDialog1 = this; @@ -136,9 +137,10 @@ void KiConfigCvpcbFrame::CreateControls() itemButton5->SetForegroundColour(wxColour(0, 0, 255)); itemBoxSizer3->Add(itemButton5, 0, wxGROW|wxLEFT|wxRIGHT, 5); - wxButton* itemButton6 = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); - itemButton6->SetForegroundColour(wxColour(0, 128, 0)); - itemBoxSizer3->Add(itemButton6, 0, wxGROW|wxALL, 5); + m_OkButton = new wxButton( itemDialog1, wxID_OK, _("&OK"), wxDefaultPosition, wxDefaultSize, 0 ); + m_OkButton->SetDefault(); + m_OkButton->SetForegroundColour(wxColour(0, 128, 0)); + itemBoxSizer3->Add(m_OkButton, 0, wxGROW|wxALL, 5); wxArrayString m_NetFormatBoxStrings; m_NetFormatBoxStrings.Add(_("&PcbNew")); @@ -234,6 +236,7 @@ void KiConfigCvpcbFrame::CreateControls() ////@end KiConfigCvpcbFrame content construction SetDialogDatas(); + m_OkButton->SetFocus( ); } /*! diff --git a/cvpcb/dialog_cvpcb_config.h b/cvpcb/dialog_cvpcb_config.h index 26bf6871dd..098ef912f3 100644 --- a/cvpcb/dialog_cvpcb_config.h +++ b/cvpcb/dialog_cvpcb_config.h @@ -140,6 +140,7 @@ public: ////@begin KiConfigCvpcbFrame member variables + wxButton* m_OkButton; wxRadioBox* m_NetFormatBox; wxStaticBoxSizer* m_FileExtList; wxBoxSizer* m_RightBoxSizer; diff --git a/cvpcb/dialog_cvpcb_config.pjd b/cvpcb/dialog_cvpcb_config.pjd index 5e67f92ee9..191095bd03 100644 --- a/cvpcb/dialog_cvpcb_config.pjd +++ b/cvpcb/dialog_cvpcb_config.pjd @@ -10,8 +10,10 @@ 0 0 0 + 1 1 1 + 1 0 "jean-pierre Charras" "License GNU" @@ -106,10 +108,12 @@ 0 0 1 + 0 1 1 0 1 + 0 @@ -132,6 +136,7 @@ 0 "" 1 + -8519680 "" "Debug" "ANSI" @@ -173,6 +178,8 @@ "%AUTO%" "%AUTO%" "%AUTO%" + 0 + 1 @@ -213,6 +220,7 @@ 0 "" 0 + 0 "ID_DIALOG" 10000 "KiConfigCvpcbFrame" @@ -233,10 +241,16 @@ 0 1 "<Any platform>" + "" + "" + "" + "" + "" + "" + "Tiled" 0 1 1 - 0 1 0 0 @@ -322,6 +336,7 @@ "wxEVT_COMMAND_BUTTON_CLICKED|OnSaveCfgClick" "SAVE_CFG" 10001 + "" "wxButton" "wxButton" 1 @@ -333,6 +348,13 @@ 0 "" "" + "" + "" + "" + "" + "" + "" + "" "" "C60000" "" @@ -381,6 +403,7 @@ "wxEVT_COMMAND_BUTTON_CLICKED|OnReadOldcfgClick" "ID_READ_OLDCFG" 10002 + "" "wxButton" "wxButton" 1 @@ -392,6 +415,13 @@ 0 "" "" + "" + "" + "" + "" + "" + "" + "" "" "0000FF" "" @@ -437,20 +467,28 @@ 0 "17/11/2006" "wbButtonProxy" - "wxEVT_COMMAND_BUTTON_CLICKED|OnOkClick" + "wxEVT_COMMAND_BUTTON_CLICKED|OnOkClick|||KiConfigCvpcbFrame" "wxID_OK" 5100 + "" "wxButton" "wxButton" 1 0 "" "" - "" + "m_OkButton" "&OK" - 0 + 1 "" "" + "" + "" + "" + "" + "" + "" + "" "" "008000" "" @@ -499,6 +537,7 @@ "wxEVT_COMMAND_RADIOBOX_SELECTED|OnFormatNetlistSelected" "FORMAT_NETLIST" 10003 + "" "wxRadioBox" "wxRadioBox" 1 @@ -520,6 +559,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 1 0 @@ -719,6 +763,7 @@ "wxEVT_COMMAND_BUTTON_CLICKED|OnDelLibClick" "DEL_LIB" 10004 + "" "wxButton" "wxButton" 1 @@ -730,6 +775,13 @@ 0 "" "" + "" + "" + "" + "" + "" + "" + "" "" "BF0000" "" @@ -778,6 +830,7 @@ "wxEVT_COMMAND_BUTTON_CLICKED|OnAddLibClick" "ADD_LIB" 10005 + "" "wxButton" "wxButton" 1 @@ -789,6 +842,13 @@ 0 "" "" + "" + "" + "" + "" + "" + "" + "" "" "008000" "" @@ -837,6 +897,7 @@ "wxEVT_COMMAND_BUTTON_CLICKED|OnInsertLibClick" "INSERT_LIB" 10006 + "" "wxButton" "wxButton" 1 @@ -848,6 +909,13 @@ 0 "" "" + "" + "" + "" + "" + "" + "" + "" "" "0000FF" "" @@ -921,6 +989,7 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" "wxStaticText" 1 @@ -940,6 +1009,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -985,6 +1059,7 @@ "wbListBoxProxy" "ID_LISTBOX" 10010 + "" "wxListBox" "wxListBox" 1 @@ -1004,6 +1079,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 1 0 0 @@ -1131,6 +1211,7 @@ "wxEVT_COMMAND_BUTTON_CLICKED|OnDelEquClick" "DEL_EQU" 10007 + "" "wxButton" "wxButton" 1 @@ -1142,6 +1223,13 @@ 0 "" "" + "" + "" + "" + "" + "" + "" + "" "" "C40000" "" @@ -1190,6 +1278,7 @@ "wxEVT_COMMAND_BUTTON_CLICKED|OnAddEquClick" "ADD_EQU" 10008 + "" "wxButton" "wxButton" 1 @@ -1201,6 +1290,13 @@ 0 "" "" + "" + "" + "" + "" + "" + "" + "" "" "008000" "" @@ -1249,6 +1345,7 @@ "wxEVT_COMMAND_BUTTON_CLICKED|OnInsertEquClick" "INSERT_EQU" 10009 + "" "wxButton" "wxButton" 1 @@ -1260,6 +1357,13 @@ 0 "" "" + "" + "" + "" + "" + "" + "" + "" "" "0000FF" "" @@ -1333,6 +1437,7 @@ "wbStaticTextProxy" "wxID_STATIC" 5105 + "" "wxStaticText" "wxStaticText" 1 @@ -1352,6 +1457,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 0 0 0 @@ -1397,6 +1507,7 @@ "wbListBoxProxy" "ID_LISTBOX1" 10011 + "" "wxListBox" "wxListBox" 1 @@ -1416,6 +1527,11 @@ "<Any platform>" "" "" + "" + "" + "" + "" + "" 1 0 0 diff --git a/cvpcb/menucfg.cpp b/cvpcb/menucfg.cpp index e7e02c893f..9fa09a45b1 100644 --- a/cvpcb/menucfg.cpp +++ b/cvpcb/menucfg.cpp @@ -24,9 +24,6 @@ #include "protos.h" -/* Routines Locales */ - - /*****************************************/ /* classe pour la frame de Configuration */ /*****************************************/ @@ -86,7 +83,7 @@ void KiConfigCvpcbFrame::SetDialogDatas() m_PkgExtBoxSizer, wxDefaultSize); wxString DocModuleFileName = - g_EDA_Appl->m_EDA_CommonConfig->Read( wxT("module_doc_file"), wxT("pcbnew/footprints.pdf")); + g_EDA_Appl->m_EDA_CommonConfig->Read( DOC_FOOTPRINTS_LIST_KEY, DEFAULT_FOOTPRINTS_LIST_FILENAME); m_TextHelpModulesFileName = new WinEDA_EnterText(this, _("Module Doc File:"), DocModuleFileName, m_RightBoxSizer, wxDefaultSize); @@ -132,7 +129,7 @@ wxString msg; if ( ! m_DoUpdate ) return; NetInExtBuffer = m_NetInputExtCtrl->GetValue(); PkgInExtBuffer = m_PkgExtCtrl->GetValue(); - g_EDA_Appl->m_EDA_CommonConfig->Write( wxT("module_doc_file"), + g_EDA_Appl->m_EDA_CommonConfig->Write( DOC_FOOTPRINTS_LIST_KEY, m_TextHelpModulesFileName->GetValue()); msg = m_LibDirCtrl->GetValue(); diff --git a/cvpcb/tool_cvpcb.cpp b/cvpcb/tool_cvpcb.cpp index c3aac795e0..ef34a67226 100644 --- a/cvpcb/tool_cvpcb.cpp +++ b/cvpcb/tool_cvpcb.cpp @@ -32,7 +32,7 @@ void WinEDA_CvpcbFrame::ReCreateHToolbar() _("Open a NetList file")); m_HToolBar->AddTool(ID_CVPCB_SAVEQUITCVPCB, BITMAP(save_xpm), - _("Save NetList and Components List files")); + _("Save NetList and Footprints List files")); m_HToolBar->AddSeparator(); m_HToolBar->AddTool(ID_CVPCB_CREATE_CONFIGWINDOW, BITMAP(config_xpm), @@ -40,7 +40,7 @@ void WinEDA_CvpcbFrame::ReCreateHToolbar() m_HToolBar->AddSeparator(); m_HToolBar->AddTool(ID_CVPCB_CREATE_SCREENCMP, BITMAP(module_xpm), - _("View selected part")); + _("View selected footprint")); m_HToolBar->AddTool(ID_CVPCB_AUTO_ASSOCIE, BITMAP(auto_associe_xpm), _("Automatic Association")); @@ -58,11 +58,11 @@ void WinEDA_CvpcbFrame::ReCreateHToolbar() m_HToolBar->AddSeparator(); m_HToolBar->AddTool(ID_CVPCB_CREATE_STUFF_FILE, BITMAP(save_cmpstuff_xpm), - _("Create stuff file (component/module list)")); + _("Create stuff file (component/footprint list)")); m_HToolBar->AddSeparator(); m_HToolBar->AddTool(ID_PCB_DISPLAY_FOOTPRINT_DOC, BITMAP(file_footprint_xpm), - _("Display/print component documentation (footprint.pdf)")); + _("Display footprints list documentation")); m_HToolBar->AddSeparator(); m_HToolBar->AddSeparator(); @@ -114,7 +114,7 @@ wxMenuBar * menuBar = GetMenuBar(); m_FilesMenu->AppendSeparator(); item = new wxMenuItem(m_FilesMenu, ID_SAVE_PROJECT, _("&Save As..."), - _("Save New NetList and Components List files") ); + _("Save New NetList and Footprints List files") ); item->SetBitmap(save_xpm); m_FilesMenu->Append(item);