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

Rework on pcbnew menubar: make code more easy to read and modify.

This commit is contained in:
jean-pierre charras 2017-02-24 12:43:10 +01:00
parent 23d4da9e49
commit 6ae7c15d89
3 changed files with 620 additions and 504 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
eeschema/menubar.cpp
View File

@ -55,7 +55,7 @@ static void prepareToolsMenu( wxMenu* aParentMenu );
// Build the help menu // Build the help menu
static void prepareHelpMenu( wxMenu* aParentMenu ); static void prepareHelpMenu( wxMenu* aParentMenu );
// Build the help submenu // Build the import/export submenu
static void prepareImportExportMenu( wxMenu* aParentMenu ); static void prepareImportExportMenu( wxMenu* aParentMenu );
// Build the edit menu // Build the edit menu

6
eeschema/widgets/widget_eeschema_color_config.cpp
View File

@ -196,10 +196,10 @@ void WIDGET_EESCHEMA_COLOR_CONFIG::CreateControls()
iconDC.DrawRectangle( 0, 0, BUTT_SIZE_X, BUTT_SIZE_Y ); iconDC.DrawRectangle( 0, 0, BUTT_SIZE_X, BUTT_SIZE_Y );
buttonId++; buttonId++;
wxBitmapButton* m_SelBgColor = new wxBitmapButton( wxBitmapButton* selBgColorBtn = new wxBitmapButton(
this, buttonId, bitmap, wxDefaultPosition, this, buttonId, bitmap, wxDefaultPosition,
wxSize( BUTT_SIZE_X + 8, BUTT_SIZE_Y + 6 ) ); wxSize( BUTT_SIZE_X + 8, BUTT_SIZE_Y + 6 ) );
m_SelBgColor->SetClientData( (void*) &bgColorButton ); selBgColorBtn->SetClientData( (void*) &bgColorButton );
Connect( 1800, buttonId, wxEVT_COMMAND_BUTTON_CLICKED, Connect( 1800, buttonId, wxEVT_COMMAND_BUTTON_CLICKED,
wxCommandEventHandler( WIDGET_EESCHEMA_COLOR_CONFIG::SetColor ) ); wxCommandEventHandler( WIDGET_EESCHEMA_COLOR_CONFIG::SetColor ) );
@ -214,7 +214,7 @@ void WIDGET_EESCHEMA_COLOR_CONFIG::CreateControls()
// Add a spacer to improve appearance. // Add a spacer to improve appearance.
columnBoxSizer->AddSpacer( 5 ); columnBoxSizer->AddSpacer( 5 );
columnBoxSizer->Add( bgColorLabel, 1, wxALIGN_CENTER_VERTICAL | wxALL, 5 ); columnBoxSizer->Add( bgColorLabel, 1, wxALIGN_CENTER_VERTICAL | wxALL, 5 );
columnBoxSizer->Add( m_SelBgColor, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT | wxBOTTOM, 5 ); columnBoxSizer->Add( selBgColorBtn, 1, wxALIGN_CENTER_VERTICAL | wxRIGHT | wxBOTTOM, 5 );
} }
currentColors[ LAYER_BACKGROUND ] = bgColor; currentColors[ LAYER_BACKGROUND ] = bgColor;

1116
pcbnew/menubar_pcbframe.cpp
View File

File diff suppressed because it is too large Load Diff