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

Commit fixes for bugs #1108773 and #1110651 and a bug fix improvement for #1101718 and #1102381.

This commit is contained in:
Jacobo Aragunde Perez 2013-02-01 08:58:49 +01:00 committed by jean-pierre charras
parent 85562b45e8
commit 638decafae
4 changed files with 25 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eeschema/files-io.cpp
View File

@ -174,6 +174,8 @@ void SCH_EDIT_FRAME::Save_File( wxCommandEvent& event )
} }
break; break;
} }
UpdateTitle();
} }
@ -477,6 +479,8 @@ void SCH_EDIT_FRAME::OnSaveProject( wxCommandEvent& aEvent )
SaveEEFile( screen ); SaveEEFile( screen );
CreateArchiveLibraryCacheFile(); CreateArchiveLibraryCacheFile();
UpdateTitle();
} }

5
eeschema/libarch.cpp
View File

@ -46,10 +46,7 @@
bool SCH_EDIT_FRAME::CreateArchiveLibraryCacheFile() bool SCH_EDIT_FRAME::CreateArchiveLibraryCacheFile()
{ {
wxFileName fn; wxFileName fn = GetScreen()->GetFileName();
SCH_SCREENS ScreenList;
fn = ScreenList.GetFirst()->GetFileName();
fn.SetName( fn.GetName() + wxT( "-cache" ) ); fn.SetName( fn.GetName() + wxT( "-cache" ) );
fn.SetExt( SchematicLibraryFileExtension ); fn.SetExt( SchematicLibraryFileExtension );

3
eeschema/schframe.cpp
View File

@ -514,8 +514,7 @@ double SCH_EDIT_FRAME::BestZoom()
wxString SCH_EDIT_FRAME::GetUniqueFilenameForCurrentSheet() wxString SCH_EDIT_FRAME::GetUniqueFilenameForCurrentSheet()
{ {
SCH_SCREENS ScreenList; wxFileName fn = GetScreen()->GetFileName();
wxFileName fn = ScreenList.GetFirst()->GetFileName();
#ifndef KICAD_GOST #ifndef KICAD_GOST
wxString filename = fn.GetName(); wxString filename = fn.GetName();

22
kicad/prjconfig.cpp
View File

@ -39,6 +39,7 @@
#include <vector> #include <vector>
#include <build_version.h> #include <build_version.h>
#include <wx/dir.h>
#include <wx/filename.h> #include <wx/filename.h>
#include <wx/stdpaths.h> #include <wx/stdpaths.h>
@ -177,10 +178,25 @@ void KICAD_MANAGER_FRAME::OnLoadProject( wxCommandEvent& event )
if( newProject ) if( newProject )
{ {
if ( !m_ProjectFileName.GetFullPath().EndsWith( g_KicadPrjFilenameExtension ) ) m_ProjectFileName.SetExt( ProjectFileExtension );
// Check if the project directory is empty
wxDir directory ( m_ProjectFileName.GetPath() );
if( directory.HasFiles() )
{ {
m_ProjectFileName.SetFullName( m_ProjectFileName.GetFullPath() + wxString msg = _( "The selected directory is not empty. "
g_KicadPrjFilenameExtension ); "We recommend you create projects in their own clean directory.\n\n"
"Do you want to create a new empty directory for the project?" );
if( IsOK( this, msg ) )
{
// Append a new directory with the same name of the project file
// and try to create it
m_ProjectFileName.AppendDir( m_ProjectFileName.GetName() );
if( !wxMkdir( m_ProjectFileName.GetPath() ) )
// There was a problem, undo
m_ProjectFileName.RemoveLastDir();
}
} }
if( event.GetId() == ID_NEW_PROJECT ) if( event.GetId() == ID_NEW_PROJECT )