From 8fad4bb34c274f2b0aadcfb26836daa13f2ada8c Mon Sep 17 00:00:00 2001
From: Jon Evans <jon@craftyjon.com>
Date: Wed, 30 Sep 2020 18:07:51 -0400
Subject: [PATCH] Remove ratsnest visibility from PcbNew preferences

Ratsnest visibility is a quick toggle, not a preference

Fixes https://gitlab.com/kicad/code/kicad/-/issues/5261
---
 pcbnew/dialogs/panel_edit_options.cpp      |  2 -
 pcbnew/dialogs/panel_edit_options_base.cpp |  3 -
 pcbnew/dialogs/panel_edit_options_base.fbp | 64 ----------------------
 pcbnew/dialogs/panel_edit_options_base.h   |  1 -
 4 files changed, 70 deletions(-)

diff --git a/pcbnew/dialogs/panel_edit_options.cpp b/pcbnew/dialogs/panel_edit_options.cpp
index bb7f122773..f1c2bc355b 100644
--- a/pcbnew/dialogs/panel_edit_options.cpp
+++ b/pcbnew/dialogs/panel_edit_options.cpp
@@ -63,7 +63,6 @@ bool PANEL_EDIT_OPTIONS::TransferDataToWindow()
     {
         /* Set display options */
         m_OptDisplayCurvedRatsnestLines->SetValue( displ_opts.m_DisplayRatsnestLinesCurved );
-        m_showGlobalRatsnest->SetValue( displ_opts.m_ShowGlobalRatsnest );
         m_showSelectedRatsnest->SetValue( displ_opts.m_ShowModuleRatsnest );
 
         m_magneticPadChoice->SetSelection( static_cast<int>( general_opts.m_MagneticItems.pads ) );
@@ -107,7 +106,6 @@ bool PANEL_EDIT_OPTIONS::TransferDataFromWindow()
         PCBNEW_SETTINGS& pcbnewSettings = m_Frame->Settings();
 
         displ_opts.m_DisplayRatsnestLinesCurved = m_OptDisplayCurvedRatsnestLines->GetValue();
-        displ_opts.m_ShowGlobalRatsnest = m_showGlobalRatsnest->GetValue();
         displ_opts.m_ShowModuleRatsnest = m_showSelectedRatsnest->GetValue();
 
         m_Frame->Settings().m_MagneticItems.pads =
diff --git a/pcbnew/dialogs/panel_edit_options_base.cpp b/pcbnew/dialogs/panel_edit_options_base.cpp
index 2463e9af70..2454f39e5d 100644
--- a/pcbnew/dialogs/panel_edit_options_base.cpp
+++ b/pcbnew/dialogs/panel_edit_options_base.cpp
@@ -142,9 +142,6 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i
 	wxStaticBoxSizer* sbSizer3;
 	sbSizer3 = new wxStaticBoxSizer( new wxStaticBox( pcbPage, wxID_ANY, _("Ratsnest") ), wxVERTICAL );
 
-	m_showGlobalRatsnest = new wxCheckBox( sbSizer3->GetStaticBox(), wxID_ANY, _("Show ratsnest"), wxDefaultPosition, wxDefaultSize, 0 );
-	sbSizer3->Add( m_showGlobalRatsnest, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
-
 	m_showSelectedRatsnest = new wxCheckBox( sbSizer3->GetStaticBox(), wxID_ANY, _("Always show selected ratsnest"), wxDefaultPosition, wxDefaultSize, 0 );
 	sbSizer3->Add( m_showSelectedRatsnest, 0, wxBOTTOM|wxRIGHT|wxLEFT, 5 );
 
diff --git a/pcbnew/dialogs/panel_edit_options_base.fbp b/pcbnew/dialogs/panel_edit_options_base.fbp
index 0a6fe21efe..18ed818f0d 100644
--- a/pcbnew/dialogs/panel_edit_options_base.fbp
+++ b/pcbnew/dialogs/panel_edit_options_base.fbp
@@ -1144,70 +1144,6 @@
                                                     <property name="orient">wxVERTICAL</property>
                                                     <property name="parent">1</property>
                                                     <property name="permission">none</property>
-                                                    <object class="sizeritem" expanded="1">
-                                                        <property name="border">5</property>
-                                                        <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
-                                                        <property name="proportion">0</property>
-                                                        <object class="wxCheckBox" 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="checked">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="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">Show ratsnest</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_showGlobalRatsnest</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="window_extra_style"></property>
-                                                            <property name="window_name"></property>
-                                                            <property name="window_style"></property>
-                                                        </object>
-                                                    </object>
                                                     <object class="sizeritem" expanded="1">
                                                         <property name="border">5</property>
                                                         <property name="flag">wxBOTTOM|wxRIGHT|wxLEFT</property>
diff --git a/pcbnew/dialogs/panel_edit_options_base.h b/pcbnew/dialogs/panel_edit_options_base.h
index 5e9028223f..16dc85575d 100644
--- a/pcbnew/dialogs/panel_edit_options_base.h
+++ b/pcbnew/dialogs/panel_edit_options_base.h
@@ -57,7 +57,6 @@ class PANEL_EDIT_OPTIONS_BASE : public wxPanel
 		wxChoice* m_magneticTrackChoice;
 		wxStaticText* m_staticText211;
 		wxChoice* m_magneticGraphicsChoice;
-		wxCheckBox* m_showGlobalRatsnest;
 		wxCheckBox* m_showSelectedRatsnest;
 		wxCheckBox* m_OptDisplayCurvedRatsnestLines;
 		wxCheckBox* m_Show_Page_Limits;