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

Symbol editor: minor fixes to disable saving the legacy file format. 

Fixes https://gitlab.com/kicad/code/kicad/issues/4093
This commit is contained in:
Wayne Stambaugh 2020-05-22 10:12:44 -04:00
parent 6c8b937e1b
commit c2d94358fc
6 changed files with 11 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
eeschema/libedit/lib_edit_frame.cpp
View File

@ -3,7 +3,7 @@
* *
* Copyright (C) 2013 Jean-Pierre Charras, jp.charras at wanadoo.fr * Copyright (C) 2013 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2008 Wayne Stambaugh <stambaughw@gmail.com> * Copyright (C) 2008 Wayne Stambaugh <stambaughw@gmail.com>
* Copyright (C) 2004-2019 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 2004-2020 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -696,7 +696,7 @@ bool LIB_EDIT_FRAME::backupFile( const wxFileName& aOriginalFile, const wxString
if( aOriginalFile.FileExists() ) if( aOriginalFile.FileExists() )
{ {
wxFileName backupFileName( aOriginalFile ); wxFileName backupFileName( aOriginalFile );
backupFileName.SetExt( "bck" ); backupFileName.SetExt( aBackupExt );
if( backupFileName.FileExists() ) if( backupFileName.FileExists() )
wxRemoveFile( backupFileName.GetFullPath() ); wxRemoveFile( backupFileName.GetFullPath() );

13
eeschema/libedit/lib_manager.cpp
View File

@ -272,18 +272,7 @@ bool LIB_MANAGER::IsLibraryReadOnly( const wxString& aLibrary ) const
{ {
wxCHECK( LibraryExists( aLibrary ), true ); wxCHECK( LibraryExists( aLibrary ), true );
wxFileName fn( symTable()->GetFullURI( aLibrary ) ); return !symTable()->IsSymbolLibWritable( aLibrary );
// From hence forth, legacy symbol libraries are not writable.
const SYMBOL_LIB_TABLE_ROW* row = dynamic_cast<const SYMBOL_LIB_TABLE_ROW*>(
symTable()->FindRowByURI( fn.GetFullPath() ) );
SCH_IO_MGR::SCH_FILE_T fileType = SCH_IO_MGR::SCH_FILE_T::SCH_FILE_UNKNOWN;
if( row )
fileType = SCH_IO_MGR::EnumFromStr( row->GetType() );
return ( fileType == SCH_IO_MGR::SCH_FILE_T::SCH_LEGACY ) ||
( fn.FileExists() && !fn.IsFileWritable() ) || !fn.IsDirWritable();
} }

2
eeschema/libedit/libedit.cpp
View File

@ -841,7 +841,7 @@ bool LIB_EDIT_FRAME::saveLibrary( const wxString& aLibrary, bool aNewFile )
} }
// Verify the user has write privileges before attempting to save the library file. // Verify the user has write privileges before attempting to save the library file.
if( !IsWritable( fn ) ) if( m_libMgr->IsLibraryReadOnly( aLibrary ) )
return false; return false;
ClearMsgPanel(); ClearMsgPanel();

4
eeschema/libedit/menubar_libedit.cpp
View File

@ -3,7 +3,7 @@
* *
* Copyright (C) 2007 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com * Copyright (C) 2007 Jean-Pierre Charras, jaen-pierre.charras@gipsa-lab.inpg.com
* Copyright (C) 2009 Wayne Stambaugh <stambaughw@gmail.com> * Copyright (C) 2009 Wayne Stambaugh <stambaughw@gmail.com>
* Copyright (C) 1992-2019 KiCad Developers, see AUTHORS.txt for contributors. * Copyright (C) 1992-2020 KiCad Developers, see AUTHORS.txt for contributors.
* *
* This program is free software; you can redistribute it and/or * This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License * modify it under the terms of the GNU General Public License
@ -45,7 +45,7 @@ void LIB_EDIT_FRAME::ReCreateMenuBar()
LIB_ID libId = getTargetLibId(); LIB_ID libId = getTargetLibId();
const wxString& libName = libId.GetLibNickname(); const wxString& libName = libId.GetLibNickname();
const wxString& partName = libId.GetLibItemName(); const wxString& partName = libId.GetLibItemName();
bool readOnly = libName.IsEmpty(); bool readOnly = libName.IsEmpty() || m_libMgr->IsLibraryReadOnly( libName );
if( partName.IsEmpty() ) if( partName.IsEmpty() )
return ( !readOnly && m_libMgr->IsLibraryModified( libName ) ); return ( !readOnly && m_libMgr->IsLibraryModified( libName ) );

3
eeschema/sch_legacy_plugin.cpp
View File

@ -4537,7 +4537,8 @@ bool SCH_LEGACY_PLUGIN::CheckHeader( const wxString& aFileName )
bool SCH_LEGACY_PLUGIN::IsSymbolLibWritable( const wxString& aLibraryPath ) bool SCH_LEGACY_PLUGIN::IsSymbolLibWritable( const wxString& aLibraryPath )
{ {
return wxFileName::IsFileWritable( aLibraryPath ); // Writing legacy symbol libraries is deprecated.
return false;
} }

4
eeschema/sch_sexpr_plugin.cpp
View File

@ -2175,7 +2175,9 @@ bool SCH_SEXPR_PLUGIN::CheckHeader( const wxString& aFileName )
bool SCH_SEXPR_PLUGIN::IsSymbolLibWritable( const wxString& aLibraryPath ) bool SCH_SEXPR_PLUGIN::IsSymbolLibWritable( const wxString& aLibraryPath )
{ {
return wxFileName::IsFileWritable( aLibraryPath ); wxFileName fn( aLibraryPath );
return ( fn.FileExists() && fn.IsFileWritable() ) || fn.IsDirWritable();
} }