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

Collapse space out of the presets area. 

Hopefully this will save us from conditional compilation as the
OSX spacing here is wildly different from GTK.
This commit is contained in:
Jeff Young 2020-08-16 22:07:21 +01:00
parent 1134d99bb7
commit fd53df6f10
5 changed files with 167 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

68
pcbnew/widgets/appearance_controls.cpp
View File

@ -103,7 +103,6 @@ APPEARANCE_CONTROLS::APPEARANCE_CONTROLS( PCB_BASE_FRAME* aParent, wxWindow* aFo
m_btnNetInspector->SetBitmapLabel( KiBitmap( list_nets_xpm ) ); m_btnNetInspector->SetBitmapLabel( KiBitmap( list_nets_xpm ) );
m_btnConfigureNetClasses->SetBitmapLabel( KiBitmap( options_generic_xpm ) ); m_btnConfigureNetClasses->SetBitmapLabel( KiBitmap( options_generic_xpm ) );
m_btnDeletePreset->SetBitmapLabel( KiBitmap( trash_xpm ) );
m_txtNetFilter->SetHint( _( "Filter nets" ) ); m_txtNetFilter->SetHint( _( "Filter nets" ) );
@ -1252,7 +1251,7 @@ void APPEARANCE_CONTROLS::rebuildNets()
m_frame->GetToolManager()->RunAction( action, true, net ); m_frame->GetToolManager()->RunAction( action, true, net );
} ); } );
wxString netName = aNet->GetShortNetname(); const wxString& netName = aNet->GetShortNetname();
auto menuHandler = auto menuHandler =
[&, netCode, netName]( wxMouseEvent& aEvent ) [&, netCode, netName]( wxMouseEvent& aEvent )
@ -1291,7 +1290,7 @@ void APPEARANCE_CONTROLS::rebuildNets()
}; };
auto appendNetclass = auto appendNetclass =
[&]( int aId, NETCLASSPTR aClass, bool isDefault = false ) [&]( int aId, const NETCLASSPTR& aClass, bool isDefault = false )
{ {
wxString name = aClass->GetName(); wxString name = aClass->GetName();
@ -1470,8 +1469,6 @@ void APPEARANCE_CONTROLS::syncLayerPresetSelection()
m_currentPreset = static_cast<LAYER_PRESET*>( m_currentPreset = static_cast<LAYER_PRESET*>(
m_cbLayerPresets->GetClientData( m_cbLayerPresets->GetSelection() ) ); m_cbLayerPresets->GetClientData( m_cbLayerPresets->GetSelection() ) );
updateDeleteLayerPresetButton();
} }
@ -1483,12 +1480,10 @@ void APPEARANCE_CONTROLS::updateLayerPresetSelection( const wxString& aName )
{ {
m_cbLayerPresets->SetSelection( idx ); m_cbLayerPresets->SetSelection( idx );
m_currentPreset = static_cast<LAYER_PRESET*>( m_cbLayerPresets->GetClientData( idx ) ); m_currentPreset = static_cast<LAYER_PRESET*>( m_cbLayerPresets->GetClientData( idx ) );
updateDeleteLayerPresetButton();
} }
else if( idx < 0 ) else if( idx < 0 )
{ {
m_cbLayerPresets->SetSelection( m_cbLayerPresets->GetCount() - 3 ); // separator m_cbLayerPresets->SetSelection( m_cbLayerPresets->GetCount() - 3 ); // separator
updateDeleteLayerPresetButton();
} }
} }
@ -1543,7 +1538,6 @@ void APPEARANCE_CONTROLS::onLayerPresetChanged( wxCommandEvent& aEvent )
index = m_cbLayerPresets->Insert( name, index - 1, static_cast<void*>( preset ) ); index = m_cbLayerPresets->Insert( name, index - 1, static_cast<void*>( preset ) );
m_cbLayerPresets->SetSelection( index ); m_cbLayerPresets->SetSelection( index );
m_btnDeletePreset->Enable();
return; return;
} }
@ -1566,7 +1560,7 @@ void APPEARANCE_CONTROLS::onLayerPresetChanged( wxCommandEvent& aEvent )
} }
EDA_LIST_DIALOG dlg( m_frame, _( "Delete Preset" ), headers, items, wxEmptyString ); EDA_LIST_DIALOG dlg( m_frame, _( "Delete Preset" ), headers, items, wxEmptyString );
dlg.SetListLabel( _( "Select netclass:" ) ); dlg.SetListLabel( _( "Select preset:" ) );
if( dlg.ShowModal() == wxID_OK ) if( dlg.ShowModal() == wxID_OK )
{ {
@ -1579,14 +1573,13 @@ void APPEARANCE_CONTROLS::onLayerPresetChanged( wxCommandEvent& aEvent )
m_currentPreset = nullptr; m_currentPreset = nullptr;
} }
resetSelection();
return; return;
} }
LAYER_PRESET* preset = static_cast<LAYER_PRESET*>( m_cbLayerPresets->GetClientData( index ) ); LAYER_PRESET* preset = static_cast<LAYER_PRESET*>( m_cbLayerPresets->GetClientData( index ) );
m_currentPreset = preset; m_currentPreset = preset;
updateDeleteLayerPresetButton();
doApplyLayerPreset( *preset ); doApplyLayerPreset( *preset );
} }
@ -1612,36 +1605,6 @@ void APPEARANCE_CONTROLS::doApplyLayerPreset( const LAYER_PRESET& aPreset )
} }
void APPEARANCE_CONTROLS::updateDeleteLayerPresetButton()
{
bool enable = m_currentPreset && !m_currentPreset->readOnly;
m_btnDeletePreset->Enable( enable );
m_btnDeletePreset->SetToolTip( enable ? _( "Delete this layer preset " ) :
_( "This preset cannot be deleted" ) );
}
void APPEARANCE_CONTROLS::OnBtnDeleteLayerPreset( wxCommandEvent& event )
{
LAYER_PRESET* current = static_cast<LAYER_PRESET*>(
m_cbLayerPresets->GetClientData( m_cbLayerPresets->GetSelection() ) );
// Button should not be enabled if we are not on an active preset
wxASSERT( current && current == m_currentPreset );
if( current->readOnly )
return;
int index = m_cbLayerPresets->GetSelection();
m_layerPresets.erase( current->name );
m_cbLayerPresets->Delete( index );
m_cbLayerPresets->SetSelection( m_cbLayerPresets->GetCount() - 3 );
m_currentPreset = nullptr;
}
void APPEARANCE_CONTROLS::OnColorSwatchChanged( wxCommandEvent& aEvent ) void APPEARANCE_CONTROLS::OnColorSwatchChanged( wxCommandEvent& aEvent )
{ {
COLOR_SWATCH* swatch = static_cast<COLOR_SWATCH*>( aEvent.GetEventObject() ); COLOR_SWATCH* swatch = static_cast<COLOR_SWATCH*>( aEvent.GetEventObject() );
@ -1671,24 +1634,11 @@ void APPEARANCE_CONTROLS::onObjectOpacitySlider( int aLayer, float aOpacity )
switch( aLayer ) switch( aLayer )
{ {
case static_cast<int>( LAYER_TRACKS ): case static_cast<int>( LAYER_TRACKS ): options.m_TrackOpacity = aOpacity; break;
options.m_TrackOpacity = aOpacity; case static_cast<int>( LAYER_VIAS ): options.m_ViaOpacity = aOpacity; break;
break; case static_cast<int>( LAYER_PADS ): options.m_PadOpacity = aOpacity; break;
case static_cast<int>( LAYER_ZONES ): options.m_ZoneOpacity = aOpacity; break;
case static_cast<int>( LAYER_VIAS ): default: return;
options.m_ViaOpacity = aOpacity;
break;
case static_cast<int>( LAYER_PADS ):
options.m_PadOpacity = aOpacity;
break;
case static_cast<int>( LAYER_ZONES ):
options.m_ZoneOpacity = aOpacity;
break;
default:
return;
} }
m_frame->SetDisplayOptions( options ); m_frame->SetDisplayOptions( options );

6
pcbnew/widgets/appearance_controls.h
View File

@ -149,8 +149,6 @@ protected:
void OnNetDisplayPaneChanged( wxCollapsiblePaneEvent& event ) override; void OnNetDisplayPaneChanged( wxCollapsiblePaneEvent& event ) override;
void OnBtnDeleteLayerPreset( wxCommandEvent& event ) override;
void OnNotebookPageChanged( wxNotebookEvent& event ) override; void OnNotebookPageChanged( wxNotebookEvent& event ) override;
private: private:
@ -251,8 +249,6 @@ private:
void syncLayerPresetSelection(); void syncLayerPresetSelection();
void updateDeleteLayerPresetButton();
void onLayerClick( wxMouseEvent& aEvent ); void onLayerClick( wxMouseEvent& aEvent );
void onLayerVisibilityChanged( PCB_LAYER_ID aLayer, bool isVisible, bool isFinal ); void onLayerVisibilityChanged( PCB_LAYER_ID aLayer, bool isVisible, bool isFinal );
@ -263,7 +259,7 @@ private:
void updateLayerPresetSelection( const wxString& aName ); void updateLayerPresetSelection( const wxString& aName );
void onLayerPresetChanged( wxCommandEvent& aEvent ); void onLayerPresetChanged( wxCommandEvent& aEvent ) override;
void doApplyLayerPreset( const LAYER_PRESET& aPreset ); void doApplyLayerPreset( const LAYER_PRESET& aPreset );

36
pcbnew/widgets/appearance_controls_base.cpp
View File

@ -80,7 +80,7 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID
m_panelLayers->SetSizer( m_panelLayersSizer ); m_panelLayers->SetSizer( m_panelLayersSizer );
m_panelLayers->Layout(); m_panelLayers->Layout();
m_panelLayersSizer->Fit( m_panelLayers ); m_panelLayersSizer->Fit( m_panelLayers );
m_notebook->AddPage( m_panelLayers, wxT("Layers"), false ); m_notebook->AddPage( m_panelLayers, wxT("Layers"), true );
m_panelObjects = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL ); m_panelObjects = new wxPanel( m_notebook, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxTAB_TRAVERSAL );
m_panelObjects->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) ); m_panelObjects->SetBackgroundColour( wxSystemSettings::GetColour( wxSYS_COLOUR_WINDOW ) );
@ -234,29 +234,33 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID
m_panelNetsAndClasses->SetSizer( bSizer16 ); m_panelNetsAndClasses->SetSizer( bSizer16 );
m_panelNetsAndClasses->Layout(); m_panelNetsAndClasses->Layout();
bSizer16->Fit( m_panelNetsAndClasses ); bSizer16->Fit( m_panelNetsAndClasses );
m_notebook->AddPage( m_panelNetsAndClasses, wxT("Nets"), true ); m_notebook->AddPage( m_panelNetsAndClasses, wxT("Nets"), false );
m_sizerOuter->Add( m_notebook, 1, wxEXPAND, 5 ); m_sizerOuter->Add( m_notebook, 1, wxEXPAND, 5 );
wxStaticBoxSizer* presetsSizer; wxBoxSizer* bSizer18;
presetsSizer = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, wxT("Layer Presets") ), wxHORIZONTAL ); bSizer18 = new wxBoxSizer( wxVERTICAL );
wxBoxSizer* bSizer171;
bSizer171 = new wxBoxSizer( wxVERTICAL );
m_staticText5 = new wxStaticText( this, wxID_ANY, wxT("Presets:"), wxDefaultPosition, wxDefaultSize, 0 );
m_staticText5->Wrap( -1 );
bSizer171->Add( m_staticText5, 0, wxTOP|wxRIGHT|wxLEFT, 2 );
wxString m_cbLayerPresetsChoices[] = { wxT("All Layers"), wxT("(unsaved)") }; wxString m_cbLayerPresetsChoices[] = { wxT("All Layers"), wxT("(unsaved)") };
int m_cbLayerPresetsNChoices = sizeof( m_cbLayerPresetsChoices ) / sizeof( wxString ); int m_cbLayerPresetsNChoices = sizeof( m_cbLayerPresetsChoices ) / sizeof( wxString );
m_cbLayerPresets = new wxChoice( presetsSizer->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_cbLayerPresetsNChoices, m_cbLayerPresetsChoices, 0 ); m_cbLayerPresets = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_cbLayerPresetsNChoices, m_cbLayerPresetsChoices, 0 );
m_cbLayerPresets->SetSelection( 1 ); m_cbLayerPresets->SetSelection( 1 );
m_cbLayerPresets->SetToolTip( wxT("Layer presets") ); m_cbLayerPresets->SetToolTip( wxT("Layer presets") );
presetsSizer->Add( m_cbLayerPresets, 1, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); bSizer171->Add( m_cbLayerPresets, 0, wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND, 2 );
m_btnDeletePreset = new wxBitmapButton( presetsSizer->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 );
m_btnDeletePreset->Enable( false );
m_btnDeletePreset->SetToolTip( wxT("Delete this layer preset") );
presetsSizer->Add( m_btnDeletePreset, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 );
m_sizerOuter->Add( presetsSizer, 0, wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT, 5 ); bSizer18->Add( bSizer171, 0, wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT, 5 );
m_sizerOuter->Add( bSizer18, 0, wxEXPAND|wxBOTTOM, 2 );
this->SetSizer( m_sizerOuter ); this->SetSizer( m_sizerOuter );
@ -268,8 +272,7 @@ APPEARANCE_CONTROLS_BASE::APPEARANCE_CONTROLS_BASE( wxWindow* parent, wxWindowID
m_paneLayerDisplay->Connect( wxEVT_COLLAPSIBLEPANE_CHANGED, wxCollapsiblePaneEventHandler( APPEARANCE_CONTROLS_BASE::OnLayerDisplayPaneChanged ), NULL, this ); m_paneLayerDisplay->Connect( wxEVT_COLLAPSIBLEPANE_CHANGED, wxCollapsiblePaneEventHandler( APPEARANCE_CONTROLS_BASE::OnLayerDisplayPaneChanged ), NULL, this );
m_cbFlipBoard->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( APPEARANCE_CONTROLS_BASE::OnFlipBoardChecked ), NULL, this ); m_cbFlipBoard->Connect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( APPEARANCE_CONTROLS_BASE::OnFlipBoardChecked ), NULL, this );
m_paneNetDisplay->Connect( wxEVT_COLLAPSIBLEPANE_CHANGED, wxCollapsiblePaneEventHandler( APPEARANCE_CONTROLS_BASE::OnNetDisplayPaneChanged ), NULL, this ); m_paneNetDisplay->Connect( wxEVT_COLLAPSIBLEPANE_CHANGED, wxCollapsiblePaneEventHandler( APPEARANCE_CONTROLS_BASE::OnNetDisplayPaneChanged ), NULL, this );
m_cbLayerPresets->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( APPEARANCE_CONTROLS_BASE::OnLayerPresetChanged ), NULL, this ); m_cbLayerPresets->Connect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( APPEARANCE_CONTROLS_BASE::onLayerPresetChanged ), NULL, this );
m_btnDeletePreset->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( APPEARANCE_CONTROLS_BASE::OnBtnDeleteLayerPreset ), NULL, this );
} }
APPEARANCE_CONTROLS_BASE::~APPEARANCE_CONTROLS_BASE() APPEARANCE_CONTROLS_BASE::~APPEARANCE_CONTROLS_BASE()
@ -279,7 +282,6 @@ APPEARANCE_CONTROLS_BASE::~APPEARANCE_CONTROLS_BASE()
m_paneLayerDisplay->Disconnect( wxEVT_COLLAPSIBLEPANE_CHANGED, wxCollapsiblePaneEventHandler( APPEARANCE_CONTROLS_BASE::OnLayerDisplayPaneChanged ), NULL, this ); m_paneLayerDisplay->Disconnect( wxEVT_COLLAPSIBLEPANE_CHANGED, wxCollapsiblePaneEventHandler( APPEARANCE_CONTROLS_BASE::OnLayerDisplayPaneChanged ), NULL, this );
m_cbFlipBoard->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( APPEARANCE_CONTROLS_BASE::OnFlipBoardChecked ), NULL, this ); m_cbFlipBoard->Disconnect( wxEVT_COMMAND_CHECKBOX_CLICKED, wxCommandEventHandler( APPEARANCE_CONTROLS_BASE::OnFlipBoardChecked ), NULL, this );
m_paneNetDisplay->Disconnect( wxEVT_COLLAPSIBLEPANE_CHANGED, wxCollapsiblePaneEventHandler( APPEARANCE_CONTROLS_BASE::OnNetDisplayPaneChanged ), NULL, this ); m_paneNetDisplay->Disconnect( wxEVT_COLLAPSIBLEPANE_CHANGED, wxCollapsiblePaneEventHandler( APPEARANCE_CONTROLS_BASE::OnNetDisplayPaneChanged ), NULL, this );
m_cbLayerPresets->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( APPEARANCE_CONTROLS_BASE::OnLayerPresetChanged ), NULL, this ); m_cbLayerPresets->Disconnect( wxEVT_COMMAND_CHOICE_SELECTED, wxCommandEventHandler( APPEARANCE_CONTROLS_BASE::onLayerPresetChanged ), NULL, this );
m_btnDeletePreset->Disconnect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( APPEARANCE_CONTROLS_BASE::OnBtnDeleteLayerPreset ), NULL, this );
} }

