Formatting.

This commit is contained in:
Jeff Young 2021-11-13 19:41:02 +00:00
parent e3ddc412d2
commit cc6e3841ae
1 changed files with 60 additions and 60 deletions

View File

@ -349,43 +349,43 @@ void SYMBOL_EDIT_FRAME::setupUIConditions()
#define CHECK( x ) ACTION_CONDITIONS().Check( x ) #define CHECK( x ) ACTION_CONDITIONS().Check( x )
auto haveSymbolCond = auto haveSymbolCond =
[this] ( const SELECTION& ) [this]( const SELECTION& )
{ {
return m_symbol; return m_symbol;
}; };
auto isEditableCond = auto isEditableCond =
[this] ( const SELECTION& ) [this]( const SELECTION& )
{ {
// Only root symbols from the new s-expression libraries or the schematic // Only root symbols from the new s-expression libraries or the schematic
// are editable. // are editable.
return IsSymbolEditable() && !IsSymbolAlias(); return IsSymbolEditable() && !IsSymbolAlias();
}; };
auto libModifiedCondition = auto libModifiedCondition =
[this] ( const SELECTION& sel ) [this]( const SELECTION& sel )
{ {
return m_libMgr->HasModifications(); return m_libMgr->HasModifications();
}; };
auto libSelectedCondition = auto libSelectedCondition =
[this] ( const SELECTION& sel ) [this]( const SELECTION& sel )
{ {
return !GetTargetLibId().GetLibNickname().empty(); return !GetTargetLibId().GetLibNickname().empty();
}; };
auto canEditProperties = auto canEditProperties =
[this] ( const SELECTION& sel ) [this]( const SELECTION& sel )
{ {
return m_symbol && ( !IsSymbolFromLegacyLibrary() || IsSymbolFromSchematic() ); return m_symbol && ( !IsSymbolFromLegacyLibrary() || IsSymbolFromSchematic() );
}; };
auto saveSymbolAsCondition = auto saveSymbolAsCondition =
[ this ]( const SELECTION& aSel ) [this]( const SELECTION& aSel )
{ {
LIB_ID sel = GetTargetLibId(); LIB_ID sel = GetTargetLibId();
return !sel.GetLibNickname().empty() && !sel.GetLibItemName().empty(); return !sel.GetLibNickname().empty() && !sel.GetLibItemName().empty();
}; };
mgr->SetConditions( ACTIONS::saveAll, ENABLE( SELECTION_CONDITIONS::ShowAlways ) ); mgr->SetConditions( ACTIONS::saveAll, ENABLE( SELECTION_CONDITIONS::ShowAlways ) );
mgr->SetConditions( ACTIONS::save, ENABLE( SELECTION_CONDITIONS::ShowAlways ) ); mgr->SetConditions( ACTIONS::save, ENABLE( SELECTION_CONDITIONS::ShowAlways ) );
@ -419,56 +419,56 @@ void SYMBOL_EDIT_FRAME::setupUIConditions()
mgr->SetConditions( ACTIONS::zoomTool, CHECK( cond.CurrentTool( ACTIONS::zoomTool ) ) ); mgr->SetConditions( ACTIONS::zoomTool, CHECK( cond.CurrentTool( ACTIONS::zoomTool ) ) );
mgr->SetConditions( ACTIONS::selectionTool, CHECK( cond.CurrentTool( ACTIONS::selectionTool ) ) ); mgr->SetConditions( ACTIONS::selectionTool, CHECK( cond.CurrentTool( ACTIONS::selectionTool ) ) );
auto pinTypeCond = auto pinTypeCond =
[this] ( const SELECTION& ) [this]( const SELECTION& )
{ {
return GetRenderSettings()->m_ShowPinsElectricalType; return GetRenderSettings()->m_ShowPinsElectricalType;
}; };
auto showCompTreeCond = auto showCompTreeCond =
[this] ( const SELECTION& ) [this]( const SELECTION& )
{ {
return IsSymbolTreeShown(); return IsSymbolTreeShown();
}; };
mgr->SetConditions( EE_ACTIONS::showElectricalTypes, CHECK( pinTypeCond ) ); mgr->SetConditions( EE_ACTIONS::showElectricalTypes, CHECK( pinTypeCond ) );
mgr->SetConditions( EE_ACTIONS::showSymbolTree, CHECK( showCompTreeCond ) ); mgr->SetConditions( EE_ACTIONS::showSymbolTree, CHECK( showCompTreeCond ) );
auto demorganCond = auto demorganCond =
[this] ( const SELECTION& ) [this]( const SELECTION& )
{ {
return GetShowDeMorgan(); return GetShowDeMorgan();
}; };
auto demorganStandardCond = auto demorganStandardCond =
[this] ( const SELECTION& ) [this]( const SELECTION& )
{ {
return m_convert == LIB_ITEM::LIB_CONVERT::BASE; return m_convert == LIB_ITEM::LIB_CONVERT::BASE;
}; };
auto demorganAlternateCond = auto demorganAlternateCond =
[this] ( const SELECTION& ) [this]( const SELECTION& )
{ {
return m_convert == LIB_ITEM::LIB_CONVERT::DEMORGAN; return m_convert == LIB_ITEM::LIB_CONVERT::DEMORGAN;
}; };
auto multiUnitModeCond = auto multiUnitModeCond =
[this] ( const SELECTION& ) [this]( const SELECTION& )
{ {
return m_symbol && m_symbol->IsMulti() && !m_symbol->UnitsLocked(); return m_symbol && m_symbol->IsMulti() && !m_symbol->UnitsLocked();
}; };
auto syncedPinsModeCond = auto syncedPinsModeCond =
[this] ( const SELECTION& ) [this]( const SELECTION& )
{ {
return m_SyncPinEdit; return m_SyncPinEdit;
}; };
auto haveDatasheetCond = auto haveDatasheetCond =
[this] ( const SELECTION& ) [this]( const SELECTION& )
{ {
return m_symbol && !m_symbol->GetDatasheetField().GetText().IsEmpty(); return m_symbol && !m_symbol->GetDatasheetField().GetText().IsEmpty();
}; };
mgr->SetConditions( EE_ACTIONS::showDatasheet, ENABLE( haveDatasheetCond ) ); mgr->SetConditions( EE_ACTIONS::showDatasheet, ENABLE( haveDatasheetCond ) );
mgr->SetConditions( EE_ACTIONS::symbolProperties, ENABLE( canEditProperties && haveSymbolCond ) ); mgr->SetConditions( EE_ACTIONS::symbolProperties, ENABLE( canEditProperties && haveSymbolCond ) );