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

Clean up some handling of project files in standalone 

Add control of project creation to Eeschema; change defaults
to enable project creation in both programs.  Properly set
project on newly-created schematics so "Save As" doesn't
get triggered repeatedly.

Fixes https://gitlab.com/kicad/code/kicad/-/issues/9000
This commit is contained in:
Jon Evans 2021-08-21 12:09:13 -04:00
parent 3e57700b21
commit 0814219513
4 changed files with 83 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
common/settings/settings_manager.cpp
View File

@ -939,6 +939,12 @@ void SETTINGS_MANAGER::SaveProjectAs( const wxString& aFullPath )
wxFileName fn( aFullPath );
PROJECT_FILE* project = m_project_files.at( oldName );
// Ensure read-only flags are copied; this allows doing a "Save As" on a standalong board/sch
// without creating project files if the checkbox is turned off
project->SetReadOnly( Prj().IsReadOnly() );
Prj().GetLocalSettings().SetReadOnly( Prj().IsReadOnly() );
project->SetFilename( fn.GetName() );
project->SaveToFile( fn.GetPath() );

78
eeschema/files-io.cpp
View File

@ -63,7 +63,42 @@
#include <wx_filename.h> // For ::ResolvePossibleSymlinks
#include <widgets/wx_progress_reporters.h>
bool SCH_EDIT_FRAME::SaveEEFile( SCH_SHEET* aSheet, bool aSaveUnderNewName )
///< Helper widget to select whether a new project should be created for a file when saving
class CREATE_PROJECT_CHECKBOX : public wxPanel
{
public:
CREATE_PROJECT_CHECKBOX( wxWindow* aParent )
: wxPanel( aParent )
{
m_cbCreateProject = new wxCheckBox( this, wxID_ANY,
_( "Create a new project for this schematic" ) );
m_cbCreateProject->SetValue( false );
m_cbCreateProject->SetToolTip( _( "Creating a project will enable features such as "
"text variables, net classes, and ERC exclusions" ) );
wxBoxSizer* sizer = new wxBoxSizer( wxHORIZONTAL );
sizer->Add( m_cbCreateProject, 0, wxALL, 8 );
SetSizerAndFit( sizer );
}
bool GetValue() const
{
return m_cbCreateProject->GetValue();
}
static wxWindow* Create( wxWindow* aParent )
{
return new CREATE_PROJECT_CHECKBOX( aParent );
}
protected:
wxCheckBox* m_cbCreateProject;
};
bool SCH_EDIT_FRAME::SaveEEFile( SCH_SHEET* aSheet, bool aSaveUnderNewName, bool* aCreateProject )
{
wxString msg;
wxFileName schematicFileName;
@ -101,6 +136,9 @@ bool SCH_EDIT_FRAME::SaveEEFile( SCH_SHEET* aSheet, bool aSaveUnderNewName )
schematicFileName.GetFullName(), KiCadSchematicFileWildcard(),
wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
// Add a "Create a project" checkbox in standalone mode and one isn't loaded
dlg.SetExtraControlCreator( &CREATE_PROJECT_CHECKBOX::Create );
if( dlg.ShowModal() == wxID_CANCEL )
return false;
@ -108,6 +146,14 @@ bool SCH_EDIT_FRAME::SaveEEFile( SCH_SHEET* aSheet, bool aSaveUnderNewName )
if( schematicFileName.GetExt().IsEmpty() )
schematicFileName.SetExt( KiCadSchematicFileExtension );
wxWindow* extraControl = dlg.GetExtraControl();
if( aCreateProject )
{
wxASSERT( extraControl );
*aCreateProject = static_cast<CREATE_PROJECT_CHECKBOX*>( extraControl )->GetValue();
}
}
// Write through symlinks, don't replace them
@ -216,7 +262,9 @@ void SCH_EDIT_FRAME::Save_File( bool doSaveAs )
{
if( doSaveAs )
{
if( SaveEEFile( nullptr, true ) )
bool createProject = false;
if( SaveEEFile( nullptr, true, &createProject ) )
{
SCH_SCREEN* screen = GetScreen();
@ -232,7 +280,7 @@ void SCH_EDIT_FRAME::Save_File( bool doSaveAs )
if( fn.IsDirWritable() && !fn.FileExists() )
{
Prj().SetReadOnly( false );
Prj().SetReadOnly( !createProject );
GetSettingsManager()->SaveProjectAs( fn.GetFullPath() );
}
}
@ -783,8 +831,9 @@ bool SCH_EDIT_FRAME::SaveProject()
wxString msg;
SCH_SCREEN* screen;
SCH_SCREENS screens( Schematic().Root() );
bool success = true;
bool updateFileType = false;
bool success = true;
bool updateFileType = false;
bool createNewProject = false;
// I want to see it in the debugger, show me the string! Can't do that with wxFileName.
wxString fileName = Prj().AbsolutePath( Schematic().Root().GetFileName() );
@ -793,7 +842,7 @@ bool SCH_EDIT_FRAME::SaveProject()
// If this a new schematic without a project and we are in the stand alone mode. All new
// sheets that are not loaded from an existing file will have to be saved to a new path
// along with the root sheet.
if( Prj().GetProjectFullName().IsEmpty() )
if( Prj().IsNullProject() )
{
// This should only be possible in stand alone mode.
wxCHECK( Kiface().IsSingle(), false );
@ -801,6 +850,9 @@ bool SCH_EDIT_FRAME::SaveProject()
wxFileDialog dlg( this, _( "Schematic Files" ), fn.GetPath(), fn.GetFullName(),
KiCadSchematicFileWildcard(), wxFD_SAVE | wxFD_OVERWRITE_PROMPT );
// Add a "Create a project" checkbox in standalone mode and one isn't loaded
dlg.SetExtraControlCreator( &CREATE_PROJECT_CHECKBOX::Create );
if( dlg.ShowModal() == wxID_CANCEL )
return false;
@ -825,6 +877,9 @@ bool SCH_EDIT_FRAME::SaveProject()
Schematic().Root().SetFileName( newFileName.GetFullName() );
Schematic().RootScreen()->SetFileName( newFileName.GetFullPath() );
if( wxWindow* extraControl = dlg.GetExtraControl() )
createNewProject = static_cast<CREATE_PROJECT_CHECKBOX*>( extraControl )->GetValue();
// Set the base path to all new sheets.
for( size_t i = 0; i < screens.GetCount(); i++ )
{
@ -1011,7 +1066,16 @@ bool SCH_EDIT_FRAME::SaveProject()
}
if( !Prj().IsNullProject() )
Pgm().GetSettingsManager().SaveProject();
{
GetSettingsManager()->SaveProject();
}
else
{
Prj().SetReadOnly( !createNewProject );
wxFileName projectPath( Schematic().GetFileName() );
projectPath.SetExt( ProjectFileExtension );
GetSettingsManager()->SaveProjectAs( projectPath.GetFullPath() );
}
if( !Kiface().IsSingle() )
{

7
eeschema/sch_edit_frame.h
View File

@ -499,10 +499,13 @@ public:
* current screen only.
* @param aSaveUnderNewName Controls how the file is to be saved;: using previous name
* or under a new name.
* @param aCreateProject will be filled with the user's choice of whether to create a new
* project file if aSaveUnderNewName is true. This value will not be
* changed if aSaveUnderNewName is false.
* @return True if the file has been saved.
*/
bool SaveEEFile( SCH_SHEET* aSheet, bool aSaveUnderNewName = false );
bool SaveEEFile( SCH_SHEET* aSheet, bool aSaveUnderNewName = false,
bool* aCreateProject = nullptr );
/**
* Check if any of the screens has unsaved changes and asks the user whether to save or

2
pcbnew/files.cpp
View File

@ -212,7 +212,7 @@ public:
{
m_cbCreateProject = new wxCheckBox( this, wxID_ANY,
_( "Create a new project for this board" ) );
m_cbCreateProject->SetValue( false );
m_cbCreateProject->SetValue( true );
m_cbCreateProject->SetToolTip( _( "Creating a project will enable features such as "
"design rules, net classes, and layer presets" ) );