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

Properties panel appearance tweaks

This commit is contained in:
Jon Evans 2021-08-22 10:15:49 -04:00
parent 3c6e8aea0f
commit 91c15b7e21
2 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
common/widgets/properties_panel.cpp
View File

@ -27,7 +27,9 @@
#include <algorithm> #include <algorithm>
#include <set> #include <set>
using namespace std; #include <wx/settings.h>
#include <wx/stattext.h>
extern APIIMPORT wxPGGlobalVarsClass* wxPGGlobalVars; extern APIIMPORT wxPGGlobalVarsClass* wxPGGlobalVars;
@ -41,14 +43,22 @@ PROPERTIES_PANEL::PROPERTIES_PANEL( wxWindow* aParent, EDA_BASE_FRAME* aFrame )
if( !wxPGGlobalVars ) if( !wxPGGlobalVars )
wxPGInitResourceModule(); wxPGInitResourceModule();
m_caption = new wxStaticText( this, wxID_ANY, _( "No objects selected" ), wxDefaultPosition,
wxDefaultSize, 0 );
mainSizer->Add( m_caption, 0, wxALL | wxEXPAND, 5 );
m_grid = new wxPropertyGrid( this, wxID_ANY, wxDefaultPosition, wxSize( 300, 400 ), m_grid = new wxPropertyGrid( this, wxID_ANY, wxDefaultPosition, wxSize( 300, 400 ),
wxPG_AUTO_SORT | wxPG_SPLITTER_AUTO_CENTER | wxPG_DEFAULT_STYLE ); wxPG_AUTO_SORT | wxPG_DEFAULT_STYLE );
m_grid->SetUnspecifiedValueAppearance( wxPGCell( wxT( "<...>" ) ) ); m_grid->SetUnspecifiedValueAppearance( wxPGCell( wxT( "<...>" ) ) );
mainSizer->Add( m_grid, 1, wxALL | wxEXPAND, 5 ); mainSizer->Add( m_grid, 1, wxALL | wxEXPAND, 5 );
m_grid->SetCellDisabledTextColour( wxSystemSettings::GetColour( wxSYS_COLOUR_GRAYTEXT ) );
SetSizer( mainSizer ); SetSizer( mainSizer );
Layout(); Layout();
m_grid->CenterSplitter();
Connect( wxEVT_PG_CHANGED, wxPropertyGridEventHandler( PROPERTIES_PANEL::valueChanged ), NULL, this ); Connect( wxEVT_PG_CHANGED, wxPropertyGridEventHandler( PROPERTIES_PANEL::valueChanged ), NULL, this );
Connect( wxEVT_PG_CHANGING, wxPropertyGridEventHandler( PROPERTIES_PANEL::valueChanging ), NULL, this ); Connect( wxEVT_PG_CHANGING, wxPropertyGridEventHandler( PROPERTIES_PANEL::valueChanging ), NULL, this );
Connect( wxEVT_SHOW, wxShowEventHandler( PROPERTIES_PANEL::onShow ), NULL, this ); Connect( wxEVT_SHOW, wxShowEventHandler( PROPERTIES_PANEL::onShow ), NULL, this );
@ -61,19 +71,34 @@ void PROPERTIES_PANEL::update( const SELECTION& aSelection )
m_displayed.clear(); m_displayed.clear();
if( aSelection.Empty() ) if( aSelection.Empty() )
{
m_caption->SetLabel( _( "No objects selected" ) );
return; return;
}
// Get all the selected types // Get all the selected types
set<TYPE_ID> types; std::set<TYPE_ID> types;
for( EDA_ITEM* item : aSelection ) for( EDA_ITEM* item : aSelection )
types.insert( TYPE_HASH( *item ) ); types.insert( TYPE_HASH( *item ) );
wxCHECK( !types.empty(), /* void */ ); wxCHECK( !types.empty(), /* void */ );
if( aSelection.Size() > 1 )
{
m_caption->SetLabel( _( "Multiple objects selected" ) );
}
else
{
// TODO: Plain-language descriptive noun function in EDA_ITEM classes
// TODO: Need to override this in PCB editor vs. schematic
m_caption->SetLabel( aSelection.Front()->GetClass() );
}
PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance(); PROPERTY_MANAGER& propMgr = PROPERTY_MANAGER::Instance();
propMgr.SetUnits( m_frame->GetUserUnits() ); propMgr.SetUnits( m_frame->GetUserUnits() );
set<PROPERTY_BASE*> commonProps; std::set<PROPERTY_BASE*> commonProps;
const PROPERTY_LIST& allProperties = propMgr.GetProperties( *types.begin() ); const PROPERTY_LIST& allProperties = propMgr.GetProperties( *types.begin() );
copy( allProperties.begin(), allProperties.end(), inserter( commonProps, commonProps.begin() ) ); copy( allProperties.begin(), allProperties.end(), inserter( commonProps, commonProps.begin() ) );

2
common/widgets/properties_panel.h
View File

@ -32,6 +32,7 @@
class EDA_BASE_FRAME; class EDA_BASE_FRAME;
class SELECTION; class SELECTION;
class PROPERTY_BASE; class PROPERTY_BASE;
class wxStaticText;
class PROPERTIES_PANEL : public wxPanel class PROPERTIES_PANEL : public wxPanel
{ {
@ -71,6 +72,7 @@ protected:
std::vector<PROPERTY_BASE*> m_displayed; std::vector<PROPERTY_BASE*> m_displayed;
wxPropertyGrid* m_grid; wxPropertyGrid* m_grid;
EDA_BASE_FRAME* m_frame; EDA_BASE_FRAME* m_frame;
wxStaticText* m_caption;
}; };
#endif /* PROPERTIES_PANEL_H */ #endif /* PROPERTIES_PANEL_H */