GAL_OPTIONS_PANEL: replace 2 wxSpinCtrlDouble to try to fix a locale issue.
Sometimes the grid thickness setting does not work, depending on some locale setting. Core developers are not able to reproduce this issue related to a double conversion. So these wxSpinCtrlDouble are replaced by a wxSpinCtrl (using ints) and a wxChoice.
This commit is contained in:
jean-pierre charras
parent
2bb457d477
commit
ddb141ff08
|
|
@ -179,6 +179,7 @@ set( COMMON_WIDGET_SRCS
|
||||||
widgets/footprint_preview_widget.cpp
|
widgets/footprint_preview_widget.cpp
|
||||||
widgets/footprint_select_widget.cpp
|
widgets/footprint_select_widget.cpp
|
||||||
widgets/gal_options_panel.cpp
|
widgets/gal_options_panel.cpp
|
||||||
|
widgets/gal_options_panel_base.cpp
|
||||||
widgets/grid_bitmap_toggle.cpp
|
widgets/grid_bitmap_toggle.cpp
|
||||||
widgets/grid_button.cpp
|
widgets/grid_button.cpp
|
||||||
widgets/grid_color_swatch_helpers.cpp
|
widgets/grid_color_swatch_helpers.cpp
|
||||||
|
|
|
||||||
|
|
@ -45,9 +45,9 @@ static const double gridThicknessMin = 1.0;
|
||||||
static const double gridThicknessMax = 10.0;
|
static const double gridThicknessMax = 10.0;
|
||||||
static const double gridThicknessStep = 0.5;
|
static const double gridThicknessStep = 0.5;
|
||||||
|
|
||||||
static const double gridMinSpacingMin = 5;
|
static const int gridMinSpacingMin = 5;
|
||||||
static const double gridMinSpacingMax = 200;
|
static const int gridMinSpacingMax = 200;
|
||||||
static const double gridMinSpacingStep = 5;
|
static const int gridMinSpacingStep = 5;
|
||||||
|
|
||||||
|
|
||||||
///TODO: These are duplicated in gal_display_options - Unify!
|
///TODO: These are duplicated in gal_display_options - Unify!
|
||||||
|
|
@ -68,153 +68,40 @@ static const UTIL::CFG_MAP<KIGFX::GRID_SNAPPING> gridSnapConfigVals =
|
||||||
|
|
||||||
|
|
||||||
GAL_OPTIONS_PANEL::GAL_OPTIONS_PANEL( wxWindow* aParent, APP_SETTINGS_BASE* aAppSettings ) :
|
GAL_OPTIONS_PANEL::GAL_OPTIONS_PANEL( wxWindow* aParent, APP_SETTINGS_BASE* aAppSettings ) :
|
||||||
wxPanel( aParent, wxID_ANY ),
|
GAL_OPTIONS_PANEL_BASE( aParent ),
|
||||||
m_cfg( aAppSettings )
|
m_cfg( aAppSettings )
|
||||||
{
|
{
|
||||||
// the main sizer that holds "columns" of settings
|
// Rendering engine
|
||||||
m_mainSizer = new wxBoxSizer( wxHORIZONTAL );
|
#ifdef __WXMAC__
|
||||||
SetSizer( m_mainSizer );
|
// On MAC, Cairo render does not work.
|
||||||
|
m_renderingEngine->Hide();
|
||||||
|
#endif
|
||||||
|
m_renderingEngine->SetItemToolTip( 0, _( "Hardware-accelerated graphics (recommended)" ) );
|
||||||
|
m_renderingEngine->SetItemToolTip( 1, _( "Software graphics (for computers which do not "
|
||||||
|
"support KiCad's hardware acceleration "
|
||||||
|
"requirements)" ) );
|
||||||
|
|
||||||
// second-level sizers that are one "column" of settings each
|
// Grid settings subpanel
|
||||||
wxBoxSizer* sLeftSizer = new wxBoxSizer( wxVERTICAL );
|
#if 0
|
||||||
m_mainSizer->Add( sLeftSizer, 1, wxRIGHT | wxBOTTOM | wxEXPAND, 5 );
|
m_gridLineWidth->SetRange( gridThicknessMin, gridThicknessMax );
|
||||||
|
m_gridLineWidth->SetIncrement( gridThicknessStep );
|
||||||
|
#else
|
||||||
|
int selection = 0; // default selection
|
||||||
|
|
||||||
/*
|
for( double size = gridThicknessMin; size <= gridThicknessMax; size += gridThicknessStep )
|
||||||
* Rendering engine
|
|
||||||
*/
|
|
||||||
#ifndef __WXMAC__
|
|
||||||
{
|
{
|
||||||
wxString engineChoices[] = { _( "Accelerated graphics" ), _( "Fallback graphics" ) };
|
m_gridThicknessList.push_back( size );
|
||||||
m_renderingEngine = new wxRadioBox( this, wxID_ANY, _( "Rendering Engine" ),
|
m_gridLineWidth->Append( wxString::Format( wxT( "%.1f" ), size ) );
|
||||||
wxDefaultPosition, wxDefaultSize,
|
|
||||||
sizeof( engineChoices ) / sizeof( wxString ),
|
|
||||||
engineChoices, 1, wxRA_SPECIFY_COLS );
|
|
||||||
m_renderingEngine->SetItemToolTip( 0, _( "Hardware-accelerated graphics (recommended)" ) );
|
|
||||||
m_renderingEngine->SetItemToolTip( 1, _( "Software graphics (for computers which do not "
|
|
||||||
"support KiCad's hardware acceleration "
|
|
||||||
"requirements)" ) );
|
|
||||||
|
|
||||||
sLeftSizer->Add( m_renderingEngine, 0, wxTOP | wxBOTTOM | wxRIGHT | wxEXPAND, 5 );
|
if( m_cfg->m_Window.grid.line_width == size )
|
||||||
|
selection = m_gridLineWidth->GetCount() - 1;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
m_gridLineWidth->SetSelection( selection );
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
/*
|
m_gridMinSpacing->SetRange( gridMinSpacingMin, gridMinSpacingMax );
|
||||||
* Grid settings subpanel
|
m_gridMinSpacing->SetIncrement( gridMinSpacingStep );
|
||||||
*/
|
|
||||||
{
|
|
||||||
wxStaticText* gridLabel = new wxStaticText( this, wxID_ANY, _( "Grid Options" ) );
|
|
||||||
sLeftSizer->Add( gridLabel, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND, 13 );
|
|
||||||
|
|
||||||
wxStaticLine* staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition,
|
|
||||||
wxDefaultSize, wxLI_HORIZONTAL );
|
|
||||||
sLeftSizer->Add( staticline1, 0, wxEXPAND|wxBOTTOM, 5 );
|
|
||||||
|
|
||||||
wxBoxSizer* sGridSettings = new wxBoxSizer( wxVERTICAL );
|
|
||||||
|
|
||||||
wxString m_gridStyleChoices[] = {
|
|
||||||
_( "Dots" ),
|
|
||||||
_( "Lines" ),
|
|
||||||
_( "Small crosses" )
|
|
||||||
};
|
|
||||||
|
|
||||||
int m_gridStyleNChoices = sizeof( m_gridStyleChoices ) / sizeof( wxString );
|
|
||||||
m_gridStyle = new wxRadioBox( this, wxID_ANY, _( "Grid Style" ), wxDefaultPosition,
|
|
||||||
wxDefaultSize, m_gridStyleNChoices, m_gridStyleChoices, 1,
|
|
||||||
wxRA_SPECIFY_COLS );
|
|
||||||
sGridSettings->Add( m_gridStyle, 0, wxALL | wxEXPAND, 5 );
|
|
||||||
|
|
||||||
wxFlexGridSizer* sGridSettingsGrid;
|
|
||||||
sGridSettingsGrid = new wxFlexGridSizer( 0, 3, 0, 0 );
|
|
||||||
sGridSettingsGrid->AddGrowableCol( 1 );
|
|
||||||
sGridSettingsGrid->SetFlexibleDirection( wxBOTH );
|
|
||||||
sGridSettingsGrid->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
|
|
||||||
|
|
||||||
l_gridLineWidth = new wxStaticText( this, wxID_ANY, _( "Grid thickness:" ) );
|
|
||||||
l_gridLineWidth->Wrap( -1 );
|
|
||||||
sGridSettingsGrid->Add( l_gridLineWidth, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT | wxTOP, 5 );
|
|
||||||
|
|
||||||
m_gridLineWidth = new wxSpinCtrlDouble( this, wxID_ANY );
|
|
||||||
m_gridLineWidth->SetRange( gridThicknessMin, gridThicknessMax );
|
|
||||||
m_gridLineWidth->SetIncrement( gridThicknessStep );
|
|
||||||
m_gridLineWidth->SetDigits( 1 );
|
|
||||||
sGridSettingsGrid->Add( m_gridLineWidth, 0, wxALIGN_CENTER_VERTICAL | wxEXPAND | wxTOP, 5 );
|
|
||||||
|
|
||||||
l_gridLineWidthUnits = new wxStaticText( this, wxID_ANY, _( "px" ) );
|
|
||||||
l_gridLineWidthUnits->Wrap( -1 );
|
|
||||||
sGridSettingsGrid->Add( l_gridLineWidthUnits, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT | wxLEFT | wxTOP, 5 );
|
|
||||||
|
|
||||||
l_gridMinSpacing = new wxStaticText( this, wxID_ANY, _( "Min grid spacing:" ) );
|
|
||||||
l_gridMinSpacing->Wrap( -1 );
|
|
||||||
sGridSettingsGrid->Add( l_gridMinSpacing, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT | wxTOP, 5 );
|
|
||||||
|
|
||||||
m_gridMinSpacing = new wxSpinCtrlDouble( this, wxID_ANY);
|
|
||||||
m_gridMinSpacing->SetRange( gridMinSpacingMin, gridMinSpacingMax );
|
|
||||||
m_gridMinSpacing->SetIncrement( gridMinSpacingStep );
|
|
||||||
m_gridMinSpacing->SetDigits( 0 );
|
|
||||||
sGridSettingsGrid->Add( m_gridMinSpacing, 0, wxALIGN_CENTER_VERTICAL | wxEXPAND | wxTOP, 5 );
|
|
||||||
|
|
||||||
l_gridMinSpacingUnits = new wxStaticText( this, wxID_ANY, _( "px" ) );
|
|
||||||
l_gridMinSpacingUnits->Wrap( -1 );
|
|
||||||
sGridSettingsGrid->Add( l_gridMinSpacingUnits, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT | wxLEFT | wxTOP, 5 );
|
|
||||||
|
|
||||||
l_gridSnapOptions = new wxStaticText( this, wxID_ANY, _( "Snap to grid:" ) );
|
|
||||||
l_gridSnapOptions->Wrap( -1 );
|
|
||||||
sGridSettingsGrid->Add( l_gridSnapOptions, 0, wxALIGN_CENTER_VERTICAL | wxRIGHT | wxTOP, 5 );
|
|
||||||
|
|
||||||
wxString gridSnapChoices[] = { _( "Always" ), _( "When grid shown" ), _( "Never" ) };
|
|
||||||
int gridSnapNChoices = sizeof( gridSnapChoices ) / sizeof( wxString );
|
|
||||||
m_gridSnapOptions = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize,
|
|
||||||
gridSnapNChoices, gridSnapChoices );
|
|
||||||
m_gridSnapOptions->Select( 0 );
|
|
||||||
sGridSettingsGrid->Add( m_gridSnapOptions, 0,
|
|
||||||
wxALIGN_CENTER_VERTICAL | wxEXPAND | wxTOP | wxBOTTOM, 5 );
|
|
||||||
|
|
||||||
l_gridSnapSpace = new wxStaticText( this, wxID_ANY, _( "px" ) );
|
|
||||||
l_gridSnapSpace->Wrap( -1 );
|
|
||||||
l_gridSnapSpace->Hide();
|
|
||||||
sGridSettingsGrid->Add( l_gridSnapSpace, 0,
|
|
||||||
wxALIGN_CENTER_VERTICAL | wxALL | wxRESERVE_SPACE_EVEN_IF_HIDDEN,
|
|
||||||
5 );
|
|
||||||
|
|
||||||
|
|
||||||
sGridSettings->Add( sGridSettingsGrid, 1, wxLEFT | wxRIGHT | wxBOTTOM | wxEXPAND, 5 );
|
|
||||||
|
|
||||||
sLeftSizer->Add( sGridSettings, 0, wxEXPAND|wxLEFT, 5 );
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
|
||||||
* Cursor settings subpanel
|
|
||||||
*/
|
|
||||||
{
|
|
||||||
sLeftSizer->Add( 0, 15, 0, wxEXPAND, 5 );
|
|
||||||
|
|
||||||
wxStaticText* gridLabel = new wxStaticText( this, wxID_ANY, _( "Cursor Options" ) );
|
|
||||||
sLeftSizer->Add( gridLabel, 0, wxTOP|wxRIGHT|wxLEFT|wxEXPAND, 13 );
|
|
||||||
|
|
||||||
wxStaticLine* staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition,
|
|
||||||
wxDefaultSize, wxLI_HORIZONTAL );
|
|
||||||
sLeftSizer->Add( staticline2, 0, wxEXPAND|wxBOTTOM, 5 );
|
|
||||||
|
|
||||||
wxBoxSizer* sCursorSettings = new wxBoxSizer( wxVERTICAL );
|
|
||||||
sLeftSizer->Add( sCursorSettings, 0, wxEXPAND|wxLEFT, 5 );
|
|
||||||
|
|
||||||
wxString m_CursorShapeChoices[] = {
|
|
||||||
_( "Small crosshair" ),
|
|
||||||
_( "Full window crosshair" )
|
|
||||||
};
|
|
||||||
|
|
||||||
int m_CursorShapeNChoices = sizeof( m_CursorShapeChoices ) / sizeof( wxString );
|
|
||||||
m_cursorShape = new wxRadioBox( this, wxID_ANY, _( "Cursor Shape" ), wxDefaultPosition,
|
|
||||||
wxDefaultSize, m_CursorShapeNChoices, m_CursorShapeChoices,
|
|
||||||
1, wxRA_SPECIFY_COLS );
|
|
||||||
|
|
||||||
m_cursorShape->SetSelection( 0 );
|
|
||||||
m_cursorShape->SetToolTip( _( "Cursor shape for drawing, placement and movement tools" ) );
|
|
||||||
sCursorSettings->Add( m_cursorShape, 0, wxALL | wxEXPAND, 5 );
|
|
||||||
|
|
||||||
m_forceCursorDisplay = new wxCheckBox( this, wxID_ANY, _( "Always show crosshairs" ) );
|
|
||||||
sCursorSettings->Add( m_forceCursorDisplay, 0, wxALL | wxEXPAND, 5 );
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
@ -231,7 +118,7 @@ bool GAL_OPTIONS_PANEL::TransferDataToWindow()
|
||||||
|
|
||||||
m_gridSnapOptions->SetSelection( m_cfg->m_Window.grid.snap );
|
m_gridSnapOptions->SetSelection( m_cfg->m_Window.grid.snap );
|
||||||
m_gridStyle->SetSelection( m_cfg->m_Window.grid.style );
|
m_gridStyle->SetSelection( m_cfg->m_Window.grid.style );
|
||||||
m_gridLineWidth->SetValue( m_cfg->m_Window.grid.line_width );
|
|
||||||
m_gridMinSpacing->SetValue( m_cfg->m_Window.grid.min_spacing );
|
m_gridMinSpacing->SetValue( m_cfg->m_Window.grid.min_spacing );
|
||||||
|
|
||||||
m_cursorShape->SetSelection( m_cfg->m_Window.cursor.fullscreen_cursor );
|
m_cursorShape->SetSelection( m_cfg->m_Window.cursor.fullscreen_cursor );
|
||||||
|
|
@ -245,7 +132,10 @@ bool GAL_OPTIONS_PANEL::TransferDataFromWindow()
|
||||||
{
|
{
|
||||||
m_cfg->m_Window.grid.snap = m_gridSnapOptions->GetSelection();
|
m_cfg->m_Window.grid.snap = m_gridSnapOptions->GetSelection();
|
||||||
m_cfg->m_Window.grid.style = m_gridStyle->GetSelection();
|
m_cfg->m_Window.grid.style = m_gridStyle->GetSelection();
|
||||||
m_cfg->m_Window.grid.line_width = m_gridLineWidth->GetValue();
|
|
||||||
|
if( m_gridLineWidth->GetSelection() >= 0 )
|
||||||
|
m_cfg->m_Window.grid.line_width = m_gridThicknessList[ m_gridLineWidth->GetSelection() ];
|
||||||
|
|
||||||
m_cfg->m_Window.grid.min_spacing = m_gridMinSpacing->GetValue();
|
m_cfg->m_Window.grid.min_spacing = m_gridMinSpacing->GetValue();
|
||||||
|
|
||||||
m_cfg->m_Window.cursor.fullscreen_cursor = m_cursorShape->GetSelection();
|
m_cfg->m_Window.cursor.fullscreen_cursor = m_cursorShape->GetSelection();
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,122 @@
|
||||||
|
///////////////////////////////////////////////////////////////////////////
|
||||||
|
// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb)
|
||||||
|
// http://www.wxformbuilder.org/
|
||||||
|
//
|
||||||
|
// PLEASE DO *NOT* EDIT THIS FILE!
|
||||||
|
///////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
#include "gal_options_panel_base.h"
|
||||||
|
|
||||||
|
///////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
GAL_OPTIONS_PANEL_BASE::GAL_OPTIONS_PANEL_BASE( wxWindow* parent, wxWindowID id, const wxPoint& pos, const wxSize& size, long style, const wxString& name ) : wxPanel( parent, id, pos, size, style, name )
|
||||||
|
{
|
||||||
|
wxBoxSizer* mainSizer;
|
||||||
|
mainSizer = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
|
wxBoxSizer* sLeftSizer;
|
||||||
|
sLeftSizer = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
|
wxString m_renderingEngineChoices[] = { _("Accelerated graphics"), _("Fallback graphics") };
|
||||||
|
int m_renderingEngineNChoices = sizeof( m_renderingEngineChoices ) / sizeof( wxString );
|
||||||
|
m_renderingEngine = new wxRadioBox( this, wxID_ANY, _("Rendering Engine"), wxDefaultPosition, wxDefaultSize, m_renderingEngineNChoices, m_renderingEngineChoices, 1, wxRA_SPECIFY_COLS );
|
||||||
|
m_renderingEngine->SetSelection( 0 );
|
||||||
|
sLeftSizer->Add( m_renderingEngine, 0, wxALL, 5 );
|
||||||
|
|
||||||
|
|
||||||
|
mainSizer->Add( sLeftSizer, 0, wxEXPAND, 5 );
|
||||||
|
|
||||||
|
m_staticText1 = new wxStaticText( this, wxID_ANY, _("Grid Options"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
m_staticText1->Wrap( -1 );
|
||||||
|
mainSizer->Add( m_staticText1, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
||||||
|
|
||||||
|
m_staticline1 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
|
||||||
|
mainSizer->Add( m_staticline1, 0, wxEXPAND | wxALL, 5 );
|
||||||
|
|
||||||
|
wxString m_gridStyleChoices[] = { _("Dots"), _("Lines"), _("Small crosses") };
|
||||||
|
int m_gridStyleNChoices = sizeof( m_gridStyleChoices ) / sizeof( wxString );
|
||||||
|
m_gridStyle = new wxRadioBox( this, wxID_ANY, _("Grid Style"), wxDefaultPosition, wxDefaultSize, m_gridStyleNChoices, m_gridStyleChoices, 1, wxRA_SPECIFY_COLS );
|
||||||
|
m_gridStyle->SetSelection( 0 );
|
||||||
|
mainSizer->Add( m_gridStyle, 0, wxALL, 5 );
|
||||||
|
|
||||||
|
wxFlexGridSizer* fgGridSettingsGrid;
|
||||||
|
fgGridSettingsGrid = new wxFlexGridSizer( 0, 3, 0, 0 );
|
||||||
|
fgGridSettingsGrid->AddGrowableCol( 1 );
|
||||||
|
fgGridSettingsGrid->SetFlexibleDirection( wxBOTH );
|
||||||
|
fgGridSettingsGrid->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED );
|
||||||
|
|
||||||
|
l_gridLineWidth = new wxStaticText( this, wxID_ANY, _("Grid thickness:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
l_gridLineWidth->Wrap( -1 );
|
||||||
|
fgGridSettingsGrid->Add( l_gridLineWidth, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
|
||||||
|
|
||||||
|
wxArrayString m_gridLineWidthChoices;
|
||||||
|
m_gridLineWidth = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_gridLineWidthChoices, 0 );
|
||||||
|
m_gridLineWidth->SetSelection( 0 );
|
||||||
|
fgGridSettingsGrid->Add( m_gridLineWidth, 0, wxALL|wxEXPAND, 5 );
|
||||||
|
|
||||||
|
l_gridLineWidthUnits = new wxStaticText( this, wxID_ANY, _("px"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
l_gridLineWidthUnits->Wrap( -1 );
|
||||||
|
fgGridSettingsGrid->Add( l_gridLineWidthUnits, 0, wxALL, 5 );
|
||||||
|
|
||||||
|
l_gridMinSpacing = new wxStaticText( this, wxID_ANY, _("Min grid spacing:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
l_gridMinSpacing->Wrap( -1 );
|
||||||
|
fgGridSettingsGrid->Add( l_gridMinSpacing, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
|
||||||
|
|
||||||
|
m_gridMinSpacing = new wxSpinCtrl( this, wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 5, 200, 10 );
|
||||||
|
fgGridSettingsGrid->Add( m_gridMinSpacing, 0, wxALL|wxEXPAND, 5 );
|
||||||
|
|
||||||
|
l_gridMinSpacingUnits = new wxStaticText( this, wxID_ANY, _("px"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
l_gridMinSpacingUnits->Wrap( -1 );
|
||||||
|
fgGridSettingsGrid->Add( l_gridMinSpacingUnits, 0, wxALL, 5 );
|
||||||
|
|
||||||
|
l_gridSnapOptions = new wxStaticText( this, wxID_ANY, _("Snap to grid:"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
l_gridSnapOptions->Wrap( -1 );
|
||||||
|
fgGridSettingsGrid->Add( l_gridSnapOptions, 0, wxALL|wxALIGN_CENTER_VERTICAL, 5 );
|
||||||
|
|
||||||
|
wxString m_gridSnapOptionsChoices[] = { _("Always"), _("When grid shown"), _("Never") };
|
||||||
|
int m_gridSnapOptionsNChoices = sizeof( m_gridSnapOptionsChoices ) / sizeof( wxString );
|
||||||
|
m_gridSnapOptions = new wxChoice( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, m_gridSnapOptionsNChoices, m_gridSnapOptionsChoices, 0 );
|
||||||
|
m_gridSnapOptions->SetSelection( 0 );
|
||||||
|
fgGridSettingsGrid->Add( m_gridSnapOptions, 0, wxALL|wxEXPAND, 5 );
|
||||||
|
|
||||||
|
|
||||||
|
fgGridSettingsGrid->Add( 0, 0, 1, wxEXPAND, 5 );
|
||||||
|
|
||||||
|
|
||||||
|
mainSizer->Add( fgGridSettingsGrid, 0, wxEXPAND, 5 );
|
||||||
|
|
||||||
|
|
||||||
|
mainSizer->Add( 0, 15, 0, 0, 5 );
|
||||||
|
|
||||||
|
m_stGridLabel = new wxStaticText( this, wxID_ANY, _("Cursor Options"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
m_stGridLabel->Wrap( -1 );
|
||||||
|
mainSizer->Add( m_stGridLabel, 0, wxTOP|wxRIGHT|wxLEFT, 5 );
|
||||||
|
|
||||||
|
m_staticline2 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL );
|
||||||
|
mainSizer->Add( m_staticline2, 0, wxEXPAND | wxALL, 5 );
|
||||||
|
|
||||||
|
wxBoxSizer* sCursorSettings;
|
||||||
|
sCursorSettings = new wxBoxSizer( wxVERTICAL );
|
||||||
|
|
||||||
|
wxString m_cursorShapeChoices[] = { _("Small crosshair"), _("Full window crosshair") };
|
||||||
|
int m_cursorShapeNChoices = sizeof( m_cursorShapeChoices ) / sizeof( wxString );
|
||||||
|
m_cursorShape = new wxRadioBox( this, wxID_ANY, _("Cursor Shape"), wxDefaultPosition, wxDefaultSize, m_cursorShapeNChoices, m_cursorShapeChoices, 1, wxRA_SPECIFY_COLS );
|
||||||
|
m_cursorShape->SetSelection( 0 );
|
||||||
|
m_cursorShape->SetToolTip( _("Cursor shape for drawing, placement and movement tools") );
|
||||||
|
|
||||||
|
sCursorSettings->Add( m_cursorShape, 0, wxALL, 5 );
|
||||||
|
|
||||||
|
m_forceCursorDisplay = new wxCheckBox( this, wxID_ANY, _("Always show crosshairs"), wxDefaultPosition, wxDefaultSize, 0 );
|
||||||
|
sCursorSettings->Add( m_forceCursorDisplay, 0, wxALL, 5 );
|
||||||
|
|
||||||
|
|
||||||
|
mainSizer->Add( sCursorSettings, 1, wxEXPAND, 5 );
|
||||||
|
|
||||||
|
|
||||||
|
this->SetSizer( mainSizer );
|
||||||
|
this->Layout();
|
||||||
|
}
|
||||||
|
|
||||||
|
GAL_OPTIONS_PANEL_BASE::~GAL_OPTIONS_PANEL_BASE()
|
||||||
|
{
|
||||||
|
}
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,62 @@
|
||||||
|
///////////////////////////////////////////////////////////////////////////
|
||||||
|
// C++ code generated with wxFormBuilder (version 3.10.0-39-g3487c3cb)
|
||||||
|
// http://www.wxformbuilder.org/
|
||||||
|
//
|
||||||
|
// PLEASE DO *NOT* EDIT THIS FILE!
|
||||||
|
///////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
#pragma once
|
||||||
|
|
||||||
|
#include <wx/artprov.h>
|
||||||
|
#include <wx/xrc/xmlres.h>
|
||||||
|
#include <wx/intl.h>
|
||||||
|
#include <wx/string.h>
|
||||||
|
#include <wx/radiobox.h>
|
||||||
|
#include <wx/gdicmn.h>
|
||||||
|
#include <wx/font.h>
|
||||||
|
#include <wx/colour.h>
|
||||||
|
#include <wx/settings.h>
|
||||||
|
#include <wx/sizer.h>
|
||||||
|
#include <wx/stattext.h>
|
||||||
|
#include <wx/statline.h>
|
||||||
|
#include <wx/choice.h>
|
||||||
|
#include <wx/spinctrl.h>
|
||||||
|
#include <wx/checkbox.h>
|
||||||
|
#include <wx/panel.h>
|
||||||
|
|
||||||
|
///////////////////////////////////////////////////////////////////////////
|
||||||
|
|
||||||
|
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
/// Class GAL_OPTIONS_PANEL_BASE
|
||||||
|
///////////////////////////////////////////////////////////////////////////////
|
||||||
|
class GAL_OPTIONS_PANEL_BASE : public wxPanel
|
||||||
|
{
|
||||||
|
private:
|
||||||
|
|
||||||
|
protected:
|
||||||
|
wxRadioBox* m_renderingEngine;
|
||||||
|
wxStaticText* m_staticText1;
|
||||||
|
wxStaticLine* m_staticline1;
|
||||||
|
wxRadioBox* m_gridStyle;
|
||||||
|
wxStaticText* l_gridLineWidth;
|
||||||
|
wxChoice* m_gridLineWidth;
|
||||||
|
wxStaticText* l_gridLineWidthUnits;
|
||||||
|
wxStaticText* l_gridMinSpacing;
|
||||||
|
wxSpinCtrl* m_gridMinSpacing;
|
||||||
|
wxStaticText* l_gridMinSpacingUnits;
|
||||||
|
wxStaticText* l_gridSnapOptions;
|
||||||
|
wxChoice* m_gridSnapOptions;
|
||||||
|
wxStaticText* m_stGridLabel;
|
||||||
|
wxStaticLine* m_staticline2;
|
||||||
|
wxRadioBox* m_cursorShape;
|
||||||
|
wxCheckBox* m_forceCursorDisplay;
|
||||||
|
|
||||||
|
public:
|
||||||
|
|
||||||
|
GAL_OPTIONS_PANEL_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 387,523 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString );
|
||||||
|
|
||||||
|
~GAL_OPTIONS_PANEL_BASE();
|
||||||
|
|
||||||
|
};
|
||||||
|
|
||||||
|
|
@ -24,8 +24,7 @@
|
||||||
#ifndef WIDGETS_GAL_OPTIONS_PANEL__H_
|
#ifndef WIDGETS_GAL_OPTIONS_PANEL__H_
|
||||||
#define WIDGETS_GAL_OPTIONS_PANEL__H_
|
#define WIDGETS_GAL_OPTIONS_PANEL__H_
|
||||||
|
|
||||||
#include <wx/panel.h>
|
#include <../../common/widgets/gal_options_panel_base.h>
|
||||||
|
|
||||||
#include <gal/gal_display_options.h>
|
#include <gal/gal_display_options.h>
|
||||||
|
|
||||||
class wxBoxSizer;
|
class wxBoxSizer;
|
||||||
|
|
@ -37,7 +36,8 @@ class wxStaticText;
|
||||||
class EDA_DRAW_FRAME;
|
class EDA_DRAW_FRAME;
|
||||||
class APP_SETTINGS_BASE;
|
class APP_SETTINGS_BASE;
|
||||||
|
|
||||||
class GAL_OPTIONS_PANEL: public wxPanel
|
|
||||||
|
class GAL_OPTIONS_PANEL: public GAL_OPTIONS_PANEL_BASE
|
||||||
{
|
{
|
||||||
public:
|
public:
|
||||||
|
|
||||||
|
|
@ -56,28 +56,7 @@ public:
|
||||||
bool ResetPanel( APP_SETTINGS_BASE* aAppSettings );
|
bool ResetPanel( APP_SETTINGS_BASE* aAppSettings );
|
||||||
|
|
||||||
private:
|
private:
|
||||||
wxBoxSizer* m_mainSizer;
|
std::vector<double> m_gridThicknessList; // List of available grid thickness
|
||||||
|
|
||||||
#ifndef __WXMAC__
|
|
||||||
wxRadioBox* m_renderingEngine;
|
|
||||||
#endif
|
|
||||||
|
|
||||||
wxRadioBox* m_gridStyle;
|
|
||||||
wxStaticText* l_gridLineWidth;
|
|
||||||
wxSpinCtrlDouble* m_gridLineWidth;
|
|
||||||
wxStaticText* l_gridLineWidthUnits;
|
|
||||||
|
|
||||||
wxStaticText* l_gridMinSpacing;
|
|
||||||
wxSpinCtrlDouble* m_gridMinSpacing;
|
|
||||||
wxStaticText* l_gridMinSpacingUnits;
|
|
||||||
|
|
||||||
wxStaticText* l_gridSnapOptions;
|
|
||||||
wxChoice* m_gridSnapOptions;
|
|
||||||
wxStaticText* l_gridSnapSpace;
|
|
||||||
|
|
||||||
wxRadioBox* m_cursorShape;
|
|
||||||
wxCheckBox* m_forceCursorDisplay;
|
|
||||||
|
|
||||||
APP_SETTINGS_BASE* m_cfg;
|
APP_SETTINGS_BASE* m_cfg;
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue