Mirrors
/
kicad
mirror of https://github.com/KiCad/kicad-source-mirror
3
0
Fork 0
Code Releases Activity
Browse Source

Adjust spacing.

pull/18/head
Jeff Young 4 months ago
parent
e6d94d5b09
commit
f66a3c3fac
4 changed files with 366 additions and 174 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 19
      pcbnew/dialogs/panel_edit_options.cpp
  2. 66
      pcbnew/dialogs/panel_edit_options_base.cpp
  3. 448
      pcbnew/dialogs/panel_edit_options_base.fbp
  4. 7
      pcbnew/dialogs/panel_edit_options_base.h

19
pcbnew/dialogs/panel_edit_options.cpp
View File

@ -50,12 +50,12 @@ PANEL_EDIT_OPTIONS::PANEL_EDIT_OPTIONS( wxWindow* aParent, UNITS_PROVIDER* aUnit
m_mouseCmdsOSX->Show( true );
m_mouseCmdsWinLin->Show( false );
// Disable highlight net option for footprint editor
m_rbCtrlClickActionMac->Enable( 1, !m_isFootprintEditor );
m_rbHighlightNetMac->Show( !m_isFootprintEditor );
#else
m_mouseCmdsWinLin->Show( true );
m_mouseCmdsOSX->Show( false );
// Disable highlight net option for footprint editor
m_rbCtrlClickAction->Enable( 1, !m_isFootprintEditor );
m_rbHighlightNet->Show( !m_isFootprintEditor );
#endif
m_optionsBook->SetSelection( isFootprintEditor ? 0 : 1 );
@ -124,9 +124,15 @@ void PANEL_EDIT_OPTIONS::loadPCBSettings( PCBNEW_SETTINGS* aCfg )
m_ratsnestThickness->SetValue( aCfg->m_Display.m_RatsnestThickness );
#ifdef __WXOSX_MAC__
m_rbCtrlClickActionMac->SetSelection( aCfg->m_CtrlClickHighlight );
if( aCfg->m_CtrlClickHighlight )
m_rbHighlightNetMac->SetValue( true );
else
m_rbToggleSelMac->SetValue( true );
#else
m_rbCtrlClickAction->SetSelection( aCfg->m_CtrlClickHighlight );
if( aCfg->m_CtrlClickHighlight )
m_rbHighlightNet->SetValue( true );
else
m_rbToggleSel->SetValue( true );
#endif
m_escClearsNetHighlight->SetValue( aCfg->m_ESCClearsNetHighlight );
@ -211,11 +217,10 @@ bool PANEL_EDIT_OPTIONS::TransferDataFromWindow()
cfg->m_ShowPageLimits = m_showPageLimits->GetValue();
cfg->m_ShowCourtyardCollisions = m_cbCourtyardCollisions->GetValue();
#ifdef __WXOSX_MAC__
cfg->m_CtrlClickHighlight = m_rbCtrlClickActionMac->GetSelection();
cfg->m_CtrlClickHighlight = m_rbHighlightNetMac->GetValue();
#else
cfg->m_CtrlClickHighlight = m_rbCtrlClickAction->GetSelection();
cfg->m_CtrlClickHighlight = m_rbHighlightNet->GetValue();
#endif
}

66
pcbnew/dialogs/panel_edit_options_base.cpp
View File

