Commit 99c1d45f authored by Felix Morgner's avatar Felix Morgner

Added mutli-selection to cvpcb

parent 92f8f006
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
COMPONENTS_LISTBOX::COMPONENTS_LISTBOX( CVPCB_MAINFRAME* parent, wxWindowID id, COMPONENTS_LISTBOX::COMPONENTS_LISTBOX( CVPCB_MAINFRAME* parent, wxWindowID id,
const wxPoint& loc, const wxSize& size, const wxPoint& loc, const wxSize& size,
int nbitems, wxString choice[] ) : int nbitems, wxString choice[] ) :
ITEMS_LISTBOX_BASE( parent, id, loc, size ) ITEMS_LISTBOX_BASE( parent, id, loc, size, ~wxLC_SINGLE_SEL)
{ {
} }
......
...@@ -18,7 +18,8 @@ class ITEMS_LISTBOX_BASE : public wxListView ...@@ -18,7 +18,8 @@ class ITEMS_LISTBOX_BASE : public wxListView
{ {
public: public:
ITEMS_LISTBOX_BASE( CVPCB_MAINFRAME* aParent, wxWindowID aId, ITEMS_LISTBOX_BASE( CVPCB_MAINFRAME* aParent, wxWindowID aId,
const wxPoint& aLocation, const wxSize& aSize ); const wxPoint& aLocation, const wxSize& aSize,
long aStyle = wxLC_SINGLE_SEL);
~ITEMS_LISTBOX_BASE(); ~ITEMS_LISTBOX_BASE();
......
...@@ -19,11 +19,12 @@ ...@@ -19,11 +19,12 @@
******************************************************************************/ ******************************************************************************/
#define LISTB_STYLE wxSUNKEN_BORDER | wxLC_NO_HEADER | \ #define LISTB_STYLE wxSUNKEN_BORDER | wxLC_NO_HEADER | \
wxLC_SINGLE_SEL | wxLC_REPORT | wxLC_VIRTUAL wxLC_REPORT | wxLC_VIRTUAL
ITEMS_LISTBOX_BASE::ITEMS_LISTBOX_BASE( CVPCB_MAINFRAME* aParent, wxWindowID aId, ITEMS_LISTBOX_BASE::ITEMS_LISTBOX_BASE( CVPCB_MAINFRAME* aParent, wxWindowID aId,
const wxPoint& aLocation, const wxSize& aSize ) : const wxPoint& aLocation, const wxSize& aSize,
wxListView( aParent, aId, aLocation, aSize, LISTB_STYLE ) long aStyle) :
wxListView( aParent, aId, aLocation, aSize, LISTB_STYLE | aStyle )
{ {
InsertColumn( 0, wxEmptyString ); InsertColumn( 0, wxEmptyString );
SetColumnWidth( 0, wxLIST_AUTOSIZE ); SetColumnWidth( 0, wxLIST_AUTOSIZE );
......
...@@ -39,53 +39,58 @@ ...@@ -39,53 +39,58 @@
#define titleComponentLibErr _( "Component Library Error" ) #define titleComponentLibErr _( "Component Library Error" )
void CVPCB_MAINFRAME::SetNewPkg( const wxString& aFootprintName ) void CVPCB_MAINFRAME::SetNewPkg( const wxString& aFootprintName )
{ {
COMPONENT_INFO* Component; COMPONENT_INFO* Component;
bool isUndefined = false; bool isUndefined = false;
int NumCmp; int NumCmp;
int LastCmp;
wxString msg; wxString msg;
if( m_components.empty() ) if( m_components.empty() )
return; return;
NumCmp = m_ListCmp->GetSelection(); if(m_ListCmp->GetFirstSelected() < 0)
if( NumCmp < 0 )
{ {
NumCmp = 0; NumCmp = 0;
m_ListCmp->SetSelection( NumCmp, true ); m_ListCmp->SetSelection( NumCmp, true );
} }
Component = &m_components[ NumCmp ]; while( (NumCmp = m_ListCmp->GetFirstSelected() ) != -1)
{
Component = &m_components[NumCmp];
if( Component == NULL ) if( Component == NULL )
return; return;
isUndefined = Component->m_Footprint.IsEmpty(); isUndefined = Component->m_Footprint.IsEmpty();
Component->m_Footprint = aFootprintName; Component->m_Footprint = aFootprintName;
msg.Printf( CMP_FORMAT, NumCmp + 1, msg.Printf( CMP_FORMAT, NumCmp + 1,
GetChars( Component->m_Reference ), GetChars( Component->m_Reference ),
GetChars( Component->m_Value ), GetChars( Component->m_Value ),
GetChars( Component->m_Footprint ) ); GetChars( Component->m_Footprint ) );
m_modified = true;
if( isUndefined ) if( isUndefined )
m_undefinedComponentCnt -= 1; m_undefinedComponentCnt -= 1;
m_ListCmp->SetString( NumCmp, msg ); m_ListCmp->SetString( NumCmp, msg );
m_ListCmp->SetSelection( NumCmp, false ); m_ListCmp->SetSelection( NumCmp, false );
isUndefined = false;
LastCmp = NumCmp;
DisplayStatus();
}
m_modified = true;
// We activate next component: if( LastCmp < (m_ListCmp->GetCount() - 1) )
if( NumCmp < (m_ListCmp->GetCount() - 1) ) NumCmp = LastCmp + 1;
NumCmp++;
m_ListCmp->SetSelection( NumCmp, true ); m_ListCmp->SetSelection( NumCmp, true );
DisplayStatus();
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment