Commit cdc114cb authored by charras's avatar charras

pcbnew: minor cosmetic enhancement in setup layers dialog.

Updated denis dupeyron email address
parent 01884b58
...@@ -5,7 +5,7 @@ Information ...@@ -5,7 +5,7 @@ Information
----------- -----------
First written: 02-Mar-2010 First written: 02-Mar-2010
Written by: denis[dot]dupeyron[at]gmail[dot]com Written by: calchan at gentoo dot org
For regular users For regular users
......
...@@ -59,6 +59,7 @@ set(BITMAP_SRCS ...@@ -59,6 +59,7 @@ set(BITMAP_SRCS
Browse_Files.xpm Browse_Files.xpm
cancel_tool.xpm cancel_tool.xpm
Cancel.xpm Cancel.xpm
checked_ok.xpm
component_select_unit.xpm component_select_unit.xpm
component_select_alternate_shape.xpm component_select_alternate_shape.xpm
config.xpm config.xpm
......
...@@ -54,6 +54,7 @@ extern const char* break_line_xpm[]; ...@@ -54,6 +54,7 @@ extern const char* break_line_xpm[];
extern const char* browse_files_xpm[]; extern const char* browse_files_xpm[];
extern const char* cancel_tool_xpm[]; extern const char* cancel_tool_xpm[];
extern const char* cancel_xpm[]; extern const char* cancel_xpm[];
extern const char* checked_ok_xpm[];
extern const char* component_select_alternate_shape_xpm[]; extern const char* component_select_alternate_shape_xpm[];
extern const char* component_select_unit_xpm[]; extern const char* component_select_unit_xpm[];
extern const char* config_xpm[]; extern const char* config_xpm[];
......
...@@ -53,6 +53,7 @@ struct CTLs ...@@ -53,6 +53,7 @@ struct CTLs
wxControl* name; wxControl* name;
wxCheckBox* checkbox; wxCheckBox* checkbox;
wxControl* choice; wxControl* choice;
wxPanel * panel;
}; };
...@@ -250,6 +251,7 @@ DIALOG_LAYERS_SETUP::DIALOG_LAYERS_SETUP( WinEDA_PcbFrame* parent ) : ...@@ -250,6 +251,7 @@ DIALOG_LAYERS_SETUP::DIALOG_LAYERS_SETUP( WinEDA_PcbFrame* parent ) :
m_CopperLayerCount = m_Pcb->GetCopperLayerCount(); m_CopperLayerCount = m_Pcb->GetCopperLayerCount();
showCopperChoice( m_CopperLayerCount ); showCopperChoice( m_CopperLayerCount );
setCopperLayerCheckBoxes( m_CopperLayerCount );
showBoardLayerNames(); showBoardLayerNames();
...@@ -311,8 +313,6 @@ void DIALOG_LAYERS_SETUP::showCopperChoice( int copperCount ) ...@@ -311,8 +313,6 @@ void DIALOG_LAYERS_SETUP::showCopperChoice( int copperCount )
{ {
static const int copperCounts[] = { 2,4,6,8,10,12,14,16 }; static const int copperCounts[] = { 2,4,6,8,10,12,14,16 };
//D(printf("boardsCopperCount=%d\n", copperCount );)
for( unsigned i = 0; i<sizeof(copperCounts); ++i ) for( unsigned i = 0; i<sizeof(copperCounts); ++i )
{ {
// note this will change a one layer board to 2: // note this will change a one layer board to 2:
...@@ -432,14 +432,15 @@ void DIALOG_LAYERS_SETUP::setCopperLayerCheckBoxes( int copperCount ) ...@@ -432,14 +432,15 @@ void DIALOG_LAYERS_SETUP::setCopperLayerCheckBoxes( int copperCount )
} }
int layer; int layer;
for( layer=LAYER_N_2; copperCount > 0; ++layer, --copperCount ) for( layer=LAYER_N_2; layer < NB_COPPER_LAYERS-1; ++layer, --copperCount )
{ {
setLayerCheckBox( layer, true ); CTLs ctl = getCTLs(layer);
} bool state = copperCount > 0;
ctl.name->Enable( state );
ctl.checkbox->Enable( state );
ctl.choice->Enable( state );
for( ; layer < NB_COPPER_LAYERS-1; ++layer ) setLayerCheckBox( layer, state );
{
setLayerCheckBox( layer, false );
} }
} }
......
This diff is collapsed.
This diff is collapsed.
...@@ -210,39 +210,39 @@ class DIALOG_LAYERS_SETUP_BASE : public wxDialog ...@@ -210,39 +210,39 @@ class DIALOG_LAYERS_SETUP_BASE : public wxDialog
wxCheckBox* m_BackCheckBox; wxCheckBox* m_BackCheckBox;
wxChoice* m_BackChoice; wxChoice* m_BackChoice;
wxStaticText* m_MaskBackName; wxStaticText* m_MaskBackName;
wxPanel* m_panel21; wxPanel* m_MaskBackPanel;
wxCheckBox* m_MaskBackCheckBox; wxCheckBox* m_MaskBackCheckBox;
wxStaticText* m_MaskBackStaticText; wxStaticText* m_MaskBackStaticText;
wxStaticText* m_SilkSBackName; wxStaticText* m_SilkSBackName;
wxPanel* m_panel22; wxPanel* m_SilkSBackPanel;
wxCheckBox* m_SilkSBackCheckBox; wxCheckBox* m_SilkSBackCheckBox;
wxStaticText* m_SilkSBackStaticText; wxStaticText* m_SilkSBackStaticText;
wxStaticText* m_SoldPBackName; wxStaticText* m_SoldPBackName;
wxPanel* m_panel23; wxPanel* m_SoldPBackPanel;
wxCheckBox* m_SoldPBackCheckBox; wxCheckBox* m_SoldPBackCheckBox;
wxStaticText* m_SoldPBackStaticText; wxStaticText* m_SoldPBackStaticText;
wxStaticText* m_AdhesBackName; wxStaticText* m_AdhesBackName;
wxPanel* m_panel24; wxPanel* m_AdhesBackPanel;
wxCheckBox* m_AdhesBackCheckBox; wxCheckBox* m_AdhesBackCheckBox;
wxStaticText* m_AdhesBackStaticText; wxStaticText* m_AdhesBackStaticText;
wxStaticText* m_PCBEdgesName; wxStaticText* m_PCBEdgesName;
wxPanel* m_panel25; wxPanel* m_PCBEdgesPanel;
wxCheckBox* m_PCBEdgesCheckBox; wxCheckBox* m_PCBEdgesCheckBox;
wxStaticText* m_PCBEdgesStaticText; wxStaticText* m_PCBEdgesStaticText;
wxStaticText* m_Eco2Name;
wxPanel* m_panel26;
wxCheckBox* m_Eco2CheckBox;
wxStaticText* m_Eco2StaticText;
wxStaticText* m_Eco1Name; wxStaticText* m_Eco1Name;
wxPanel* m_panel27; wxPanel* m_Eco1Panel;
wxCheckBox* m_Eco1CheckBox; wxCheckBox* m_Eco1CheckBox;
wxStaticText* m_Eco1StaticText; wxStaticText* m_Eco1StaticText;
wxStaticText* m_Eco2Name;
wxPanel* m_Eco2Panel;
wxCheckBox* m_Eco2CheckBox;
wxStaticText* m_Eco2StaticText;
wxStaticText* m_CommentsName; wxStaticText* m_CommentsName;
wxPanel* m_panel28; wxPanel* m_CommentsPanel;
wxCheckBox* m_CommentsCheckBox; wxCheckBox* m_CommentsCheckBox;
wxStaticText* m_CommentsStaticText; wxStaticText* m_CommentsStaticText;
wxStaticText* m_DrawingsName; wxStaticText* m_DrawingsName;
wxPanel* m_panel29; wxPanel* m_DrawingsPanel;
wxCheckBox* m_DrawingsCheckBox; wxCheckBox* m_DrawingsCheckBox;
wxStaticText* m_DrawingsStaticText; wxStaticText* m_DrawingsStaticText;
wxStdDialogButtonSizer* m_sdbSizer2; wxStdDialogButtonSizer* m_sdbSizer2;
......
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