diff --git a/common/dialogs/panel_common_settings_base.cpp b/common/dialogs/panel_common_settings_base.cpp index e25f64ca40..1696e70491 100644 --- a/common/dialogs/panel_common_settings_base.cpp +++ b/common/dialogs/panel_common_settings_base.cpp @@ -292,35 +292,13 @@ PANEL_COMMON_SETTINGS_BASE::PANEL_COMMON_SETTINGS_BASE( wxWindow* parent, wxWind rightSizer->Add( 0, 15, 0, wxEXPAND, 5 ); - m_staticText24 = new wxStaticText( this, wxID_ANY, _("Update Check"), wxDefaultPosition, wxDefaultSize, 0 ); + m_staticText24 = new wxStaticText( this, wxID_ANY, _("Session"), wxDefaultPosition, wxDefaultSize, 0 ); m_staticText24->Wrap( -1 ); rightSizer->Add( m_staticText24, 0, wxEXPAND|wxTOP|wxRIGHT|wxLEFT, 13 ); m_staticline5 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); rightSizer->Add( m_staticline5, 0, wxEXPAND|wxBOTTOM, 5 ); - wxBoxSizer* bUpdateSizer; - bUpdateSizer = new wxBoxSizer( wxVERTICAL ); - - m_cbUpdateCheck = new wxCheckBox( this, wxID_ANY, _("Check for KiCad updates on launch"), wxDefaultPosition, wxDefaultSize, 0 ); - m_cbUpdateCheck->SetValue(true); - m_cbUpdateCheck->SetToolTip( _("If checked, launching a project will also launch tools such as the schematic and board editors with previously open files") ); - - bUpdateSizer->Add( m_cbUpdateCheck, 0, wxALL, 5 ); - - - rightSizer->Add( bUpdateSizer, 0, wxEXPAND|wxLEFT|wxTOP, 5 ); - - - rightSizer->Add( 0, 15, 0, wxEXPAND, 5 ); - - m_staticText241 = new wxStaticText( this, wxID_ANY, _("Session"), wxDefaultPosition, wxDefaultSize, 0 ); - m_staticText241->Wrap( -1 ); - rightSizer->Add( m_staticText241, 0, wxLEFT|wxRIGHT|wxTOP, 13 ); - - m_staticline51 = new wxStaticLine( this, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxLI_HORIZONTAL ); - rightSizer->Add( m_staticline51, 0, wxBOTTOM|wxEXPAND, 5 ); - wxBoxSizer* bSessionSizer; bSessionSizer = new wxBoxSizer( wxVERTICAL ); diff --git a/common/dialogs/panel_common_settings_base.fbp b/common/dialogs/panel_common_settings_base.fbp index 548f7bd6fb..0ac075ada3 100644 --- a/common/dialogs/panel_common_settings_base.fbp +++ b/common/dialogs/panel_common_settings_base.fbp @@ -2919,7 +2919,7 @@ 0 0 wxID_ANY - Update Check + Session 0 0 @@ -3006,210 +3006,6 @@ - - 5 - wxEXPAND|wxLEFT|wxTOP - 0 - - - bUpdateSizer - wxVERTICAL - none - - 5 - wxALL - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Check for KiCad updates on launch - - 0 - - - 0 - - 1 - m_cbUpdateCheck - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - If checked, launching a project will also launch tools such as the schematic and board editors with previously open files - - wxFILTER_NONE - wxDefaultValidator - - - - - - - - - - 5 - wxEXPAND - 0 - - 15 - protected - 0 - - - - 13 - wxLEFT|wxRIGHT|wxTOP - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - Session - 0 - - 0 - - - 0 - - 1 - m_staticText241 - 1 - - - protected - 1 - - Resizable - 1 - - - ; ; forward_declare - 0 - - - - - -1 - - - - 5 - wxBOTTOM|wxEXPAND - 0 - - 1 - 1 - 1 - 1 - - - - - - - - 1 - 0 - 1 - - 1 - 0 - Dock - 0 - Left - 1 - - 1 - - 0 - 0 - wxID_ANY - - 0 - - - 0 - - 1 - m_staticline51 - 1 - - - protected - 1 - - Resizable - 1 - - wxLI_HORIZONTAL - ; ; forward_declare - 0 - - - - - - 5 wxTOP|wxLEFT|wxEXPAND diff --git a/common/dialogs/panel_common_settings_base.h b/common/dialogs/panel_common_settings_base.h index 43d655525e..6a1aca6e9f 100644 --- a/common/dialogs/panel_common_settings_base.h +++ b/common/dialogs/panel_common_settings_base.h @@ -86,9 +86,6 @@ class PANEL_COMMON_SETTINGS_BASE : public RESETTABLE_PANEL wxCheckBox* m_NonImmediateActions; wxStaticText* m_staticText24; wxStaticLine* m_staticline5; - wxCheckBox* m_cbUpdateCheck; - wxStaticText* m_staticText241; - wxStaticLine* m_staticline51; wxCheckBox* m_cbRememberOpenFiles; wxStaticText* m_staticTextautosave; wxSpinCtrl* m_SaveTime;