@ -53,6 +53,9 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i
bSizerUniversal->Add( bSizerRotationStep, 0, wxEXPAND, 5 );
bSizerUniversal->Add( 0, 3, 0, 0, 5 );
m_arcEditModeLabel = new wxStaticText( this, wxID_ANY, _("Arc editing mode:"), wxDefaultPosition, wxDefaultSize, 0 );
m_arcEditModeLabel->Wrap( -1 );
bSizerUniversal->Add( m_arcEditModeLabel, 0, wxLEFT, 5 );
@ -71,6 +74,9 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i
m_sizerBoardEdit = new wxBoxSizer( wxVERTICAL );
m_sizerBoardEdit->Add( 0, 3, 0, wxEXPAND, 5 );
m_trackMouseDragLabel = new wxStaticText( this, wxID_ANY, _("Track mouse-drag mode:"), wxDefaultPosition, wxDefaultSize, 0 );
m_trackMouseDragLabel->Wrap( -1 );
m_sizerBoardEdit->Add( m_trackMouseDragLabel, 0, wxRIGHT|wxLEFT, 5 );
@ -98,7 +104,7 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i
bSizerFlip->Add( m_rbFlipTopBottom, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 10 );
m_sizerBoardEdit->Add( bSizerFlip, 1, wxEXPAND|wxBOTTOM, 5 );
m_sizerBoardEdit->Add( bSizerFlip, 1, wxEXPAND|wxTOP|wxBOTTOM, 5 );
m_allowFreePads = new wxCheckBox( this, wxID_ANY, _("Allow free pads"), wxDefaultPosition, wxDefaultSize, 0 );
m_allowFreePads->SetToolTip( _("If checked, pads can be moved with respect to the rest of the footprint.") );
@ -132,7 +138,7 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i
fgSizerCmdsWinLin->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
wxStaticText* staticText61;
staticText61 = new wxStaticText( this, wxID_ANY, _("Click"), wxDefaultPosition, wxDefaultSize, 0 );
staticText61 = new wxStaticText( this, wxID_ANY, _("Click:"), wxDefaultPosition, wxDefaultSize, 0 );
staticText61->Wrap( -1 );
fgSizerCmdsWinLin->Add( staticText61, 0, wxRIGHT|wxLEFT, 5 );
@ -142,7 +148,7 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i
fgSizerCmdsWinLin->Add( staticText71, 0, wxRIGHT|wxLEFT, 5 );
wxStaticText* staticText611;
staticText611 = new wxStaticText( this, wxID_ANY, _("Long Click"), wxDefaultPosition, wxDefaultSize, 0 );
staticText611 = new wxStaticText( this, wxID_ANY, _("Long Click:"), wxDefaultPosition, wxDefaultSize, 0 );
staticText611->Wrap( -1 );
fgSizerCmdsWinLin->Add( staticText611, 0, wxRIGHT|wxLEFT, 5 );
@ -152,7 +158,7 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i
fgSizerCmdsWinLin->Add( staticText711, 0, wxRIGHT|wxLEFT, 5 );
wxStaticText* staticText81;
staticText81 = new wxStaticText( this, wxID_ANY, _("Shift"), wxDefaultPosition, wxDefaultSize, 0 );
staticText81 = new wxStaticText( this, wxID_ANY, _("Shift:"), wxDefaultPosition, wxDefaultSize, 0 );
staticText81->Wrap( -1 );
fgSizerCmdsWinLin->Add( staticText81, 0, wxRIGHT|wxLEFT, 5 );
@ -162,7 +168,7 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i
fgSizerCmdsWinLin->Add( staticText91, 0, wxRIGHT|wxLEFT, 5 );
wxStaticText* staticText121;
staticText121 = new wxStaticText( this, wxID_ANY, _("Ctrl+Shift"), wxDefaultPosition, wxDefaultSize, 0 );
staticText121 = new wxStaticText( this, wxID_ANY, _("Ctrl+Shift:"), wxDefaultPosition, wxDefaultSize, 0 );
staticText121->Wrap( -1 );
fgSizerCmdsWinLin->Add( staticText121, 0, wxRIGHT|wxLEFT, 5 );
@ -172,15 +178,21 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i
fgSizerCmdsWinLin->Add( staticText131, 0, wxRIGHT|wxLEFT, 5 );
wxStaticText* staticText161;
staticText161 = new wxStaticText( this, wxID_ANY, _("Ctrl"), wxDefaultPosition, wxDefaultSize, 0 );
staticText161 = new wxStaticText( this, wxID_ANY, _("Ctrl:"), wxDefaultPosition, wxDefaultSize, 0 );
staticText161->Wrap( -1 );
fgSizerCmdsWinLin->Add( staticText161, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
fgSizerCmdsWinLin->Add( staticText161, 0, wxRIGHT|wxLEFT, 5 );
wxBoxSizer* bSizer16;
bSizer16 = new wxBoxSizer( wxVERTICAL );
m_rbToggleSel = new wxRadioButton( this, wxID_ANY, _("Toggle selection"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
bSizer16->Add( m_rbToggleSel, 0, 0, 5 );
wxString m_rbCtrlClickActionChoices[] = { _("Toggle selection"), _("Highlight net (for pads or tracks)") };
int m_rbCtrlClickActionNChoices = sizeof( m_rbCtrlClickActionChoices ) / sizeof( wxString );
m_rbCtrlClickAction = new wxRadioBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_rbCtrlClickActionNChoices, m_rbCtrlClickActionChoices, 1, wxRA_SPECIFY_COLS );
m_rbCtrlClickAction->SetSelection( 1 );
fgSizerCmdsWinLin->Add( m_rbCtrlClickAction, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 );
m_rbHighlightNet = new wxRadioButton( this, wxID_ANY, _("Highlight net (for pads/tracks)"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer16->Add( m_rbHighlightNet, 0, wxTOP, 2 );
fgSizerCmdsWinLin->Add( bSizer16, 1, wxEXPAND|wxLEFT, 5 );
m_mouseCmdsWinLin->Add( fgSizerCmdsWinLin, 1, wxEXPAND|wxTOP, 5 );
@ -200,7 +212,7 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i
fgSizerCmdsOSX->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
wxStaticText* staticText62;
staticText62 = new wxStaticText( this, wxID_ANY, _("Click"), wxDefaultPosition, wxDefaultSize, 0 );
staticText62 = new wxStaticText( this, wxID_ANY, _("Click:"), wxDefaultPosition, wxDefaultSize, 0 );
staticText62->Wrap( -1 );
fgSizerCmdsOSX->Add( staticText62, 0, wxRIGHT|wxLEFT, 5 );
@ -210,7 +222,7 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i
fgSizerCmdsOSX->Add( staticText72, 0, wxRIGHT|wxLEFT, 5 );
wxStaticText* staticText162;
staticText162 = new wxStaticText( this, wxID_ANY, _("Long Click"), wxDefaultPosition, wxDefaultSize, 0 );
staticText162 = new wxStaticText( this, wxID_ANY, _("Long Click:"), wxDefaultPosition, wxDefaultSize, 0 );
staticText162->Wrap( -1 );
fgSizerCmdsOSX->Add( staticText162, 0, wxRIGHT|wxLEFT, 5 );
@ -220,7 +232,7 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i
fgSizerCmdsOSX->Add( staticText172, 0, wxRIGHT|wxLEFT, 5 );
wxStaticText* staticText82;
staticText82 = new wxStaticText( this, wxID_ANY, _("Shift"), wxDefaultPosition, wxDefaultSize, 0 );
staticText82 = new wxStaticText( this, wxID_ANY, _("Shift:"), wxDefaultPosition, wxDefaultSize, 0 );
staticText82->Wrap( -1 );
fgSizerCmdsOSX->Add( staticText82, 0, wxRIGHT|wxLEFT, 5 );
@ -230,7 +242,7 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i
fgSizerCmdsOSX->Add( staticText92, 0, wxRIGHT|wxLEFT, 5 );
wxStaticText* staticText122;
staticText122 = new wxStaticText( this, wxID_ANY, _("Shift+Cmd"), wxDefaultPosition, wxDefaultSize, 0 );
staticText122 = new wxStaticText( this, wxID_ANY, _("Shift+Cmd:"), wxDefaultPosition, wxDefaultSize, 0 );
staticText122->Wrap( -1 );
fgSizerCmdsOSX->Add( staticText122, 0, wxRIGHT|wxLEFT, 5 );
@ -240,18 +252,24 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i
fgSizerCmdsOSX->Add( staticText132, 0, wxRIGHT|wxLEFT, 5 );
wxStaticText* staticText142;
staticText142 = new wxStaticText( this, wxID_ANY, _("Cmd"), wxDefaultPosition, wxDefaultSize, 0 );
staticText142 = new wxStaticText( this, wxID_ANY, _("Cmd:"), wxDefaultPosition, wxDefaultSize, 0 );
staticText142->Wrap( -1 );
fgSizerCmdsOSX->Add( staticText142, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
fgSizerCmdsOSX->Add( staticText142, 0, wxRIGHT|wxLEFT, 5 );
wxBoxSizer* bSizer161;
bSizer161 = new wxBoxSizer( wxVERTICAL );
m_rbToggleSelMac = new wxRadioButton( this, wxID_ANY, _("Toggle selection"), wxDefaultPosition, wxDefaultSize, wxRB_GROUP );
bSizer161->Add( m_rbToggleSelMac, 0, 0, 5 );
m_rbHighlightNetMac = new wxRadioButton( this, wxID_ANY, _("Highlight net (for pads/tracks)"), wxDefaultPosition, wxDefaultSize, 0 );
bSizer161->Add( m_rbHighlightNetMac, 0, wxTOP, 2 );
wxString m_rbCtrlClickActionMacChoices[] = { _("Toggle selection"), _("Highlight net (for pads or tracks)") };
int m_rbCtrlClickActionMacNChoices = sizeof( m_rbCtrlClickActionMacChoices ) / sizeof( wxString );
m_rbCtrlClickActionMac = new wxRadioBox( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, m_rbCtrlClickActionMacNChoices, m_rbCtrlClickActionMacChoices, 1, wxRA_SPECIFY_COLS );
m_rbCtrlClickActionMac->SetSelection( 0 );
fgSizerCmdsOSX->Add( m_rbCtrlClickActionMac, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 );
fgSizerCmdsOSX->Add( bSizer161, 1, wxEXPAND|wxLEFT, 5 );
wxStaticText* staticText102;
staticText102 = new wxStaticText( this, wxID_ANY, _("Option"), wxDefaultPosition, wxDefaultSize, 0 );
staticText102 = new wxStaticText( this, wxID_ANY, _("Option:"), wxDefaultPosition, wxDefaultSize, 0 );
staticText102->Wrap( -1 );
fgSizerCmdsOSX->Add( staticText102, 0, wxBOTTOM|wxLEFT|wxRIGHT, 5 );

448
pcbnew/dialogs/panel_edit_options_base.fbp
View File

@ -473,6 +473,16 @@
</object>
</object>
</object>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag"></property>
<property name="proportion">0</property>
<object class="spacer" expanded="true">
<property name="height">3</property>
<property name="permission">protected</property>
<property name="width">0</property>
</object>
</object>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxLEFT</property>
@ -621,6 +631,16 @@
<property name="name">m_sizerBoardEdit</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">protected</property>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxEXPAND</property>
<property name="proportion">0</property>
<object class="spacer" expanded="true">
<property name="height">3</property>
<property name="permission">protected</property>
<property name="width">0</property>
</object>
</object>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxRIGHT|wxLEFT</property>
@ -760,7 +780,7 @@
</object>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxEXPAND|wxBOTTOM</property>
<property name="flag">wxEXPAND|wxTOP|wxBOTTOM</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
@ -1334,7 +1354,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Click</property>
<property name="label">Click:</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
@ -1458,7 +1478,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Long Click</property>
<property name="label">Long Click:</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
@ -1582,7 +1602,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Shift</property>
<property name="label">Shift:</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
@ -1706,7 +1726,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Ctrl+Shift</property>
<property name="label">Ctrl+Shift:</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
@ -1799,7 +1819,7 @@
</object>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
<property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
<property name="flag">wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="false">
<property name="BottomDockable">1</property>
@ -1830,7 +1850,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Ctrl</property>
<property name="label">Ctrl:</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
@ -1859,71 +1879,145 @@
<property name="wrap">-1</property>
</object>
</object>
<object class="sizeritem" expanded="false">
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxBOTTOM|wxLEFT|wxRIGHT</property>
<property name="proportion">0</property>
<object class="wxRadioBox" expanded="false">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer">0</property>
<property name="aui_name"></property>
<property name="aui_position">0</property>
<property name="aui_row">0</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;Toggle selection&quot; &quot;Highlight net (for pads or tracks)&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="drag_accept_files">0</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"></property>
<property name="majorDimension">1</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="flag">wxEXPAND|wxLEFT</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_rbCtrlClickAction</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">wxRA_SPECIFY_COLS</property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></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>
<property name="name">bSizer16</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag"></property>
<property name="proportion">0</property>
<object class="wxRadioButton" expanded="true">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer">0</property>
<property name="aui_name"></property>
<property name="aui_position">0</property>
<property name="aui_row">0</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="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="drag_accept_files">0</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">Toggle selection</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_rbToggleSel</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">wxRB_GROUP</property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></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="value">0</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
</object>
</object>
<object class="sizeritem" expanded="true">
<property name="border">2</property>
<property name="flag">wxTOP</property>
<property name="proportion">0</property>
<object class="wxRadioButton" expanded="true">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer">0</property>
<property name="aui_name"></property>
<property name="aui_position">0</property>
<property name="aui_row">0</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="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="drag_accept_files">0</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">Highlight net (for pads/tracks)</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_rbHighlightNet</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="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="value">0</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
</object>
</object>
</object>
</object>
</object>
@ -2050,7 +2144,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Click</property>
<property name="label">Click:</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
@ -2174,7 +2268,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Long Click</property>
<property name="label">Long Click:</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
@ -2298,7 +2392,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Shift</property>
<property name="label">Shift:</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
@ -2422,7 +2516,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Shift+Cmd</property>
<property name="label">Shift+Cmd:</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
@ -2515,7 +2609,7 @@
</object>
<object class="sizeritem" expanded="false">
<property name="border">5</property>
<property name="flag">wxTOP|wxRIGHT|wxLEFT</property>
<property name="flag">wxRIGHT|wxLEFT</property>
<property name="proportion">0</property>
<object class="wxStaticText" expanded="false">
<property name="BottomDockable">1</property>
@ -2546,7 +2640,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Cmd</property>
<property name="label">Cmd:</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
@ -2575,71 +2669,145 @@
<property name="wrap">-1</property>
</object>
</object>
<object class="sizeritem" expanded="false">
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag">wxBOTTOM|wxLEFT|wxRIGHT</property>
<property name="proportion">0</property>
<object class="wxRadioBox" expanded="false">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer">0</property>
<property name="aui_name"></property>
<property name="aui_position">0</property>
<property name="aui_row">0</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;Toggle selection&quot; &quot;Highlight net (for pads or tracks)&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="drag_accept_files">0</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"></property>
<property name="majorDimension">1</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="flag">wxEXPAND|wxLEFT</property>
<property name="proportion">1</property>
<object class="wxBoxSizer" expanded="true">
<property name="minimum_size"></property>
<property name="moveable">1</property>
<property name="name">m_rbCtrlClickActionMac</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">0</property>
<property name="show">1</property>
<property name="size"></property>
<property name="style">wxRA_SPECIFY_COLS</property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></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>
<property name="name">bSizer161</property>
<property name="orient">wxVERTICAL</property>
<property name="permission">none</property>
<object class="sizeritem" expanded="true">
<property name="border">5</property>
<property name="flag"></property>
<property name="proportion">0</property>
<object class="wxRadioButton" expanded="true">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer">0</property>
<property name="aui_name"></property>
<property name="aui_position">0</property>
<property name="aui_row">0</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="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="drag_accept_files">0</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">Toggle selection</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_rbToggleSelMac</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">wxRB_GROUP</property>
<property name="subclass">; ; forward_declare</property>
<property name="toolbar_pane">0</property>
<property name="tooltip"></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="value">0</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
</object>
</object>
<object class="sizeritem" expanded="true">
<property name="border">2</property>
<property name="flag">wxTOP</property>
<property name="proportion">0</property>
<object class="wxRadioButton" expanded="true">
<property name="BottomDockable">1</property>
<property name="LeftDockable">1</property>
<property name="RightDockable">1</property>
<property name="TopDockable">1</property>
<property name="aui_layer">0</property>
<property name="aui_name"></property>
<property name="aui_position">0</property>
<property name="aui_row">0</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="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="drag_accept_files">0</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">Highlight net (for pads/tracks)</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_rbHighlightNetMac</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="validator_data_type"></property>
<property name="validator_style">wxFILTER_NONE</property>
<property name="validator_type">wxDefaultValidator</property>
<property name="validator_variable"></property>
<property name="value">0</property>
<property name="window_extra_style"></property>
<property name="window_name"></property>
<property name="window_style"></property>
</object>
</object>
</object>
</object>
<object class="sizeritem" expanded="false">
@ -2675,7 +2843,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Option</property>
<property name="label">Option:</property>
<property name="markup">0</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>

7
pcbnew/dialogs/panel_edit_options_base.h
View File

@ -23,7 +23,6 @@
#include <wx/sizer.h>
#include <wx/choice.h>
#include <wx/radiobut.h>
#include <wx/radiobox.h>
#include <wx/panel.h>
#include <wx/spinctrl.h>
#include <wx/simplebook.h>
@ -61,10 +60,12 @@ class PANEL_EDIT_OPTIONS_BASE : public RESETTABLE_PANEL
wxStaticLine* m_staticline4;
wxBoxSizer* m_mouseCmdsWinLin;
wxStaticText* m_stHint1;
wxRadioBox* m_rbCtrlClickAction;
wxRadioButton* m_rbToggleSel;
wxRadioButton* m_rbHighlightNet;
wxBoxSizer* m_mouseCmdsOSX;
wxStaticText* m_stHint2;
wxRadioBox* m_rbCtrlClickActionMac;
wxRadioButton* m_rbToggleSelMac;
wxRadioButton* m_rbHighlightNetMac;
wxSimplebook* m_optionsBook;
wxStaticText* m_staticText34;
wxStaticLine* m_staticline5;

Write Preview
Loading…
Cancel
Save