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

Symbol editor: don't allow new or imported symbols in read only libraries. 

Fixes https://gitlab.com/kicad/code/kicad/issues/7334
This commit is contained in:
Wayne Stambaugh 2021-01-30 12:59:04 -05:00
parent fabafe719d
commit 7737489e57
3 changed files with 36 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
eeschema/symbol_editor/symbol_edit_frame.cpp
View File

@ -357,6 +357,13 @@ void SYMBOL_EDIT_FRAME::setupUIConditions()
return !getTargetLibId().GetLibNickname().empty();
};
auto canEditLib =
[this] ( const SELECTION& sel )
{
return !getTargetLibId().GetLibNickname().empty() &&
!m_libMgr->IsLibraryReadOnly( getTargetLibId().GetLibNickname() );
};
mgr->SetConditions( ACTIONS::saveAll,
ENABLE( schematicModifiedCond || libModifiedCondition ) );
mgr->SetConditions( ACTIONS::save,
@ -365,6 +372,8 @@ void SYMBOL_EDIT_FRAME::setupUIConditions()
ENABLE( schematicModifiedCond ) );
mgr->SetConditions( EE_ACTIONS::saveLibraryAs, ENABLE( libSelectedCondition ) );
mgr->SetConditions( EE_ACTIONS::saveSymbolAs, ENABLE( haveSymbolCond ) );
mgr->SetConditions( EE_ACTIONS::newSymbol, ENABLE( !libSelectedCondition || canEditLib ) );
mgr->SetConditions( EE_ACTIONS::importSymbol, ENABLE( !libSelectedCondition || canEditLib ) );
mgr->SetConditions( ACTIONS::undo,
ENABLE( haveSymbolCond && cond.UndoAvailable() ) );

6
eeschema/symbol_editor/symbol_editor.cpp
View File

@ -3,7 +3,7 @@
*
* Copyright (C) 2019 Jean-Pierre Charras, jp.charras at wanadoo.fr
* Copyright (C) 2008 Wayne Stambaugh <stambaughw@gmail.com>
* Copyright (C) 2004-2020 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2004-2021 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -190,6 +190,10 @@ wxString SYMBOL_EDIT_FRAME::SelectLibraryFromList()
{
wxArrayString item;
// Exclude read only libraries.
if( m_libMgr->IsLibraryReadOnly( name ) )
continue;
item.Add( name );
itemsToDisplay.push_back( item );
}

30
eeschema/tools/symbol_editor_control.cpp
View File

@ -2,7 +2,7 @@
* This program source code file is part of KiCad, a free EDA CAD application.
*
* Copyright (C) 2019 CERN
* Copyright (C) 2019-2020 KiCad Developers, see AUTHORS.txt for contributors.
* Copyright (C) 2019-2021 KiCad Developers, see AUTHORS.txt for contributors.
*
* This program is free software; you can redistribute it and/or
* modify it under the terms of the GNU General Public License
@ -28,6 +28,7 @@
#include <tools/ee_actions.h>
#include <tools/symbol_editor_control.h>
#include <symbol_edit_frame.h>
#include <symbol_library_manager.h>
#include <symbol_viewer_frame.h>
#include <symbol_tree_model_adapter.h>
#include <wildcards_and_files_ext.h>
@ -46,12 +47,20 @@ bool SYMBOL_EDITOR_CONTROL::Init()
CONDITIONAL_MENU& ctxMenu = m_menu.GetMenu();
SYMBOL_EDIT_FRAME* editFrame = getEditFrame<SYMBOL_EDIT_FRAME>();
wxCHECK( editFrame, false );
auto libSelectedCondition =
[ editFrame ]( const SELECTION& aSel )
{
LIB_ID sel = editFrame->GetTreeLIBID();
return !sel.GetLibNickname().empty() && sel.GetLibItemName().empty();
};
auto canEditLibrary =
[ editFrame ]( const SELECTION& aSel )
{
LIB_ID sel = editFrame->GetTreeLIBID();
return !editFrame->GetLibManager().IsLibraryReadOnly( sel.GetLibNickname() );
};
auto pinnedLibSelectedCondition =
[ editFrame ]( const SELECTION& aSel )
{
@ -82,8 +91,9 @@ bool SYMBOL_EDITOR_CONTROL::Init()
ctxMenu.AddItem( ACTIONS::revert, libSelectedCondition );
ctxMenu.AddSeparator();
ctxMenu.AddItem( EE_ACTIONS::newSymbol, libSelectedCondition );
ctxMenu.AddItem( EE_ACTIONS::editSymbol, symbolSelectedCondition );
ctxMenu.AddItem( EE_ACTIONS::newSymbol, libSelectedCondition && canEditLibrary );
ctxMenu.AddItem( EE_ACTIONS::editSymbol,
symbolSelectedCondition && canEditLibrary );
ctxMenu.AddSeparator();
ctxMenu.AddItem( ACTIONS::save, symbolSelectedCondition );
@ -91,14 +101,18 @@ bool SYMBOL_EDITOR_CONTROL::Init()
ctxMenu.AddItem( ACTIONS::revert, symbolSelectedCondition );
ctxMenu.AddSeparator();
ctxMenu.AddItem( EE_ACTIONS::cutSymbol, symbolSelectedCondition );
ctxMenu.AddItem( EE_ACTIONS::cutSymbol,
symbolSelectedCondition && canEditLibrary );
ctxMenu.AddItem( EE_ACTIONS::copySymbol, symbolSelectedCondition );
ctxMenu.AddItem( EE_ACTIONS::pasteSymbol, SELECTION_CONDITIONS::ShowAlways );
ctxMenu.AddItem( EE_ACTIONS::duplicateSymbol, symbolSelectedCondition );
ctxMenu.AddItem( EE_ACTIONS::deleteSymbol, symbolSelectedCondition );
ctxMenu.AddItem( EE_ACTIONS::pasteSymbol,
SELECTION_CONDITIONS::ShowAlways && canEditLibrary );
ctxMenu.AddItem( EE_ACTIONS::duplicateSymbol,
symbolSelectedCondition && canEditLibrary );
ctxMenu.AddItem( EE_ACTIONS::deleteSymbol,
symbolSelectedCondition && canEditLibrary );
ctxMenu.AddSeparator();
ctxMenu.AddItem( EE_ACTIONS::importSymbol, libSelectedCondition );
ctxMenu.AddItem( EE_ACTIONS::importSymbol, libSelectedCondition && canEditLibrary);
ctxMenu.AddItem( EE_ACTIONS::exportSymbol, symbolSelectedCondition );
}