From 32b824e3cd86902dcb242bf1700d7dcfe7baea78 Mon Sep 17 00:00:00 2001
From: John Beard <john.j.beard@gmail.com>
Date: Thu, 12 Sep 2024 23:01:23 +0100
Subject: [PATCH] Clarify track/via snapping in dialog

Very minor tweaks:

* "When creating tracks" -> "When routing tracks"
  This setting affects the router tool, but not, say,
  copy/paste or other non-router ways to create tracks.
* The 'Snap to tracks' setting also toggles snapping to
  vias, so say so.

Relates-To: https://gitlab.com/kicad/code/kicad/-/issues/18508
---
 pcbnew/dialogs/panel_edit_options_base.cpp |   8 +-
 pcbnew/dialogs/panel_edit_options_base.fbp | 376 +++++++++++----------
 pcbnew/dialogs/panel_edit_options_base.h   |   2 +-
 3 files changed, 194 insertions(+), 192 deletions(-)

diff --git a/pcbnew/dialogs/panel_edit_options_base.cpp b/pcbnew/dialogs/panel_edit_options_base.cpp
index 0c0fab6c75..08d622e3f1 100644
--- a/pcbnew/dialogs/panel_edit_options_base.cpp
+++ b/pcbnew/dialogs/panel_edit_options_base.cpp
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
+// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!
@@ -294,7 +294,7 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i
 
 	fgSizer2->Add( m_staticText2, 0, wxALIGN_CENTER_VERTICAL|wxLEFT|wxRIGHT, 5 );
 
-	wxString m_magneticPadChoiceChoices[] = { _("Never"), _("When creating tracks"), _("Always") };
+	wxString m_magneticPadChoiceChoices[] = { _("Never"), _("When routing tracks"), _("Always") };
 	int m_magneticPadChoiceNChoices = sizeof( m_magneticPadChoiceChoices ) / sizeof( wxString );
 	m_magneticPadChoice = new wxChoice( sbMagnets->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_magneticPadChoiceNChoices, m_magneticPadChoiceChoices, 0 );
 	m_magneticPadChoice->SetSelection( 1 );