276
pcbnew/widgets/appearance_controls_base.fbp
View File

@ -1892,153 +1892,149 @@
</object> </object>
</object> </object>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">2</property>
<property name="flag">wxBOTTOM|wxEXPAND|wxLEFT|wxRIGHT</property> <property name="flag">wxEXPAND|wxBOTTOM</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxStaticBoxSizer" expanded="1"> <object class="wxBoxSizer" expanded="1">
<property name="id">wxID_ANY</property>
<property name="label">Layer Presets</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="name">presetsSizer</property> <property name="name">bSizer18</property>
<property name="orient">wxHORIZONTAL</property> <property name="orient">wxVERTICAL</property>
<property name="parent">1</property>
<property name="permission">none</property> <property name="permission">none</property>
<object class="sizeritem" expanded="1"> <object class="sizeritem" expanded="1">
<property name="border">5</property> <property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property> <property name="flag">wxEXPAND|wxBOTTOM|wxRIGHT|wxLEFT</property>
<property name="proportion">1</property>
<object class="wxChoice" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="choices">&quot;All Layers&quot; &quot;(unsaved)&quot;</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_cbLayerPresets</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="selection">1</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip">Layer presets</property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChoice">OnLayerPresetChanged</event>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">5</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALL</property>
<property name="proportion">0</property> <property name="proportion">0</property>
<object class="wxBitmapButton" expanded="1"> <object class="wxBoxSizer" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="bitmap"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="current"></property>
<property name="default">0</property>
<property name="default_pane">0</property>
<property name="disabled"></property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">0</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="focus"></property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">New Preset</property>
<property name="margins"></property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property> <property name="minimum_size"></property>
<property name="moveable">1</property> <property name="name">bSizer171</property>
<property name="name">m_btnDeletePreset</property> <property name="orient">wxVERTICAL</property>
<property name="pane_border">1</property> <property name="permission">none</property>
<property name="pane_position"></property> <object class="sizeritem" expanded="1">
<property name="pane_size"></property> <property name="border">2</property>
<property name="permission">protected</property> <property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
<property name="pin_button">1</property> <property name="proportion">0</property>
<property name="pos"></property> <object class="wxStaticText" expanded="1">
<property name="position"></property> <property name="BottomDockable">1</property>
<property name="pressed"></property> <property name="LeftDockable">1</property>
<property name="resize">Resizable</property> <property name="RightDockable">1</property>
<property name="show">1</property> <property name="TopDockable">1</property>
<property name="size"></property> <property name="aui_layer"></property>
<property name="style"></property> <property name="aui_name"></property>
<property name="subclass">; ; forward_declare</property> <property name="aui_position"></property>
<property name="toolbar_pane">0</property> <property name="aui_row"></property>
<property name="tooltip">Delete this layer preset</property> <property name="best_size"></property>
<property name="validator_data_type"></property> <property name="bg"></property>
<property name="validator_style">wxFILTER_NONE</property> <property name="caption"></property>
<property name="validator_type">wxDefaultValidator</property> <property name="caption_visible">1</property>
<property name="validator_variable"></property> <property name="center_pane">0</property>
<property name="window_extra_style"></property> <property name="close_button">1</property>
<property name="window_name"></property> <property name="context_help"></property>
<property name="window_style"></property> <property name="context_menu">1</property>
<event name="OnButtonClick">OnBtnDeleteLayerPreset</event> <property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Presets:</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_staticText5</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<property name="wrap">-1</property>
</object>
</object>
<object class="sizeritem" expanded="1">
<property name="border">2</property>
<property name="flag">wxALIGN_CENTER_VERTICAL|wxALL|wxEXPAND</property>
<property name="proportion">0</property>
<object class="wxChoice" expanded="1">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer"></property>
<property name="aui_name"></property>
<property name="aui_position"></property>
<property name="aui_row"></property>
<property name="best_size"></property>
<property name="bg"></property>
<property name="caption"></property>
<property name="caption_visible">1</property>
<property name="center_pane">0</property>
<property name="choices">&quot;All Layers&quot; &quot;(unsaved)&quot;</property>
<property name="close_button">1</property>
<property name="context_help"></property>
<property name="context_menu">1</property>
<property name="default_pane">0</property>
<property name="dock">Dock</property>
<property name="dock_fixed">0</property>
<property name="docking">Left</property>
<property name="enabled">1</property>
<property name="fg"></property>
<property name="floatable">1</property>
<property name="font"></property>
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
<property name="min_size"></property>
<property name="minimize_button">0</property>
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_cbLayerPresets</property>
<property name="pane_border">1</property>
<property name="pane_position"></property>
<property name="pane_size"></property>
<property name="permission">protected</property>
<property name="pin_button">1</property>
<property name="pos"></property>
<property name="resize">Resizable</property>
<property name="selection">1</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style"></property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip">Layer presets</property>
<property name="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
<event name="OnChoice">onLayerPresetChanged</event>
</object>
</object>
</object> </object>
</object> </object>
</object> </object>

