Cosmetic enhancement in GAL: disambiguationMenu: add icons in menuitems, like in Legacy mode.

This commit is contained in:
jean-pierre charras 2017-12-13 19:42:33 +01:00
parent 8ab8a11cf8
commit c18b638c17
3 changed files with 9 additions and 4 deletions

View File

@ -121,6 +121,10 @@ void CONTEXT_MENU::DisplayTitle( bool aDisplay )
// Add a separator and a menu entry to display the title
InsertSeparator( 0 );
Insert( 0, new wxMenuItem( this, wxID_NONE, m_title, wxEmptyString, wxITEM_NORMAL ) );
if( m_icon )
set_wxMenuIcon( FindItemByPosition( 0 ), m_icon );
m_titleDisplayed = true;
}
}

View File

@ -219,7 +219,7 @@ wxString VIA::GetSelectMenuText() const
BITMAP_DEF VIA::GetMenuImage() const
{
return via_sketch_xpm;
return via_xpm;
}
@ -1610,7 +1610,7 @@ wxString TRACK::GetSelectMenuText() const
BITMAP_DEF TRACK::GetMenuImage() const
{
return showtrack_xpm;
return add_tracks_xpm;
}
void TRACK::SwapData( BOARD_ITEM* aImage )

View File

@ -1327,10 +1327,11 @@ BOARD_ITEM* SELECTION_TOOL::disambiguationMenu( GENERAL_COLLECTOR* aCollector )
text = item->GetSelectMenuText();
wxString menuText = wxString::Format("&%d. %s", i + 1, text );
menu.Add( menuText, i + 1 );
menu.Add( menuText, i + 1, item->GetMenuImage() );
}
menu.SetTitle( _( "Clarify selection" ) );
menu.SetTitle( _( "Clarify Selection" ) );
menu.SetIcon( info_xpm );
menu.DisplayTitle( true );
SetContextMenu( &menu, CMENU_NOW );