@@ -302,13 +302,13 @@ PANEL_EDIT_OPTIONS_BASE::PANEL_EDIT_OPTIONS_BASE( wxWindow* parent, wxWindowID i
 
 	fgSizer2->Add( m_magneticPadChoice, 0, wxALIGN_CENTER_VERTICAL|wxEXPAND|wxRIGHT|wxLEFT, 5 );
 
-	m_staticText21 = new wxStaticText( sbMagnets->GetStaticBox(), wxID_ANY, _("Snap to tracks:"), wxDefaultPosition, wxDefaultSize, 0 );
+	m_staticText21 = new wxStaticText( sbMagnets->GetStaticBox(), wxID_ANY, _("Snap to tracks and vias:"), wxDefaultPosition, wxDefaultSize, 0 );
 	m_staticText21->Wrap( -1 );
 	m_staticText21->SetToolTip( _("Capture cursor when the mouse approaches a track") );
 
 	fgSizer2->Add( m_staticText21, 0, wxALIGN_CENTER_VERTICAL|wxRIGHT|wxLEFT, 5 );
 
-	wxString m_magneticTrackChoiceChoices[] = { _("Never"), _("When creating tracks"), _("Always") };
+	wxString m_magneticTrackChoiceChoices[] = { _("Never"), _("When routing tracks"), _("Always") };
 	int m_magneticTrackChoiceNChoices = sizeof( m_magneticTrackChoiceChoices ) / sizeof( wxString );
 	m_magneticTrackChoice = new wxChoice( sbMagnets->GetStaticBox(), wxID_ANY, wxDefaultPosition, wxDefaultSize, m_magneticTrackChoiceNChoices, m_magneticTrackChoiceChoices, 0 );
 	m_magneticTrackChoice->SetSelection( 1 );
diff --git a/pcbnew/dialogs/panel_edit_options_base.fbp b/pcbnew/dialogs/panel_edit_options_base.fbp
index 761170dde9..819a0a2415 100644
--- a/pcbnew/dialogs/panel_edit_options_base.fbp
+++ b/pcbnew/dialogs/panel_edit_options_base.fbp
@@ -1,34 +1,36 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
 <wxFormBuilder_Project>
-  <FileVersion major="1" minor="17"/>
+  <FileVersion major="1" minor="18"/>
   <object class="Project" expanded="true">
-    <property name="class_decoration"></property>
     <property name="code_generation">C++</property>
-    <property name="disconnect_events">1</property>
-    <property name="disconnect_mode">source_name</property>
-    <property name="disconnect_php_events">0</property>
-    <property name="disconnect_python_events">0</property>
+    <property name="cpp_class_decoration"></property>
+    <property name="cpp_disconnect_events">1</property>
+    <property name="cpp_event_generation">connect</property>
+    <property name="cpp_help_provider">none</property>
+    <property name="cpp_namespace"></property>
+    <property name="cpp_precompiled_header"></property>
+    <property name="cpp_use_array_enum">0</property>
+    <property name="cpp_use_enum">1</property>
     <property name="embedded_files_path">res</property>
     <property name="encoding">UTF-8</property>
-    <property name="event_generation">connect</property>
     <property name="file">panel_edit_options_base</property>
     <property name="first_id">1000</property>
-    <property name="help_provider">none</property>
-    <property name="image_path_wrapper_function_name"></property>
-    <property name="indent_with_spaces"></property>
     <property name="internationalize">1</property>
+    <property name="lua_skip_events">1</property>
+    <property name="lua_ui_table">UI</property>
     <property name="name">PanelEditOptions</property>
-    <property name="namespace"></property>
     <property name="path">.</property>
-    <property name="precompiled_header"></property>
+    <property name="php_disconnect_events">0</property>
+    <property name="php_disconnect_mode">source_name</property>
+    <property name="php_skip_events">1</property>
+    <property name="python_disconnect_events">0</property>
+    <property name="python_disconnect_mode">source_name</property>
+    <property name="python_image_path_wrapper_function_name"></property>
+    <property name="python_indent_with_spaces"></property>
+    <property name="python_skip_events">1</property>
     <property name="relative_path">1</property>
-    <property name="skip_lua_events">1</property>
-    <property name="skip_php_events">1</property>
-    <property name="skip_python_events">1</property>
-    <property name="ui_table">UI</property>
-    <property name="use_array_enum">0</property>
-    <property name="use_enum">1</property>
     <property name="use_microsoft_bom">0</property>
+    <property name="use_native_eol">0</property>
     <object class="Panel" expanded="true">
       <property name="aui_managed">0</property>
       <property name="aui_manager_style">wxAUI_MGR_DEFAULT</property>
@@ -106,10 +108,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -180,10 +182,10 @@
                                 <property name="LeftDockable">1</property>
                                 <property name="RightDockable">1</property>
                                 <property name="TopDockable">1</property>
-                                <property name="aui_layer"></property>
+                                <property name="aui_layer">0</property>
                                 <property name="aui_name"></property>
-                                <property name="aui_position"></property>
-                                <property name="aui_row"></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>
@@ -242,10 +244,10 @@
                                 <property name="LeftDockable">1</property>
                                 <property name="RightDockable">1</property>
                                 <property name="TopDockable">1</property>
-                                <property name="aui_layer"></property>
+                                <property name="aui_layer">0</property>
                                 <property name="aui_name"></property>
-                                <property name="aui_position"></property>
-                                <property name="aui_row"></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>
@@ -269,7 +271,7 @@
                                 <property name="max_size"></property>
                                 <property name="maximize_button">0</property>
                                 <property name="maximum_size"></property>
-                                <property name="maxlength"></property>
+                                <property name="maxlength">0</property>
                                 <property name="min_size"></property>
                                 <property name="minimize_button">0</property>
                                 <property name="minimum_size">60,-1</property>
@@ -307,10 +309,10 @@
                                 <property name="LeftDockable">1</property>
                                 <property name="RightDockable">1</property>
                                 <property name="TopDockable">1</property>
-                                <property name="aui_layer"></property>
+                                <property name="aui_layer">0</property>
                                 <property name="aui_name"></property>
-                                <property name="aui_position"></property>
-                                <property name="aui_row"></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>
@@ -371,10 +373,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -443,10 +445,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -519,10 +521,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -591,10 +593,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -656,10 +658,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -721,10 +723,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -802,10 +804,10 @@
                         <property name="LeftDockable">1</property>
                         <property name="RightDockable">1</property>
                         <property name="TopDockable">1</property>
-                        <property name="aui_layer"></property>
+                        <property name="aui_layer">0</property>
                         <property name="aui_name"></property>
-                        <property name="aui_position"></property>
-                        <property name="aui_row"></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>
@@ -864,10 +866,10 @@
                         <property name="LeftDockable">1</property>
                         <property name="RightDockable">1</property>
                         <property name="TopDockable">1</property>
-                        <property name="aui_layer"></property>
+                        <property name="aui_layer">0</property>
                         <property name="aui_name"></property>
-                        <property name="aui_position"></property>
-                        <property name="aui_row"></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>
@@ -939,10 +941,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -1001,10 +1003,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -1063,10 +1065,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -1125,10 +1127,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -1187,10 +1189,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -1249,10 +1251,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -1311,10 +1313,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -1373,10 +1375,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -1435,10 +1437,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -1497,10 +1499,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -1580,10 +1582,10 @@
                         <property name="LeftDockable">1</property>
                         <property name="RightDockable">1</property>
                         <property name="TopDockable">1</property>
-                        <property name="aui_layer"></property>
+                        <property name="aui_layer">0</property>
                         <property name="aui_name"></property>
-                        <property name="aui_position"></property>
-                        <property name="aui_row"></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>
@@ -1642,10 +1644,10 @@
                         <property name="LeftDockable">1</property>
                         <property name="RightDockable">1</property>
                         <property name="TopDockable">1</property>
-                        <property name="aui_layer"></property>
+                        <property name="aui_layer">0</property>
                         <property name="aui_name"></property>
-                        <property name="aui_position"></property>
-                        <property name="aui_row"></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>
@@ -1717,10 +1719,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -1779,10 +1781,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -1841,10 +1843,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -1903,10 +1905,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -1965,10 +1967,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -2027,10 +2029,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -2089,10 +2091,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -2151,10 +2153,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -2213,10 +2215,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -2275,10 +2277,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -2342,10 +2344,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -2404,10 +2406,10 @@
                             <property name="LeftDockable">1</property>
                             <property name="RightDockable">1</property>
                             <property name="TopDockable">1</property>
-                            <property name="aui_layer"></property>
+                            <property name="aui_layer">0</property>
                             <property name="aui_name"></property>
-                            <property name="aui_position"></property>
-                            <property name="aui_row"></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>
@@ -2472,10 +2474,10 @@
                 <property name="LeftDockable">1</property>
                 <property name="RightDockable">1</property>
                 <property name="TopDockable">1</property>
-                <property name="aui_layer"></property>
+                <property name="aui_layer">0</property>
                 <property name="aui_name"></property>
-                <property name="aui_position"></property>
-                <property name="aui_row"></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>
@@ -2527,10 +2529,10 @@
                     <property name="LeftDockable">1</property>
                     <property name="RightDockable">1</property>
                     <property name="TopDockable">1</property>
-                    <property name="aui_layer"></property>
+                    <property name="aui_layer">0</property>
                     <property name="aui_name"></property>
-                    <property name="aui_position"></property>
-                    <property name="aui_row"></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>
@@ -2600,10 +2602,10 @@
                               <property name="LeftDockable">1</property>
                               <property name="RightDockable">1</property>
                               <property name="TopDockable">1</property>
-                              <property name="aui_layer"></property>
+                              <property name="aui_layer">0</property>
                               <property name="aui_name"></property>
-                              <property name="aui_position"></property>
-                              <property name="aui_row"></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>
@@ -2665,10 +2667,10 @@
                               <property name="LeftDockable">1</property>
                               <property name="RightDockable">1</property>
                               <property name="TopDockable">1</property>
-                              <property name="aui_layer"></property>
+                              <property name="aui_layer">0</property>
                               <property name="aui_name"></property>
-                              <property name="aui_position"></property>
-                              <property name="aui_row"></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>
@@ -2734,10 +2736,10 @@
                     <property name="LeftDockable">1</property>
                     <property name="RightDockable">1</property>
                     <property name="TopDockable">1</property>
-                    <property name="aui_layer"></property>
+                    <property name="aui_layer">0</property>
                     <property name="aui_name"></property>
-                    <property name="aui_position"></property>
-                    <property name="aui_row"></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>
@@ -2823,10 +2825,10 @@
                                   <property name="LeftDockable">1</property>
                                   <property name="RightDockable">1</property>
                                   <property name="TopDockable">1</property>
-                                  <property name="aui_layer"></property>
+                                  <property name="aui_layer">0</property>
                                   <property name="aui_name"></property>
-                                  <property name="aui_position"></property>
-                                  <property name="aui_row"></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>
@@ -2885,16 +2887,16 @@
                                   <property name="LeftDockable">1</property>
                                   <property name="RightDockable">1</property>
                                   <property name="TopDockable">1</property>
-                                  <property name="aui_layer"></property>
+                                  <property name="aui_layer">0</property>
                                   <property name="aui_name"></property>
-                                  <property name="aui_position"></property>
-                                  <property name="aui_row"></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;Never&quot; &quot;When creating tracks&quot; &quot;Always&quot;</property>
+                                  <property name="choices">&quot;Never&quot; &quot;When routing tracks&quot; &quot;Always&quot;</property>
                                   <property name="close_button">1</property>
                                   <property name="context_help"></property>
                                   <property name="context_menu">1</property>
@@ -2950,10 +2952,10 @@
                                   <property name="LeftDockable">1</property>
                                   <property name="RightDockable">1</property>
                                   <property name="TopDockable">1</property>
-                                  <property name="aui_layer"></property>
+                                  <property name="aui_layer">0</property>
                                   <property name="aui_name"></property>
-                                  <property name="aui_position"></property>
-                                  <property name="aui_row"></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>
@@ -2974,7 +2976,7 @@
                                   <property name="gripper">0</property>
                                   <property name="hidden">0</property>
                                   <property name="id">wxID_ANY</property>
-                                  <property name="label">Snap to tracks:</property>
+                                  <property name="label">Snap to tracks and vias:</property>
                                   <property name="markup">0</property>
                                   <property name="max_size"></property>
                                   <property name="maximize_button">0</property>
@@ -3012,16 +3014,16 @@
                                   <property name="LeftDockable">1</property>
                                   <property name="RightDockable">1</property>
                                   <property name="TopDockable">1</property>
-                                  <property name="aui_layer"></property>
+                                  <property name="aui_layer">0</property>
                                   <property name="aui_name"></property>
-                                  <property name="aui_position"></property>
-                                  <property name="aui_row"></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;Never&quot; &quot;When creating tracks&quot; &quot;Always&quot;</property>
+                                  <property name="choices">&quot;Never&quot; &quot;When routing tracks&quot; &quot;Always&quot;</property>
                                   <property name="close_button">1</property>
                                   <property name="context_help"></property>
                                   <property name="context_menu">1</property>
@@ -3077,10 +3079,10 @@
                                   <property name="LeftDockable">1</property>
                                   <property name="RightDockable">1</property>
                                   <property name="TopDockable">1</property>
-                                  <property name="aui_layer"></property>
+                                  <property name="aui_layer">0</property>
                                   <property name="aui_name"></property>
-                                  <property name="aui_position"></property>
-                                  <property name="aui_row"></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>
@@ -3139,10 +3141,10 @@
                                   <property name="LeftDockable">1</property>
                                   <property name="RightDockable">1</property>
                                   <property name="TopDockable">1</property>
-                                  <property name="aui_layer"></property>
+                                  <property name="aui_layer">0</property>
                                   <property name="aui_name"></property>
-                                  <property name="aui_position"></property>
-                                  <property name="aui_row"></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>
@@ -3220,10 +3222,10 @@
                               <property name="LeftDockable">1</property>
                               <property name="RightDockable">1</property>
                               <property name="TopDockable">1</property>
-                              <property name="aui_layer"></property>
+                              <property name="aui_layer">0</property>
                               <property name="aui_name"></property>
-                              <property name="aui_position"></property>
-                              <property name="aui_row"></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>
@@ -3285,10 +3287,10 @@
                               <property name="LeftDockable">1</property>
                               <property name="RightDockable">1</property>
                               <property name="TopDockable">1</property>
-                              <property name="aui_layer"></property>
+                              <property name="aui_layer">0</property>
                               <property name="aui_name"></property>
-                              <property name="aui_position"></property>
-                              <property name="aui_row"></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>
@@ -3359,10 +3361,10 @@
                                   <property name="LeftDockable">1</property>
                                   <property name="RightDockable">1</property>
                                   <property name="TopDockable">1</property>
-                                  <property name="aui_layer"></property>
+                                  <property name="aui_layer">0</property>
                                   <property name="aui_name"></property>
-                                  <property name="aui_position"></property>
-                                  <property name="aui_row"></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>
@@ -3421,10 +3423,10 @@
                                   <property name="LeftDockable">1</property>
                                   <property name="RightDockable">1</property>
                                   <property name="TopDockable">1</property>
-                                  <property name="aui_layer"></property>
+                                  <property name="aui_layer">0</property>
                                   <property name="aui_name"></property>
-                                  <property name="aui_position"></property>
-                                  <property name="aui_row"></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>
@@ -3502,10 +3504,10 @@
                               <property name="LeftDockable">1</property>
                               <property name="RightDockable">1</property>
                               <property name="TopDockable">1</property>
-                              <property name="aui_layer"></property>
+                              <property name="aui_layer">0</property>
                               <property name="aui_name"></property>
-                              <property name="aui_position"></property>
-                              <property name="aui_row"></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>
@@ -3567,10 +3569,10 @@
                               <property name="LeftDockable">1</property>
                               <property name="RightDockable">1</property>
                               <property name="TopDockable">1</property>
-                              <property name="aui_layer"></property>
+                              <property name="aui_layer">0</property>
                               <property name="aui_name"></property>
-                              <property name="aui_position"></property>
-                              <property name="aui_row"></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>
@@ -3632,10 +3634,10 @@
                               <property name="LeftDockable">1</property>
                               <property name="RightDockable">1</property>
                               <property name="TopDockable">1</property>
-                              <property name="aui_layer"></property>
+                              <property name="aui_layer">0</property>
                               <property name="aui_name"></property>
-                              <property name="aui_position"></property>
-                              <property name="aui_row"></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>
@@ -3697,10 +3699,10 @@
                               <property name="LeftDockable">1</property>
                               <property name="RightDockable">1</property>
                               <property name="TopDockable">1</property>
-                              <property name="aui_layer"></property>
+                              <property name="aui_layer">0</property>
                               <property name="aui_name"></property>
-                              <property name="aui_position"></property>
-                              <property name="aui_row"></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>
diff --git a/pcbnew/dialogs/panel_edit_options_base.h b/pcbnew/dialogs/panel_edit_options_base.h
index c86ea693b7..99ddc4eaf1 100644
--- a/pcbnew/dialogs/panel_edit_options_base.h
+++ b/pcbnew/dialogs/panel_edit_options_base.h
@@ -1,5 +1,5 @@
 ///////////////////////////////////////////////////////////////////////////
-// C++ code generated with wxFormBuilder (version 4.0.0-0-g0efcecf)
+// C++ code generated with wxFormBuilder (version 4.2.1-0-g80c4cb6)
 // http://www.wxformbuilder.org/
 //
 // PLEASE DO *NOT* EDIT THIS FILE!