6
pcbnew/widgets/appearance_controls_base.h
View File

@ -31,7 +31,6 @@
#include <wx/splitter.h> #include <wx/splitter.h>
#include <wx/notebook.h> #include <wx/notebook.h>
#include <wx/choice.h> #include <wx/choice.h>
#include <wx/statbox.h>
/////////////////////////////////////////////////////////////////////////// ///////////////////////////////////////////////////////////////////////////
@ -79,16 +78,15 @@ class APPEARANCE_CONTROLS_BASE : public wxPanel
wxRadioButton* m_rbNetColorAll; wxRadioButton* m_rbNetColorAll;
wxRadioButton* m_rbNetColorRatsnest; wxRadioButton* m_rbNetColorRatsnest;
wxRadioButton* m_rbNetColorOff; wxRadioButton* m_rbNetColorOff;
wxStaticText* m_staticText5;
wxChoice* m_cbLayerPresets; wxChoice* m_cbLayerPresets;
wxBitmapButton* m_btnDeletePreset;
// Virtual event handlers, overide them in your derived class // Virtual event handlers, overide them in your derived class
virtual void OnNotebookPageChanged( wxNotebookEvent& event ) { event.Skip(); } virtual void OnNotebookPageChanged( wxNotebookEvent& event ) { event.Skip(); }
virtual void OnLayerDisplayPaneChanged( wxCollapsiblePaneEvent& event ) { event.Skip(); } virtual void OnLayerDisplayPaneChanged( wxCollapsiblePaneEvent& event ) { event.Skip(); }
virtual void OnFlipBoardChecked( wxCommandEvent& event ) { event.Skip(); } virtual void OnFlipBoardChecked( wxCommandEvent& event ) { event.Skip(); }
virtual void OnNetDisplayPaneChanged( wxCollapsiblePaneEvent& event ) { event.Skip(); } virtual void OnNetDisplayPaneChanged( wxCollapsiblePaneEvent& event ) { event.Skip(); }
virtual void OnLayerPresetChanged( wxCommandEvent& event ) { event.Skip(); } virtual void onLayerPresetChanged( wxCommandEvent& event ) { event.Skip(); }
virtual void OnBtnDeleteLayerPreset( wxCommandEvent& event ) { event.Skip(); }
public: public: