From 0b108d61e7426226358d1489d18675e984db51ec Mon Sep 17 00:00:00 2001 From: Jeff Young Date: Sun, 20 Sep 2020 12:57:55 +0100 Subject: [PATCH] Cairo canvas not on Mac; no need to show antialiasing settings. --- common/dialogs/panel_common_settings.cpp | 6 + common/dialogs/panel_common_settings_base.cpp | 96 +++--- common/dialogs/panel_common_settings_base.fbp | 286 +++++++++--------- common/dialogs/panel_common_settings_base.h | 3 +- 4 files changed, 197 insertions(+), 194 deletions(-) diff --git a/common/dialogs/panel_common_settings.cpp b/common/dialogs/panel_common_settings.cpp index d839854d95..ce5349dcaf 100644 --- a/common/dialogs/panel_common_settings.cpp +++ b/common/dialogs/panel_common_settings.cpp @@ -66,6 +66,12 @@ PANEL_COMMON_SETTINGS::PANEL_COMMON_SETTINGS( DIALOG_SHIM* aDialog, wxWindow* aP m_iconScaleSlider->SetStep( 25 ); +#ifdef __WXMAC__ + // Cairo canvas doesn't work on Mac, so no need for anti-aliasing options + m_antialiasingFallback->Show( false ); + m_antialiasingFallbackLabel->Show( false ); +#endif + m_textEditorBtn->SetBitmap( KiBitmap( folder_xpm ) ); m_pdfViewerBtn->SetBitmap( KiBitmap( folder_xpm ) ); diff --git a/common/dialogs/panel_common_settings_base.cpp b/common/dialogs/panel_common_settings_base.cpp index f165d54ca7..5d04ad64b0 100644 --- a/common/dialogs/panel_common_settings_base.cpp +++ b/common/dialogs/panel_common_settings_base.cpp @@ -76,10 +76,9 @@ PANEL_COMMON_SETTINGS_BASE::PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWind m_antialiasing->SetSelection( 0 ); gbSizer1->Add( m_antialiasing, wxGBPosition( 4, 1 ), wxGBSpan( 1, 2 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); - wxStaticText* antialiasingLabel1; - antialiasingLabel1 = new wxStaticText( this, wxID_ANY, _("Fallback graphics:"), wxDefaultPosition, wxDefaultSize, 0 ); - antialiasingLabel1->Wrap( -1 ); - gbSizer1->Add( antialiasingLabel1, wxGBPosition( 6, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); + m_antialiasingFallbackLabel = new wxStaticText( this, wxID_ANY, _("Fallback graphics:"), wxDefaultPosition, wxDefaultSize, 0 ); + m_antialiasingFallbackLabel->Wrap( -1 ); + gbSizer1->Add( m_antialiasingFallbackLabel, wxGBPosition( 6, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL, 5 ); wxString m_antialiasingFallbackChoices[] = { _("No Antialiasing"), _("Fast Antialiasing"), _("Balanced Antialiasing"), _("High Quality Antialiasing") }; int m_antialiasingFallbackNChoices = sizeof( m_antialiasingFallbackChoices ) / sizeof( wxString ); @@ -94,16 +93,16 @@ PANEL_COMMON_SETTINGS_BASE::PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWind gbSizer1->AddGrowableCol( 1 ); - bLeftSizer->Add( gbSizer1, 0, wxEXPAND|wxALL, 10 ); + bLeftSizer->Add( gbSizer1, 0, wxEXPAND|wxALL, 15 ); wxStaticBoxSizer* sizerHelperApps; sizerHelperApps = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Helper Applications") ), wxHORIZONTAL ); wxGridBagSizer* gridHelperApps; - gridHelperApps = new wxGridBagSizer( 3, 3 ); + gridHelperApps = new wxGridBagSizer( 5, 3 ); gridHelperApps->SetFlexibleDirection( wxBOTH ); gridHelperApps->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); - gridHelperApps->SetEmptyCellSize( wxSize( -1,5 ) ); + gridHelperApps->SetEmptyCellSize( wxSize( -1,1 ) ); wxStaticText* textEditorLabel; textEditorLabel = new wxStaticText( sizerHelperApps->GetStaticBox(), wxID_ANY, _("Text editor:"), wxDefaultPosition, wxDefaultSize, 0 ); @@ -113,10 +112,10 @@ PANEL_COMMON_SETTINGS_BASE::PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWind m_textEditorPath = new wxTextCtrl( sizerHelperApps->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_textEditorPath->SetMinSize( wxSize( 280,-1 ) ); - gridHelperApps->Add( m_textEditorPath, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxEXPAND, 8 ); + gridHelperApps->Add( m_textEditorPath, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 8 ); m_textEditorBtn = new wxBitmapButton( sizerHelperApps->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - gridHelperApps->Add( m_textEditorBtn, wxGBPosition( 0, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM, 5 ); + gridHelperApps->Add( m_textEditorBtn, wxGBPosition( 0, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); m_defaultPDFViewer = new wxRadioButton( sizerHelperApps->GetStaticBox(), wxID_ANY, _("System default PDF viewer"), wxDefaultPosition, wxDefaultSize, 0 ); gridHelperApps->Add( m_defaultPDFViewer, wxGBPosition( 3, 0 ), wxGBSpan( 1, 3 ), 0, 4 ); @@ -127,68 +126,64 @@ PANEL_COMMON_SETTINGS_BASE::PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWind m_PDFViewerPath = new wxTextCtrl( sizerHelperApps->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, 0 ); m_PDFViewerPath->SetMinSize( wxSize( 280,-1 ) ); - gridHelperApps->Add( m_PDFViewerPath, wxGBPosition( 4, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxEXPAND, 8 ); + gridHelperApps->Add( m_PDFViewerPath, wxGBPosition( 4, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 8 ); m_pdfViewerBtn = new wxBitmapButton( sizerHelperApps->GetStaticBox(), wxID_ANY, wxNullBitmap, wxDefaultPosition, wxDefaultSize, wxBU_AUTODRAW|0 ); - gridHelperApps->Add( m_pdfViewerBtn, wxGBPosition( 4, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM, 5 ); + gridHelperApps->Add( m_pdfViewerBtn, wxGBPosition( 4, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); gridHelperApps->AddGrowableCol( 1 ); - sizerHelperApps->Add( gridHelperApps, 1, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); + sizerHelperApps->Add( gridHelperApps, 0, wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND, 5 ); bLeftSizer->Add( sizerHelperApps, 0, wxEXPAND|wxALL, 5 ); wxStaticBoxSizer* sbSizerIconsOpts; - sbSizerIconsOpts = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("User Interface") ), wxVERTICAL ); + sbSizerIconsOpts = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("User Interface") ), wxHORIZONTAL ); - wxFlexGridSizer* fgSizer11; - fgSizer11 = new wxFlexGridSizer( 0, 3, 3, 0 ); - fgSizer11->AddGrowableCol( 1 ); - fgSizer11->SetFlexibleDirection( wxBOTH ); - fgSizer11->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); + wxGridBagSizer* gbSizer4; + gbSizer4 = new wxGridBagSizer( 20, 0 ); + gbSizer4->SetFlexibleDirection( wxBOTH ); + gbSizer4->SetNonFlexibleGrowMode( wxFLEX_GROWMODE_SPECIFIED ); m_staticTexticonscale = new wxStaticText( sbSizerIconsOpts->GetStaticBox(), wxID_ANY, _("Icon scale:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTexticonscale->Wrap( -1 ); - fgSizer11->Add( m_staticTexticonscale, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 ); + gbSizer4->Add( m_staticTexticonscale, wxGBPosition( 0, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); m_iconScaleSlider = new STEPPED_SLIDER( sbSizerIconsOpts->GetStaticBox(), wxID_ANY, 100, 50, 275, wxDefaultPosition, wxDefaultSize, wxSL_HORIZONTAL|wxSL_VALUE_LABEL ); m_iconScaleSlider->SetMinSize( wxSize( 140,-1 ) ); - fgSizer11->Add( m_iconScaleSlider, 1, wxBOTTOM|wxEXPAND, 4 ); + gbSizer4->Add( m_iconScaleSlider, wxGBPosition( 0, 1 ), wxGBSpan( 1, 1 ), wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); m_iconScaleAuto = new wxCheckBox( sbSizerIconsOpts->GetStaticBox(), wxID_ANY, _("Automatic"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer11->Add( m_iconScaleAuto, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 25 ); + gbSizer4->Add( m_iconScaleAuto, wxGBPosition( 0, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 15 ); m_staticTextCanvasScale = new wxStaticText( sbSizerIconsOpts->GetStaticBox(), wxID_ANY, _("Canvas scale:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticTextCanvasScale->Wrap( -1 ); - fgSizer11->Add( m_staticTextCanvasScale, 0, wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + gbSizer4->Add( m_staticTextCanvasScale, wxGBPosition( 1, 0 ), wxGBSpan( 1, 1 ), wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_canvasScaleCtrl = new wxSpinCtrlDouble( sbSizerIconsOpts->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 100, 0, 1 ); m_canvasScaleCtrl->SetDigits( 0 ); - fgSizer11->Add( m_canvasScaleCtrl, 0, wxALL|wxEXPAND, 5 ); + gbSizer4->Add( m_canvasScaleCtrl, wxGBPosition( 1, 1 ), wxGBSpan( 1, 1 ), wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND, 5 ); m_canvasScaleAuto = new wxCheckBox( sbSizerIconsOpts->GetStaticBox(), wxID_ANY, _("Automatic"), wxDefaultPosition, wxDefaultSize, 0 ); - fgSizer11->Add( m_canvasScaleAuto, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 25 ); - - - sbSizerIconsOpts->Add( fgSizer11, 0, wxEXPAND|wxRIGHT, 5 ); - - - sbSizerIconsOpts->Add( 0, 15, 0, wxEXPAND, 5 ); + gbSizer4->Add( m_canvasScaleAuto, wxGBPosition( 1, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 15 ); m_checkBoxIconsInMenus = new wxCheckBox( sbSizerIconsOpts->GetStaticBox(), wxID_ANY, _("Show icons in menus"), wxDefaultPosition, wxDefaultSize, 0 ); - sbSizerIconsOpts->Add( m_checkBoxIconsInMenus, 0, 0, 4 ); + gbSizer4->Add( m_checkBoxIconsInMenus, wxGBPosition( 2, 0 ), wxGBSpan( 1, 3 ), wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT, 5 ); - sbSizerIconsOpts->Add( 0, 0, 1, wxEXPAND, 5 ); + gbSizer4->AddGrowableCol( 1 ); + gbSizer4->AddGrowableRow( 0 ); + + sbSizerIconsOpts->Add( gbSizer4, 1, wxBOTTOM|wxRIGHT, 5 ); bLeftSizer->Add( sbSizerIconsOpts, 1, wxEXPAND|wxALL, 5 ); - bPanelSizer->Add( bLeftSizer, 1, wxEXPAND|wxBOTTOM, 5 ); + bPanelSizer->Add( bLeftSizer, 1, wxBOTTOM|wxEXPAND, 5 ); wxBoxSizer* rightSizer; rightSizer = new wxBoxSizer( wxVERTICAL ); @@ -197,7 +192,7 @@ PANEL_COMMON_SETTINGS_BASE::PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWind sbSizer4 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Editing") ), wxVERTICAL ); m_PreferSelectToDrag = new wxCheckBox( sbSizer4->GetStaticBox(), wxID_ANY, _("Prefer selection to dragging"), wxDefaultPosition, wxDefaultSize, 0 ); - sbSizer4->Add( m_PreferSelectToDrag, 0, wxALL, 5 ); + sbSizer4->Add( m_PreferSelectToDrag, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_warpMouseOnMove = new wxCheckBox( sbSizer4->GetStaticBox(), wxID_ANY, _("Warp mouse to origin of moved object"), wxDefaultPosition, wxDefaultSize, 0 ); sbSizer4->Add( m_warpMouseOnMove, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); @@ -221,12 +216,12 @@ PANEL_COMMON_SETTINGS_BASE::PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWind m_cbBackupEnabled = new wxCheckBox( sbSizer41->GetStaticBox(), wxID_ANY, _("Automatically backup projects"), wxDefaultPosition, wxDefaultSize, 0 ); m_cbBackupEnabled->SetToolTip( _("Automatically create backup archives of the current project when saving files") ); - gbSizer3->Add( m_cbBackupEnabled, wxGBPosition( 0, 0 ), wxGBSpan( 1, 3 ), wxALL, 5 ); + gbSizer3->Add( m_cbBackupEnabled, wxGBPosition( 0, 0 ), wxGBSpan( 1, 3 ), wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_cbBackupAutosave = new wxCheckBox( sbSizer41->GetStaticBox(), wxID_ANY, _("Create backups when auto save occurs"), wxDefaultPosition, wxDefaultSize, 0 ); m_cbBackupAutosave->SetToolTip( _("Create backups when the auto save feature is enabled. If not checked, backups will only be created when you manually save a file.") ); - gbSizer3->Add( m_cbBackupAutosave, wxGBPosition( 1, 0 ), wxGBSpan( 1, 3 ), wxALL, 5 ); + gbSizer3->Add( m_cbBackupAutosave, wxGBPosition( 1, 0 ), wxGBSpan( 1, 3 ), wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_staticText9 = new wxStaticText( sbSizer41->GetStaticBox(), wxID_ANY, _("Maximum backups to keep:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText9->Wrap( -1 ); @@ -235,48 +230,48 @@ PANEL_COMMON_SETTINGS_BASE::PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWind gbSizer3->Add( m_staticText9, wxGBPosition( 2, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 ); m_backupLimitTotalFiles = new wxSpinCtrl( sbSizer41->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 1000, 0 ); - gbSizer3->Add( m_backupLimitTotalFiles, wxGBPosition( 2, 1 ), wxGBSpan( 1, 1 ), wxALL, 5 ); + gbSizer3->Add( m_backupLimitTotalFiles, wxGBPosition( 2, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_staticText10 = new wxStaticText( sbSizer41->GetStaticBox(), wxID_ANY, _("Maximum backups per day:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText10->Wrap( -1 ); m_staticText10->SetToolTip( _("How many backup files to keep each day (set to 0 for no limit)") ); - gbSizer3->Add( m_staticText10, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + gbSizer3->Add( m_staticText10, wxGBPosition( 3, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_backupLimitDailyFiles = new wxSpinCtrl( sbSizer41->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 1000, 0 ); - gbSizer3->Add( m_backupLimitDailyFiles, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxALL, 5 ); + gbSizer3->Add( m_backupLimitDailyFiles, wxGBPosition( 3, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_staticText11 = new wxStaticText( sbSizer41->GetStaticBox(), wxID_ANY, _("Minimum time between backups:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText11->Wrap( -1 ); m_staticText11->SetToolTip( _("Number of minutes since the last backup before another will be created the next time you save (set to 0 for no minimum)") ); - gbSizer3->Add( m_staticText11, wxGBPosition( 4, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + gbSizer3->Add( m_staticText11, wxGBPosition( 4, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT, 5 ); m_backupMinInterval = new wxSpinCtrl( sbSizer41->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 3600, 0 ); - gbSizer3->Add( m_backupMinInterval, wxGBPosition( 4, 1 ), wxGBSpan( 1, 1 ), wxALL, 5 ); + gbSizer3->Add( m_backupMinInterval, wxGBPosition( 4, 1 ), wxGBSpan( 1, 1 ), wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL, 5 ); m_staticText15 = new wxStaticText( sbSizer41->GetStaticBox(), wxID_ANY, _("minutes"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText15->Wrap( -1 ); - gbSizer3->Add( m_staticText15, wxGBPosition( 4, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + gbSizer3->Add( m_staticText15, wxGBPosition( 4, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT, 5 ); m_staticText16 = new wxStaticText( sbSizer41->GetStaticBox(), wxID_ANY, _("Maximum total backup size:"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText16->Wrap( -1 ); m_staticText16->SetToolTip( _("If the total size of backup files grows above this limit, old backups will be deleted (set to 0 for no limit)") ); - gbSizer3->Add( m_staticText16, wxGBPosition( 5, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + gbSizer3->Add( m_staticText16, wxGBPosition( 5, 0 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); m_backupLimitTotalSize = new wxSpinCtrl( sbSizer41->GetStaticBox(), wxID_ANY, wxEmptyString, wxDefaultPosition, wxDefaultSize, wxSP_ARROW_KEYS, 0, 1000, 0 ); - gbSizer3->Add( m_backupLimitTotalSize, wxGBPosition( 5, 1 ), wxGBSpan( 1, 1 ), wxALL, 5 ); + gbSizer3->Add( m_backupLimitTotalSize, wxGBPosition( 5, 1 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 ); m_staticText17 = new wxStaticText( sbSizer41->GetStaticBox(), wxID_ANY, _("MB"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText17->Wrap( -1 ); - gbSizer3->Add( m_staticText17, wxGBPosition( 5, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxALL, 5 ); + gbSizer3->Add( m_staticText17, wxGBPosition( 5, 2 ), wxGBSpan( 1, 1 ), wxALIGN_CENTER_VERTICAL|wxRIGHT, 5 ); - sbSizer41->Add( gbSizer3, 1, wxALL|wxEXPAND, 5 ); + sbSizer41->Add( gbSizer3, 0, wxEXPAND|wxBOTTOM, 5 ); - rightSizer->Add( sbSizer41, 1, wxALL|wxEXPAND, 5 ); + rightSizer->Add( sbSizer41, 0, wxALL|wxEXPAND, 5 ); wxStaticBoxSizer* sbSizer5; sbSizer5 = new wxStaticBoxSizer( new wxStaticBox( this, wxID_ANY, _("Session") ), wxVERTICAL ); @@ -285,17 +280,18 @@ PANEL_COMMON_SETTINGS_BASE::PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWind m_cbRememberOpenFiles->SetValue(true); m_cbRememberOpenFiles->SetToolTip( _("If checked, launching a project will also launch tools such as eeschema and pcbnew with previously open files") ); - sbSizer5->Add( m_cbRememberOpenFiles, 0, wxALL, 5 ); + sbSizer5->Add( m_cbRememberOpenFiles, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 ); - rightSizer->Add( sbSizer5, 0, wxALL|wxEXPAND, 5 ); + rightSizer->Add( sbSizer5, 1, wxALL|wxEXPAND, 5 ); - bPanelSizer->Add( rightSizer, 0, wxEXPAND|wxALL, 5 ); + bPanelSizer->Add( rightSizer, 0, wxALL|wxEXPAND, 5 ); this->SetSizer( bPanelSizer ); this->Layout(); + bPanelSizer->Fit( this ); // Connect Events m_textEditorBtn->Connect( wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler( PANEL_COMMON_SETTINGS_BASE::OnTextEditorClick ), NULL, this ); diff --git a/common/dialogs/panel_common_settings_base.fbp b/common/dialogs/panel_common_settings_base.fbp index 98270f8903..0a8868a49e 100644 --- a/common/dialogs/panel_common_settings_base.fbp +++ b/common/dialogs/panel_common_settings_base.fbp @@ -43,7 +43,7 @@ PANEL_COMMON_SETTINGS_BASE - 838,485 + -1,-1 RESETTABLE_PANEL; widgets/resettable_panel.h; Not forward_declare @@ -56,7 +56,7 @@ none 5 - wxEXPAND|wxBOTTOM + wxBOTTOM|wxEXPAND 1 @@ -64,7 +64,7 @@ wxVERTICAL none - 10 + 15 wxEXPAND|wxALL 0 @@ -720,11 +720,11 @@ 0 1 - antialiasingLabel1 + m_antialiasingFallbackLabel 1 - none + protected 1 Resizable @@ -888,9 +888,9 @@ 5 wxBOTTOM|wxLEFT|wxRIGHT|wxEXPAND - 1 + 0 - -1,5 + -1,1 wxBOTH 1 @@ -899,7 +899,7 @@ gridHelperApps wxFLEX_GROWMODE_SPECIFIED none - 3 + 5 4 1 @@ -968,7 +968,7 @@ 8 1 1 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxEXPAND + wxALIGN_CENTER_VERTICAL|wxEXPAND 0 1 @@ -1035,7 +1035,7 @@ 5 1 2 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM + wxALIGN_CENTER_VERTICAL|wxEXPAND 0 1 @@ -1245,7 +1245,7 @@ 8 1 1 - wxALIGN_CENTER_VERTICAL|wxTOP|wxBOTTOM|wxEXPAND + wxALIGN_CENTER_VERTICAL|wxEXPAND 4 1 @@ -1313,7 +1313,7 @@ 5 1 2 - wxALIGN_CENTER_VERTICAL|wxEXPAND|wxTOP|wxBOTTOM + wxALIGN_CENTER_VERTICAL|wxEXPAND 4 1 @@ -1399,29 +1399,31 @@ User Interface sbSizerIconsOpts - wxVERTICAL + wxHORIZONTAL 1 none 5 - wxEXPAND|wxRIGHT - 0 - - 3 + wxBOTTOM|wxRIGHT + 1 + + wxBOTH 1 - + 0 0 - fgSizer11 + gbSizer4 wxFLEX_GROWMODE_SPECIFIED none - 0 - 3 - + 20 + 5 - wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT - 0 + 1 + 0 + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT + 0 + 1 1 1 @@ -1479,10 +1481,13 @@ -1 - - 4 - wxBOTTOM|wxEXPAND - 1 + + 5 + 1 + 1 + wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND + 0 + 1 1 1 @@ -1545,10 +1550,13 @@ OnScaleSlider - - 25 + + 15 + 1 + 2 wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT - 0 + 0 + 1 1 1 @@ -1610,10 +1618,13 @@ OnIconScaleAuto - + 5 - wxALIGN_CENTER_VERTICAL|wxALL - 0 + 1 + 0 + wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL + 1 + 1 1 1 @@ -1671,10 +1682,13 @@ -1 - + 5 - wxALL|wxEXPAND - 0 + 1 + 1 + wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL|wxEXPAND + 1 + 1 1 1 @@ -1735,10 +1749,13 @@ - - 25 - wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT - 0 + + 15 + 1 + 2 + wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT + 1 + 1 1 1 @@ -1800,90 +1817,73 @@ OnCanvasScaleAuto - - - - 5 - wxEXPAND - 0 - - 15 - protected - 0 - - - - 4 - - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Show icons in menus - - 0 - - - 0 - - 1 - m_checkBoxIconsInMenus - 1 - - - protected - 1 - - Resizable - 1 - - - ; forward_declare - 0 - - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - 5 - wxEXPAND - 1 - - 0 - protected - 0 + + 5 + 3 + 0 + wxALIGN_CENTER_VERTICAL|wxTOP|wxLEFT + 2 + 1 + + 1 + 1 + 1 + 1 + + + + + + + + 1 + 0 + 0 + 1 + + 1 + 0 + Dock + 0 + Left + 1 + + 1 + + 0 + 0 + wxID_ANY + Show icons in menus + + 0 + + + 0 + + 1 + m_checkBoxIconsInMenus + 1 + + + protected + 1 + + Resizable + 1 + + + ; forward_declare + 0 + + + wxFILTER_NONE + wxDefaultValidator + + + + + + @@ -1892,7 +1892,7 @@ 5 - wxEXPAND|wxALL + wxALL|wxEXPAND 0 @@ -1913,7 +1913,7 @@ none 5 - wxALL + wxBOTTOM|wxRIGHT|wxLEFT 0 1 @@ -2108,7 +2108,7 @@ 5 wxALL|wxEXPAND - 1 + 0 wxID_ANY Project Backup @@ -2119,8 +2119,8 @@ none 5 - wxALL|wxEXPAND - 1 + wxEXPAND|wxBOTTOM + 0 wxBOTH @@ -2136,7 +2136,7 @@ 5 3 0 - wxALL + wxBOTTOM|wxRIGHT|wxLEFT 0 1 @@ -2203,7 +2203,7 @@ 5 3 0 - wxALL + wxBOTTOM|wxRIGHT|wxLEFT 1 1 @@ -2334,7 +2334,7 @@ 5 1 1 - wxALL + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT 2 1 @@ -2399,7 +2399,7 @@ 5 1 0 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT 3 1 @@ -2463,7 +2463,7 @@ 5 1 1 - wxALL + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT 3 1 @@ -2528,7 +2528,7 @@ 5 1 0 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT|wxLEFT 4 1 @@ -2592,7 +2592,7 @@ 5 1 1 - wxALL + wxBOTTOM|wxRIGHT|wxLEFT|wxALIGN_CENTER_VERTICAL 4 1 @@ -2657,7 +2657,7 @@ 5 1 2 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxBOTTOM|wxRIGHT 4 1 @@ -2721,7 +2721,7 @@ 5 1 0 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 5 1 @@ -2785,7 +2785,7 @@ 5 1 1 - wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT 5 1 @@ -2850,7 +2850,7 @@ 5 1 2 - wxALIGN_CENTER_VERTICAL|wxALL + wxALIGN_CENTER_VERTICAL|wxRIGHT 5 1 @@ -2917,7 +2917,7 @@ 5 wxALL|wxEXPAND - 0 + 1 wxID_ANY Session @@ -2928,7 +2928,7 @@ none 5 - wxALL + wxBOTTOM|wxRIGHT|wxLEFT 0 1 diff --git a/common/dialogs/panel_common_settings_base.h b/common/dialogs/panel_common_settings_base.h index 3fb7609b79..546afcaf79 100644 --- a/common/dialogs/panel_common_settings_base.h +++ b/common/dialogs/panel_common_settings_base.h @@ -51,6 +51,7 @@ class PANEL_COMMON_SETTINGS_BASE : public RESETTABLE_PANEL wxSpinCtrl* m_Clear3DCacheFilesOlder; wxStaticText* m_staticTextDays; wxChoice* m_antialiasing; + wxStaticText* m_antialiasingFallbackLabel; wxChoice* m_antialiasingFallback; wxStaticText* m_staticTextClear3DCache; wxTextCtrl* m_textEditorPath; @@ -94,7 +95,7 @@ class PANEL_COMMON_SETTINGS_BASE : public RESETTABLE_PANEL public: - PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( 838,485 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); + PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWindowID id = wxID_ANY, const wxPoint& pos = wxDefaultPosition, const wxSize& size = wxSize( -1,-1 ), long style = wxTAB_TRAVERSAL, const wxString& name = wxEmptyString ); ~PANEL_COMMON_SETTINGS_BASE(); };