Online doc format changed to PDF format. See changelog

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 );
 }
 
 

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"

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( );
 }
 
 /*!

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;

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();

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);