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

Changed DIALOG_MULTIPLE_OPTIONS to use wxCheckListBox class

This commit is contained in:
Maciej Suminski 2017-11-21 18:17:30 +01:00
parent e25a1feb25
commit 28608b1b52
2 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
common/confirm.cpp
View File

@ -183,7 +183,6 @@ int SelectSingleOption( wxWindow* aParent, const wxString& aTitle, const wxStrin
{ {
int ret = -1; int ret = -1;
wxDialog* dlg = new DIALOG_SHIM( aParent, wxID_ANY, aTitle ); wxDialog* dlg = new DIALOG_SHIM( aParent, wxID_ANY, aTitle );
dlg->SetSizeHints( wxDefaultSize, wxDefaultSize );
wxBoxSizer* boxSizer = new wxBoxSizer( wxVERTICAL ); wxBoxSizer* boxSizer = new wxBoxSizer( wxVERTICAL );
@ -208,6 +207,7 @@ int SelectSingleOption( wxWindow* aParent, const wxString& aTitle, const wxStrin
dlg->SetSizer( boxSizer ); dlg->SetSizer( boxSizer );
dlg->Layout(); dlg->Layout();
boxSizer->Fit( dlg ); boxSizer->Fit( dlg );
boxSizer->SetSizeHints( dlg );
dlg->Centre( wxBOTH ); dlg->Centre( wxBOTH );
if( dlg->ShowModal() == wxID_OK ) if( dlg->ShowModal() == wxID_OK )
@ -246,18 +246,17 @@ public:
if( !aMessage.IsEmpty() ) if( !aMessage.IsEmpty() )
boxSizer->Add( new wxStaticText( this, wxID_ANY, aMessage ), 0, wxEXPAND | wxALL, 5 ); boxSizer->Add( new wxStaticText( this, wxID_ANY, aMessage ), 0, wxEXPAND | wxALL, 5 );
m_checkBoxes.reserve( aOptions.Count() ); m_checklist = new wxCheckListBox( this, wxID_ANY );
for( const wxString& option : aOptions ) for( const wxString& option : aOptions )
{ m_checklist->Append( option );
m_checkBoxes.emplace_back( new wxCheckBox( this, wxID_ANY, _( option ) ) );
boxSizer->Add( m_checkBoxes.back(), 0, wxEXPAND | wxALL, 5 ); boxSizer->Add( m_checklist, 0, wxEXPAND | wxALL, 5 );
}
wxBoxSizer* btnSizer = new wxBoxSizer( wxHORIZONTAL ); wxBoxSizer* btnSizer = new wxBoxSizer( wxHORIZONTAL );
wxButton* selectAll = new wxButton( this, wxID_ANY, "Select All" ); wxButton* selectAll = new wxButton( this, wxID_ANY, _( "Select All" ) );
btnSizer->Add( selectAll, 0, wxEXPAND | wxALL, 5 ); btnSizer->Add( selectAll, 0, wxEXPAND | wxALL, 5 );
wxButton* unselectAll = new wxButton( this, wxID_ANY, "Unselect All" ); wxButton* unselectAll = new wxButton( this, wxID_ANY, _( "Unselect All" ) );
btnSizer->Add( unselectAll, 0, wxEXPAND | wxALL, 5 ); btnSizer->Add( unselectAll, 0, wxEXPAND | wxALL, 5 );
boxSizer->Add( btnSizer, 0, wxEXPAND | wxALL, 5 ); boxSizer->Add( btnSizer, 0, wxEXPAND | wxALL, 5 );
@ -270,6 +269,7 @@ public:
SetSizer( boxSizer ); SetSizer( boxSizer );
Layout(); Layout();
boxSizer->Fit( this ); boxSizer->Fit( this );
boxSizer->SetSizeHints( this );
Centre( wxBOTH ); Centre( wxBOTH );
selectAll->Bind( wxEVT_COMMAND_BUTTON_CLICKED, &DIALOG_MULTI_OPTIONS::selectAll, this ); selectAll->Bind( wxEVT_COMMAND_BUTTON_CLICKED, &DIALOG_MULTI_OPTIONS::selectAll, this );
@ -280,9 +280,9 @@ public:
{ {
std::vector<int> ret; std::vector<int> ret;
for( unsigned int i = 0; i < m_checkBoxes.size(); ++i ) for( unsigned int i = 0; i < m_checklist->GetCount(); ++i )
{ {
if( m_checkBoxes[i]->IsChecked() ) if( m_checklist->IsChecked( i ) )
ret.push_back( i ); ret.push_back( i );
} }
@ -291,12 +291,12 @@ public:
void SetCheckboxes( bool aValue ) void SetCheckboxes( bool aValue )
{ {
for( auto& cb : m_checkBoxes ) for( unsigned int i = 0; i < m_checklist->GetCount(); ++i )
cb->SetValue( aValue ); m_checklist->Check( i, aValue );
} }
protected: protected:
std::vector<wxCheckBox*> m_checkBoxes; wxCheckListBox* m_checklist;
void selectAll( wxCommandEvent& aEvent ) void selectAll( wxCommandEvent& aEvent )
{ {
@ -330,3 +330,15 @@ std::pair<bool, std::vector<int>> SelectMultipleOptions( wxWindow* aParent, cons
return std::make_pair( clickedOk, ret ); return std::make_pair( clickedOk, ret );
} }
std::pair<bool, std::vector<int>> SelectMultipleOptions( wxWindow* aParent, const wxString& aTitle,
const wxString& aMessage, const std::vector<std::string>& aOptions, bool aDefaultState )
{
wxArrayString array;
for( const auto& option : aOptions )
array.Add( option );
return SelectMultipleOptions( aParent, aTitle, aMessage, array, aDefaultState );
}

3
include/confirm.h
View File

@ -145,4 +145,7 @@ int SelectSingleOption( wxWindow* aParent, const wxString& aTitle, const wxStrin
std::pair<bool, std::vector<int>> SelectMultipleOptions( wxWindow* aParent, const wxString& aTitle, std::pair<bool, std::vector<int>> SelectMultipleOptions( wxWindow* aParent, const wxString& aTitle,
const wxString& aMessage, const wxArrayString& aOptions, bool aDefaultState = false ); const wxString& aMessage, const wxArrayString& aOptions, bool aDefaultState = false );
std::pair<bool, std::vector<int>> SelectMultipleOptions( wxWindow* aParent, const wxString& aTitle,
const wxString& aMessage, const std::vector<std::string>& aOptions, bool aDefaultState = false );
#endif /* __INCLUDE__CONFIRM_H__ */ #endif /* __INCLUDE__CONFIRM_H__ */