Cvpcb: force project name in stand alone mode, to allow access to project fp...

Cvpcb: force project name in stand alone mode, to allow access to project fp lib table. In project mode: disable the read netlist option (the netlist is read when Cvpcb is started by eeschema)
Dialog fp lib table editor: now shows the table full filenames, to help users.

cvpcb/cvframe.cpp

@@ -438,25 +438,39 @@ void CVPCB_MAINFRAME::LoadNetList( wxCommandEvent& event )
 
 bool CVPCB_MAINFRAME::OpenProjectFiles( const std::vector<wxString>& aFileSet, int aCtl )
 {
-    if( aFileSet.size() == 1 )
-    {
-        m_NetlistFileName = aFileSet[0];
-        ReadNetListAndLinkFiles();
+    if( aFileSet.size() != 1 )  // Unexpected comand
+        return false;
 
-        UpdateTitle();
+    m_NetlistFileName = aFileSet[0];
+    ReadNetListAndLinkFiles();
 
-        // Resize the components list box. This is needed in case the
-        // contents have shrunk compared to the previous netlist.
-        m_compListBox->UpdateWidth();
+    UpdateTitle();
 
-        // OSX need it since some objects are "rebuild" just make aware AUI
-        // Fixes #1258081
-        m_auimgr.Update();
+    // Resize the components list box. This is needed in case the
+    // contents have shrunk compared to the previous netlist.
+    m_compListBox->UpdateWidth();
+
+    // OSX need it since some objects are "rebuild" just make aware AUI
+    // Fixes #1258081
+    m_auimgr.Update();
 
-        return true;
+    if( Kiface().IsSingle() )
+    {
+        // PROJECT::SetProjectFullName() is an impactful function.  It should only be
+        // called under carefully considered circumstances.
+
+        // The calling code should know not to ask me here to change projects unless
+        // it knows what consequences that will have on other KIFACEs running and using
+        // this same PROJECT.  It can be very harmful if that calling code is stupid.
+        //
+        // In Cvpcb, we call SetProjectFullName only in Single mode, i.e. it is not
+        // called from a project
+        wxFileName pro = m_NetlistFileName;
+        pro.SetExt( ProjectFileExtension );
+        Prj().SetProjectFullName( pro.GetFullPath() );
     }
 
-    return false;
+    return true;
 }
 
 

cvpcb/menubar.cpp

@@ -64,50 +64,49 @@ void CVPCB_MAINFRAME::ReCreateMenuBar()
     // Menu File:
     wxMenu* filesMenu = new wxMenu;
 
-    // Open
-    AddMenuItem( filesMenu,
-                 ID_LOAD_PROJECT,
-                 _( "&Open Netlist" ), LOAD_FILE_HELP, KiBitmap( open_document_xpm ) );
+    // Open files can be used only outside a project, because opening a netlist
+    // which is not the project netlist is a non sense.
+    if( Kiface().IsSingle() )
+    {
+        AddMenuItem( filesMenu, ID_LOAD_PROJECT,
+                     _( "&Open Netlist" ), LOAD_FILE_HELP, KiBitmap( open_document_xpm ) );
 
-    // Open Recent submenu
-    static wxMenu* openRecentMenu;
+        // Open Recent submenu
+        static wxMenu* openRecentMenu;
 
-    // Add this menu to list menu managed by m_fileHistory
-    // (the file history will be updated when adding/removing files in history
-    if( openRecentMenu )
-        Kiface().GetFileHistory().RemoveMenu( openRecentMenu );
+        // Add this menu to list menu managed by m_fileHistory
+        // (the file history will be updated when adding/removing files in history
+        if( openRecentMenu )
+            Kiface().GetFileHistory().RemoveMenu( openRecentMenu );
 
-    openRecentMenu = new wxMenu();
+        openRecentMenu = new wxMenu();
 
-    Kiface().GetFileHistory().UseMenu( openRecentMenu );
-    Kiface().GetFileHistory().AddFilesToMenu();
+        Kiface().GetFileHistory().UseMenu( openRecentMenu );
+        Kiface().GetFileHistory().AddFilesToMenu();
 
-    AddMenuItem( filesMenu, openRecentMenu, -1,
-                 _( "Open &Recent" ),
-                 _( "Open recent netlist" ),
-                 KiBitmap( open_project_xpm ) );
+        AddMenuItem( filesMenu, openRecentMenu, -1,
+                     _( "Open &Recent" ),
+                     _( "Open recent netlist" ),
+                     KiBitmap( open_project_xpm ) );
 
-    // Separator
-    filesMenu->AppendSeparator();
+        // Separator
+        filesMenu->AppendSeparator();
+    }
 
     // Save the .cmp file
-    AddMenuItem( filesMenu,
-                 wxID_SAVE,
+    AddMenuItem( filesMenu, wxID_SAVE,
                  _( "&Save\tCtrl+S" ), SAVE_HLP_MSG, KiBitmap( save_xpm ) );
 
     // Save as the .cmp file
-    AddMenuItem( filesMenu,
-                 wxID_SAVEAS,
+    AddMenuItem( filesMenu, wxID_SAVEAS,
                  _( "Save &As...\tCtrl+Shift+S" ), SAVE_AS_HLP_MSG, KiBitmap( save_xpm ) );
 
     // Separator
     filesMenu->AppendSeparator();
 
     // Quit
-    AddMenuItem( filesMenu,
-                 wxID_EXIT,
-                 _( "&Quit" ),
-                 _( "Quit CvPcb" ),
+    AddMenuItem( filesMenu, wxID_EXIT,
+                 _( "&Quit" ), _( "Quit CvPcb" ),
                  KiBitmap( exit_xpm ) );
 
     // Menu Preferences:

cvpcb/tool_cvpcb.cpp

@@ -49,8 +49,13 @@ void CVPCB_MAINFRAME::ReCreateHToolbar()
     m_mainToolBar = new wxAuiToolBar( this, ID_H_TOOLBAR, wxDefaultPosition, wxDefaultSize,
                                       wxAUI_TB_DEFAULT_STYLE | wxAUI_TB_HORZ_LAYOUT );
 
-    m_mainToolBar->AddTool( ID_CVPCB_READ_INPUT_NETLIST, wxEmptyString,
-                            KiBitmap( open_document_xpm ), LOAD_FILE_HELP );
+    // Open files can be used only outside a project, because opening a netlist
+    // which is not the project netlist is a non sense.
+    if( Kiface().IsSingle() )
+    {
+        m_mainToolBar->AddTool( ID_CVPCB_READ_INPUT_NETLIST, wxEmptyString,
+                                KiBitmap( open_document_xpm ), LOAD_FILE_HELP );
+    }
 
     m_mainToolBar->AddTool( wxID_SAVE, wxEmptyString, KiBitmap( save_xpm ), SAVE_HLP_MSG );
 

pcbnew/dialogs/dialog_fp_lib_table.cpp

@@ -295,6 +295,10 @@ public:
         m_global( aGlobal ),
         m_project( aProject )
     {
+        // For user info, shows the table filenames:
+        m_PrjTableFilename->SetLabel( Prj().FootprintLibTblName() );
+        m_GblTableFilename->SetLabel( FP_LIB_TABLE::GetGlobalTableFileName() );
+
         // wxGrid only supports user owned tables if they exist past end of ~wxGrid(),
         // so make it a grid owned table.
         m_global_grid->SetTable(  new FP_TBL_MODEL( *aGlobal ),  true );

pcbnew/dialogs/dialog_fp_lib_table_base.cpp

@@ -24,6 +24,22 @@ DIALOG_FP_LIB_TABLE_BASE::DIALOG_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID
 	wxBoxSizer* m_global_sizer;
 	m_global_sizer = new wxBoxSizer( wxVERTICAL );
 	
+	wxFlexGridSizer* fgSizer1;
+	fgSizer1 = new wxFlexGridSizer( 1, 2, 0, 0 );
+	fgSizer1->SetFlexibleDirection( wxBOTH );
+	fgSizer1->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_staticText3 = new wxStaticText( m_global_panel, wxID_ANY, _("Table:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText3->Wrap( -1 );
+	fgSizer1->Add( m_staticText3, 0, wxRIGHT|wxLEFT, 5 );
+	
+	m_GblTableFilename = new wxStaticText( m_global_panel, wxID_ANY, _("Table Name"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_GblTableFilename->Wrap( -1 );
+	fgSizer1->Add( m_GblTableFilename, 0, wxRIGHT|wxLEFT, 5 );
+	
+	
+	m_global_sizer->Add( fgSizer1, 0, wxEXPAND, 5 );
+	
 	m_global_grid = new wxGrid( m_global_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 	
 	// Grid
@@ -60,6 +76,22 @@ DIALOG_FP_LIB_TABLE_BASE::DIALOG_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID
 	wxBoxSizer* m_project_sizer;
 	m_project_sizer = new wxBoxSizer( wxVERTICAL );
 	
+	wxFlexGridSizer* fgSizer2;
+	fgSizer2 = new wxFlexGridSizer( 1, 2, 0, 0 );
+	fgSizer2->SetFlexibleDirection( wxBOTH );
+	fgSizer2->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
+	
+	m_staticText4 = new wxStaticText( m_project_panel, wxID_ANY, _("Table:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText4->Wrap( -1 );
+	fgSizer2->Add( m_staticText4, 0, wxRIGHT|wxLEFT, 5 );
+	
+	m_PrjTableFilename = new wxStaticText( m_project_panel, wxID_ANY, _("Table Name"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_PrjTableFilename->Wrap( -1 );
+	fgSizer2->Add( m_PrjTableFilename, 0, wxRIGHT|wxLEFT, 5 );
+	
+	
+	m_project_sizer->Add( fgSizer2, 0, wxEXPAND, 5 );
+	
 	m_project_grid = new wxGrid( m_project_panel, wxID_ANY, wxDefaultPosition, wxDefaultSize, 0 );
 	
 	// Grid

pcbnew/dialogs/dialog_fp_lib_table_base.h

@@ -14,13 +14,14 @@
 class DIALOG_SHIM;
 
 #include "dialog_shim.h"
-#include <wx/colour.h>
-#include <wx/settings.h>
 #include <wx/string.h>
-#include <wx/font.h>
-#include <wx/grid.h>
+#include <wx/stattext.h>
 #include <wx/gdicmn.h>
+#include <wx/font.h>
+#include <wx/colour.h>
+#include <wx/settings.h>
 #include <wx/sizer.h>
+#include <wx/grid.h>
 #include <wx/panel.h>
 #include <wx/bitmap.h>
 #include <wx/image.h>
@@ -43,8 +44,12 @@ class DIALOG_FP_LIB_TABLE_BASE : public DIALOG_SHIM
 	protected:
 		wxAuiNotebook* m_auinotebook;
 		wxPanel* m_global_panel;
+		wxStaticText* m_staticText3;
+		wxStaticText* m_GblTableFilename;
 		wxGrid* m_global_grid;
 		wxPanel* m_project_panel;
+		wxStaticText* m_staticText4;
+		wxStaticText* m_PrjTableFilename;
 		wxGrid* m_project_grid;
 		wxButton* m_append_button;
 		wxButton* m_buttonWizard;